From 5e7c2d6cef758222eedd6ba9ee2cb3d9e1c16b75 Mon Sep 17 00:00:00 2001 From: Default email Date: Mon, 9 Oct 2023 21:29:22 +0200 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: f99e5f03cc0aa231ab5950a15ed02afec45ed51a --- third_party/nixpkgs/.github/CODEOWNERS | 41 +- .../nixpkgs/.github/workflows/backport.yml | 6 +- .../nixpkgs/.github/workflows/basic-eval.yml | 4 +- .../.github/workflows/check-by-name.yml | 151 + .../workflows/check-maintainers-sorted.yaml | 4 +- .../.github/workflows/editorconfig.yml | 4 +- .../.github/workflows/manual-nixos.yml | 4 +- .../.github/workflows/manual-nixpkgs.yml | 4 +- .../.github/workflows/periodic-merge-24h.yml | 2 +- .../.github/workflows/periodic-merge-6h.yml | 2 +- .../workflows/update-terraform-providers.yml | 8 +- third_party/nixpkgs/.gitignore | 1 + third_party/nixpkgs/CONTRIBUTING.md | 25 +- .../nixpkgs/doc/builders/fetchers.chapter.md | 49 +- .../doc/builders/packages/emacs.section.md | 6 +- .../doc/builders/packages/ibus.section.md | 4 +- .../doc/builders/trivial-builders.chapter.md | 21 +- third_party/nixpkgs/doc/default.nix | 2 + third_party/nixpkgs/doc/functions.md | 1 + .../nixpkgs/doc/functions/fileset.section.md | 51 + .../nixpkgs/doc/hooks/bmake.section.md | 7 + third_party/nixpkgs/doc/hooks/index.md | 2 + .../doc/hooks/mpi-check-hook.section.md | 24 + third_party/nixpkgs/doc/hooks/waf.section.md | 59 +- third_party/nixpkgs/doc/hooks/zig.section.md | 36 +- .../doc/languages-frameworks/beam.section.md | 24 +- .../languages-frameworks/chicken.section.md | 29 + .../doc/languages-frameworks/cuda.section.md | 62 + .../doc/languages-frameworks/dhall.section.md | 13 +- .../languages-frameworks/dotnet.section.md | 2 +- .../languages-frameworks/haskell.section.md | 6 +- .../javascript.section.md | 20 +- .../doc/languages-frameworks/lisp.section.md | 139 +- .../doc/languages-frameworks/php.section.md | 140 +- .../languages-frameworks/python.section.md | 245 +- .../doc/languages-frameworks/ruby.section.md | 13 +- .../doc/languages-frameworks/rust.section.md | 2 +- .../doc/languages-frameworks/vim.section.md | 13 +- third_party/nixpkgs/doc/preface.chapter.md | 2 +- .../nixpkgs/doc/stdenv/meta.chapter.md | 5 +- .../doc/stdenv/multiple-output.chapter.md | 44 +- .../nixpkgs/doc/stdenv/stdenv.chapter.md | 79 +- third_party/nixpkgs/doc/using-nixpkgs.md | 1 + .../nixpkgs/doc/using/overlays.chapter.md | 2 +- .../doc/using/platform-support.chapter.md | 18 + third_party/nixpkgs/lib/README.md | 3 + third_party/nixpkgs/lib/attrsets.nix | 8 +- third_party/nixpkgs/lib/customisation.nix | 2 +- third_party/nixpkgs/lib/default.nix | 3 + third_party/nixpkgs/lib/fileset/README.md | 216 + third_party/nixpkgs/lib/fileset/benchmark.sh | 140 + third_party/nixpkgs/lib/fileset/default.nix | 368 + third_party/nixpkgs/lib/fileset/internal.nix | 536 + .../nixpkgs/lib/fileset/mock-splitRoot.nix | 26 + third_party/nixpkgs/lib/fileset/tests.sh | 733 + third_party/nixpkgs/lib/generators.nix | 22 +- third_party/nixpkgs/lib/gvariant.nix | 290 + third_party/nixpkgs/lib/licenses.nix | 40 +- third_party/nixpkgs/lib/lists.nix | 60 +- third_party/nixpkgs/lib/modules.nix | 15 +- third_party/nixpkgs/lib/strings.nix | 58 + third_party/nixpkgs/lib/systems/default.nix | 8 + third_party/nixpkgs/lib/systems/examples.nix | 6 + third_party/nixpkgs/lib/tests/misc.nix | 81 +- third_party/nixpkgs/lib/tests/modules.sh | 23 +- .../tests/modules/declaration-positions.nix | 49 + .../nixpkgs/lib/tests/modules/gvariant.nix | 61 + third_party/nixpkgs/lib/tests/release.nix | 6 +- third_party/nixpkgs/maintainers/README.md | 63 +- .../nixpkgs/maintainers/maintainer-list.nix | 665 +- .../maintainers/scripts/all-tarballs.nix | 2 +- .../scripts/haskell/hydra-report.hs | 47 +- .../scripts/haskell/mark-broken.sh | 22 +- .../maintainers/scripts/luarocks-packages.csv | 1 + .../maintainers/scripts/pluginupdate.py | 40 +- .../maintainers/scripts/remove-old-aliases.py | 9 +- .../nixpkgs/maintainers/scripts/sha-to-sri.py | 228 + .../scripts/update-luarocks-packages | 98 +- third_party/nixpkgs/maintainers/team-list.nix | 46 +- .../adding-custom-packages.section.md | 4 +- .../customizing-packages.section.md | 8 +- .../development/unit-handling.section.md | 7 +- ...-happens-during-a-system-switch.chapter.md | 5 +- .../manual/release-notes/rl-2105.section.md | 2 +- .../manual/release-notes/rl-2205.section.md | 3 +- .../manual/release-notes/rl-2305.section.md | 6 +- .../manual/release-notes/rl-2311.section.md | 199 +- .../nixpkgs/nixos/lib/make-btrfs-fs.nix | 65 + third_party/nixpkgs/nixos/lib/systemd-lib.nix | 10 +- .../nixpkgs/nixos/lib/test-driver/default.nix | 20 +- .../lib/test-driver/extract-docstrings.py | 42 +- .../nixos/lib/test-driver/pyproject.toml | 44 + .../nixpkgs/nixos/lib/test-driver/setup.py | 14 - .../nixpkgs/nixos/lib/test-driver/shell.nix | 2 + .../lib/test-driver/test_driver/__init__.py | 11 +- .../lib/test-driver/test_driver/driver.py | 8 +- .../lib/test-driver/test_driver/logger.py | 14 +- .../lib/test-driver/test_driver/machine.py | 55 +- .../test_driver/polling_condition.py | 8 +- .../nixos/lib/test-driver/test_driver/vlan.py | 2 +- .../nixpkgs/nixos/lib/testing/driver.nix | 7 +- .../nixpkgs/nixos/lib/testing/nodes.nix | 18 +- third_party/nixpkgs/nixos/lib/utils.nix | 11 +- .../scripts/lxd/lxd-container-image-inner.nix | 20 + ...{lxd-image.nix => lxd-container-image.nix} | 6 +- .../scripts/lxd/lxd-image-inner.nix | 95 - .../lxd/lxd-virtual-machine-image-inner.nix | 20 + .../scripts/lxd/lxd-virtual-machine-image.nix | 27 + .../maintainers/scripts/oci/create-image.sh | 24 + .../maintainers/scripts/oci/upload-image.sh | 100 + .../nixpkgs/nixos/modules/config/console.nix | 3 + .../nixos/modules/config/fonts/packages.nix | 2 +- .../nixos/modules/config/system-path.nix | 13 +- .../nixpkgs/nixos/modules/config/terminfo.nix | 38 +- .../modules/config/update-users-groups.pl | 36 +- .../nixos/modules/config/users-groups.nix | 70 +- .../nixpkgs/nixos/modules/config/zram.nix | 47 +- .../nixos/modules/hardware/all-firmware.nix | 2 +- .../nixos/modules/hardware/cpu/amd-sev.nix | 91 +- .../nixos/modules/hardware/decklink.nix | 16 + .../nixos/modules/hardware/device-tree.nix | 66 +- .../nixos/modules/hardware/glasgow.nix | 23 + .../nixos/modules/hardware/infiniband.nix | 58 + .../modules/hardware/video/amdgpu-pro.nix | 3 - .../nixos/modules/hardware/video/nvidia.nix | 533 +- .../nixos/modules/i18n/input-method/uim.nix | 2 +- .../nixpkgs/nixos/modules/image/repart.nix | 3 +- .../installation-cd-graphical-gnome.nix | 1 - .../modules/installer/cd-dvd/iso-image.nix | 129 +- .../nixos/modules/installer/tools/tools.nix | 4 +- .../nixpkgs/nixos/modules/misc/locate.nix | 37 +- .../nixpkgs/nixos/modules/misc/nixpkgs.nix | 24 +- .../nixpkgs/nixos/modules/module-list.nix | 27 +- .../modules/profiles/installation-device.nix | 2 - .../nixos/modules/programs/bash/bash.nix | 2 +- .../nixos/modules/programs/browserpass.nix | 2 +- .../nixos/modules/programs/clash-verge.nix | 14 +- .../nixpkgs/nixos/modules/programs/dconf.nix | 245 +- .../nixpkgs/nixos/modules/programs/direnv.nix | 18 +- .../nixos/modules/programs/ecryptfs.nix | 31 + .../nixos/modules/programs/environment.nix | 9 +- .../nixos/modules/programs/firefox.nix | 28 +- .../nixpkgs/nixos/modules/programs/fish.nix | 17 +- .../nixpkgs/nixos/modules/programs/gnupg.nix | 29 +- .../nixos/modules/programs/hyprland.nix | 4 +- .../nixpkgs/nixos/modules/programs/nano.nix | 34 +- .../nixos/modules/programs/regreet.nix | 6 +- .../nixos/modules/programs/rust-motd.nix | 65 +- .../nixos/modules/programs/streamdeck-ui.nix | 2 +- .../nixpkgs/nixos/modules/programs/tmux.nix | 12 +- .../nixos/modules/programs/wayland/sway.nix | 13 + .../nixpkgs/nixos/modules/programs/yazi.nix | 53 + .../programs/yubikey-touch-detector.nix | 21 + .../nixos/modules/programs/zsh/zsh.nix | 13 + third_party/nixpkgs/nixos/modules/rename.nix | 3 + .../nixos/modules/security/acme/default.md | 4 +- .../nixos/modules/security/acme/default.nix | 149 +- .../nixpkgs/nixos/modules/security/pam.nix | 2 +- .../nixos/modules/security/sudo-rs.nix | 296 + .../nixpkgs/nixos/modules/security/sudo.nix | 4 + .../modules/security/wrappers/default.nix | 41 +- .../nixos/modules/security/wrappers/wrapper.c | 154 +- .../modules/security/wrappers/wrapper.nix | 6 +- .../nixos/modules/services/audio/castopod.md | 22 + .../nixos/modules/services/audio/castopod.nix | 287 + .../nixos/modules/services/audio/gonic.nix | 1 + .../nixos/modules/services/audio/tts.nix | 1 + .../services/audio/wyoming/openwakeword.nix | 157 + .../modules/services/backup/borgbackup.nix | 11 +- .../nixos/modules/services/backup/btrbk.nix | 4 +- .../modules/services/backup/duplicati.nix | 7 +- .../nixos/modules/services/backup/restic.nix | 34 +- .../buildbot/master.nix | 26 +- .../github-runner/options.nix | 8 + .../github-runner/service.nix | 5 +- .../services/continuous-integration/hail.nix | 61 - .../woodpecker/agents.nix | 59 +- .../modules/services/databases/influxdb2.nix | 452 +- .../modules/services/databases/pgmanage.nix | 2 +- .../modules/services/databases/postgresql.nix | 22 +- .../modules/services/databases/surrealdb.nix | 29 +- .../gnome/gnome-browser-connector.nix | 2 +- .../nixos/modules/services/editors/emacs.md | 24 +- .../nixos/modules/services/editors/emacs.nix | 17 +- .../nixos/modules/services/finance/odoo.nix | 8 +- .../nixos/modules/services/games/xonotic.nix | 198 + .../services/hardware/auto-cpufreq.nix | 10 +- .../services/hardware/hddfancontrol.nix | 66 + .../modules/services/hardware/kanata.nix | 16 +- .../nixos/modules/services/hardware/keyd.nix | 32 +- .../modules/services/hardware/openrgb.nix | 9 +- .../nixos/modules/services/hardware/tlp.nix | 2 +- .../modules/services/hardware/tuxedo-rs.nix | 49 + .../home-automation/home-assistant.nix | 2 + .../services/home-automation/zigbee2mqtt.nix | 3 +- .../modules/services/logging/logrotate.nix | 12 +- .../nixos/modules/services/logging/ulogd.nix | 27 +- .../nixos/modules/services/mail/listmonk.nix | 4 +- .../modules/services/mail/stalwart-mail.nix | 106 + .../services/matrix/matrix-sliding-sync.nix | 4 +- .../services/matrix/mautrix-telegram.nix | 1 - .../services/matrix/mautrix-whatsapp.nix | 99 +- .../services/matrix/synapse-log_config.yaml | 25 - .../nixos/modules/services/matrix/synapse.md | 2 +- .../nixos/modules/services/matrix/synapse.nix | 676 +- .../nixos/modules/services/misc/atuin.nix | 2 +- .../nixos/modules/services/misc/cfdyndns.nix | 31 +- .../nixos/modules/services/misc/dysnomia.nix | 2 +- .../nixos/modules/services/misc/forgejo.nix | 668 + .../nixos/modules/services/misc/gitea.nix | 15 + .../nixos/modules/services/misc/gitlab.nix | 7 +- .../nixos/modules/services/misc/gollum.nix | 2 +- .../nixos/modules/services/misc/gpsd.nix | 12 + .../nixos/modules/services/misc/jellyfin.nix | 3 +- .../nixos/modules/services/misc/mbpfan.nix | 19 +- .../nixos/modules/services/misc/moonraker.nix | 10 +- .../nixos/modules/services/misc/paperless.nix | 2 + .../nixos/modules/services/misc/xmr-stak.nix | 8 +- .../modules/services/monitoring/below.nix | 2 + .../modules/services/monitoring/grafana.nix | 24 +- .../modules/services/monitoring/mimir.nix | 14 +- .../monitoring/prometheus/exporters.nix | 60 +- .../prometheus/exporters/blackbox.nix | 2 +- .../prometheus/exporters/mysqld.nix | 60 + .../prometheus/exporters/nextcloud.nix | 24 +- .../prometheus/exporters/pgbouncer.nix | 145 + .../prometheus/exporters/sabnzbd.nix | 47 + .../prometheus/exporters/unbound.nix | 84 +- .../modules/services/monitoring/vmagent.nix | 12 +- .../network-filesystems/orangefs/server.nix | 2 +- .../services/networking/adguardhome.nix | 5 +- .../modules/services/networking/coredns.nix | 9 +- .../nixos/modules/services/networking/dae.nix | 170 +- .../services/networking/dnscrypt-proxy2.nix | 6 +- .../modules/services/networking/dnsmasq.nix | 4 +- .../services/networking/firewall-nftables.nix | 9 +- .../nixos/modules/services/networking/frp.nix | 93 + .../nixos/modules/services/networking/frr.nix | 1 + .../modules/services/networking/jool.nix | 307 +- .../modules/services/networking/knot.nix | 136 +- .../services/networking/mtr-exporter.nix | 117 +- .../services/networking/nat-nftables.nix | 36 +- .../modules/services/networking/netclient.nix | 27 + .../services/networking/networkmanager.nix | 133 +- .../modules/services/networking/nftables.nix | 179 +- .../modules/services/networking/nncp.nix | 131 + .../modules/services/networking/privoxy.nix | 2 +- .../modules/services/networking/ssh/sshd.nix | 22 +- .../modules/services/networking/syncthing.nix | 14 +- .../modules/services/networking/tailscale.nix | 2 +- .../modules/services/networking/tedicross.nix | 100 - .../modules/services/networking/trust-dns.nix | 5 +- .../modules/services/networking/twingate.nix | 2 +- .../modules/services/networking/unifi.nix | 8 +- .../services/networking/websockify.nix | 2 +- .../modules/services/networking/wg-quick.nix | 2 + .../modules/services/networking/wireguard.nix | 11 +- .../modules/services/networking/wstunnel.nix | 4 +- .../modules/services/networking/yggdrasil.nix | 9 +- .../modules/services/search/typesense.nix | 4 +- .../modules/services/security/kanidm.nix | 6 +- .../modules/services/security/usbguard.nix | 21 +- .../services/security/vaultwarden/default.nix | 6 +- .../services/system/zram-generator.nix | 38 + .../modules/services/torrent/transmission.nix | 2 +- .../services/web-apps/audiobookshelf.nix | 90 + .../modules/services/web-apps/calibre-web.nix | 7 +- .../modules/services/web-apps/cloudlog.nix | 2 - .../modules/services/web-apps/galene.nix | 2 +- .../nixos/modules/services/web-apps/grocy.nix | 20 +- .../services/web-apps/healthchecks.nix | 45 +- .../nixos/modules/services/web-apps/honk.md | 23 + .../nixos/modules/services/web-apps/honk.nix | 153 + .../nixos/modules/services/web-apps/lemmy.nix | 2 +- .../modules/services/web-apps/mediawiki.nix | 94 +- .../services/web-apps/meme-bingo-web.nix | 93 + .../modules/services/web-apps/mobilizon.nix | 442 + .../modules/services/web-apps/netbox.nix | 25 +- .../services/web-apps/peering-manager.nix | 97 +- .../modules/services/web-apps/plausible.nix | 6 +- .../nixos/modules/services/web-apps/rimgo.nix | 107 + .../modules/services/web-apps/tt-rss.nix | 44 +- .../modules/services/web-apps/vikunja.nix | 4 + .../modules/services/web-apps/wordpress.nix | 2 +- .../modules/services/web-apps/zitadel.nix | 223 + .../services/web-servers/caddy/default.nix | 56 +- .../modules/services/web-servers/garage.nix | 9 +- .../services/web-servers/nginx/default.nix | 47 +- .../services/x11/desktop-managers/budgie.nix | 3 +- .../services/x11/desktop-managers/gnome.nix | 22 +- .../services/x11/desktop-managers/plasma5.nix | 21 +- .../services/x11/display-managers/gdm.nix | 56 +- .../lightdm-greeters/tiny.nix | 10 +- .../services/x11/display-managers/sddm.nix | 30 + .../services/x11/window-managers/default.nix | 1 + .../services/x11/window-managers/dwm.nix | 1 + .../services/x11/window-managers/oroborus.nix | 25 - .../services/x11/window-managers/ragnarwm.nix | 33 + .../activation/switch-to-configuration.pl | 44 +- .../nixos/modules/system/boot/binfmt.nix | 32 +- .../boot/loader/systemd-boot/systemd-boot.nix | 6 +- .../nixos/modules/system/boot/luksroot.nix | 6 + .../nixos/modules/system/boot/networkd.nix | 105 +- .../nixos/modules/system/boot/resolved.nix | 8 +- .../nixos/modules/system/boot/stage-1.nix | 2 +- .../nixos/modules/system/boot/stage-2-init.sh | 5 +- .../nixos/modules/system/boot/systemd.nix | 5 +- .../modules/system/boot/systemd/initrd.nix | 26 +- .../modules/system/boot/systemd/user.nix | 4 + .../nixpkgs/nixos/modules/tasks/bcache.nix | 12 +- .../nixos/modules/tasks/filesystems.nix | 9 +- .../nixos/modules/tasks/filesystems/zfs.nix | 5 + .../tasks/network-interfaces-scripted.nix | 2 +- .../tasks/network-interfaces-systemd.nix | 76 +- .../modules/tasks/network-interfaces.nix | 24 +- .../nixpkgs/nixos/modules/tasks/swraid.nix | 21 +- .../nixos/modules/virtualisation/anbox.nix | 59 +- .../modules/virtualisation/azure-image.nix | 9 +- .../virtualisation/google-compute-config.nix | 2 +- .../modules/virtualisation/lxc-container.nix | 130 +- .../virtualisation/lxc-image-metadata.nix | 104 + .../virtualisation/lxc-instance-common.nix | 30 + .../virtualisation/lxd-virtual-machine.nix | 46 + .../nixos/modules/virtualisation/lxd.nix | 129 +- .../modules/virtualisation/oci-common.nix | 60 + .../virtualisation/oci-config-user.nix | 12 + .../modules/virtualisation/oci-containers.nix | 12 + .../modules/virtualisation/oci-image.nix | 50 + .../modules/virtualisation/oci-options.nix | 14 + .../nixos/modules/virtualisation/qemu-vm.nix | 13 +- .../virtualisation/virtualbox-host.nix | 2 +- .../nixpkgs/nixos/release-combined.nix | 5 + third_party/nixpkgs/nixos/release.nix | 51 +- third_party/nixpkgs/nixos/tests/acme.nix | 44 +- .../nixpkgs/nixos/tests/adguardhome.nix | 1 - third_party/nixpkgs/nixos/tests/akkoma.nix | 5 +- third_party/nixpkgs/nixos/tests/all-tests.nix | 49 +- third_party/nixpkgs/nixos/tests/amd-sev.nix | 56 + third_party/nixpkgs/nixos/tests/anbox.nix | 36 + .../nixpkgs/nixos/tests/audiobookshelf.nix | 23 + third_party/nixpkgs/nixos/tests/bcachefs.nix | 3 +- third_party/nixpkgs/nixos/tests/caddy.nix | 22 + third_party/nixpkgs/nixos/tests/castopod.nix | 87 + .../nixos/tests/common/lxd/config.yaml | 24 - third_party/nixpkgs/nixos/tests/custom-ca.nix | 4 +- third_party/nixpkgs/nixos/tests/dae.nix | 29 + third_party/nixpkgs/nixos/tests/dconf.nix | 34 + third_party/nixpkgs/nixos/tests/discourse.nix | 2 +- .../nixpkgs/nixos/tests/docker-tools.nix | 2 +- third_party/nixpkgs/nixos/tests/dolibarr.nix | 2 +- .../nixos/tests/fontconfig-default-fonts.nix | 2 +- third_party/nixpkgs/nixos/tests/forgejo.nix | 157 + third_party/nixpkgs/nixos/tests/frp.nix | 86 + third_party/nixpkgs/nixos/tests/gitea.nix | 8 + .../nixpkgs/nixos/tests/gnome-flashback.nix | 16 +- third_party/nixpkgs/nixos/tests/hardened.nix | 2 +- .../nixpkgs/nixos/tests/hddfancontrol.nix | 44 + third_party/nixpkgs/nixos/tests/honk.nix | 32 + third_party/nixpkgs/nixos/tests/influxdb2.nix | 193 +- third_party/nixpkgs/nixos/tests/installer.nix | 3 +- third_party/nixpkgs/nixos/tests/jool.nix | 106 +- third_party/nixpkgs/nixos/tests/kea.nix | 43 +- .../nixpkgs/nixos/tests/kernel-generic.nix | 2 +- third_party/nixpkgs/nixos/tests/keyd.nix | 23 +- third_party/nixpkgs/nixos/tests/knot.nix | 122 +- third_party/nixpkgs/nixos/tests/legit.nix | 2 +- third_party/nixpkgs/nixos/tests/listmonk.nix | 23 +- .../nixpkgs/nixos/tests/litestream.nix | 24 +- .../nixpkgs/nixos/tests/lxd-image-server.nix | 10 +- .../tests/{lxd.nix => lxd/container.nix} | 47 +- .../nixpkgs/nixos/tests/lxd/default.nix | 12 + .../{lxd-nftables.nix => lxd/nftables.nix} | 7 +- .../nixpkgs/nixos/tests/lxd/preseed.nix | 71 + .../nixos/tests/{lxd-ui.nix => lxd/ui.nix} | 2 +- .../nixos/tests/lxd/virtual-machine.nix | 64 + .../nixos/tests/matrix/synapse-workers.nix | 50 + third_party/nixpkgs/nixos/tests/mediawiki.nix | 16 + third_party/nixpkgs/nixos/tests/mobilizon.nix | 44 + third_party/nixpkgs/nixos/tests/mongodb.nix | 2 +- .../nixpkgs/nixos/tests/nginx-tmpdir.nix | 60 + .../nixpkgs/nixos/tests/noto-fonts.nix | 2 +- third_party/nixpkgs/nixos/tests/odoo.nix | 3 +- third_party/nixpkgs/nixos/tests/openssh.nix | 33 + third_party/nixpkgs/nixos/tests/os-prober.nix | 1 + third_party/nixpkgs/nixos/tests/osquery.nix | 2 +- third_party/nixpkgs/nixos/tests/pantheon.nix | 18 +- third_party/nixpkgs/nixos/tests/plausible.nix | 2 + third_party/nixpkgs/nixos/tests/postgis.nix | 2 +- .../nixos/tests/prometheus-exporters.nix | 108 +- .../tests/qemu-vm-external-disk-image.nix | 73 + third_party/nixpkgs/nixos/tests/qgis.nix | 30 + third_party/nixpkgs/nixos/tests/ragnarwm.nix | 32 + third_party/nixpkgs/nixos/tests/restic.nix | 20 +- third_party/nixpkgs/nixos/tests/sftpgo.nix | 18 +- .../tests/{sgtpuzzles.nix => sgt-puzzles.nix} | 4 +- third_party/nixpkgs/nixos/tests/shadow.nix | 2 +- .../nixpkgs/nixos/tests/stalwart-mail.nix | 117 + third_party/nixpkgs/nixos/tests/sudo-rs.nix | 101 + third_party/nixpkgs/nixos/tests/sudo.nix | 2 +- .../nixpkgs/nixos/tests/switch-test.nix | 151 +- .../nixpkgs/nixos/tests/syncthing-init.nix | 1 - .../nixos/tests/systemd-initrd-bridge.nix | 63 + .../nixos/tests/systemd-initrd-swraid.nix | 16 +- .../nixos/tests/systemd-initrd-vlan.nix | 59 + third_party/nixpkgs/nixos/tests/tinywl.nix | 2 + third_party/nixpkgs/nixos/tests/tracee.nix | 4 + .../nixpkgs/nixos/tests/transmission.nix | 3 +- third_party/nixpkgs/nixos/tests/ulogd.nix | 82 - .../nixpkgs/nixos/tests/ulogd/ulogd.nix | 56 + .../nixpkgs/nixos/tests/ulogd/ulogd.py | 48 + .../nixos/tests/user-activation-scripts.nix | 3 + .../nixpkgs/nixos/tests/user-expiry.nix | 70 + .../nixpkgs/nixos/tests/virtualbox.nix | 2 +- .../nixos/tests/web-apps/netbox-upgrade.nix | 10 +- .../nixpkgs/nixos/tests/web-apps/netbox.nix | 1 + third_party/nixpkgs/nixos/tests/wordpress.nix | 2 +- third_party/nixpkgs/nixos/tests/wrappers.nix | 24 +- third_party/nixpkgs/nixos/tests/yggdrasil.nix | 1 + third_party/nixpkgs/nixos/tests/zfs.nix | 7 +- third_party/nixpkgs/pkgs/README.md | 78 +- .../audio/airwindows-lv2/default.nix | 12 +- .../audio/alsa-scarlett-gui/default.nix | 6 +- .../applications/audio/ardour/default.nix | 4 +- .../applications/audio/aucatctl/default.nix | 9 +- .../audio/bambootracker/default.nix | 4 +- .../applications/audio/baudline/default.nix | 4 +- .../applications/audio/bchoppr/default.nix | 5 +- .../audio/bespokesynth/default.nix | 32 +- .../audio/bitwig-studio/bitwig-studio3.nix | 10 +- .../audio/bitwig-studio/bitwig-studio5.nix | 4 +- .../applications/audio/cardinal/default.nix | 16 +- .../applications/audio/castopod/default.nix | 53 + .../applications/audio/castopod/update.sh | 89 + .../pkgs/applications/audio/cava/default.nix | 12 + .../pkgs/applications/audio/clerk/default.nix | 72 +- .../audio/easyeffects/default.nix | 6 +- .../applications/audio/exaile/default.nix | 18 +- .../applications/audio/famistudio/default.nix | 4 +- .../applications/audio/ft2-clone/default.nix | 17 +- .../applications/audio/furnace/default.nix | 26 +- .../applications/audio/g4music/default.nix | 9 +- .../pkgs/applications/audio/giada/default.nix | 19 +- .../applications/audio/glicol-cli/default.nix | 42 + .../applications/audio/gpodder/default.nix | 5 +- .../applications/audio/gtkcord4/default.nix | 6 +- .../applications/audio/helvum/default.nix | 8 +- .../pkgs/applications/audio/hydrogen/0.nix | 48 - .../applications/audio/hydrogen/default.nix | 4 +- .../audio/infamousPlugins/default.nix | 18 +- .../applications/audio/jacktrip/default.nix | 13 +- .../applications/audio/jamulus/default.nix | 24 +- .../applications/audio/librespot/default.nix | 11 +- .../audio/losslessaudiochecker/default.nix | 2 +- .../audio/lsp-plugins/default.nix | 4 +- .../audio/miniaudicle/default.nix | 18 +- .../pkgs/applications/audio/mixxx/default.nix | 4 +- .../applications/audio/mmlgui/default.nix | 6 +- .../audio/monkeys-audio/default.nix | 11 +- .../applications/audio/mopidy/soundcloud.nix | 9 +- .../pkgs/applications/audio/mopidy/tidal.nix | 2 +- .../applications/audio/mousai/default.nix | 6 +- .../audio/mpd-touch-screen-gui/default.nix | 8 +- .../pkgs/applications/audio/muse/default.nix | 69 +- .../audio/muse/fix-parallel-building.patch | 93 - .../applications/audio/musescore/default.nix | 6 +- .../audio/music-player/default.nix | 6 +- .../applications/audio/musikcube/default.nix | 12 +- .../pkgs/applications/audio/mympd/default.nix | 10 +- .../pkgs/applications/audio/ncmpc/default.nix | 4 +- .../pkgs/applications/audio/noson/default.nix | 8 +- .../applications/audio/nuclear/default.nix | 53 +- .../applications/audio/ocenaudio/default.nix | 4 +- .../audio/open-stage-control/default.nix | 6 +- .../applications/audio/parrot/default.nix | 50 + .../applications/audio/patchance/default.nix | 18 +- .../applications/audio/picard/default.nix | 24 +- .../applications/audio/plexamp/default.nix | 6 +- .../pkgs/applications/audio/praat/default.nix | 4 +- .../applications/audio/pt2-clone/default.nix | 4 +- .../applications/audio/qmidiroute/default.nix | 30 - .../applications/audio/qpwgraph/default.nix | 4 +- .../audio/qtscrobbler/default.nix | 34 - .../applications/audio/quodlibet/default.nix | 68 +- .../applications/audio/raysession/default.nix | 8 +- .../applications/audio/reaper/default.nix | 6 +- .../applications/audio/renoise/default.nix | 2 +- .../audio/schismtracker/default.nix | 18 +- .../applications/audio/scream/default.nix | 1 + .../pkgs/applications/audio/sfizz/default.nix | 2 +- .../pkgs/applications/audio/snd/default.nix | 4 +- .../audio/sony-headphones-client/default.nix | 2 +- .../audio/soundscape-renderer/default.nix | 56 - .../audio/spotify-player/default.nix | 82 +- .../applications/audio/spotify-qt/default.nix | 2 +- .../pkgs/applications/audio/spotify/linux.nix | 6 +- .../audio/squeezelite/default.nix | 6 +- .../applications/audio/squeezelite/update.sh | 2 +- .../applications/audio/strawberry/default.nix | 4 +- .../audio/sublime-music/default.nix | 14 +- .../applications/audio/tageditor/default.nix | 4 +- .../pkgs/applications/audio/tauon/default.nix | 4 +- .../applications/audio/tidal-hifi/default.nix | 4 +- .../applications/audio/transcribe/default.nix | 6 +- .../applications/audio/vcv-rack/default.nix | 32 +- .../applications/audio/yoshimi/default.nix | 4 +- .../audio/youtube-music/default.nix | 11 +- .../applications/backup/ludusavi/default.nix | 8 +- .../backup/pika-backup/default.nix | 6 +- .../applications/blockchains/aeon/default.nix | 1 - .../blockchains/atomic-swap/default.nix | 6 +- .../applications/blockchains/besu/default.nix | 4 +- .../blockchains/bitcoin-abc/default.nix | 1 + .../blockchains/bitcoin/default.nix | 17 +- .../blockchains/btcpayserver/default.nix | 4 +- .../blockchains/btcpayserver/deps.nix | 8 +- .../blockchains/clightning/default.nix | 7 +- .../blockchains/dcrctl/default.nix | 2 +- .../applications/blockchains/dcrd/default.nix | 6 +- .../blockchains/dcrwallet/default.nix | 6 +- .../blockchains/erigon/default.nix | 6 +- .../blockchains/framesh/default.nix | 11 +- .../blockchains/fulcrum/default.nix | 4 +- .../blockchains/go-ethereum/default.nix | 6 +- .../blockchains/haven-cli/default.nix | 1 - .../ledger-live-desktop/default.nix | 6 +- .../blockchains/lightwalletd/default.nix | 4 +- .../applications/blockchains/lnd/default.nix | 6 +- .../blockchains/lndinit/default.nix | 28 + .../blockchains/monero-cli/default.nix | 2 +- .../blockchains/namecoin/default.nix | 9 +- .../blockchains/nbxplorer/default.nix | 4 +- .../blockchains/nbxplorer/deps.nix | 4 +- .../blockchains/optimism/default.nix | 6 +- .../blockchains/optimism/geth.nix | 6 +- .../applications/blockchains/oxen/default.nix | 3 +- .../blockchains/polkadot/Cargo.lock | 9969 ++- .../blockchains/polkadot/default.nix | 58 +- .../blockchains/quorum/default.nix | 40 +- .../blockchains/quorum/go.mod.patch | 12 + .../blockchains/snarkos/default.nix | 6 +- .../blockchains/sparrow/default.nix | 4 +- .../blockchains/stellar-core/default.nix | 4 +- .../blockchains/trezor-suite/default.nix | 2 +- .../blockchains/wasabiwallet/default.nix | 16 +- .../display-managers/greetd/gtkgreet.nix | 4 + .../display-managers/lemurs/default.nix | 13 +- .../lightdm-tiny-greeter/default.nix | 2 +- .../display-managers/sddm/default.nix | 21 +- .../editors/android-studio/default.nix | 12 +- .../editors/aseprite/allegro-glibc-2.30.patch | 8 - .../applications/editors/aseprite/default.nix | 48 +- .../editors/aseprite/shared-libwebp.patch | 47 + .../editors/aseprite/shared-skia-deps.patch | 21 + .../editors/aseprite/skia-deps.nix | 12 +- .../editors/aseprite/skia-make-deps.sh | 2 +- .../applications/editors/aseprite/skia.nix | 31 +- .../applications/editors/atom/default.nix | 96 - .../pkgs/applications/editors/atom/env.nix | 23 - .../applications/editors/bluefish/default.nix | 7 +- .../applications/editors/bluej/default.nix | 27 +- .../applications/editors/bviplus/default.nix | 2 +- .../applications/editors/codux/default.nix | 6 +- .../applications/editors/cudatext/default.nix | 4 +- .../applications/editors/cudatext/deps.json | 24 +- .../pkgs/applications/editors/dit/default.nix | 4 +- .../applications/editors/eclipse/default.nix | 45 +- .../applications/editors/eclipse/plugins.nix | 6 +- .../applications/editors/eclipse/update.sh | 72 + .../applications/editors/emacs/default.nix | 51 +- .../elisp-packages/elpa-devel-generated.nix | 502 +- .../elisp-packages/elpa-devel-packages.nix | 16 + .../emacs/elisp-packages/elpa-generated.nix | 192 +- .../emacs/elisp-packages/elpa-packages.nix | 17 + .../emacs/elisp-packages/manual-packages.nix | 2 + .../manual-packages/control-lock/default.nix | 2 + .../manual-packages/ebuild-mode/default.nix | 26 +- .../manual-packages/mu4e/default.nix | 33 + .../perl-completion/default.nix | 2 + .../emacs/elisp-packages/melpa-packages.nix | 14 + .../emacs/elisp-packages/nongnu-generated.nix | 328 +- .../elisp-packages/recipes-archive-melpa.json | 5810 +- .../applications/editors/emacs/generic.nix | 33 +- .../editors/emacs/macport_noescape_noop.h | 31 + .../applications/editors/emacs/site-start.el | 25 +- .../applications/editors/emacs/sources.nix | 121 +- .../editors/focuswriter/default.nix | 33 +- .../applications/editors/gedit/default.nix | 3 + .../applications/editors/glow/default.nix | 25 +- .../editors/gophernotes/default.nix | 2 +- .../editors/greenfoot/default.nix | 37 +- .../applications/editors/hecate/default.nix | 2 +- .../applications/editors/hexcurse/default.nix | 2 +- .../applications/editors/howl/default.nix | 2 +- .../pkgs/applications/editors/ht/default.nix | 2 +- .../applications/editors/jetbrains/darwin.nix | 3 +- .../editors/jetbrains/default.nix | 61 +- .../applications/editors/jetbrains/linux.nix | 4 + .../editors/jetbrains/plugins/plugins.json | 297 +- .../jetbrains/plugins/specialPlugins.nix | 12 +- .../editors/jetbrains/plugins/tests.nix | 1 + .../jetbrains/plugins/update_plugins.py | 1 + .../editors/jetbrains/versions.json | 336 +- .../jupyter-kernels/clojupyter/default.nix | 7 +- .../editors/jupyter-kernels/iruby/Gemfile | 6 +- .../jupyter-kernels/iruby/Gemfile.lock | 120 +- .../editors/jupyter-kernels/iruby/default.nix | 47 +- .../editors/jupyter-kernels/iruby/gemset.nix | 385 +- .../editors/jupyter-kernels/iruby/update.sh | 18 + .../jupyter-kernels/octave/default.nix | 7 +- .../jupyter-kernels/wolfram/default.nix | 8 +- .../applications/editors/jupyter/console.nix | 37 + .../applications/editors/kakoune/default.nix | 4 +- .../applications/editors/ldtk/default.nix | 4 +- .../editors/leo-editor/default.nix | 6 +- .../pkgs/applications/editors/mg/default.nix | 5 +- .../applications/editors/micro/default.nix | 10 +- .../editors/molsketch/default.nix | 5 +- .../applications/editors/nano/default.nix | 6 +- .../applications/editors/neovim/default.nix | 31 +- .../editors/neovim/neovide/default.nix | 6 +- .../applications/editors/neovim/wrapper.nix | 6 +- .../applications/editors/netbeans/default.nix | 6 +- .../applications/editors/orbiton/default.nix | 4 +- .../pkgs/applications/editors/ox/default.nix | 4 +- .../editors/pixelorama/default.nix | 4 +- .../applications/editors/pulsar/default.nix | 54 +- .../applications/editors/rstudio/default.nix | 64 +- .../rstudio/do-not-install-pandoc.patch | 13 - .../applications/editors/rstudio/package.json | 85 - .../editors/rstudio/pandoc-nix-path.patch | 17 +- .../remove-quarto-from-generator.patch | 32 - .../editors/rstudio/use-system-node.patch | 67 +- .../editors/rstudio/use-system-quarto.patch | 46 + .../applications/editors/rstudio/yarn.lock | 4200 -- .../applications/editors/rstudio/yarndeps.nix | 4829 -- .../applications/editors/setzer/default.nix | 42 +- .../applications/editors/sigil/default.nix | 4 +- .../editors/standardnotes/src.json | 10 +- .../applications/editors/sublime/4/common.nix | 3 +- .../editors/sublime/4/packages.nix | 12 +- .../applications/editors/teehee/default.nix | 27 + .../applications/editors/texmacs/darwin.nix | 60 - .../applications/editors/texmacs/darwin.patch | 29 - .../applications/editors/thonny/default.nix | 4 +- .../pkgs/applications/editors/vim/common.nix | 4 +- .../pkgs/applications/editors/vim/macvim.nix | 2 +- .../editors/vim/plugins/aliases.nix | 1 + .../editors/vim/plugins/build-vim-plugin.nix | 9 +- .../editors/vim/plugins/default.nix | 6 +- .../editors/vim/plugins/generated.nix | 4535 +- .../editors/vim/plugins/get-plugins.nix | 4 +- .../vim/plugins/nvim-treesitter/generated.nix | 486 +- .../vim/plugins/nvim-treesitter/update.py | 28 +- .../editors/vim/plugins/overrides.nix | 97 +- .../fix-nix-store-path-regex.patch | 25 + .../editors/vim/plugins/update-shell.nix | 16 - .../editors/vim/plugins/update.py | 105 +- .../editors/vim/plugins/updater.nix | 47 + .../editors/vim/plugins/vim-clap/default.nix | 2 +- .../editors/vim/plugins/vim-plugin-names | 21 +- .../editors/vim/plugins/vim-utils.nix | 5 +- .../vim/plugins/vim2nix/autoload/nix.vim | 6 +- .../editors/vscode/extensions/default.nix | 98 +- .../applications/editors/vscode/generic.nix | 8 +- .../applications/editors/vscode/vscode.nix | 18 +- .../applications/editors/vscode/vscodium.nix | 14 +- .../applications/emulators/86box/default.nix | 9 +- .../applications/emulators/box64/default.nix | 4 +- .../applications/emulators/cemu/default.nix | 6 +- .../emulators/commanderx16/emulator.nix | 4 +- .../emulators/commanderx16/rom.nix | 4 +- .../emulators/dolphin-emu/default.nix | 31 +- .../dolphin-emu/find-minizip-ng.patch | 13 + .../emulators/dolphin-emu/primehack.nix | 1 + .../duckstation/001-fix-test-inclusion.diff | 11 + .../duckstation/002-hardcode-vars.diff | 19 + .../emulators/duckstation/default.nix | 58 +- .../emulators/dynamips/default.nix | 3 +- .../emulators/fs-uae/launcher.nix | 1 + .../applications/emulators/mame/default.nix | 4 +- .../emulators/openmsx/default.nix | 4 +- .../applications/emulators/pcsx2/default.nix | 12 +- .../applications/emulators/ppsspp/default.nix | 4 +- .../applications/emulators/resim/default.nix | 26 - .../emulators/retroarch/cores.nix | 64 +- .../emulators/retroarch/default.nix | 8 +- .../emulators/retroarch/hashes.json | 235 +- .../retroarch/libretro-core-info.nix | 6 +- .../emulators/retroarch/retroarch-assets.nix | 6 +- .../retroarch/retroarch-joypad-autoconfig.nix | 6 +- .../emulators/retroarch/update_cores.py | 16 +- .../applications/emulators/ripes/default.nix | 11 +- .../emulators/ryujinx/default.nix | 6 +- .../applications/emulators/vbam/default.nix | 5 +- .../applications/emulators/vice/default.nix | 141 +- .../pkgs/applications/emulators/wine/base.nix | 27 +- .../emulators/wine/builder-wow.sh | 4 +- .../wine/darwin-metal-compat-pre8.12.patch | 22 + .../emulators/wine/darwin-metal-compat.patch | 21 +- .../applications/emulators/wine/default.nix | 15 +- .../applications/emulators/wine/sources.nix | 8 +- .../applications/emulators/wine/staging.nix | 2 +- .../applications/emulators/yuzu/generic.nix | 2 +- .../applications/emulators/yuzu/sources.nix | 14 +- .../applications/emulators/yuzu/update.sh | 2 +- .../emulators/yuzu/vulkan_version.patch | 13 - .../file-managers/browsr/default.nix | 6 +- .../file-managers/clifm/default.nix | 4 +- .../file-managers/doublecmd/default.nix | 4 +- .../file-managers/felix-fm/default.nix | 13 +- .../file-managers/joshuto/default.nix | 3 +- .../applications/file-managers/lf/default.nix | 6 +- .../file-managers/llama/default.nix | 22 - .../applications/file-managers/mc/default.nix | 4 +- .../file-managers/nnn/default.nix | 23 +- .../portfolio-filemanager/default.nix | 27 +- .../file-managers/ranger/default.nix | 6 +- .../file-managers/tuifimanager/default.nix | 4 +- .../file-managers/walk/default.nix | 23 + .../file-managers/xplr/default.nix | 34 +- .../file-managers/yazi/default.nix | 6 +- .../file-managers/ytree/default.nix | 4 +- .../finance/cryptowatch/default.nix | 8 +- .../applications/finance/denaro/default.nix | 7 +- .../pkgs/applications/finance/denaro/deps.nix | 47 +- .../applications/finance/odoo/default.nix | 23 +- .../pkgs/applications/finance/odoo/odoo15.nix | 121 + .../pkgs/applications/finance/odoo/update.sh | 6 +- .../pkgs/applications/gis/grass/default.nix | 6 +- .../gis/openorienteering-mapper/default.nix | 7 - .../fix-qttranslations-path.diff | 13 - .../pkgs/applications/gis/qgis/default.nix | 18 +- .../pkgs/applications/gis/qgis/ltr.nix | 18 +- .../gis/qgis/set-pyqt-package-dirs-ltr.patch | 59 + .../gis/qgis/set-pyqt-package-dirs.patch | 4 +- .../pkgs/applications/gis/qgis/test.py | 64 + .../applications/gis/qgis/unwrapped-ltr.nix | 123 +- .../pkgs/applications/gis/qgis/unwrapped.nix | 166 +- .../applications/gis/qmapshack/default.nix | 12 +- .../qmapshack/fix-qttranslations-path.patch | 74 - .../gis/spatialite-tools/default.nix | 4 +- .../graphics/ImageMagick/default.nix | 7 +- .../applications/graphics/animbar/default.nix | 39 - .../applications/graphics/artem/default.nix | 8 +- .../ascii-image-converter/default.nix | 2 +- .../graphics/blockbench-electron/default.nix | 8 +- .../applications/graphics/brlcad/default.nix | 1 - .../applications/graphics/dia/default.nix | 19 +- .../applications/graphics/drawio/default.nix | 10 +- .../applications/graphics/f3d/default.nix | 4 +- .../applications/graphics/fig2dev/default.nix | 4 +- .../graphics/figma-linux/default.nix | 13 +- .../applications/graphics/flaca/Cargo.lock | 192 +- .../applications/graphics/flaca/default.nix | 4 +- .../graphics/fontmatrix/default.nix | 24 +- .../applications/graphics/freecad/default.nix | 25 +- .../applications/graphics/gthumb/default.nix | 23 +- .../graphics/hdrmerge/default.nix | 21 +- .../applications/graphics/hugin/default.nix | 11 +- .../graphics/hydrus/0001-inform-nixpkgs.patch | 18 + .../applications/graphics/hydrus/default.nix | 21 +- .../graphics/inkscape/default.nix | 3 + .../graphics/inkscape/extensions.nix | 6 +- .../applications/graphics/komikku/default.nix | 5 +- .../applications/graphics/krita/generic.nix | 13 +- .../graphics/luminance-hdr/default.nix | 14 +- .../applications/graphics/lutgen/default.nix | 26 + .../graphics/megapixels/default.nix | 4 +- .../graphics/meme-image-generator/default.nix | 4 +- .../applications/graphics/meshlab/default.nix | 4 +- .../applications/graphics/monado/default.nix | 27 +- .../monado/force-enable-steamvr_lh.patch | 12 + .../monado/steamvr_lh-use-old-interface.patch | 13 + .../applications/graphics/mozjpeg/default.nix | 4 +- .../applications/graphics/mypaint/default.nix | 10 +- .../applications/graphics/nomacs/default.nix | 32 +- .../applications/graphics/normcap/default.nix | 52 + .../applications/graphics/nufraw/default.nix | 27 +- .../graphics/nufraw/move-extern-c.patch | 21 - .../graphics/ocrfeeder/default.nix | 20 +- .../applications/graphics/oculante/Cargo.lock | 1774 +- .../graphics/oculante/default.nix | 4 +- .../graphics/panotools/default.nix | 4 +- .../graphics/paraview/default.nix | 1 - .../applications/graphics/pdfcpu/default.nix | 6 +- .../applications/graphics/photoqt/default.nix | 70 +- .../graphics/phototonic/default.nix | 24 +- .../graphics/pick-colour-picker/default.nix | 8 +- .../graphics/pineapple-pictures/default.nix | 18 +- .../graphics/pixinsight/default.nix | 4 +- .../graphics/qscreenshot/default.nix | 37 +- .../graphics/scantailor/default.nix | 26 - .../graphics/structorizer/default.nix | 8 +- .../applications/graphics/upscayl/default.nix | 4 +- .../graphics/viewnior/default.nix | 17 +- .../graphics/vimiv-qt/default.nix | 12 +- .../graphics/vipsdisp/default.nix | 6 +- .../applications/graphics/xfig/default.nix | 7 +- .../graphics/xournalpp/default.nix | 4 +- .../applications/graphics/yed/default.nix | 4 +- .../applications/kde/akonadi-calendar.nix | 4 +- .../pkgs/applications/kde/angelfish.nix | 6 +- .../arianna/default.nix => kde/arianna.nix} | 57 +- .../pkgs/applications/kde/audiotube.nix | 4 + .../nixpkgs/pkgs/applications/kde/cantor.nix | 7 +- .../pkgs/applications/kde/colord-kde.nix | 8 +- .../nixpkgs/pkgs/applications/kde/default.nix | 6 +- .../nixpkgs/pkgs/applications/kde/fetch.sh | 2 +- .../default.nix} | 11 +- .../kdegraphics-thumbnailers/gs-paths.patch | 22 + .../applications/kde/kdenlive/default.nix | 8 +- .../kde/kdenlive/dependency-paths.patch | 46 + .../kde/kdenlive/ffmpeg-path.patch | 25 - .../applications/kde/kdenlive/mlt-path.patch | 22 - .../nixpkgs/pkgs/applications/kde/kfloppy.nix | 20 - .../kde/{kalendar.nix => merkuro.nix} | 11 +- .../nixpkgs/pkgs/applications/kde/neochat.nix | 13 +- .../pkgs/applications/kde/skanlite.nix | 3 +- .../pkgs/applications/kde/skanpage.nix | 6 +- .../pkgs/applications/kde/spectacle.nix | 11 +- .../nixpkgs/pkgs/applications/kde/srcs.nix | 2064 +- .../nixpkgs/pkgs/applications/kde/tokodon.nix | 2 + .../applications/logging/humioctl/default.nix | 6 +- .../nixpkgs/pkgs/applications/maui/booth.nix | 2 + .../pkgs/applications/maui/default.nix | 1 + .../applications/maui/mauikit-documents.nix | 44 + .../nixpkgs/pkgs/applications/maui/shelf.nix | 2 + .../nixpkgs/pkgs/applications/maui/srcs.nix | 176 +- .../misc/1password-gui/default.nix | 20 +- .../applications/misc/1password/default.nix | 16 +- .../misc/ArchiSteamFarm/default.nix | 4 +- .../applications/misc/ArchiSteamFarm/deps.nix | 22 +- .../misc/ArchiSteamFarm/web-ui/default.nix | 6 +- .../misc/HentaiAtHome/default.nix | 5 +- .../pkgs/applications/misc/OSCAR/default.nix | 4 +- .../misc/activate-linux/default.nix | 40 +- .../pkgs/applications/misc/albert/default.nix | 27 +- .../applications/misc/anytype/default.nix | 9 +- .../applications/misc/appcleaner/default.nix | 35 + .../applications/misc/archiver/default.nix | 4 +- .../applications/misc/ausweisapp2/default.nix | 6 + .../pkgs/applications/misc/authy/default.nix | 6 +- .../misc/auto-multiple-choice/default.nix | 7 +- .../misc/azuredatastudio/default.nix | 72 +- .../pkgs/applications/misc/bemenu/default.nix | 13 +- .../applications/misc/birdtray/default.nix | 15 +- .../birdtray/fix-qttranslations-path.diff | 13 - .../misc/bitwarden-menu/default.nix | 2 +- .../applications/misc/blender/default.nix | 54 +- .../applications/misc/bottles/default.nix | 4 +- .../pkgs/applications/misc/bottles/fhsenv.nix | 20 +- .../applications/misc/calibre/default.nix | 13 +- .../applications/misc/cambrinary/default.nix | 7 +- .../misc/camunda-modeler/default.nix | 71 + .../applications/misc/cartridges/default.nix | 4 +- .../applications/misc/chatblade/default.nix | 4 +- .../pkgs/applications/misc/cheat/default.nix | 2 +- .../applications/misc/cherrytree/default.nix | 4 +- .../applications/misc/chrysalis/default.nix | 41 +- .../0001-Poetry-core-and-pillow-9.patch | 32 - .../pkgs/applications/misc/cobang/default.nix | 46 +- .../applications/misc/cointop/default.nix | 2 +- .../pkgs/applications/misc/conceal/Cargo.lock | 537 +- .../applications/misc/conceal/default.nix | 16 +- .../pkgs/applications/misc/copyq/default.nix | 6 +- .../applications/misc/coursera-dl/default.nix | 12 +- .../misc/crow-translate/default.nix | 10 - .../fix-qttranslations-path.patch | 13 - .../cubocore-packages/coreaction/default.nix | 4 +- .../corearchiver/default.nix | 4 +- .../misc/cubocore-packages/corefm/default.nix | 4 +- .../cubocore-packages/coregarage/default.nix | 4 +- .../cubocore-packages/corehunt/default.nix | 4 +- .../cubocore-packages/coreimage/default.nix | 4 +- .../cubocore-packages/coreinfo/default.nix | 4 +- .../corekeyboard/default.nix | 4 +- .../cubocore-packages/corepad/default.nix | 4 +- .../cubocore-packages/corepaint/default.nix | 4 +- .../cubocore-packages/corepdf/default.nix | 4 +- .../cubocore-packages/corepins/default.nix | 4 +- .../cubocore-packages/corerenamer/default.nix | 4 +- .../cubocore-packages/coreshot/default.nix | 4 +- .../cubocore-packages/corestats/default.nix | 4 +- .../cubocore-packages/corestuff/default.nix | 4 +- .../coreterminal/default.nix | 4 +- .../cubocore-packages/coretime/default.nix | 4 +- .../coretoppings/default.nix | 4 +- .../coreuniverse/default.nix | 4 +- .../libcprime/0001-fix-application-dirs.patch | 14 +- .../cubocore-packages/libcprime/default.nix | 4 +- .../cubocore-packages/libcsys/default.nix | 4 +- .../applications/misc/darkman/default.nix | 2 +- .../pkgs/applications/misc/dasel/default.nix | 6 +- .../applications/misc/dbeaver/default.nix | 6 +- .../deadd-notification-center/default.nix | 4 +- .../applications/misc/dict-cc-py/default.nix | 32 + ...-32491+CVE-2021-32492+CVE-2021-32493.patch | 105 + .../applications/misc/djvulibre/default.nix | 12 +- .../pkgs/applications/misc/dmenu/wayland.nix | 14 +- .../pkgs/applications/misc/dstask/default.nix | 4 +- .../pkgs/applications/misc/edgetx/default.nix | 7 +- .../applications/misc/etesync-dav/default.nix | 11 + .../applications/misc/expenses/default.nix | 2 +- .../applications/misc/faircamp/default.nix | 4 + .../misc/firefly-desktop/default.nix | 4 +- .../applications/misc/flashprint/default.nix | 38 + .../pkgs/applications/misc/fluidd/default.nix | 4 +- .../misc/font-manager/default.nix | 13 +- .../pkgs/applications/misc/free42/default.nix | 4 +- .../applications/misc/gallery-dl/default.nix | 5 +- .../applications/misc/get_iplayer/default.nix | 10 +- .../applications/misc/ghosttohugo/default.nix | 25 + .../applications/misc/gmnitohtml/default.nix | 2 +- .../applications/misc/gnome-frog/default.nix | 12 +- .../applications/misc/go-jira/default.nix | 2 +- .../misc/go-thumbnailer/default.nix | 40 - .../misc/go-thumbnailer/go.thumbnailer | 3 - .../misc/golden-cheetah-bin/default.nix | 21 +- .../misc/golden-cheetah/default.nix | 16 +- .../misc/goldendict-ng/default.nix | 9 +- .../applications/misc/goldendict/default.nix | 3 +- .../applications/misc/gopacked/default.nix | 4 +- .../applications/misc/gpsbabel/default.nix | 7 +- .../misc/gpscorrelate/default.nix | 10 +- .../applications/misc/gpsprune/default.nix | 7 +- .../applications/misc/gpx-viewer/default.nix | 55 +- .../pkgs/applications/misc/gpxlab/default.nix | 10 +- .../misc/gpxlab/fix-qttranslations-path.patch | 17 - .../pkgs/applications/misc/gpxsee/default.nix | 45 +- .../misc/gpxsee/fix-qttranslations-path.diff | 18 - .../applications/misc/gradience/default.nix | 2 + .../misc/gremlin-console/default.nix | 4 +- .../misc/gremlin-server/default.nix | 4 +- .../pkgs/applications/misc/grsync/default.nix | 4 +- .../pkgs/applications/misc/gsctl/default.nix | 2 +- .../pkgs/applications/misc/gum/default.nix | 1 + .../pkgs/applications/misc/harsh/default.nix | 26 + .../applications/misc/hivemind/default.nix | 5 +- .../misc/holochain-launcher/default.nix | 18 +- .../pkgs/applications/misc/huggle/default.nix | 3 +- .../pkgs/applications/misc/hugo/default.nix | 6 +- .../hyprland-autoname-workspaces/default.nix | 8 +- .../applications/misc/hyprnome/default.nix | 41 + .../pkgs/applications/misc/iptsd/default.nix | 4 +- .../misc/jetbrains-toolbox/default.nix | 4 +- .../misc/joplin-desktop/default.nix | 25 +- .../pkgs/applications/misc/josm/default.nix | 6 +- .../applications/misc/jotta-cli/default.nix | 4 +- .../pkgs/applications/misc/jquake/default.nix | 4 +- .../pkgs/applications/misc/jrnl/default.nix | 17 +- .../misc/kaufkauflist/default.nix | 23 +- .../applications/misc/keepass/default.nix | 4 +- .../applications/misc/keepass/fix-paths.patch | 63 +- .../applications/misc/keepassxc/default.nix | 6 +- .../applications/misc/keyleds/default.nix | 4 +- .../pkgs/applications/misc/khard/default.nix | 10 +- .../pkgs/applications/misc/kile-wl/Cargo.lock | 295 + .../applications/misc/kile-wl/default.nix | 22 +- .../pkgs/applications/misc/kiln/default.nix | 2 +- .../pkgs/applications/misc/kiwix/lib.nix | 4 +- .../applications/misc/klayout/default.nix | 4 +- .../applications/misc/konsave/default.nix | 27 + .../pkgs/applications/misc/kratos/default.nix | 6 +- .../pkgs/applications/misc/kuro/default.nix | 10 +- .../pkgs/applications/misc/kuro/yarn.lock | 5757 -- .../pkgs/applications/misc/kuro/yarn.nix | 6485 -- .../applications/misc/lemonade/default.nix | 2 +- .../applications/misc/limesctl/default.nix | 6 +- .../pkgs/applications/misc/logseq/default.nix | 4 +- .../applications/misc/lunatask/default.nix | 12 +- .../pkgs/applications/misc/lutris/fhsenv.nix | 5 +- .../applications/misc/madonctl/default.nix | 2 +- .../applications/misc/mainsail/default.nix | 4 +- .../pkgs/applications/misc/mangal/default.nix | 2 +- .../applications/misc/markmind/default.nix | 48 - .../misc/matcha-rss-digest/default.nix | 27 + .../misc/mediainfo-gui/default.nix | 6 +- .../applications/misc/mediainfo/default.nix | 6 +- .../applications/misc/merkaartor/default.nix | 2 - .../misc/metadata-cleaner/default.nix | 4 +- .../pkgs/applications/misc/minder/default.nix | 4 +- .../misc/mission-center/Cargo.lock | 381 +- .../misc/mission-center/default.nix | 18 +- .../misc/mission-center/gatherer-Cargo.lock | 658 + .../pkgs/applications/misc/mkgmap/default.nix | 4 +- .../pkgs/applications/misc/mob/default.nix | 4 +- .../applications/misc/moolticute/default.nix | 4 +- .../misc/moonlight-embedded/default.nix | 4 +- .../pkgs/applications/misc/mop/default.nix | 2 +- ...0001-Use-command-v-in-favor-of-which.patch | 26 +- .../pkgs/applications/misc/mupdf/default.nix | 23 +- .../applications/misc/navipowm/default.nix | 32 - .../pkgs/applications/misc/nimbo/default.nix | 11 +- .../pkgs/applications/misc/nut/default.nix | 4 + .../applications/misc/nwg-bar/default.nix | 13 +- .../misc/nwg-dock-hyprland/default.nix | 6 +- .../applications/misc/nwg-dock/default.nix | 6 +- .../applications/misc/nwg-drawer/default.nix | 7 +- .../applications/misc/nwg-look/default.nix | 72 + .../misc/nwg-look/fix-paths.patch | 35 + .../pkgs/applications/misc/nwg-look/go.mod | 10 + .../applications/misc/nwg-menu/default.nix | 2 +- .../applications/misc/nwg-panel/default.nix | 4 +- .../applications/misc/obsidian/default.nix | 8 +- .../applications/misc/octoprint/default.nix | 2 +- .../nixpkgs/pkgs/applications/misc/omegat.nix | 6 +- .../misc/openrgb-plugins/effects/default.nix | 13 +- .../openrgb-plugins/hardwaresync/default.nix | 18 +- .../applications/misc/openrgb/default.nix | 4 +- .../applications/misc/openring/default.nix | 2 +- .../applications/misc/opentrack/default.nix | 1 - .../pkgs/applications/misc/opentx/default.nix | 7 +- .../pkgs/applications/misc/oranda/default.nix | 18 +- .../applications/misc/oranda/tailwind.patch | 52 - .../applications/misc/organicmaps/default.nix | 21 +- .../applications/misc/osmium-tool/default.nix | 4 +- .../applications/misc/owmods-cli/Cargo.lock | 475 +- .../applications/misc/owmods-cli/default.nix | 4 +- .../applications/misc/owmods-cli/update.sh | 38 + .../pkgs/applications/misc/oxker/default.nix | 6 +- .../pkgs/applications/misc/p2pool/default.nix | 4 +- .../applications/misc/pagefind/default.nix | 110 + .../pkgs/applications/misc/parsec/bin.nix | 39 +- .../misc/passky-desktop/default.nix | 107 +- .../applications/misc/perkeep/default.nix | 13 +- ...dle-outputs-that-arent-in-the-layout.patch | 14 - .../pkgs/applications/misc/phoc/default.nix | 45 +- .../applications/misc/pomotroid/default.nix | 60 - .../pkgs/applications/misc/pot/Cargo.lock | 2195 +- .../pkgs/applications/misc/pot/default.nix | 23 +- .../applications/misc/privacyidea/default.nix | 18 +- .../misc/process-compose/default.nix | 4 +- .../applications/misc/protonup-qt/default.nix | 4 +- .../misc/prusa-slicer/default.nix | 12 +- .../applications/misc/pysentation/default.nix | 39 + .../pkgs/applications/misc/qcad/default.nix | 4 +- .../pkgs/applications/misc/qmetro/default.nix | 31 - .../misc/remarkable/rmapi/default.nix | 2 +- .../applications/misc/remnote/default.nix | 45 +- .../applications/misc/rescuetime/default.nix | 2 +- .../applications/misc/resp-app/default.nix | 2 +- .../pkgs/applications/misc/retool/default.nix | 59 + .../applications/misc/rlaunch/default.nix | 15 +- .../misc/rust-traverse/default.nix | 47 + .../applications/misc/safecloset/default.nix | 41 + .../applications/misc/sampler/default.nix | 8 +- .../pkgs/applications/misc/semver/default.nix | 2 +- .../pkgs/applications/misc/senv/default.nix | 2 +- .../applications/misc/sidequest/default.nix | 69 +- .../applications/misc/simplenote/default.nix | 25 +- .../pkgs/applications/misc/sioyek/default.nix | 10 + .../applications/misc/skytemple/default.nix | 4 +- .../pkgs/applications/misc/slides/default.nix | 2 +- .../pkgs/applications/misc/slweb/default.nix | 18 +- .../misc/smb3-foundry/default.nix | 13 +- .../misc/smb3-foundry/fix-relative-dirs.patch | 34 - .../applications/misc/snagboot/default.nix | 30 +- .../misc/snapmaker-luban/default.nix | 10 +- .../misc/spicetify-cli/default.nix | 6 +- .../applications/misc/sqliteman/default.nix | 34 - .../pkgs/applications/misc/sqls/default.nix | 2 +- .../applications/misc/stepreduce/default.nix | 31 + .../pkgs/applications/misc/stog/default.nix | 9 +- .../misc/streamdeck-ui/default.nix | 77 +- .../misc/streamdeck-ui/update-pillow.patch | 13 + .../applications/misc/sunwait/default.nix | 19 +- .../misc/sway-launcher-desktop/default.nix | 4 +- .../001-backport-pr296.patch | 50 + .../misc/swaynotificationcenter/default.nix | 6 + .../misc/syncthingtray/default.nix | 33 +- .../applications/misc/tabula-java/default.nix | 36 +- .../misc/tandoor-recipes/common.nix | 6 +- .../applications/misc/tasktimer/default.nix | 2 +- .../misc/taskwarrior-tui/default.nix | 6 +- .../misc/teleprompter/default.nix | 4 +- .../applications/misc/tellico/default.nix | 5 - .../misc/terminal-notifier/default.nix | 2 +- .../misc/terminal-parrot/default.nix | 4 +- .../misc/terminal-typeracer/default.nix | 16 +- .../misc/timew-sync-server/default.nix | 4 +- .../applications/misc/timewarrior/default.nix | 4 +- .../applications/misc/tomato-c/default.nix | 67 + .../pkgs/applications/misc/toot/default.nix | 4 +- .../misc/translatelocally/default.nix | 62 + .../version_without_git.patch | 66 + .../pkgs/applications/misc/tsukae/default.nix | 2 +- .../pkgs/applications/misc/ttdl/default.nix | 6 +- .../applications/misc/tty-share/default.nix | 2 +- .../pkgs/applications/misc/ttyper/default.nix | 6 +- .../pkgs/applications/misc/tuba/default.nix | 2 + .../applications/misc/tui-journal/default.nix | 6 +- .../applications/misc/tvbrowser/default.nix | 1 + .../pkgs/applications/misc/ubpm/default.nix | 5 +- .../applications/misc/udiskie/default.nix | 8 +- .../applications/misc/ultralist/default.nix | 2 +- .../pkgs/applications/misc/uni/default.nix | 18 +- .../pkgs/applications/misc/usql/default.nix | 12 +- .../pkgs/applications/misc/valent/default.nix | 6 +- .../applications/misc/valentina/default.nix | 17 +- .../valentina/fix-qttranslations-path.patch | 37 - .../applications/misc/wallust/default.nix | 11 +- .../applications/misc/watchmate/Cargo.lock | 91 +- .../applications/misc/watchmate/default.nix | 4 +- .../pkgs/applications/misc/waybar/default.nix | 3 +- .../applications/misc/waylock/default.nix | 1 + .../applications/misc/waypaper/default.nix | 11 +- .../applications/misc/whalebird/default.nix | 4 +- .../applications/misc/wofi-emoji/default.nix | 13 +- .../applications/misc/workrave/default.nix | 4 +- .../applications/misc/writefreely/default.nix | 2 +- .../applications/misc/wttrbar/default.nix | 6 +- .../pkgs/applications/misc/xchm/default.nix | 4 +- .../applications/misc/xlights/default.nix | 19 + .../pkgs/applications/misc/xmrig/default.nix | 3 + .../applications/misc/xmrig/moneroocean.nix | 4 +- .../misc/yambar-hyprland-wses/default.nix | 27 + .../pkgs/applications/misc/yate/default.nix | 4 +- .../pkgs/applications/misc/ydict/default.nix | 2 +- .../applications/misc/yewtube/default.nix | 4 +- .../misc/yubioath-flutter/default.nix | 21 +- .../misc/yubioath-flutter/deps.json | 309 +- .../misc/yubioath-flutter/pubspec.lock | 997 + .../misc/zathura/pdf-mupdf/default.nix | 2 +- .../misc/zathura/pdf-poppler/default.nix | 2 +- .../applications/misc/zathura/ps/default.nix | 2 +- .../pkgs/applications/misc/zola/default.nix | 9 + .../networking/alpnpass/default.nix | 2 +- .../networking/appgate-sdp/default.nix | 4 +- .../networking/avalanchego/default.nix | 8 +- .../pkgs/applications/networking/bee/bee.nix | 8 +- .../networking/blocky/default.nix | 6 +- .../networking/breitbandmessung/default.nix | 4 +- .../applications/networking/brig/default.nix | 2 +- .../networking/browsers/amfora/default.nix | 2 +- .../browsers/bombadillo/default.nix | 2 +- .../networking/browsers/brave/default.nix | 7 +- .../networking/browsers/chromium/common.nix | 23 +- .../networking/browsers/chromium/default.nix | 10 +- .../browsers/chromium/ungoogled-flags.toml | 1 - .../browsers/chromium/upstream-info.nix | 60 +- .../browsers/firefox-bin/beta_sources.nix | 820 +- .../browsers/firefox-bin/default.nix | 192 +- .../firefox-bin/devedition_sources.nix | 810 +- .../browsers/firefox-bin/release_sources.nix | 810 +- .../networking/browsers/firefox/common.nix | 2 +- .../networking/browsers/firefox/packages.nix | 45 +- .../networking/browsers/firefox/wrapper.nix | 7 +- .../networking/browsers/lagrange/default.nix | 4 +- .../browsers/librewolf/librewolf.nix | 4 +- .../networking/browsers/librewolf/src.json | 14 +- .../networking/browsers/librewolf/src.nix | 8 +- .../networking/browsers/librewolf/update.nix | 9 + .../networking/browsers/lynx/default.nix | 1 + .../browsers/microsoft-edge/browser.nix | 7 +- .../browsers/microsoft-edge/default.nix | 12 +- .../browsers/microsoft-edge/update.py | 5 +- .../browsers/mullvad-browser/default.nix | 10 +- .../networking/browsers/nyxt/default.nix | 5 +- .../networking/browsers/offpunk/default.nix | 4 +- .../networking/browsers/palemoon/bin.nix | 20 +- .../networking/browsers/polypane/default.nix | 4 +- .../default.nix | 31 +- .../update.nix | 0 .../networking/browsers/vieb/default.nix | 6 +- .../networking/browsers/vivaldi/default.nix | 10 +- .../networking/browsers/w3m/default.nix | 2 +- .../applications/networking/calls/default.nix | 4 +- .../networking/cawbird/default.nix | 88 - .../networking/charles/default.nix | 6 +- .../networking/clash-verge/default.nix | 4 +- .../networking/cloudflared/default.nix | 6 +- .../networking/cluster/acorn/default.nix | 6 +- .../cluster/argo-rollouts/default.nix | 6 +- .../cluster/argocd-autopilot/default.nix | 6 +- .../networking/cluster/argocd/default.nix | 6 +- .../networking/cluster/arkade/default.nix | 6 +- .../cluster/assign-lb-ip/default.nix | 2 +- .../networking/cluster/atmos/default.nix | 2 +- .../networking/cluster/calico/default.nix | 6 +- .../networking/cluster/cilium/default.nix | 8 +- .../networking/cluster/civo/default.nix | 6 +- .../cluster/cloudfoundry-cli/default.nix | 6 +- .../networking/cluster/clusterctl/default.nix | 6 +- .../networking/cluster/cmctl/default.nix | 31 +- .../networking/cluster/cmctl/update.sh | 41 - .../networking/cluster/cni/default.nix | 2 +- .../networking/cluster/cni/plugins.nix | 2 +- .../cluster/dnsname-cni/default.nix | 2 +- .../networking/cluster/fetchit/default.nix | 2 +- .../networking/cluster/fluxcd/default.nix | 8 +- .../networking/cluster/fluxcd/update.sh | 11 +- .../networking/cluster/fluxctl/default.nix | 2 +- .../networking/cluster/gatekeeper/default.nix | 4 +- .../networking/cluster/glooctl/default.nix | 31 +- .../networking/cluster/habitat/Cargo.lock | 1544 +- .../networking/cluster/habitat/default.nix | 8 +- .../networking/cluster/hashi-up/default.nix | 2 +- .../networking/cluster/helm-docs/default.nix | 6 +- .../networking/cluster/helm/default.nix | 6 +- .../cluster/helm/plugins/helm-cm-push.nix | 6 +- .../cluster/helm/plugins/helm-s3.nix | 6 +- .../cluster/helm/plugins/helm-secrets.nix | 4 +- .../networking/cluster/helmfile/default.nix | 6 +- .../networking/cluster/jx/default.nix | 2 +- .../networking/cluster/k0sctl/default.nix | 2 +- .../networking/cluster/k3d/default.nix | 4 +- .../networking/cluster/k3s/1_24/default.nix | 12 +- .../networking/cluster/k3s/1_25/default.nix | 12 +- .../networking/cluster/k3s/1_26/versions.nix | 2 +- .../networking/cluster/k3s/1_27/versions.nix | 16 +- .../networking/cluster/k3s/README.md | 2 +- .../networking/cluster/k3s/builder.nix | 12 +- .../networking/cluster/k3s/update-script.sh | 10 +- .../networking/cluster/k3sup/default.nix | 6 +- .../networking/cluster/k8sgpt/default.nix | 6 +- .../networking/cluster/kaniko/default.nix | 4 +- .../networking/cluster/karmor/default.nix | 8 +- .../networking/cluster/kconf/default.nix | 2 +- .../networking/cluster/kn/default.nix | 4 +- .../networking/cluster/kns/default.nix | 38 + .../networking/cluster/kops/default.nix | 20 +- .../networking/cluster/krane/Gemfile.lock | 35 +- .../networking/cluster/krane/gemset.nix | 72 +- .../networking/cluster/krelay/default.nix | 6 +- .../networking/cluster/ktunnel/default.nix | 4 +- .../cluster/kubebuilder/default.nix | 6 +- .../networking/cluster/kubecfg/default.nix | 8 +- .../networking/cluster/kubecolor/default.nix | 2 +- .../cluster/kubectl-doctor/default.nix | 2 +- .../cluster/kubectl-evict-pod/default.nix | 2 +- .../cluster/kubectl-gadget/default.nix | 6 +- .../cluster/kubectl-klock/default.nix | 10 +- .../cluster/kubectl-ktop/default.nix | 2 +- .../cluster/kubectl-node-shell/default.nix | 4 +- .../cluster/kubectl-tree/default.nix | 2 +- .../networking/cluster/kubedb-cli/default.nix | 4 +- .../networking/cluster/kubefirst/default.nix | 6 +- .../networking/cluster/kubelogin/default.nix | 6 +- .../networking/cluster/kubent/default.nix | 2 +- .../networking/cluster/kubeone/default.nix | 6 +- .../networking/cluster/kubernetes/default.nix | 4 +- .../networking/cluster/kubeseal/default.nix | 6 +- .../networking/cluster/kubeshark/default.nix | 6 +- .../networking/cluster/kubeval/default.nix | 2 +- .../networking/cluster/kubevpn/default.nix | 6 +- .../networking/cluster/kuma/default.nix | 16 +- .../networking/cluster/levant/default.nix | 2 +- .../networking/cluster/linkerd/default.nix | 6 +- .../networking/cluster/linkerd/edge.nix | 6 +- .../networking/cluster/linkerd/generic.nix | 4 +- .../networking/cluster/linkerd/update-edge.sh | 10 +- .../cluster/linkerd/update-stable.sh | 10 +- .../networking/cluster/luigi/default.nix | 6 +- .../networking/cluster/minikube/default.nix | 6 +- .../networking/cluster/multus-cni/default.nix | 18 +- .../networking/cluster/nerdctl/default.nix | 6 +- .../networking/cluster/nixops/default.nix | 15 +- .../cluster/node-problem-detector/default.nix | 4 +- .../cluster/nomad-autoscaler/default.nix | 2 +- .../cluster/nomad-driver-podman/default.nix | 6 +- .../networking/cluster/nomad-pack/default.nix | 2 +- .../networking/cluster/nomad/default.nix | 43 +- .../networking/cluster/ocm/default.nix | 6 +- .../networking/cluster/octant/default.nix | 67 - .../networking/cluster/octant/desktop.nix | 77 - .../plugins/starboard-octant-plugin.nix | 31 - .../cluster/octant/update-desktop.sh | 36 - .../networking/cluster/octant/update.sh | 40 - .../networking/cluster/odo/default.nix | 4 +- .../networking/cluster/opentofu/default.nix | 180 + .../cluster/opentofu/provider-path-0_15.patch | 23 + .../networking/cluster/pachyderm/default.nix | 4 +- .../networking/cluster/pinniped/default.nix | 6 +- .../networking/cluster/pluto/default.nix | 8 +- .../networking/cluster/prow/default.nix | 4 +- .../networking/cluster/pv-migrate/default.nix | 6 +- .../networking/cluster/qbec/default.nix | 2 +- .../networking/cluster/rancher/default.nix | 6 +- .../networking/cluster/rke/default.nix | 6 +- .../networking/cluster/rke2/default.nix | 10 +- .../networking/cluster/roxctl/default.nix | 6 +- .../networking/cluster/sonobuoy/default.nix | 2 +- .../networking/cluster/ssm-agent/default.nix | 74 +- .../networking/cluster/starboard/default.nix | 6 +- .../networking/cluster/stern/default.nix | 6 +- .../networking/cluster/talosctl/default.nix | 6 +- .../cluster/tektoncd-cli/default.nix | 4 +- .../cluster/temporal-cli/default.nix | 5 +- .../networking/cluster/temporal/default.nix | 6 +- .../cluster/temporalite/default.nix | 2 +- .../cluster/terraform-compliance/default.nix | 10 +- .../cluster/terraform-docs/default.nix | 2 +- .../cluster/terraform-inventory/default.nix | 2 +- .../terraform-providers/providers.json | 169 +- .../networking/cluster/terraform/default.nix | 12 +- .../networking/cluster/terragrunt/default.nix | 10 +- .../cluster/tf-summarize/default.nix | 6 +- .../networking/cluster/tfautomv/default.nix | 4 +- .../networking/cluster/tfupdate/default.nix | 6 +- .../networking/cluster/tgswitch/default.nix | 2 +- .../networking/cluster/tilt/default.nix | 4 +- .../networking/cluster/timoni/default.nix | 12 +- .../networking/cluster/timoni/update.sh | 45 + .../networking/cluster/vcluster/default.nix | 4 +- .../cluster/weave-gitops/default.nix | 6 +- .../networking/cluster/werf/default.nix | 6 +- .../networking/cluster/yor/default.nix | 4 +- .../networking/cluster/zarf/default.nix | 6 +- .../applications/networking/deck/default.nix | 14 +- .../networking/discordo/default.nix | 8 +- .../networking/dnscontrol/default.nix | 9 +- .../applications/networking/drive/default.nix | 2 +- .../networking/dyndns/cfdyndns/Cargo.lock | 2044 + .../networking/dyndns/cfdyndns/default.nix | 14 +- .../networking/errbot/default.nix | 35 +- .../feedreaders/castget/default.nix | 6 +- .../feedreaders/newsboat/default.nix | 14 +- .../networking/feedreaders/photon/default.nix | 2 +- .../feedreaders/rssguard/default.nix | 4 +- .../networking/feedreaders/yarr/default.nix | 6 +- .../networking/flexget/default.nix | 27 +- .../networking/freefilesync/default.nix | 10 +- .../networking/gmailctl/default.nix | 2 +- .../applications/networking/gnmic/default.nix | 6 +- .../gnome-network-displays/default.nix | 6 +- .../applications/networking/gns3/default.nix | 16 +- .../pkgs/applications/networking/gns3/gui.nix | 24 +- .../applications/networking/gns3/server.nix | 38 +- .../networking/gopher/sacc/default.nix | 2 +- .../networking/hyprspace/default.nix | 2 +- .../instant-messengers/abaddon/default.nix | 12 +- .../instant-messengers/alfaview/default.nix | 4 +- .../instant-messengers/armcord/default.nix | 12 +- .../instant-messengers/beeper/default.nix | 59 + .../caprine-bin/build-from-appimage.nix | 1 - .../caprine-bin/build-from-dmg.nix | 1 - .../caprine-bin/default.nix | 6 +- .../chatterino2/default.nix | 4 +- .../cinny-desktop/default.nix | 69 +- .../instant-messengers/cinny/default.nix | 26 +- .../instant-messengers/cordless/default.nix | 4 +- .../deltachat-desktop/default.nix | 10 +- .../instant-messengers/discord/darwin.nix | 17 +- .../instant-messengers/discord/default.nix | 32 +- .../instant-messengers/discord/openasar.nix | 4 +- .../element/element-desktop.nix | 3 +- .../instant-messengers/element/pin.nix | 10 +- .../instant-messengers/feishu/default.nix | 6 +- .../flare-signal/Cargo.lock | 1127 +- .../flare-signal/default.nix | 13 +- .../instant-messengers/fluffychat/default.nix | 25 +- .../instant-messengers/fluffychat/deps.json | 885 +- .../instant-messengers/gajim/default.nix | 4 +- .../instant-messengers/gitter/default.nix | 102 - .../instant-messengers/go-neb/default.nix | 2 +- .../instant-messengers/gomuks/default.nix | 2 +- .../instant-messengers/jackline/default.nix | 9 +- .../instant-messengers/linphone/default.nix | 4 +- .../matrix-commander/default.nix | 6 +- .../mattermost-desktop/default.nix | 51 +- .../instant-messengers/mm/default.nix | 2 +- .../instant-messengers/nchat/default.nix | 4 +- .../instant-messengers/neosay/default.nix | 27 + .../instant-messengers/nheko/default.nix | 17 + .../instant-messengers/qq/default.nix | 8 +- .../instant-messengers/qtox/default.nix | 2 - .../instant-messengers/quaternion/default.nix | 2 +- .../rocketchat-desktop/default.nix | 4 +- .../session-desktop/default.nix | 4 +- .../instant-messengers/signal-cli/default.nix | 5 +- .../signal-desktop/default.nix | 8 +- .../signal-desktop/generic.nix | 5 +- .../signalbackup-tools/default.nix | 4 +- .../skypeforlinux/default.nix | 4 +- .../instant-messengers/slack-term/default.nix | 2 +- .../instant-messengers/slack/default.nix | 19 +- .../instant-messengers/slack/update.sh | 6 - .../instant-messengers/ssh-chat/default.nix | 4 +- .../teams-for-linux/default.nix | 22 +- .../instant-messengers/teams/default.nix | 123 +- .../instant-messengers/teamspeak/client.nix | 4 +- .../telegram/telegram-desktop/tg_owt.nix | 6 +- .../instant-messengers/tensor/default.nix | 2 +- .../instant-messengers/twitch-tui/default.nix | 1 + .../instant-messengers/webcord/default.nix | 11 +- .../webcord/webcord-vencord/default.nix | 11 +- .../instant-messengers/webex/default.nix | 6 +- .../wire-desktop/default.nix | 24 +- .../instant-messengers/zoom-us/default.nix | 12 +- .../instant-messengers/zulip/default.nix | 6 +- .../networking/insync/default.nix | 67 +- .../networking/ipfs-upload-client/default.nix | 6 +- .../networking/irc/catgirl/default.nix | 1 + .../networking/irc/halloy/Cargo.lock | 236 +- .../networking/irc/halloy/default.nix | 31 +- .../networking/irc/irssi/default.nix | 4 +- .../networking/irc/senpai/default.nix | 2 +- .../networking/irc/weechat/default.nix | 4 +- .../irc/weechat/scripts/wee-slack/default.nix | 4 +- .../applications/networking/juju/default.nix | 6 +- .../networking/ktailctl/default.nix | 83 + .../kubo-migrator/all-migrations.nix | 6 +- .../networking/kubo-migrator/unwrapped.nix | 6 +- .../applications/networking/kubo/default.nix | 10 +- .../networking/libcoap/default.nix | 4 +- .../networking/localproxy/default.nix | 33 +- .../networking/localsend/default.nix | 14 +- .../networking/localsend/update.sh | 25 + .../networking/mailreaders/aerc/default.nix | 9 +- .../mailreaders/betterbird/default.nix | 9 +- .../mailreaders/hasmail/default.nix | 4 +- .../networking/mailreaders/imapfilter.nix | 6 +- .../mailreaders/mailspring/default.nix | 1 + .../networking/mailreaders/meli/default.nix | 79 + .../mailreaders/mswatch/default.nix | 4 +- .../networking/mailreaders/mutt/default.nix | 5 +- .../mailreaders/neomutt/default.nix | 10 +- .../mailreaders/notmuch/default.nix | 14 +- .../mailreaders/thunderbird-bin/default.nix | 1 + .../thunderbird-bin/release_sources.nix | 530 +- .../mailreaders/thunderbird/packages.nix | 9 +- .../mailreaders/trojita/default.nix | 8 - .../trojita/fix-qttranslations-path.patch | 13 - .../mailreaders/tutanota-desktop/default.nix | 6 +- .../networking/misc/zammad/default.nix | 8 +- .../networking/misc/zammad/yarn.lock | 10810 --- .../networking/misc/zammad/yarn.nix | 11446 ---- .../applications/networking/mullvad/libwg.nix | 3 +- .../networking/n8n/node-packages.nix | 3047 +- .../networking/netmaker/default.nix | 8 +- .../newsreaders/liferea/default.nix | 4 +- .../networking/nextcloud-client/default.nix | 7 +- .../networking/nextdns/default.nix | 6 +- .../networking/ostinato/default.nix | 4 +- .../networking/p2p/lokinet/default.nix | 11 +- .../networking/p2p/magnetico/default.nix | 2 +- .../networking/p2p/pyrosimple/default.nix | 4 +- .../networking/p2p/qbittorrent/default.nix | 6 +- .../networking/p2p/soulseekqt/default.nix | 12 +- .../p2p/transmission-remote-gtk/default.nix | 59 +- .../networking/p2p/transmission/4.nix | 22 +- .../networking/p2p/transmission/default.nix | 12 +- .../networking/p2p/tremc/default.nix | 13 +- .../networking/pcloud/default.nix | 7 +- .../networking/peroxide/default.nix | 2 +- .../networking/powerdns-admin/default.nix | 11 +- .../powerdns-admin/update-asset-deps.sh | 20 - .../networking/powerdns-admin/yarndeps.nix | 1701 - .../networking/protonmail-bridge/default.nix | 6 +- .../networking/qv2ray/default.nix | 1 - .../networking/r53-ddns/default.nix | 2 +- .../networking/remote/anydesk/default.nix | 4 +- .../remote/citrix-workspace/generic.nix | 2 +- .../networking/remote/freerdp/default.nix | 4 +- .../networking/remote/remmina/default.nix | 14 +- .../networking/remote/rustdesk/Cargo.lock | 4324 +- .../networking/remote/rustdesk/cargo.patch | 13 - .../networking/remote/rustdesk/default.nix | 184 +- .../remote/rustdesk/fix-for-rust-1.65.diff | 31 - .../networking/remote/wayvnc/default.nix | 4 +- .../networking/remote/xrdp/default.nix | 30 +- .../networking/rymdport/default.nix | 6 +- .../networking/scaleft/default.nix | 12 +- .../networking/seahub/default.nix | 11 +- .../networking/shellhub-agent/default.nix | 6 +- .../networking/sniffers/sngrep/default.nix | 11 + .../networking/sniffers/wireshark/default.nix | 4 +- .../applications/networking/soju/default.nix | 14 +- .../networking/stc-cli/default.nix | 2 +- .../networking/sync/celeste/default.nix | 49 +- .../networking/sync/celeste/target-dir.patch | 16 - .../networking/sync/rclone/default.nix | 6 +- .../networking/sync/storj-uplink/default.nix | 8 +- .../networking/sync/unison/default.nix | 10 +- .../networking/syncthing/default.nix | 6 +- .../networking/tcping-go/default.nix | 2 +- .../networking/termius/default.nix | 20 +- .../networking/twingate/default.nix | 4 +- .../upnp-router-control/default.nix | 4 +- .../networking/utahfs/default.nix | 25 - .../networking/versus/default.nix | 4 +- .../networking/vnstat/default.nix | 4 +- .../applications/networking/warp/default.nix | 7 +- .../networking/websocketd/default.nix | 2 +- .../applications/networking/wgcf/default.nix | 6 +- .../applications/office/PageEdit/default.nix | 8 +- .../applications/office/appflowy/default.nix | 6 +- .../office/beamerpresenter/default.nix | 14 +- .../pkgs/applications/office/fava/default.nix | 4 +- .../office/gnucash/0004-exec-fq-wrapper.patch | 16 +- .../0005-remove-gncquotes-online-wiggle.patch | 31 - .../applications/office/gnucash/default.nix | 20 +- .../applications/office/homebank/default.nix | 2 +- .../applications/office/jabref/default.nix | 97 +- .../applications/office/libreoffice/README.md | 9 - .../office/libreoffice/default.nix | 351 +- .../libreoffice/download-list-builder.sh | 4 - .../office/libreoffice/gen-shell.nix | 29 - .../office/libreoffice/gpgme-1.18.patch | 10 - .../office/libreoffice/poppler-22-04-0.patch | 100 - .../skip-failed-test-with-icu70.patch | 29 - .../libreoffice/soffice-template.desktop | 6 - .../download.nix => src-fresh/deps.nix} | 315 +- .../office/libreoffice/src-fresh/help.nix | 4 + .../office/libreoffice/src-fresh/main.nix | 4 + .../office/libreoffice/src-fresh/override.nix | 22 - .../office/libreoffice/src-fresh/primary.nix | 36 - .../libreoffice/src-fresh/translations.nix | 4 + .../office/libreoffice/src-fresh/version.nix | 1 + .../download.nix => src-still/deps.nix} | 80 +- .../office/libreoffice/src-still/help.nix | 4 + .../office/libreoffice/src-still/main.nix | 4 + .../office/libreoffice/src-still/override.nix | 21 - .../office/libreoffice/src-still/primary.nix | 36 - .../libreoffice/src-still/translations.nix | 4 + .../office/libreoffice/src-still/version.nix | 1 + .../applications/office/libreoffice/update.sh | 74 + .../office/libreoffice/wrapper.nix | 4 +- .../applications/office/micropad/default.nix | 14 +- .../applications/office/micropad/package.json | 10 +- .../applications/office/micropad/update.sh | 15 +- .../applications/office/micropad/yarn.lock | 1733 - .../applications/office/micropad/yarn.nix | 2013 - .../applications/office/morgen/default.nix | 8 +- .../applications/office/notes/default.nix | 10 +- .../onlyoffice-bin/{default.nix => 7_2.nix} | 4 + .../office/onlyoffice-bin/7_4.nix | 215 + .../office/paperless-ngx/default.nix | 7 +- .../applications/office/planify/default.nix | 9 +- .../applications/office/portfolio/default.nix | 4 +- .../applications/office/pympress/default.nix | 7 +- .../applications/office/qownnotes/default.nix | 4 +- .../office/roam-research/common.nix | 22 + .../office/roam-research/darwin.nix | 34 + .../office/roam-research/default.nix | 87 +- .../office/roam-research/linux.nix | 73 + .../pkgs/applications/office/scribus/1_4.nix | 52 - .../office/super-productivity/default.nix | 4 +- .../office/tagainijisho/default.nix | 9 +- .../applications/office/ticktick/default.nix | 77 + .../applications/office/timetrap/default.nix | 50 +- .../applications/office/timeular/default.nix | 4 +- .../applications/office/todoman/default.nix | 6 +- .../office/treesheets/default.nix | 6 +- .../applications/office/trilium/desktop.nix | 21 +- .../applications/office/vnote/default.nix | 4 +- .../applications/office/zotero/default.nix | 4 +- .../radio/abracadabra/default.nix | 4 +- .../applications/radio/cloudlog/default.nix | 4 +- .../applications/radio/direwolf/default.nix | 42 +- .../applications/radio/fldigi/default.nix | 4 +- .../pkgs/applications/radio/flmsg/default.nix | 4 +- .../pkgs/applications/radio/flrig/default.nix | 4 +- .../applications/radio/freedv/default.nix | 7 +- .../pkgs/applications/radio/gnuradio/3.8.nix | 50 +- .../pkgs/applications/radio/gnuradio/3.9.nix | 44 +- .../applications/radio/gnuradio/default.nix | 44 +- .../applications/radio/gnuradio/shared.nix | 38 +- .../applications/radio/gnuradio/wrapper.nix | 25 + .../pkgs/applications/radio/gqrx/default.nix | 4 +- .../applications/radio/kappanhang/default.nix | 6 +- .../radio/multimon-ng/default.nix | 8 +- .../pkgs/applications/radio/pat/default.nix | 25 +- .../applications/radio/qradiolink/default.nix | 4 +- .../pkgs/applications/radio/quisk/default.nix | 6 +- .../pkgs/applications/radio/rscw/default.nix | 2 +- .../applications/radio/sdrangel/default.nix | 9 +- .../applications/radio/soapysdr/default.nix | 99 +- .../radio/soapysdr/fix-pkgconfig.patch | 14 - .../applications/radio/srsran/default.nix | 4 +- .../pkgs/applications/radio/uhd/3.5.nix | 160 - .../pkgs/applications/radio/uhd/default.nix | 27 +- .../science/astronomy/gildas/default.nix | 15 +- .../science/astronomy/kstars/default.nix | 4 +- .../science/astronomy/siril/default.nix | 19 +- .../science/astronomy/stellarium/default.nix | 10 +- .../science/biology/angsd/default.nix | 24 +- .../science/biology/ants/default.nix | 52 +- .../science/biology/blast/default.nix | 4 +- .../science/biology/bwa-mem2/default.nix | 55 + .../science/biology/delly/default.nix | 4 +- .../science/biology/dssp/default.nix | 12 +- .../science/biology/hmmer/default.nix | 5 +- .../science/biology/igv/default.nix | 4 +- .../science/biology/iqtree/default.nix | 4 +- .../science/biology/mosdepth/default.nix | 4 +- .../science/biology/mrtrix/default.nix | 34 +- .../science/biology/nest/default.nix | 4 +- .../science/biology/neuron/default.nix | 4 +- .../science/biology/sambamba/default.nix | 4 +- .../science/biology/sortmerna/default.nix | 1 - .../science/biology/sratoolkit/default.nix | 2 +- .../science/biology/stacks/default.nix | 5 +- .../science/biology/trimmomatic/default.nix | 66 + .../science/biology/truvari/default.nix | 27 +- .../science/biology/veryfasttree/default.nix | 4 +- .../science/chemistry/avogadro/default.nix | 30 - .../science/chemistry/cp2k/default.nix | 111 +- .../science/chemistry/element/default.nix | 2 +- .../science/chemistry/ergoscf/default.nix | 4 +- .../science/chemistry/jmol/default.nix | 4 +- .../science/chemistry/mopac/default.nix | 4 +- .../science/chemistry/nwchem/default.nix | 13 +- .../science/chemistry/openmolcas/default.nix | 2 +- .../science/chemistry/wxmacmolplt/default.nix | 2 + .../electronics/dataexplorer/default.nix | 4 +- .../science/electronics/flatcam/default.nix | 133 +- .../science/electronics/flatcam/release.patch | 13 - .../science/electronics/gerbv/default.nix | 4 +- .../hal-hardware-analyzer/default.nix | 112 +- .../science/electronics/kicad/base.nix | 3 +- .../science/electronics/kicad/default.nix | 11 +- .../science/electronics/kicad/libraries.nix | 17 +- .../science/electronics/librepcb/default.nix | 9 +- .../science/electronics/nvc/default.nix | 4 +- .../electronics/openboardview/default.nix | 1 - ...001-Disable-failing-regression-tests.patch | 83 + .../0001-Fix-string-formatting-in-tests.patch | 53 - .../science/electronics/openroad/default.nix | 27 +- .../science/electronics/qfsm/default.nix | 28 - .../qfsm/drop-hardcoded-prefix.patch | 20 - .../science/electronics/qfsm/gcc6-fixes.patch | 20 - .../science/electronics/qucs-s/default.nix | 6 +- .../science/electronics/qucs/cmakelists.patch | 34 - .../science/electronics/qucs/default.nix | 30 - .../science/electronics/xyce/default.nix | 2 +- .../science/geometry/gama/default.nix | 4 +- .../science/logic/abc/default.nix | 6 +- .../science/logic/alt-ergo/default.nix | 40 +- .../science/logic/beluga/default.nix | 4 +- .../science/logic/cbmc/default.nix | 4 +- .../science/logic/coq/default.nix | 3 +- .../science/logic/cryptominisat/default.nix | 4 +- .../science/logic/cvc4/default.nix | 5 +- .../science/logic/cvc5/default.nix | 7 +- .../science/logic/dafny/default.nix | 36 +- .../science/logic/drat-trim/default.nix | 8 +- .../science/logic/easycrypt/default.nix | 15 +- .../science/logic/egglog/default.nix | 6 +- .../science/logic/ekrhyper/default.nix | 2 +- .../science/logic/elan/default.nix | 8 +- .../science/logic/kissat/default.nix | 4 +- .../science/logic/klee/default.nix | 3 +- .../science/logic/lean4/default.nix | 60 + .../science/logic/netlistsvg/default.nix | 54 + .../logic/netlistsvg/package-lock.json | 9761 +++ .../science/logic/netlistsvg/test.v | 7 + .../science/logic/surelog/default.nix | 18 +- .../science/logic/tamarin-prover/default.nix | 53 +- .../science/logic/uhdm/default.nix | 13 +- .../science/logic/workcraft/default.nix | 4 +- .../science/math/geogebra/default.nix | 6 +- .../science/math/geogebra/geogebra6.nix | 6 +- .../science/math/giac/default.nix | 4 +- .../science/math/ginac/default.nix | 4 +- .../science/math/gretl/default.nix | 46 +- .../science/math/maxima/default.nix | 18 +- .../science/math/mpsolve/default.nix | 39 + .../science/math/qalculate-gtk/default.nix | 17 +- .../science/math/qalculate-qt/default.nix | 10 +- .../science/math/ratpoints/default.nix | 2 +- .../applications/science/math/sage/README.md | 2 +- .../science/math/sage/sage-src.nix | 7 + .../applications/science/math/sage/sage.nix | 3 +- .../science/math/wolfram-engine/l10ns.nix | 7 + .../science/math/wxmaxima/default.nix | 6 +- .../science/medicine/aliza/default.nix | 60 - .../science/medicine/xmedcon/default.nix | 5 +- .../science/misc/boinc/default.nix | 4 +- .../science/misc/cytoscape/default.nix | 4 +- .../science/misc/golly/default.nix | 10 +- .../science/misc/openmvs/default.nix | 4 +- .../science/misc/root/default.nix | 53 +- .../science/misc/vite/default.nix | 36 +- .../molecular-dynamics/lammps/default.nix | 13 +- .../molecular-dynamics/viennarna/default.nix | 4 +- .../science/physics/elmerfem/default.nix | 10 +- .../science/robotics/mavproxy/default.nix | 4 +- .../science/robotics/mujoco/default.nix | 36 +- .../robotics/mujoco/dependencies.patch | 30 +- .../applications/search/recoll/default.nix | 21 +- .../applications/system/asusctl/Cargo.lock | 369 +- .../applications/system/asusctl/default.nix | 6 +- .../applications/system/glances/default.nix | 4 +- .../terminal-emulators/alacritty/default.nix | 7 +- .../blackbox-terminal/default.nix | 1 + .../terminal-emulators/contour/default.nix | 8 + .../terminal-emulators/eterm/default.nix | 52 - .../terminal-emulators/foot/default.nix | 2 + .../terminal-emulators/iterm2/default.nix | 4 +- .../terminal-emulators/kitty/default.nix | 18 +- .../terminal-emulators/kitty/themes.nix | 8 +- .../terminal-emulators/microcom/default.nix | 4 +- .../terminal-emulators/mlterm/default.nix | 8 +- .../terminal-emulators/rio/default.nix | 11 +- .../terminal-emulators/roxterm/default.nix | 4 +- .../urxvt-font-size/default.nix | 2 +- .../urxvt-perl/default.nix | 2 +- .../terminal-emulators/st/default.nix | 6 +- .../terminal-emulators/tym/default.nix | 6 +- .../terminal-emulators/yaft/default.nix | 8 + .../version-management/bit/default.nix | 2 +- .../version-management/blackbox/default.nix | 6 +- .../version-management/commitizen/default.nix | 24 +- .../version-management/conform/default.nix | 2 +- .../cvs-fast-export/default.nix | 4 +- .../version-management/degit/default.nix | 26 + .../version-management/delta/default.nix | 1 + .../version-management/forgejo/default.nix | 6 +- .../version-management/gex/default.nix | 6 +- .../version-management/gg/default.nix | 4 +- .../version-management/gh/default.nix | 7 +- .../version-management/ghorg/default.nix | 4 +- .../version-management/ghr/default.nix | 2 +- .../git-appraise/default.nix | 2 +- .../git-branchless/default.nix | 7 +- .../git-bug-migration/default.nix | 2 +- .../version-management/git-bug/default.nix | 2 +- .../version-management/git-cliff/default.nix | 6 +- .../git-codereview/default.nix | 4 +- .../git-credential-manager/default.nix | 4 +- .../git-credential-manager/update.sh | 4 +- .../git-credential-oauth/default.nix | 4 +- .../version-management/git-hound/default.nix | 2 +- .../version-management/git-mit/default.nix | 6 +- .../git-privacy/default.nix | 4 +- .../version-management/git-repo/default.nix | 4 +- .../version-management/git-sizer/default.nix | 2 +- .../git-subtrac/default.nix | 4 +- .../version-management/git-up/default.nix | 21 +- .../git-when-merged/default.nix | 4 +- .../git-workspace/default.nix | 12 +- .../version-management/git/default.nix | 6 +- .../version-management/gitbatch/default.nix | 2 +- .../version-management/gitea/default.nix | 4 +- .../Remove-unsupported-database-names.patch | 16 +- .../version-management/gitlab/data.json | 18 +- .../version-management/gitlab/default.nix | 11 +- .../gitlab/gitaly/default.nix | 18 +- .../gitlab-container-registry/default.nix | 6 +- .../gitlab-elasticsearch-indexer/default.nix | 7 +- .../gitlab/gitlab-pages/default.nix | 6 +- .../gitlab/gitlab-shell/default.nix | 6 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- ...ties-remove-yarn-install-enhancement.patch | 13 - .../version-management/gitlab/rubyEnv/Gemfile | 159 +- .../gitlab/rubyEnv/Gemfile.lock | 578 +- .../gitlab/rubyEnv/gemset.nix | 643 +- .../version-management/gitlab/update.py | 14 +- .../version-management/gitls/default.nix | 2 +- .../version-management/gitmux/default.nix | 6 +- .../version-management/gitnr/default.nix | 49 + .../version-management/gitoxide/default.nix | 6 +- .../version-management/gitty/default.nix | 2 +- .../version-management/gitui/default.nix | 18 +- .../version-management/glab/default.nix | 9 +- .../version-management/gogs/default.nix | 2 +- .../version-management/got/default.nix | 7 +- .../version-management/gql/default.nix | 10 +- .../version-management/gst/default.nix | 4 +- .../version-management/jujutsu/default.nix | 16 +- .../version-management/lab/default.nix | 2 +- .../version-management/lefthook/default.nix | 4 +- .../version-management/mercurial/default.nix | 7 +- .../version-management/pijul/default.nix | 10 +- .../reposurgeon/default.nix | 2 +- .../version-management/scmpuff/default.nix | 2 +- .../version-management/sourcehut/git.nix | 10 +- .../version-management/sourcehut/hg.nix | 4 +- .../version-management/sourcehut/lists.nix | 2 +- .../version-management/sourcehut/pages.nix | 2 +- .../version-management/sourcehut/todo.nix | 2 +- .../version-management/sourcehut/update.sh | 2 +- ...ix-use-canonical-Message-ID-spelling.patch | 249 - .../version-management/stgit/default.nix | 32 +- .../version-management/subgit/default.nix | 4 +- .../sublime-merge/common.nix | 25 +- .../sublime-merge/default.nix | 10 +- .../version-management/tortoisehg/default.nix | 51 +- .../version-management/transcrypt/default.nix | 14 +- .../helper-scripts_depspathprefix.patch | 37 - .../version-management/vcprompt/default.nix | 2 +- ...atch => 0001-fix-installation-paths.patch} | 0 .../video/anilibria-winmaclinux/default.nix | 6 +- .../applications/video/bilibili/default.nix | 6 +- .../video/davinci-resolve/default.nix | 13 +- .../applications/video/devede/default.nix | 4 +- .../applications/video/dmlive/default.nix | 8 +- .../applications/video/f1viewer/default.nix | 2 +- .../applications/video/filebot/default.nix | 6 +- .../applications/video/freetube/default.nix | 7 +- .../applications/video/haruna/default.nix | 6 +- .../video/hyperion-ng/default.nix | 1 - .../applications/video/hypnotix/default.nix | 6 +- .../video/jellyfin-media-player/default.nix | 1 - .../pkgs/applications/video/jftui/default.nix | 4 +- .../video/kodi/addons/certifi/default.nix | 4 +- .../video/kodi/addons/keymap/default.nix | 4 +- .../video/kodi/addons/simplejson/default.nix | 4 +- .../pkgs/applications/video/lbry/default.nix | 2 +- .../applications/video/lightworks/default.nix | 14 +- .../applications/video/makemkv/default.nix | 12 +- .../applications/video/makemkv/r13y.patch | 13 + .../video/media-downloader/default.nix | 6 +- .../applications/video/mkvtoolnix/default.nix | 5 +- .../video/mpv/scripts/autoload.nix | 2 +- .../video/mpv/scripts/default.nix | 1 + .../video/mpv/scripts/mpv-webm.nix | 36 + .../video/mpv/scripts/mpvacious.nix | 4 +- .../video/multiviewer-for-f1/default.nix | 8 +- .../applications/video/obs-studio/default.nix | 16 +- .../obs-studio/fix-nix-plugin-path.patch | 15 +- .../video/obs-studio/plugins/default.nix | 2 + .../obs-studio/plugins/obs-freeze-filter.nix | 40 + .../plugins/obs-move-transition.nix | 4 +- .../plugins/obs-pipewire-audio-capture.nix | 4 +- .../obs-studio/plugins/obs-shaderfilter.nix | 4 +- .../obs-studio/plugins/obs-vkcapture.nix | 4 +- .../video/obs-studio/plugins/wlrobs.nix | 6 +- .../video/olive-editor/default.nix | 10 +- .../applications/video/pitivi/default.nix | 10 +- .../video/plex-media-player/default.nix | 4 +- .../pkgs/applications/video/prism/default.nix | 6 +- .../applications/video/qmplay2/default.nix | 6 +- .../video/shaka-packager/default.nix | 62 + .../applications/video/srtrelay/default.nix | 2 +- .../applications/video/streamlink/default.nix | 4 +- .../video/subtitleedit/default.nix | 10 +- .../video/vdr/softhddevice/default.nix | 4 +- .../video/video-trimmer/default.nix | 12 +- .../pkgs/applications/video/vlc/default.nix | 17 +- .../video/wf-recorder/default.nix | 9 +- .../virtualization/appvm/default.nix | 2 +- .../virtualization/buildkit-nix/default.nix | 6 +- .../virtualization/catatonit/default.nix | 24 +- .../cloud-hypervisor/Cargo.lock | 296 +- .../cloud-hypervisor/default.nix | 24 +- .../virtualization/colima/default.nix | 6 +- .../virtualization/conmon-rs/default.nix | 6 +- .../virtualization/conmon/default.nix | 6 +- .../virtualization/containerd/default.nix | 4 +- .../virtualization/cri-o/default.nix | 4 +- .../virtualization/crosvm/default.nix | 21 +- .../virtualization/crun/default.nix | 4 +- .../virtualization/ddev/default.nix | 4 +- .../virtualization/distrobox/default.nix | 10 +- .../virtualization/docker-slim/default.nix | 4 +- .../virtualization/docker/compose.nix | 6 +- .../virtualization/docker/default.nix | 38 +- .../virtualization/docker/distribution.nix | 4 +- .../docker/sbom-disable-tests.patch | 28 + .../virtualization/docker/sbom.nix | 43 + .../driver/win-virtio/default.nix | 4 +- .../virtualization/ecs-agent/default.nix | 4 +- .../virtualization/gvisor/default.nix | 2 +- .../virtualization/ignite/default.nix | 2 +- .../virtualization/kraft/default.nix | 13 +- .../virtualization/kvmtool/default.nix | 10 +- .../applications/virtualization/lima/bin.nix | 11 +- .../virtualization/lima/default.nix | 6 +- .../looking-glass-client/default.nix | 1 + .../virtualization/nixpacks/default.nix | 6 +- .../nvidia-container-toolkit/default.nix | 28 +- .../virtualization/open-vm-tools/default.nix | 14 +- .../virtualization/ops/default.nix | 2 +- .../virtualization/podman-desktop/default.nix | 2 +- .../virtualization/podman/default.nix | 4 +- .../podman/rm-podman-mac-helper-msg.patch | 33 +- .../virtualization/qemu/default.nix | 31 +- .../virtualization/qemu/utils.nix | 22 +- .../rust-hypervisor-firmware/default.nix | 10 +- .../virtualization/rvvm/default.nix | 2 +- .../virtualization/singularity/generic.nix | 6 +- .../virtualization/singularity/packages.nix | 12 +- .../virtualization/stratovirt/default.nix | 6 +- .../micro_vm-allow-SYS_clock_gettime.patch | 8 +- .../virtualization/tart/default.nix | 1 + .../virtualization/umoci/default.nix | 2 +- .../virtualization/virt-manager/default.nix | 4 +- .../vmware-workstation/default.nix | 16 +- .../virtualization/vpcs/default.nix | 54 +- .../window-managers/dwl/default.nix | 5 +- .../window-managers/eww/default.nix | 8 +- .../applications/window-managers/fvwm/3.nix | 4 +- .../window-managers/gamescope/default.nix | 13 +- .../window-managers/herbstluftwm/default.nix | 7 + .../hyprwm/hyprland/default.nix | 12 +- .../hyprwm/hyprland/wlroots.nix | 14 +- .../hyprwm/hyprpicker/default.nix | 2 +- .../hyprwm/hyprshade/default.nix | 34 + .../xdg-desktop-portal-hyprland/default.nix | 61 +- .../hyprland-share-picker.nix | 36 - .../xdg-desktop-portal-hyprland/source.nix | 25 - .../window-managers/i3/status-rust.nix | 6 +- .../window-managers/i3/status.nix | 1 + .../window-managers/i3/workstyle-Cargo.lock} | 935 +- .../window-managers/i3/workstyle.nix | 13 +- .../applications/window-managers/i3/wsr.nix | 1 + .../window-managers/lesbar/default.nix | 35 + .../window-managers/maui-shell/default.nix | 7 +- .../window-managers/miriway/default.nix | 10 +- .../window-managers/nimdow/default.nix | 6 +- .../window-managers/notion/default.nix | 44 - .../window-managers/oroborus/default.nix | 61 - .../window-managers/phosh/default.nix | 4 +- .../window-managers/picom/picom-allusive.nix | 24 + .../window-managers/ragnarwm/default.nix | 73 + .../window-managers/river/default.nix | 1 + .../window-managers/smallwm/default.nix | 38 - .../window-managers/spectrwm/default.nix | 6 +- .../window-managers/sway/contrib.nix | 1 + .../window-managers/sway/default.nix | 2 + .../sway/drop_ambient_capabilities.patch | 41 + .../window-managers/weston/default.nix | 15 +- .../window-managers/windowmaker/default.nix | 43 - .../pkgs/build-support/appimage/default.nix | 1 + .../bintools-wrapper/default.nix | 3 +- .../build-fhsenv-bubblewrap/buildFHSEnv.nix | 11 +- .../build-fhsenv-bubblewrap/default.nix | 13 +- .../build-support/build-fhsenv-chroot/env.nix | 1 + .../build-graalvm-native-image/default.nix | 2 - .../build-support/cc-wrapper/add-hardening.sh | 27 +- .../build-support/cc-wrapper/cc-wrapper.sh | 4 +- .../pkgs/build-support/cc-wrapper/default.nix | 17 +- .../dart/build-dart-application/default.nix | 10 +- .../deterministic-uname.sh | 35 +- .../pkgs/build-support/docker/default.nix | 15 +- .../build-dotnet-global-tool/default.nix | 2 +- .../build-dotnet-module/hooks/default.nix | 1 + .../hooks/dotnet-fixup-hook.sh | 2 +- .../pkgs/build-support/emacs/buffer.nix | 8 +- .../pkgs/build-support/emacs/generic.nix | 8 +- .../pkgs/build-support/emacs/wrapper.nix | 24 +- .../pkgs/build-support/emacs/wrapper.sh | 16 +- .../fetchdebianpatch/default.nix | 19 + .../build-support/fetchdebianpatch/tests.nix | 19 + .../build-support/fetchgit/nix-prefetch-git | 11 +- .../fetchnextcloudapp/default.nix | 30 +- .../pkgs/build-support/fetchurl/default.nix | 22 +- .../pkgs/build-support/fetchzip/default.nix | 55 +- .../pkgs/build-support/flutter/default.nix | 30 +- .../build-support/kernel/make-initrd-ng.nix | 2 +- .../build-support/libredirect/libredirect.c | 5 +- .../pkgs/build-support/libredirect/test.c | 12 + .../write-darwin-bundle.nix | 30 +- .../make-startupitem/default.nix | 2 +- .../node/build-npm-package/default.nix | 9 +- .../node/build-npm-package/hooks/default.nix | 23 +- .../hooks/npm-install-hook.sh | 23 +- .../node/fetch-npm-deps/default.nix | 4 +- .../node/fetch-npm-deps/src/main.rs | 2 +- .../node/fetch-npm-deps/src/parse/mod.rs | 4 +- .../node/fetch-npm-deps/src/util.rs | 13 + .../node/fetch-yarn-deps/default.nix | 2 +- .../node/fetch-yarn-deps/index.js | 4 +- .../pkgs/build-support/ocaml/topkg.nix | 28 + .../php/build-composer-project.nix | 71 + .../php/build-composer-repository.nix | 87 + .../build-support/{ => php}/build-pecl.nix | 5 +- .../php/hooks/composer-install-hook.sh | 147 + .../php/hooks/composer-repository-hook.sh | 84 + .../pkgs/build-support/php/hooks/default.nix | 29 + .../php/pkgs/composer-local-repo-plugin.nix | 114 + .../build-support/php/pkgs/composer-phar.nix | 50 + .../rust/build-rust-crate/default.nix | 4 + .../rust/default-crate-overrides.nix | 6 + .../setup-hooks/desktop-to-darwin-bundle.sh | 4 +- .../make-binary-wrapper/default.nix | 2 +- .../setup-hooks/mpi-check-hook/default.nix | 5 + .../mpi-check-hook/mpi-check-hook.sh | 54 + .../setup-hooks/multiple-outputs.sh | 4 +- .../setup-hooks/patch-shebangs.sh | 2 +- .../setup-hooks/separate-debug-info.sh | 3 + .../pkgs/build-support/setup-hooks/strip.sh | 10 +- .../build-support/setup-hooks/win-dll-link.sh | 124 +- .../pkgs/build-support/testers/default.nix | 2 +- .../testers/testMetaPkgConfig/tester.nix | 4 +- .../trivial-builders/default.nix | 21 +- .../nixpkgs/pkgs/build-support/vm/default.nix | 2 +- third_party/nixpkgs/pkgs/by-name/README.md | 121 + .../_4/_4th}/001-install-manual-fixup.diff | 0 .../_4/_4th/package.nix} | 33 +- .../default.nix => by-name/a4/a4/package.nix} | 10 +- .../aa/aarch64-esr-decoder/package.nix | 27 + .../af/afterstep/package.nix} | 74 +- .../pkgs/by-name/ai/airscan/package.nix | 26 + .../al/algol68g/package.nix} | 28 +- .../pkgs/by-name/al/alt-tab-macos/package.nix | 37 + .../pkgs/by-name/ao/aocl-utils/package.nix | 23 + .../nixpkgs/pkgs/by-name/ar/arjun/package.nix | 43 + .../by-name/ar/armbian-firmware/package.nix | 33 + .../nixpkgs/pkgs/by-name/ar/arrpc/package.nix | 40 + .../as/asciiquarium-transparent/package.nix | 34 + .../pkgs/by-name/as/ast-grep/package.nix | 47 + .../by-name/aw/aws-azure-login/package.nix | 76 + .../by-name/ba/backlight-auto/package.nix | 28 + .../pkgs/by-name/ba/badger/package.nix | 30 + .../be/berry/package.nix} | 27 +- .../pkgs/by-name/bi/binsort/package.nix | 35 + .../pkgs/by-name/bi/bitmagnet/package.nix | 31 + .../bm/bmake/001-bootstrap-fix.diff} | 0 .../002-dont-test-while-installing.diff} | 0 .../bm/bmake/003-fix-unexport-env-test.diff} | 0 .../bm/bmake/004-unconditional-ksh-test.diff} | 0 .../bm/bmake/package.nix} | 30 +- .../bm}/bmake/setup-hook.sh | 0 .../bo/bochs/package.nix} | 16 +- .../bo/boogie/deps.nix} | 0 .../by-name/bo/boogie/install-check-file.bpl | 61 + .../pkgs/by-name/bo/boogie/package.nix | 57 + .../nixpkgs/pkgs/by-name/br/bruno/package.nix | 61 + .../pkgs/by-name/ca/cargo-bump/package.nix | 36 + .../pkgs/by-name/ca/cargo-i18n/package.nix | 34 + .../pkgs/by-name/ca/cargo-rdme/package.nix | 25 + .../nixpkgs/pkgs/by-name/cd/cdwe/package.nix | 26 + .../ce/celluloid/package.nix} | 22 +- .../pkgs/by-name/ci/circle-flags/package.nix | 36 + .../nixpkgs/pkgs/by-name/cl/clzip/package.nix | 22 + .../nixpkgs/pkgs/by-name/cn/cntb/package.nix | 30 + .../by-name/co/colorized-logs/package.nix | 30 + .../pkgs/by-name/co/comic-mandown/package.nix | 17 + .../pkgs/by-name/co/composefs/package.nix | 101 + .../pkgs/by-name/co/controku/package.nix | 4 + .../co/convco/package.nix} | 12 +- .../nixpkgs/pkgs/by-name/co/costa/package.nix | 40 + .../by-name/cr/create-react-app/package.nix | 33 + .../ct/ctx/0001-fix-detections.diff} | 121 +- .../ct/ctx/package.nix} | 41 +- .../pkgs/by-name/de/debianutils/package.nix | 47 + .../nixpkgs/pkgs/by-name/dj/djent/package.nix | 47 + .../by-name/dm/dmenu-bluetooth/package.nix | 43 + .../pkgs/by-name/do/dorion/package.nix | 65 + .../dx/dxvk/package.nix} | 0 .../{misc => by-name/dx}/dxvk/setup_dxvk.sh | 0 .../dx/dxvk_1}/darwin-dxvk-compat.patch | 0 .../dx/dxvk_1}/darwin-thread-primitives.patch | 0 .../pkgs/by-name/dx/dxvk_1/package.nix | 57 + .../pkgs/by-name/dx/dxvk_2/package.nix | 77 + .../pkgs/by-name/dy/dyalog/dyalogscript.patch | 8 + .../nixpkgs/pkgs/by-name/dy/dyalog/mapl.patch | 31 + .../pkgs/by-name/dy/dyalog/package.nix | 225 + .../nixpkgs/pkgs/by-name/ec/ecc/package.nix | 124 + .../pkgs/by-name/ec/ecmtools/package.nix | 39 + .../ek/eksctl/package.nix} | 6 +- .../el/elvish/package.nix} | 27 +- .../el/elvish/tests/expect-version.elv | 8 + .../el/elvish/tests/expect-version.nix | 25 + .../en/engage/package.nix} | 8 +- .../by-name/es/esbuild-config/package.nix | 31 + .../nixpkgs/pkgs/by-name/eu/eudev/package.nix | 85 + .../ez/eza/package.nix} | 20 +- .../fl/fleng/package.nix} | 4 +- .../pkgs/by-name/ga/game-rs/package.nix | 32 + .../pkgs/by-name/ga/gash-utils/package.nix | 46 + .../nixpkgs/pkgs/by-name/ga/gash/package.nix | 35 + .../nixpkgs/pkgs/by-name/gb/gbar/package.nix | 58 + .../by-name/gh/gh-screensaver/package.nix | 28 + .../nixpkgs/pkgs/by-name/gh/ghunt/package.nix | 50 + .../pkgs/by-name/gi/girouette/package.nix | 43 + .../pkgs/by-name/gi/gitmoji-cli/package.nix | 75 + .../nixpkgs/pkgs/by-name/go/goat/package.nix | 26 + .../pkgs/by-name/gr/grimblast/package.nix | 61 + .../pkgs/by-name/gu/guile-avahi/package.nix | 39 + .../pkgs/by-name/gu/guile-goblins/package.nix | 34 + .../pkgs/by-name/gu/guile-lzma/package.nix | 37 + .../pkgs/by-name/gu/guile-semver/package.nix | 33 + .../pkgs/by-name/gu/guile-zlib/package.nix | 39 + .../ha/ha-mqtt-discoverable-cli/package.nix | 41 + .../by-name/he/headphones-toolbox/package.nix | 47 + .../he/hello/package.nix} | 1 + .../misc => by-name/he}/hello/test.nix | 0 .../pkgs/by-name/he/hexbinhex/package.nix | 40 + .../pkgs/by-name/hy/hyperlink/package.nix | 26 + .../pkgs/by-name/hy/hyprkeys/package.nix | 44 + .../pkgs/by-name/i3/i3bar-river/package.nix | 32 + .../ic/icewm/package.nix} | 4 +- .../by-name/if/ifrextractor-rs/Cargo.lock | 32 + .../by-name/if/ifrextractor-rs/package.nix | 31 + .../im/imhex/package.nix} | 13 +- .../pkgs/by-name/im/impression/package.nix | 69 + .../pkgs/by-name/ir/ironbar/package.nix | 80 + .../pkgs/by-name/ji/jinja2-cli/package.nix | 49 + .../pkgs/by-name/ju/justbuild/package.nix | 186 + .../ka/katriawm/package.nix} | 19 +- .../nixpkgs/pkgs/by-name/kt/ktfmt/package.nix | 38 + .../pkgs/by-name/ku/kubectl-neat/package.nix | 29 + .../la/labwc/package.nix} | 29 +- .../pkgs/by-name/le/lemminx/package.nix | 104 + .../nixpkgs/pkgs/by-name/le/less/package.nix | 41 + .../pkgs/by-name/le/lexmark-aex/package.nix | 78 + .../nixpkgs/pkgs/by-name/li/liana/Cargo.lock | 4998 ++ .../nixpkgs/pkgs/by-name/li/liana/package.nix | 91 + .../pkgs/by-name/li/libburn/package.nix | 38 + .../pkgs/by-name/li/libisoburn/package.nix | 54 + .../pkgs/by-name/li/libisofs/package.nix | 48 + .../li/linux-wallpaperengine/package.nix | 76 + .../pkgs/by-name/lu/luastatus/package.nix | 88 + .../ma/matrix-commander-rs/package.nix | 41 + .../pkgs/by-name/ma/matrix-hook/package.nix | 23 + .../pkgs/by-name/me/mermaid-cli/package.nix | 80 + .../by-name/mf/mfoc-hardnested/package.nix | 38 + .../pkgs/by-name/mi/millipixels/package.nix | 70 + .../mk/mksh/package.nix} | 25 +- .../nixpkgs/pkgs/by-name/ml/mlx42/mlx42.pc | 10 + .../nixpkgs/pkgs/by-name/ml/mlx42/package.nix | 62 + .../nixpkgs/pkgs/by-name/na/nawk/package.nix | 56 + .../pkgs/by-name/ne/netclient/package.nix | 34 + .../ne/netproc/package.nix} | 15 +- .../nixpkgs/pkgs/by-name/nf/nfft/package.nix | 52 + .../by-name/ni/nixos-anywhere/package.nix | 56 + .../pkgs/by-name/no/notion/package.nix | 86 + .../nixpkgs/pkgs/by-name/nu/nuget/package.nix | 50 + .../pkgs/by-name/oe/oelint-adv/package.nix | 40 + .../pkgs/by-name/op/openpgl/package.nix | 41 + .../pkgs/by-name/or/orchard/package.nix | 55 + .../pkgs/by-name/ou/outputcheck/package.nix | 52 + .../pkgs/by-name/pa/passes/package.nix | 67 + .../pkgs/by-name/pd/pdepend/composer.lock | 2094 + .../pkgs/by-name/pd/pdepend/package.nix | 30 + .../pe/pekwm/package.nix} | 25 +- .../pkgs/by-name/pe/pesign/package.nix | 52 + .../pkgs/by-name/ph/phpdocumentor/package.nix | 37 + .../pkgs/by-name/pl/platformsh/package.nix | 42 + .../pkgs/by-name/po/poethepoet/package.nix | 43 + .../by-name/pr/prettier-d-slim/package.nix | 28 + .../nixpkgs/pkgs/by-name/px/pxder/package.nix | 66 + .../pkgs/by-name/qu/quicktype/package.nix | 31 + .../ra/ratpoison/package.nix} | 70 +- .../default.nix => by-name/rc/rc/package.nix} | 0 .../pkgs/by-name/re/rectangle-pro/package.nix | 37 + .../pkgs/by-name/re/replxx/package.nix | 30 + .../nixpkgs/pkgs/by-name/ri/rimgo/package.nix | 40 + .../pkgs/by-name/ri/ripsecrets/package.nix | 27 + .../nixpkgs/pkgs/by-name/ro/robo/package.nix | 28 + .../by-name/ro/robotfindskitten/package.nix | 49 + .../pkgs/by-name/ru/rusti-cal/package.nix | 31 + .../pkgs/by-name/sa/samrewritten/package.nix | 47 + .../sc/scdoc/package.nix} | 12 +- .../pkgs/by-name/sc/screentest/package.nix | 42 + .../se/searxng/package.nix} | 12 +- .../pkgs/by-name/sh/shepherd/package.nix | 77 + .../sh/shopware-cli/package.nix} | 8 +- .../si/simplex-chat-desktop/package.nix | 46 + .../pkgs/by-name/si/sirius/package.nix | 117 + .../by-name/sl/sleek-grub-theme/package.nix | 39 + .../pkgs/by-name/sl/slurm-nm/package.nix | 32 + .../pkgs/by-name/sm/smallwm/package.nix | 60 + .../nixpkgs/pkgs/by-name/sp/spfft/package.nix | 67 + .../nixpkgs/pkgs/by-name/sp/spla/package.nix | 66 + .../pkgs/by-name/ss/sssnake/package.nix | 27 + .../pkgs/by-name/st/static-server/package.nix | 56 + .../by-name/st/static-server/version.patch | 23 + .../su/sunpaper/package.nix} | 31 +- .../pkgs/by-name/su/supersonic/package.nix | 73 + .../pkgs/by-name/sy/symbolicator/Cargo.lock | 5616 ++ .../pkgs/by-name/sy/symbolicator/package.nix | 62 + .../tc/tcsh/package.nix} | 0 .../th/the-legend-of-edgar/package.nix} | 28 +- .../nixpkgs/pkgs/by-name/th/thud/package.nix | 43 + .../ti/tinywm/package.nix} | 43 +- .../pkgs/by-name/tm/tmuxifier/package.nix | 56 + .../tr/trealla/package.nix} | 8 +- .../pkgs/by-name/tu/tuxmux/package.nix | 41 + .../uc/ucg/package.nix} | 25 +- .../pkgs/by-name/uc/ucg/tests/simple.nix | 26 + .../nixpkgs/pkgs/by-name/ui/uiua/package.nix | 62 + .../pkgs/by-name/un/unbook/package.nix | 34 + .../un/unimap}/Cargo.lock | 1764 +- .../pkgs/by-name/un/unimap/package.nix | 60 + .../pkgs/by-name/up/upiano/package.nix | 38 + .../ux/uxn/package.nix} | 6 +- .../wa/waybox/package.nix} | 55 +- .../pkgs/by-name/wa/waycheck/package.nix | 58 + .../by-name/wa/wayland-logout/package.nix | 27 + .../windowmaker/dockapps/AlsaMixer-app.nix | 0 .../wi}/windowmaker/dockapps/default.nix | 0 .../wi}/windowmaker/dockapps/libdockapp.nix | 0 .../wi}/windowmaker/dockapps/wmCalClock.nix | 0 .../wi}/windowmaker/dockapps/wmsm-app.nix | 0 .../wi}/windowmaker/dockapps/wmsystemtray.nix | 0 .../pkgs/by-name/wi/windowmaker/package.nix | 82 + .../pkgs/by-name/wo/wonderdraft/package.nix | 62 + .../xm/xmldiff/package.nix} | 28 +- .../xo/xorriso/package.nix} | 15 +- .../ye/yeahwm/package.nix} | 66 +- .../pkgs/by-name/yt/ytui-music/package.nix | 68 + .../nixpkgs/pkgs/by-name/zc/zcfan/package.nix | 41 + .../pkgs/by-name/zi/zitadel/console.nix | 51 + .../pkgs/by-name/zi/zitadel/package.json | 88 + .../pkgs/by-name/zi/zitadel/package.nix | 150 + .../pkgs/by-name/zp/zpaqfranz/package.nix | 46 + .../nixpkgs/pkgs/by-name/zx/zxpy/package.nix | 53 + .../documentation/scheme-manpages/default.nix | 6 +- .../pkgs/data/documentation/zeal/default.nix | 48 +- .../pkgs/data/fonts/azeret-mono/default.nix | 39 + .../pkgs/data/fonts/commit-mono/default.nix | 7 +- .../nixpkgs/pkgs/data/fonts/hack/default.nix | 2 +- .../pkgs/data/fonts/hubot-sans/default.nix | 25 +- .../nixpkgs/pkgs/data/fonts/iosevka/bin.nix | 3 +- .../pkgs/data/fonts/iosevka/default.nix | 7 +- .../pkgs/data/fonts/iosevka/variants.nix | 184 +- .../pkgs/data/fonts/julia-mono/default.nix | 4 +- .../pkgs/data/fonts/last-resort/default.nix | 4 +- .../pkgs/data/fonts/lxgw-neoxihei/default.nix | 4 +- .../pkgs/data/fonts/maple-font/default.nix | 9 +- .../pkgs/data/fonts/mona-sans/default.nix | 18 +- .../pkgs/data/fonts/nerdfonts/default.nix | 4 +- .../pkgs/data/fonts/noto-fonts/default.nix | 48 +- .../fonts/noto-fonts/noto-emoji.hashes.json | 7 + .../data/fonts/noto-fonts/noto-emoji.json | 30 + .../pkgs/data/fonts/noto-fonts/noto-emoji.py | 183 + .../pkgs/data/fonts/openmoji/default.nix | 3 +- .../pkgs/data/fonts/pretendard/default.nix | 14 +- .../pkgs/data/fonts/roboto-mono/default.nix | 2 +- .../nixpkgs/pkgs/data/fonts/rubik/default.nix | 2 +- .../pkgs/data/fonts/sarasa-gothic/default.nix | 4 +- .../fonts/sketchybar-app-font/default.nix | 4 +- .../pkgs/data/fonts/source-han/default.nix | 70 +- .../nixpkgs/pkgs/data/fonts/sudo/default.nix | 4 +- .../fonts/twitter-color-emoji/default.nix | 10 +- .../pkgs/data/fonts/unifont/default.nix | 14 +- .../pkgs/data/fonts/unifont_upper/default.nix | 8 +- .../elementary-xfce-icon-theme/default.nix | 4 +- .../data/icons/kora-icon-theme/default.nix | 4 +- .../icons/numix-icon-theme-circle/default.nix | 4 +- .../icons/numix-icon-theme-square/default.nix | 4 +- .../data/icons/papirus-icon-theme/default.nix | 4 +- .../pkgs/data/icons/tau-hydrogen/default.nix | 36 + .../pkgs/data/icons/vanilla-dmz/default.nix | 2 +- .../data/icons/whitesur-cursors/default.nix | 31 + .../pkgs/data/misc/clash-geoip/default.nix | 4 +- .../data/misc/conway_polynomials/default.nix | 2 +- .../data/misc/dbip-country-lite/default.nix | 4 +- .../pkgs/data/misc/ddccontrol-db/default.nix | 4 +- .../data/misc/elliptic_curves/default.nix | 2 +- .../pkgs/data/misc/geolite-legacy/default.nix | 6 +- .../nixpkgs/pkgs/data/misc/hackage/pin.json | 8 +- .../unicode-character-database/default.nix | 4 +- .../data/misc/unihan-database/default.nix | 4 +- .../v2ray-domain-list-community/default.nix | 4 +- .../pkgs/data/misc/wireless-regdb/default.nix | 4 +- .../pkgs/data/themes/adw-gtk3/default.nix | 4 +- .../data/themes/catppuccin-gtk/default.nix | 11 +- .../pkgs/data/themes/greybird/default.nix | 4 +- .../sierra-breeze-enhanced/default.nix | 1 - .../pkgs/data/themes/sweet-nova/default.nix | 6 +- .../pkgs/data/themes/vimix/default.nix | 4 +- .../themes/where-is-my-sddm-theme/default.nix | 50 + .../pkgs/data/themes/whitesur-kde/default.nix | 49 + .../pkgs/data/themes/whitesur/default.nix | 4 +- .../nixpkgs/pkgs/data/themes/yaru/default.nix | 6 +- .../budgie/budgie-desktop/default.nix | 4 +- .../budgie/budgie-desktop/plugins.patch | 48 +- .../budgie-gsettings-overrides/default.nix | 8 + .../pkgs/desktops/budgie/magpie/default.nix | 8 +- .../pkgs/desktops/cinnamon/nemo/default.nix | 4 +- .../deepin/apps/deepin-camera/default.nix | 5 +- .../apps/deepin-camera/dont_use_libPath.diff | 35 +- .../deepin/apps/deepin-compressor/default.nix | 4 +- .../deepin/apps/deepin-music/default.nix | 4 +- .../deepin/apps/deepin-reader/default.nix | 15 +- .../deepin/apps/deepin-terminal/default.nix | 9 +- .../artwork/deepin-icon-theme/default.nix | 6 +- .../desktops/expidus/file-manager/default.nix | 10 +- .../desktops/expidus/file-manager/deps.json | 217 +- .../nixpkgs/pkgs/desktops/gnome-2/default.nix | 2 +- .../gnome/apps/gnome-boxes/default.nix | 4 +- .../gnome/apps/gnome-maps/default.nix | 4 +- .../gnome/core/adwaita-icon-theme/default.nix | 1 + .../pkgs/desktops/gnome/core/gdm/default.nix | 38 +- .../gnome/core/gnome-session/default.nix | 7 + .../gnome/core/gnome-shell/default.nix | 4 +- .../desktops/gnome/core/mutter/43/default.nix | 4 +- .../desktops/gnome/core/mutter/default.nix | 4 +- .../nixpkgs/pkgs/desktops/gnome/default.nix | 6 +- .../extensions/EasyScreenCast/default.nix | 6 +- .../gnome/extensions/extensionRenames.nix | 1 - .../desktops/gnome/extensions/extensions.json | 170 +- .../gnome/extensions/manuallyPackaged.nix | 1 - .../gnome/extensions/no-title-bar/default.nix | 2 +- .../gnome/extensions/paperwm/default.nix | 42 - .../gnome/misc/gnome-flashback/default.nix | 96 +- .../gnome/misc/gnome-panel/wrapper.nix | 66 + .../desktops/gnome/misc/pomodoro/default.nix | 4 +- .../lomiri/development/geonames/default.nix | 8 +- .../lxqt/xdg-desktop-portal-lxqt/default.nix | 4 + .../desktops/mate/libmatemixer/default.nix | 4 +- .../desktops/mate/mate-desktop/default.nix | 4 +- .../desktops/mate/mate-user-guide/default.nix | 4 +- .../pantheon/apps/appcenter/default.nix | 11 +- .../apps/elementary-files/default.nix | 23 +- .../apps/elementary-iconbrowser/default.nix | 11 +- .../applications/default.nix | 4 +- .../elementary-default-settings/default.nix | 10 + .../wingpanel-indicators/network/default.nix | 14 +- .../notifications/default.nix | 4 +- .../wingpanel-indicators/power/default.nix | 11 +- .../pantheon/desktop/wingpanel/default.nix | 11 +- .../nixpkgs/pkgs/desktops/plasma-5/fetch.sh | 2 +- .../plasma-5/plasma-desktop/default.nix | 1 + .../plasma-desktop/no-discover-shortcut.patch | 13 + .../pkgs/desktops/plasma-5/plasma-sdk.nix | 11 - .../plasma-5/plasma-workspace/default.nix | 7 +- .../nixpkgs/pkgs/desktops/plasma-5/srcs.nix | 472 +- .../pkgs/desktops/rox/rox-filer/default.nix | 2 +- .../xfce/applications/gigolo/default.nix | 4 +- .../xfce4-taskmanager/default.nix | 8 +- .../applications/xfce4-terminal/default.nix | 35 +- .../desktops/xfce/core/thunar/default.nix | 15 +- .../xfce/core/xfce4-appfinder/default.nix | 4 +- .../xfce/core/xfce4-panel/default.nix | 4 +- .../xfce/core/xfce4-session/default.nix | 10 + .../xfce4-clipman-plugin/default.nix | 31 +- .../xfce4-pulseaudio-plugin/default.nix | 4 +- .../xfce4-whiskermenu-plugin/default.nix | 48 +- .../androidndk-pkgs/androidndk-pkgs.nix | 15 +- .../development/androidndk-pkgs/default.nix | 6 +- .../development/beam-modules/build-mix.nix | 18 + .../beam-modules/elixir-ls/default.nix | 11 +- .../development/beam-modules/mix-release.nix | 22 + .../algol68g/0001-plotutils-png-support.diff | 27 - .../development/compilers/aspectj/default.nix | 4 +- .../compilers/assemblyscript/default.nix | 4 +- .../development/compilers/bfc/default.nix | 6 +- .../compilers/blueprint/default.nix | 5 +- .../development/compilers/cairo/default.nix | 6 +- .../development/compilers/ccl/default.nix | 48 +- .../development/compilers/chez/default.nix | 19 +- .../compilers/chicken/4/default.nix | 2 +- .../compilers/chicken/5/default.nix | 66 +- .../development/compilers/chicken/5/deps.toml | 155 +- .../compilers/chicken/5/overrides.nix | 2 + .../development/compilers/circt/default.nix | 11 +- .../development/compilers/closure/default.nix | 4 +- .../development/compilers/cmdstan/default.nix | 4 +- .../compilers/coffeescript/default.nix | 32 + .../development/compilers/crystal/default.nix | 3 + .../cudatoolkit/hooks/nvcc-setup-hook.sh | 2 +- .../cudatoolkit/hooks/setup-cuda-hook.sh | 2 +- .../redist/build-cuda-redist-package.nix | 146 +- .../cudatoolkit/redist/extension.nix | 156 +- .../manifests/redistrib_features_11.4.4.json | 1518 + .../manifests/redistrib_features_11.5.2.json | 1536 + .../manifests/redistrib_features_11.6.2.json | 1546 + .../manifests/redistrib_features_11.7.0.json | 1565 + .../manifests/redistrib_features_11.8.0.json | 1938 + .../manifests/redistrib_features_12.0.1.json | 2050 + .../manifests/redistrib_features_12.1.1.json | 2050 + .../manifests/redistrib_features_12.2.0.json | 2030 + .../cudatoolkit/redist/overrides.nix | 104 +- .../development/compilers/djgpp/default.nix | 2 +- .../development/compilers/dmd/default.nix | 7 +- .../development/compilers/dmd/generic.nix | 67 +- .../compilers/dotnet/combine-packages.nix | 5 - .../development/compilers/dotnet/update.sh | 32 +- .../compilers/dotnet/versions/6.0.nix | 268 +- .../compilers/dotnet/versions/7.0.nix | 282 +- .../compilers/dotnet/versions/8.0.nix | 276 +- .../pkgs/development/compilers/ecl/16.1.2.nix | 2 +- .../development/compilers/ecl/default.nix | 2 +- .../development/compilers/edk2/default.nix | 25 +- .../development/compilers/elm/default.nix | 1 + .../elm-pages-fix-init-read-only.patch | 39 + .../packages/elm-pages-fix-read-only.patch | 74 +- .../compilers/elm/packages/elm-srcs.nix | 48 +- .../compilers/elm/packages/elm.nix | 6 +- .../compilers/elm/packages/lamdera.nix | 10 +- .../compilers/elm/packages/node-packages.nix | 3197 +- .../development/compilers/elm/registry.dat | Bin 86479 -> 132822 bytes .../compilers/emscripten/default.nix | 6 +- .../development/compilers/eql/default.nix | 63 - .../development/compilers/erg/default.nix | 6 +- .../pkgs/development/compilers/fasm/bin.nix | 4 +- .../development/compilers/flix/default.nix | 4 +- .../development/compilers/flutter/default.nix | 39 +- .../flutter/engine-artifacts/default.nix | 2 +- .../flutter/engine-artifacts/hashes.nix | 231 +- .../development/compilers/flutter/flutter.nix | 2 +- .../flutter3/disable-auto-update.patch | 56 +- .../flutter3/flutter-pub-dart-override.patch | 34 + .../flutter/patches/flutter3/git-dir.patch | 64 +- .../development/compilers/flutter/wrapper.nix | 54 +- .../compilers/gcc/common/builder.nix | 3 + .../compilers/gcc/common/configure-flags.nix | 7 +- .../compilers/gcc/common/libgcc.nix | 27 +- .../compilers/gcc/common/pre-configure.nix | 16 +- .../development/compilers/gcc/default.nix | 6 +- .../compilers/gcc/patches/default.nix | 262 +- .../pkgs/development/compilers/ghc/9.2.4.nix | 2 +- .../pkgs/development/compilers/ghc/9.2.5.nix | 2 +- .../pkgs/development/compilers/ghc/9.2.6.nix | 2 +- .../pkgs/development/compilers/ghc/9.2.7.nix | 2 +- .../pkgs/development/compilers/ghc/9.2.8.nix | 2 +- .../pkgs/development/compilers/ghc/9.4.2.nix | 2 +- .../pkgs/development/compilers/ghc/9.4.3.nix | 2 +- .../pkgs/development/compilers/ghc/9.4.4.nix | 2 +- .../pkgs/development/compilers/ghc/9.4.5.nix | 2 +- .../pkgs/development/compilers/ghc/9.4.6.nix | 2 +- .../pkgs/development/compilers/ghc/9.6.3.nix | 4 + .../compilers/ghc/common-hadrian.nix | 2 +- .../development/compilers/ghdl/default.nix | 30 +- .../development/compilers/gleam/default.nix | 6 +- .../development/compilers/glslang/default.nix | 19 +- .../compilers/gnat-bootstrap/default.nix | 26 +- .../development/compilers/gnostic/default.nix | 6 +- .../pkgs/development/compilers/go/1.18.nix | 21 +- .../pkgs/development/compilers/go/1.19.nix | 25 +- .../pkgs/development/compilers/go/1.20.nix | 25 +- .../pkgs/development/compilers/go/1.21.nix | 29 +- .../pkgs/development/compilers/go/binary.nix | 1 + .../development/compilers/go/bootstrap121.nix | 22 + .../community-edition/buildGraalvm.nix | 132 +- .../community-edition/buildGraalvmProduct.nix | 78 +- .../graalvm/community-edition/default.nix | 233 +- .../community-edition/graaljs/default.nix | 17 + .../community-edition/graaljs/hashes.nix | 22 + .../community-edition/graalnodejs/default.nix | 17 + .../community-edition/graalnodejs/hashes.nix | 22 + .../community-edition/graalpy/default.nix | 18 + .../community-edition/graalpy/hashes.nix | 22 + .../community-edition/graalvm-ce/default.nix | 12 + .../community-edition/graalvm-ce/hashes.nix | 22 + .../graalvm/community-edition/hashes.nix | 391 - .../community-edition/js-installable-svm.nix | 17 - .../llvm-installable-svm.nix | 18 - .../native-image-installable-svm.nix | 60 - .../nodejs-installable-svm.nix | 21 - .../python-installable-svm.nix | 18 - .../default.nix} | 21 +- .../community-edition/truffleruby/hashes.nix | 22 + .../graalvm/community-edition/update.sh | 141 +- .../wasm-installable-svm.nix | 22 - .../compilers/heptagon/default.nix | 28 +- .../intel-graphics-compiler/default.nix | 42 +- .../development/compilers/ispc/default.nix | 15 +- .../development/compilers/julia/1.9-bin.nix | 10 +- .../pkgs/development/compilers/julia/1.9.nix | 6 +- .../development/compilers/kotlin/default.nix | 4 +- .../development/compilers/kotlin/native.nix | 8 +- .../development/compilers/ldc/default.nix | 4 +- .../development/compilers/ldc/generic.nix | 3 +- .../development/compilers/lesscpy/default.nix | 4 +- .../development/compilers/ligo/default.nix | 27 +- .../compilers/llvm/10/bintools/default.nix | 34 - .../compilers/llvm/10/compiler-rt/default.nix | 2 +- .../development/compilers/llvm/10/default.nix | 7 +- .../compilers/llvm/10/libcxxabi/default.nix | 4 +- .../compilers/llvm/10/llvm/default.nix | 3 +- .../compilers/llvm/11/bintools/default.nix | 34 - .../llvm/11/compiler-rt/codesign.patch | 33 - .../compilers/llvm/11/compiler-rt/default.nix | 2 +- .../development/compilers/llvm/11/default.nix | 7 +- .../compilers/llvm/11/libcxxabi/default.nix | 4 +- .../llvm/11/libcxxabi/no-threads.patch | 12 - .../compilers/llvm/11/libcxxabi/wasm.patch | 16 - .../compilers/llvm/11/llvm/default.nix | 3 +- .../compilers/llvm/12/bintools/default.nix | 34 - .../llvm/12/compiler-rt/codesign.patch | 33 - .../compilers/llvm/12/compiler-rt/default.nix | 2 +- .../development/compilers/llvm/12/default.nix | 20 +- .../compilers/llvm/12/libcxxabi/default.nix | 2 +- .../compilers/llvm/12/libcxxabi/wasm.patch | 16 - .../compilers/llvm/12/llvm/default.nix | 3 +- .../compilers/llvm/13/bintools/default.nix | 35 - .../development/compilers/llvm/13/default.nix | 20 +- .../compilers/llvm/13/libcxxabi/default.nix | 2 +- .../compilers/llvm/13/libcxxabi/wasm.patch | 16 - .../compilers/llvm/13/llvm/default.nix | 3 +- .../compilers/llvm/14/bintools/default.nix | 35 - .../development/compilers/llvm/14/default.nix | 20 +- .../compilers/llvm/14/libcxxabi/default.nix | 2 +- .../compilers/llvm/14/libcxxabi/wasm.patch | 16 - .../compilers/llvm/14/llvm/default.nix | 3 +- .../compilers/llvm/15/bintools/default.nix | 37 - .../development/compilers/llvm/15/default.nix | 20 +- .../compilers/llvm/15/libcxx/default.nix | 11 +- .../compilers/llvm/15/libcxxabi/default.nix | 4 +- .../compilers/llvm/15/libcxxabi/wasm.patch | 16 - .../compilers/llvm/15/llvm/default.nix | 3 +- .../compilers/llvm/16/bintools/default.nix | 37 - .../development/compilers/llvm/16/default.nix | 20 +- .../compilers/llvm/16/libcxxabi/default.nix | 4 +- .../compilers/llvm/16/libcxxabi/wasm.patch | 16 - .../compilers/llvm/16/llvm/default.nix | 3 +- .../compilers/llvm/5/clang/default.nix | 2 +- .../development/compilers/llvm/5/default.nix | 3 +- .../compilers/llvm/5/llvm/default.nix | 3 +- .../compilers/llvm/6/clang/default.nix | 2 +- .../compilers/llvm/6/clang/purity.patch | 30 - .../development/compilers/llvm/6/default.nix | 3 +- .../compilers/llvm/6/llvm/default.nix | 3 +- .../compilers/llvm/7/bintools/default.nix | 34 - .../compilers/llvm/7/clang/default.nix | 2 +- .../compilers/llvm/7/clang/purity.patch | 30 - .../llvm/7/compiler-rt/codesign.patch | 33 - .../compilers/llvm/7/compiler-rt/default.nix | 2 +- .../development/compilers/llvm/7/default.nix | 5 +- .../compilers/llvm/7/llvm/default.nix | 3 +- .../compilers/llvm/8/bintools/default.nix | 34 - .../compilers/llvm/8/clang/default.nix | 2 +- .../compilers/llvm/8/clang/purity.patch | 30 - .../llvm/8/compiler-rt/codesign.patch | 33 - .../compilers/llvm/8/compiler-rt/default.nix | 2 +- .../development/compilers/llvm/8/default.nix | 5 +- .../compilers/llvm/8/libcxxabi/default.nix | 2 +- .../llvm/8/libcxxabi/no-threads.patch | 12 - .../compilers/llvm/8/libcxxabi/wasm.patch | 16 - .../compilers/llvm/8/llvm/default.nix | 3 +- .../compilers/llvm/9/bintools/default.nix | 34 - .../llvm/9/compiler-rt/codesign.patch | 33 - .../compilers/llvm/9/compiler-rt/default.nix | 2 +- .../development/compilers/llvm/9/default.nix | 5 +- .../compilers/llvm/9/libcxxabi/default.nix | 4 +- .../llvm/9/libcxxabi/no-threads.patch | 12 - .../compilers/llvm/9/libcxxabi/wasm.patch | 16 - .../compilers/llvm/9/llvm/default.nix | 3 +- .../compilers/llvm/common/bintools.nix | 48 + .../clang/5-8-purity.patch} | 0 .../compiler-rt/7-12-codesign.patch} | 0 .../{10 => common}/libcxxabi/no-threads.patch | 0 .../llvm/{10 => common}/libcxxabi/wasm.patch | 0 .../compilers/llvm/common/lldb.nix | 69 +- .../compilers/llvm/git/bintools/default.nix | 37 - .../compilers/llvm/git/default.nix | 30 +- .../compilers/llvm/git/libcxxabi/default.nix | 4 +- .../compilers/llvm/git/libcxxabi/wasm.patch | 16 - .../compilers/llvm/git/lldb/default.nix | 144 - .../compilers/llvm/git/llvm/default.nix | 3 +- .../development/compilers/lobster/default.nix | 4 +- .../development/compilers/lunarml/default.nix | 22 +- .../development/compilers/mercury/default.nix | 4 +- .../compilers/minimacy/default.nix | 4 +- .../development/compilers/mlkit/default.nix | 4 +- .../development/compilers/nim/default.nix | 59 +- .../development/compilers/nim/openssl.patch | 458 + .../pkgs/development/compilers/ocaml/5.1.nix | 6 + .../pkgs/development/compilers/openjdk/21.nix | 188 + .../compilers/openjdk/darwin/11.nix | 92 - .../compilers/openjdk/darwin/16.nix | 92 - .../compilers/openjdk/darwin/17.nix | 92 - .../compilers/openjdk/darwin/18.nix | 92 - .../compilers/openjdk/darwin/19.nix | 92 - .../compilers/openjdk/darwin/20.nix | 92 - .../compilers/openjdk/darwin/8.nix | 96 - .../compilers/openjdk/darwin/meta.nix | 4 - .../openjdk/fix-java-home-jdk21.patch | 14 + .../compilers/openjdk/openjfx/21.nix | 113 + .../development/compilers/ponyc/default.nix | 14 +- .../compilers/ponyc/fix-darwin-build.patch | 22 + .../compilers/ponyc/pony-corral.nix | 18 +- .../purescript/purescript/default.nix | 8 +- .../development/compilers/reason/default.nix | 6 +- .../compilers/reason/tests/hello/default.nix | 7 +- .../compilers/reason/tests/hello/dune-project | 1 + .../compilers/rust/{1_71.nix => 1_72.nix} | 34 +- .../rust/cargo-auditable-cargo-wrapper.nix | 15 +- .../compilers/rust/cargo_cross.nix | 14 + .../development/compilers/rust/default.nix | 14 +- .../pkgs/development/compilers/rust/rustc.nix | 46 +- .../pkgs/development/compilers/sbcl/2.x.nix | 12 +- .../pkgs/development/compilers/scala/2.x.nix | 6 +- .../pkgs/development/compilers/scala/bare.nix | 6 +- .../compilers/scryer-prolog/Cargo.lock | 1693 +- .../compilers/scryer-prolog/default.nix | 7 +- .../development/compilers/seexpr/default.nix | 47 - .../development/compilers/solc/default.nix | 10 +- .../development/compilers/solc/tests.patch | 14 - .../spirv-llvm-translator/default.nix | 18 +- .../development/compilers/stanc/default.nix | 4 +- .../compilers/swi-prolog/default.nix | 4 +- .../development/compilers/tinygo/default.nix | 2 +- .../compilers/typescript/default.nix | 6 +- .../development/compilers/unison/default.nix | 6 +- .../development/compilers/vala/default.nix | 6 +- .../development/compilers/yosys/default.nix | 6 +- .../compilers/yosys/fix-clang-build.patch | 28 +- .../compilers/yosys/plugins/symbiflow.nix | 5 +- .../pkgs/development/compilers/zig/hook.nix | 20 + .../development/compilers/zig/setup-hook.sh | 26 +- .../pkgs/development/compilers/zulu/11.nix | 42 + .../pkgs/development/compilers/zulu/16.nix | 26 + .../pkgs/development/compilers/zulu/17.nix | 42 + .../pkgs/development/compilers/zulu/18.nix | 26 + .../pkgs/development/compilers/zulu/19.nix | 26 + .../pkgs/development/compilers/zulu/20.nix | 26 + .../pkgs/development/compilers/zulu/21.nix | 42 + .../pkgs/development/compilers/zulu/8.nix | 146 +- .../development/compilers/zulu/common.nix | 159 + .../development/compilers/zulu/default.nix | 125 - .../coq-modules/Cheerios/default.nix | 2 +- .../development/coq-modules/CoLoR/default.nix | 2 +- .../development/coq-modules/HoTT/default.nix | 5 +- .../coq-modules/InfSeqExt/default.nix | 2 +- .../coq-modules/LibHyps/default.nix | 2 +- .../coq-modules/StructTact/default.nix | 2 +- .../development/coq-modules/Verdi/default.nix | 2 +- .../coq-modules/aac-tactics/default.nix | 2 + .../coq-modules/addition-chains/default.nix | 2 +- .../coq-modules/autosubst/default.nix | 2 +- .../coq-modules/bignums/default.nix | 3 +- .../development/coq-modules/ceres/default.nix | 2 +- .../coq-modules/compcert/default.nix | 19 +- .../coq-modules/coq-elpi/default.nix | 10 +- .../coq-modules/coq-ext-lib/default.nix | 2 +- .../coq-modules/coq-lsp/default.nix | 2 + .../coq-modules/coq-record-update/default.nix | 2 +- .../coq-modules/coqeal/default.nix | 2 +- .../coq-modules/coqprime/default.nix | 2 +- .../coq-modules/coquelicot/default.nix | 2 +- .../coq-modules/deriving/default.nix | 2 +- .../coq-modules/equations/default.nix | 3 + .../coq-modules/extructures/default.nix | 2 +- .../development/coq-modules/flocq/default.nix | 2 + .../coq-modules/fourcolor/default.nix | 4 +- .../coq-modules/hierarchy-builder/default.nix | 2 + .../coq-modules/itauto/default.nix | 5 + .../mathcomp-algebra-tactics/default.nix | 2 +- .../mathcomp-bigenough/default.nix | 2 +- .../coq-modules/mathcomp-finmap/default.nix | 6 +- .../coq-modules/mathcomp-tarjan/default.nix | 10 +- .../coq-modules/mathcomp-word/default.nix | 2 +- .../coq-modules/mathcomp-zify/default.nix | 6 +- .../coq-modules/mathcomp/default.nix | 4 +- .../coq-modules/metalib/default.nix | 2 +- .../coq-modules/multinomials/default.nix | 6 +- .../development/coq-modules/paco/default.nix | 2 +- .../coq-modules/paramcoq/default.nix | 3 +- .../coq-modules/parsec/default.nix | 2 +- .../coq-modules/reglang/default.nix | 2 +- .../coq-modules/semantics/default.nix | 2 +- .../coq-modules/serapi/default.nix | 6 + .../coq-modules/serapi/janestreet-0.16.patch | 17 + .../coq-modules/simple-io/default.nix | 2 +- .../coq-modules/topology/default.nix | 2 + .../development/coq-modules/trakt/default.nix | 2 +- .../coq-modules/zorns-lemma/default.nix | 3 + .../embedded/arduino/arduino-cli/default.nix | 6 +- .../arduino-language-server/default.nix | 6 +- .../development/embedded/blisp/default.nix | 21 +- .../embedded/fpga/apio/default.nix | 7 +- .../embedded/stm32/stm32cubemx/default.nix | 26 +- .../development/embedded/svdtools/default.nix | 6 +- .../development/embedded/wch-isp/default.nix | 4 +- .../guile-modules/guile-gnutls/default.nix | 4 +- .../guile-modules/guile-lib/default.nix | 10 +- .../guile-modules/guile-ssh/default.nix | 43 +- .../development/haskell-modules/HACKING.md | 2 +- .../haskell-modules/configuration-common.nix | 190 +- .../configuration-ghc-8.10.x.nix | 20 +- .../configuration-ghc-9.0.x.nix | 4 + .../configuration-ghc-9.2.x.nix | 4 + .../configuration-ghc-9.6.x.nix | 42 +- .../configuration-ghc-9.8.x.nix | 6 - .../configuration-hackage2nix/broken.yaml | 12691 ++-- .../configuration-hackage2nix/main.yaml | 30 +- .../configuration-hackage2nix/stackage.yaml | 248 +- .../transitive-broken.yaml | 693 +- .../haskell-modules/configuration-nix.nix | 36 +- .../haskell-modules/hackage-packages.nix | 13890 ++-- .../patches/bloomfilter-fix-on-32bit.patch | 28 - .../interpreters/babashka/default.nix | 8 +- .../interpreters/babashka/wrapped.nix | 1 + .../interpreters/bqn/cbqn/default.nix | 5 +- .../interpreters/bqn/cbqn/singeli.nix | 6 +- .../interpreters/cel-go/default.nix | 14 +- .../interpreters/cel-go/go-mod-tidy.patch | 52 + .../clisp/bits_ipctypes_to_sys_ipc.patch | 12 - .../interpreters/clisp/default.nix | 89 +- .../interpreters/clisp/gnulib_aarch64.patch | 13 + .../development/interpreters/clisp/hg.nix | 98 - .../clisp/remove-cfree-binding.patch | 12 - .../interpreters/clojure/default.nix | 9 +- .../interpreters/cyber/default.nix | 6 +- .../development/interpreters/elixir/1.15.nix | 4 +- .../interpreters/emilua/default.nix | 111 + .../development/interpreters/erlang/23.nix | 6 - .../development/interpreters/erlang/25.nix | 4 +- .../development/interpreters/erlang/26.nix | 4 +- .../development/interpreters/expr/default.nix | 6 +- .../interpreters/femtolisp/default.nix | 1 + .../development/interpreters/hugs/default.nix | 1 + .../interpreters/janet/default.nix | 4 +- .../interpreters/joker/default.nix | 6 +- .../interpreters/lambda-lisp/default.nix | 82 + .../interpreters/lambda-lisp/sources.nix | 50 + .../development/interpreters/luajit/2.0.nix | 10 +- .../development/interpreters/luajit/2.1.nix | 10 +- .../interpreters/luajit/default.nix | 2 + .../development/interpreters/luau/default.nix | 4 +- .../interpreters/micropython/default.nix | 7 +- .../development/interpreters/mujs/default.nix | 5 + .../interpreters/nickel/Cargo.lock | 3536 + .../interpreters/nickel/default.nix | 19 +- .../development/interpreters/oak/default.nix | 2 +- .../interpreters/octave/default.nix | 131 +- .../development/interpreters/perl/default.nix | 9 - .../pkgs/development/interpreters/php/8.1.nix | 4 +- .../pkgs/development/interpreters/php/8.2.nix | 4 +- .../pkgs/development/interpreters/php/8.3.nix | 6 +- .../development/interpreters/php/generic.nix | 6 +- .../interpreters/python/cpython/default.nix | 97 +- .../interpreters/python/default.nix | 54 +- .../interpreters/python/hooks/default.nix | 48 +- .../python/hooks/flit-build-hook.sh | 15 - .../python/hooks/pypa-build-hook-test.nix | 32 + .../python/hooks/pypa-build-hook.sh | 2 +- .../python/hooks/pypa-install-hook.sh | 26 + .../python/hooks/python-relax-deps-hook.sh | 17 +- .../python/mk-python-derivation.nix | 85 +- .../python/python-packages-base.nix | 9 +- .../python/python2/mk-python-derivation.nix | 250 + .../development/interpreters/python/tests.nix | 11 +- .../interpreters/rakudo/default.nix | 4 +- .../interpreters/rakudo/moarvm.nix | 4 +- .../development/interpreters/rakudo/nqp.nix | 4 +- .../development/interpreters/rakudo/zef.nix | 4 +- .../interpreters/risor/default.nix | 14 +- .../development/interpreters/ruby/default.nix | 6 +- .../interpreters/ruby/rubygems/default.nix | 4 +- .../development/interpreters/self/default.nix | 45 - .../pkgs/development/interpreters/self/self | 18 - .../interpreters/spidermonkey/115.nix | 4 + .../interpreters/spidermonkey/common.nix | 4 + .../development/interpreters/tcl/generic.nix | 19 +- .../development/interpreters/wamr/default.nix | 5 +- .../interpreters/wasmer/default.nix | 9 +- .../interpreters/wasmtime/default.nix | 11 +- ...cy-due-to-cargo-auditable-limitation.patch | 26 + .../interpreters/wazero/default.nix | 5 +- .../interpreters/yabasic/default.nix | 4 +- .../development/java-modules/jna/default.nix | 2 +- .../development/libraries/SDL2/default.nix | 18 +- .../development/libraries/SDL2_mixer/2_0.nix | 12 + ...-incompatible-pointer-comparison-fix.patch | 26 + .../libraries/SDL2_ttf/default.nix | 7 +- .../libraries/SDL_compat/default.nix | 4 +- .../libraries/abseil-cpp/202308.nix | 42 + .../development/libraries/amdvlk/default.nix | 4 +- .../libraries/armadillo/default.nix | 4 +- .../arrow-cpp/cmake-find-protobuf.patch | 103 +- .../libraries/arrow-cpp/darwin.patch | 11 - .../libraries/arrow-cpp/default.nix | 7 +- .../development/libraries/assimp/default.nix | 4 +- .../libraries/audio/zix/default.nix | 2 +- .../development/libraries/avahi/default.nix | 7 + .../libraries/ayatana-ido/default.nix | 4 +- .../development/libraries/azmq/default.nix | 43 + .../libraries/backward-cpp/default.nix | 2 +- .../libraries/bctoolbox/default.nix | 4 +- .../development/libraries/belcard/default.nix | 4 +- .../libraries/belle-sip/default.nix | 4 +- .../development/libraries/belr/default.nix | 4 +- .../pkgs/development/libraries/boost/1.83.nix | 14 + .../development/libraries/boost/default.nix | 1 + .../development/libraries/boost/generic.nix | 23 +- .../libraries/boringssl/default.nix | 11 +- .../development/libraries/bzrtp/default.nix | 7 +- .../development/libraries/c-ares/default.nix | 3 +- .../libraries/capnproto/default.nix | 6 +- .../development/libraries/cdo/default.nix | 6 +- .../development/libraries/cgreen/default.nix | 4 +- .../development/libraries/cm256cc/default.nix | 12 +- .../libraries/comedilib/default.nix | 6 +- .../libraries/cpp-utilities/default.nix | 12 +- .../libraries/cracklib/default.nix | 6 +- .../libraries/ctranslate2/default.nix | 15 +- .../libraries/cyclonedds/default.nix | 4 +- .../development/libraries/dab_lib/default.nix | 2 +- .../development/libraries/dav1d/default.nix | 16 + .../libraries/discord-gamesdk/default.nix | 11 +- .../development/libraries/dqlite/default.nix | 4 +- .../development/libraries/drogon/default.nix | 28 +- .../development/libraries/dssi/default.nix | 4 +- .../development/libraries/duckdb/default.nix | 22 +- .../libraries/duckdb/version.patch | 26 +- .../elementary-cmake-modules/default.nix | 29 - .../elementary-cmake-modules/setup-hook.sh | 4 - .../development/libraries/elpa/default.nix | 17 +- .../development/libraries/enchant/2.x.nix | 4 +- .../development/libraries/exempi/default.nix | 4 +- .../development/libraries/exiv2/default.nix | 93 +- .../0001-Do-not-require-wget-and-unzip.patch | 34 + .../development/libraries/fastcdr/default.nix | 56 + .../development/libraries/faudio/default.nix | 4 +- .../development/libraries/fbjni/default.nix | 54 + .../development/libraries/fdk-aac/default.nix | 4 +- .../pkgs/development/libraries/ffmpeg/4.nix | 14 +- .../pkgs/development/libraries/ffmpeg/5.nix | 2 +- .../pkgs/development/libraries/ffmpeg/6.nix | 2 +- .../development/libraries/ffmpeg/generic.nix | 15 +- .../libraries/flatbuffers/default.nix | 9 +- .../development/libraries/flatcc/default.nix | 1 - .../libraries/flatpak/binary-path.patch | 29 + .../development/libraries/flatpak/default.nix | 12 +- .../development/libraries/fmt/default.nix | 4 +- .../libraries/fortify-headers/default.nix | 11 +- .../fortify-headers/restore-macros.patch | 283 + .../fortify-headers/wchar-imports-skip.patch | 41 + .../development/libraries/freetds/default.nix | 5 +- .../libraries/freetype/default.nix | 3 +- .../libraries/functionalplus/default.nix | 4 +- .../libraries/futuresql/default.nix | 16 + .../development/libraries/gdal/default.nix | 4 +- .../development/libraries/gegl/default.nix | 20 +- .../development/libraries/geos/default.nix | 20 +- .../pkgs/development/libraries/geos/tests.nix | 15 + ...msginit-Do-not-use-POT-Creation-Date.patch | 32 + .../development/libraries/gettext/default.nix | 3 + .../development/libraries/gf2x/default.nix | 12 +- .../libraries/glfw/3.x-wayland-minecraft.nix | 55 + .../development/libraries/glog/default.nix | 34 +- .../development/libraries/glpk/default.nix | 2 +- .../pkgs/development/libraries/gmime/3.nix | 4 +- .../libraries/gnu-config/default.nix | 26 +- .../development/libraries/gpgme/default.nix | 4 +- ...de-to-search-for-the-LibXml2-package.patch | 25 + .../libraries/gr-framework/default.nix | 19 +- .../graphene-hardened-malloc/default.nix | 4 +- .../development/libraries/grpc/default.nix | 9 +- .../libraries/gstreamer/rs/Cargo.lock | 1388 +- .../libraries/gstreamer/rs/default.nix | 20 +- .../pkgs/development/libraries/gtk/3.x.nix | 7 +- .../pkgs/development/libraries/gtk/4.x.nix | 9 + .../pkgs/development/libraries/gtkmm/3.x.nix | 4 +- .../libraries/gvm-libs/default.nix | 4 +- .../development/libraries/hax11/default.nix | 50 + .../libraries/hmat-oss/default.nix | 4 +- .../development/libraries/hpp-fcl/default.nix | 4 +- .../development/libraries/httplib/default.nix | 4 +- .../libraries/hunspell/dictionaries.nix | 14 +- .../development/libraries/hwloc/default.nix | 4 +- .../libraries/hyperscan/default.nix | 40 +- .../development/libraries/igraph/default.nix | 20 +- .../development/libraries/imgui/default.nix | 4 +- .../development/libraries/imlib2/default.nix | 6 +- .../development/libraries/inih/default.nix | 4 +- .../libraries/intel-gmmlib/default.nix | 14 +- .../libraries/java/commons/bcel/default.nix | 4 +- .../java/commons/compress/default.nix | 4 +- .../libraries/java/commons/lang/default.nix | 25 +- .../libraries/java/mockobjects/default.nix | 2 +- .../libraries/jbig2enc/default.nix | 8 + .../libraries/jellyfin-ffmpeg/default.nix | 4 +- .../development/libraries/kcp/default.nix | 27 + .../development/libraries/kdb/default.nix | 6 +- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/kio/default.nix | 10 + .../libraries/kde-frameworks/kirigami2.nix | 6 +- .../libraries/kde-frameworks/srcs.nix | 666 +- .../libraries/keybinder3/default.nix | 2 +- .../libraries/kirigami-addons/default.nix | 4 +- .../libraries/kpeoplevcard/default.nix | 14 +- .../development/libraries/lcrq/default.nix | 6 +- .../development/libraries/ldacbt/default.nix | 3 +- .../libraries/level-zero/default.nix | 4 +- .../libraries/libadwaita/default.nix | 4 +- .../development/libraries/libaec/default.nix | 6 +- .../libraries/libarchive/default.nix | 26 +- .../development/libraries/libavif/default.nix | 7 +- .../libraries/libayatana-common/default.nix | 4 +- .../libraries/libblockdev/default.nix | 4 +- .../libbsd/darwin-fix-libbsd.sym.patch | 15 + .../development/libraries/libbsd/darwin.patch | 309 - .../development/libraries/libbsd/default.nix | 47 +- .../development/libraries/libburn/default.nix | 20 - .../development/libraries/libcef/default.nix | 10 +- .../development/libraries/libcerf/default.nix | 4 +- .../libraries/libcifpp/default.nix | 13 +- .../development/libraries/libcint/default.nix | 4 +- .../libraries/libcouchbase/default.nix | 4 +- .../libraries/libdatachannel/default.nix | 29 +- .../libraries/libdeltachat/Cargo.lock | 42 +- .../libraries/libdeltachat/default.nix | 4 +- .../libraries/libdigidocpp/default.nix | 4 +- .../development/libraries/libdrm/default.nix | 2 +- .../libraries/libdwarf/20210528.nix | 2 +- .../development/libraries/libdwarf/common.nix | 4 +- .../libraries/libdwarf/default.nix | 2 +- .../development/libraries/libei/default.nix | 4 +- .../development/libraries/liberio/default.nix | 4 +- .../libraries/libetpan/default.nix | 64 +- .../libraries/libfabric/default.nix | 4 +- .../libraries/libfprint/default.nix | 4 +- .../libraries/libfyaml/default.nix | 24 +- .../development/libraries/libgit2/default.nix | 18 +- .../libraries/libglibutil/default.nix | 4 +- .../libraries/libgourou/default.nix | 16 +- .../libraries/libgphoto2/default.nix | 4 +- .../development/libraries/libharu/default.nix | 4 +- .../development/libraries/libhwy/default.nix | 22 +- .../development/libraries/libicns/default.nix | 26 +- .../libraries/libiconv/default.nix | 2 +- .../libraries/libimagequant/Cargo.lock | 70 +- .../libraries/libimagequant/default.nix | 4 +- .../development/libraries/libime/default.nix | 6 +- .../libraries/libinput/default.nix | 4 +- .../libraries/libisoburn/default.nix | 22 - .../libraries/libisofs/default.nix | 32 - .../development/libraries/libite/default.nix | 4 +- .../libraries/libjpeg-turbo/default.nix | 11 +- .../development/libraries/libjpeg/default.nix | 14 +- .../libraries/libjreen/default.nix | 21 - .../libraries/libkcapi/default.nix | 53 + .../development/libraries/libksba/default.nix | 4 +- .../development/libraries/liblc3/default.nix | 4 +- .../liblinphone/backport-cpp17.patch | 98 + .../libraries/liblinphone/default.nix | 16 +- .../libraries/liblouis/default.nix | 4 +- .../development/libraries/libmbim/default.nix | 19 + .../libraries/libmcrypt/default.nix | 8 +- .../development/libraries/libmd/default.nix | 27 +- .../libraries/libmediainfo/default.nix | 4 +- .../libraries/libmodplug/default.nix | 5 + .../libraries/libmongocrypt/default.nix | 2 +- .../development/libraries/libmx/default.nix | 2 +- .../libmysqlconnectorcpp/default.nix | 4 +- .../development/libraries/libnbd/default.nix | 4 +- .../libraries/libngspice/default.nix | 4 +- .../libraries/libosmium/default.nix | 4 +- .../development/libraries/libotr/default.nix | 7 +- .../libraries/libowlevelzs/default.nix | 6 +- .../development/libraries/libpcap/default.nix | 16 + .../development/libraries/libpeas/default.nix | 1 + .../libraries/libpinyin/default.nix | 7 +- .../development/libraries/libpng/default.nix | 10 +- .../libraries/libqalculate/default.nix | 55 +- .../libraries/libquotient/default.nix | 4 +- .../development/libraries/libraw/default.nix | 30 +- .../libraries/librecast/default.nix | 4 +- .../libraries/libredwg/default.nix | 9 +- .../development/libraries/librime/default.nix | 5 +- .../libraries/librist/darwin.patch | 14 + .../development/libraries/librist/default.nix | 9 +- .../development/libraries/librsvg/default.nix | 21 + .../libraries/librtprocess/default.nix | 14 +- .../libraries/libsecret/default.nix | 1 + .../libraries/libsigcxx/default.nix | 2 +- .../development/libraries/libsmi/default.nix | 2 + .../libraries/libsndfile/default.nix | 36 +- .../development/libraries/libsolv/default.nix | 4 +- .../libraries/libspelling/default.nix | 12 +- .../libraries/libtommath/default.nix | 4 +- .../development/libraries/libtsm/default.nix | 2 +- .../development/libraries/libubox/default.nix | 6 +- .../libraries/libuchardet/default.nix | 2 +- .../development/libraries/libuev/default.nix | 23 + .../libraries/libunarr/default.nix | 30 +- .../libraries/libuninameslist/default.nix | 4 +- .../libraries/liburing/default.nix | 12 +- .../development/libraries/libuv/default.nix | 2 +- .../development/libraries/libvirt/default.nix | 4 +- .../development/libraries/libvpx/default.nix | 14 +- .../development/libraries/libwebp/default.nix | 4 +- .../libraries/libwtk-sdl2/default.nix | 6 +- .../development/libraries/libxc/default.nix | 2 + .../libraries/libxcrypt/default.nix | 3 + .../development/libraries/libxml2/default.nix | 6 +- .../development/libraries/libxsmm/default.nix | 8 + .../development/libraries/libyang/default.nix | 5 +- .../development/libraries/libyuv/default.nix | 9 + .../pkgs/development/libraries/libyuv/yuv.pc | 13 + .../development/libraries/libzen/default.nix | 2 +- .../development/libraries/libzip/default.nix | 6 +- .../development/libraries/lief/default.nix | 41 +- .../lightstep-tracer-cpp/default.nix | 2 +- .../development/libraries/lime/default.nix | 4 +- .../libraries/linenoise-ng/default.nix | 2 +- .../libraries/liquidfun/default.nix | 2 +- .../development/libraries/llhttp/default.nix | 21 +- .../development/libraries/lmdb/default.nix | 5 + .../libraries/mailcore2/default.nix | 2 +- .../development/libraries/mdds/default.nix | 4 +- .../libraries/mediastreamer/default.nix | 4 +- .../libraries/mesa-glu/default.nix | 24 +- .../development/libraries/mesa/default.nix | 4 +- .../development/libraries/mlt/default.nix | 4 +- .../development/libraries/mongoc/default.nix | 4 +- .../development/libraries/mpfi/default.nix | 27 +- .../development/libraries/mpfr/default.nix | 4 +- .../development/libraries/mpir/default.nix | 13 +- .../development/libraries/mps/default.nix | 18 +- .../libraries/muparserx/default.nix | 4 - .../development/libraries/neatvnc/default.nix | 4 +- .../development/libraries/netcdf/default.nix | 10 +- .../development/libraries/nghttp3/default.nix | 4 +- .../development/libraries/ngtcp2/default.nix | 11 +- .../development/libraries/ngtcp2/gnutls.nix | 4 +- .../development/libraries/nspr/default.nix | 2 +- .../development/libraries/nss/generic.nix | 6 +- .../pkgs/development/libraries/nss/latest.nix | 4 +- .../development/libraries/ntrack/default.nix | 34 - .../libraries/ntrack/libnl-fix.patch | 11 - .../development/libraries/nuspell/default.nix | 13 +- .../development/libraries/odpic/default.nix | 15 +- .../development/libraries/ogre/default.nix | 4 +- .../pkgs/development/libraries/oneDNN/2.nix | 26 +- .../development/libraries/oneDNN/default.nix | 24 +- .../libraries/onnxruntime/default.nix | 3 +- .../libraries/open62541/default.nix | 4 +- .../libraries/opencascade/default.nix | 65 - .../libraries/opencl-clang/default.nix | 128 +- .../libraries/opencomposite/default.nix | 59 + .../libraries/opencomposite/helper.nix | 18 + .../pkgs/development/libraries/opencv/3.x.nix | 12 +- .../pkgs/development/libraries/opencv/4.x.nix | 11 + .../pkgs/development/libraries/openexr/3.nix | 18 +- .../libraries/openexr/disable-iex-test.patch | 13 + .../libraries/openimageio/default.nix | 4 +- .../libraries/openscenegraph/default.nix | 16 +- .../development/libraries/openssl/default.nix | 5 +- .../libraries/opensubdiv/default.nix | 4 +- .../libraries/openturns/default.nix | 14 +- .../libraries/openxr-loader/default.nix | 4 +- .../oracle-instantclient/default.nix | 2 +- .../development/libraries/orcania/default.nix | 4 +- .../development/libraries/packr/default.nix | 8 +- .../development/libraries/pango/default.nix | 2 +- .../development/libraries/pdal/default.nix | 4 +- .../libraries/pdfhummus/default.nix | 4 +- .../libraries/pe-parse/default.nix | 14 +- .../libraries/phonon/backends/gstreamer.nix | 4 +- .../libraries/phonon/backends/vlc.nix | 4 +- .../development/libraries/phonon/default.nix | 4 +- .../physics/fastjet-contrib/default.nix | 4 +- .../libraries/pipewire/default.nix | 25 +- .../libraries/pipewire/wireplumber.nix | 42 +- .../development/libraries/pkger/default.nix | 4 +- .../development/libraries/plog/default.nix | 4 +- .../development/libraries/polkit/default.nix | 4 +- .../development/libraries/ppl/default.nix | 2 +- .../development/libraries/pplite/default.nix | 19 + .../development/libraries/prison/default.nix | 21 - .../development/libraries/proj/default.nix | 4 +- .../development/libraries/protobuf/3.17.nix | 6 - .../development/libraries/protobuf/3.19.nix | 6 - .../development/libraries/protobuf/3.24.nix | 6 + .../libraries/protobuf/generic-v3-cmake.nix | 154 +- .../libraries/protolock/default.nix | 2 +- .../libraries/psqlodbc/default.nix | 12 +- .../libraries/pulseaudio-qt/default.nix | 24 +- .../development/libraries/pupnp/default.nix | 4 +- .../libraries/qimageblitz/default.nix | 23 - .../qimageblitz-9999-exec-stack.patch | 11 - .../development/libraries/qpdf/default.nix | 4 +- .../libraries/qrupdate/default.nix | 10 +- .../libraries/qscintilla-qt4/default.nix | 67 - .../qscintilla-qt4/fix-qt4-build.patch | 11 - .../libraries/qscintilla/default.nix | 13 +- .../libraries/qt-4.x/4.8/clang-5-darwin.patch | 13 - .../libraries/qt-4.x/4.8/default.nix | 239 - .../qt-4.x/4.8/dlopen-absolute-paths.diff | 74 - .../libraries/qt-4.x/4.8/dlopen-gtkstyle.diff | 37 - .../libraries/qt-4.x/4.8/glib-2.32.patch | 12 - .../qt-4.x/4.8/kill-legacy-darwin-apis.patch | 330 - .../libraries/qt-4.x/4.8/libressl.patch | 64 - .../qt-4.x/4.8/parallel-configure.patch | 22 - .../qt-4.x/4.8/patch-qthread-stacksize.diff | 54 - .../libraries/qt-4.x/4.8/qmake-hook.sh | 21 - .../qsettings-recursive-global-mutex.patch | 17 - .../qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch | 11 - .../qt-4.x/4.8/qt-musl-iconv-no-bom.patch | 11 - .../libraries/qt-4.x/4.8/qt-musl.patch | 14 - .../libraries/qt-4.x/4.8/qt4-gcc6.patch | 33 - .../qt-4.x/4.8/qt4-openssl-1.1.patch | 398 - .../libraries/qt-5/5.15/default.nix | 19 +- .../9999-backport-dbus-crash.patch | 79 + .../libraries/qt-5/modules/qtbase.nix | 3 + .../libraries/qt-5/modules/qtimageformats.nix | 10 +- .../libraries/qt-5/modules/qttools.nix | 2 +- .../libraries/qt-5/modules/qttranslations.nix | 3 +- .../libraries/qt-5/modules/qtwayland.nix | 4 +- .../development/libraries/qt-5/qtModule.nix | 2 +- .../development/libraries/qt-6/default.nix | 29 +- .../pkgs/development/libraries/qt-6/fetch.sh | 2 +- .../libraries/qt-6/modules/qtbase.nix | 3 +- .../libraries/qt-6/modules/qtgrpc.nix | 2 + .../libraries/qt-6/modules/qtmqtt.nix | 4 +- .../libraries/qt-6/modules/qttranslations.nix | 3 +- .../libraries/qt-6/modules/qtwebengine.nix | 11 +- ...se-allow-translations-outside-prefix.patch | 13 + .../patches/qtwebengine-locales-path.patch | 28 + .../development/libraries/qt-6/qtModule.nix | 2 +- .../pkgs/development/libraries/qt-6/srcs.nix | 312 +- .../libraries/qt-mobility/default.nix | 54 - .../libraries/qtforkawesome/default.nix | 25 +- .../qtstyleplugin-kvantum-qt4/default.nix | 42 - .../qtstyleplugin-kvantum/default.nix | 18 +- .../libraries/qtutilities/default.nix | 32 +- .../development/libraries/quarto/default.nix | 24 +- .../development/libraries/quictls/default.nix | 4 +- .../pkgs/development/libraries/qwt/6_qt4.nix | 42 - .../libraries/rapidjson/default.nix | 2 +- .../development/libraries/re2/default.nix | 9 +- .../development/libraries/reproc/default.nix | 1 - .../libraries/restinio/default.nix | 4 +- .../libraries/rnnoise-plugin/default.nix | 2 - .../development/libraries/rocksdb/default.nix | 2 +- .../development/libraries/rtlcss/default.nix | 24 + .../development/libraries/s2n-tls/default.nix | 4 +- .../astronomy/stellarsolver/default.nix | 4 +- .../science/biology/mirtk/default.nix | 52 +- .../science/chemistry/tblite/python.nix | 9 +- .../science/math/amd-blis/default.nix | 16 +- .../math/amd-libflame/add-lapacke.diff | 34 - .../science/math/amd-libflame/default.nix | 72 +- .../libraries/science/math/cudnn/generic.nix | 87 +- .../libraries/science/math/dbcsr/default.nix | 10 +- .../libraries/science/math/magma/generic.nix | 14 +- .../libraries/science/math/magma/releases.nix | 4 +- .../science/math/mongoose/default.nix | 6 +- .../libraries/science/math/nccl/default.nix | 54 +- .../science/math/or-tools/default.nix | 5 +- .../or-tools/fix-stringview-compile.patch | 36 + .../science/math/p4est-sc/default.nix | 10 +- .../libraries/science/math/p4est/default.nix | 2 +- .../libraries/science/math/rubiks/default.nix | 8 +- .../science/math/scalapack/default.nix | 19 +- .../libraries/sdbus-cpp/default.nix | 4 +- .../libraries/seasocks/default.nix | 4 +- .../libraries/sentry-native/default.nix | 3 +- .../libraries/simdjson/default.nix | 4 +- .../libraries/simpleitk/default.nix | 4 +- .../development/libraries/smesh/default.nix | 35 - .../libraries/smokegen/default.nix | 23 - .../development/libraries/smokeqt/default.nix | 27 - .../development/libraries/smooth/default.nix | 21 +- .../development/libraries/snappy/default.nix | 9 +- .../development/libraries/spdlog/default.nix | 24 +- .../libraries/speexdsp/default.nix | 16 +- .../development/libraries/spglib/default.nix | 10 +- .../libraries/spirv-headers/default.nix | 4 +- .../libraries/sqlcipher/default.nix | 4 +- .../development/libraries/sqlite/default.nix | 21 +- .../development/libraries/sqlite/tools.nix | 4 +- .../libraries/sqlitecpp/default.nix | 29 +- .../libraries/swiftshader/default.nix | 35 +- .../development/libraries/taglib/default.nix | 12 +- .../libraries/tagparser/default.nix | 4 +- .../development/libraries/tbox/default.nix | 4 +- .../development/libraries/tdb/default.nix | 4 +- .../development/libraries/tdlib/default.nix | 6 +- .../development/libraries/tevent/default.nix | 4 +- .../libraries/the-foundation/default.nix | 4 +- .../development/libraries/tiledb/default.nix | 3 +- .../libraries/tpm2-tss/default.nix | 37 +- .../libraries/tracker-miners/default.nix | 14 +- .../development/libraries/tweeny/default.nix | 6 +- .../development/libraries/ubus/default.nix | 6 +- .../development/libraries/uci/default.nix | 6 +- .../development/libraries/uclient/default.nix | 6 +- .../development/libraries/ucx/default.nix | 8 +- .../libraries/unixODBC/default.nix | 4 +- .../libraries/unixODBCDrivers/default.nix | 120 +- .../mariadb-connector-odbc-unistd.patch | 12 + .../libraries/ustream-ssl/default.nix | 6 +- .../development/libraries/utf8cpp/default.nix | 5 +- .../pkgs/development/libraries/v8/default.nix | 2 +- .../libraries/valhalla/default.nix | 14 + .../libraries/vapoursynth/default.nix | 4 +- .../libraries/vectorscan/default.nix | 6 +- .../development/libraries/vkd3d/default.nix | 4 +- .../pkgs/development/libraries/volk/2.5.0.nix | 8 +- .../development/libraries/volk/default.nix | 8 +- .../pkgs/development/libraries/vtk/8.x.nix | 18 - .../libraries/vulkan-headers/default.nix | 4 +- .../libraries/vulkan-headers/update.sh | 3 +- .../libraries/vulkan-loader/default.nix | 4 +- .../vulkan-utility-libraries/default.nix | 24 + .../development/libraries/wayland/default.nix | 1 - .../libraries/webkitgtk/default.nix | 11 +- .../webkitgtk/fdo-backend-path.patch | 2 +- .../webrtc-audio-processing/default.nix | 34 +- .../libraries/wfa2-lib/default.nix | 37 + .../development/libraries/wlroots/default.nix | 2 +- .../development/libraries/wolfssl/default.nix | 19 +- .../libraries/xdg-dbus-proxy/default.nix | 38 +- .../development/libraries/xeus/default.nix | 4 +- .../development/libraries/xgboost/default.nix | 5 +- .../pkgs/development/libraries/xsimd/10.nix | 47 + .../development/libraries/xsimd/default.nix | 8 +- .../development/libraries/xtensor/default.nix | 52 +- .../yajl/cmake-shared-static-fix.patch | 89 + .../development/libraries/yajl/default.nix | 27 +- .../development/libraries/yas/default.nix | 2 +- .../development/libraries/yyjson/default.nix | 4 +- .../development/libraries/zint/default.nix | 1 + .../development/libraries/zlib-ng/default.nix | 13 +- .../development/libraries/zlib/default.nix | 12 +- .../libraries/zookeeper_mt/default.nix | 2 +- .../libraries/zxing-cpp/default.nix | 47 +- .../lisp-modules-new-obsolete/doc/api.md | 2 +- .../lisp-modules-new-obsolete/doc/nix-cl.md | 2 +- .../lisp-modules-new-obsolete/packages.nix | 100 - .../patches/qt-libs-dont-download.patch | 36 - .../development/lisp-modules/packages.nix | 186 +- .../patches/cffi-libffi-darwin-ffi-h.patch | 14 + .../patches/qtools-use-nix-libs.patch | 19 - .../lua-modules/generated-packages.nix | 35 +- .../development/lua-modules/overrides.nix | 4 +- .../development/misc/brev-cli/default.nix | 4 +- .../pkgs/development/misc/gokrazy/default.nix | 27 + .../misc/haskell/hasura/ekg-core.nix | 2 + .../misc/haskell/hasura/ekg-json.nix | 2 + .../misc/haskell/hasura/pg-client.nix | 2 + .../development/misc/haskell/hasura/update.sh | 2 +- .../pkgs/development/misc/juce/default.nix | 69 + .../pkgs/development/misc/resholve/README.md | 5 +- .../pkgs/development/misc/resholve/oildev.nix | 16 +- .../mobile/androidenv/build-app.nix | 2 +- .../mobile/androidenv/emulate-app.nix | 2 - .../development/mobile/cordova/default.nix | 28 + .../development/mobile/genymotion/default.nix | 4 +- .../development/mobile/gomobile/default.nix | 2 +- .../development/mobile/maestro/default.nix | 4 +- .../mobile/titanium-alloy/default.nix | 29 + .../development/mobile/titanium/default.nix | 29 + .../mobile/titaniumenv/default.nix | 4 +- .../nim-packages/atlas/default.nix | 23 + .../nim-packages/csvtools/default.nix | 19 + .../nim-packages/jsony/default.nix | 4 +- .../nim-packages/nimble/default.nix | 30 + .../nim-packages/safeseq/default.nix | 21 + .../development/node-packages/aliases.nix | 61 + .../node-packages/main-programs.nix | 18 +- .../node-packages/node-packages.json | 61 +- .../node-packages/node-packages.nix | 54933 +++------------- .../development/node-packages/overrides.nix | 145 +- .../ocaml-modules/algaeff/default.nix | 10 +- .../ocaml-modules/apron/default.nix | 17 +- .../development/ocaml-modules/arp/default.nix | 9 +- .../development/ocaml-modules/awa/default.nix | 4 +- .../development/ocaml-modules/b0/default.nix | 46 + .../ocaml-modules/batteries/default.nix | 22 +- .../ocaml-modules/bistro/default.nix | 2 + .../bistro/janestreet-0.16.patch | 205 + .../development/ocaml-modules/bwd/default.nix | 7 +- .../ocaml-modules/ca-certs-nss/default.nix | 5 +- .../ocaml-modules/camomile/default.nix | 75 +- .../ocaml-modules/cfstream/default.nix | 2 +- .../cfstream/janestreet-0.16.patch | 36 + .../ocaml-modules/charInfo_width/default.nix | 6 +- .../ocaml-modules/checkseum/default.nix | 12 +- .../ocaml-modules/conduit/mirage.nix | 8 +- .../ocaml-modules/containers/data.nix | 7 +- .../ocaml-modules/containers/default.nix | 6 +- .../ocaml-modules/decompress/default.nix | 5 +- .../ocaml-modules/dolmen/default.nix | 12 +- .../development/ocaml-modules/dolmen/loop.nix | 15 + .../development/ocaml-modules/dolmen/type.nix | 15 + .../ocaml-modules/domain_shims/default.nix | 22 + .../ocaml-modules/domainslib/default.nix | 16 +- .../ocaml-modules/earlybird/default.nix | 28 +- .../development/ocaml-modules/eio/default.nix | 4 +- .../ocaml-modules/eliom/default.nix | 6 +- .../ocaml-modules/elpi/default.nix | 8 +- .../ocaml-modules/ethernet/default.nix | 15 +- .../ocaml-modules/extlib/default.nix | 2 +- .../ocaml-modules/higlo/default.nix | 6 +- .../ocaml-modules/janestreet/0.16.nix | 1245 + .../janestreet/janePackage_0_16.nix | 30 + .../ocaml-modules/junit/default.nix | 3 +- .../ocaml-modules/kafka/default.nix | 2 - .../development/ocaml-modules/kafka/lwt.nix | 7 +- .../ocaml-modules/lame/default.nix | 4 +- .../ocaml-modules/lockfree/default.nix | 29 - .../development/ocaml-modules/lun/default.nix | 20 + .../development/ocaml-modules/lun/ppx.nix | 17 + .../ocaml-modules/lustre-v6/default.nix | 5 +- .../development/ocaml-modules/lwt/default.nix | 11 +- .../development/ocaml-modules/mdx/default.nix | 9 +- .../ocaml-modules/mirage-nat/default.nix | 6 +- .../ocaml-modules/mirage-stack/default.nix | 22 - .../ocaml-modules/msgpck/default.nix | 31 + .../ocaml-modules/ocaml-gettext/camomile.nix | 5 +- .../ocaml-migrate-parsetree/2.x.nix | 5 +- .../ocaml-modules/ocaml-protoc/default.nix | 19 +- .../ocaml-modules/ocamlgraph/default.nix | 10 +- .../ocaml-modules/ocamlgraph/gtk.nix | 2 +- .../ocaml-modules/ocolor/default.nix | 30 + .../ocaml-modules/ocplib-simplex/default.nix | 23 +- .../ocsigen-server/cohttp-5.patch | 31 - .../ocaml-modules/ocsigen-server/default.nix | 15 +- .../ocaml-modules/ocsigen-start/default.nix | 4 +- .../ocaml-modules/odig/default.nix | 25 + .../development/ocaml-modules/paf/default.nix | 3 - .../ocaml-modules/parany/default.nix | 23 +- .../ocaml-modules/pbrt/default.nix | 23 + .../development/ocaml-modules/pp/default.nix | 16 +- .../ocaml-modules/pp_loc/default.nix | 22 + .../ocaml-modules/pprint/default.nix | 4 +- .../ocaml-modules/ppx_deriving/default.nix | 12 +- .../ocaml-modules/ppx_tools/default.nix | 1 + .../ocaml-modules/ptime/default.nix | 3 + .../development/ocaml-modules/qcheck/core.nix | 5 +- .../development/ocaml-modules/re/default.nix | 4 +- .../ocaml-modules/saturn/default.nix | 21 + .../ocaml-modules/saturn/lockfree.nix | 24 + .../development/ocaml-modules/tar/default.nix | 10 +- .../development/ocaml-modules/tar/unix.nix | 6 +- .../ocaml-modules/tcpip/default.nix | 15 +- .../ocaml-modules/telegraml/default.nix | 5 +- .../development/ocaml-modules/tls/async.nix | 9 +- .../development/ocaml-modules/tls/default.nix | 16 +- .../development/ocaml-modules/tls/lwt.nix | 1 - .../development/ocaml-modules/tls/mirage.nix | 1 - .../ocaml-modules/trace/default.nix | 10 +- .../development/ocaml-modules/zed/default.nix | 7 +- .../ocaml-modules/zelus-gtk/default.nix | 24 + .../ocaml-modules/zelus/default.nix | 42 + .../development/ocaml-modules/zmq/default.nix | 10 +- .../development/ocaml-modules/zmq/lwt.nix | 5 +- .../perl-modules/sdl-modern-perl.patch | 64 + .../tk-configure-implicit-int-fix.patch | 11 + .../development/php-packages/box/default.nix | 39 +- .../php-packages/castor/default.nix | 50 + .../php-packages/composer/default.nix | 42 +- .../php-packages/memcache/default.nix | 31 + .../php-packages/mongodb/default.nix | 4 +- .../php-packages/opentelemetry/default.nix | 27 + .../php-packages/pdepend/default.nix | 41 - .../php-packages/phalcon/default.nix | 27 + .../development/php-packages/phan/default.nix | 4 +- .../php-packages/php-cs-fixer/default.nix | 4 +- .../php-packages/phpstan/default.nix | 40 +- .../php-packages/psalm/composer.lock | 4636 ++ .../php-packages/psalm/default.nix | 42 +- .../php-packages/psysh/composer.lock | 929 + .../php-packages/psysh/default.nix | 41 +- .../php-packages/redis/default.nix | 4 +- .../development/php-packages/rrd/default.nix | 17 + .../python-modules/aardwolf/default.nix | 6 +- .../python-modules/about-time/default.nix | 31 + .../python-modules/acquire/default.nix | 6 +- .../python-modules/acunetix/default.nix | 42 + .../adafruit-platformdetect/default.nix | 4 +- .../python-modules/adax/default.nix | 13 +- .../python-modules/adb-shell/default.nix | 10 +- .../add-trailing-comma/default.nix | 4 +- .../python-modules/adlfs/default.nix | 4 +- .../python-modules/aemet-opendata/default.nix | 23 +- .../python-modules/aesara/default.nix | 4 +- .../python-modules/afdko/default.nix | 2 + .../python-modules/ailment/default.nix | 4 +- .../python-modules/aio-pika/default.nix | 4 +- .../aioairzone-cloud/default.nix | 4 +- .../python-modules/aioairzone/default.nix | 6 +- .../aioaladdinconnect/default.nix | 4 +- .../python-modules/aioambient/default.nix | 21 +- .../python-modules/aioapns/default.nix | 4 +- .../python-modules/aioaseko/default.nix | 9 +- .../python-modules/aiobafi6/default.nix | 4 +- .../python-modules/aiobiketrax/default.nix | 4 +- .../python-modules/aioboto3/default.nix | 73 + .../python-modules/aiocomelit/default.nix | 52 + .../python-modules/aiodiscover/default.nix | 4 +- .../python-modules/aioesphomeapi/default.nix | 4 +- .../python-modules/aioflo/default.nix | 17 + .../python-modules/aiogram/default.nix | 6 + .../python-modules/aioguardian/default.nix | 19 +- .../python-modules/aiohomekit/default.nix | 4 +- .../aiohttp-basicauth/default.nix | 41 + .../aiohttp-openmetrics/default.nix | 13 +- .../aiohttp-remotes/default.nix | 7 +- .../python-modules/aiohttp-socks/default.nix | 4 +- .../python-modules/aiohue/default.nix | 22 +- .../python-modules/aiolifx-themes/default.nix | 4 +- .../python-modules/aiolyric/default.nix | 8 +- .../python-modules/aiomisc/default.nix | 4 +- .../python-modules/aiomqtt/default.nix | 6 +- .../python-modules/aionotion/default.nix | 17 + .../python-modules/aiopegelonline/default.nix | 46 + .../python-modules/aioprocessing/default.nix | 2 +- .../python-modules/aioprometheus/default.nix | 65 + .../python-modules/aiopurpleair/default.nix | 17 + .../python-modules/aioqsw/default.nix | 4 +- .../aioquic-mitmproxy/default.nix | 51 + .../python-modules/aioquic/default.nix | 45 +- .../python-modules/aiorecollect/default.nix | 17 +- .../python-modules/aioredis/default.nix | 16 +- .../python-modules/aioridwell/default.nix | 21 +- .../python-modules/aioruckus/default.nix | 67 + .../python-modules/aiorun/default.nix | 16 +- .../python-modules/aioshelly/default.nix | 4 +- .../python-modules/aiosmb/default.nix | 6 +- .../python-modules/aiosomecomfort/default.nix | 4 +- .../python-modules/aiostream/default.nix | 35 +- .../python-modules/aiotractive/default.nix | 5 +- .../python-modules/aiounifi/default.nix | 27 +- .../python-modules/aiovodafone/default.nix | 54 + .../python-modules/aiowaqi/default.nix | 60 + .../python-modules/aiowatttime/default.nix | 21 +- .../python-modules/airthings-ble/default.nix | 4 +- .../python-modules/alexapy/default.nix | 8 +- .../python-modules/alive-progress/default.nix | 41 + .../aliyun-python-sdk-config/default.nix | 4 +- .../aliyun-python-sdk-core/default.nix | 4 +- .../aliyun-python-sdk-iot/default.nix | 4 +- .../aliyun-python-sdk-kms/default.nix | 4 +- .../python-modules/altgraph/default.nix | 4 +- .../python-modules/amaranth-soc/default.nix | 8 +- .../python-modules/amaranth/default.nix | 55 +- .../python-modules/amcrest/default.nix | 15 +- .../python-modules/androidtv/default.nix | 6 +- .../androidtvremote2/default.nix | 4 +- .../anel-pwrctrl-homeassistant/default.nix | 30 + .../python-modules/angr/default.nix | 4 +- .../python-modules/ansi2image/default.nix | 48 + .../python-modules/ansible-compat/default.nix | 4 +- .../ansible-pylibssh/default.nix | 54 + .../python-modules/ansible-runner/default.nix | 4 +- .../python-modules/ansible/core.nix | 6 +- .../python-modules/ansible/default.nix | 7 +- .../python-modules/anthemav/default.nix | 46 + .../python-modules/anthropic/default.nix | 14 +- .../antlr4-python3-runtime/default.nix | 16 +- .../python-modules/anyio/default.nix | 4 +- .../python-modules/anyqt/default.nix | 44 + .../python-modules/anytree/default.nix | 51 +- .../python-modules/anywidget/default.nix | 14 +- .../python-modules/apischema/default.nix | 45 + .../python-modules/apkit/default.nix | 36 + .../python-modules/app-model/default.nix | 4 +- .../python-modules/apprise/default.nix | 4 +- .../python-modules/approvaltests/default.nix | 28 +- .../appthreat-vulnerability-db/default.nix | 4 +- .../python-modules/apptools/default.nix | 25 +- .../python-modules/apscheduler/default.nix | 4 +- .../python-modules/apycula/default.nix | 4 +- .../python-modules/archinfo/default.nix | 4 +- .../python-modules/argh/default.nix | 4 +- .../python-modules/argilla/default.nix | 4 +- .../python-modules/argon2-cffi/default.nix | 7 +- .../python-modules/art/default.nix | 4 +- .../python-modules/asdf/default.nix | 2 + .../python-modules/astroid/default.nix | 4 + .../astropy-extension-helpers/default.nix | 17 +- .../permissions.patch | 20 - .../astropy-healpix/default.nix | 4 +- .../python-modules/astropy/default.nix | 50 +- .../python-modules/astroquery/default.nix | 2 + .../python-modules/asyauth/default.nix | 4 +- .../async-tkinter-loop/default.nix | 4 +- .../async-upnp-client/default.nix | 4 +- .../python-modules/asyncinotify/default.nix | 7 +- .../python-modules/asyncpg/default.nix | 4 +- .../python-modules/asyncsleepiq/default.nix | 4 +- .../python-modules/asyncstdlib/default.nix | 7 +- .../python-modules/asyncua/default.nix | 14 +- .../python-modules/asysocks/default.nix | 4 +- .../atlassian-python-api/default.nix | 4 +- .../python-modules/atom/default.nix | 4 +- .../default.nix | 0 .../python-modules/attrs/default.nix | 20 +- .../attrs/remove-hatch-plugins.patch | 74 + .../python-modules/auditok/default.nix | 44 + .../python-modules/autarco/default.nix | 26 +- .../python-modules/auth0-python/default.nix | 12 +- .../python-modules/authheaders/default.nix | 6 +- .../python-modules/autofaiss/default.nix | 4 +- .../python-modules/automx2/default.nix | 46 + .../python-modules/autoslot/default.nix | 47 + .../python-modules/awacs/default.nix | 4 +- .../python-modules/awkward-cpp/default.nix | 8 +- .../aws-encryption-sdk/default.nix | 54 + .../aws-lambda-builders/default.nix | 9 +- .../aws-sam-translator/default.nix | 35 +- .../python-modules/awscrt/default.nix | 4 +- .../azure-data-tables/default.nix | 26 +- .../azure-eventgrid/default.nix | 21 +- .../python-modules/azure-identity/default.nix | 4 +- .../azure-mgmt-appcontainers/default.nix | 20 +- .../azure-mgmt-compute/default.nix | 15 +- .../azure-mgmt-containerservice/default.nix | 18 +- .../azure-mgmt-iothub/default.nix | 26 +- .../azure-mgmt-maps/default.nix | 33 +- .../azure-mgmt-monitor/default.nix | 20 +- .../azure-mgmt-network/default.nix | 20 +- .../azure-mgmt-recoveryservices/default.nix | 16 +- .../azure-mgmt-redhatopenshift/default.nix | 30 +- .../azure-mgmt-redis/default.nix | 33 +- .../azure-servicebus/default.nix | 14 +- .../azure-storage-blob/default.nix | 11 +- .../azure-storage-file-share/default.nix | 15 +- .../azure-storage-queue/default.nix | 34 +- .../python-modules/b2sdk/default.nix | 16 +- .../python-modules/base64io/default.nix | 29 + .../python-modules/bash_kernel/default.nix | 5 +- .../python-modules/baycomp/default.nix | 35 + .../python-modules/beancount/default.nix | 4 +- .../python-modules/beautiful-date/default.nix | 43 + .../python-modules/beautifulsoup4/default.nix | 17 + .../python-modules/bellows/default.nix | 4 +- .../python-modules/bentoml/default.nix | 8 +- .../python-modules/bibtexparser/default.nix | 4 +- .../python-modules/bids-validator/default.nix | 4 +- .../bimmer-connected/default.nix | 20 +- .../python-modules/bitsandbytes/default.nix | 4 - .../python-modules/black/default.nix | 7 +- .../bleak-retry-connector/default.nix | 4 +- .../python-modules/bleak/default.nix | 4 +- .../python-modules/blebox-uniapi/default.nix | 6 +- .../blockfrost-python/default.nix | 35 + .../bluetooth-adapters/default.nix | 4 +- .../bluetooth-auto-recovery/default.nix | 4 +- .../bluetooth-data-tools/default.nix | 9 +- .../python-modules/bokeh/default.nix | 141 +- .../bokeh/hardcode-nodejs-npmjs-paths.patch | 13 +- .../boost-histogram/default.nix | 4 +- .../bootstrap/build/default.nix | 70 + .../bootstrap/flit-core/default.nix | 29 + .../bootstrap/installer/default.nix | 29 + .../python-modules/boschshcpy/default.nix | 4 +- .../python-modules/boto3-stubs/default.nix | 1823 + .../python-modules/botocore-stubs/default.nix | 42 + .../python-modules/boxx/default.nix | 4 +- .../python-modules/bpycv/default.nix | 4 +- .../python-modules/bqplot/default.nix | 10 + .../python-modules/bqscales/default.nix | 14 +- .../python-modules/bracex/default.nix | 6 +- .../python-modules/breezy/Cargo.lock | 143 +- .../python-modules/breezy/default.nix | 4 +- .../browser-cookie3/default.nix | 4 +- .../python-modules/bthome-ble/default.nix | 4 +- .../python-modules/bugsnag/default.nix | 4 +- .../python-modules/build/default.nix | 71 +- .../python-modules/bytecode/default.nix | 4 +- .../python-modules/cachier/default.nix | 87 + .../python-modules/cadquery/default.nix | 12 +- .../python-modules/cairo-lang/default.nix | 105 - .../python-modules/cairocffi/default.nix | 17 +- .../camel-converter/default.nix | 4 +- .../python-modules/canals/default.nix | 64 +- .../python-modules/casbin/default.nix | 4 +- .../python-modules/castepxbin/default.nix | 16 +- .../python-modules/celery-types/default.nix | 14 +- .../python-modules/celery/default.nix | 7 +- .../python-modules/cemm/default.nix | 12 + .../python-modules/censys/default.nix | 4 +- .../python-modules/certbot/default.nix | 6 +- .../python-modules/certipy-ad/default.nix | 4 +- .../python-modules/cfn-lint/default.nix | 53 +- .../chacha20poly1305-reuseable/default.nix | 4 +- .../python-modules/chart-studio/default.nix | 4 +- .../chat-downloader/default.nix | 4 +- .../python-modules/checkdmarc/default.nix | 75 + .../python-modules/checksumdir/default.nix | 35 + .../python-modules/chiabip158/default.nix | 4 +- .../python-modules/chiavdf/default.nix | 6 +- .../python-modules/chispa/default.nix | 6 +- .../python-modules/circus/default.nix | 7 +- .../python-modules/ckcc-protocol/default.nix | 20 +- .../python-modules/clarifai-grpc/default.nix | 4 +- .../python-modules/clarifai/default.nix | 4 +- .../python-modules/claripy/default.nix | 4 +- .../python-modules/cle/default.nix | 8 +- .../python-modules/clevercsv/default.nix | 4 +- .../click-help-colors/default.nix | 33 +- .../click-odoo-contrib/default.nix | 43 + .../python-modules/click-odoo/default.nix | 37 + .../python-modules/clintermission/default.nix | 4 +- .../python-modules/cloudflare/default.nix | 4 +- .../python-modules/cloudsplaining/default.nix | 4 +- .../python-modules/cloup/default.nix | 9 +- .../python-modules/clr-loader/default.nix | 4 +- .../python-modules/clustershell/default.nix | 4 +- .../python-modules/cmaes/default.nix | 8 +- .../python-modules/cmake/default.nix | 43 + .../cmake/stub/cmake/__init__.py | 19 + .../python-modules/cmake/stub/pyproject.toml | 13 + .../python-modules/cmdstanpy/default.nix | 6 +- .../cmsis-pack-manager/default.nix | 21 +- .../python-modules/cobs/default.nix | 42 + .../python-modules/coconut/default.nix | 4 +- .../python-modules/coffea/default.nix | 8 +- .../python-modules/cohere/default.nix | 16 +- .../coinmetrics-api-client/default.nix | 6 +- .../python-modules/comicon/default.nix | 42 + .../python-modules/commoncode/default.nix | 19 +- .../python-modules/confection/default.nix | 4 +- .../python-modules/confuse/default.nix | 2 +- .../python-modules/controku/default.nix | 52 + .../python-modules/cookiecutter/default.nix | 19 +- .../python-modules/cookies/default.nix | 27 +- .../python-modules/coredis/default.nix | 4 +- .../python-modules/cose/default.nix | 43 + .../python-modules/cryptography/default.nix | 23 +- .../python-modules/cryptography/vectors.nix | 17 +- .../python-modules/cson/default.nix | 2 +- .../python-modules/cssbeautifier/default.nix | 35 + .../python-modules/ctranslate2/default.nix | 4 +- .../python-modules/curlify/default.nix | 25 + .../python-modules/curtsies/default.nix | 5 +- .../python-modules/cwl-upgrader/default.nix | 6 +- .../python-modules/cwl-utils/default.nix | 6 +- .../cyclonedx-python-lib/default.nix | 6 +- .../python-modules/cymem/default.nix | 12 +- .../python-modules/cypari2/default.nix | 5 +- .../python-modules/daqp/default.nix | 52 + .../python-modules/darkdetect/default.nix | 44 + .../python-modules/dask-awkward/default.nix | 9 + .../python-modules/dask-glm/default.nix | 4 +- .../python-modules/dask/default.nix | 2 + .../dataclass-factory/default.nix | 45 + .../dataclasses-json/default.nix | 29 +- .../python-modules/datadiff/default.nix | 4 +- .../python-modules/datadog/default.nix | 4 +- .../python-modules/dataprep-ml/default.nix | 77 + .../python-modules/dataproperty/default.nix | 48 +- .../python-modules/datasets/default.nix | 15 +- .../python-modules/datasette/default.nix | 5 +- .../python-modules/dbt-core/default.nix | 5 +- .../python-modules/dbus-fast/default.nix | 6 +- .../python-modules/dctorch/default.nix | 42 + .../python-modules/debianbts/default.nix | 39 + .../python-modules/debugpy/default.nix | 21 +- .../python-modules/deep_merge/default.nix | 24 - .../python-modules/denonavr/default.nix | 4 +- .../python-modules/deploykit/default.nix | 4 +- .../python-modules/detectron2/default.nix | 3 + .../python-modules/devito/default.nix | 4 +- .../python-modules/devolo-plc-api/default.nix | 6 +- .../python-modules/diffsync/default.nix | 47 + .../python-modules/dirty-equals/default.nix | 4 +- .../dissect-cstruct/default.nix | 6 +- .../python-modules/dissect-esedb/default.nix | 6 +- .../dissect-evidence/default.nix | 4 +- .../dissect-hypervisor/default.nix | 6 +- .../python-modules/dissect-target/default.nix | 6 +- .../dissect-thumbcache/default.nix | 4 +- .../python-modules/dissect-util/default.nix | 6 +- .../python-modules/dissect-volume/default.nix | 14 +- .../python-modules/dissect/default.nix | 6 +- .../python-modules/distributed/default.nix | 7 +- .../dj-database-url/default.nix | 4 +- .../django-admin-datta/default.nix | 8 +- .../django-admin-sortable2/default.nix | 4 +- .../django-auth-ldap/default.nix | 4 +- .../django-celery-results/default.nix | 5 +- .../django-google-analytics-app/default.nix | 54 + .../python-modules/django-jinja2/default.nix | 8 +- .../python-modules/django-ninja/default.nix | 45 + .../django-postgresql-netfields/default.nix | 41 +- .../python-modules/django-redis/default.nix | 12 +- .../django-reversion/default.nix | 5 +- .../python-modules/django-scim2/default.nix | 2 + .../python-modules/django-sesame/default.nix | 6 +- .../django-simple-history/default.nix | 50 + .../django-tastypie/default.nix | 4 +- .../django-treebeard/default.nix | 4 +- .../python-modules/django-types/default.nix | 25 + .../django-widget-tweaks/default.nix | 25 +- .../development/python-modules/django/4.nix | 4 +- .../default.nix | 4 +- .../djangorestframework-simplejwt/default.nix | 16 +- .../djangorestframework-stubs/default.nix | 54 + .../python-modules/dnfile/default.nix | 18 +- .../python-modules/dns-lexicon/default.nix | 84 + .../python-modules/dnspython/default.nix | 4 +- .../python-modules/docformatter/default.nix | 4 +- .../docformatter/test-path.patch | 6 +- .../drf-spectacular-sidecar/default.nix | 4 +- .../drf-spectacular/default.nix | 4 +- .../python-modules/drf-yasg/default.nix | 4 +- .../python-modules/drms/default.nix | 5 + .../python-modules/dronecan/default.nix | 36 + .../python-modules/dtw-python/default.nix | 57 + .../python-modules/duckdb-engine/default.nix | 9 +- .../duckdb-engine/remote_data.patch | 24 + .../python-modules/duckdb/default.nix | 17 +- .../duckduckgo-search/default.nix | 22 +- .../python-modules/dulwich/default.nix | 6 +- .../python-modules/dunamai/default.nix | 11 +- .../python-modules/dvc-data/default.nix | 4 +- .../python-modules/dvc-render/default.nix | 4 +- .../dvc-studio-client/default.nix | 4 +- .../python-modules/dvc/default.nix | 4 +- .../python-modules/dvclive/default.nix | 4 +- .../python-modules/easyocr/default.nix | 4 +- .../python-modules/ebooklib/default.nix | 34 + .../python-modules/ecs-logging/default.nix | 2 +- .../edk2-pytool-library/default.nix | 25 +- .../python-modules/einops/default.nix | 10 - .../elastic-transport/default.nix | 4 +- .../python-modules/elasticsearch8/default.nix | 4 +- .../python-modules/elkm1-lib/default.nix | 4 +- .../python-modules/emborg/default.nix | 7 +- .../python-modules/enlighten/default.nix | 4 +- .../python-modules/env-canada/default.nix | 4 +- .../epson-projector/default.nix | 4 +- .../python-modules/es-client/default.nix | 4 +- .../python-modules/esig/default.nix | 60 + .../esphome-dashboard-api/default.nix | 8 + .../python-modules/ete3/default.nix | 3 +- .../python-modules/events/default.nix | 38 +- .../python-modules/exchangelib/default.nix | 4 +- .../python-modules/exitcode/default.nix | 40 + .../python-modules/expandvars/default.nix | 39 + .../python-modules/explorerscript/default.nix | 18 +- .../python-modules/faadelays/default.nix | 21 +- .../python-modules/fabric/default.nix | 7 +- .../python-modules/fake-useragent/default.nix | 4 +- .../python-modules/fakeredis/default.nix | 4 +- .../faraday-plugins/default.nix | 4 +- .../python-modules/fastapi/default.nix | 4 +- .../python-modules/fastembed/default.nix | 53 + .../python-modules/fastparquet/default.nix | 25 +- .../python-modules/fastparquet/version.patch | 7 - .../python-modules/fastrlock/default.nix | 4 +- .../python-modules/faust-cchardet/default.nix | 4 +- .../python-modules/fb-re2/default.nix | 11 + .../python-modules/fe25519/default.nix | 6 +- .../python-modules/ffcv/default.nix | 7 +- .../python-modules/fido2/default.nix | 39 +- .../python-modules/filedepot/default.nix | 14 +- .../python-modules/findpython/default.nix | 4 +- .../python-modules/fiona/default.nix | 11 + .../python-modules/flake8-bugbear/default.nix | 4 +- .../python-modules/flask-assets/default.nix | 11 +- .../python-modules/flask-compress/default.nix | 24 +- .../python-modules/flask-elastic/default.nix | 7 +- .../flask-jwt-extended/default.nix | 4 +- .../python-modules/flask-limiter/default.nix | 2 +- .../python-modules/flask-mail/default.nix | 7 +- .../python-modules/flask-migrate/default.nix | 14 +- .../python-modules/flask-mysqldb/default.nix | 49 + .../flask-principal/default.nix | 7 +- .../flask-reverse-proxy-fix/default.nix | 10 +- .../python-modules/flask-script/default.nix | 7 +- .../flask-security-too/default.nix | 9 +- .../python-modules/flask-socketio/default.nix | 12 +- .../python-modules/flow-record/default.nix | 6 +- .../python-modules/flux-led/default.nix | 4 +- .../python-modules/fnv-hash-fast/default.nix | 4 +- .../fontawesomefree/default.nix | 4 +- .../python-modules/formbox/default.nix | 5 +- .../python-modules/formulae/default.nix | 12 +- .../python-modules/fountains/default.nix | 6 +- .../fritzconnection/default.nix | 18 +- .../python-modules/frozendict/default.nix | 8 +- .../python-modules/fschat/default.nix | 102 + .../python-modules/funsor/default.nix | 4 +- .../python-modules/fx2/default.nix | 6 +- .../python-modules/garminconnect/default.nix | 15 +- .../python-modules/garth/default.nix | 65 + .../python-modules/gcsa/default.nix | 46 + .../python-modules/ge25519/default.nix | 6 +- .../python-modules/gehomesdk/default.nix | 4 +- .../python-modules/gensim/default.nix | 4 +- .../python-modules/geopandas/default.nix | 6 +- .../python-modules/geopy/default.nix | 4 +- .../get-video-properties/default.nix | 7 +- .../python-modules/getjump/default.nix | 10 + .../python-modules/gevent/default.nix | 7 + .../geventhttpclient/default.nix | 9 +- .../python-modules/gidgethub/default.nix | 7 +- .../gitignore-parser/default.nix | 4 +- .../gitlike-commands/default.nix | 40 + .../python-modules/gitpython/default.nix | 4 +- .../python-modules/globus-sdk/default.nix | 6 +- .../python-modules/glyphslib/default.nix | 4 +- .../python-modules/gocardless-pro/default.nix | 6 +- .../google-ai-generativelanguage/default.nix | 4 +- .../google-api-python-client/default.nix | 4 +- .../google-auth-httplib2/default.nix | 4 +- .../google-auth-oauthlib/default.nix | 6 +- .../default.nix | 4 +- .../default.nix | 9 +- .../google-cloud-bigquery-logging/default.nix | 4 +- .../google-cloud-bigquery/default.nix | 2 + .../google-cloud-compute/default.nix | 4 +- .../google-cloud-container/default.nix | 4 +- .../google-cloud-datacatalog/default.nix | 4 +- .../google-cloud-dataproc/default.nix | 4 +- .../google-cloud-datastore/default.nix | 4 +- .../google-cloud-dlp/default.nix | 4 +- .../google-cloud-firestore/default.nix | 4 +- .../google-cloud-iam-logging/default.nix | 4 +- .../google-cloud-kms/default.nix | 4 +- .../google-cloud-language/default.nix | 8 +- .../google-cloud-logging/default.nix | 4 +- .../google-cloud-os-config/default.nix | 6 +- .../google-cloud-pubsub/default.nix | 4 +- .../google-cloud-redis/default.nix | 4 +- .../google-cloud-resource-manager/default.nix | 4 +- .../google-cloud-secret-manager/default.nix | 4 +- .../google-cloud-securitycenter/default.nix | 4 +- .../google-cloud-tasks/default.nix | 4 +- .../google-cloud-texttospeech/default.nix | 4 +- .../default.nix | 4 +- .../default.nix | 4 +- .../google-generativeai/default.nix | 12 +- .../google-nest-sdm/default.nix | 6 +- .../python-modules/google-re2/default.nix | 6 +- .../google-resumable-media/default.nix | 4 +- .../python-modules/gpiozero/default.nix | 25 +- .../python-modules/gprof2dot/default.nix | 16 +- .../python-modules/gps3/default.nix | 10 +- .../python-modules/gpytorch/default.nix | 16 +- .../python-modules/gradio/client.nix | 109 + .../python-modules/gradio/default.nix | 101 +- .../greeneye-monitor/default.nix | 15 +- .../python-modules/greynoise/default.nix | 62 + .../python-modules/griffe/default.nix | 4 +- .../grpc-interceptor/default.nix | 19 +- .../grpcio-channelz/default.nix | 4 +- .../grpcio-reflection/default.nix | 4 +- .../python-modules/gspread/default.nix | 37 +- .../python-modules/gudhi/default.nix | 1 - .../python-modules/gumath/default.nix | 18 +- .../python-modules/gvm-tools/default.nix | 4 +- .../python-modules/gymnasium/default.nix | 51 +- .../python-modules/gyp/default.nix | 6 + .../ha-mqtt-discoverable/default.nix | 53 + .../python-modules/ha-philipsjs/default.nix | 4 +- .../python-modules/hahomematic/default.nix | 19 +- .../python-modules/hap-python/default.nix | 4 +- .../python-modules/hass-nabucasa/default.nix | 4 +- .../python-modules/hatasmota/default.nix | 4 +- .../python-modules/hcloud/default.nix | 4 +- .../python-modules/hdfs/default.nix | 8 +- .../python-modules/heudiconv/default.nix | 40 +- .../python-modules/hist/default.nix | 4 +- .../home-assistant-bluetooth/default.nix | 4 +- .../python-modules/homematicip/default.nix | 4 +- .../python-modules/hsluv/default.nix | 4 +- .../python-modules/html-tag-names/default.nix | 34 + .../html-void-elements/default.nix | 34 + .../python-modules/huey/default.nix | 4 +- .../huggingface-hub/default.nix | 11 +- .../python-modules/humanize/default.nix | 4 +- .../python-modules/hvac/default.nix | 4 +- .../python-modules/hyperpyyaml/default.nix | 10 +- .../python-modules/hyperscan/default.nix | 54 + .../python-modules/hypothesmith/default.nix | 9 +- .../python-modules/ibis-framework/default.nix | 28 +- .../python-modules/ical/default.nix | 4 +- .../python-modules/icontract/default.nix | 10 +- .../python-modules/idasen/default.nix | 13 +- .../python-modules/identify/default.nix | 4 +- .../python-modules/igraph/default.nix | 4 +- .../python-modules/iisignature/default.nix | 39 + .../python-modules/ilua/default.nix | 4 +- .../python-modules/imap-tools/default.nix | 4 +- .../python-modules/impacket/default.nix | 14 +- .../python-modules/indexed-bzip2/default.nix | 31 + .../python-modules/indexed-gzip/default.nix | 37 + .../python-modules/indexed-zstd/default.nix | 37 + .../influxdb-client/default.nix | 4 +- .../python-modules/iniconfig/default.nix | 4 +- .../python-modules/insightface/default.nix | 3 + .../python-modules/installer/default.nix | 25 +- .../python-modules/intake/default.nix | 25 +- .../python-modules/invoke/default.nix | 5 +- .../python-modules/iocextract/default.nix | 4 +- .../python-modules/ipfshttpclient/default.nix | 11 +- .../python-modules/ipwhl/default.nix | 5 +- .../python-modules/ipycanvas/default.nix | 10 + .../python-modules/ipymarkup/default.nix | 29 + .../python-modules/ipyniivue/default.nix | 13 +- .../python-modules/ipyparallel/default.nix | 8 + .../ipytablewidgets/default.nix | 9 + .../python-modules/ipyvue/default.nix | 8 +- .../python-modules/ircrobots/default.nix | 6 +- .../python-modules/ircstates/default.nix | 9 +- .../python-modules/irctokens/default.nix | 4 +- .../python-modules/ismartgate/default.nix | 6 +- .../python-modules/jaraco-logging/default.nix | 18 +- .../python-modules/jarowinkler/default.nix | 13 +- .../python-modules/jax/default.nix | 18 +- .../development/python-modules/jaxlib/bin.nix | 12 +- .../python-modules/jaxlib/default.nix | 14 +- .../python-modules/jaxtyping/default.nix | 6 +- .../python-modules/jedi/default.nix | 15 +- .../python-modules/jellyfish/default.nix | 24 +- .../jenkins-job-builder/default.nix | 4 +- .../python-modules/joblib/default.nix | 4 +- .../python-modules/jplephem/default.nix | 4 +- .../development/python-modules/jq/default.nix | 10 +- .../python-modules/json-logging/default.nix | 5 + .../json-schema-for-humans/default.nix | 9 +- .../python-modules/json-tricks/default.nix | 4 +- .../python-modules/json5/default.nix | 4 +- .../python-modules/jsonpath-ng/default.nix | 28 +- .../python-modules/jsonpath/default.nix | 23 +- .../python-modules/jsonrpc-async/default.nix | 4 +- .../python-modules/jsonschema/default.nix | 2 + .../python-modules/junos-eznc/default.nix | 4 +- .../python-modules/jupyter-book/default.nix | 2 +- .../python-modules/jupyter-cache/default.nix | 2 +- .../jupyter-collaboration/default.nix | 23 +- .../default.nix | 10 +- .../python-modules/jupyter-server/default.nix | 9 +- .../python-modules/jupyter-ydoc/default.nix | 4 +- .../python-modules/jupyter/default.nix | 4 +- .../python-modules/jupyterhub/default.nix | 2 +- .../python-modules/jupytext/default.nix | 4 +- .../python-modules/k-diffusion/default.nix | 12 +- .../python-modules/kaggle/default.nix | 12 +- .../python-modules/kaptan/default.nix | 4 +- .../karton-classifier/default.nix | 1 + .../karton-config-extractor/default.nix | 4 +- .../python-modules/karton-core/default.nix | 4 +- .../python-modules/keyrings-alt/default.nix | 25 +- .../keyrings-cryptfile/default.nix | 34 +- .../python-modules/klaus/default.nix | 4 +- .../python-modules/knx-frontend/default.nix | 12 + .../python-modules/kombu/default.nix | 73 +- .../python-modules/kornia/default.nix | 7 +- .../python-modules/kotsu/default.nix | 46 + .../kotsu/disable-pytest-coverage-flags.patch | 18 + .../python-modules/langchain/default.nix | 6 +- .../python-modules/langid/default.nix | 37 + .../python-modules/langsmith/default.nix | 6 +- .../python-modules/laszip/default.nix | 18 +- .../python-modules/led-ble/default.nix | 7 +- .../python-modules/ledgerblue/default.nix | 4 +- .../python-modules/levenshtein/default.nix | 4 +- .../python-modules/libpcap/default.nix | 66 + .../python-modules/libtmux/default.nix | 14 +- .../python-modules/libvirt/default.nix | 4 +- .../python-modules/liccheck/default.nix | 52 + .../python-modules/lifelines/default.nix | 4 +- .../python-modules/limnoria/default.nix | 4 +- .../python-modules/liquidctl/default.nix | 7 +- .../python-modules/litellm/default.nix | 53 + .../python-modules/livelossplot/default.nix | 7 +- .../python-modules/loca/default.nix | 8 +- .../python-modules/localstack-ext/default.nix | 4 +- .../python-modules/localstack/default.nix | 4 +- .../locationsharinglib/default.nix | 4 +- .../python-modules/logbook/default.nix | 87 +- .../python-modules/logilab/common.nix | 5 +- .../python-modules/logilab/constraint.nix | 43 +- .../python-modules/looseversion/default.nix | 7 +- .../python-modules/loqedapi/default.nix | 49 + .../python-modules/losant-rest/default.nix | 4 +- .../python-modules/lxmf/default.nix | 4 +- .../python-modules/m3u8/default.nix | 11 +- .../python-modules/magic-filter/default.nix | 6 +- .../magic-wormhole-mailbox-server/default.nix | 7 + .../python-modules/magic-wormhole/default.nix | 25 + .../python-modules/mando/default.nix | 46 + .../python-modules/mandown/default.nix | 65 + .../python-modules/manifest-ml/default.nix | 6 + .../manifestoo-core/default.nix | 40 + .../python-modules/manifestoo/default.nix | 51 + .../python-modules/manuf/default.nix | 60 + .../python-modules/manuf/fix_manuf_url.patch | 14 + .../manuf/internal_db_update_nix.patch | 31 + .../python-modules/marisa-trie/default.nix | 9 +- .../python-modules/markdown2/default.nix | 18 +- .../marshmallow-dataclass/default.nix | 4 +- .../python-modules/marshmallow/default.nix | 10 +- .../python-modules/mashumaro/default.nix | 4 +- .../python-modules/matplotlib/default.nix | 8 +- .../python-modules/matrix-nio/default.nix | 4 +- .../python-modules/mautrix/default.nix | 4 +- .../python-modules/maya/default.nix | 60 +- .../python-modules/mcuuid/default.nix | 36 + .../python-modules/md2gemini/default.nix | 1 + .../python-modules/mdformat-admon/default.nix | 6 +- .../mdformat-beautysh/default.nix | 9 + .../mdformat-footnote/default.nix | 7 +- .../mdformat-frontmatter/default.nix | 7 +- .../mdformat-mkdocs/default.nix | 12 +- .../mdformat-simple-breaks/default.nix | 7 +- .../mdformat-tables/default.nix | 7 +- .../python-modules/mdformat/default.nix | 7 +- .../python-modules/mecab-python3/default.nix | 4 +- .../python-modules/mediafile/default.nix | 2 +- .../python-modules/mediapy/default.nix | 5 +- .../python-modules/meep/default.nix | 13 +- .../python-modules/meilisearch/default.nix | 4 +- .../python-modules/meraki/default.nix | 4 +- .../python-modules/mercadopago/default.nix | 4 +- .../python-modules/merge3/default.nix | 4 +- .../python-modules/meshtastic/default.nix | 4 +- .../python-modules/metakernel/default.nix | 4 +- .../python-modules/millheater/default.nix | 4 +- .../mindsdb-evaluator/default.nix | 47 + .../python-modules/minichain/default.nix | 73 + .../python-modules/minikerberos/default.nix | 4 +- .../python-modules/minio/default.nix | 4 +- .../python-modules/mip/default.nix | 14 +- .../python-modules/mirakuru/default.nix | 46 + .../python-modules/mistune/default.nix | 17 +- .../python-modules/mitmproxy/default.nix | 2 + .../python-modules/mkdocs-jupyter/default.nix | 4 +- .../python-modules/mkdocs-minify/default.nix | 4 +- .../mkdocs-swagger-ui-tag/default.nix | 30 +- .../mkdocstrings-python/default.nix | 4 +- .../python-modules/ml-dtypes/default.nix | 24 +- .../python-modules/mobi/default.nix | 44 + .../python-modules/model-bakery/default.nix | 4 +- .../python-modules/molecule/default.nix | 60 + .../python-modules/molecule/plugins.nix | 50 + .../python-modules/monai-deploy/default.nix | 6 + .../python-modules/more-itertools/default.nix | 4 +- .../python-modules/mpi4py/default.nix | 10 +- .../python-modules/mrsqm/default.nix | 45 + .../python-modules/mscerts/default.nix | 4 +- .../python-modules/msgpack/default.nix | 7 + .../python-modules/msgspec/default.nix | 4 +- .../python-modules/msldap/default.nix | 4 +- .../python-modules/msprime/default.nix | 48 +- .../python-modules/multiset/default.nix | 18 +- .../python-modules/murmurhash/default.nix | 4 +- .../python-modules/mutagen/default.nix | 19 +- .../mwparserfromhell/default.nix | 4 +- .../mypy-boto3-builder/default.nix | 4 +- .../python-modules/mypy-boto3-ebs/default.nix | 39 - .../python-modules/mypy-boto3-s3/default.nix | 41 - .../python-modules/mypy-boto3/default.nix | 755 + .../python-modules/mypy-protobuf/default.nix | 6 +- .../python-modules/mypy/default.nix | 3 + ...Revert-Fix-MacOS-wheels-platform-tag.patch | 42 +- .../mysql-connector/default.nix | 29 +- .../python-modules/myst-nb/default.nix | 2 +- .../python-modules/napalm/hp-procurve.nix | 22 +- .../python-modules/napari/default.nix | 4 +- .../python-modules/natasha/default.nix | 35 + .../python-modules/nats-py/default.nix | 21 +- .../python-modules/natsort/default.nix | 6 + .../python-modules/navec/default.nix | 32 + .../python-modules/nbclassic/default.nix | 4 +- .../python-modules/nbsphinx/default.nix | 4 +- .../python-modules/neo4j/default.nix | 4 +- .../python-modules/nestedtext/default.nix | 4 +- .../python-modules/netcdf4/default.nix | 9 +- .../python-modules/netio/default.nix | 18 +- .../python-modules/netutils/default.nix | 4 +- .../python-modules/newversion/default.nix | 10 + .../python-modules/nextcord/default.nix | 4 +- .../python-modules/nibe/default.nix | 4 +- .../python-modules/ninja/default.nix | 1 + .../ninja/stub/ninja/__init__.py | 2 + .../python-modules/nitime/default.nix | 28 +- .../python-modules/nkdfu/default.nix | 8 +- .../python-modules/nlpcloud/default.nix | 4 +- .../python-modules/nocaselist/default.nix | 4 +- .../python-modules/nomadnet/default.nix | 4 +- .../python-modules/notmuch2/default.nix | 12 +- .../python-modules/notus-scanner/default.nix | 13 +- .../python-modules/nsz/default.nix | 4 +- .../python-modules/ntc-templates/default.nix | 7 +- .../python-modules/nuitka/default.nix | 3 +- .../python-modules/numba/cuda_path.patch | 29 +- .../python-modules/numpyro/default.nix | 17 +- .../python-modules/nvidia-ml-py/default.nix | 4 +- .../python-modules/oauthenticator/default.nix | 4 +- .../python-modules/objax/default.nix | 4 +- .../python-modules/oci/default.nix | 4 +- .../python-modules/ocrmypdf/default.nix | 21 +- .../python-modules/ocrmypdf/paths.patch | 84 +- .../python-modules/oelint-parser/default.nix | 31 + .../oldest-supported-numpy/default.nix | 3 +- .../python-modules/onnx/default.nix | 17 +- .../python-modules/opcua-widgets/default.nix | 2 +- .../python-modules/openai-whisper/default.nix | 13 +- .../openai-whisper/ffmpeg-path.patch | 20 +- .../python-modules/openai/default.nix | 4 +- .../python-modules/openapi-core/default.nix | 2 + .../python-modules/opencensus/default.nix | 4 +- .../python-modules/openllm-client/default.nix | 58 + .../python-modules/openllm-core/default.nix | 84 + .../python-modules/openllm/default.nix | 198 + .../python-modules/opensearch-py/default.nix | 4 +- .../python-modules/openstacksdk/default.nix | 4 +- .../python-modules/opentsne/default.nix | 64 + .../python-modules/opower/default.nix | 4 +- .../python-modules/optimum/default.nix | 4 +- .../python-modules/optuna/default.nix | 173 +- .../python-modules/oracledb/default.nix | 13 +- .../orange-canvas-core/default.nix | 64 + .../orange-widget-base/default.nix | 62 + .../python-modules/orange3/default.nix | 179 + .../python-modules/osc/default.nix | 19 +- .../oslo-concurrency/default.nix | 4 +- .../python-modules/oslo-log/default.nix | 4 +- .../oslo-serialization/default.nix | 4 +- .../python-modules/osqp/default.nix | 31 +- .../python-modules/oss2/default.nix | 9 +- .../python-modules/ossfs/default.nix | 4 +- .../python-modules/paddleocr/default.nix | 111 + .../paddleocr/remove-import-imaug.patch | 20 + .../pallets-sphinx-themes/default.nix | 4 +- .../python-modules/pandas/default.nix | 10 +- .../python-modules/panel/default.nix | 4 +- .../parametrize-from-file/default.nix | 7 +- .../python-modules/particle/default.nix | 6 +- .../python-modules/parver/default.nix | 4 +- .../python-modules/paste/default.nix | 17 +- .../python-modules/pathvalidate/default.nix | 16 +- .../python-modules/patiencediff/default.nix | 4 +- .../python-modules/patool/default.nix | 39 +- .../python-modules/pdf2docx/default.nix | 76 + .../python-modules/pdoc/default.nix | 4 +- .../python-modules/peaqevcore/default.nix | 4 +- .../python-modules/peft/default.nix | 4 +- .../python-modules/pep440/default.nix | 2 +- .../python-modules/pex/default.nix | 6 +- .../python-modules/pg8000/default.nix | 6 +- .../python-modules/pglast/default.nix | 11 +- .../python-modules/pgvector/default.nix | 6 +- .../python-modules/phonenumbers/default.nix | 4 +- .../python-modules/piccolo-theme/default.nix | 4 +- .../python-modules/picosvg/default.nix | 6 +- .../python-modules/pikepdf/default.nix | 4 +- .../python-modules/pillow-heif/default.nix | 41 + .../python-modules/pillow-simd/default.nix | 2 +- .../python-modules/pillow/default.nix | 12 +- .../python-modules/pillow/generic.nix | 2 + .../pinecone-client/default.nix | 4 +- .../python-modules/pint-pandas/default.nix | 6 + .../python-modules/pip-tools/default.nix | 13 +- .../python-modules/pip/default.nix | 65 +- .../python-modules/pipdeptree/default.nix | 2 +- .../pipenv-poetry-migrate/default.nix | 11 +- .../python-modules/pkg-about/default.nix | 55 + .../pkgutil-resolve-name/default.nix | 16 +- .../python-modules/pkutils/default.nix | 4 +- .../python-modules/plac/default.nix | 6 +- .../python-modules/plaid-python/default.nix | 4 +- .../python-modules/playwright/default.nix | 7 +- .../python-modules/playwright/update.sh | 2 +- .../python-modules/plexapi/default.nix | 6 +- .../python-modules/plugwise/default.nix | 4 +- .../python-modules/pmdarima/default.nix | 64 + .../python-modules/podcastparser/default.nix | 39 +- .../python-modules/podman/default.nix | 76 + .../python-modules/poetry-core/default.nix | 41 +- .../poetry-dynamic-versioning/default.nix | 6 +- .../python-modules/policy-sentry/default.nix | 4 +- .../python-modules/polyline/default.nix | 12 + .../python-modules/pontos/default.nix | 4 +- .../python-modules/pony/default.nix | 9 +- .../python-modules/port-for/default.nix | 37 + .../python-modules/posthog/default.nix | 4 +- .../python-modules/pplpy/default.nix | 4 +- .../python-modules/prawcore/default.nix | 39 +- .../prayer-times-calculator/default.nix | 4 +- .../python-modules/prettytable/default.nix | 15 +- .../python-modules/primer3/default.nix | 15 +- .../python-modules/procmon-parser/default.nix | 46 + .../python-modules/proxy-db/default.nix | 56 + .../python-modules/proxy-py/default.nix | 19 + .../python-modules/psychrolib/default.nix | 43 + .../publicsuffixlist/default.nix | 4 +- .../pulsectl-asyncio/default.nix | 47 + .../python-modules/pulumi-aws/default.nix | 4 +- .../python-modules/pulumi/default.nix | 2 + .../python-modules/pvlib/default.nix | 8 +- .../python-modules/pwntools/default.nix | 4 +- .../py-dormakaba-dkey/default.nix | 16 +- .../python-modules/py-nextbusnext/default.nix | 20 +- .../py-partiql-parser/default.nix | 4 +- .../python-modules/py17track/default.nix | 25 +- .../pyTelegramBotAPI/default.nix | 4 +- .../python-modules/pyacoustid/default.nix | 4 +- .../python-modules/pyairvisual/default.nix | 13 + .../python-modules/pyaml/default.nix | 4 +- .../python-modules/pyasn/default.nix | 4 +- .../python-modules/pyathena/default.nix | 4 +- .../python-modules/pybind11/default.nix | 2 + .../python-modules/pybloom-live/default.nix | 49 + .../python-modules/pybox2d/default.nix | 44 + .../pybtex-docutils/default.nix | 4 +- .../python-modules/pycapnp/default.nix | 5 +- .../python-modules/pycardano/default.nix | 67 + .../python-modules/pycatch22/default.nix | 52 + .../python-modules/pycmarkgfm/default.nix | 4 +- .../python-modules/pycookiecheat/default.nix | 12 +- .../python-modules/pyctr/default.nix | 25 +- .../python-modules/pydaikin/default.nix | 4 +- .../pydata-sphinx-theme/default.nix | 7 +- .../python-modules/pydateinfer/default.nix | 40 + .../python-modules/pydeck/default.nix | 3 + .../python-modules/pydicom-seg/default.nix | 13 +- .../python-modules/pydiscourse/default.nix | 46 + .../python-modules/pydiscovergy/default.nix | 59 + .../python-modules/pydrawise/default.nix | 65 + .../python-modules/pyduotecno/default.nix | 4 +- .../python-modules/pydyf/default.nix | 4 +- .../python-modules/pyecoforest/default.nix | 56 + .../python-modules/pyenphase/default.nix | 75 + .../python-modules/pyerfa/default.nix | 37 +- .../python-modules/pyfaidx/default.nix | 4 +- .../python-modules/pyfibaro/default.nix | 6 +- .../python-modules/pyfiglet/default.nix | 4 +- .../python-modules/pyfluidsynth/default.nix | 55 + .../python-modules/pyfronius/default.nix | 21 +- .../python-modules/pyftpdlib/default.nix | 4 +- .../python-modules/pygitguardian/default.nix | 22 +- .../python-modules/pygithub/default.nix | 4 +- .../python-modules/pygmt/default.nix | 6 +- .../pygobject-stubs/default.nix | 39 + .../pyhanko-certvalidator/default.nix | 6 +- .../python-modules/pyhepmc/default.nix | 69 + .../pyinstaller-versionfile/default.nix | 30 + .../python-modules/pyinsteon/default.nix | 9 +- .../python-modules/pyinstrument/default.nix | 16 +- .../python-modules/pyipma/default.nix | 4 +- .../python-modules/pyipp/default.nix | 4 +- .../python-modules/pyiqvia/default.nix | 21 +- .../python-modules/pyixapi/default.nix | 35 + .../python-modules/pykalman/default.nix | 44 + .../fix-masked-arrays-not-supported.patch | 14 + .../pykalman/fix-p311-issues.patch | 13 + .../python-modules/pykeepass/default.nix | 12 +- .../python-modules/pykka/default.nix | 18 +- .../python-modules/pyleri/default.nix | 37 + .../python-modules/pylink-square/default.nix | 29 +- .../python-modules/pylitterbot/default.nix | 4 +- .../pylutron-caseta/default.nix | 4 +- .../python-modules/pymavlink/default.nix | 4 +- .../python-modules/pymc/default.nix | 10 +- .../pymdown-extensions/default.nix | 14 +- .../python-modules/pymilvus/default.nix | 10 +- .../python-modules/pymodbus/default.nix | 50 +- .../pymongo-inmemory/default.nix | 65 + .../python-modules/pymyq/default.nix | 19 +- .../python-modules/pynetbox/default.nix | 4 +- .../python-modules/pynetdicom/default.nix | 9 + .../python-modules/pynetgear/default.nix | 4 +- .../python-modules/pyngrok/default.nix | 11 +- .../python-modules/pynisher/default.nix | 5 +- .../python-modules/pynobo/default.nix | 4 +- .../python-modules/pynws/default.nix | 4 +- .../python-modules/pyomo/default.nix | 4 +- .../python-modules/pyopencl/default.nix | 13 +- .../pyopengl-accelerate/default.nix | 13 +- .../python-modules/pyopengl/default.nix | 21 +- .../python-modules/pyopenuv/default.nix | 13 + .../python-modules/pyorthanc/default.nix | 4 +- .../python-modules/pyosmium/default.nix | 10 +- .../pyoutbreaksnearme/default.nix | 21 +- .../python-modules/pyoverkiz/default.nix | 4 +- .../python-modules/pypandoc/default.nix | 6 + .../python-modules/pypck/default.nix | 12 + .../python-modules/pypiserver/default.nix | 24 +- .../python-modules/pypoint/default.nix | 4 +- .../python-modules/pyproj/default.nix | 4 +- .../python-modules/pyproject-api/default.nix | 10 +- .../pyproject-hooks/default.nix | 37 +- .../python-modules/pypykatz/default.nix | 4 +- .../python-modules/pyqt-builder/default.nix | 19 +- .../development/python-modules/pyqt/4.x.nix | 69 - .../development/python-modules/pyqt/5.x.nix | 4 + .../python-modules/pyqt5-stubs/default.nix | 61 + .../python-modules/pyramid/default.nix | 4 +- .../python-modules/pyrender/default.nix | 85 + .../python-modules/pyrisco/default.nix | 4 +- .../python-modules/pyrogram/default.nix | 4 +- .../python-modules/pyruckus/default.nix | 36 - .../python-modules/pyschlage/default.nix | 4 +- .../python-modules/pysensibo/default.nix | 4 +- .../pyserial-asyncio-fast/default.nix | 53 + .../python-modules/pyside/apiextractor.nix | 34 - .../python-modules/pyside/default.nix | 34 - .../python-modules/pyside/gcc6.patch | 18 - .../python-modules/pyside/generatorrunner.nix | 33 - .../python-modules/pyside/shiboken.nix | 66 - .../python-modules/pyside/shiboken_py35.patch | 12 - .../python-modules/pyside/tools.nix | 34 - .../python-modules/pyside6/default.nix | 24 +- .../pysigma-backend-elasticsearch/default.nix | 4 +- .../pysigma-backend-opensearch/default.nix | 4 +- .../pysigma-backend-splunk/default.nix | 4 +- .../pysigma-pipeline-crowdstrike/default.nix | 4 +- .../pysigma-pipeline-sysmon/default.nix | 4 +- .../pysigma-pipeline-windows/default.nix | 4 +- .../python-modules/pysigma/default.nix | 14 +- .../python-modules/pysimplesoap/default.nix | 54 + .../pysimplesoap/stringIO.patch | 31 + .../python-modules/pyskyqremote/default.nix | 4 +- .../python-modules/pyslim/default.nix | 4 +- .../python-modules/pysml/default.nix | 4 +- .../python-modules/pysnooz/default.nix | 10 +- .../python-modules/pyssim/default.nix | 14 +- .../python-modules/pystache/default.nix | 4 +- .../python-modules/pyswitchbot/default.nix | 4 +- .../python-modules/pytablewriter/default.nix | 104 +- .../python-modules/pytado/default.nix | 12 +- .../python-modules/pytapo/default.nix | 4 +- .../python-modules/pytensor/default.nix | 57 +- .../python-modules/pytesseract/default.nix | 6 +- .../python-modules/pytest-celery/default.nix | 8 +- .../python-modules/pytest-check/default.nix | 9 +- .../python-modules/pytest-cid/default.nix | 13 +- .../pytest-md-report/default.nix | 4 +- .../pytest-param-files/default.nix | 2 +- .../pytest-playwright/default.nix | 6 +- .../pytest-postgresql/default.nix | 73 + .../pytest-quickcheck/default.nix | 15 +- .../python-modules/pytest-raisin/default.nix | 6 +- .../pytest-recording/default.nix | 9 +- .../python-modules/pytest-repeat/default.nix | 24 +- .../python-modules/pytest-reverse/default.nix | 41 + .../python-modules/pytest-spec/default.nix | 50 + .../pytest-testinfra/default.nix | 6 +- .../python-benedict/default.nix | 4 +- .../python-modules/python-box/default.nix | 8 +- .../python-modules/python-bsblan/default.nix | 6 +- .../python-cinderclient/default.nix | 4 +- .../python-modules/python-creole/default.nix | 13 +- .../python-engineio/default.nix | 4 +- .../python-modules/python-fx/default.nix | 4 +- .../python-modules/python-hl7/default.nix | 36 + .../python-homewizard-energy/default.nix | 6 +- .../python-modules/python-hosts/default.nix | 4 +- .../python-ironicclient/default.nix | 4 +- .../python-modules/python-jenkins/default.nix | 27 +- .../python-keystoneclient/default.nix | 4 +- .../python-lsp-jsonrpc/default.nix | 37 +- .../python-lsp-server/default.nix | 17 +- .../python-modules/python-magic/default.nix | 8 + .../python-manilaclient/default.nix | 4 +- .../python-matter-server/default.nix | 12 + .../python-modules/python-ndn/default.nix | 16 +- .../python-novaclient/default.nix | 4 +- .../python-openstackclient/default.nix | 4 +- .../python-otbr-api/default.nix | 14 + .../python-modules/python-pptx/default.nix | 4 +- .../python-rapidjson/default.nix | 17 +- .../python-roborock/default.nix | 9 +- .../python-modules/python-rtmidi/default.nix | 8 +- .../python-socketio/default.nix | 4 +- .../python-modules/python-stdnum/default.nix | 4 +- .../python-swiftclient/default.nix | 4 +- .../python-modules/python-tds/default.nix | 74 + .../python-telegram-bot/default.nix | 13 +- .../python-modules/python-utils/default.nix | 4 +- .../python-modules/python-vagrant/default.nix | 18 +- .../python-modules/python-xz/default.nix | 34 + .../python-modules/python-yate/default.nix | 41 + .../python-modules/python3-saml/default.nix | 3 + .../python3-saml/skip-broken-tests.patch | 28 + .../python_docs_theme/default.nix | 12 +- .../python-modules/pythonfinder/default.nix | 48 +- .../python-modules/pythonnet/default.nix | 4 +- .../python-modules/pythonocc-core/default.nix | 13 +- .../python-modules/pytibber/default.nix | 4 +- .../python-modules/pytile/default.nix | 21 +- .../python-modules/pytimeparse2/default.nix | 32 + .../pytorch-lightning/default.nix | 4 +- .../python-modules/pytrafikverket/default.nix | 4 +- .../python-modules/pytrends/default.nix | 4 + .../python-modules/pytube/default.nix | 10 +- .../python-modules/pyunifiprotect/default.nix | 4 +- .../python-modules/pyvesync/default.nix | 4 +- .../python-modules/pyvex/default.nix | 4 +- .../python-modules/pyvisa-sim/default.nix | 11 +- .../python-modules/pyvista/default.nix | 12 +- .../python-modules/pyvmomi/default.nix | 4 +- .../python-modules/pywayland/default.nix | 4 +- .../python-modules/pywaze/default.nix | 56 + .../python-modules/pywbem/default.nix | 6 +- .../pyweatherflowrest/default.nix | 4 +- .../pyweatherflowudp/default.nix | 62 + .../python-modules/pywemo/default.nix | 4 +- .../python-modules/pywerview/default.nix | 4 +- .../python-modules/pywfa/default.nix | 53 + .../python-modules/pywlroots/default.nix | 6 +- .../python-modules/pyxlsb/default.nix | 26 + .../python-modules/pyyardian/default.nix | 46 + .../python-modules/qasync/default.nix | 39 + .../qbittorrent-api/default.nix | 4 +- .../python-modules/qcelemental/default.nix | 10 +- .../python-modules/qcengine/default.nix | 6 +- .../python-modules/qcodes-loop/default.nix | 21 +- .../python-modules/qcs-api-client/default.nix | 4 +- .../python-modules/qdrant-client/default.nix | 39 +- .../python-modules/qpsolvers/default.nix | 50 + .../python-modules/qscintilla-qt4/default.nix | 42 - .../python-modules/qt-material/default.nix | 30 + .../python-modules/qtconsole/default.nix | 4 +- .../python-modules/qtile-extras/default.nix | 31 +- .../python-modules/qtile/default.nix | 29 +- .../python-modules/qtpy/default.nix | 6 +- .../python-modules/quandl/default.nix | 6 +- .../quandl/pandas2-datetime-removal.patch | 33 + .../quantile-python/default.nix | 27 + .../python-modules/quantiphy-eval/default.nix | 7 +- .../python-modules/quantiphy/default.nix | 4 +- .../python-modules/quaternion/default.nix | 33 + .../python-modules/qutip/default.nix | 4 +- .../python-modules/radian/default.nix | 9 +- .../python-modules/radish-bdd/default.nix | 7 +- .../python-modules/radon/default.nix | 67 + .../python-modules/rapidfuzz/default.nix | 10 +- .../python-modules/rapidgzip/default.nix | 34 + .../python-modules/rarfile/default.nix | 4 +- .../python-modules/rasterio/default.nix | 6 + .../python-modules/ratarmount/default.nix | 37 + .../python-modules/ratarmountcore/default.nix | 48 + .../python-modules/ray/default.nix | 6 - .../python-modules/razdel/default.nix | 27 + .../python-modules/rchitect/default.nix | 4 +- .../python-modules/rdkit/default.nix | 4 +- .../recipe-scrapers/default.nix | 4 +- .../python-modules/recordlinkage/default.nix | 28 +- .../python-modules/reflink/default.nix | 4 +- .../python-modules/regenmaschine/default.nix | 19 +- .../python-modules/regex/default.nix | 4 +- .../python-modules/remarshal/default.nix | 12 +- .../python-modules/reolink-aio/default.nix | 22 +- .../reorder-python-imports/default.nix | 6 +- .../repoze_sphinx_autointerface/default.nix | 13 +- .../python-modules/reproject/default.nix | 8 + .../python-modules/reptor/default.nix | 99 + .../requests-pkcs12/default.nix | 4 +- .../requirements-detector/default.nix | 7 +- .../restrictedpython/default.nix | 4 +- .../python-modules/returns/default.nix | 4 +- .../python-modules/rfcat/default.nix | 4 +- .../python-modules/rich-argparse/default.nix | 4 +- .../python-modules/rich-pixels/default.nix | 6 + .../python-modules/ring-doorbell/default.nix | 14 +- .../python-modules/riscof/default.nix | 42 +- .../python-modules/riscv-config/default.nix | 31 +- .../python-modules/rjsmin/default.nix | 21 +- .../python-modules/rkm-codes/default.nix | 4 +- .../python-modules/rnginline/default.nix | 35 +- .../python-modules/rns/default.nix | 4 +- .../python-modules/rope/default.nix | 4 +- .../python-modules/ropgadget/default.nix | 4 +- .../rotary-embedding-torch/default.nix | 48 + .../python-modules/rsskey/default.nix | 7 +- .../python-modules/rst2pdf/default.nix | 7 +- .../python-modules/ruamel-base/default.nix | 2 + .../python-modules/rustworkx/default.nix | 6 +- .../python-modules/s3fs/default.nix | 4 +- .../python-modules/sagemaker/default.nix | 6 +- .../python-modules/schedule/default.nix | 4 +- .../python-modules/schema-salad/default.nix | 16 +- .../scikit-build-core/default.nix | 14 +- .../python-modules/scikit-fuzzy/default.nix | 23 +- .../python-modules/scikit-image/default.nix | 3 + .../python-modules/scikit-misc/default.nix | 8 + ...ased-abs-tolerance-for-wilcoxon-test.patch | 25 + .../0002-Update-test_posthocs.py.patch | 34 + .../scikit-posthocs/default.nix | 65 + .../scim2-filter-parser/default.nix | 10 + .../python-modules/scipy/default.nix | 81 +- .../python-modules/scipy/update.sh | 8 +- .../python-modules/scooby/default.nix | 6 +- .../python-modules/scramp/default.nix | 3 + .../python-modules/scrapy/default.nix | 8 +- .../python-modules/screenlogicpy/default.nix | 4 +- .../python-modules/scs/default.nix | 11 +- .../python-modules/sdds/default.nix | 6 +- .../python-modules/seasonal/default.nix | 63 + .../python-modules/seatconnect/default.nix | 14 +- .../python-modules/send2trash/default.nix | 13 +- .../python-modules/sense-energy/default.nix | 6 +- .../python-modules/sensirion-ble/default.nix | 4 +- .../sentence-splitter/default.nix | 41 + .../sentence-transformers/default.nix | 1 + .../python-modules/sentry-sdk/default.nix | 4 +- .../python-modules/serverfiles/default.nix | 28 + .../python-modules/setupmeta/default.nix | 8 +- .../setuptools-gettext/default.nix | 4 +- .../setuptools-odoo/default.nix | 85 + .../python-modules/setuptools/default.nix | 68 +- .../python-modules/seventeentrack/default.nix | 19 +- .../python-modules/shazamio/default.nix | 76 + .../python-modules/shiboken6/default.nix | 23 +- .../python-modules/shiv/default.nix | 4 +- .../simple-rest-client/default.nix | 4 +- .../simple-websocket/default.nix | 43 + .../python-modules/simplefix/default.nix | 33 +- .../python-modules/simplemma/default.nix | 36 + .../python-modules/simplepush/default.nix | 48 + .../simplisafe-python/default.nix | 19 +- .../development/python-modules/sip/4.x.nix | 12 +- .../python-modules/sklearn-deap/default.nix | 40 +- .../python-modules/skodaconnect/default.nix | 4 +- .../python-modules/skorch/default.nix | 38 +- .../skytemple-files/default.nix | 8 +- .../python-modules/skytemple-rust/default.nix | 6 +- .../python-modules/slack-bolt/default.nix | 58 +- .../python-modules/slack-sdk/default.nix | 4 +- .../python-modules/slackclient/default.nix | 4 +- .../python-modules/slovnet/default.nix | 35 + .../python-modules/smbprotocol/default.nix | 6 +- .../python-modules/smbus2/default.nix | 16 +- .../python-modules/snaptime/default.nix | 34 + .../python-modules/snitun/default.nix | 4 +- .../snowflake-connector-python/default.nix | 4 +- .../python-modules/snscrape/default.nix | 4 +- .../social-auth-app-django/default.nix | 4 +- .../python-modules/socksio/default.nix | 10 + .../python-modules/softlayer/default.nix | 4 +- .../python-modules/solo-python/default.nix | 7 +- .../python-modules/sourmash/default.nix | 6 +- .../python-modules/soxr/default.nix | 6 +- .../python-modules/spacy-loggers/default.nix | 4 +- .../python-modules/spacy-pkuseg/default.nix | 4 +- .../python-modules/spdx-tools/default.nix | 4 +- .../python-modules/spectral-cube/default.nix | 2 + .../python-modules/speechbrain/default.nix | 4 +- .../python-modules/speg/default.nix | 2 +- .../python-modules/sphinx-design/default.nix | 2 +- .../sphinx-external-toc/default.nix | 2 +- .../sphinx-hoverxref/default.nix | 2 +- .../sphinx-inline-tabs/default.nix | 7 +- .../sphinx-mdinclude/default.nix | 2 +- .../sphinx-notfound-page/default.nix | 2 +- .../python-modules/sphinx-pytest/default.nix | 2 +- .../sphinxcontrib-plantuml/default.nix | 4 +- .../sphinxcontrib-spelling/default.nix | 8 +- .../python-modules/spsdk/default.nix | 8 +- .../python-modules/spyder-kernels/default.nix | 4 +- .../python-modules/spyder/default.nix | 8 +- .../spyder/dont-clear-pythonpath.patch | 29 +- .../python-modules/sqids/default.nix | 39 + .../sqlalchemy-mixins/default.nix | 4 +- .../python-modules/sqlite-utils/default.nix | 4 +- .../python-modules/sqlmap/default.nix | 4 +- .../python-modules/sqlparse/default.nix | 10 + .../python-modules/sqltrie/default.nix | 4 +- .../python-modules/srsly/default.nix | 4 +- .../python-modules/ssdpy/default.nix | 48 + .../python-modules/sseclient-py/default.nix | 30 +- .../python-modules/stanio/default.nix | 37 + .../python-modules/stanza/default.nix | 4 +- .../python-modules/starlette/default.nix | 4 +- .../python-modules/steamodd/default.nix | 12 +- .../python-modules/steamship/default.nix | 4 +- .../python-modules/stim/default.nix | 15 +- .../python-modules/stix2-patterns/default.nix | 64 + .../python-modules/stravalib/default.nix | 9 +- .../strawberry-graphql/default.nix | 9 +- .../python-modules/streamlit/default.nix | 18 +- .../python-modules/stumpy/default.nix | 4 +- .../python-modules/subdownloader/default.nix | 66 - .../python-modules/svg2tikz/default.nix | 13 +- .../python-modules/svgelements/default.nix | 50 + .../python-modules/swift/default.nix | 4 +- .../python-modules/syncedlyrics/default.nix | 4 +- .../python-modules/syrupy/default.nix | 8 +- .../python-modules/systemd/default.nix | 6 +- .../python-modules/tabcmd/default.nix | 66 + .../tableauserverclient/default.nix | 35 + .../python-modules/tabledata/default.nix | 4 +- .../python-modules/tagoio-sdk/default.nix | 4 +- .../python-modules/tank-utility/default.nix | 13 +- .../python-modules/tbats/default.nix | 56 + .../python-modules/tcolorpy/default.nix | 4 +- .../python-modules/tempest/default.nix | 4 +- .../python-modules/tempita/default.nix | 4 +- .../python-modules/tempora/default.nix | 21 +- .../tensorflow-datasets/default.nix | 4 +- .../tensorflow-metadata/default.nix | 4 +- .../python-modules/tensorflow/bin.nix | 14 +- .../tensorflow/binary-hashes.nix | 50 +- .../python-modules/tensorflow/prefetcher.sh | 5 +- .../python-modules/teslajsonpy/default.nix | 4 +- .../python-modules/textdistance/default.nix | 18 +- .../python-modules/textnets/default.nix | 6 +- .../python-modules/textual/default.nix | 4 +- .../python-modules/thelogrus/default.nix | 47 + .../python-modules/threadpoolctl/default.nix | 8 +- .../python-modules/tidalapi/default.nix | 6 +- .../python-modules/tidyexc/default.nix | 7 +- .../python-modules/tifffile/default.nix | 3 + .../python-modules/tika-client/default.nix | 6 +- .../python-modules/timetagger/default.nix | 4 +- .../python-modules/tinycss2/default.nix | 2 +- .../python-modules/tinyrecord/default.nix | 40 + .../python-modules/tldextract/default.nix | 8 +- .../python-modules/tlds/default.nix | 4 +- .../python-modules/tokenizers/Cargo.lock | 1703 +- .../python-modules/tokenizers/default.nix | 12 +- .../python-modules/tokentrim/default.nix | 39 + .../python-modules/torch/default.nix | 107 +- .../python-modules/torchio/default.nix | 9 +- .../development/python-modules/tornado/4.nix | 9 + .../development/python-modules/tornado/5.nix | 9 + .../python-modules/tornado/default.nix | 30 +- .../tplink-omada-client/default.nix | 4 +- .../python-modules/tpm2-pytss/default.nix | 8 + .../python-modules/transformers/default.nix | 4 +- .../transmission-rpc/default.nix | 4 +- .../python-modules/tree-sitter/default.nix | 4 +- .../python-modules/treelib/default.nix | 35 + .../python-modules/trimesh/default.nix | 4 +- .../python-modules/troposphere/default.nix | 31 +- .../python-modules/trustme/default.nix | 35 +- .../python-modules/truststore/default.nix | 15 +- .../python-modules/trytond/default.nix | 4 +- .../python-modules/tsfresh/default.nix | 93 + .../tsfresh/remove-pyscaffold.patch | 14 + .../remove-pytest-coverage-flags.patch | 15 + .../python-modules/ttls/default.nix | 4 +- .../python-modules/turnt/default.nix | 8 +- .../python-modules/tweedledum/default.nix | 5 + .../python-modules/twilio/default.nix | 4 +- .../python-modules/twisted/default.nix | 16 +- .../python-modules/twitchapi/default.nix | 26 +- .../python-modules/type-infer/default.nix | 71 + .../python-modules/typecode/default.nix | 8 + .../python-modules/typepy/default.nix | 15 +- .../types-aiobotocore-packages/default.nix | 752 + .../types-aiobotocore/default.nix | 1824 + .../python-modules/types-appdirs/default.nix | 21 + .../python-modules/types-awscrt/default.nix | 36 + .../types-beautifulsoup4/default.nix | 34 + .../python-modules/types-docopt/default.nix | 29 + .../python-modules/types-html5lib/default.nix | 29 + .../python-modules/types-mock/default.nix | 25 + .../python-modules/types-protobuf/default.nix | 4 +- .../python-modules/types-pytz/default.nix | 4 +- .../python-modules/types-redis/default.nix | 4 +- .../python-modules/types-requests/default.nix | 4 +- .../types-s3transfer/default.nix | 35 + .../u-msgpack-python/default.nix | 9 +- .../python-modules/ua-parser/default.nix | 4 +- .../python-modules/ulid-transform/default.nix | 4 +- .../python-modules/ultraheat-api/default.nix | 4 +- .../python-modules/unearth/default.nix | 8 +- .../universal-pathlib/default.nix | 7 +- .../universal-silabs-flasher/default.nix | 73 + .../unstructured-api-tools/default.nix | 6 +- .../unstructured-inference/default.nix | 12 +- .../python-modules/unstructured/default.nix | 6 +- .../python-modules/upcloud-api/default.nix | 4 +- .../python-modules/uproot/default.nix | 7 +- .../uptime-kuma-api/default.nix | 4 +- .../python-modules/uritools/default.nix | 4 +- .../urwid-mitmproxy/default.nix | 37 + .../development/python-modules/us/default.nix | 41 +- .../python-modules/userpath/default.nix | 4 +- .../python-modules/vega/default.nix | 13 +- .../python-modules/vertica-python/default.nix | 4 +- .../development/python-modules/vg/default.nix | 53 + .../python-modules/vispy/default.nix | 4 +- .../python-modules/vncdo/default.nix | 3 +- .../python-modules/volvooncall/default.nix | 5 +- .../python-modules/vsure/default.nix | 4 +- .../python-modules/walrus/default.nix | 52 + .../python-modules/wandb/default.nix | 30 +- .../python-modules/wasmer/default.nix | 5 +- .../python-modules/watchfiles/default.nix | 6 +- .../python-modules/wcmatch/default.nix | 4 +- .../python-modules/weasyprint/default.nix | 4 +- .../python-modules/web3/default.nix | 23 +- .../python-modules/webauthn/default.nix | 4 +- .../webrtc-noise-gain/default.nix | 56 + .../python-modules/weconnect-mqtt/default.nix | 4 +- .../python-modules/weconnect/default.nix | 4 +- .../python-modules/wheel/default.nix | 17 +- .../whirlpool-sixth-sense/default.nix | 4 +- .../python-modules/whitenoise/default.nix | 6 +- .../python-modules/whodap/default.nix | 4 +- .../python-modules/wikipedia-api/default.nix | 35 + .../python-modules/wikitextparser/default.nix | 39 + .../python-modules/worldengine/default.nix | 1 + .../python-modules/wsgidav/default.nix | 4 +- .../python-modules/wyoming/default.nix | 17 +- .../python-modules/xcffib/default.nix | 34 +- .../python-modules/xdg-base-dirs/default.nix | 9 +- .../python-modules/xdot/default.nix | 58 +- .../python-modules/xformers/default.nix | 19 +- .../python-modules/xgboost/default.nix | 4 +- .../python-modules/xknxproject/default.nix | 15 +- .../python-modules/xlsx2csv/default.nix | 4 + .../python-modules/xml2rfc/default.nix | 6 +- .../python-modules/xmlschema/default.nix | 4 +- .../xpath-expressions/default.nix | 20 +- .../python-modules/xtensor-python/default.nix | 40 +- .../python-modules/y-py/default.nix | 6 +- .../python-modules/yalexs-ble/default.nix | 4 +- .../python-modules/yalexs/default.nix | 4 +- .../yamlordereddictloader/default.nix | 4 +- .../python-modules/yangson/default.nix | 8 +- .../python-modules/yaramod/default.nix | 4 +- .../python-modules/yargy/default.nix | 29 + .../python-modules/yaspin/default.nix | 4 +- .../python-modules/yolink-api/default.nix | 4 +- .../python-modules/ypy-websocket/default.nix | 4 +- .../development/python-modules/yq/default.nix | 4 +- .../python-modules/ytmusicapi/default.nix | 14 +- .../python-modules/zamg/default.nix | 4 +- .../zephyr-python-api/default.nix | 35 + .../python-modules/zeroconf/default.nix | 4 +- .../zeversolarlocal/default.nix | 19 +- .../python-modules/zha-quirks/default.nix | 4 +- .../python-modules/zigpy-deconz/default.nix | 4 +- .../python-modules/zigpy-xbee/default.nix | 8 +- .../python-modules/zigpy-znp/default.nix | 4 +- .../python-modules/zigpy/default.nix | 4 +- .../python-modules/zimports/default.nix | 4 +- .../python-modules/zodbpickle/default.nix | 4 +- .../zwave-js-server-python/default.nix | 8 +- .../python-modules/zxing_cpp/default.nix | 31 +- .../zxing_cpp/use-nixpkgs-pybind11.patch | 14 - .../pkgs/development/r-modules/default.nix | 10 +- .../development/r-modules/wrapper-radian.nix | 3 +- .../ruby-modules/bundler/default.nix | 4 +- .../ruby-modules/gem-config/default.nix | 3 + .../pkgs/development/tools/air/default.nix | 6 +- .../development/tools/algolia-cli/default.nix | 4 +- .../pkgs/development/tools/allure/default.nix | 4 +- .../tools/altair-graphql-client/default.nix | 10 +- .../development/tools/amqpcat/default.nix | 7 +- .../pkgs/development/tools/amqpcat/shards.nix | 8 +- .../tools/analysis/actionlint/default.nix | 6 +- .../tools/analysis/banana-vera/default.nix | 4 +- .../analysis/cargo-tarpaulin/default.nix | 6 +- .../tools/analysis/checkov/default.nix | 6 +- .../tools/analysis/checkstyle/default.nix | 4 +- .../tools/analysis/codeql/default.nix | 4 +- .../tools/analysis/cppcheck/default.nix | 34 +- .../tools/analysis/flow/default.nix | 4 +- .../tools/analysis/kcov/default.nix | 4 +- .../tools/analysis/rizin/cutter.nix | 4 +- .../tools/analysis/rizin/default.nix | 4 +- .../tools/analysis/snyk/default.nix | 26 + .../tools/analysis/stylelint/default.nix | 24 + .../tools/analysis/svlint/default.nix | 6 +- .../tflint-plugins/tflint-ruleset-aws.nix | 6 +- .../tools/analysis/tflint/default.nix | 6 +- .../tools/analysis/tfsec/default.nix | 13 +- .../tools/analysis/valgrind/default.nix | 3 +- .../tools/analysis/valkyrie/default.nix | 31 - .../development/tools/api-linter/default.nix | 8 +- .../pkgs/development/tools/apko/default.nix | 8 +- .../development/tools/apktool/default.nix | 4 +- .../pkgs/development/tools/argc/default.nix | 6 +- .../pkgs/development/tools/asmfmt/default.nix | 2 +- .../development/tools/aws-sam-cli/default.nix | 5 +- .../pkgs/development/tools/azcopy/default.nix | 7 +- .../azure-functions-core-tools/default.nix | 14 +- .../azure-static-sites-client/default.nix | 6 +- .../azure-static-sites-client/versions.json | 48 +- .../pkgs/development/tools/b4/default.nix | 7 +- .../tools/backblaze-b2/default.nix | 30 +- .../pkgs/development/tools/bacon/default.nix | 6 +- .../tools/bazel-gazelle/default.nix | 4 +- .../development/tools/bazel-kazel/default.nix | 2 +- .../development/tools/bazelisk/default.nix | 7 +- .../pkgs/development/tools/bearer/default.nix | 8 +- .../development/tools/benthos/default.nix | 6 +- .../pkgs/development/tools/biome/default.nix | 63 + .../development/tools/bomber-go/default.nix | 10 +- .../pkgs/development/tools/buf/default.nix | 6 +- .../apache-maven/build-package.nix | 24 +- .../build-managers/apache-maven/default.nix | 4 +- .../bazel/bazel-remote/default.nix | 11 +- .../build-managers/bazel/bazel_6/default.nix | 3 + .../bazel/buildtools/default.nix | 4 +- .../tools/build-managers/bear/default.nix | 11 +- .../tools/build-managers/bob/default.nix | 10 +- .../tools/build-managers/buck2/default.nix | 4 +- .../tools/build-managers/buck2/hashes.json | 10 +- .../build-managers/corrosion/default.nix | 6 +- .../tools/build-managers/dub/default.nix | 7 +- .../tools/build-managers/goredo/default.nix | 6 +- .../tools/build-managers/gradle/default.nix | 12 +- .../tools/build-managers/mill/default.nix | 4 +- .../tools/build-managers/moon/default.nix | 6 +- .../tools/build-managers/msbuild/default.nix | 4 +- .../build-managers/sbt-extras/default.nix | 6 +- .../tools/build-managers/sbt/default.nix | 6 +- .../build-managers/turtle-build/default.nix | 26 + .../tools/build-managers/waf/default.nix | 96 +- .../tools/build-managers/waf/hook.nix | 24 + .../{wafHook => waf}/setup-hook.sh | 46 +- .../tools/build-managers/wafHook/default.nix | 10 - .../tools/build-managers/xmake/default.nix | 4 +- .../development/tools/buildah/default.nix | 4 +- .../development/tools/buildkit/default.nix | 5 +- .../development/tools/buildpack/default.nix | 6 +- .../pkgs/development/tools/butane/default.nix | 2 +- .../development/tools/castxml/default.nix | 4 +- .../development/tools/changie/default.nix | 6 +- .../pkgs/development/tools/check/default.nix | 2 +- .../development/tools/clang-tools/default.nix | 6 +- .../development/tools/clj-kondo/default.nix | 4 +- .../development/tools/cobra-cli/default.nix | 2 +- .../tools/cocoapods/Gemfile-beta.lock | 20 +- .../development/tools/cocoapods/Gemfile.lock | 20 +- .../tools/cocoapods/gemset-beta.nix | 32 +- .../development/tools/cocoapods/gemset.nix | 32 +- .../development/tools/cocogitto/default.nix | 6 +- .../development/tools/code-maat/default.nix | 45 + .../pkgs/development/tools/coder/default.nix | 6 +- .../tools/codespelunker/default.nix | 4 +- .../pkgs/development/tools/comby/comby.patch | 142 +- .../development/tools/conftest/default.nix | 6 +- .../tools/container2wasm/default.nix | 37 + .../buildbot/default.nix | 4 +- .../buildbot/master.nix | 7 +- .../continuous-integration/buildbot/pkg.nix | 2 +- .../buildbot/plugins.nix | 50 +- .../continuous-integration/buildbot/update.sh | 1 + .../buildbot/worker.nix | 2 +- .../buildkite-agent/default.nix | 33 +- .../buildkite-cli/default.nix | 2 +- .../cirrus-cli/default.nix | 6 +- .../codeberg-pages/default.nix | 2 +- .../continuous-integration/dagger/default.nix | 19 +- .../drone-cli/default.nix | 2 +- .../drone-runner-exec/default.nix | 2 +- .../gitea-actions-runner/default.nix | 6 +- .../github-runner/default.nix | 31 +- .../github-runner/deps.nix | 6 +- .../gitlab-runner/default.nix | 6 +- .../continuous-integration/hci/default.nix | 22 +- .../jenkins/default.nix | 4 +- .../pkgs/development/tools/cotton/Cargo.lock | 403 +- .../pkgs/development/tools/cotton/default.nix | 6 +- .../development/tools/coursier/default.nix | 4 +- .../development/tools/cpm-cmake/default.nix | 4 +- .../pkgs/development/tools/ctlptl/default.nix | 4 +- .../pkgs/development/tools/cuelsp/default.nix | 2 +- .../pkgs/development/tools/dapper/default.nix | 2 +- .../development/tools/darklua/default.nix | 13 +- .../tools/database/atlas/default.nix | 41 + .../database/beekeeper-studio/default.nix | 8 +- .../database/clickhouse-backup/default.nix | 6 +- .../tools/database/dbmate/default.nix | 6 +- .../tools/database/liquibase/default.nix | 4 +- .../tools/database/litefs/default.nix | 4 +- .../tools/database/litestream/default.nix | 6 +- .../tools/database/prisma-engines/Cargo.lock | 1788 +- .../tools/database/prisma-engines/default.nix | 6 +- .../tools/database/prqlc/default.nix | 6 +- .../tools/database/sqlc/default.nix | 10 +- .../tools/database/sqlcmd/default.nix | 6 +- .../tools/database/sqlfluff/default.nix | 4 +- .../tools/database/termdbms/default.nix | 4 +- .../timescaledb-parallel-copy/default.nix | 2 +- .../database/timescaledb-tune/default.nix | 2 +- .../tools/database/vitess/default.nix | 4 +- .../tools/database/webdis/default.nix | 29 +- .../pkgs/development/tools/devbox/default.nix | 6 +- .../development/tools/diesel-cli/default.nix | 6 +- .../pkgs/development/tools/djlint/default.nix | 45 + .../development/tools/dockfmt/default.nix | 2 +- .../pkgs/development/tools/doctl/default.nix | 4 +- .../pkgs/development/tools/dstp/default.nix | 2 +- .../pkgs/development/tools/dtools/default.nix | 10 +- .../development/tools/dump_syms/default.nix | 6 +- .../development/tools/earthly/default.nix | 6 +- .../development/tools/easyjson/default.nix | 2 +- .../tools/ec2-metadata-mock/default.nix | 2 +- .../pkgs/development/tools/ejs/default.nix | 34 + .../pkgs/development/tools/ejson/default.nix | 2 +- .../tools/electron-fiddle/default.nix | 2 +- .../development/tools/electron/.gitignore | 1 + .../tools/electron/binary/default.nix | 206 +- .../tools/electron/binary/generic.nix | 74 +- .../development/tools/electron/common.nix | 204 + .../development/tools/electron/default.nix | 12 + .../pkgs/development/tools/electron/info.json | 2558 + .../pkgs/development/tools/electron/update.py | 279 + .../tools/electron/version-old.patch | 42 + .../development/tools/electron/version.patch | 42 + .../development/tools/electron/wrapper.nix | 37 + .../pkgs/development/tools/ent/default.nix | 2 +- .../development/tools/esbuild/default.nix | 4 +- .../development/tools/esbuild/netlify.nix | 2 +- .../pkgs/development/tools/espup/default.nix | 20 +- .../development/tools/extism-cli/default.nix | 2 +- .../pkgs/development/tools/f2c/default.nix | 4 +- .../development/tools/faas-cli/default.nix | 4 +- .../pkgs/development/tools/faq/default.nix | 2 +- .../tools/fdroidserver/default.nix | 43 +- .../tools/fermyon-spin/default.nix | 3 +- .../tools/firebase-tools/default.nix | 44 + .../pkgs/development/tools/flock/default.nix | 3 +- .../pkgs/development/tools/flyway/default.nix | 19 +- .../pkgs/development/tools/fmbt/default.nix | 53 - .../pkgs/development/tools/fq/default.nix | 6 +- .../pkgs/development/tools/frugal/default.nix | 6 +- .../tools/fsautocomplete/default.nix | 4 +- .../development/tools/fsautocomplete/deps.nix | 41 +- .../pkgs/development/tools/fx/default.nix | 6 +- .../development/tools/gammaray/default.nix | 7 +- .../pkgs/development/tools/garble/default.nix | 2 +- .../pkgs/development/tools/gauge/default.nix | 6 +- .../pkgs/development/tools/gci/default.nix | 6 +- .../development/tools/gcov2lcov/default.nix | 31 + .../pkgs/development/tools/gdlv/default.nix | 17 +- .../development/tools/gi-crystal/default.nix | 4 +- .../pkgs/development/tools/ginkgo/default.nix | 6 +- .../development/tools/git-ps-rs/Cargo.lock | 2 +- .../development/tools/git-ps-rs/default.nix | 4 +- .../development/tools/github/bump/default.nix | 2 +- .../GlamorousToolkit-GetImage | 25 + .../tools/glamoroustoolkit/default.nix | 103 + .../pkgs/development/tools/gllvm/default.nix | 2 +- .../tools/global-platform-pro/default.nix | 35 +- .../development/tools/glpaper/default.nix | 2 +- .../development/tools/go-bindata/default.nix | 2 +- .../pkgs/development/tools/go-jet/default.nix | 4 +- .../tools/go-junit-report/default.nix | 2 +- .../development/tools/go-mockery/default.nix | 6 +- .../development/tools/go-outline/default.nix | 2 +- .../development/tools/go-task/default.nix | 6 +- .../development/tools/go-toml/default.nix | 5 +- .../development/tools/go-tools/default.nix | 6 +- .../pkgs/development/tools/goa/default.nix | 6 +- .../tools/gocode-gomod/default.nix | 2 +- .../development/tools/goconst/default.nix | 6 +- .../development/tools/gocyclo/default.nix | 2 +- .../pkgs/development/tools/goda/default.nix | 2 +- .../pkgs/development/tools/godef/default.nix | 2 +- .../development/tools/gofumpt/default.nix | 2 +- .../development/tools/gogetdoc/default.nix | 2 +- .../tools/goimports-reviser/default.nix | 6 +- .../pkgs/development/tools/gojq/default.nix | 1 + .../tools/gojsontoyaml/default.nix | 2 +- .../pkgs/development/tools/gokart/default.nix | 2 +- .../development/tools/golines/default.nix | 2 +- .../pkgs/development/tools/golint/default.nix | 2 +- .../development/tools/gomacro/default.nix | 5 +- .../tools/gomodifytags/default.nix | 2 +- .../tools/google-java-format/default.nix | 4 +- .../pkgs/development/tools/gopkgs/default.nix | 8 +- .../pkgs/development/tools/gops/default.nix | 6 +- .../pkgs/development/tools/gore/default.nix | 6 +- .../development/tools/gotemplate/default.nix | 4 +- .../pkgs/development/tools/gotest/default.nix | 2 +- .../development/tools/gotests/default.nix | 2 +- .../development/tools/gotools/default.nix | 2 +- .../pkgs/development/tools/gox/default.nix | 2 +- .../development/tools/gptcommit/default.nix | 6 +- .../pkgs/development/tools/gqlint/default.nix | 28 + .../pkgs/development/tools/gron/default.nix | 2 +- .../tools/grpc-gateway/default.nix | 6 +- .../pkgs/development/tools/hclfmt/default.nix | 6 +- .../pkgs/development/tools/hcloud/default.nix | 19 +- .../development/tools/headache/default.nix | 12 +- .../development/tools/hexo-cli/default.nix | 34 + .../development/tools/hjson-go/default.nix | 2 +- .../development/tools/hostess/default.nix | 2 +- .../pkgs/development/tools/hotdoc/default.nix | 14 +- .../pkgs/development/tools/hover/default.nix | 2 +- .../tools/html-minifier/default.nix | 30 + .../development/tools/htmltest/default.nix | 2 +- .../pkgs/development/tools/ijq/default.nix | 2 +- .../pkgs/development/tools/img/default.nix | 2 +- .../development/tools/ineffassign/default.nix | 2 +- .../development/tools/inferno/default.nix | 6 +- .../development/tools/initool/default.nix | 4 +- .../pkgs/development/tools/jake/default.nix | 28 + .../pkgs/development/tools/jaq/default.nix | 6 +- .../java/java-language-server/default.nix | 8 +- .../tools/java/visualvm/default.nix | 4 +- .../pkgs/development/tools/jbang/default.nix | 4 +- .../development/tools/jira-cli-go/default.nix | 2 +- .../development/tools/jmespath/default.nix | 2 +- .../pkgs/development/tools/jp/default.nix | 2 +- .../pkgs/development/tools/jq/default.nix | 25 +- ...when-building-without-regex-supports.patch | 38 - .../pkgs/development/tools/jql/default.nix | 7 +- .../development/tools/json2hcl/default.nix | 2 +- .../tools/jsonnet-bundler/default.nix | 2 +- .../pkgs/development/tools/k6/default.nix | 6 +- .../development/tools/kafkactl/default.nix | 6 +- .../pkgs/development/tools/kcli/default.nix | 2 +- .../pkgs/development/tools/kdash/default.nix | 6 +- .../development/tools/kdoctor/default.nix | 43 + .../development/tools/konstraint/default.nix | 6 +- .../pkgs/development/tools/ktlint/default.nix | 4 +- .../development/tools/kube-prompt/default.nix | 2 +- .../development/tools/kubectx/default.nix | 2 +- .../development/tools/kubeprompt/default.nix | 6 +- .../kubernetes-controller-tools/default.nix | 6 +- .../pkgs/development/tools/kubie/default.nix | 6 +- .../pkgs/development/tools/kustomize/3.nix | 2 +- .../buf-language-server/default.nix | 2 +- .../tools/language-servers/ccls/default.nix | 4 +- .../default.nix | 31 + .../language-servers/emmet-ls/default.nix | 37 + .../tools/language-servers/gopls/default.nix | 1 + .../language-servers/helm-ls/default.nix | 4 +- .../jsonnet-language-server/default.nix | 6 +- .../kotlin-language-server/default.nix | 5 +- .../lua-language-server/default.nix | 5 +- .../tools/language-servers/metals/default.nix | 4 +- .../tools/language-servers/millet/Cargo.lock | 323 +- .../tools/language-servers/millet/default.nix | 8 +- .../language-servers/neocmakelsp/default.nix | 6 +- .../tools/language-servers/nixd/default.nix | 1 + .../tools/language-servers/nls/Cargo.lock | 3536 + .../tools/language-servers/nls/default.nix | 15 +- .../perlnavigator/default.nix | 80 + .../language-servers/postgres-lsp/default.nix | 44 + .../language-servers/pylyzer/default.nix | 6 +- .../language-servers/ruff-lsp/default.nix | 8 +- .../rune-languageserver/default.nix | 35 + .../language-servers/typst-lsp/Cargo.lock | 950 +- .../language-servers/typst-lsp/default.nix | 9 +- .../language-servers/verible/default.nix | 24 +- .../language-servers/vhdl-ls/default.nix | 15 +- .../yaml-language-server/default.nix | 41 + .../yaml-language-server/package.json | 108 + .../development/tools/lazygit/default.nix | 6 +- .../tools/ldid-procursus/default.nix | 17 +- .../pkgs/development/tools/leaps/default.nix | 2 +- .../tools/lightningcss/default.nix | 7 +- .../literate-programming/Literate/default.nix | 2 + .../development/tools/ls-lint/default.nix | 4 +- .../development/tools/maligned/default.nix | 2 +- .../development/tools/marksman/default.nix | 8 +- .../pkgs/development/tools/memray/default.nix | 8 +- .../development/tools/micronaut/default.nix | 4 +- .../development/tools/misc/act/default.nix | 8 +- .../tools/misc/ast-grep/default.nix | 38 - .../tools/misc/autoconf-archive/default.nix | 4 +- .../tools/misc/aviator/default.nix | 2 +- .../tools/misc/blackfire/default.nix | 12 +- .../tools/misc/blackfire/php-probe.nix | 24 +- .../tools/misc/catppuccin-catwalk/default.nix | 60 +- .../development/tools/misc/ccache/default.nix | 4 +- .../development/tools/misc/chruby/default.nix | 2 +- .../tools/misc/circleci-cli/default.nix | 6 +- .../tools/misc/complgen/default.nix | 11 +- .../tools/misc/coreboot-toolchain/default.nix | 12 +- .../tools/misc/coreboot-toolchain/stable.nix | 18 +- .../tools/misc/dart-sass/default.nix | 10 +- .../tools/misc/dart-sass/pubspec.lock | 112 +- .../tools/misc/devspace/default.nix | 6 +- .../misc/editorconfig-checker/default.nix | 5 +- .../tools/misc/fsatrace/default.nix | 6 +- .../development/tools/misc/funzzy/default.nix | 11 +- .../tools/misc/fzf-make/default.nix | 6 +- .../development/tools/misc/gef/default.nix | 4 +- .../tools/misc/go-md2man/default.nix | 2 +- .../development/tools/misc/gperf/3.0.x.nix | 13 +- .../tools/misc/grpc-tools/default.nix | 10 +- .../development/tools/misc/hydra/unstable.nix | 7 +- .../tools/misc/inotify-tools/default.nix | 4 +- .../development/tools/misc/jiq/default.nix | 2 +- .../development/tools/misc/k2tf/default.nix | 2 +- .../development/tools/misc/kibana/7.x.nix | 14 +- .../tools/misc/linuxkit/default.nix | 2 +- .../development/tools/misc/mdl/Gemfile.lock | 2 +- .../development/tools/misc/mdl/default.nix | 2 +- .../development/tools/misc/mdl/gemset.nix | 4 +- .../development/tools/misc/mkcert/default.nix | 2 +- .../tools/misc/msitools/default.nix | 4 +- .../tools/misc/n98-magerun/default.nix | 51 +- .../tools/misc/n98-magerun2/default.nix | 49 +- .../tools/misc/nix-build-uncached/default.nix | 2 +- .../misc/nrf-command-line-tools/default.nix | 72 - .../tools/misc/nxpmicro-mfgtools/default.nix | 6 +- .../tools/misc/one_gadget/Gemfile.lock | 8 +- .../tools/misc/one_gadget/default.nix | 8 +- .../tools/misc/one_gadget/gemset.nix | 12 +- .../tools/misc/opengrok/default.nix | 4 +- .../tools/misc/orogene/default.nix | 6 +- .../tools/misc/patchelf/unstable.nix | 6 +- .../tools/misc/pest-ide-tools/default.nix | 6 +- .../tools/misc/phpunit/composer.lock | 1542 + .../tools/misc/phpunit/default.nix | 44 +- .../tools/misc/pkg-config/default.nix | 1 + .../tools/misc/pkgconf/default.nix | 20 +- .../pkgs/development/tools/misc/premake/5.nix | 7 +- .../development/tools/misc/protox/default.nix | 6 +- .../tools/misc/reviewdog/default.nix | 8 +- .../tools/misc/rsonpath/default.nix | 12 +- .../development/tools/misc/runme/default.nix | 10 +- .../development/tools/misc/scc/default.nix | 2 +- .../tools/misc/segger-jlink/default.nix | 120 - .../tools/misc/slint-lsp/default.nix | 6 +- .../development/tools/misc/spruce/default.nix | 4 +- .../tools/misc/src-cli/default.nix | 6 +- .../development/tools/misc/strace/default.nix | 4 +- .../tools/misc/terraform-ls/default.nix | 6 +- .../tools/misc/terraform-lsp/default.nix | 2 +- .../tools/misc/terramate/default.nix | 6 +- .../development/tools/misc/terser/default.nix | 22 + .../development/tools/misc/texinfo/common.nix | 5 +- .../development/tools/misc/texlab/default.nix | 8 +- .../development/tools/misc/topiary/Cargo.lock | 775 +- .../tools/misc/topiary/default.nix | 23 +- .../tools/misc/typical/default.nix | 6 +- .../development/tools/misc/ycmd/default.nix | 2 +- .../development/tools/misc/ztags/default.nix | 12 +- .../development/tools/mix2nix/default.nix | 4 +- .../development/tools/mockgen/default.nix | 2 +- .../pkgs/development/tools/modd/default.nix | 2 +- .../pkgs/development/tools/mold/default.nix | 1 + .../tools/mongosh/package-lock.json | 1939 +- .../development/tools/mongosh/source.json | 8 +- .../development/tools/mustache-go/default.nix | 2 +- .../development/tools/mysql-shell/default.nix | 35 +- .../pkgs/development/tools/nap/default.nix | 2 +- .../pkgs/development/tools/nc4nix/default.nix | 2 +- .../pkgs/development/tools/neil/default.nix | 4 +- .../development/tools/nest-cli/default.nix | 30 +- .../tools/nest-cli/package-lock.json | 15970 ----- .../development/tools/norminette/default.nix | 4 +- .../tools/ocaml/camlp5/default.nix | 3 +- .../pkgs/development/tools/ocaml/dune/3.nix | 4 +- .../development/tools/ocaml/merlin/4.x.nix | 16 +- .../tools/ocaml/ocp-index/default.nix | 8 +- .../tools/ocaml/opam-publish/default.nix | 34 + .../development/tools/oh-my-posh/default.nix | 6 +- .../pkgs/development/tools/okteto/default.nix | 4 +- .../tools/omnisharp-roslyn/default.nix | 4 +- .../tools/omnisharp-roslyn/deps.nix | 70 +- .../pkgs/development/tools/oq/default.nix | 8 + .../pkgs/development/tools/oras/default.nix | 6 +- .../pkgs/development/tools/oshka/default.nix | 2 +- .../tools/osslsigncode/default.nix | 21 +- .../development/tools/out-of-tree/default.nix | 2 +- .../pkgs/development/tools/oxlint/default.nix | 36 + .../pkgs/development/tools/packer/default.nix | 2 +- .../development/tools/packet-sd/default.nix | 2 +- .../tools/paging-calculator/default.nix | 6 +- .../development/tools/parsing/antlr/4.nix | 14 + .../tools/parsing/tree-sitter/default.nix | 3 + .../parsing/tree-sitter/grammars/default.nix | 1 + .../grammars/tree-sitter-bash.json | 9 +- .../grammars/tree-sitter-beancount.json | 9 +- .../grammars/tree-sitter-bibtex.json | 1 + .../grammars/tree-sitter-c-sharp.json | 1 + .../tree-sitter/grammars/tree-sitter-c.json | 9 +- .../grammars/tree-sitter-clojure.json | 1 + .../grammars/tree-sitter-cmake.json | 9 +- .../grammars/tree-sitter-comment.json | 9 +- .../grammars/tree-sitter-commonlisp.json | 9 +- .../tree-sitter/grammars/tree-sitter-cpp.json | 9 +- .../tree-sitter/grammars/tree-sitter-css.json | 9 +- .../grammars/tree-sitter-cuda.json | 9 +- .../tree-sitter/grammars/tree-sitter-cue.json | 9 +- .../grammars/tree-sitter-dart.json | 9 +- .../grammars/tree-sitter-devicetree.json | 1 + .../grammars/tree-sitter-dockerfile.json | 1 + .../tree-sitter/grammars/tree-sitter-dot.json | 1 + .../tree-sitter/grammars/tree-sitter-eex.json | 1 + .../grammars/tree-sitter-elisp.json | 1 + .../grammars/tree-sitter-elixir.json | 1 + .../tree-sitter/grammars/tree-sitter-elm.json | 9 +- .../tree-sitter-embedded-template.json | 1 + .../grammars/tree-sitter-erlang.json | 1 + .../grammars/tree-sitter-fennel.json | 1 + .../grammars/tree-sitter-fish.json | 1 + .../grammars/tree-sitter-fortran.json | 9 +- .../grammars/tree-sitter-gdscript.json | 1 + .../grammars/tree-sitter-glimmer.json | 1 + .../grammars/tree-sitter-glsl.json | 9 +- .../tree-sitter/grammars/tree-sitter-go.json | 9 +- .../grammars/tree-sitter-godot-resource.json | 1 + .../grammars/tree-sitter-gomod.json | 1 + .../grammars/tree-sitter-gowork.json | 1 + .../grammars/tree-sitter-graphql.json | 1 + .../grammars/tree-sitter-haskell.json | 9 +- .../tree-sitter/grammars/tree-sitter-hcl.json | 9 +- .../grammars/tree-sitter-heex.json | 1 + .../grammars/tree-sitter-hjson.json | 1 + .../grammars/tree-sitter-html.json | 9 +- .../grammars/tree-sitter-http.json | 1 + .../grammars/tree-sitter-janet-simple.json | 1 + .../grammars/tree-sitter-java.json | 1 + .../grammars/tree-sitter-javascript.json | 9 +- .../grammars/tree-sitter-jsdoc.json | 9 +- .../grammars/tree-sitter-json.json | 9 +- .../grammars/tree-sitter-json5.json | 1 + .../grammars/tree-sitter-jsonnet.json | 9 +- .../grammars/tree-sitter-julia.json | 9 +- .../grammars/tree-sitter-kotlin.json | 1 + .../grammars/tree-sitter-latex.json | 1 + .../grammars/tree-sitter-ledger.json | 1 + .../grammars/tree-sitter-llvm.json | 9 +- .../tree-sitter/grammars/tree-sitter-lua.json | 9 +- .../grammars/tree-sitter-make.json | 1 + .../grammars/tree-sitter-markdown.json | 9 +- .../grammars/tree-sitter-nickel.json | 9 +- .../tree-sitter/grammars/tree-sitter-nix.json | 9 +- .../grammars/tree-sitter-norg.json | 1 + .../tree-sitter/grammars/tree-sitter-nu.json | 9 +- .../grammars/tree-sitter-ocaml.json | 9 +- .../grammars/tree-sitter-org-nvim.json | 9 +- .../grammars/tree-sitter-perl.json | 9 +- .../tree-sitter/grammars/tree-sitter-pgn.json | 1 + .../tree-sitter/grammars/tree-sitter-php.json | 9 +- .../grammars/tree-sitter-pioasm.json | 1 + .../grammars/tree-sitter-prisma.json | 1 + .../tree-sitter/grammars/tree-sitter-pug.json | 9 +- .../grammars/tree-sitter-python.json | 9 +- .../grammars/tree-sitter-ql-dbscheme.json | 1 + .../tree-sitter/grammars/tree-sitter-ql.json | 1 + .../grammars/tree-sitter-query.json | 1 + .../tree-sitter/grammars/tree-sitter-r.json | 9 +- .../grammars/tree-sitter-regex.json | 9 +- .../grammars/tree-sitter-rego.json | 1 + .../tree-sitter/grammars/tree-sitter-rst.json | 1 + .../grammars/tree-sitter-ruby.json | 1 + .../grammars/tree-sitter-rust.json | 9 +- .../grammars/tree-sitter-scala.json | 9 +- .../grammars/tree-sitter-scheme.json | 9 +- .../grammars/tree-sitter-scss.json | 1 + .../grammars/tree-sitter-smithy.json | 9 +- .../grammars/tree-sitter-solidity.json | 1 + .../grammars/tree-sitter-sparql.json | 1 + .../tree-sitter/grammars/tree-sitter-sql.json | 9 +- .../grammars/tree-sitter-supercollider.json | 9 +- .../grammars/tree-sitter-surface.json | 1 + .../grammars/tree-sitter-svelte.json | 1 + .../grammars/tree-sitter-tiger.json | 9 +- .../grammars/tree-sitter-tlaplus.json | 1 + .../grammars/tree-sitter-toml.json | 1 + .../tree-sitter/grammars/tree-sitter-tsq.json | 1 + .../grammars/tree-sitter-turtle.json | 1 + .../grammars/tree-sitter-typescript.json | 9 +- .../grammars/tree-sitter-typst.json | 12 + .../grammars/tree-sitter-verilog.json | 9 +- .../tree-sitter/grammars/tree-sitter-vim.json | 1 + .../tree-sitter/grammars/tree-sitter-vue.json | 1 + .../grammars/tree-sitter-wing.json | 9 +- .../grammars/tree-sitter-yaml.json | 1 + .../grammars/tree-sitter-yang.json | 1 + .../tree-sitter/grammars/tree-sitter-zig.json | 1 + .../tools/parsing/tree-sitter/update.nix | 4 + .../development/tools/phpactor/default.nix | 73 +- .../pkgs/development/tools/pigeon/default.nix | 2 +- .../poetry2nix/known-build-systems.json | 1 - .../poetry2nix/overrides/build-systems.json | 124 +- .../poetry2nix/overrides/default.nix | 30 +- .../poetry2nix/pkgs/poetry/default.nix | 26 + .../development/tools/prettierd/default.nix | 6 +- .../development/tools/prettierd/package.json | 17 +- .../tools/proto-contrib/default.nix | 2 +- .../tools/protoc-gen-connect-go/default.nix | 19 +- .../tools/protoc-gen-dart/default.nix | 6 +- .../tools/protoc-gen-dart/pubspec.lock | 54 +- .../tools/protoc-gen-doc/default.nix | 2 +- .../tools/protoc-gen-go-vtproto/default.nix | 4 +- .../protoc-gen-twirp_swagger/default.nix | 2 +- .../protoc-gen-twirp_typescript/default.nix | 2 +- .../development/tools/protolint/default.nix | 2 +- .../development/tools/prototool/default.nix | 6 +- .../pkgs/development/tools/pscale/default.nix | 8 +- .../development/tools/pulumictl/default.nix | 6 +- .../tools/purescript/spago/default.nix | 2 - .../pkgs/development/tools/pyenv/default.nix | 4 +- .../pkgs/development/tools/qc/default.nix | 5 +- .../development/tools/qtcreator/default.nix | 6 +- .../tools/quick-lint-js/default.nix | 4 +- .../tools/quicktemplate/default.nix | 2 +- .../pkgs/development/tools/rain/default.nix | 6 +- .../development/tools/rakkess/default.nix | 2 +- .../tools/react-static/default.nix | 55 + .../tools/react-static/package.json | 154 + .../tools/redisinsight/default.nix | 154 + .../development/tools/redoc-cli/default.nix | 34 + .../tools/refinery-cli/default.nix | 12 +- .../pkgs/development/tools/reflex/default.nix | 2 +- .../pkgs/development/tools/refmt/default.nix | 2 +- .../development/tools/reftools/default.nix | 2 +- .../development/tools/regclient/default.nix | 6 +- .../development/tools/reindeer/default.nix | 8 +- .../pkgs/development/tools/relic/default.nix | 4 +- .../development/tools/renderdoc/default.nix | 4 +- .../development/tools/renderizer/default.nix | 2 +- .../pkgs/development/tools/revive/default.nix | 8 +- .../pkgs/development/tools/rome/default.nix | 58 - .../0001-cargo-lock-update-version.patch | 25 - .../development/tools/rubyfmt/default.nix | 19 +- .../pkgs/development/tools/ruff/Cargo.lock | 1153 +- .../pkgs/development/tools/ruff/default.nix | 6 +- .../tools/rust/cargo-about/default.nix | 7 +- .../tools/rust/cargo-audit/default.nix | 12 +- .../tools/rust/cargo-binstall/default.nix | 8 +- .../tools/rust/cargo-bisect-rustc/default.nix | 6 +- .../tools/rust/cargo-bundle/default.nix | 8 +- .../tools/rust/cargo-c/default.nix | 8 +- .../tools/rust/cargo-careful/default.nix | 6 +- .../tools/rust/cargo-codspeed/default.nix | 51 + .../tools/rust/cargo-component/Cargo.lock | 470 +- .../tools/rust/cargo-component/default.nix | 8 +- .../tools/rust/cargo-crev/default.nix | 6 +- .../tools/rust/cargo-deny/default.nix | 6 +- .../tools/rust/cargo-deps/default.nix | 6 +- .../tools/rust/cargo-dist/default.nix | 6 +- .../tools/rust/cargo-edit/Cargo.lock | 860 +- .../tools/rust/cargo-edit/default.nix | 6 +- .../tools/rust/cargo-espflash/default.nix | 6 +- .../tools/rust/cargo-expand/default.nix | 6 +- .../tools/rust/cargo-fund/default.nix | 6 +- .../tools/rust/cargo-generate/default.nix | 10 +- .../tools/rust/cargo-guppy/default.nix | 8 +- .../tools/rust/cargo-hack/default.nix | 6 +- .../tools/rust/cargo-hakari/default.nix | 6 +- .../tools/rust/cargo-insta/default.nix | 8 +- .../tools/rust/cargo-leptos/Cargo.lock | 1052 +- .../tools/rust/cargo-leptos/default.nix | 6 +- .../tools/rust/cargo-llvm-cov/default.nix | 91 +- .../tools/rust/cargo-llvm-lines/default.nix | 6 +- .../tools/rust/cargo-machete/default.nix | 6 +- .../tools/rust/cargo-make/default.nix | 15 +- .../tools/rust/cargo-modules/default.nix | 6 +- .../tools/rust/cargo-mutants/default.nix | 8 +- .../tools/rust/cargo-ndk/default.nix | 6 +- .../tools/rust/cargo-nextest/default.nix | 6 +- .../tools/rust/cargo-pgrx/default.nix | 15 +- .../tools/rust/cargo-public-api/default.nix | 6 +- .../tools/rust/cargo-release/Cargo.lock | 161 +- .../tools/rust/cargo-release/default.nix | 4 +- .../tools/rust/cargo-risczero/default.nix | 6 +- .../tools/rust/cargo-run-bin/default.nix | 28 + .../rust/cargo-semver-checks/default.nix | 22 +- .../tools/rust/cargo-shuttle/Cargo.lock | 2193 +- .../tools/rust/cargo-shuttle/default.nix | 4 +- .../tools/rust/cargo-tally/default.nix | 6 +- .../tools/rust/cargo-udeps/default.nix | 6 +- .../tools/rust/cargo-update/default.nix | 6 +- .../tools/rust/cargo-watch/default.nix | 6 +- .../tools/rust/cargo-xbuild/default.nix | 6 +- .../tools/rust/cargo-zigbuild/default.nix | 6 +- .../tools/rust/cbindgen/default.nix | 6 +- .../tools/rust/dioxus-cli/default.nix | 49 +- .../tools/rust/duckscript/default.nix | 6 +- .../tools/rust/genemichaels/Cargo.lock | 553 + .../tools/rust/genemichaels/default.nix | 22 + .../tools/rust/leptosfmt/default.nix | 6 +- .../tools/rust/maturin/default.nix | 6 +- .../tools/rust/probe-rs/default.nix | 6 +- .../tools/rust/rtthost/default.nix | 33 + .../tools/rust/rust-analyzer/default.nix | 6 +- .../tools/rust/rust-script/default.nix | 6 +- .../tools/rust/specr-transpile/default.nix | 6 +- .../tools/rust/sqlx-cli/default.nix | 19 +- .../tools/rust/svd2rust/default.nix | 6 +- .../pkgs/development/tools/rye/Cargo.lock | 125 +- .../pkgs/development/tools/rye/default.nix | 16 +- .../development/tools/sd-local/default.nix | 6 +- .../pkgs/development/tools/sem/default.nix | 4 +- .../development/tools/sentry-cli/default.nix | 8 +- .../development/tools/skaffold/default.nix | 4 +- .../pkgs/development/tools/skopeo/default.nix | 6 +- .../pkgs/development/tools/snazy/default.nix | 17 +- .../pkgs/development/tools/spicy/default.nix | 2 +- .../development/tools/spirv-tools/default.nix | 13 +- .../tools/spirv-tools/no-shared-libs.patch | 30 + .../pkgs/development/tools/sq/default.nix | 10 +- .../pkgs/development/tools/sqldef/default.nix | 30 + .../pkgs/development/tools/sshs/default.nix | 4 +- .../pkgs/development/tools/statik/default.nix | 2 +- .../pkgs/development/tools/stylua/default.nix | 6 +- .../tools/supabase-cli/default.nix | 8 +- .../development/tools/surge-cli/default.nix | 25 + .../pkgs/development/tools/swc/default.nix | 13 +- .../development/tools/symfony-cli/default.nix | 6 +- .../development/tools/tabnine/default.nix | 2 +- .../development/tools/tabnine/sources.json | 8 +- .../pkgs/development/tools/textql/default.nix | 4 +- .../development/tools/toxiproxy/default.nix | 2 +- .../development/tools/treefmt/default.nix | 6 +- .../development/tools/trunk-io/default.nix | 6 +- .../pkgs/development/tools/ttfb/default.nix | 6 +- .../development/tools/turbogit/default.nix | 2 +- .../development/tools/turso-cli/default.nix | 36 +- .../development/tools/twilio-cli/default.nix | 4 +- .../pkgs/development/tools/typos/default.nix | 6 +- .../development/tools/unconvert/default.nix | 2 +- .../development/tools/unityhub/default.nix | 4 +- .../development/tools/upbound/default.nix | 6 +- .../pkgs/development/tools/vendir/default.nix | 4 +- .../development/tools/viceroy/default.nix | 6 +- .../pkgs/development/tools/vsce/default.nix | 6 +- .../vulkan-validation-layers/default.nix | 28 +- .../development/tools/vultr-cli/default.nix | 21 +- .../pkgs/development/tools/vultr/default.nix | 2 +- .../pkgs/development/tools/wails/default.nix | 6 +- .../development/tools/wally-cli/default.nix | 2 +- .../development/tools/wasmedge/default.nix | 5 +- .../pkgs/development/tools/wasmi/Cargo.lock | 442 +- .../pkgs/development/tools/wasmi/default.nix | 4 +- .../development/tools/watchman/Cargo.lock | 462 +- .../development/tools/watchman/default.nix | 13 +- .../pkgs/development/tools/wgo/default.nix | 6 +- .../pkgs/development/tools/wire/default.nix | 2 +- .../pkgs/development/tools/wlcs/default.nix | 20 +- .../tools/worker-build}/Cargo.lock | 2316 +- .../tools/worker-build/default.nix | 13 +- .../pkgs/development/tools/wp4nix/default.nix | 2 +- .../tools/wxformbuilder/default.nix | 5 +- .../development/tools/yamlfmt/default.nix | 4 +- .../pkgs/development/tools/yq-go/default.nix | 6 +- .../pkgs/development/tools/ytt/default.nix | 4 +- .../pkgs/development/tools/zprint/default.nix | 4 +- .../pkgs/development/tools/zsv/default.nix | 5 +- .../pkgs/development/web/bloomrpc/default.nix | 2 +- .../pkgs/development/web/boa/default.nix | 6 +- .../pkgs/development/web/bun/default.nix | 32 +- .../pkgs/development/web/cypress/default.nix | 4 +- .../pkgs/development/web/deno/default.nix | 19 +- .../pkgs/development/web/deno/librusty_v8.nix | 10 +- .../development/web/deno/update/common.ts | 4 +- .../web/deno/update/librusty_v8.ts | 21 +- .../development/web/edge-runtime/default.nix | 8 +- .../web/edge-runtime/librusty_v8.nix | 11 +- .../pkgs/development/web/flyctl/default.nix | 9 +- .../web/function-runner/default.nix | 6 +- .../pkgs/development/web/insomnia/default.nix | 14 +- .../pkgs/development/web/minify/default.nix | 7 +- .../pkgs/development/web/nodejs/corepack.nix | 26 + .../pkgs/development/web/nodejs/nodejs.nix | 62 +- .../web/nodejs/trap-handler-backport.patch | 76 + .../pkgs/development/web/nodejs/v18.nix | 8 +- .../pkgs/development/web/nodejs/v20.nix | 5 +- .../web/playwright-test/node-packages.json | 2 +- .../web/playwright-test/node-packages.nix | 38 +- .../development/web/playwright/driver.nix | 10 +- .../pkgs/development/web/postman/darwin.nix | 4 +- .../pkgs/development/web/postman/default.nix | 2 +- .../pkgs/development/web/postman/linux.nix | 15 +- .../web/shopify-themekit/default.nix | 2 +- .../web/twitter-bootstrap/default.nix | 4 +- .../nixpkgs/pkgs/games/aaaaxy/default.nix | 6 +- .../nixpkgs/pkgs/games/angband/default.nix | 4 +- .../nixpkgs/pkgs/games/anki/Cargo.lock | 2580 +- third_party/nixpkgs/pkgs/games/anki/bin.nix | 8 +- .../nixpkgs/pkgs/games/anki/default.nix | 83 +- ...atch => skip-formatting-python-code.patch} | 8 +- .../nixpkgs/pkgs/games/atlauncher/default.nix | 53 +- .../pkgs/games/blackshades/default.nix | 10 +- .../nixpkgs/pkgs/games/blightmud/default.nix | 7 +- .../nixpkgs/pkgs/games/boohu/default.nix | 19 +- third_party/nixpkgs/pkgs/games/boohu/deps.nix | 20 - .../nixpkgs/pkgs/games/brutalmaze/default.nix | 6 +- .../nixpkgs/pkgs/games/chessx/default.nix | 47 +- .../nixpkgs/pkgs/games/chiaki/default.nix | 6 +- .../pkgs/games/chiaki4deck/default.nix | 4 +- .../nixpkgs/pkgs/games/classicube/default.nix | 12 +- .../pkgs/games/classicube/fix-linking.patch | 6 +- .../nixpkgs/pkgs/games/clonehero/default.nix | 2 +- .../nixpkgs/pkgs/games/cockatrice/default.nix | 4 +- .../nixpkgs/pkgs/games/corsix-th/default.nix | 4 +- .../nixpkgs/pkgs/games/ddnet/default.nix | 6 +- .../games/doom-ports/doomretro/default.nix | 4 +- .../pkgs/games/doom-ports/gzdoom/default.nix | 6 +- .../pkgs/games/dwarf-fortress/update.sh | 2 +- .../nixpkgs/pkgs/games/eduke32/default.nix | 34 +- ...1-bundle-system-glm-in-seriousproton.patch | 34 - .../pkgs/games/empty-epsilon/default.nix | 70 +- .../nixpkgs/pkgs/games/etlegacy/default.nix | 1 - .../nixpkgs/pkgs/games/ezquake/default.nix | 4 +- .../nixpkgs/pkgs/games/factorio/versions.json | 24 +- .../nixpkgs/pkgs/games/fallout-ce/build.nix | 77 + .../pkgs/games/fallout-ce/fallout-ce.nix | 20 + .../pkgs/games/fallout-ce/fallout2-ce.nix | 23 + .../nixpkgs/pkgs/games/fheroes2/default.nix | 4 +- .../nixpkgs/pkgs/games/gambatte/default.nix | 34 - .../nixpkgs/pkgs/games/gogdl/default.nix | 11 +- .../nixpkgs/pkgs/games/gotypist/default.nix | 2 +- .../nixpkgs/pkgs/games/grapejuice/default.nix | 53 +- .../nixpkgs/pkgs/games/harmonist/default.nix | 8 +- .../nixpkgs/pkgs/games/heroic/default.nix | 12 +- .../nixpkgs/pkgs/games/heroic/fhsenv.nix | 13 +- .../pkgs/games/instead-launcher/default.nix | 32 - .../pkgs/games/instead-launcher/path.patch | 39 - .../nixpkgs/pkgs/games/itch/butler.nix | 2 +- .../nixpkgs/pkgs/games/klavaro/default.nix | 6 +- .../nixpkgs/pkgs/games/klavaro/icons.patch | 146 - .../klavaro/trans_lang_get_similar.patch | 71 - .../nixpkgs/pkgs/games/ldmud/default.nix | 4 +- .../pkgs/games/lgames/lbreakouthd/default.nix | 4 +- .../pkgs/games/lunar-client/default.nix | 47 +- .../nixpkgs/pkgs/games/lzwolf/default.nix | 1 - .../nixpkgs/pkgs/games/mindustry/default.nix | 8 +- .../pkgs/games/minesweep-rs/default.nix | 6 +- .../nixpkgs/pkgs/games/nanosaur/default.nix | 2 - .../nixpkgs/pkgs/games/nanosaur2/default.nix | 2 - .../pkgs/games/openarena/Makefile.local | 12 + .../nixpkgs/pkgs/games/openarena/default.nix | 29 +- .../nixpkgs/pkgs/games/openmw/tes3mp.nix | 1 - .../nixpkgs/pkgs/games/osu-lazer/bin.nix | 8 +- .../nixpkgs/pkgs/games/otto-matic/default.nix | 2 - .../pkgs/games/path-of-building/default.nix | 4 +- .../nixpkgs/pkgs/games/performous/default.nix | 22 +- .../games/performous/performous-cmake.patch | 36 +- .../pkgs/games/prismlauncher/default.nix | 4 +- .../pkgs/games/prismlauncher/wrapper.nix | 11 +- .../nixpkgs/pkgs/games/qgo/default.nix | 6 +- .../nixpkgs/pkgs/games/quakespasm/default.nix | 4 +- .../nixpkgs/pkgs/games/r2modman/default.nix | 9 +- .../games/r2modman/steam-launch-fix.patch | 21 + .../pkgs/games/robotfindskitten/default.nix | 30 - .../pkgs/games/sgt-puzzles/default.nix | 19 +- .../space-station-14-launcher.nix | 6 +- .../nixpkgs/pkgs/games/srb2/cmake.patch | 56 +- .../nixpkgs/pkgs/games/srb2/default.nix | 11 +- .../nixpkgs/pkgs/games/srb2/thirdparty.patch | 12 + .../nixpkgs/pkgs/games/steam/fhsenv.nix | 4 +- .../nixpkgs/pkgs/games/stockfish/default.nix | 8 +- .../pkgs/games/terraria-server/default.nix | 14 +- .../pkgs/games/theforceengine/default.nix | 8 +- .../nixpkgs/pkgs/games/tworld2/default.nix | 46 - .../nixpkgs/pkgs/games/uchess/default.nix | 2 +- .../pkgs/games/ultrastardx/default.nix | 9 +- .../nixpkgs/pkgs/games/unciv/default.nix | 4 +- .../nixpkgs/pkgs/games/vassal/default.nix | 4 +- .../nixpkgs/pkgs/games/vcmi/default.nix | 6 +- .../pkgs/games/vintagestory/default.nix | 4 +- .../pkgs/games/warzone2100/default.nix | 3 + .../pkgs/games/wipeout-rewrite/default.nix | 71 + .../nixpkgs/pkgs/games/worldofgoo/default.nix | 2 +- .../pkgs/games/xivlauncher/default.nix | 4 +- .../nixpkgs/pkgs/games/xivlauncher/deps.nix | 3 + .../nixpkgs/pkgs/misc/ananicy-cpp/default.nix | 4 +- .../nixpkgs/pkgs/misc/beep/default.nix | 1 + .../pkgs/misc/brightnessctl/default.nix | 5 + .../pkgs/misc/calaos/installer/default.nix | 4 +- .../misc/cups/drivers/cnijfilter2/default.nix | 2 +- .../misc/cups/drivers/foomatic-db/default.nix | 6 +- .../pkgs/misc/drivers/epsonscan2/default.nix | 1 - .../nixpkgs/pkgs/misc/dumb/default.nix | 1 - third_party/nixpkgs/pkgs/misc/dxvk/dxvk.nix | 114 - .../nixpkgs/pkgs/misc/fastly/default.nix | 6 +- .../nixpkgs/pkgs/misc/flashfocus/default.nix | 15 +- .../nixpkgs/pkgs/misc/jackaudio/default.nix | 7 +- .../nixpkgs/pkgs/misc/jackaudio/tools.nix | 65 + .../nixpkgs/pkgs/misc/lilypond/default.nix | 4 +- .../nixpkgs/pkgs/misc/lilypond/unstable.nix | 4 +- .../nixpkgs/pkgs/misc/logging/beats/7.x.nix | 1 + .../nixpkgs/pkgs/misc/mnemonicode/default.nix | 2 +- .../nixpkgs/pkgs/misc/platformsh/default.nix | 51 - .../nixpkgs/pkgs/misc/scrcpy/default.nix | 2 +- .../screensavers/betterlockscreen/default.nix | 4 +- .../pkgs/misc/screensavers/vlock/default.nix | 1 + .../misc/screensavers/xss-lock/default.nix | 1 + .../pkgs/misc/tmux-plugins/default.nix | 6 +- .../nixpkgs/pkgs/misc/uboot/default.nix | 8 + .../nixpkgs/pkgs/misc/urbit/default.nix | 10 +- .../nixpkgs/pkgs/misc/vencord/default.nix | 26 +- .../misc/vencord/disable-updater-ui.patch | 35 - .../pkgs/misc/vencord/package-lock.json | 1843 +- .../pkgs/misc/vencord/replace-git.patch | 26 - .../nixpkgs/pkgs/misc/zeyple/default.nix | 2 +- .../darwin/apple-sdk-11.0/cf-setup-hook.sh | 2 +- .../darwin/apple-sdk/cf-setup-hook.sh | 2 +- .../darwin/coconutbattery/default.nix | 4 +- .../os-specific/darwin/ios-deploy/default.nix | 75 +- .../os-specific/darwin/raycast/default.nix | 4 +- .../os-specific/darwin/rectangle/default.nix | 6 +- .../os-specific/darwin/sketchybar/default.nix | 23 +- .../pkgs/os-specific/darwin/skhd/default.nix | 9 +- .../pkgs/os-specific/darwin/utm/default.nix | 6 +- .../pkgs/os-specific/darwin/yabai/default.nix | 9 +- .../linux/alsa-project/alsa-utils/default.nix | 17 +- ...Use-anbox-from-PATH-in-desktop-files.patch | 34 + .../pkgs/os-specific/linux/anbox/default.nix | 65 +- .../linux/anbox/postmarketos-image.nix | 19 + .../pkgs/os-specific/linux/apfs/default.nix | 4 +- .../os-specific/linux/apparmor/default.nix | 2 +- .../000-fix-static-attribute-malloc.diff | 12 - .../audit/001-ignore-flexible-array.patch | 35 - .../pkgs/os-specific/linux/audit/default.nix | 10 +- .../pkgs/os-specific/linux/bolt/default.nix | 4 +- .../os-specific/linux/bpftrace/default.nix | 22 +- .../os-specific/linux/bpftune/default.nix | 8 +- .../pkgs/os-specific/linux/conky/default.nix | 4 +- .../linux/conntrack-tools/default.nix | 6 +- .../os-specific/linux/cryptsetup/default.nix | 6 +- .../os-specific/linux/cshatag/default.nix | 2 +- .../pkgs/os-specific/linux/ddcci/default.nix | 15 +- .../os-specific/linux/decklink/default.nix | 52 + .../os-specific/linux/device-tree/default.nix | 25 +- .../os-specific/linux/displaylink/default.nix | 19 +- .../pkgs/os-specific/linux/dpdk/default.nix | 2 +- .../pkgs/os-specific/linux/ell/default.nix | 18 +- .../pkgs/os-specific/linux/ena/default.nix | 23 +- .../pkgs/os-specific/linux/eudev/default.nix | 66 - .../linux/evdi/0000-fix-drm-path.patch | 31 - .../pkgs/os-specific/linux/evdi/default.nix | 10 +- .../os-specific/linux/eventstat/default.nix | 2 +- .../pkgs/os-specific/linux/fan2go/default.nix | 6 +- .../firmware/firmware-updater/default.nix | 25 +- .../linux/firmware/firmware-updater/deps.json | 655 +- .../firmware/firmware-updater/pubspec.lock | 224 +- .../linux/firmware/fwupd-efi/default.nix | 2 +- ...d-option-for-installation-sysconfdir.patch | 48 +- .../linux/firmware/fwupd/default.nix | 17 +- .../firmware/fwupd/installed-tests-path.patch | 31 +- .../linux/firmware/linux-firmware/source.nix | 8 +- .../firmware/xow_dongle-firmware/default.nix | 2 +- .../os-specific/linux/fw-ectool/default.nix | 41 + .../pkgs/os-specific/linux/fwts/default.nix | 4 +- .../pkgs/os-specific/linux/hwdata/default.nix | 4 +- .../os-specific/linux/ifmetric/default.nix | 1 + .../linux/intel-cmt-cat/default.nix | 4 +- .../linux/intel-compute-runtime/default.nix | 5 +- .../pkgs/os-specific/linux/iomelt/default.nix | 2 +- .../os-specific/linux/iotop-c/default.nix | 4 +- .../os-specific/linux/ipp-usb/default.nix | 2 +- .../os-specific/linux/iproute/default.nix | 7 +- .../linux/ipu6-drivers/default.nix | 6 +- .../pkgs/os-specific/linux/iwd/default.nix | 6 +- .../pkgs/os-specific/linux/kbd/default.nix | 14 +- .../os-specific/linux/kbd/search-paths.patch | 3 +- .../linux/kernel-headers/default.nix | 4 +- .../linux/kernel/common-config.nix | 7 +- .../linux/kernel/hardened/patches.json | 72 +- .../linux/kernel/hardened/update.py | 23 +- .../os-specific/linux/kernel/kernels-org.json | 38 + .../os-specific/linux/kernel/linux-4.14.nix | 18 - .../os-specific/linux/kernel/linux-4.19.nix | 18 - .../os-specific/linux/kernel/linux-5.10.nix | 18 - .../os-specific/linux/kernel/linux-5.15.nix | 18 - .../os-specific/linux/kernel/linux-5.4.nix | 18 - .../os-specific/linux/kernel/linux-6.1.nix | 18 - .../os-specific/linux/kernel/linux-6.4.nix | 18 - .../os-specific/linux/kernel/linux-libre.nix | 4 +- .../linux/kernel/linux-rt-5.10.nix | 6 +- .../linux/kernel/linux-rt-5.15.nix | 6 +- .../os-specific/linux/kernel/linux-rt-5.4.nix | 6 +- .../os-specific/linux/kernel/linux-rt-6.1.nix | 6 +- .../linux/kernel/linux-testing.nix | 20 - .../os-specific/linux/kernel/mainline.nix | 27 + .../linux/kernel/manual-config.nix | 15 +- .../pkgs/os-specific/linux/kernel/patches.nix | 10 + .../os-specific/linux/kernel/perf/default.nix | 2 + .../linux/kernel/update-mainline.py | 130 + .../pkgs/os-specific/linux/kernel/update.sh | 76 +- .../linux/kernel/xanmod-kernels.nix | 10 +- .../os-specific/linux/kernel/zen-kernels.nix | 20 +- .../os-specific/linux/lenovo-legion/app.nix | 4 +- .../pkgs/os-specific/linux/libcap/default.nix | 26 + .../os-specific/linux/libnl-tiny/default.nix | 6 +- .../os-specific/linux/libnvme/default.nix | 8 +- .../os-specific/linux/libpsm2/default.nix | 4 +- .../pkgs/os-specific/linux/libzbc/default.nix | 2 +- .../pkgs/os-specific/linux/libzbd/default.nix | 2 +- .../os-specific/linux/linuxptp/default.nix | 4 +- .../pkgs/os-specific/linux/lvm2/2_03.nix | 4 +- .../pkgs/os-specific/linux/mbpfan/default.nix | 2 +- .../pkgs/os-specific/linux/microcode/amd.nix | 2 +- .../linux/minimal-bootstrap/bash/default.nix | 36 +- .../bash/mksignames-flush.patch | 10 + .../minimal-bootstrap/binutils/default.nix | 80 +- .../linux/minimal-bootstrap/bzip2/default.nix | 29 +- .../minimal-bootstrap/coreutils/musl.nix | 74 + .../linux/minimal-bootstrap/default.nix | 157 +- .../minimal-bootstrap/diffutils/default.nix | 33 +- .../minimal-bootstrap/findutils/default.nix | 37 +- .../linux/minimal-bootstrap/gawk/common.nix | 11 + .../linux/minimal-bootstrap/gawk/default.nix | 52 +- .../linux/minimal-bootstrap/gawk/mes.nix | 70 + .../linux/minimal-bootstrap/gcc/2.nix | 140 - .../linux/minimal-bootstrap/gcc/4.6.cxx.nix | 140 + .../linux/minimal-bootstrap/gcc/4.6.nix | 56 +- .../linux/minimal-bootstrap/gcc/8.nix | 140 + .../linux/minimal-bootstrap/gcc/latest.nix | 136 + .../gcc/libstdc++-target.patch | 32 - .../gcc/no-system-headers.patch | 11 + .../linux/minimal-bootstrap/glibc/default.nix | 121 - .../linux/minimal-bootstrap/gnumake/musl.nix | 82 + .../linux/minimal-bootstrap/gnused/common.nix | 12 + .../minimal-bootstrap/gnused/default.nix | 71 +- .../linux/minimal-bootstrap/gnused/mes.nix | 59 + .../linux/minimal-bootstrap/gnutar/latest.nix | 71 + .../gnutar/{default.nix => mes.nix} | 0 .../linux/minimal-bootstrap/gnutar/musl.nix | 70 + .../linux/minimal-bootstrap/mes/default.nix | 1 - .../linux/minimal-bootstrap/musl/1.1.nix | 116 + .../minimal-bootstrap/musl/always-flush.patch | 12 + .../linux/minimal-bootstrap/musl/common.nix | 13 + .../linux/minimal-bootstrap/musl/default.nix | 81 + .../stage0-posix/bootstrap-sources.nix | 10 +- .../stage0-posix/default.nix | 10 +- .../minimal-bootstrap/stage0-posix/hex0.nix | 29 +- .../stage0-posix/kaem/default.nix | 3 +- .../stage0-posix/kaem/minimal.nix | 6 +- .../stage0-posix/make-bootstrap-sources.nix | 8 + ...ge0-posix-x86.nix => mescc-tools-boot.nix} | 171 +- .../stage0-posix/mescc-tools-extra/build.kaem | 2 +- .../mescc-tools-extra/default.nix | 10 +- .../stage0-posix/mescc-tools/build.kaem | 100 +- .../stage0-posix/mescc-tools/default.nix | 42 +- .../stage0-posix/platforms.nix | 32 + .../tinycc/ignore-duplicate-symbols.patch | 13 + .../tinycc/ignore-static-inside-array.patch | 21 + .../linux/minimal-bootstrap/tinycc/musl.nix | 155 + .../tinycc/static-link.patch | 10 + .../linux/minimal-bootstrap/xz/default.nix | 36 +- .../linux/minimal-bootstrap/xz/stubs.h | 25 - .../linux/multipath-tools/default.nix | 34 +- .../os-specific/linux/net-tools/default.nix | 2 +- .../os-specific/linux/nftables/default.nix | 10 +- .../linux/nixos-rebuild/default.nix | 4 +- .../linux/nixos-rebuild/nixos-rebuild.8 | 10 +- .../linux/nixos-rebuild/nixos-rebuild.sh | 87 +- .../pkgs/os-specific/linux/nmon/default.nix | 4 +- .../os-specific/linux/nvidia-x11/default.nix | 42 +- .../linux/nvidia-x11/fabricmanager.nix | 47 + .../os-specific/linux/nvidia-x11/generic.nix | 63 +- .../os-specific/linux/oxtools/default.nix | 14 +- .../os-specific/linux/pam_mount/default.nix | 6 +- .../os-specific/linux/pam_rssh/default.nix | 15 +- .../os-specific/linux/pam_ussh/default.nix | 2 +- .../os-specific/linux/pax-utils/default.nix | 17 +- .../os-specific/linux/pipework/default.nix | 2 +- .../os-specific/linux/prl-tools/default.nix | 4 +- .../pkgs/os-specific/linux/psmisc/default.nix | 23 +- .../linux/raspberrypi-eeprom/default.nix | 3 +- .../os-specific/linux/rdma-core/default.nix | 6 +- .../os-specific/linux/rtl8821cu/default.nix | 6 +- .../pkgs/os-specific/linux/shadow/default.nix | 18 +- .../os-specific/linux/sysstat/default.nix | 17 +- ...ts-for-uninitialised-encrypted-devic.patch | 2 +- ...on-t-try-to-unmount-nix-or-nix-store.patch | 32 +- .../systemd/0003-Fix-NixOS-containers.patch | 6 +- ...some-NixOS-specific-unit-directories.patch | 26 +- ...f-a-useless-message-in-user-sessions.patch | 4 +- ...d-timedated-disable-methods-that-cha.patch | 20 +- ...e-usr-share-zoneinfo-to-etc-zoneinfo.patch | 28 +- ...calectl-use-etc-X11-xkb-for-list-x11.patch | 2 +- ...te-statedir-and-don-t-touch-prefixdi.patch | 4 +- ...1-add-rootprefix-to-lookup-dir-paths.patch | 4 +- ...-execute-scripts-in-etc-systemd-syst.patch | 4 +- ...ecute-scripts-in-etc-systemd-system-.patch | 4 +- ...-placeholder-for-DEFAULT_PATH_NORMAL.patch | 4 +- ...-environment-when-calling-generators.patch | 6 +- ...017-core-don-t-taint-on-unmerged-usr.patch | 4 +- ...ontext_init-fix-driver-name-checking.patch | 4 +- ...nt-efi-files-not-owned-by-systemd-in.patch | 46 - .../os-specific/linux/systemd/default.nix | 60 +- .../os-specific/linux/tailor-gui/default.nix | 60 + .../os-specific/linux/tpacpi-bat/default.nix | 4 +- .../os-specific/linux/tuxedo-rs/default.nix | 47 + .../os-specific/linux/uclibc-ng/default.nix | 4 +- .../os-specific/linux/udisks/2-default.nix | 4 +- .../linux/ultrablue-server/default.nix | 2 +- .../os-specific/linux/usbrelay/default.nix | 4 +- .../os-specific/linux/util-linux/default.nix | 36 +- .../pkgs/os-specific/linux/vmware/default.nix | 10 +- .../os-specific/linux/wiringpi/default.nix | 4 +- .../pkgs/os-specific/linux/xone/default.nix | 2 +- .../os-specific/linux/xpadneo/default.nix | 2 +- .../os-specific/linux/xsensors/default.nix | 2 +- .../pkgs/os-specific/linux/zfs/generic.nix | 54 +- .../pkgs/os-specific/linux/zfs/stable.nix | 19 +- .../pkgs/os-specific/linux/zfs/unstable.nix | 9 +- .../pkgs/os-specific/windows/default.nix | 2 +- .../os-specific/windows/dlfcn/default.nix | 23 + .../pkgs/os-specific/windows/jom/default.nix | 32 - .../os-specific/windows/mingw-w64/default.nix | 2 + .../windows/npiperelay/default.nix | 2 +- .../nixpkgs/pkgs/pkgs-lib/tests/formats.nix | 1 - .../pkgs/servers/akkoma/akkoma-fe/default.nix | 6 +- .../nixpkgs/pkgs/servers/akkoma/default.nix | 25 +- .../nixpkgs/pkgs/servers/akkoma/mix.nix | 207 +- .../nixpkgs/pkgs/servers/alice-lg/default.nix | 2 +- .../nixpkgs/pkgs/servers/alps/default.nix | 2 +- .../servers/amqp/rabbitmq-server/default.nix | 4 +- .../pkgs/servers/apache-airflow/default.nix | 6 +- .../pkgs/servers/apache-airflow/package.json | 28 +- .../pkgs/servers/apache-airflow/providers.nix | 64 +- .../servers/apache-airflow/python-package.nix | 38 +- .../apache-airflow/update-providers.py | 3 +- .../pkgs/servers/apache-airflow/yarn.lock | 11921 ---- .../pkgs/servers/apache-airflow/yarn.nix | 12349 ---- .../pkgs/servers/asouldocs/default.nix | 2 +- .../nixpkgs/pkgs/servers/asterisk/default.nix | 1 + .../pkgs/servers/atlassian/confluence.nix | 4 +- .../nixpkgs/pkgs/servers/atlassian/jira.nix | 4 +- .../pkgs/servers/audiobookshelf/default.nix | 25 +- .../pkgs/servers/audiobookshelf/wrapper.nix | 6 +- .../nixpkgs/pkgs/servers/bazarr/default.nix | 13 +- .../pkgs/servers/bililiverecorder/default.nix | 52 + .../nixpkgs/pkgs/servers/bindle/default.nix | 10 +- .../nixpkgs/pkgs/servers/bird-lg/default.nix | 8 +- .../nixpkgs/pkgs/servers/bird/default.nix | 4 +- .../pkgs/servers/birdwatcher/default.nix | 2 +- .../nixpkgs/pkgs/servers/bloat/default.nix | 8 +- .../pkgs/servers/blockbook/default.nix | 4 +- .../pkgs/servers/calibre-web/default.nix | 5 +- .../servers/calibre-web/static_environ.patch | 25 + .../nixpkgs/pkgs/servers/cayley/default.nix | 2 +- .../pkgs/servers/clickhouse/default.nix | 4 +- .../pkgs/servers/computing/slurm/default.nix | 6 +- .../pkgs/servers/confluencepot/default.nix | 2 +- .../nixpkgs/pkgs/servers/deconz/default.nix | 83 + .../nixpkgs/pkgs/servers/demoit/default.nix | 12 +- .../nixpkgs/pkgs/servers/dendrite/default.nix | 16 +- .../nixpkgs/pkgs/servers/dict/default.nix | 6 +- .../nixpkgs/pkgs/servers/dict/libmaa.nix | 7 +- .../nixpkgs/pkgs/servers/dns/bind/default.nix | 8 +- .../pkgs/servers/dns/coredns/default.nix | 40 +- .../pkgs/servers/dns/knot-dns/default.nix | 4 +- .../pkgs/servers/dns/ncdns/default.nix | 2 +- .../nixpkgs/pkgs/servers/dns/nsd/default.nix | 2 + .../servers/dns/pdns-recursor/default.nix | 4 +- .../nixpkgs/pkgs/servers/dns/pdns/default.nix | 4 +- .../pkgs/servers/dns/trust-dns/default.nix | 6 +- .../servers/documize-community/default.nix | 2 +- .../nixpkgs/pkgs/servers/domoticz/default.nix | 1 - .../pkgs/servers/duckling-proxy/default.nix | 5 +- .../nixpkgs/pkgs/servers/echoip/default.nix | 2 +- .../servers/elasticmq-server-bin/default.nix | 4 +- .../nixpkgs/pkgs/servers/eris-go/default.nix | 6 +- third_party/nixpkgs/pkgs/servers/etcd/3.3.nix | 35 - .../servers/fastnetmon-advanced/default.nix | 6 +- .../nixpkgs/pkgs/servers/frr/default.nix | 13 +- .../pkgs/servers/ftp/uftpd/default.nix | 24 + .../servers/geospatial/martin/default.nix | 10 +- .../geospatial/mbtileserver/default.nix | 2 +- .../servers/geospatial/tegola/default.nix | 4 +- .../nixpkgs/pkgs/servers/gerbera/default.nix | 11 + .../pkgs/servers/gnss-share/default.nix | 4 +- .../pkgs/servers/go-autoconfig/default.nix | 2 +- .../pkgs/servers/go-cqhttp/default.nix | 2 +- .../pkgs/servers/gobetween/default.nix | 2 +- .../nixpkgs/pkgs/servers/gonic/default.nix | 2 +- .../nixpkgs/pkgs/servers/gotify/default.nix | 28 +- .../nixpkgs/pkgs/servers/gotify/package.json | 87 - .../pkgs/servers/gotify/source-sha.nix | 1 - .../nixpkgs/pkgs/servers/gotify/ui.nix | 87 +- .../nixpkgs/pkgs/servers/gotify/update.sh | 40 - .../pkgs/servers/gotify/vendor-sha.nix | 1 - .../nixpkgs/pkgs/servers/gotify/version.nix | 1 - .../nixpkgs/pkgs/servers/gotify/yarndeps.nix | 13301 ---- .../pkgs/servers/gotosocial/default.nix | 6 +- .../nixpkgs/pkgs/servers/gotty/default.nix | 2 +- .../nixpkgs/pkgs/servers/gpsd/default.nix | 7 +- .../0001-Define-configs-with-env-vars.patch | 22 +- ...-config-file-as-it-s-stored-in-etc-g.patch | 2 +- .../nixpkgs/pkgs/servers/grocy/default.nix | 4 +- .../nixpkgs/pkgs/servers/h2/default.nix | 6 +- .../pkgs/servers/haste-server/default.nix | 50 +- .../servers/haste-server/node-composition.nix | 17 - .../pkgs/servers/haste-server/node-deps.nix | 1561 - .../pkgs/servers/haste-server/node-env.nix | 686 - .../pkgs/servers/haste-server/update.sh | 28 - .../nixpkgs/pkgs/servers/hasura/cli.nix | 2 +- .../pkgs/servers/heisenbridge/default.nix | 4 +- .../nixpkgs/pkgs/servers/hiraeth/default.nix | 6 +- .../nixpkgs/pkgs/servers/hitch/default.nix | 4 +- .../pkgs/servers/hockeypuck/server.nix | 2 +- .../home-assistant/component-packages.nix | 328 +- .../pkgs/servers/home-assistant/default.nix | 12 +- .../pkgs/servers/home-assistant/frontend.nix | 4 +- .../pkgs/servers/home-assistant/intents.nix | 12 +- .../home-assistant/patches/ffmpeg-path.patch | 120 +- .../pkgs/servers/home-assistant/stubs.nix | 4 +- .../pkgs/servers/home-assistant/tests.nix | 10 + .../servers/home-automation/evcc/default.nix | 12 +- .../servers/homepage-dashboard/default.nix | 8 +- .../nixpkgs/pkgs/servers/honk/default.nix | 9 +- .../pkgs/servers/hqplayerd/default.nix | 8 +- .../pkgs/servers/http/bozohttpd/default.nix | 2 +- .../pkgs/servers/http/cgiserver/default.nix | 4 +- .../pkgs/servers/http/dufs/default.nix | 26 +- .../pkgs/servers/http/envoy/default.nix | 17 +- .../pkgs/servers/http/jetty/default.nix | 4 +- .../pkgs/servers/http/nginx/modules.nix | 4 +- .../pkgs/servers/http/pomerium/default.nix | 6 +- .../pkgs/servers/http/pomerium/package.json | 12 +- .../pkgs/servers/http/pomerium/yarn-hash | 2 +- .../nixpkgs/pkgs/servers/http/ran/default.nix | 2 +- .../pkgs/servers/http/router/default.nix | 2 +- .../pkgs/servers/http/spawn-fcgi/default.nix | 2 +- .../servers/http/tomcat/tomcat-native.nix | 4 +- .../servers/http/trafficserver/default.nix | 4 +- .../pkgs/servers/http/unit/default.nix | 7 +- .../nixpkgs/pkgs/servers/hydron/default.nix | 1 + .../nixpkgs/pkgs/servers/icingaweb2/ipl.nix | 4 +- .../nixpkgs/pkgs/servers/imgproxy/default.nix | 6 +- .../pkgs/servers/interlock/default.nix | 2 +- .../pkgs/servers/invidious/versions.json | 6 +- .../pkgs/servers/irc/irccat/default.nix | 4 +- .../nixpkgs/pkgs/servers/jackett/default.nix | 4 +- .../nixpkgs/pkgs/servers/jackett/deps.nix | 2 + .../pkgs/servers/janus-gateway/default.nix | 4 +- .../nixpkgs/pkgs/servers/jellyfin/default.nix | 4 +- .../nixpkgs/pkgs/servers/jellyfin/web.nix | 6 +- .../nixpkgs/pkgs/servers/keycloak/default.nix | 16 +- .../keycloak/scim-for-keycloak/default.nix | 9 +- .../nixpkgs/pkgs/servers/klipper/default.nix | 10 +- .../nixpkgs/pkgs/servers/knxd/default.nix | 54 + .../nixpkgs/pkgs/servers/komga/default.nix | 4 +- .../pkgs/servers/kubemq-community/default.nix | 2 +- .../pkgs/servers/ldap/lldap/Cargo.lock | 1182 +- .../pkgs/servers/ldap/lldap/default.nix | 39 +- .../nixpkgs/pkgs/servers/lenpaste/default.nix | 2 +- .../nixpkgs/pkgs/servers/lidarr/default.nix | 8 +- .../nixpkgs/pkgs/servers/livepeer/default.nix | 2 +- .../nixpkgs/pkgs/servers/maddy/default.nix | 2 +- .../pkgs/servers/mail/dovecot/default.nix | 5 +- .../dovecot/plugins/pigeonhole/default.nix | 4 +- .../pkgs/servers/mail/exim/default.nix | 11 +- .../pkgs/servers/mail/listmonk/default.nix | 16 +- .../pkgs/servers/mail/listmonk/frontend.nix | 13 +- .../pkgs/servers/mail/listmonk/package.json | 14 +- .../pkgs/servers/mail/listmonk/stuffbin.nix | 2 +- .../pkgs/servers/mail/listmonk/yarn.lock | 10337 --- .../pkgs/servers/mail/listmonk/yarn.nix | 11085 ---- .../pkgs/servers/mail/mailman/package.nix | 2 - .../pkgs/servers/mail/mailman/python.nix | 12 +- .../nixpkgs/pkgs/servers/mail/mailman/web.nix | 1 + .../nixpkgs/pkgs/servers/mail/mox/default.nix | 4 +- .../pkgs/servers/mail/postfix/default.nix | 10 +- .../pkgs/servers/mail/rspamd/default.nix | 13 +- .../servers/mail/spamassassin/default.nix | 9 + .../pkgs/servers/mail/spf-engine/default.nix | 6 +- .../pkgs/servers/mail/stalwart/Cargo.lock | 574 +- .../pkgs/servers/mail/stalwart/default.nix | 8 +- .../nixpkgs/pkgs/servers/mastodon/default.nix | 19 +- .../nixpkgs/pkgs/servers/mastodon/source.nix | 14 +- .../nixpkgs/pkgs/servers/mastodon/update.sh | 24 +- .../nixpkgs/pkgs/servers/mastodon/version.nix | 1 - .../matrix-appservice-discord/package.json | 16 +- .../matrix-appservice-discord/pin.json | 6 +- .../matrix-appservice-discord/update.sh | 2 +- .../pkgs/servers/matrix-corporal/default.nix | 2 +- .../pkgs/servers/matrix-synapse/default.nix | 17 +- .../matrix-hookshot/package.json | 14 +- .../matrix-synapse/matrix-hookshot/pin.json | 8 +- .../plugins/mjolnir-antispam.nix | 2 +- .../plugins/s3-storage-provider.nix | 45 +- .../matrix-synapse/sliding-sync/default.nix | 10 +- .../servers/matrix-synapse/tools/synadm.nix | 4 +- .../pkgs/servers/mattermost/default.nix | 32 +- .../pkgs/servers/mautrix-discord/default.nix | 44 + .../pkgs/servers/mautrix-facebook/default.nix | 6 +- .../pkgs/servers/mautrix-telegram/default.nix | 10 +- .../pkgs/servers/mautrix-whatsapp/default.nix | 6 +- .../nixpkgs/pkgs/servers/mediamtx/default.nix | 6 +- .../nixpkgs/pkgs/servers/metabase/default.nix | 4 +- .../nixpkgs/pkgs/servers/meteor/default.nix | 2 +- .../nixpkgs/pkgs/servers/miniflux/default.nix | 8 +- .../nixpkgs/pkgs/servers/minio/default.nix | 6 +- .../nixpkgs/pkgs/servers/minio/legacy_fs.nix | 2 +- .../nixpkgs/pkgs/servers/mir/default.nix | 15 +- .../pkgs/servers/misc/gobgpd/default.nix | 6 +- .../pkgs/servers/misc/irrd/default.nix | 2 +- .../pkgs/servers/misc/podgrab/default.nix | 2 +- .../pkgs/servers/misc/starcharts/default.nix | 6 +- .../pkgs/servers/misc/virtiofsd/default.nix | 19 +- .../nixpkgs/pkgs/servers/mobilizon/common.nix | 22 + .../pkgs/servers/mobilizon/default.nix | 137 + .../pkgs/servers/mobilizon/frontend.nix | 42 + .../nixpkgs/pkgs/servers/mobilizon/mix.nix | 2027 + .../pkgs/servers/mobilizon/package.json | 140 + .../servers/monitoring/alerta/default.nix | 1 + .../monitoring/alertmanager-bot/default.nix | 35 - .../buildkite-agent-metrics/default.nix | 6 +- .../servers/monitoring/do-agent/default.nix | 4 +- .../monitoring/grafana-agent/default.nix | 37 +- .../grafana-dash-n-grab/default.nix | 6 +- .../servers/monitoring/grafana/default.nix | 17 +- .../pkgs/servers/monitoring/grafana/update.sh | 5 +- .../pkgs/servers/monitoring/loki/default.nix | 6 +- .../pkgs/servers/monitoring/mimir/default.nix | 25 +- .../nagios/plugins/check_ssl_cert.nix | 6 +- .../servers/monitoring/net-snmp/default.nix | 13 +- .../monitoring/prometheus/alertmanager.nix | 6 +- .../prometheus/apcupsd-exporter.nix | 2 +- .../monitoring/prometheus/aws-s3-exporter.nix | 2 +- .../prometheus/blackbox-exporter.nix | 2 +- .../prometheus/cloudflare-exporter.nix | 2 +- .../prometheus/collectd-exporter.nix | 2 +- .../prometheus/dcgm-exporter/default.nix | 6 +- .../servers/monitoring/prometheus/default.nix | 8 +- .../prometheus/dnsmasq-exporter.nix | 4 +- .../prometheus/exportarr/default.nix | 6 +- .../monitoring/prometheus/flow-exporter.nix | 2 +- .../prometheus/fritzbox-exporter.nix | 6 +- .../monitoring/prometheus/jitsi-exporter.nix | 2 +- .../prometheus/junos-czerwonk-exporter.nix | 6 +- .../prometheus/keylight-exporter.nix | 2 +- .../monitoring/prometheus/mail-exporter.nix | 4 +- .../prometheus/mikrotik-exporter.nix | 4 +- .../prometheus/modemmanager-exporter.nix | 2 +- .../monitoring/prometheus/nginx-exporter.nix | 2 +- .../prometheus/openldap-exporter.nix | 2 +- .../prometheus/openvpn-exporter.nix | 4 +- .../prometheus/pgbouncer-exporter.nix | 23 + .../prometheus/postfix-exporter.nix | 2 +- .../prometheus/postgres-exporter.nix | 6 +- .../prometheus/process-exporter.nix | 2 +- .../prometheus/promscale/default.nix | 2 +- .../monitoring/prometheus/pushgateway.nix | 6 +- .../monitoring/prometheus/redis-exporter.nix | 6 +- .../prometheus/rtl_433-exporter.nix | 4 +- .../prometheus/sabnzbd-exporter.nix | 38 + .../monitoring/prometheus/script-exporter.nix | 4 +- .../monitoring/prometheus/shelly-exporter.nix | 2 +- .../prometheus/smartctl-exporter/default.nix | 4 +- .../prometheus/systemd-exporter.nix | 16 +- .../prometheus/unbound-exporter.nix | 42 +- .../monitoring/prometheus/v2ray-exporter.nix | 2 +- .../prometheus/varnish-exporter.nix | 4 +- .../prometheus/wireguard-exporter.nix | 5 + .../servers/monitoring/telegraf/default.nix | 8 +- .../servers/monitoring/unpoller/default.nix | 6 +- .../monitoring/uptime-kuma/default.nix | 6 +- .../servers/monitoring/vmagent/default.nix | 4 +- .../pkgs/servers/monitoring/zabbix/agent2.nix | 4 +- .../servers/monitoring/zabbix/versions.nix | 16 +- .../pkgs/servers/moonraker/default.nix | 39 +- .../pkgs/servers/mqtt/mosquitto/default.nix | 4 +- .../servers/mx-puppet-discord/default.nix | 4 +- .../pkgs/servers/nats-server/default.nix | 7 +- .../pkgs/servers/nextcloud/default.nix | 16 +- .../pkgs/servers/nextcloud/packages/25.json | 62 +- .../pkgs/servers/nextcloud/packages/26.json | 76 +- .../pkgs/servers/nextcloud/packages/27.json | 70 +- .../servers/nextcloud/packages/default.nix | 12 +- .../servers/nextcloud/packages/generate.sh | 2 +- .../nextcloud/packages/nextcloud-apps.json | 62 +- .../pkgs/servers/nfs-ganesha/default.nix | 9 +- .../pkgs/servers/nginx-sso/default.nix | 6 +- .../nixpkgs/pkgs/servers/nitter/default.nix | 2 + .../nosql/apache-jena/fuseki-binary.nix | 2 +- .../pkgs/servers/nosql/arangodb/default.nix | 3 +- .../pkgs/servers/nosql/eventstore/default.nix | 4 +- .../pkgs/servers/nosql/eventstore/deps.nix | 71 +- .../pkgs/servers/nosql/ferretdb/default.nix | 12 +- .../pkgs/servers/nosql/influxdb/default.nix | 2 +- .../pkgs/servers/nosql/influxdb2/default.nix | 31 +- .../nosql/influxdb2/no-deny-warnings.patch | 10 + .../servers/nosql/influxdb2/provision.nix | 34 + .../nosql/influxdb2/token-manipulator.nix | 26 + .../pkgs/servers/nosql/mongodb/4.4.nix | 4 +- .../pkgs/servers/nosql/mongodb/5.0.nix | 4 +- .../pkgs/servers/nosql/mongodb/6.0.nix | 4 +- .../pkgs/servers/nosql/mongodb/mongodb.nix | 2 +- .../pkgs/servers/nosql/questdb/default.nix | 4 +- .../pkgs/servers/nosql/redis/default.nix | 31 +- .../pkgs/servers/nosql/surrealdb/default.nix | 12 +- .../servers/nosql/victoriametrics/default.nix | 4 +- .../pkgs/servers/nostr-rs-relay/default.nix | 6 +- .../nixpkgs/pkgs/servers/nsq/default.nix | 4 +- .../pkgs/servers/oauth2-proxy/default.nix | 6 +- .../nixpkgs/pkgs/servers/ombi/default.nix | 8 +- .../onlyoffice-documentserver/default.nix | 4 +- .../pkgs/servers/osmocom/libasn1c/default.nix | 4 +- .../servers/osmocom/libosmo-netif/default.nix | 4 +- .../servers/osmocom/libosmo-sccp/default.nix | 4 +- .../servers/osmocom/libosmoabis/default.nix | 4 +- .../servers/osmocom/libosmocore/default.nix | 6 +- .../pkgs/servers/osmocom/osmo-bsc/default.nix | 4 +- .../pkgs/servers/osmocom/osmo-bts/default.nix | 4 +- .../servers/osmocom/osmo-ggsn/default.nix | 4 +- .../pkgs/servers/osmocom/osmo-hlr/default.nix | 4 +- .../pkgs/servers/osmocom/osmo-mgw/default.nix | 4 +- .../pkgs/servers/osmocom/osmo-msc/default.nix | 4 +- .../pkgs/servers/osmocom/osmo-pcu/default.nix | 4 +- .../servers/osmocom/osmo-sgsn/default.nix | 4 +- .../osmocom/osmo-sip-connector/default.nix | 4 +- .../nixpkgs/pkgs/servers/oxigraph/default.nix | 6 +- .../pkgs/servers/photofield/default.nix | 6 +- .../pkgs/servers/photoprism/backend.nix | 2 +- .../nixpkgs/pkgs/servers/pleroma/default.nix | 6 +- third_party/nixpkgs/pkgs/servers/plex/raw.nix | 8 +- .../pkgs/servers/pocketbase/default.nix | 13 +- .../pocketbase/remove-update-method.patch | 22 - .../nixpkgs/pkgs/servers/polaris/default.nix | 2 + .../nixpkgs/pkgs/servers/polaris/web.nix | 6 +- .../nixpkgs/pkgs/servers/portunus/default.nix | 2 +- .../pkgs/servers/pufferpanel/default.nix | 53 +- .../pkgs/servers/pulseaudio/default.nix | 3 + .../nixpkgs/pkgs/servers/radarr/default.nix | 12 +- .../nixpkgs/pkgs/servers/radarr/update.sh | 1 + .../nixpkgs/pkgs/servers/radicale/3.x.nix | 18 +- .../nixpkgs/pkgs/servers/readarr/default.nix | 8 +- .../nixpkgs/pkgs/servers/redpanda/default.nix | 1 + .../pkgs/servers/rmfakecloud/default.nix | 2 +- .../pkgs/servers/roundcube/default.nix | 4 +- .../pkgs/servers/routinator/default.nix | 6 +- .../pkgs/servers/rustypaste/default.nix | 6 +- .../nixpkgs/pkgs/servers/sabnzbd/default.nix | 4 +- .../nixpkgs/pkgs/servers/samba/4.x.nix | 4 +- .../pkgs/servers/scaphandre/default.nix | 6 +- .../pkgs/servers/seafile-server/default.nix | 6 +- .../pkgs/servers/search/elasticsearch/7.x.nix | 14 +- .../servers/search/elasticsearch/plugins.nix | 2 +- .../servers/search/opensearch/default.nix | 4 +- .../pkgs/servers/search/qdrant/Cargo.lock | 555 +- .../pkgs/servers/search/qdrant/default.nix | 6 +- .../pkgs/servers/search/quickwit/Cargo.lock | 2243 +- .../pkgs/servers/search/quickwit/default.nix | 10 +- .../servers/search/typesense/sources.json | 8 +- .../pkgs/servers/search/weaviate/default.nix | 6 +- .../nixpkgs/pkgs/servers/ser2net/default.nix | 4 +- .../nixpkgs/pkgs/servers/serf/default.nix | 2 +- .../pkgs/servers/shairport-sync/default.nix | 4 +- .../override-python-version-check.patch | 22 +- .../pkgs/servers/sickbeard/sickgear.nix | 13 +- .../pkgs/servers/sip/freeswitch/default.nix | 4 +- .../nixpkgs/pkgs/servers/skydns/default.nix | 2 +- .../nixpkgs/pkgs/servers/snac2/default.nix | 4 +- .../pkgs/servers/soft-serve/default.nix | 6 +- .../nixpkgs/pkgs/servers/sozu/default.nix | 7 +- .../nixpkgs/pkgs/servers/spicedb/default.nix | 6 +- .../nixpkgs/pkgs/servers/spicedb/zed.nix | 6 +- .../nixpkgs/pkgs/servers/sql/dolt/default.nix | 6 +- .../servers/sql/mariadb/connector-c/3_1.nix | 4 +- .../servers/sql/mariadb/connector-c/3_2.nix | 4 +- .../servers/sql/mariadb/connector-c/3_3.nix | 6 + .../sql/mariadb/connector-c/default.nix | 20 +- .../pkgs/servers/sql/mariadb/default.nix | 38 +- .../servers/sql/mariadb/galera/default.nix | 4 +- .../pkgs/servers/sql/monetdb/default.nix | 4 +- .../pkgs/servers/sql/mssql/jdbc/default.nix | 4 +- .../nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix | 17 +- .../pkgs/servers/sql/mysql/jdbc/default.nix | 6 +- .../pkgs/servers/sql/pgbouncer/default.nix | 4 +- .../pkgs/servers/sql/pgpool/default.nix | 9 +- .../pkgs/servers/sql/postgresql/default.nix | 12 +- .../pkgs/servers/sql/postgresql/ext/age.nix | 23 +- .../servers/sql/postgresql/ext/periods.nix | 4 +- .../servers/sql/postgresql/ext/pg_cron.nix | 4 +- .../sql/postgresql/ext/pg_hint_plan.nix | 52 +- .../servers/sql/postgresql/ext/pg_ivm.nix | 4 +- .../servers/sql/postgresql/ext/pg_partman.nix | 4 +- .../pkgs/servers/sql/postgresql/ext/pgjwt.nix | 10 +- .../servers/sql/postgresql/ext/pgsql-http.nix | 30 + .../pkgs/servers/sql/postgresql/ext/pgtap.nix | 4 +- .../servers/sql/postgresql/ext/pgvector.nix | 4 +- .../sql/postgresql/ext/plpgsql_check.nix | 4 +- .../servers/sql/postgresql/ext/postgis.nix | 7 +- .../servers/sql/postgresql/ext/repmgr.nix | 4 +- .../sql/postgresql/ext/timescaledb.nix | 15 +- .../pkgs/servers/sql/postgresql/packages.nix | 2 + .../patches/disable-normalize_exec_path.patch | 12 + .../pkgs/servers/sql/rqlite/default.nix | 2 +- .../servers/static-web-server/default.nix | 6 +- .../nixpkgs/pkgs/servers/stone/default.nix | 33 + .../nixpkgs/pkgs/servers/swego/default.nix | 6 +- .../pkgs/servers/tailscale/default.nix | 8 +- .../pkgs/servers/tarantool/default.nix | 3 +- .../nixpkgs/pkgs/servers/tautulli/default.nix | 4 +- .../pkgs/servers/teleport/11/default.nix | 14 +- .../pkgs/servers/teleport/12/default.nix | 14 +- .../pkgs/servers/teleport/13/Cargo.lock | 1937 + .../pkgs/servers/teleport/13/default.nix | 19 + .../pkgs/servers/teleport/14/Cargo.lock | 1982 + .../pkgs/servers/teleport/14/default.nix | 17 + .../nixpkgs/pkgs/servers/teleport/generic.nix | 9 +- .../pkgs/servers/teleport/tsh_14.patch | 17 + .../nixpkgs/pkgs/servers/tidb/default.nix | 6 +- .../tracing/honeycomb/honeymarker/default.nix | 2 +- .../tracing/honeycomb/honeytail/default.nix | 2 +- .../tracing/honeycomb/honeyvent/default.nix | 2 +- .../pkgs/servers/tracing/tempo/default.nix | 5 +- .../nixpkgs/pkgs/servers/traefik/default.nix | 6 +- .../nixpkgs/pkgs/servers/trezord/default.nix | 2 +- .../pkgs/servers/trickster/trickster.nix | 2 +- .../nixpkgs/pkgs/servers/unifi/default.nix | 5 +- .../unifiedpush-common-proxies/default.nix | 2 +- .../pkgs/servers/unstructured-api/default.nix | 68 + .../nixpkgs/pkgs/servers/uxplay/default.nix | 4 +- .../servers/web-apps/bookstack/default.nix | 4 +- .../web-apps/bookstack/php-packages.nix | 136 +- .../discourse/assets_esbuild_from_path.patch | 13 + .../servers/web-apps/discourse/default.nix | 47 +- .../plugins/discourse-assign/default.nix | 4 +- .../discourse-bbcode-color/default.nix | 4 +- .../plugins/discourse-calendar/Gemfile.lock | 8 +- .../plugins/discourse-calendar/default.nix | 4 +- .../plugins/discourse-calendar/gemset.nix | 12 +- .../discourse-canned-replies/default.nix | 4 +- .../discourse-chat-integration/default.nix | 4 +- .../plugins/discourse-checklist/default.nix | 4 +- .../discourse-data-explorer/default.nix | 4 +- .../plugins/discourse-docs/default.nix | 4 +- .../plugins/discourse-github/Gemfile.lock | 10 +- .../plugins/discourse-github/default.nix | 4 +- .../plugins/discourse-github/gemset.nix | 26 +- .../plugins/discourse-math/default.nix | 4 +- .../discourse-migratepassword/Gemfile.lock | 2 +- .../discourse-migratepassword/default.nix | 4 +- .../discourse-openid-connect/default.nix | 4 +- .../plugins/discourse-prometheus/Gemfile | 2 +- .../plugins/discourse-prometheus/Gemfile.lock | 2 +- .../plugins/discourse-prometheus/default.nix | 4 +- .../spec-import-fix-abi-version.patch | 20 +- .../plugins/discourse-reactions/default.nix | 4 +- .../discourse-saved-searches/default.nix | 4 +- .../plugins/discourse-solved/default.nix | 4 +- .../discourse-spoiler-alert/default.nix | 4 +- .../plugins/discourse-voting/default.nix | 4 +- .../discourse-yearly-review/default.nix | 4 +- .../web-apps/discourse/rubyEnv/Gemfile | 20 +- .../web-apps/discourse/rubyEnv/Gemfile.lock | 306 +- .../web-apps/discourse/rubyEnv/gemset.nix | 486 +- .../rubyEnv/sass-embedded-static.patch | 21 - .../pkgs/servers/web-apps/discourse/update.py | 2 +- .../servers/web-apps/dolibarr/default.nix | 4 +- .../servers/web-apps/engelsystem/default.nix | 4 +- .../pkgs/servers/web-apps/galene/default.nix | 4 +- .../servers/web-apps/healthchecks/default.nix | 31 +- .../pkgs/servers/web-apps/lemmy/ui.nix | 10 +- ...ip2.patch => change-path-geoip2-4.x.patch} | 1 - .../matomo/change-path-geoip2-5.x.patch | 10 + .../pkgs/servers/web-apps/matomo/default.nix | 23 +- .../servers/web-apps/mediawiki/default.nix | 4 +- .../web-apps/meme-bingo-web/default.nix | 34 + .../pkgs/servers/web-apps/moodle/default.nix | 6 +- .../pkgs/servers/web-apps/morty/default.nix | 2 +- .../pkgs/servers/web-apps/netbox/default.nix | 53 +- .../pkgs/servers/web-apps/netbox/generic.nix | 33 +- .../pkgs/servers/web-apps/nifi/default.nix | 4 +- .../pkgs/servers/web-apps/outline/default.nix | 10 +- .../pkgs/servers/web-apps/outline/yarn.lock | 13732 ---- .../pkgs/servers/web-apps/outline/yarn.nix | 14949 ----- .../web-apps/peering-manager/default.nix | 53 +- .../pkgs/servers/web-apps/pict-rs/default.nix | 6 +- .../servers/web-apps/plausible/default.nix | 67 +- .../servers/web-apps/plausible/package.json | 68 - .../pkgs/servers/web-apps/plausible/yarn.lock | 5873 -- .../pkgs/servers/web-apps/plausible/yarn.nix | 6438 -- .../pkgs/servers/web-apps/slskd/default.nix | 7 +- .../pkgs/servers/web-apps/slskd/deps.nix | 1 + .../servers/web-apps/slskd/package-lock.patch | 13 - .../servers/web-apps/snipe-it/default.nix | 4 +- .../web-apps/snipe-it/php-packages.nix | 28 +- .../pkgs/servers/web-apps/snipe-it/update.sh | 53 +- .../pkgs/servers/web-apps/sogo/default.nix | 4 +- .../pkgs/servers/web-apps/vikunja/api.nix | 2 +- .../servers/web-apps/wallabag/default.nix | 18 +- .../web-apps/wallabag/wallabag-data.patch | 12 +- .../servers/web-apps/whitebophir/default.nix | 60 +- .../servers/web-apps/whitebophir/generate.sh | 15 - .../whitebophir/node-packages-generated.nix | 976 - .../web-apps/whitebophir/node-packages.json | 3 - .../web-apps/whitebophir/node-packages.nix | 17 - .../servers/web-apps/wordpress/default.nix | 6 +- .../wordpress/packages/languages.json | 18 +- .../web-apps/wordpress/packages/plugins.json | 152 +- .../web-apps/wordpress/packages/themes.json | 8 +- .../nixpkgs/pkgs/servers/webdav/default.nix | 2 +- .../nixpkgs/pkgs/servers/wesher/default.nix | 2 +- .../nixpkgs/pkgs/servers/windmill/Cargo.lock | 1729 +- .../nixpkgs/pkgs/servers/windmill/default.nix | 42 +- .../nixpkgs/pkgs/servers/x11/xorg/default.nix | 6 +- .../pkgs/servers/x11/xorg/overrides.nix | 158 +- .../pkgs/servers/x11/xorg/tarballs.list | 2 +- .../pkgs/servers/x11/xorg/xwayland.nix | 21 +- .../pkgs/servers/x11/xquartz/default.nix | 2 +- .../nixpkgs/pkgs/servers/xandikos/default.nix | 21 +- .../servers/xmpp/prosody-filer/default.nix | 10 +- .../pkgs/servers/xmpp/prosody/default.nix | 14 +- .../nixpkgs/pkgs/servers/xteve/default.nix | 2 +- .../pkgs/servers/zigbee2mqtt/default.nix | 6 +- .../pkgs/servers/zookeeper/default.nix | 4 +- third_party/nixpkgs/pkgs/shells/bash/5.nix | 10 +- .../nixpkgs/pkgs/shells/carapace/default.nix | 7 +- .../nixpkgs/pkgs/shells/fish/babelfish.nix | 2 +- .../nixpkgs/pkgs/shells/fish/plugins/done.nix | 4 +- .../pkgs/shells/fish/plugins/fzf-fish.nix | 5 +- .../nixpkgs/pkgs/shells/fish/plugins/pure.nix | 20 +- .../nixpkgs/pkgs/shells/fish/plugins/tide.nix | 6 +- .../nixpkgs/pkgs/shells/hishtory/default.nix | 6 +- .../nixpkgs/pkgs/shells/murex/default.nix | 8 +- .../nixpkgs/pkgs/shells/nushell/default.nix | 6 +- .../shells/nushell/nu_scripts/default.nix | 6 +- .../pkgs/shells/nushell/plugins/default.nix | 5 +- .../pkgs/shells/nushell/plugins/formats.nix | 36 + .../pkgs/shells/nushell/plugins/gstat.nix | 30 +- .../pkgs/shells/nushell/plugins/query.nix | 22 +- .../nixpkgs/pkgs/shells/oh/default.nix | 2 +- .../nixpkgs/pkgs/shells/pash/default.nix | 30 - .../pkgs/shells/powershell/default.nix | 170 +- .../pkgs/shells/powershell/getHashes.sh | 33 - .../nixpkgs/pkgs/shells/xonsh/default.nix | 12 +- .../nixpkgs/pkgs/shells/yash/default.nix | 15 +- .../shells/zsh/agdsn-zsh-config/default.nix | 4 +- .../pkgs/shells/zsh/antibody/default.nix | 4 +- .../nixpkgs/pkgs/shells/zsh/default.nix | 7 + .../nixpkgs/pkgs/shells/zsh/zimfw/default.nix | 4 +- .../nixpkgs/pkgs/shells/zsh/zinit/default.nix | 4 +- .../shells/zsh/zsh-completions/default.nix | 4 +- .../pkgs/shells/zsh/zsh-forgit/default.nix | 4 +- .../pkgs/shells/zsh/zsh-history/default.nix | 2 +- .../pkgs/shells/zsh/zsh-prezto/default.nix | 6 +- third_party/nixpkgs/pkgs/stdenv/booter.nix | 2 +- .../stdenv/darwin/make-bootstrap-tools.nix | 2 +- .../pkgs/stdenv/generic/make-derivation.nix | 2 + .../nixpkgs/pkgs/stdenv/generic/setup.sh | 4 +- ...ch64.nix => aarch64-unknown-linux-gnu.nix} | 0 ...usl.nix => aarch64-unknown-linux-musl.nix} | 0 ...nix => armv5tel-unknown-linux-gnueabi.nix} | 0 ...nix => armv6l-unknown-linux-gnueabihf.nix} | 0 ...ix => armv6l-unknown-linux-musleabihf.nix} | 0 ...nix => armv7l-unknown-linux-gnueabihf.nix} | 0 .../{i686.nix => i686-unknown-linux-gnu.nix} | 0 .../linux/bootstrap-files/loongson2f.nix | 44 - ...ix => mips64el-unknown-linux-gnuabi64.nix} | 0 ...x => mips64el-unknown-linux-gnuabin32.nix} | 0 ...ipsel.nix => mipsel-unknown-linux-gnu.nix} | 0 ....nix => powerpc64le-unknown-linux-gnu.nix} | 0 ...cv64.nix => riscv64-unknown-linux-gnu.nix} | 0 ...86_64.nix => x86_64-unknown-linux-gnu.nix} | 2 +- ...musl.nix => x86_64-unknown-linux-musl.nix} | 0 .../nixpkgs/pkgs/stdenv/linux/default.nix | 28 +- .../linux/make-bootstrap-tools-cross.nix | 34 +- .../stdenv/linux/make-bootstrap-tools.nix | 3 +- .../nixpkgs/pkgs/test/cc-wrapper/default.nix | 26 +- .../pkgs/test/cc-wrapper/fortify1-example.c | 16 + .../pkgs/test/cc-wrapper/fortify2-example.c | 16 + .../pkgs/test/cc-wrapper/fortify3-example.c | 13 + .../pkgs/test/cc-wrapper/hardening.nix | 396 + third_party/nixpkgs/pkgs/test/default.nix | 108 +- .../pkgs/test/make-binary-wrapper/cross.nix | 7 +- .../pkgs/test/nixpkgs-check-by-name/.envrc | 1 + .../test/nixpkgs-check-by-name/.gitignore | 2 + .../nixpkgs-check-by-name/Cargo.lock} | 502 +- .../test/nixpkgs-check-by-name/Cargo.toml | 18 + .../pkgs/test/nixpkgs-check-by-name/README.md | 98 + .../test/nixpkgs-check-by-name/default.nix | 42 + .../pkgs/test/nixpkgs-check-by-name/shell.nix | 6 + .../test/nixpkgs-check-by-name/src/eval.nix | 59 + .../test/nixpkgs-check-by-name/src/eval.rs | 130 + .../test/nixpkgs-check-by-name/src/main.rs | 200 + .../nixpkgs-check-by-name/src/references.rs | 184 + .../nixpkgs-check-by-name/src/structure.rs | 152 + .../test/nixpkgs-check-by-name/src/utils.rs | 72 + .../tests/broken-autocall/default.nix | 4 + .../tests/broken-autocall/expected | 1 + .../pkgs/by-name/fo/foo/package.nix | 1 + .../tests/incorrect-shard/default.nix | 1 + .../tests/incorrect-shard/expected | 1 + .../pkgs/by-name/aa/FOO/package.nix | 1 + .../tests/invalid-package-name/default.nix | 1 + .../tests/invalid-package-name/expected | 1 + .../pkgs/by-name/fo/fo@/package.nix | 1 + .../tests/invalid-shard-name/default.nix | 1 + .../tests/invalid-shard-name/expected | 1 + .../pkgs/by-name/A/A/.git-keep | 0 .../pkgs/by-name/A/A/package.nix | 1 + .../tests/missing-package-nix/default.nix | 1 + .../tests/missing-package-nix/expected | 1 + .../pkgs/by-name/fo/foo/.git-keep | 0 .../tests/mock-nixpkgs.nix | 101 + .../tests/no-by-name/default.nix | 1 + .../tests/non-attrs/default.nix | 1 + .../tests/non-attrs/expected | 1 + .../pkgs/by-name/no/nonDerivation/package.nix | 1 + .../tests/non-derivation/default.nix | 1 + .../tests/non-derivation/expected | 1 + .../pkgs/by-name/no/nonDerivation/package.nix | 1 + .../tests/one-letter/default.nix | 1 + .../one-letter/pkgs/by-name/a/a/package.nix | 1 + .../override-different-file/all-packages.nix | 3 + .../tests/override-different-file/default.nix | 1 + .../tests/override-different-file/expected | 1 + .../pkgs/by-name/no/nonDerivation/package.nix | 1 + .../tests/override-different-file/someDrv.nix | 1 + .../override-no-call-package/all-packages.nix | 3 + .../override-no-call-package/default.nix | 1 + .../tests/override-no-call-package/expected | 1 + .../pkgs/by-name/no/nonDerivation/package.nix | 1 + .../tests/override-no-file/all-packages.nix | 3 + .../tests/override-no-file/default.nix | 1 + .../tests/override-no-file/expected | 1 + .../pkgs/by-name/no/nonDerivation/package.nix | 1 + .../tests/package-dir-is-file/default.nix | 1 + .../tests/package-dir-is-file/expected | 1 + .../package-dir-is-file/pkgs/by-name/fo/foo | 0 .../tests/package-nix-dir/default.nix | 1 + .../tests/package-nix-dir/expected | 1 + .../by-name/fo/foo/package.nix/default.nix | 1 + .../tests/ref-absolute/default.nix | 1 + .../tests/ref-absolute/expected | 1 + .../pkgs/by-name/aa/aa/package.nix | 3 + .../tests/ref-escape/default.nix | 1 + .../tests/ref-escape/expected | 1 + .../ref-escape/pkgs/by-name/aa/aa/package.nix | 3 + .../tests/ref-nix-path/default.nix | 1 + .../tests/ref-nix-path/expected | 1 + .../pkgs/by-name/aa/aa/package.nix | 3 + .../tests/ref-parse-failure/default.nix | 1 + .../tests/ref-parse-failure/expected | 1 + .../pkgs/by-name/aa/aa/invalid.nix | 1 + .../pkgs/by-name/aa/aa/package.nix | 1 + .../tests/ref-path-subexpr/default.nix | 1 + .../tests/ref-path-subexpr/expected | 1 + .../pkgs/by-name/aa/aa/package.nix | 3 + .../tests/ref-success/default.nix | 1 + .../pkgs/by-name/aa/aa/dir/default.nix | 2 + .../tests/ref-success/pkgs/by-name/aa/aa/file | 0 .../ref-success/pkgs/by-name/aa/aa/file.nix | 2 + .../pkgs/by-name/aa/aa/package.nix | 5 + .../tests/shard-file/default.nix | 1 + .../tests/shard-file/expected | 1 + .../tests/shard-file/pkgs/by-name/fo | 0 .../tests/success/default.nix | 1 + .../success/pkgs/by-name/fo/foo/package.nix | 1 + .../tests/symlink-escape/default.nix | 1 + .../tests/symlink-escape/expected | 1 + .../pkgs/by-name/fo/foo/package.nix | 1 + .../tests/symlink-escape/someDrv.nix | 1 + .../tests/symlink-invalid/default.nix | 1 + .../tests/symlink-invalid/expected | 1 + .../nixpkgs/pkgs/test/texlive/default.nix | 217 +- .../nixpkgs/pkgs/test/top-level/default.nix | 47 + third_party/nixpkgs/pkgs/test/vim/default.nix | 2 +- .../nixpkgs/pkgs/tools/X11/go-sct/default.nix | 4 +- .../nixpkgs/pkgs/tools/X11/gobble/default.nix | 37 + .../pkgs/tools/X11/inputplug/default.nix | 4 + .../nixpkgs/pkgs/tools/X11/ncview/default.nix | 25 +- .../tools/X11/opentabletdriver/default.nix | 4 +- .../pkgs/tools/X11/opentabletdriver/deps.nix | 4 +- .../nixpkgs/pkgs/tools/X11/sbs/default.nix | 27 + .../nixpkgs/pkgs/tools/X11/wpgtk/default.nix | 4 +- .../nixpkgs/pkgs/tools/X11/x2x/default.nix | 25 +- .../pkgs/tools/X11/xdg-utils/default.nix | 5 +- .../nixpkgs/pkgs/tools/X11/xpra/default.nix | 2 + .../pkgs/tools/X11/xsecurelock/default.nix | 1 + .../nixpkgs/pkgs/tools/X11/xzoom/default.nix | 1 - .../pkgs/tools/admin/aliyun-cli/default.nix | 6 +- .../tools/admin/amazon-ec2-utils/default.nix | 24 +- .../nixpkgs/pkgs/tools/admin/ansible/lint.nix | 4 +- .../pkgs/tools/admin/auth0-cli/default.nix | 6 +- .../admin/aws-encryption-sdk-cli/default.nix | 53 + .../pkgs/tools/admin/aws-nuke/default.nix | 19 +- .../pkgs/tools/admin/aws-sso-cli/default.nix | 6 +- .../pkgs/tools/admin/awscli2/default.nix | 35 +- .../pkgs/tools/admin/awsls/default.nix | 2 +- .../pkgs/tools/admin/awsrm/default.nix | 2 +- .../pkgs/tools/admin/awsweeper/default.nix | 2 +- .../pkgs/tools/admin/azure-cli/default.nix | 20 +- .../tools/admin/azure-cli/python-packages.nix | 121 +- .../pkgs/tools/admin/balena-cli/default.nix | 112 +- .../nixpkgs/pkgs/tools/admin/bom/default.nix | 2 +- .../pkgs/tools/admin/certigo/default.nix | 2 +- .../pkgs/tools/admin/cf-vault/default.nix | 2 +- .../pkgs/tools/admin/coldsnap/default.nix | 6 +- .../pkgs/tools/admin/copilot-cli/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/cw/default.nix | 2 +- .../pkgs/tools/admin/damon/default.nix | 2 +- .../pkgs/tools/admin/drawterm/default.nix | 7 +- .../pkgs/tools/admin/ejson2env/default.nix | 2 +- .../pkgs/tools/admin/exoscale-cli/default.nix | 4 +- .../pkgs/tools/admin/fastlane/Gemfile.lock | 39 +- .../pkgs/tools/admin/fastlane/default.nix | 2 +- .../pkgs/tools/admin/fastlane/gemset.nix | 70 +- .../pkgs/tools/admin/fioctl/default.nix | 4 +- .../tools/admin/gimme-aws-creds/default.nix | 9 +- .../nixpkgs/pkgs/tools/admin/gixy/default.nix | 3 +- .../admin/google-cloud-sdk/components.json | 1234 +- .../tools/admin/google-cloud-sdk/data.nix | 22 +- .../pkgs/tools/admin/granted/default.nix | 12 +- .../pkgs/tools/admin/hop-cli/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/iamy/default.nix | 2 +- .../pkgs/tools/admin/infra/default.nix | 2 +- .../pkgs/tools/admin/iredis/default.nix | 30 +- .../nixpkgs/pkgs/tools/admin/itamae/Gemfile | 9 + .../pkgs/tools/admin/itamae/Gemfile.lock | 42 + .../pkgs/tools/admin/itamae/default.nix | 17 + .../pkgs/tools/admin/itamae/gemset.nix | 156 + .../nixpkgs/pkgs/tools/admin/kics/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/lego/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/lxd/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/lxd/wrapper.nix | 18 + .../pkgs/tools/admin/manta/default.nix | 28 +- .../pkgs/tools/admin/manta/package-lock.json | 3477 - .../pkgs/tools/admin/manta/source.json | 6 - .../nixpkgs/pkgs/tools/admin/manta/update.sh | 25 - .../pkgs/tools/admin/meshcentral/default.nix | 16 +- .../pkgs/tools/admin/meshcentral/update.sh | 8 +- .../pkgs/tools/admin/meshcentral/yarn.nix | 11381 ---- .../pkgs/tools/admin/mycli/default.nix | 4 +- .../pkgs/tools/admin/okta-aws-cli/default.nix | 4 +- .../pkgs/tools/admin/ossutil/default.nix | 2 +- .../pkgs/tools/admin/pebble/default.nix | 2 +- .../pkgs/tools/admin/pgadmin/default.nix | 4 +- .../pkgs/tools/admin/pulumi-packages/base.nix | 21 +- .../admin/pulumi-packages/pulumi-command.nix | 8 +- .../pkgs/tools/admin/qovery-cli/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/rset/default.nix | 2 +- .../nixpkgs/pkgs/tools/admin/salt/default.nix | 4 +- .../pkgs/tools/admin/scaleway-cli/default.nix | 6 +- .../pkgs/tools/admin/simplotask/default.nix | 4 +- .../pkgs/tools/admin/ssmsh/default.nix | 14 +- .../pkgs/tools/admin/stripe-cli/default.nix | 8 +- .../nixpkgs/pkgs/tools/admin/syft/default.nix | 16 +- .../tools/admin/synapse-admin/default.nix | 7 +- .../pkgs/tools/admin/synapse-admin/yarn.nix | 11597 ---- .../pkgs/tools/admin/tlsclient/default.nix | 4 +- .../pkgs/tools/admin/trivy/default.nix | 23 +- .../nixpkgs/pkgs/tools/admin/try/default.nix | 4 +- .../pkgs/tools/archivers/7zz/default.nix | 30 +- .../archivers/7zz/fix-build-on-darwin.patch | 24 - .../archivers/7zz/fix-cross-mingw-build.patch | 599 +- .../archivers/7zz/fix-empty-expr-stmt.patch | 184 + .../pkgs/tools/archivers/7zz/update.sh | 2 +- .../tools/archivers/rpm2targz/default.nix | 2 +- .../pkgs/tools/archivers/snzip/default.nix | 20 +- .../pkgs/tools/archivers/unar/default.nix | 2 +- .../pkgs/tools/archivers/unrar/default.nix | 60 +- .../pkgs/tools/archivers/unzip/default.nix | 1 + .../pkgs/tools/audio/abcmidi/default.nix | 4 +- .../audio/acoustid-fingerprinter/default.nix | 38 - .../nixpkgs/pkgs/tools/audio/asap/default.nix | 4 +- .../tools/audio/audiowaveform/default.nix | 4 +- .../nixpkgs/pkgs/tools/audio/bark/default.nix | 29 + .../pkgs/tools/audio/bpm-tools/default.nix | 10 +- .../tools/audio/dl-librescore/default.nix | 44 + .../nixpkgs/pkgs/tools/audio/dsp/default.nix | 8 +- .../tools/audio/headsetcontrol/default.nix | 6 +- .../pkgs/tools/audio/liquidsoap/full.nix | 2 +- .../pkgs/tools/audio/mpd-mpris/default.nix | 26 +- .../pkgs/tools/audio/playerctl/default.nix | 31 +- .../pkgs/tools/audio/pulsemixer/default.nix | 1 + .../nixpkgs/pkgs/tools/audio/shaq/default.nix | 64 + .../pkgs/tools/audio/spotdl/default.nix | 29 +- .../nixpkgs/pkgs/tools/audio/stt/default.nix | 3 +- .../nixpkgs/pkgs/tools/audio/tts/default.nix | 13 +- .../pkgs/tools/audio/unflac/default.nix | 2 +- .../pkgs/tools/audio/vgmtools/default.nix | 6 +- .../audio/whisper-ctranslate2/default.nix | 15 +- .../pkgs/tools/audio/wyoming/openwakeword.nix | 63 + .../pkgs/tools/audio/wyoming/piper.nix | 4 +- .../pkgs/tools/backup/awsbck/default.nix | 8 +- .../pkgs/tools/backup/bdsync/default.nix | 6 +- .../pkgs/tools/backup/borgbackup/default.nix | 4 +- .../pkgs/tools/backup/conserve/default.nix | 11 +- .../discordchatexporter-cli/default.nix | 10 +- .../backup/discordchatexporter-cli/deps.nix | 23 +- .../pkgs/tools/backup/diskrsync/default.nix | 2 +- .../pkgs/tools/backup/duplicacy/default.nix | 2 +- .../pkgs/tools/backup/duplicity/default.nix | 20 +- .../pkgs/tools/backup/gamerbackup/default.nix | 2 +- .../tools/backup/gphotos-sync/default.nix | 14 +- .../nixpkgs/pkgs/tools/backup/gyb/default.nix | 4 +- .../pkgs/tools/backup/kopia/default.nix | 6 +- .../nixpkgs/pkgs/tools/backup/mtx/default.nix | 2 +- .../pkgs/tools/backup/partclone/default.nix | 4 +- .../tools/backup/percona-xtrabackup/8_0.nix | 4 +- .../backup/percona-xtrabackup/generic.nix | 10 +- .../pkgs/tools/backup/pgbackrest/default.nix | 4 +- .../tools/backup/rdiff-backup/default.nix | 12 +- .../pkgs/tools/backup/tsm-client/default.nix | 6 +- .../pkgs/tools/backup/wal-g/default.nix | 2 +- .../pkgs/tools/backup/zfsbackup/default.nix | 2 +- .../pkgs/tools/backup/zrepl/default.nix | 6 +- .../tools/bluetooth/bluetuith/default.nix | 7 +- .../tools/bluetooth/bluewalker/default.nix | 4 +- .../tools/bluetooth/nrfconnect/default.nix | 43 - .../pkgs/tools/cd-dvd/cdrtools/default.nix | 2 + .../pkgs/tools/cd-dvd/ecm-tools/default.nix | 29 - .../pkgs/tools/cd-dvd/sacd/default.nix | 9 +- .../pkgs/tools/cd-dvd/ventoy/default.nix | 4 +- .../pkgs/tools/compression/asar/default.nix | 48 + .../pkgs/tools/compression/asar/package.json | 62 + .../pkgs/tools/compression/brotli/default.nix | 35 +- .../pkgs/tools/compression/gzip/default.nix | 4 +- .../tools/compression/mozlz4a/default.nix | 31 +- .../pkgs/tools/compression/pigz/default.nix | 18 +- .../pkgs/tools/filesystems/bindfs/default.nix | 31 +- .../tools/filesystems/btrfs-progs/default.nix | 4 +- .../pkgs/tools/filesystems/catcli/default.nix | 26 +- .../pkgs/tools/filesystems/ceph/default.nix | 44 +- .../tools/filesystems/curlftpfs/default.nix | 2 + .../curlftpfs/suse-bug-580609.patch | 10 + .../curlftpfs/suse-bug-955687.patch | 11 + .../tools/filesystems/dosfstools/default.nix | 7 + .../tools/filesystems/duperemove/default.nix | 4 +- .../tools/filesystems/erofs-utils/default.nix | 8 +- .../filesystems/fuse-overlayfs/default.nix | 4 +- .../tools/filesystems/fwanalyzer/default.nix | 2 +- .../pkgs/tools/filesystems/garage/default.nix | 12 +- .../tools/filesystems/gcsfuse/default.nix | 8 +- .../tools/filesystems/go-mtpfs/default.nix | 2 +- .../pkgs/tools/filesystems/goofys/default.nix | 2 +- .../pkgs/tools/filesystems/irods/common.nix | 16 +- .../pkgs/tools/filesystems/irods/default.nix | 38 +- .../filesystems/irods/irods_root_path.patch | 49 - .../irods/zmqcpp-deprecated-send_recv.patch | 21 - .../tools/filesystems/juicefs/default.nix | 6 +- .../filesystems/littlefs-fuse/default.nix | 4 +- .../tools/filesystems/mergerfs/default.nix | 4 +- .../tools/filesystems/mount-zip/default.nix | 4 +- .../pkgs/tools/filesystems/rar2fs/default.nix | 7 +- .../tools/filesystems/stratisd/Cargo.lock | 26 +- .../tools/filesystems/stratisd/default.nix | 4 +- .../tools/filesystems/stuffbin/default.nix | 2 +- .../tools/filesystems/tar2ext4/default.nix | 4 +- .../pkgs/tools/filesystems/upspin/default.nix | 2 +- .../pkgs/tools/filesystems/zkfuse/default.nix | 2 +- .../games/minecraft/mcaselector/default.nix | 41 + .../minecraft-server-hibernation/default.nix | 19 +- .../tools/games/minecraft/packwiz/default.nix | 10 +- .../add-runtime-identifier.patch | 31 + .../games/pocket-updater-utility/default.nix | 59 + .../games/pocket-updater-utility/deps.nix | 9 + .../pkgs/tools/games/ps3iso-utils/default.nix | 38 + .../pkgs/tools/games/scarab/default.nix | 4 +- .../nixpkgs/pkgs/tools/games/scarab/deps.nix | 75 +- .../pkgs/tools/graphics/agi/default.nix | 8 +- .../tools/graphics/astc-encoder/default.nix | 3 +- .../pkgs/tools/graphics/asymptote/default.nix | 4 +- .../pkgs/tools/graphics/dnglab/default.nix | 6 +- .../pkgs/tools/graphics/epstool/default.nix | 8 +- .../pkgs/tools/graphics/epstool/gcc43.patch | 20 - .../pkgs/tools/graphics/fgallery/default.nix | 9 +- .../pkgs/tools/graphics/gifski/Cargo.lock | 303 +- .../pkgs/tools/graphics/gifski/default.nix | 10 +- .../pkgs/tools/graphics/gmic-qt/default.nix | 13 +- .../pkgs/tools/graphics/gmic/default.nix | 13 +- .../pkgs/tools/graphics/gnuplot/default.nix | 4 +- .../pkgs/tools/graphics/maim/default.nix | 1 + .../pkgs/tools/graphics/mangohud/default.nix | 19 +- .../mangohud/preload-nix-workaround.patch | 16 +- .../tools/graphics/maskromtool/default.nix | 4 +- .../pkgs/tools/graphics/netpbm/default.nix | 6 +- .../pkgs/tools/graphics/pikchr/default.nix | 1 + .../plotutils/c++17-register-usage-fix.patch | 44 + .../pkgs/tools/graphics/plotutils/default.nix | 5 +- .../pkgs/tools/graphics/pngquant/default.nix | 1 + .../tools/graphics/puppeteer-cli/default.nix | 30 +- .../tools/graphics/puppeteer-cli/package.json | 18 - .../tools/graphics/puppeteer-cli/yarn.lock | 490 - .../tools/graphics/puppeteer-cli/yarn.nix | 605 - .../pkgs/tools/graphics/resvg/default.nix | 8 +- .../tools/graphics/sic-image-cli/default.nix | 6 +- .../tools/graphics/spirv-cross/default.nix | 9 +- .../pkgs/tools/graphics/stegsolve/default.nix | 28 +- .../graphics/structure-synth/default.nix | 46 - .../graphics/structure-synth/gcc47.patch | 50 - .../pkgs/tools/graphics/svg2pdf/default.nix | 26 +- .../pkgs/tools/graphics/svgbob/default.nix | 6 +- .../pkgs/tools/graphics/termimage/default.nix | 37 + .../pkgs/tools/graphics/textplots/default.nix | 10 +- .../tools/graphics/ueberzugpp/default.nix | 4 +- .../pkgs/tools/graphics/unpaper/default.nix | 1 + .../pkgs/tools/graphics/vips/default.nix | 4 +- .../graphics/vulkan-caps-viewer/default.nix | 4 +- .../tools/graphics/vulkan-cts/default.nix | 71 +- .../tools/graphics/vulkan-cts/sources.nix | 73 + .../pkgs/tools/graphics/vulkan-cts/update.sh | 21 + .../graphics/vulkan-cts/vk-cts-sources.py | 93 + .../vulkan-extension-layer/default.nix | 10 +- .../tools/graphics/vulkan-helper/default.nix | 37 + .../add-missing-macro-definition.patch | 26 - .../graphics/vulkan-tools-lunarg/default.nix | 16 +- .../skip-qnx-extension.patch | 13 - .../tools/graphics/vulkan-tools/default.nix | 5 +- .../tools/inputmethods/fcitx5/default.nix | 4 +- .../inputmethods/fcitx5/fcitx5-anthy.nix | 4 +- .../fcitx5/fcitx5-chinese-addons.nix | 4 +- .../inputmethods/fcitx5/fcitx5-configtool.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-lua.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-qt.nix | 4 +- .../tools/inputmethods/fcitx5/fcitx5-rime.nix | 4 +- .../inputmethods/fcitx5/fcitx5-unikey.nix | 4 +- .../tools/inputmethods/fcitx5/with-addons.nix | 2 +- .../pkgs/tools/inputmethods/fusuma/Gemfile | 15 + .../tools/inputmethods/fusuma/Gemfile.lock | 26 +- .../tools/inputmethods/fusuma/default.nix | 4 +- .../pkgs/tools/inputmethods/fusuma/gemset.nix | 90 +- .../pkgs/tools/inputmethods/hime/default.nix | 3 +- .../ibus-engines/ibus-m17n/default.nix | 4 +- .../ibus-table-others/default.nix | 4 +- .../ibus-engines/ibus-table/default.nix | 4 +- .../ibus-typing-booster/default.nix | 4 +- .../pkgs/tools/inputmethods/ibus/ibus-qt.nix | 24 - .../tools/inputmethods/keymapper/default.nix | 4 +- .../pkgs/tools/inputmethods/uim/default.nix | 23 +- .../nixpkgs/pkgs/tools/llm/heygpt/default.nix | 34 + .../tools/llm/open-interpreter/default.nix | 58 + .../SP800-90B_EntropyAssessment/default.nix | 50 + .../nixpkgs/pkgs/tools/misc/aptly/default.nix | 2 +- .../pkgs/tools/misc/asciinema-agg/Cargo.lock | 6 +- .../pkgs/tools/misc/asciinema-agg/default.nix | 6 +- .../pkgs/tools/misc/asdf-vm/default.nix | 4 +- .../pkgs/tools/misc/aspcud/default.nix | 1 - .../pkgs/tools/misc/autorandr/default.nix | 1 + .../pkgs/tools/misc/backdown/default.nix | 27 + .../pkgs/tools/misc/bepasty/default.nix | 43 +- .../tools/misc/betterdiscordctl/default.nix | 1 + .../pkgs/tools/misc/birdfont/default.nix | 8 +- .../nixpkgs/pkgs/tools/misc/bkt/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/broot/default.nix | 6 +- .../pkgs/tools/misc/brotab/default.nix | 1 + .../tools/misc/btc-rpc-explorer/default.nix | 47 + .../pkgs/tools/misc/bunnyfetch/default.nix | 2 +- .../calamares-nixos-extensions/default.nix | 4 +- .../pkgs/tools/misc/calamares/default.nix | 1 - .../pkgs/tools/misc/cc2538-bsl/default.nix | 2 +- .../tools/misc/cf-terraforming/default.nix | 6 +- .../pkgs/tools/misc/cfonts/default.nix | 11 +- .../pkgs/tools/misc/charasay/default.nix | 6 +- .../pkgs/tools/misc/chezmoi/default.nix | 6 +- .../pkgs/tools/misc/citron/default.nix | 35 + .../pkgs/tools/misc/ckb-next/default.nix | 1 + .../nixpkgs/pkgs/tools/misc/clac/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/claws/default.nix | 2 +- .../pkgs/tools/misc/clematis/default.nix | 2 +- .../pkgs/tools/misc/clipboard-jh/default.nix | 7 +- .../nixpkgs/pkgs/tools/misc/cloc/default.nix | 29 +- .../tools/misc/cloud-sql-proxy/default.nix | 6 +- .../pkgs/tools/misc/clubhouse-cli/default.nix | 27 + .../nixpkgs/pkgs/tools/misc/cod/default.nix | 4 +- .../pkgs/tools/misc/convimg/default.nix | 4 +- .../tools/misc/coreboot-utils/default.nix | 6 +- .../pkgs/tools/misc/cpulimit/default.nix | 1 + .../pkgs/tools/misc/crudini/default.nix | 39 +- .../nixpkgs/pkgs/tools/misc/dabet/default.nix | 6 +- .../pkgs/tools/misc/dashing/default.nix | 2 +- .../pkgs/tools/misc/dbus-map/default.nix | 2 +- .../pkgs/tools/misc/ddccontrol/default.nix | 8 +- .../tools/misc/debian-devscripts/default.nix | 10 +- .../pkgs/tools/misc/debianutils/default.nix | 33 - .../pkgs/tools/misc/debootstrap/default.nix | 39 +- .../nixpkgs/pkgs/tools/misc/dgoss/default.nix | 13 +- .../pkgs/tools/misc/diffoci/default.nix | 27 + .../pkgs/tools/misc/diffoscope/default.nix | 12 +- .../tools/misc/diffoscope/fix-test_fit.patch | 58 + .../pkgs/tools/misc/digitemp/default.nix | 2 +- .../pkgs/tools/misc/direnv/default.nix | 2 +- .../pkgs/tools/misc/djenrandom/default.nix | 43 + .../pkgs/tools/misc/docker-ls/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/docui/default.nix | 4 +- .../pkgs/tools/misc/domine/default.nix | 17 + .../pkgs/tools/misc/domine/pubspec.lock | 157 + .../nixpkgs/pkgs/tools/misc/dooit/default.nix | 38 +- .../nixpkgs/pkgs/tools/misc/dsq/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/dtool/default.nix | 33 + .../nixpkgs/pkgs/tools/misc/duf/default.nix | 2 +- .../pkgs/tools/misc/dwarf2json/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/edir/default.nix | 13 +- .../nixpkgs/pkgs/tools/misc/eget/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/ent/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/entr/default.nix | 6 +- .../pkgs/tools/misc/esphome/dashboard.nix | 4 +- .../pkgs/tools/misc/esphome/default.nix | 4 +- .../pkgs/tools/misc/esptool/default.nix | 22 +- .../pkgs/tools/misc/etcher/default.nix | 76 +- .../nixpkgs/pkgs/tools/misc/ets/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/exa/default.nix | 63 - .../pkgs/tools/misc/expect/default.nix | 1 + .../pkgs/tools/misc/faketty/default.nix | 7 +- .../pkgs/tools/misc/fastfetch/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/fend/default.nix | 33 +- .../pkgs/tools/misc/file/32-bit-time_t.patch | 38 + .../nixpkgs/pkgs/tools/misc/file/default.nix | 17 +- .../nixpkgs/pkgs/tools/misc/file/pyzip.patch | 36 - .../pkgs/tools/misc/findutils/default.nix | 2 + .../pkgs/tools/misc/flexoptix-app/default.nix | 10 +- .../pkgs/tools/misc/fluent-bit/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/frei/default.nix | 2 +- .../pkgs/tools/misc/fsearch/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/fsql/default.nix | 2 +- .../tools/misc/fuc/add_missing_feature.patch | 11 - .../nixpkgs/pkgs/tools/misc/fuc/default.nix | 8 +- .../nixpkgs/pkgs/tools/misc/fzf/default.nix | 1 + .../nixpkgs/pkgs/tools/misc/geekbench/5.nix | 29 +- .../nixpkgs/pkgs/tools/misc/geekbench/6.nix | 32 +- .../pkgs/tools/misc/getoptions/default.nix | 3 + .../pkgs/tools/misc/gh-dash/default.nix | 6 +- .../pkgs/tools/misc/gh-eco/default.nix | 2 +- .../misc/gh-markdown-preview/default.nix | 4 +- .../pkgs/tools/misc/ghostie/default.nix | 4 +- .../tools/misc/github-copilot-cli/default.nix | 2 +- .../pkgs/tools/misc/glasgow/default.nix | 22 +- .../pkgs/tools/misc/go-ios/default.nix | 6 +- .../pkgs/tools/misc/go.rice/default.nix | 2 +- .../pkgs/tools/misc/goaccess/default.nix | 4 +- .../pkgs/tools/misc/goreleaser/default.nix | 14 +- .../nixpkgs/pkgs/tools/misc/goss/default.nix | 43 +- .../nixpkgs/pkgs/tools/misc/gosu/default.nix | 2 +- .../tools/misc/gradescope-submit/default.nix | 35 + .../nixpkgs/pkgs/tools/misc/grex/default.nix | 12 +- .../nixpkgs/pkgs/tools/misc/grit/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/h/default.nix | 4 +- .../pkgs/tools/misc/hakuneko/default.nix | 18 +- .../nixpkgs/pkgs/tools/misc/hdf5/default.nix | 16 +- .../nixpkgs/pkgs/tools/misc/hoard/default.nix | 28 +- .../nixpkgs/pkgs/tools/misc/hsd/default.nix | 42 + .../pkgs/tools/misc/hyfetch/default.nix | 4 +- .../pkgs/tools/misc/hyperfine/default.nix | 6 +- .../pkgs/tools/misc/hyperpotamus/default.nix | 28 + .../pkgs/tools/misc/ical2orgpy/default.nix | 36 +- .../pkgs/tools/misc/infracost/default.nix | 8 +- .../pkgs/tools/misc/interactsh/default.nix | 6 +- .../pkgs/tools/misc/jfrog-cli/default.nix | 6 +- .../pkgs/tools/misc/kepubify/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/ksnip/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/kt/default.nix | 2 +- .../pkgs/tools/misc/lazydocker/default.nix | 6 +- .../pkgs/tools/misc/lektor/default.nix | 14 +- .../nixpkgs/pkgs/tools/misc/less/default.nix | 37 - .../tools/misc/librespeed-cli/default.nix | 2 +- .../pkgs/tools/misc/lifecycled/default.nix | 2 +- .../tools/misc/lighthouse-steamvr/Cargo.lock | 792 +- .../tools/misc/lighthouse-steamvr/default.nix | 6 +- .../pkgs/tools/misc/livedl/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/lnch/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/logstash/7.x.nix | 18 +- .../pkgs/tools/misc/logstash/contrib.nix | 2 +- .../pkgs/tools/misc/lokalise2-cli/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/lsd/default.nix | 26 +- .../pkgs/tools/misc/mapcidr/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/mdr/default.nix | 2 +- .../pkgs/tools/misc/microplane/default.nix | 2 +- .../pkgs/tools/misc/mloader/default.nix | 4 +- .../pkgs/tools/misc/mlocate/default.nix | 13 +- .../nixpkgs/pkgs/tools/misc/mmake/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/mnc/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/moar/default.nix | 5 +- .../tools/misc/mongodb-compass/default.nix | 4 +- .../pkgs/tools/misc/mongodb-tools/default.nix | 4 +- .../pkgs/tools/misc/moon-phases/default.nix | 20 + .../tools/misc/mynewt-newtmgr/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/ncdu/1.nix | 5 +- .../nixpkgs/pkgs/tools/misc/ncdu/default.nix | 5 + .../pkgs/tools/misc/near-cli/default.nix | 49 + .../pkgs/tools/misc/near-cli/package.json | 83 + .../pkgs/tools/misc/node-glob/default.nix | 29 + .../pkgs/tools/misc/nomino/default.nix | 9 +- .../pkgs/tools/misc/notify/default.nix | 2 +- .../pkgs/tools/misc/ollama/default.nix | 6 +- .../misc/opentelemetry-collector/default.nix | 6 +- .../pkgs/tools/misc/osm2pgsql/default.nix | 8 +- .../pkgs/tools/misc/ovh-ttyrec/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/page/default.nix | 21 +- .../pkgs/tools/misc/panicparse/default.nix | 2 +- .../pkgs/tools/misc/paperlike-go/default.nix | 6 +- .../pkgs/tools/misc/parallel/default.nix | 12 +- .../nixpkgs/pkgs/tools/misc/pb/default.nix | 37 + .../nixpkgs/pkgs/tools/misc/pc/default.nix | 1 + .../nixpkgs/pkgs/tools/misc/pcp/default.nix | 2 +- .../pkgs/tools/misc/perccli/default.nix | 16 +- .../nixpkgs/pkgs/tools/misc/pferd/default.nix | 4 +- .../pkgs/tools/misc/pg_flame/default.nix | 4 +- .../pkgs/tools/misc/pgbadger/default.nix | 11 +- .../pkgs/tools/misc/pgcenter/default.nix | 2 +- .../pkgs/tools/misc/pgmetrics/default.nix | 4 +- .../pkgs/tools/misc/phrase-cli/default.nix | 7 +- .../pkgs/tools/misc/plocate/default.nix | 10 +- .../pkgs/tools/misc/pokeget-rs/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/pouf/default.nix | 11 +- .../pkgs/tools/misc/pricehist/default.nix | 46 + .../nixpkgs/pkgs/tools/misc/pv/default.nix | 21 +- .../pkgs/tools/misc/qjoypad/default.nix | 4 +- .../tools/misc/riemann-c-client/default.nix | 4 +- .../pkgs/tools/misc/ripdrag/default.nix | 6 +- .../pkgs/tools/misc/rmtrash/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/rot8/default.nix | 24 + .../pkgs/tools/misc/routino/default.nix | 5 +- .../pkgs/tools/misc/rpi-imager/default.nix | 69 +- .../tools/misc/rpi-imager/lsblkCheckFix.patch | 8 +- .../pkgs/tools/misc/rpm-ostree/default.nix | 4 +- .../tools/misc/rshim-user-space/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/rtx/default.nix | 9 +- .../tools/misc/rustypaste-cli/default.nix | 6 +- .../pkgs/tools/misc/seaborn-data/default.nix | 41 + .../nixpkgs/pkgs/tools/misc/sfeed/default.nix | 4 +- .../pkgs/tools/misc/sharedown/default.nix | 9 +- .../pkgs/tools/misc/sharedown/yarndeps.nix | 3317 - .../pkgs/tools/misc/shelldap/default.nix | 44 +- .../nixpkgs/pkgs/tools/misc/shim/default.nix | 7 + .../pkgs/tools/misc/slingshot/default.nix | 27 + .../nixpkgs/pkgs/tools/misc/sloth/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/smenu/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/smug/default.nix | 2 +- .../pkgs/tools/misc/snapper/default.nix | 4 +- .../pkgs/tools/misc/spacer/default.nix | 6 +- .../tools/misc/sqlite3-to-mysql/default.nix | 43 +- .../pkgs/tools/misc/srisum/default.nix | 29 + .../pkgs/tools/misc/star-history/default.nix | 6 +- .../pkgs/tools/misc/starry/default.nix | 6 +- .../pkgs/tools/misc/starship/default.nix | 4 + .../pkgs/tools/misc/staruml/default.nix | 15 +- .../pkgs/tools/misc/steampipe/default.nix | 4 +- .../misc/system-config-printer/default.nix | 24 +- .../pkgs/tools/misc/szyszka/default.nix | 16 +- .../pkgs/tools/misc/tailspin/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/tcat/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/tdfgo/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/tea/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/tfk8s/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/tgpt/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/time/default.nix | 13 +- .../tools/misc/timetagger_cli/default.nix | 33 + .../misc/timidity/configure-compat.patch | 33 + .../pkgs/tools/misc/timidity/default.nix | 32 +- .../nixpkgs/pkgs/tools/misc/tio/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/tldr/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/tlp/default.nix | 5 +- .../0001-makefile-correctly-sed-paths.patch | 12 +- .../0002-reintroduce-tlp-sleep-service.patch | 18 +- .../nixpkgs/pkgs/tools/misc/tmuxp/default.nix | 13 +- .../pkgs/tools/misc/toilet/default.nix | 6 +- .../pkgs/tools/misc/topicctl/default.nix | 4 +- .../pkgs/tools/misc/toybox/default.nix | 4 +- .../pkgs/tools/misc/trackma/default.nix | 13 +- .../misc/traefik-certs-dumper/default.nix | 2 +- .../pkgs/tools/misc/trdl-client/default.nix | 4 +- .../pkgs/tools/misc/ttchat/default.nix | 7 +- .../nixpkgs/pkgs/tools/misc/turbo/default.nix | 10 +- .../nixpkgs/pkgs/tools/misc/twm/default.nix | 6 +- .../tools/misc/twspace-crawler/default.nix | 8 +- .../nixpkgs/pkgs/tools/misc/ugs/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/umlet/default.nix | 16 +- .../pkgs/tools/misc/unparam/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/up/default.nix | 4 +- .../pkgs/tools/misc/upterm/default.nix | 6 +- .../pkgs/tools/misc/url-parser/default.nix | 9 +- .../pkgs/tools/misc/urlencode/default.nix | 24 + .../pkgs/tools/misc/usbimager/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/vector/Cargo.lock | 2707 +- .../pkgs/tools/misc/vector/default.nix | 14 +- .../vector/rust-1.71-unnecessary-mut.diff | 22 - .../nixpkgs/pkgs/tools/misc/vial/default.nix | 14 +- .../nixpkgs/pkgs/tools/misc/viddy/default.nix | 6 +- .../pkgs/tools/misc/vrc-get/default.nix | 7 +- .../tools/misc/vsc-leetcode-cli/default.nix | 28 + .../nixpkgs/pkgs/tools/misc/vsh/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/vtm/default.nix | 4 +- .../pkgs/tools/misc/wakapi/default.nix | 6 +- .../pkgs/tools/misc/wakatime/default.nix | 2 +- .../pkgs/tools/misc/wasm-tools/default.nix | 11 +- .../pkgs/tools/misc/websocat/default.nix | 6 +- .../pkgs/tools/misc/wimboot/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/xcp/default.nix | 6 +- .../pkgs/tools/misc/xdaliclock/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/xsel/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/yai/default.nix | 2 +- .../pkgs/tools/misc/yt-dlp/default.nix | 4 +- .../pkgs/tools/misc/ytcast/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/ytfzf/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/ytmdl/default.nix | 4 +- .../pkgs/tools/misc/zabbixctl/default.nix | 2 +- .../pkgs/tools/misc/zellij/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/zf/default.nix | 19 +- .../nixpkgs/pkgs/tools/misc/zf/deps.nix | 13 + .../tools/networking/aardvark-dns/default.nix | 8 + .../pkgs/tools/networking/amass/default.nix | 6 +- .../networking/apc-temp-fetch/default.nix | 2 +- .../pkgs/tools/networking/assh/default.nix | 6 +- .../bandwhich}/Cargo.lock | 2517 +- .../tools/networking/bandwhich/default.nix | 34 +- .../update-socket2-for-rust-1.64.diff | 160 - .../tools/networking/biosdevname/default.nix | 2 +- .../tools/networking/bitmask-vpn/default.nix | 11 +- .../pkgs/tools/networking/bully/default.nix | 2 +- .../tools/networking/burpsuite/default.nix | 2 +- .../tools/networking/calendar-cli/default.nix | 10 +- .../tools/networking/cassowary/default.nix | 2 +- .../tools/networking/cfspeedtest/default.nix | 27 + .../tools/networking/changetower/default.nix | 4 +- .../pkgs/tools/networking/chisel/default.nix | 4 +- .../tools/networking/clash-meta/default.nix | 6 +- .../connman/create-libppp-compat.h.patch | 132 + .../networking/connman/connman/default.nix | 25 +- .../tools/networking/containerlab/default.nix | 6 +- .../pkgs/tools/networking/corerad/default.nix | 2 +- ...7.79.1-darwin-no-systemconfiguration.patch | 13 +- .../pkgs/tools/networking/curl/default.nix | 6 +- .../pkgs/tools/networking/curlie/default.nix | 2 +- .../pkgs/tools/networking/dae/default.nix | 21 +- .../networking/dd-agent/datadog-agent.nix | 6 +- .../pkgs/tools/networking/ddns-go/default.nix | 4 +- .../default.nix | 4 +- .../pkgs/tools/networking/dnsmasq/default.nix | 1 + .../tools/networking/dnsmon-go/default.nix | 2 +- .../pkgs/tools/networking/dnsperf/default.nix | 8 +- .../tools/networking/dnsproxy/default.nix | 4 +- .../pkgs/tools/networking/dnstake/default.nix | 2 +- .../tools/networking/dnstwist/default.nix | 4 +- .../pkgs/tools/networking/easyrsa/default.nix | 4 +- .../networking/ebpf-verifier/default.nix | 2 - .../tools/networking/findomain/Cargo.lock | 850 +- .../tools/networking/findomain/default.nix | 8 +- .../pkgs/tools/networking/flannel/default.nix | 6 +- .../pkgs/tools/networking/flannel/plugin.nix | 2 +- .../pkgs/tools/networking/frp/default.nix | 12 +- .../tools/networking/getmail6/default.nix | 6 +- .../tools/networking/ghostunnel/default.nix | 2 +- .../networking/go-shadowsocks2/default.nix | 2 +- .../pkgs/tools/networking/gobgp/default.nix | 6 +- .../pkgs/tools/networking/godns/default.nix | 4 +- .../tools/networking/godspeed/default.nix | 2 +- .../pkgs/tools/networking/gof5/default.nix | 2 +- .../pkgs/tools/networking/goflow/default.nix | 2 +- .../tools/networking/goimapnotify/default.nix | 2 +- .../tools/networking/goreplay/default.nix | 2 +- .../tools/networking/gp-saml-gui/default.nix | 6 +- .../tools/networking/graphqurl/default.nix | 28 + .../tools/networking/grpc_cli/default.nix | 4 +- .../pkgs/tools/networking/grpcui/default.nix | 6 +- .../pkgs/tools/networking/grpcurl/default.nix | 6 +- .../pkgs/tools/networking/gvproxy/default.nix | 4 +- .../pkgs/tools/networking/haproxy/default.nix | 5 +- .../pkgs/tools/networking/hey/default.nix | 2 +- .../pkgs/tools/networking/httplz/default.nix | 6 +- .../tools/networking/hysteria/default.nix | 14 +- .../tools/networking/inetutils/default.nix | 17 +- .../pkgs/tools/networking/iouyap/default.nix | 32 - .../pkgs/tools/networking/ipinfo/default.nix | 6 +- .../pkgs/tools/networking/ivpn/default.nix | 4 +- .../pkgs/tools/networking/juicity/default.nix | 10 +- .../pkgs/tools/networking/kapp/default.nix | 12 +- .../pkgs/tools/networking/kea/default.nix | 4 + .../tools/networking/lxi-tools/default.nix | 4 +- .../pkgs/tools/networking/mailctl/default.nix | 26 +- ...llow-building-plugins-from-nix-store.patch | 13 + .../pkgs/tools/networking/maubot/default.nix | 137 + .../tools/networking/minio-client/default.nix | 6 +- .../pkgs/tools/networking/mockoon/default.nix | 4 +- .../pkgs/tools/networking/mole/default.nix | 4 +- .../pkgs/tools/networking/mosh/default.nix | 10 +- .../tools/networking/mtr-exporter/default.nix | 10 +- .../pkgs/tools/networking/mtr/default.nix | 6 + .../pkgs/tools/networking/mu/default.nix | 42 +- .../pkgs/tools/networking/mubeng/default.nix | 6 +- .../networking/narrowlink/Cargo.lock.patch | 170 + .../tools/networking/narrowlink/default.nix | 43 + .../pkgs/tools/networking/netbird/default.nix | 4 +- .../networking/networkmanager/default.nix | 2 +- .../networkmanager/dmenu/default.nix | 8 +- .../networkmanager/openvpn/default.nix | 4 +- .../tools/networking/nexttrace/default.nix | 6 +- .../pkgs/tools/networking/nfdump/default.nix | 4 +- .../pkgs/tools/networking/ngrok/versions.json | 36 +- .../tools/networking/norouter/default.nix | 2 +- .../pkgs/tools/networking/nqptp/default.nix | 4 +- .../tools/networking/nss-mdns/default.nix | 23 +- .../pkgs/tools/networking/ntpd-rs/default.nix | 45 + .../pkgs/tools/networking/ocserv/default.nix | 4 +- .../pkgs/tools/networking/oha/default.nix | 6 +- .../pkgs/tools/networking/oneshot/default.nix | 42 +- .../networking/ookla-speedtest/default.nix | 4 +- .../openapi-generator-cli/default.nix | 4 +- .../tools/networking/opensnitch/daemon.nix | 4 +- .../pkgs/tools/networking/openssh/common.nix | 13 +- .../pkgs/tools/networking/openssh/default.nix | 12 +- .../networking/p2p/gtk-gnutella/default.nix | 28 +- .../pkgs/tools/networking/passh/default.nix | 10 +- .../networking/pgrok/build-deps/package.json | 38 + .../pkgs/tools/networking/pgrok/default.nix | 26 +- .../pkgs/tools/networking/pgrok/update.sh | 40 + .../pkgs/tools/networking/pgrok/web.nix | 30 + .../tools/networking/pixiecore/default.nix | 4 +- .../pkgs/tools/networking/q/default.nix | 6 +- .../pkgs/tools/networking/qcal/default.nix | 6 +- .../pkgs/tools/networking/qcard/default.nix | 38 + .../pkgs/tools/networking/qrcp/default.nix | 2 +- .../pkgs/tools/networking/rabtap/default.nix | 2 +- .../pkgs/tools/networking/rdap/default.nix | 2 +- .../pkgs/tools/networking/restish/default.nix | 4 +- .../tools/networking/rosenpass/default.nix | 85 + .../pkgs/tools/networking/s5cmd/default.nix | 6 +- .../networking/shadowsocks-rust/default.nix | 11 +- .../shadowsocks-v2ray-plugin/default.nix | 4 +- .../tools/networking/sing-box/default.nix | 6 +- .../pkgs/tools/networking/sipexer/default.nix | 2 +- .../tools/networking/sleep-on-lan/default.nix | 2 +- .../tools/networking/slirp4netns/default.nix | 4 +- .../tools/networking/smartdns/default.nix | 4 +- .../pkgs/tools/networking/snet/default.nix | 2 +- .../tools/networking/snowflake/default.nix | 8 +- .../tools/networking/speedtest-go/default.nix | 4 +- .../networking/ssh-key-confirmer/default.nix | 4 +- .../tools/networking/ssl-proxy/default.nix | 31 + .../tools/networking/subfinder/default.nix | 6 +- .../tools/networking/subnetcalc/default.nix | 4 +- .../networking/telepresence2/default.nix | 50 +- .../tools/networking/tendermint/default.nix | 2 +- .../pkgs/tools/networking/termscp/default.nix | 10 +- .../tools/networking/termshark/default.nix | 2 +- .../tools/networking/traceroute/default.nix | 4 +- .../pkgs/tools/networking/tran/default.nix | 2 +- .../pkgs/tools/networking/ubridge/default.nix | 23 +- .../pkgs/tools/networking/unbound/default.nix | 5 +- .../pkgs/tools/networking/v2ray/default.nix | 2 +- .../pkgs/tools/networking/v2raya/default.nix | 2 +- .../pkgs/tools/networking/vegeta/default.nix | 8 +- .../pkgs/tools/networking/veilid/Cargo.lock | 1527 +- .../pkgs/tools/networking/veilid/default.nix | 19 +- .../pkgs/tools/networking/vlan/default.nix | 2 +- .../pkgs/tools/networking/waitron/default.nix | 2 +- .../pkgs/tools/networking/whois/default.nix | 4 +- .../networking/wireguard-tools/default.nix | 1 + .../networking/wormhole-william/default.nix | 6 +- .../tools/networking/xdp-tools/default.nix | 13 +- .../pkgs/tools/networking/xray/default.nix | 6 +- .../tools/networking/yggdrasil/default.nix | 2 +- .../tools/networking/zerotierone/Cargo.lock | 677 +- .../tools/networking/zerotierone/default.nix | 8 +- .../pkgs/tools/networking/zrok/default.nix | 8 +- .../networking/zs-apc-spdu-ctl/default.nix | 4 +- .../tools/networking/zs-wait4host/default.nix | 2 +- .../nixpkgs/pkgs/tools/nix/fh/default.nix | 53 + .../pkgs/tools/nix/gridlock/default.nix | 8 +- .../pkgs/tools/nix/nar-serve/default.nix | 2 +- .../pkgs/tools/nix/nix-init/default.nix | 10 +- ...et-nix-license.nix => get_nix_license.nix} | 2 +- .../nix-output-monitor/generated-package.nix | 6 +- .../tools/nix/nix-store-gcs-proxy/default.nix | 2 +- .../tools/nix/nixos-generators/default.nix | 4 +- .../nixpkgs/pkgs/tools/nix/npins/default.nix | 2 +- .../nixpkgs/pkgs/tools/nix/npins/sources.json | 8 +- .../nixpkgs/pkgs/tools/nix/statix/default.nix | 6 +- .../pkgs/tools/nix/zon2nix/default.nix | 23 +- .../tools/package-management/apt/default.nix | 6 +- .../tools/package-management/apx/default.nix | 2 +- .../package-management/deploy-rs/default.nix | 9 +- .../disnix/disnixos/default.nix | 4 +- .../disnix/dysnomia/default.nix | 4 +- .../tools/package-management/dnf5/default.nix | 8 +- .../tools/package-management/dpkg/default.nix | 7 +- .../tools/package-management/gx/default.nix | 2 +- .../package-management/harmonia/default.nix | 6 +- .../package-management/holo-build/default.nix | 2 +- .../home-manager/default.nix | 6 +- .../package-management/libdnf/default.nix | 6 +- .../package-management/morph/default.nix | 4 +- .../mynewt-newt/default.nix | 2 +- .../tools/package-management/nfpm/default.nix | 6 +- .../package-management/nix-doc/default.nix | 6 +- .../nix-eval-jobs/default.nix | 5 + .../package-management/nix-index/default.nix | 20 +- .../package-management/nix-update/default.nix | 10 +- .../tools/package-management/nix/common.nix | 2 + .../tools/package-management/nix/default.nix | 5 + .../nixpkgs-review/default.nix | 4 +- .../npm-check-updates/default.nix | 27 + .../tools/package-management/pdm/default.nix | 7 +- .../tools/package-management/pkg/default.nix | 4 +- .../package-management/poetry/default.nix | 29 +- .../poetry/plugins/poetry-plugin-export.nix | 4 +- .../poetry/plugins/poetry-plugin-up.nix | 13 +- .../package-management/poetry/unwrapped.nix | 22 +- .../package-management/repro-get/default.nix | 6 +- .../tools/package-management/zkg/default.nix | 4 +- .../pkgs/tools/security/2fa/default.nix | 2 +- .../pkgs/tools/security/adreaper/default.nix | 2 +- .../tools/security/aflplusplus/default.nix | 6 +- .../pkgs/tools/security/aflplusplus/qemu.nix | 4 +- .../pkgs/tools/security/age/default.nix | 2 +- .../pkgs/tools/security/agebox/default.nix | 8 +- .../security/apachetomcatscanner/default.nix | 6 + .../pkgs/tools/security/arti/default.nix | 6 +- .../pkgs/tools/security/asnmap/default.nix | 6 +- .../pkgs/tools/security/b3sum/default.nix | 6 +- .../pkgs/tools/security/bettercap/default.nix | 2 +- .../security/beyond-identity/default.nix | 2 +- .../tools/security/biscuit-cli/default.nix | 10 +- .../security/biscuit-cli/version-0.4.0.patch | 13 - .../pkgs/tools/security/bitwarden/cli.nix | 6 +- .../pkgs/tools/security/bitwarden/default.nix | 136 +- .../pkgs/tools/security/cameradar/default.nix | 2 +- .../pkgs/tools/security/certgraph/default.nix | 2 +- .../pkgs/tools/security/certstrap/default.nix | 2 +- .../tools/security/chain-bench/default.nix | 2 +- .../pkgs/tools/security/chainsaw/Cargo.lock | 843 +- .../pkgs/tools/security/chainsaw/default.nix | 6 +- .../pkgs/tools/security/chopchop/default.nix | 4 +- .../pkgs/tools/security/cirrusgo/default.nix | 2 +- .../tools/security/clairvoyance/default.nix | 6 +- .../pkgs/tools/security/clamav/default.nix | 4 +- .../tools/security/cloudbrute/default.nix | 4 +- .../pkgs/tools/security/cloudfox/default.nix | 4 +- .../pkgs/tools/security/cloudlist/default.nix | 9 +- .../pkgs/tools/security/cnspec/default.nix | 6 +- .../pkgs/tools/security/cosign/default.nix | 6 +- .../pkgs/tools/security/crlfuzz/default.nix | 2 +- .../pkgs/tools/security/crowdsec/default.nix | 14 +- .../pkgs/tools/security/dalfox/default.nix | 2 +- .../pkgs/tools/security/deepsea/default.nix | 2 +- .../pkgs/tools/security/der-ascii/default.nix | 27 + .../pkgs/tools/security/dismap/default.nix | 2 +- .../pkgs/tools/security/dismember/default.nix | 2 +- .../pkgs/tools/security/dnsx/default.nix | 6 +- .../pkgs/tools/security/doas/default.nix | 2 +- .../pkgs/tools/security/dontgo403/default.nix | 4 +- .../pkgs/tools/security/doppler/default.nix | 4 +- .../pkgs/tools/security/dorkscout/default.nix | 4 +- .../pkgs/tools/security/dumpasn1/default.nix | 1 + .../pkgs/tools/security/duo-unix/default.nix | 4 +- .../pkgs/tools/security/earlybird/default.nix | 20 +- .../earlybird/fix-go.mod-dependency.patch | 13 + .../pkgs/tools/security/echidna/default.nix | 10 + .../pkgs/tools/security/exploitdb/default.nix | 4 +- .../pkgs/tools/security/extrude/default.nix | 2 +- .../tools/security/flare-floss/default.nix | 34 +- .../pkgs/tools/security/galer/default.nix | 4 +- .../pkgs/tools/security/gau/default.nix | 2 +- .../pkgs/tools/security/ggshield/default.nix | 4 +- .../pkgs/tools/security/ghidra/build.nix | 4 +- .../pkgs/tools/security/gitjacker/default.nix | 2 +- .../pkgs/tools/security/gitleaks/default.nix | 6 +- .../pkgs/tools/security/gomapenum/default.nix | 2 +- .../pkgs/tools/security/gopass/default.nix | 9 +- .../tools/security/gopass/git-credential.nix | 7 +- .../pkgs/tools/security/gopass/hibp.nix | 7 +- .../pkgs/tools/security/gopass/jsonapi.nix | 7 +- .../pkgs/tools/security/gopass/summon.nix | 7 +- .../pkgs/tools/security/gospider/default.nix | 2 +- .../pkgs/tools/security/gotestwaf/default.nix | 4 +- .../pkgs/tools/security/gotrue/supabase.nix | 4 +- .../pkgs/tools/security/gpg-tui/default.nix | 6 +- .../pkgs/tools/security/grype/default.nix | 18 +- .../pkgs/tools/security/hakrawler/default.nix | 2 +- .../pkgs/tools/security/hashcat/default.nix | 4 +- .../pkgs/tools/security/holehe/default.nix | 46 + .../pkgs/tools/security/hologram/default.nix | 2 +- .../tools/security/hstsparser/default.nix | 37 + .../pkgs/tools/security/httpx/default.nix | 6 +- .../tools/security/ic-keysmith/default.nix | 2 +- .../pkgs/tools/security/imdshift/default.nix | 39 + .../pkgs/tools/security/ipscan/default.nix | 13 +- .../tools/security/jsubfinder/default.nix | 2 +- .../pkgs/tools/security/jwt-hack/default.nix | 2 +- .../pkgs/tools/security/jwx/default.nix | 6 +- .../pkgs/tools/security/katana/default.nix | 8 +- .../pkgs/tools/security/kdigger/default.nix | 2 +- .../pkgs/tools/security/kepler/default.nix | 47 + .../pkgs/tools/security/keybase/default.nix | 6 +- .../pkgs/tools/security/keybase/gui.nix | 6 +- .../pkgs/tools/security/keybase/kbfs.nix | 2 +- .../tools/security/kiterunner/default.nix | 4 +- .../pkgs/tools/security/knowsmore/default.nix | 55 + .../pkgs/tools/security/kpcli/default.nix | 4 +- .../pkgs/tools/security/kubeaudit/default.nix | 2 +- .../tools/security/kubeclarity/default.nix | 6 +- .../security/kubernetes-polaris/default.nix | 6 +- .../pkgs/tools/security/kubescape/default.nix | 21 +- .../tools/security/lastpass-cli/default.nix | 6 +- .../pkgs/tools/security/ldeep/default.nix | 37 +- .../pkgs/tools/security/lmp/default.nix | 2 +- .../tools/security/log4j-sniffer/default.nix | 2 +- .../security/log4j-vuln-scanner/default.nix | 2 +- .../pkgs/tools/security/melt/default.nix | 2 +- .../pkgs/tools/security/metabigor/default.nix | 2 +- .../pkgs/tools/security/metasploit/Gemfile | 2 +- .../tools/security/metasploit/Gemfile.lock | 55 +- .../tools/security/metasploit/default.nix | 4 +- .../pkgs/tools/security/metasploit/gemset.nix | 74 +- .../security/mfoc-hardnested/default.nix | 25 - .../pkgs/tools/security/minica/default.nix | 2 +- .../tools/security/minio-certgen/default.nix | 2 +- .../pkgs/tools/security/mkpasswd/default.nix | 2 +- .../pkgs/tools/security/mpw/default.nix | 2 +- .../pkgs/tools/security/naabu/default.nix | 6 +- .../security/nbtscanner/Cargo.lock.patch | 176 + .../tools/security/nbtscanner/default.nix | 10 +- .../pkgs/tools/security/ncrack/default.nix | 3 + .../tools/security/nitrokey-app/default.nix | 4 +- .../tools/security/nitrokey-app2/default.nix | 51 + .../tools/security/nmap-formatter/default.nix | 6 +- .../pkgs/tools/security/nosqli/default.nix | 2 +- .../pkgs/tools/security/notation/default.nix | 20 +- .../pkgs/tools/security/nuclei/default.nix | 6 +- .../pkgs/tools/security/oauth2c/default.nix | 4 +- .../pkgs/tools/security/omapd/default.nix | 36 - .../pkgs/tools/security/omapd/zlib.patch | 9 - .../security/openpgp-card-tools/default.nix | 15 +- .../tools/security/ospd-openvas/default.nix | 4 +- .../tools/security/osv-scanner/default.nix | 6 +- .../pkgs/tools/security/ots/default.nix | 4 +- .../pkgs/tools/security/pass/default.nix | 7 +- .../tools/security/passphrase2pgp/default.nix | 2 +- .../tools/security/plasma-pass/default.nix | 7 +- .../pkgs/tools/security/proxmark3/default.nix | 6 +- .../pkgs/tools/security/pwdsafety/default.nix | 2 +- .../pkgs/tools/security/pwgen/default.nix | 1 + .../tools/security/pynitrokey/default.nix | 7 +- .../pkgs/tools/security/qdigidoc/default.nix | 5 +- .../tools/security/quark-engine/default.nix | 4 +- .../tools/security/rblake2sum/default.nix | 28 + .../tools/security/rucredstash/default.nix | 21 +- .../pkgs/tools/security/s5/default.nix | 5 +- .../pkgs/tools/security/saml2aws/default.nix | 6 +- .../pkgs/tools/security/sammler/default.nix | 2 +- .../pkgs/tools/security/sdlookup/default.nix | 2 +- .../security/secrets-extractor/default.nix | 2 +- .../tools/security/secretscanner/default.nix | 1 + .../pkgs/tools/security/semgrep/common.nix | 14 +- .../pkgs/tools/security/shellz/default.nix | 4 +- .../pkgs/tools/security/sigma-cli/default.nix | 4 +- .../pkgs/tools/security/sirikali/default.nix | 87 + .../tools/security/slsa-verifier/default.nix | 6 +- .../pkgs/tools/security/sn0int/default.nix | 6 +- .../pkgs/tools/security/snowcat/default.nix | 2 +- .../pkgs/tools/security/sops/default.nix | 20 +- .../pkgs/tools/security/spire/default.nix | 6 +- .../pkgs/tools/security/ssb/default.nix | 2 +- .../pkgs/tools/security/ssh-audit/default.nix | 13 +- .../tools/security/ssh-to-age/default.nix | 6 +- .../tools/security/sshchecker/default.nix | 4 +- .../pkgs/tools/security/sshocker/default.nix | 6 +- .../pkgs/tools/security/sslscan/default.nix | 7 +- .../tools/security/steamguard-cli/default.nix | 28 + .../pkgs/tools/security/step-ca/default.nix | 6 +- .../pkgs/tools/security/step-cli/default.nix | 6 +- .../pkgs/tools/security/subjs/default.nix | 4 +- .../pkgs/tools/security/sudo-rs/default.nix | 80 + .../pkgs/tools/security/sudo/default.nix | 2 +- ...s-to-dropped-sys_nerr-sys_errlist-fo.patch | 51 - .../pkgs/tools/security/super/default.nix | 56 - .../pkgs/tools/security/swtpm/default.nix | 4 +- .../pkgs/tools/security/sx-go/default.nix | 2 +- .../pkgs/tools/security/thc-hydra/default.nix | 3 +- .../tools/security/theharvester/default.nix | 4 +- .../pkgs/tools/security/tlsx/default.nix | 6 +- .../pkgs/tools/security/tor/default.nix | 4 +- .../pkgs/tools/security/traitor/default.nix | 2 +- .../tools/security/trueseeing/default.nix | 9 +- .../tools/security/trufflehog/default.nix | 6 +- .../pkgs/tools/security/uncover/default.nix | 8 +- .../pkgs/tools/security/urlhunter/default.nix | 2 +- .../pkgs/tools/security/vals/default.nix | 6 +- .../tools/security/vault-ssh-plus/default.nix | 6 +- .../pkgs/tools/security/vault/default.nix | 9 +- .../pkgs/tools/security/vault/vault-bin.nix | 12 +- .../tools/security/vaultwarden/Cargo.lock | 415 +- .../tools/security/vaultwarden/default.nix | 4 +- .../tools/security/vaultwarden/webvault.nix | 8 +- .../tools/security/volatility3/default.nix | 4 +- .../pkgs/tools/security/wapiti/default.nix | 42 +- .../tools/security/web-eid-app/default.nix | 8 +- .../pkgs/tools/security/weggli/default.nix | 35 + .../pkgs/tools/security/wprecon/default.nix | 2 +- .../tools/security/yubikey-agent/default.nix | 2 +- .../pkgs/tools/security/zkar/default.nix | 2 +- .../tools/system/acpica-tools/default.nix | 8 +- .../pkgs/tools/system/amtterm/default.nix | 10 +- .../tools/system/auto-cpufreq/default.nix | 11 +- .../auto-cpufreq/fix-version-output.patch | 32 +- .../prevent-install-and-copy.patch | 183 +- .../system/auto-cpufreq/prevent-update.patch | 60 + .../system/automatic-timezoned/default.nix | 6 +- .../nixpkgs/pkgs/tools/system/bfs/default.nix | 6 +- .../pkgs/tools/system/bottom/default.nix | 12 +- .../pkgs/tools/system/btop/default.nix | 6 + .../pkgs/tools/system/ctop/default.nix | 2 +- .../pkgs/tools/system/daemon/default.nix | 4 +- .../pkgs/tools/system/dool/default.nix | 4 +- .../pkgs/tools/system/fakeroot/default.nix | 23 +- .../pkgs/tools/system/gohai/default.nix | 2 +- .../pkgs/tools/system/gotop/default.nix | 2 +- .../pkgs/tools/system/gptman/default.nix | 6 +- .../tools/system/hddfancontrol/default.nix | 34 + .../pkgs/tools/system/htop/default.nix | 2 +- .../tools/system/journalwatch/default.nix | 2 +- .../pkgs/tools/system/jump/default.nix | 2 +- .../pkgs/tools/system/lact/default.nix | 6 +- .../pkgs/tools/system/localtime/default.nix | 2 +- .../nixpkgs/pkgs/tools/system/lr/default.nix | 4 +- .../pkgs/tools/system/mediawriter/default.nix | 4 +- .../pkgs/tools/system/natscli/default.nix | 6 +- .../pkgs/tools/system/netdata/default.nix | 27 +- .../pkgs/tools/system/netdata/go.d.plugin.nix | 6 +- .../pkgs/tools/system/nkeys/default.nix | 4 +- .../nixpkgs/pkgs/tools/system/nq/default.nix | 2 +- .../nixpkgs/pkgs/tools/system/nsc/default.nix | 18 +- .../pkgs/tools/system/nvitop/default.nix | 4 +- .../pkgs/tools/system/nvtop/default.nix | 25 +- .../pkgs/tools/system/openipmi/default.nix | 4 +- .../pkgs/tools/system/psensor/default.nix | 2 +- .../nixpkgs/pkgs/tools/system/rex/default.nix | 4 + .../pkgs/tools/system/rsyslog/default.nix | 4 +- .../pkgs/tools/system/runitor/default.nix | 2 +- .../pkgs/tools/system/sg3_utils/default.nix | 4 +- .../pkgs/tools/system/skeema/default.nix | 14 +- .../pkgs/tools/system/sleuthkit/default.nix | 4 +- .../tools/system/smartmontools/default.nix | 4 +- .../pkgs/tools/system/stress-ng/default.nix | 4 +- .../tools/system/stressapptest/default.nix | 13 +- .../pkgs/tools/system/systeroid/default.nix | 9 +- .../pkgs/tools/system/thermald/default.nix | 4 +- .../pkgs/tools/system/tree/default.nix | 1 + .../pkgs/tools/system/ttop/default.nix | 31 +- .../pkgs/tools/system/uroboros/default.nix | 4 +- .../pkgs/tools/system/which/default.nix | 7 + .../nixpkgs/pkgs/tools/system/xe/default.nix | 6 +- .../nixpkgs/pkgs/tools/text/align/default.nix | 2 +- .../pkgs/tools/text/autocorrect/Cargo.lock | 380 +- .../pkgs/tools/text/autocorrect/default.nix | 4 +- .../pkgs/tools/text/base16384/default.nix | 4 +- .../pkgs/tools/text/chroma/default.nix | 2 +- .../pkgs/tools/text/cidrgrep/default.nix | 2 +- .../pkgs/tools/text/codesearch/default.nix | 2 +- .../pkgs/tools/text/comrak/default.nix | 6 +- .../pkgs/tools/text/crowdin-cli/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/d2/default.nix | 8 +- .../nixpkgs/pkgs/tools/text/dcs/default.nix | 4 +- .../pkgs/tools/text/difftastic/Cargo.lock | 78 +- .../pkgs/tools/text/difftastic/default.nix | 4 +- .../pkgs/tools/text/discount/default.nix | 5 +- .../pkgs/tools/text/dos2unix/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/dt/default.nix | 6 +- .../pkgs/tools/text/frangipanni/default.nix | 2 +- .../pkgs/tools/text/gawk/gawkextlib.nix | 17 +- .../nixpkgs/pkgs/tools/text/gjo/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/goawk/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/grin/default.nix | 17 +- .../nixpkgs/pkgs/tools/text/gtree/default.nix | 6 +- .../pkgs/tools/text/hcledit/default.nix | 6 +- .../pkgs/tools/text/jotdown/default.nix | 6 +- .../tools/text/languagetool-rust/default.nix | 6 +- .../tools/text/markdownlint-cli2/default.nix | 32 + .../pkgs/tools/text/math-review/default.nix | 33 + .../tools/text/mdbook-admonish/default.nix | 6 +- .../tools/text/mdbook-emojicodes/default.nix | 6 +- .../text/mdbook-i18n-helpers/default.nix | 6 +- .../pkgs/tools/text/mdbook-katex/default.nix | 6 +- .../nixpkgs/pkgs/tools/text/mecab/base.nix | 23 +- .../nixpkgs/pkgs/tools/text/mecab/default.nix | 28 +- .../nixpkgs/pkgs/tools/text/mecab/ipadic.nix | 15 +- .../nixpkgs/pkgs/tools/text/mecab/nodic.nix | 7 +- .../pkgs/tools/text/miller/default.nix | 6 +- .../nixpkgs/pkgs/tools/text/mmdoc/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/mpage/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/nawk/default.nix | 40 - .../pkgs/tools/text/nltk_data/default.nix | 16 +- .../nixpkgs/pkgs/tools/text/ov/default.nix | 6 +- .../pkgs/tools/text/papeer/default.nix | 4 +- .../pkgs/tools/text/pbgopy/default.nix | 2 +- .../tools/text/platinum-searcher/default.nix | 23 +- .../tools/text/platinum-searcher/deps.nix | 83 - .../pkgs/tools/text/riffdiff/default.nix | 6 +- .../pkgs/tools/text/ruplacer/default.nix | 6 +- .../nixpkgs/pkgs/tools/text/shfmt/default.nix | 2 +- .../nixpkgs/pkgs/tools/text/tesh/default.nix | 22 +- .../nixpkgs/pkgs/tools/text/txr/default.nix | 5 +- .../pkgs/tools/text/txt2tags/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/ugrep/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/vale/default.nix | 6 +- .../nixpkgs/pkgs/tools/text/vgrep/default.nix | 2 +- .../pkgs/tools/text/xml/basex/default.nix | 4 +- .../pkgs/tools/text/xml/xml2/default.nix | 19 + .../tools/text/xml/xmlstarlet/default.nix | 1 + .../nixpkgs/pkgs/tools/text/yx/default.nix | 31 + .../pkgs/tools/text/zstxtns-utils/default.nix | 2 +- .../asciidoctor-with-extensions/Gemfile | 1 + .../asciidoctor-with-extensions/Gemfile.lock | 3 + .../asciidoctor-with-extensions/default.nix | 1 + .../asciidoctor-with-extensions/gemset.nix | 11 + .../typesetting/carbon-now-cli/default.nix | 37 + .../tools/typesetting/hayagriva/default.nix | 6 +- .../tools/typesetting/htmldoc/default.nix | 8 +- .../tools/typesetting/lowdown/default.nix | 2 +- .../pkgs/tools/typesetting/marp/default.nix | 76 + .../tools/typesetting/pdf2djvu/default.nix | 30 +- .../tools/typesetting/pdfchain/default.nix | 33 +- .../pkgs/tools/typesetting/sile/default.nix | 21 +- .../tools/typesetting/soupault/default.nix | 17 +- .../tools/typesetting/tex/catdvi/default.nix | 87 + .../tools/typesetting/tex/pplatex/default.nix | 21 +- .../tools/typesetting/tex/texlive/bin.nix | 229 +- .../tex/texlive/build-texlive-package.nix | 13 +- .../tools/typesetting/tex/texlive/combine.nix | 20 +- .../tools/typesetting/tex/texlive/default.nix | 423 +- .../tex/texlive/make-bin-containers.sh | 14 +- .../typesetting/tex/texlive/setup-hook.sh | 7 - .../tex/texlive/tlpdb-overrides.nix | 401 + .../tools/typesetting/typst-live/default.nix | 17 +- .../pkgs/tools/typesetting/typst/Cargo.lock | 1261 +- .../pkgs/tools/typesetting/typst/default.nix | 7 +- .../tools/typesetting/typstfmt/Cargo.lock | 124 +- .../tools/typesetting/typstfmt/default.nix | 9 +- .../tools/typesetting/xmlroff/default.nix | 2 +- .../blackmagic-desktop-video/default.nix | 106 + .../pkgs/tools/video/go2rtc/default.nix | 6 +- .../pkgs/tools/video/recyclarr/default.nix | 10 +- .../pkgs/tools/video/svt-av1/default.nix | 10 +- .../pkgs/tools/video/xjadeo/default.nix | 4 +- .../tools/virtualization/awsebcli/default.nix | 29 +- .../cloud-init/0001-add-nixos-support.patch | 8 +- .../cloud-init/0002-Add-Udhcpc-support.patch | 421 - .../virtualization/cloud-init/default.nix | 12 +- .../virtualization/cri-tools/default.nix | 4 +- .../virtualization/distrobuilder/default.nix | 2 +- .../google-guest-agent/default.nix | 31 +- .../google-guest-oslogin/default.nix | 4 +- .../tools/virtualization/govc/default.nix | 6 +- .../tools/virtualization/jumppad/default.nix | 6 +- .../virtualization/marathonctl/default.nix | 2 +- .../tools/virtualization/mkosi/default.nix | 74 +- .../pkgs/tools/virtualization/reg/default.nix | 4 +- .../virtualization/rootlesskit/default.nix | 2 +- .../tools/virtualization/uefi-run/default.nix | 2 +- .../pkgs/tools/wayland/clipman/default.nix | 2 +- .../pkgs/tools/wayland/gtklock/default.nix | 6 +- .../pkgs/tools/wayland/kanshi/default.nix | 1 + .../pkgs/tools/wayland/shotman/Cargo.lock | 1148 - .../pkgs/tools/wayland/shotman/default.nix | 13 +- .../pkgs/tools/wayland/stacktile/default.nix | 44 + .../pkgs/tools/wayland/swayr/default.nix | 15 +- .../tools/wayland/way-displays/default.nix | 4 +- .../wayland/wayland-proxy-virtwl/default.nix | 1 + .../tools/wayland/wl-clipboard/default.nix | 4 +- .../tools/wayland/wl-screenrec/default.nix | 15 +- .../pkgs/tools/wayland/wleave/default.nix | 60 + .../pkgs/tools/wayland/wlopm/default.nix | 1 + .../tools/wayland/wlr-which-key/default.nix | 6 +- .../nixpkgs/pkgs/top-level/aliases.nix | 1311 +- .../nixpkgs/pkgs/top-level/all-packages.nix | 1531 +- .../nixpkgs/pkgs/top-level/beam-packages.nix | 17 - .../pkgs/top-level/by-name-overlay.nix | 50 + .../nixpkgs/pkgs/top-level/coq-packages.nix | 4 +- .../nixpkgs/pkgs/top-level/default.nix | 16 +- .../pkgs/top-level/dotnet-packages.nix | 74 +- .../nixpkgs/pkgs/top-level/emacs-packages.nix | 12 +- .../pkgs/top-level/gnuradio-packages.nix | 5 +- .../pkgs/top-level/haskell-packages.nix | 29 +- .../nixpkgs/pkgs/top-level/java-packages.nix | 25 +- .../nixpkgs/pkgs/top-level/linux-kernels.nix | 53 +- .../nixpkgs/pkgs/top-level/nim-packages.nix | 8 + .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 148 +- .../pkgs/top-level/packages-config.nix | 1 - .../nixpkgs/pkgs/top-level/perl-packages.nix | 161 +- .../nixpkgs/pkgs/top-level/php-packages.nix | 30 +- .../top-level/pkg-config/pkg-config-data.json | 2 +- .../nixpkgs/pkgs/top-level/python-aliases.nix | 13 + .../pkgs/top-level/python-packages.nix | 1955 +- .../pkgs/top-level/python2-packages.nix | 4 + .../nixpkgs/pkgs/top-level/qt5-packages.nix | 5 +- .../nixpkgs/pkgs/top-level/qt6-packages.nix | 6 +- .../pkgs/top-level/release-haskell.nix | 6 + .../nixpkgs/pkgs/top-level/release.nix | 75 +- .../nixpkgs/pkgs/top-level/ruby-packages.nix | 401 +- third_party/nixpkgs/pkgs/top-level/stage.nix | 8 + 7521 files changed, 253268 insertions(+), 349735 deletions(-) create mode 100644 third_party/nixpkgs/.github/workflows/check-by-name.yml create mode 100644 third_party/nixpkgs/doc/functions/fileset.section.md create mode 100644 third_party/nixpkgs/doc/hooks/bmake.section.md create mode 100644 third_party/nixpkgs/doc/hooks/mpi-check-hook.section.md create mode 100644 third_party/nixpkgs/doc/using/platform-support.chapter.md create mode 100644 third_party/nixpkgs/lib/fileset/README.md create mode 100755 third_party/nixpkgs/lib/fileset/benchmark.sh create mode 100644 third_party/nixpkgs/lib/fileset/default.nix create mode 100644 third_party/nixpkgs/lib/fileset/internal.nix create mode 100644 third_party/nixpkgs/lib/fileset/mock-splitRoot.nix create mode 100755 third_party/nixpkgs/lib/fileset/tests.sh create mode 100644 third_party/nixpkgs/lib/gvariant.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/declaration-positions.nix create mode 100644 third_party/nixpkgs/lib/tests/modules/gvariant.nix create mode 100755 third_party/nixpkgs/maintainers/scripts/sha-to-sri.py create mode 100644 third_party/nixpkgs/nixos/lib/make-btrfs-fs.nix create mode 100644 third_party/nixpkgs/nixos/lib/test-driver/pyproject.toml delete mode 100644 third_party/nixpkgs/nixos/lib/test-driver/setup.py create mode 100644 third_party/nixpkgs/nixos/lib/test-driver/shell.nix create mode 100644 third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix rename third_party/nixpkgs/nixos/maintainers/scripts/lxd/{lxd-image.nix => lxd-container-image.nix} (64%) delete mode 100644 third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-image-inner.nix create mode 100644 third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix create mode 100644 third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix create mode 100755 third_party/nixpkgs/nixos/maintainers/scripts/oci/create-image.sh create mode 100755 third_party/nixpkgs/nixos/maintainers/scripts/oci/upload-image.sh create mode 100644 third_party/nixpkgs/nixos/modules/hardware/decklink.nix create mode 100644 third_party/nixpkgs/nixos/modules/hardware/glasgow.nix create mode 100644 third_party/nixpkgs/nixos/modules/hardware/infiniband.nix create mode 100644 third_party/nixpkgs/nixos/modules/programs/ecryptfs.nix create mode 100644 third_party/nixpkgs/nixos/modules/programs/yazi.nix create mode 100644 third_party/nixpkgs/nixos/modules/programs/yubikey-touch-detector.nix create mode 100644 third_party/nixpkgs/nixos/modules/security/sudo-rs.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/audio/castopod.md create mode 100644 third_party/nixpkgs/nixos/modules/services/audio/castopod.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/audio/wyoming/openwakeword.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/continuous-integration/hail.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/games/xonotic.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/hardware/hddfancontrol.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/hardware/tuxedo-rs.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/mail/stalwart-mail.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/matrix/synapse-log_config.yaml create mode 100644 third_party/nixpkgs/nixos/modules/services/misc/forgejo.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/sabnzbd.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/frp.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/netclient.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/nncp.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/networking/tedicross.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/system/zram-generator.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/web-apps/audiobookshelf.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/web-apps/honk.md create mode 100644 third_party/nixpkgs/nixos/modules/services/web-apps/honk.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/web-apps/meme-bingo-web.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/web-apps/mobilizon.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/web-apps/rimgo.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/web-apps/zitadel.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/x11/window-managers/oroborus.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/x11/window-managers/ragnarwm.nix create mode 100644 third_party/nixpkgs/nixos/modules/virtualisation/lxc-image-metadata.nix create mode 100644 third_party/nixpkgs/nixos/modules/virtualisation/lxc-instance-common.nix create mode 100644 third_party/nixpkgs/nixos/modules/virtualisation/lxd-virtual-machine.nix create mode 100644 third_party/nixpkgs/nixos/modules/virtualisation/oci-common.nix create mode 100644 third_party/nixpkgs/nixos/modules/virtualisation/oci-config-user.nix create mode 100644 third_party/nixpkgs/nixos/modules/virtualisation/oci-image.nix create mode 100644 third_party/nixpkgs/nixos/modules/virtualisation/oci-options.nix create mode 100644 third_party/nixpkgs/nixos/tests/amd-sev.nix create mode 100644 third_party/nixpkgs/nixos/tests/anbox.nix create mode 100644 third_party/nixpkgs/nixos/tests/audiobookshelf.nix create mode 100644 third_party/nixpkgs/nixos/tests/castopod.nix delete mode 100644 third_party/nixpkgs/nixos/tests/common/lxd/config.yaml create mode 100644 third_party/nixpkgs/nixos/tests/dae.nix create mode 100644 third_party/nixpkgs/nixos/tests/dconf.nix create mode 100644 third_party/nixpkgs/nixos/tests/forgejo.nix create mode 100644 third_party/nixpkgs/nixos/tests/frp.nix create mode 100644 third_party/nixpkgs/nixos/tests/hddfancontrol.nix create mode 100644 third_party/nixpkgs/nixos/tests/honk.nix rename third_party/nixpkgs/nixos/tests/{lxd.nix => lxd/container.nix} (64%) create mode 100644 third_party/nixpkgs/nixos/tests/lxd/default.nix rename third_party/nixpkgs/nixos/tests/{lxd-nftables.nix => lxd/nftables.nix} (89%) create mode 100644 third_party/nixpkgs/nixos/tests/lxd/preseed.nix rename third_party/nixpkgs/nixos/tests/{lxd-ui.nix => lxd/ui.nix} (94%) create mode 100644 third_party/nixpkgs/nixos/tests/lxd/virtual-machine.nix create mode 100644 third_party/nixpkgs/nixos/tests/matrix/synapse-workers.nix create mode 100644 third_party/nixpkgs/nixos/tests/mobilizon.nix create mode 100644 third_party/nixpkgs/nixos/tests/nginx-tmpdir.nix create mode 100644 third_party/nixpkgs/nixos/tests/qemu-vm-external-disk-image.nix create mode 100644 third_party/nixpkgs/nixos/tests/qgis.nix create mode 100644 third_party/nixpkgs/nixos/tests/ragnarwm.nix rename third_party/nixpkgs/nixos/tests/{sgtpuzzles.nix => sgt-puzzles.nix} (92%) create mode 100644 third_party/nixpkgs/nixos/tests/stalwart-mail.nix create mode 100644 third_party/nixpkgs/nixos/tests/sudo-rs.nix create mode 100644 third_party/nixpkgs/nixos/tests/systemd-initrd-bridge.nix create mode 100644 third_party/nixpkgs/nixos/tests/systemd-initrd-vlan.nix delete mode 100644 third_party/nixpkgs/nixos/tests/ulogd.nix create mode 100644 third_party/nixpkgs/nixos/tests/ulogd/ulogd.nix create mode 100644 third_party/nixpkgs/nixos/tests/ulogd/ulogd.py create mode 100644 third_party/nixpkgs/nixos/tests/user-expiry.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/castopod/default.nix create mode 100755 third_party/nixpkgs/pkgs/applications/audio/castopod/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/audio/glicol-cli/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/hydrogen/0.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/muse/fix-parallel-building.patch create mode 100644 third_party/nixpkgs/pkgs/applications/audio/parrot/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/qmidiroute/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/qtscrobbler/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/lndinit/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/quorum/go.mod.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch create mode 100644 third_party/nixpkgs/pkgs/applications/editors/aseprite/shared-libwebp.patch create mode 100644 third_party/nixpkgs/pkgs/applications/editors/aseprite/shared-skia-deps.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/atom/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/atom/env.nix create mode 100755 third_party/nixpkgs/pkgs/applications/editors/eclipse/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/emacs/macport_noescape_noop.h create mode 100755 third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/editors/jupyter/console.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/rstudio/do-not-install-pandoc.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/rstudio/package.json delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/rstudio/remove-quarto-from-generator.patch create mode 100644 third_party/nixpkgs/pkgs/applications/editors/rstudio/use-system-quarto.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/rstudio/yarn.lock delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/rstudio/yarndeps.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/teehee/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.patch create mode 100644 third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/vim-sensible/fix-nix-store-path-regex.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update-shell.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/vim/plugins/updater.nix create mode 100644 third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/find-minizip-ng.patch create mode 100644 third_party/nixpkgs/pkgs/applications/emulators/duckstation/001-fix-test-inclusion.diff create mode 100644 third_party/nixpkgs/pkgs/applications/emulators/duckstation/002-hardcode-vars.diff delete mode 100644 third_party/nixpkgs/pkgs/applications/emulators/resim/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.12.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/emulators/yuzu/vulkan_version.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/file-managers/llama/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/file-managers/walk/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/finance/odoo/odoo15.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/fix-qttranslations-path.diff create mode 100644 third_party/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch create mode 100644 third_party/nixpkgs/pkgs/applications/gis/qgis/test.py delete mode 100644 third_party/nixpkgs/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/graphics/animbar/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/lutgen/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/monado/steamvr_lh-use-old-interface.patch create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/normcap/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/graphics/nufraw/move-extern-c.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/graphics/scantailor/default.nix rename third_party/nixpkgs/pkgs/applications/{misc/arianna/default.nix => kde/arianna.nix} (68%) rename third_party/nixpkgs/pkgs/applications/kde/{kdegraphics-thumbnailers.nix => kdegraphics-thumbnailers/default.nix} (55%) create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers/gs-paths.patch create mode 100644 third_party/nixpkgs/pkgs/applications/kde/kdenlive/dependency-paths.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/kde/kdenlive/ffmpeg-path.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/kde/kdenlive/mlt-path.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/kde/kfloppy.nix rename third_party/nixpkgs/pkgs/applications/kde/{kalendar.nix => merkuro.nix} (86%) create mode 100644 third_party/nixpkgs/pkgs/applications/maui/mauikit-documents.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/appcleaner/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/birdtray/fix-qttranslations-path.diff create mode 100644 third_party/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/dict-cc-py/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/flashprint/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/ghosttohugo/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/go-thumbnailer/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/go-thumbnailer/go.thumbnailer delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff create mode 100644 third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/hyprnome/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/kile-wl/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/applications/misc/konsave/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/kuro/yarn.lock delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/kuro/yarn.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/markmind/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/matcha-rss-digest/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/navipowm/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/nwg-look/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/nwg-look/fix-paths.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/nwg-look/go.mod delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/oranda/tailwind.patch create mode 100755 third_party/nixpkgs/pkgs/applications/misc/owmods-cli/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/misc/pagefind/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/pomotroid/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/pysentation/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/qmetro/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/retool/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/rust-traverse/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/safecloset/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/sqliteman/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/stepreduce/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/update-pillow.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/tomato-c/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/translatelocally/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/translatelocally/version_without_git.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/valentina/fix-qttranslations-path.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/xlights/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/yambar-hyprland-wses/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/pubspec.lock rename third_party/nixpkgs/pkgs/applications/networking/browsers/{tor-browser-bundle-bin => tor-browser}/default.nix (94%) rename third_party/nixpkgs/pkgs/applications/networking/browsers/{tor-browser-bundle-bin => tor-browser}/update.nix (100%) delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix delete mode 100755 third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/kns/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix delete mode 100755 third_party/nixpkgs/pkgs/applications/networking/cluster/octant/update-desktop.sh delete mode 100755 third_party/nixpkgs/pkgs/applications/networking/cluster/octant/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/provider-path-0_15.patch create mode 100755 third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/networking/dyndns/cfdyndns/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neosay/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/ktailctl/default.nix create mode 100755 third_party/nixpkgs/pkgs/applications/networking/localsend/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/fix-qttranslations-path.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.lock delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.nix delete mode 100755 third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/yarndeps.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/cargo.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/fix-for-rust-1.65.diff delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/sync/celeste/target-dir.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/utahfs/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/README.md delete mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/download-list-builder.sh delete mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/gen-shell.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/gpgme-1.18.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/poppler-22-04-0.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/soffice-template.desktop rename third_party/nixpkgs/pkgs/applications/office/libreoffice/{src-still/download.nix => src-fresh/deps.nix} (71%) create mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/help.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/main.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/translations.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/version.nix rename third_party/nixpkgs/pkgs/applications/office/libreoffice/{src-fresh/download.nix => src-still/deps.nix} (92%) create mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/help.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/main.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/primary.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/translations.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/version.nix create mode 100755 third_party/nixpkgs/pkgs/applications/office/libreoffice/update.sh delete mode 100644 third_party/nixpkgs/pkgs/applications/office/micropad/yarn.lock delete mode 100644 third_party/nixpkgs/pkgs/applications/office/micropad/yarn.nix rename third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/{default.nix => 7_2.nix} (94%) create mode 100644 third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/7_4.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/roam-research/common.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/roam-research/darwin.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/roam-research/linux.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/office/scribus/1_4.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/ticktick/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/radio/soapysdr/fix-pkgconfig.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/radio/uhd/3.5.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/biology/bwa-mem2/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/biology/trimmomatic/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/chemistry/avogadro/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/release.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/openroad/0001-Disable-failing-regression-tests.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/openroad/0001-Fix-string-formatting-in-tests.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/qfsm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/qucs/cmakelists.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/qucs/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/package-lock.json create mode 100644 third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/test.v create mode 100644 third_party/nixpkgs/pkgs/applications/science/math/mpsolve/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/terminal-emulators/eterm/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/degit/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/version-management/gitlab/railties-remove-yarn-install-enhancement.patch create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/gitnr/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/version-management/stgit/0001-fix-use-canonical-Message-ID-spelling.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/version-management/transcrypt/helper-scripts_depspathprefix.patch rename third_party/nixpkgs/pkgs/applications/video/anilibria-winmaclinux/{0001-fix-instalation-paths.patch => 0001-fix-installation-paths.patch} (100%) create mode 100644 third_party/nixpkgs/pkgs/applications/video/makemkv/r13y.patch create mode 100644 third_party/nixpkgs/pkgs/applications/video/mpv/scripts/mpv-webm.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-freeze-filter.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/shaka-packager/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/docker/sbom-disable-tests.patch create mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/docker/sbom.nix create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/hyprland-share-picker.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/source.nix rename third_party/nixpkgs/pkgs/{development/tools/language-servers/vhdl-ls/Cargo.lock => applications/window-managers/i3/workstyle-Cargo.lock} (59%) create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/lesbar/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/notion/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/oroborus/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/picom/picom-allusive.nix create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/ragnarwm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/smallwm/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/sway/drop_ambient_capabilities.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/window-managers/windowmaker/default.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/fetchdebianpatch/default.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/fetchdebianpatch/tests.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/ocaml/topkg.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/php/build-composer-project.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/php/build-composer-repository.nix rename third_party/nixpkgs/pkgs/build-support/{ => php}/build-pecl.nix (91%) create mode 100644 third_party/nixpkgs/pkgs/build-support/php/hooks/composer-install-hook.sh create mode 100644 third_party/nixpkgs/pkgs/build-support/php/hooks/composer-repository-hook.sh create mode 100644 third_party/nixpkgs/pkgs/build-support/php/hooks/default.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/php/pkgs/composer-local-repo-plugin.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/php/pkgs/composer-phar.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/setup-hooks/mpi-check-hook/default.nix create mode 100644 third_party/nixpkgs/pkgs/build-support/setup-hooks/mpi-check-hook/mpi-check-hook.sh create mode 100644 third_party/nixpkgs/pkgs/by-name/README.md rename third_party/nixpkgs/pkgs/{development/compilers/4th => by-name/_4/_4th}/001-install-manual-fixup.diff (100%) rename third_party/nixpkgs/pkgs/{development/compilers/4th/default.nix => by-name/_4/_4th/package.nix} (52%) rename third_party/nixpkgs/pkgs/{tools/misc/a4term/default.nix => by-name/a4/a4/package.nix} (79%) create mode 100644 third_party/nixpkgs/pkgs/by-name/aa/aarch64-esr-decoder/package.nix rename third_party/nixpkgs/pkgs/{applications/window-managers/afterstep/default.nix => by-name/af/afterstep/package.nix} (61%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ai/airscan/package.nix rename third_party/nixpkgs/pkgs/{development/compilers/algol68g/default.nix => by-name/al/algol68g/package.nix} (65%) create mode 100644 third_party/nixpkgs/pkgs/by-name/al/alt-tab-macos/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ao/aocl-utils/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ar/arjun/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ar/armbian-firmware/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ar/arrpc/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/as/asciiquarium-transparent/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/as/ast-grep/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/aw/aws-azure-login/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ba/backlight-auto/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ba/badger/package.nix rename third_party/nixpkgs/pkgs/{applications/window-managers/berry/default.nix => by-name/be/berry/package.nix} (75%) create mode 100644 third_party/nixpkgs/pkgs/by-name/bi/binsort/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/bi/bitmagnet/package.nix rename third_party/nixpkgs/pkgs/{development/tools/build-managers/bmake/bootstrap-fix.patch => by-name/bm/bmake/001-bootstrap-fix.diff} (100%) rename third_party/nixpkgs/pkgs/{development/tools/build-managers/bmake/dont-test-while-installing.diff => by-name/bm/bmake/002-dont-test-while-installing.diff} (100%) rename third_party/nixpkgs/pkgs/{development/tools/build-managers/bmake/fix-unexport-env-test.patch => by-name/bm/bmake/003-fix-unexport-env-test.diff} (100%) rename third_party/nixpkgs/pkgs/{development/tools/build-managers/bmake/unconditional-ksh-test.patch => by-name/bm/bmake/004-unconditional-ksh-test.diff} (100%) rename third_party/nixpkgs/pkgs/{development/tools/build-managers/bmake/default.nix => by-name/bm/bmake/package.nix} (79%) rename third_party/nixpkgs/pkgs/{development/tools/build-managers => by-name/bm}/bmake/setup-hook.sh (100%) rename third_party/nixpkgs/pkgs/{applications/emulators/bochs/default.nix => by-name/bo/bochs/package.nix} (94%) rename third_party/nixpkgs/pkgs/{development/dotnet-modules/boogie-deps.nix => by-name/bo/boogie/deps.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/bo/boogie/install-check-file.bpl create mode 100644 third_party/nixpkgs/pkgs/by-name/bo/boogie/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/br/bruno/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ca/cargo-bump/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ca/cargo-i18n/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ca/cargo-rdme/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/cd/cdwe/package.nix rename third_party/nixpkgs/pkgs/{applications/video/celluloid/default.nix => by-name/ce/celluloid/package.nix} (69%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ci/circle-flags/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/cl/clzip/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/cn/cntb/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/co/colorized-logs/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/co/comic-mandown/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/co/composefs/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/co/controku/package.nix rename third_party/nixpkgs/pkgs/{development/tools/convco/default.nix => by-name/co/convco/package.nix} (65%) create mode 100644 third_party/nixpkgs/pkgs/by-name/co/costa/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/cr/create-react-app/package.nix rename third_party/nixpkgs/pkgs/{applications/terminal-emulators/ctx/0001-Make-arch-detection-optional-and-fix-targets.patch => by-name/ct/ctx/0001-fix-detections.diff} (57%) rename third_party/nixpkgs/pkgs/{applications/terminal-emulators/ctx/default.nix => by-name/ct/ctx/package.nix} (65%) create mode 100644 third_party/nixpkgs/pkgs/by-name/de/debianutils/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/dj/djent/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/dm/dmenu-bluetooth/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/do/dorion/package.nix rename third_party/nixpkgs/pkgs/{misc/dxvk/default.nix => by-name/dx/dxvk/package.nix} (100%) rename third_party/nixpkgs/pkgs/{misc => by-name/dx}/dxvk/setup_dxvk.sh (100%) rename third_party/nixpkgs/pkgs/{misc/dxvk => by-name/dx/dxvk_1}/darwin-dxvk-compat.patch (100%) rename third_party/nixpkgs/pkgs/{misc/dxvk => by-name/dx/dxvk_1}/darwin-thread-primitives.patch (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/dx/dxvk_1/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/dx/dxvk_2/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/dy/dyalog/dyalogscript.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/dy/dyalog/mapl.patch create mode 100644 third_party/nixpkgs/pkgs/by-name/dy/dyalog/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ec/ecc/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ec/ecmtools/package.nix rename third_party/nixpkgs/pkgs/{tools/admin/eksctl/default.nix => by-name/ek/eksctl/package.nix} (86%) rename third_party/nixpkgs/pkgs/{shells/elvish/default.nix => by-name/el/elvish/package.nix} (63%) create mode 100644 third_party/nixpkgs/pkgs/by-name/el/elvish/tests/expect-version.elv create mode 100644 third_party/nixpkgs/pkgs/by-name/el/elvish/tests/expect-version.nix rename third_party/nixpkgs/pkgs/{tools/misc/engage/default.nix => by-name/en/engage/package.nix} (79%) create mode 100644 third_party/nixpkgs/pkgs/by-name/es/esbuild-config/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/eu/eudev/package.nix rename third_party/nixpkgs/pkgs/{tools/misc/eza/default.nix => by-name/ez/eza/package.nix} (69%) rename third_party/nixpkgs/pkgs/{development/compilers/fleng/default.nix => by-name/fl/fleng/package.nix} (87%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ga/game-rs/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ga/gash-utils/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ga/gash/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gb/gbar/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gh/gh-screensaver/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gh/ghunt/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gi/girouette/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gi/gitmoji-cli/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/go/goat/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gr/grimblast/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gu/guile-avahi/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gu/guile-goblins/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gu/guile-lzma/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gu/guile-semver/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/gu/guile-zlib/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/he/headphones-toolbox/package.nix rename third_party/nixpkgs/pkgs/{applications/misc/hello/default.nix => by-name/he/hello/package.nix} (97%) rename third_party/nixpkgs/pkgs/{applications/misc => by-name/he}/hello/test.nix (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/he/hexbinhex/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/hy/hyperlink/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/hy/hyprkeys/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/i3/i3bar-river/package.nix rename third_party/nixpkgs/pkgs/{applications/window-managers/icewm/default.nix => by-name/ic/icewm/package.nix} (96%) create mode 100644 third_party/nixpkgs/pkgs/by-name/if/ifrextractor-rs/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/by-name/if/ifrextractor-rs/package.nix rename third_party/nixpkgs/pkgs/{applications/editors/imhex/default.nix => by-name/im/imhex/package.nix} (79%) create mode 100644 third_party/nixpkgs/pkgs/by-name/im/impression/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ir/ironbar/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ji/jinja2-cli/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ju/justbuild/package.nix rename third_party/nixpkgs/pkgs/{applications/window-managers/katriawm/default.nix => by-name/ka/katriawm/package.nix} (70%) create mode 100644 third_party/nixpkgs/pkgs/by-name/kt/ktfmt/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ku/kubectl-neat/package.nix rename third_party/nixpkgs/pkgs/{applications/window-managers/labwc/default.nix => by-name/la/labwc/package.nix} (71%) create mode 100644 third_party/nixpkgs/pkgs/by-name/le/lemminx/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/le/less/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/le/lexmark-aex/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/liana/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/by-name/li/liana/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libburn/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libisoburn/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/libisofs/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/li/linux-wallpaperengine/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/lu/luastatus/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ma/matrix-commander-rs/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ma/matrix-hook/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/me/mermaid-cli/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/mf/mfoc-hardnested/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/mi/millipixels/package.nix rename third_party/nixpkgs/pkgs/{shells/mksh/default.nix => by-name/mk/mksh/package.nix} (74%) create mode 100644 third_party/nixpkgs/pkgs/by-name/ml/mlx42/mlx42.pc create mode 100644 third_party/nixpkgs/pkgs/by-name/ml/mlx42/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/na/nawk/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ne/netclient/package.nix rename third_party/nixpkgs/pkgs/{tools/networking/netproc/default.nix => by-name/ne/netproc/package.nix} (72%) create mode 100644 third_party/nixpkgs/pkgs/by-name/nf/nfft/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ni/nixos-anywhere/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/no/notion/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/nu/nuget/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/oe/oelint-adv/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/op/openpgl/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/or/orchard/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ou/outputcheck/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/pa/passes/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/pd/pdepend/composer.lock create mode 100644 third_party/nixpkgs/pkgs/by-name/pd/pdepend/package.nix rename third_party/nixpkgs/pkgs/{applications/window-managers/pekwm/default.nix => by-name/pe/pekwm/package.nix} (89%) create mode 100644 third_party/nixpkgs/pkgs/by-name/pe/pesign/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ph/phpdocumentor/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/pl/platformsh/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/po/poethepoet/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/pr/prettier-d-slim/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/px/pxder/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/qu/quicktype/package.nix rename third_party/nixpkgs/pkgs/{applications/window-managers/ratpoison/default.nix => by-name/ra/ratpoison/package.nix} (59%) rename third_party/nixpkgs/pkgs/{shells/rc/default.nix => by-name/rc/rc/package.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/re/rectangle-pro/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/re/replxx/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ri/rimgo/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ri/ripsecrets/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ro/robo/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ro/robotfindskitten/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ru/rusti-cal/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/sa/samrewritten/package.nix rename third_party/nixpkgs/pkgs/{tools/typesetting/scdoc/default.nix => by-name/sc/scdoc/package.nix} (79%) create mode 100644 third_party/nixpkgs/pkgs/by-name/sc/screentest/package.nix rename third_party/nixpkgs/pkgs/{servers/web-apps/searxng/default.nix => by-name/se/searxng/package.nix} (84%) create mode 100644 third_party/nixpkgs/pkgs/by-name/sh/shepherd/package.nix rename third_party/nixpkgs/pkgs/{tools/misc/shopware-cli/default.nix => by-name/sh/shopware-cli/package.nix} (84%) create mode 100644 third_party/nixpkgs/pkgs/by-name/si/simplex-chat-desktop/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/si/sirius/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/sl/sleek-grub-theme/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/sl/slurm-nm/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/sm/smallwm/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/sp/spfft/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/sp/spla/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ss/sssnake/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/st/static-server/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/st/static-server/version.patch rename third_party/nixpkgs/pkgs/{tools/X11/sunpaper/default.nix => by-name/su/sunpaper/package.nix} (53%) create mode 100644 third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/sy/symbolicator/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/by-name/sy/symbolicator/package.nix rename third_party/nixpkgs/pkgs/{shells/tcsh/default.nix => by-name/tc/tcsh/package.nix} (100%) rename third_party/nixpkgs/pkgs/{games/the-legend-of-edgar/default.nix => by-name/th/the-legend-of-edgar/package.nix} (72%) create mode 100644 third_party/nixpkgs/pkgs/by-name/th/thud/package.nix rename third_party/nixpkgs/pkgs/{applications/window-managers/tinywm/default.nix => by-name/ti/tinywm/package.nix} (65%) create mode 100644 third_party/nixpkgs/pkgs/by-name/tm/tmuxifier/package.nix rename third_party/nixpkgs/pkgs/{development/interpreters/trealla/default.nix => by-name/tr/trealla/package.nix} (94%) create mode 100644 third_party/nixpkgs/pkgs/by-name/tu/tuxmux/package.nix rename third_party/nixpkgs/pkgs/{tools/text/ucg/default.nix => by-name/uc/ucg/package.nix} (67%) create mode 100644 third_party/nixpkgs/pkgs/by-name/uc/ucg/tests/simple.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/ui/uiua/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/un/unbook/package.nix rename third_party/nixpkgs/pkgs/{tools/security/rucredstash => by-name/un/unimap}/Cargo.lock (55%) create mode 100644 third_party/nixpkgs/pkgs/by-name/un/unimap/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/up/upiano/package.nix rename third_party/nixpkgs/pkgs/{applications/emulators/uxn/default.nix => by-name/ux/uxn/package.nix} (90%) rename third_party/nixpkgs/pkgs/{applications/window-managers/waybox/default.nix => by-name/wa/waybox/package.nix} (73%) create mode 100644 third_party/nixpkgs/pkgs/by-name/wa/waycheck/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/wa/wayland-logout/package.nix rename third_party/nixpkgs/pkgs/{applications/window-managers => by-name/wi}/windowmaker/dockapps/AlsaMixer-app.nix (100%) rename third_party/nixpkgs/pkgs/{applications/window-managers => by-name/wi}/windowmaker/dockapps/default.nix (100%) rename third_party/nixpkgs/pkgs/{applications/window-managers => by-name/wi}/windowmaker/dockapps/libdockapp.nix (100%) rename third_party/nixpkgs/pkgs/{applications/window-managers => by-name/wi}/windowmaker/dockapps/wmCalClock.nix (100%) rename third_party/nixpkgs/pkgs/{applications/window-managers => by-name/wi}/windowmaker/dockapps/wmsm-app.nix (100%) rename third_party/nixpkgs/pkgs/{applications/window-managers => by-name/wi}/windowmaker/dockapps/wmsystemtray.nix (100%) create mode 100644 third_party/nixpkgs/pkgs/by-name/wi/windowmaker/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/wo/wonderdraft/package.nix rename third_party/nixpkgs/pkgs/{tools/text/xml/xmldiff/default.nix => by-name/xm/xmldiff/package.nix} (74%) rename third_party/nixpkgs/pkgs/{tools/cd-dvd/xorriso/default.nix => by-name/xo/xorriso/package.nix} (81%) rename third_party/nixpkgs/pkgs/{applications/window-managers/yeahwm/default.nix => by-name/ye/yeahwm/package.nix} (53%) create mode 100644 third_party/nixpkgs/pkgs/by-name/yt/ytui-music/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/zc/zcfan/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/zi/zitadel/console.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/zi/zitadel/package.json create mode 100644 third_party/nixpkgs/pkgs/by-name/zi/zitadel/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/zp/zpaqfranz/package.nix create mode 100644 third_party/nixpkgs/pkgs/by-name/zx/zxpy/package.nix create mode 100644 third_party/nixpkgs/pkgs/data/fonts/azeret-mono/default.nix create mode 100644 third_party/nixpkgs/pkgs/data/fonts/noto-fonts/noto-emoji.hashes.json create mode 100644 third_party/nixpkgs/pkgs/data/fonts/noto-fonts/noto-emoji.json create mode 100755 third_party/nixpkgs/pkgs/data/fonts/noto-fonts/noto-emoji.py create mode 100644 third_party/nixpkgs/pkgs/data/icons/tau-hydrogen/default.nix create mode 100644 third_party/nixpkgs/pkgs/data/icons/whitesur-cursors/default.nix create mode 100644 third_party/nixpkgs/pkgs/data/themes/where-is-my-sddm-theme/default.nix create mode 100644 third_party/nixpkgs/pkgs/data/themes/whitesur-kde/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/extensions/paperwm/default.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix create mode 100644 third_party/nixpkgs/pkgs/desktops/plasma-5/plasma-desktop/no-discover-shortcut.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/algol68g/0001-plotutils-png-support.diff create mode 100644 third_party/nixpkgs/pkgs/development/compilers/coffeescript/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.4.4.json create mode 100644 third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.5.2.json create mode 100644 third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.6.2.json create mode 100644 third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.7.0.json create mode 100644 third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_11.8.0.json create mode 100644 third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.0.1.json create mode 100644 third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.1.1.json create mode 100644 third_party/nixpkgs/pkgs/development/compilers/cudatoolkit/redist/manifests/redistrib_features_12.2.0.json create mode 100644 third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-pages-fix-init-read-only.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/eql/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/flutter/patches/flutter3/flutter-pub-dart-override.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ghc/9.6.3.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/go/bootstrap121.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graaljs/hashes.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalnodejs/hashes.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalpy/hashes.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/hashes.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/hashes.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/js-installable-svm.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/llvm-installable-svm.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/native-image-installable-svm.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/nodejs-installable-svm.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/python-installable-svm.nix rename third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/{ruby-installable-svm.nix => truffleruby/default.nix} (64%) create mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/truffleruby/hashes.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/wasm-installable-svm.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/10/bintools/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/bintools/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/compiler-rt/codesign.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxxabi/no-threads.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/11/libcxxabi/wasm.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/12/bintools/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/codesign.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/12/libcxxabi/wasm.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/13/bintools/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxxabi/wasm.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/bintools/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/14/libcxxabi/wasm.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/15/bintools/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/15/libcxxabi/wasm.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/16/bintools/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/16/libcxxabi/wasm.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/6/clang/purity.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/7/bintools/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/7/clang/purity.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/7/compiler-rt/codesign.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/8/bintools/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/8/clang/purity.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/8/compiler-rt/codesign.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi/no-threads.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/8/libcxxabi/wasm.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/9/bintools/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/9/compiler-rt/codesign.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/9/libcxxabi/no-threads.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/9/libcxxabi/wasm.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/common/bintools.nix rename third_party/nixpkgs/pkgs/development/compilers/llvm/{5/clang/purity.patch => common/clang/5-8-purity.patch} (100%) rename third_party/nixpkgs/pkgs/development/compilers/llvm/{10/compiler-rt/codesign.patch => common/compiler-rt/7-12-codesign.patch} (100%) rename third_party/nixpkgs/pkgs/development/compilers/llvm/{10 => common}/libcxxabi/no-threads.patch (100%) rename third_party/nixpkgs/pkgs/development/compilers/llvm/{10 => common}/libcxxabi/wasm.patch (100%) delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/git/bintools/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/git/libcxxabi/wasm.patch delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/llvm/git/lldb/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/nim/openssl.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ocaml/5.1.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/openjdk/21.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/11.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/16.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/17.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/18.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/19.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/20.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/8.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/openjdk/darwin/meta.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/openjdk/fix-java-home-jdk21.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/openjdk/openjfx/21.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ponyc/fix-darwin-build.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/reason/tests/hello/dune-project rename third_party/nixpkgs/pkgs/development/compilers/rust/{1_71.nix => 1_72.nix} (52%) create mode 100644 third_party/nixpkgs/pkgs/development/compilers/rust/cargo_cross.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/seexpr/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/solc/tests.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/zulu/11.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/zulu/16.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/zulu/17.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/zulu/18.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/zulu/19.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/zulu/20.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/zulu/21.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/zulu/common.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/zulu/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/coq-modules/serapi/janestreet-0.16.patch delete mode 100644 third_party/nixpkgs/pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/cel-go/go-mod-tidy.patch delete mode 100644 third_party/nixpkgs/pkgs/development/interpreters/clisp/bits_ipctypes_to_sys_ipc.patch create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/clisp/gnulib_aarch64.patch delete mode 100644 third_party/nixpkgs/pkgs/development/interpreters/clisp/hg.nix delete mode 100644 third_party/nixpkgs/pkgs/development/interpreters/clisp/remove-cfree-binding.patch create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/emilua/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/interpreters/erlang/23.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/lambda-lisp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/lambda-lisp/sources.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/nickel/Cargo.lock delete mode 100644 third_party/nixpkgs/pkgs/development/interpreters/python/hooks/flit-build-hook.sh create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-build-hook-test.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/python/hooks/pypa-install-hook.sh create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/python/python2/mk-python-derivation.nix delete mode 100644 third_party/nixpkgs/pkgs/development/interpreters/self/default.nix delete mode 100755 third_party/nixpkgs/pkgs/development/interpreters/self/self create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/115.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/wasmtime/patches/0001-Use-dep-dependency-due-to-cargo-auditable-limitation.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/SDL2_mixer/SDL_mixer-2.0-incompatible-pointer-comparison-fix.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/abseil-cpp/202308.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/darwin.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/azmq/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/boost/1.83.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/elementary-cmake-modules/setup-hook.sh create mode 100644 third_party/nixpkgs/pkgs/development/libraries/fastcdr/0001-Do-not-require-wget-and-unzip.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/fastcdr/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/fbjni/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/flatpak/binary-path.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/fortify-headers/restore-macros.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/fortify-headers/wchar-imports-skip.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/futuresql/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/geos/tests.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/gettext/0001-msginit-Do-not-use-POT-Creation-Date.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/glfw/3.x-wayland-minecraft.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/gr-framework/Use-the-module-mode-to-search-for-the-LibXml2-package.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/hax11/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/kcp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libbsd/darwin.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libburn/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libisoburn/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libisofs/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libjreen/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libkcapi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/liblinphone/backport-cpp17.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/librist/darwin.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libuev/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libyuv/yuv.pc delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/ntrack/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/ntrack/libnl-fix.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/opencascade/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/opencomposite/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/opencomposite/helper.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/openexr/disable-iex-test.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/pplite/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/prison/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/protobuf/3.17.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/protobuf/3.19.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/protobuf/3.24.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qimageblitz/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qimageblitz/qimageblitz-9999-exec-stack.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qscintilla-qt4/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qscintilla-qt4/fix-qt4-build.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/clang-5-darwin.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-absolute-paths.diff delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/dlopen-gtkstyle.diff delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/glib-2.32.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/kill-legacy-darwin-apis.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/libressl.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/parallel-configure.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/patch-qthread-stacksize.diff delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qmake-hook.sh delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qsettings-recursive-global-mutex.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-4.8.7-unixmake-darwin.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-musl-iconv-no-bom.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt-musl.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt4-gcc6.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-4.x/4.8/qt4-openssl-1.1.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/9999-backport-dbus-crash.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/0008-qtbase-allow-translations-outside-prefix.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-6/patches/qtwebengine-locales-path.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qt-mobility/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum-qt4/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/qwt/6_qt4.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/rtlcss/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/science/math/amd-libflame/add-lapacke.diff create mode 100644 third_party/nixpkgs/pkgs/development/libraries/science/math/or-tools/fix-stringview-compile.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/smesh/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/smokegen/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/smokeqt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/unixODBCDrivers/mariadb-connector-odbc-unistd.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/vtk/8.x.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/vulkan-utility-libraries/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/xsimd/10.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/yajl/cmake-shared-static-fix.patch delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules-new-obsolete/patches/qt-libs-dont-download.patch create mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/patches/cffi-libffi-darwin-ffi-h.patch delete mode 100644 third_party/nixpkgs/pkgs/development/lisp-modules/patches/qtools-use-nix-libs.patch create mode 100644 third_party/nixpkgs/pkgs/development/misc/gokrazy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/misc/juce/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/mobile/cordova/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/mobile/titanium-alloy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/mobile/titanium/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/nim-packages/atlas/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/nim-packages/csvtools/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/nim-packages/nimble/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/nim-packages/safeseq/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/b0/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/cfstream/janestreet-0.16.patch create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/dolmen/loop.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/dolmen/type.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/domain_shims/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.16.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_16.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/lockfree/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/lun/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/lun/ppx.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-stack/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/msgpck/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/ocolor/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/ocsigen-server/cohttp-5.patch create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/odig/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/pbrt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/pp_loc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/saturn/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/saturn/lockfree.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/zelus-gtk/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/zelus/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/perl-modules/sdl-modern-perl.patch create mode 100644 third_party/nixpkgs/pkgs/development/perl-modules/tk-configure-implicit-int-fix.patch create mode 100644 third_party/nixpkgs/pkgs/development/php-packages/castor/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/php-packages/memcache/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/php-packages/opentelemetry/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/php-packages/pdepend/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/php-packages/phalcon/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/php-packages/psalm/composer.lock create mode 100644 third_party/nixpkgs/pkgs/development/php-packages/psysh/composer.lock create mode 100644 third_party/nixpkgs/pkgs/development/php-packages/rrd/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/about-time/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/acunetix/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aioboto3/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiocomelit/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiohttp-basicauth/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiopegelonline/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aioprometheus/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aioquic-mitmproxy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aioruckus/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiovodafone/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aiowaqi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/alive-progress/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/anel-pwrctrl-homeassistant/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ansi2image/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ansible-pylibssh/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/anthemav/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/anyqt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/apischema/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/apkit/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/astropy-extension-helpers/permissions.patch rename third_party/nixpkgs/pkgs/development/python-modules/{atsim_potentials => atsim-potentials}/default.nix (100%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/attrs/remove-hatch-plugins.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/auditok/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/automx2/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/autoslot/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/aws-encryption-sdk/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/base64io/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/baycomp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/beautiful-date/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/blockfrost-python/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/bootstrap/build/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/bootstrap/flit-core/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/bootstrap/installer/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/boto3-stubs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/botocore-stubs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cachier/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cairo-lang/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/checkdmarc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/checksumdir/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/click-odoo-contrib/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/click-odoo/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cmake/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cmake/stub/cmake/__init__.py create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cmake/stub/pyproject.toml create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cobs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/comicon/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/controku/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cose/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/cssbeautifier/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/curlify/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/daqp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/darkdetect/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dataclass-factory/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dataprep-ml/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dctorch/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/debianbts/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/deep_merge/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/diffsync/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/django-google-analytics-app/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/django-ninja/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/django-simple-history/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/django-types/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-stubs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dns-lexicon/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dronecan/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dtw-python/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/remote_data.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ebooklib/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/esig/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/exitcode/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/expandvars/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/fastembed/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/fastparquet/version.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/flask-mysqldb/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/fschat/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/garth/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/gcsa/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/gitlike-commands/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/gradio/client.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/greynoise/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/html-tag-names/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/html-void-elements/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/hyperscan/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/iisignature/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/indexed-bzip2/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/indexed-gzip/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/indexed-zstd/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ipymarkup/default.nix rename third_party/nixpkgs/pkgs/development/python-modules/{jupyter_console => jupyter-console}/default.nix (86%) create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/kotsu/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/kotsu/disable-pytest-coverage-flags.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/langid/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/libpcap/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/liccheck/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/litellm/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/loqedapi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mando/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mandown/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/manifestoo-core/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/manifestoo/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/manuf/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/manuf/fix_manuf_url.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/manuf/internal_db_update_nix.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mcuuid/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mindsdb-evaluator/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/minichain/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mirakuru/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mobi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/molecule/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/molecule/plugins.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mrsqm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-ebs/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/natasha/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/navec/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/openllm-client/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/openllm-core/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/openllm/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/opentsne/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/orange-canvas-core/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/orange-widget-base/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/orange3/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/paddleocr/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/paddleocr/remove-import-imaug.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pdf2docx/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pkg-about/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pmdarima/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/podman/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/port-for/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/procmon-parser/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/proxy-db/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/psychrolib/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pulsectl-asyncio/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pybloom-live/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pybox2d/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pycardano/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pycatch22/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pydateinfer/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pydiscourse/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pydiscovergy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pydrawise/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyecoforest/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyenphase/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyfluidsynth/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pygobject-stubs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyhepmc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyinstaller-versionfile/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyixapi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pykalman/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pykalman/fix-masked-arrays-not-supported.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pykalman/fix-p311-issues.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyleri/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pymongo-inmemory/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyqt/4.x.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyqt5-stubs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyrender/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyruckus/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyside/apiextractor.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyside/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyside/gcc6.patch delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyside/generatorrunner.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyside/shiboken.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyside/shiboken_py35.patch delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyside/tools.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pysimplesoap/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pysimplesoap/stringIO.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytest-postgresql/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytest-reverse/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytest-spec/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python-hl7/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python-tds/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python-xz/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python-yate/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/python3-saml/skip-broken-tests.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytimeparse2/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pywaze/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyweatherflowudp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pywfa/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyxlsb/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyyardian/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/qasync/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/qpsolvers/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/qscintilla-qt4/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/qt-material/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/quandl/pandas2-datetime-removal.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/quantile-python/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/quaternion/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/radon/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/rapidgzip/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ratarmount/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ratarmountcore/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/razdel/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/rotary-embedding-torch/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/scikit-posthocs/0001-increased-abs-tolerance-for-wilcoxon-test.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/scikit-posthocs/0002-Update-test_posthocs.py.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/scikit-posthocs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/seasonal/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sentence-splitter/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/serverfiles/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/setuptools-odoo/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/shazamio/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/simple-websocket/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/simplemma/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/simplepush/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/slovnet/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/snaptime/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sqids/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/ssdpy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/stanio/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/stix2-patterns/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/subdownloader/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/svgelements/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tabcmd/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tbats/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/thelogrus/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tinyrecord/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tokentrim/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/treelib/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tsfresh/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tsfresh/remove-pyscaffold.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tsfresh/remove-pytest-coverage-flags.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/type-infer/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore-packages/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/types-aiobotocore/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/types-appdirs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/types-awscrt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/types-beautifulsoup4/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/types-docopt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/types-html5lib/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/types-mock/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/types-s3transfer/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/universal-silabs-flasher/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/urwid-mitmproxy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/vg/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/walrus/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/webrtc-noise-gain/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/wikipedia-api/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/wikitextparser/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/yargy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/zephyr-python-api/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/zxing_cpp/use-nixpkgs-pybind11.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/analysis/stylelint/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/analysis/valkyrie/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/biome/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/turtle-build/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/waf/hook.nix rename third_party/nixpkgs/pkgs/development/tools/build-managers/{wafHook => waf}/setup-hook.sh (66%) delete mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/wafHook/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/code-maat/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/container2wasm/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/database/atlas/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/djlint/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/ejs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/electron/.gitignore create mode 100644 third_party/nixpkgs/pkgs/development/tools/electron/common.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/electron/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/electron/info.json create mode 100755 third_party/nixpkgs/pkgs/development/tools/electron/update.py create mode 100644 third_party/nixpkgs/pkgs/development/tools/electron/version-old.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/electron/version.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/electron/wrapper.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/firebase-tools/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/fmbt/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gcov2lcov/default.nix create mode 100755 third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/GlamorousToolkit-GetImage create mode 100644 third_party/nixpkgs/pkgs/development/tools/glamoroustoolkit/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gqlint/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/hexo-cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/html-minifier/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/jake/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/jq/fix-tests-when-building-without-regex-supports.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/kdoctor/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/language-servers/dockerfile-language-server-nodejs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/language-servers/emmet-ls/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/language-servers/nls/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/development/tools/language-servers/perlnavigator/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/language-servers/postgres-lsp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/language-servers/rune-languageserver/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/language-servers/yaml-language-server/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/language-servers/yaml-language-server/package.json delete mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/ast-grep/default.nix delete mode 100755 third_party/nixpkgs/pkgs/development/tools/misc/nrf-command-line-tools/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/phpunit/composer.lock delete mode 100755 third_party/nixpkgs/pkgs/development/tools/misc/segger-jlink/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/terser/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/nest-cli/package-lock.json create mode 100644 third_party/nixpkgs/pkgs/development/tools/ocaml/opam-publish/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/oxlint/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json create mode 100644 third_party/nixpkgs/pkgs/development/tools/react-static/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/react-static/package.json create mode 100644 third_party/nixpkgs/pkgs/development/tools/redisinsight/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/redoc-cli/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/rome/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/rubyfmt/0001-cargo-lock-update-version.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-codspeed/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-run-bin/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/genemichaels/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/genemichaels/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/rtthost/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/spirv-tools/no-shared-libs.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/sqldef/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/surge-cli/default.nix rename third_party/nixpkgs/pkgs/{tools/backup/conserve => development/tools/worker-build}/Cargo.lock (56%) create mode 100644 third_party/nixpkgs/pkgs/development/web/nodejs/corepack.nix create mode 100644 third_party/nixpkgs/pkgs/development/web/nodejs/trap-handler-backport.patch rename third_party/nixpkgs/pkgs/games/anki/patches/{0001-Skip-formatting-python-code.patch => skip-formatting-python-code.patch} (85%) delete mode 100644 third_party/nixpkgs/pkgs/games/boohu/deps.nix delete mode 100644 third_party/nixpkgs/pkgs/games/empty-epsilon/0001-bundle-system-glm-in-seriousproton.patch create mode 100644 third_party/nixpkgs/pkgs/games/fallout-ce/build.nix create mode 100644 third_party/nixpkgs/pkgs/games/fallout-ce/fallout-ce.nix create mode 100644 third_party/nixpkgs/pkgs/games/fallout-ce/fallout2-ce.nix delete mode 100644 third_party/nixpkgs/pkgs/games/gambatte/default.nix delete mode 100644 third_party/nixpkgs/pkgs/games/instead-launcher/default.nix delete mode 100644 third_party/nixpkgs/pkgs/games/instead-launcher/path.patch delete mode 100644 third_party/nixpkgs/pkgs/games/klavaro/icons.patch delete mode 100644 third_party/nixpkgs/pkgs/games/klavaro/trans_lang_get_similar.patch create mode 100644 third_party/nixpkgs/pkgs/games/openarena/Makefile.local create mode 100644 third_party/nixpkgs/pkgs/games/r2modman/steam-launch-fix.patch delete mode 100644 third_party/nixpkgs/pkgs/games/robotfindskitten/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/srb2/thirdparty.patch delete mode 100644 third_party/nixpkgs/pkgs/games/tworld2/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/wipeout-rewrite/default.nix delete mode 100644 third_party/nixpkgs/pkgs/misc/dxvk/dxvk.nix create mode 100644 third_party/nixpkgs/pkgs/misc/jackaudio/tools.nix delete mode 100644 third_party/nixpkgs/pkgs/misc/platformsh/default.nix delete mode 100644 third_party/nixpkgs/pkgs/misc/vencord/disable-updater-ui.patch delete mode 100644 third_party/nixpkgs/pkgs/misc/vencord/replace-git.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/anbox/0001-NixOS-Use-anbox-from-PATH-in-desktop-files.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/anbox/postmarketos-image.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/audit/000-fix-static-attribute-malloc.diff delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/audit/001-ignore-flexible-array.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/decklink/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/eudev/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/evdi/0000-fix-drm-path.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/fw-ectool/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.1.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-6.4.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/kernel/mainline.nix create mode 100755 third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-mainline.py create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/bash/mksignames-flush.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gawk/common.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gawk/mes.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/2.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/4.6.cxx.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/8.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/latest.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/libstdc++-target.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gcc/no-system-headers.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/glibc/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gnumake/musl.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gnused/common.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gnused/mes.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gnutar/latest.nix rename third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gnutar/{default.nix => mes.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/gnutar/musl.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/musl/1.1.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/musl/always-flush.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/musl/common.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/musl/default.nix rename third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/{stage0-posix-x86.nix => mescc-tools-boot.nix} (67%) create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/stage0-posix/platforms.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/tinycc/ignore-duplicate-symbols.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/tinycc/ignore-static-inside-array.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/tinycc/musl.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/tinycc/static-link.patch delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/minimal-bootstrap/xz/stubs.h create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-bootctl-also-print-efi-files-not-owned-by-systemd-in.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/tailor-gui/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/tuxedo-rs/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/windows/dlfcn/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/windows/jom/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/apache-airflow/yarn.lock delete mode 100644 third_party/nixpkgs/pkgs/servers/apache-airflow/yarn.nix create mode 100644 third_party/nixpkgs/pkgs/servers/bililiverecorder/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/calibre-web/static_environ.patch create mode 100644 third_party/nixpkgs/pkgs/servers/deconz/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/etcd/3.3.nix create mode 100644 third_party/nixpkgs/pkgs/servers/ftp/uftpd/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/gotify/package.json delete mode 100644 third_party/nixpkgs/pkgs/servers/gotify/source-sha.nix delete mode 100755 third_party/nixpkgs/pkgs/servers/gotify/update.sh delete mode 100644 third_party/nixpkgs/pkgs/servers/gotify/vendor-sha.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/gotify/version.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/gotify/yarndeps.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/haste-server/node-composition.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/haste-server/node-deps.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/haste-server/node-env.nix delete mode 100755 third_party/nixpkgs/pkgs/servers/haste-server/update.sh create mode 100644 third_party/nixpkgs/pkgs/servers/knxd/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/mail/listmonk/yarn.lock delete mode 100644 third_party/nixpkgs/pkgs/servers/mail/listmonk/yarn.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/mastodon/version.nix create mode 100644 third_party/nixpkgs/pkgs/servers/mautrix-discord/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/mobilizon/common.nix create mode 100644 third_party/nixpkgs/pkgs/servers/mobilizon/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/mobilizon/frontend.nix create mode 100644 third_party/nixpkgs/pkgs/servers/mobilizon/mix.nix create mode 100644 third_party/nixpkgs/pkgs/servers/mobilizon/package.json delete mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-bot/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sabnzbd-exporter.nix create mode 100644 third_party/nixpkgs/pkgs/servers/nosql/influxdb2/no-deny-warnings.patch create mode 100644 third_party/nixpkgs/pkgs/servers/nosql/influxdb2/provision.nix create mode 100644 third_party/nixpkgs/pkgs/servers/nosql/influxdb2/token-manipulator.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/pocketbase/remove-update-method.patch create mode 100644 third_party/nixpkgs/pkgs/servers/sql/mariadb/connector-c/3_3.nix create mode 100644 third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgsql-http.nix create mode 100644 third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/disable-normalize_exec_path.patch create mode 100644 third_party/nixpkgs/pkgs/servers/stone/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/teleport/13/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/servers/teleport/13/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/teleport/14/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/servers/teleport/14/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/teleport/tsh_14.patch create mode 100644 third_party/nixpkgs/pkgs/servers/unstructured-api/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/discourse/assets_esbuild_from_path.patch delete mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/discourse/rubyEnv/sass-embedded-static.patch rename third_party/nixpkgs/pkgs/servers/web-apps/matomo/{change-path-geoip2.patch => change-path-geoip2-4.x.patch} (85%) create mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/matomo/change-path-geoip2-5.x.patch create mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/meme-bingo-web/default.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/outline/yarn.lock delete mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/outline/yarn.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/plausible/package.json delete mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/plausible/yarn.lock delete mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/plausible/yarn.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/slskd/package-lock.patch delete mode 100755 third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/generate.sh delete mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.json delete mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.nix create mode 100644 third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix delete mode 100644 third_party/nixpkgs/pkgs/shells/pash/default.nix delete mode 100755 third_party/nixpkgs/pkgs/shells/powershell/getHashes.sh rename third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/{aarch64.nix => aarch64-unknown-linux-gnu.nix} (100%) rename third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/{aarch64-musl.nix => aarch64-unknown-linux-musl.nix} (100%) rename third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/{armv5tel.nix => armv5tel-unknown-linux-gnueabi.nix} (100%) rename third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/{armv6l.nix => armv6l-unknown-linux-gnueabihf.nix} (100%) rename third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/{armv6l-musl.nix => armv6l-unknown-linux-musleabihf.nix} (100%) rename third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/{armv7l.nix => armv7l-unknown-linux-gnueabihf.nix} (100%) rename third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/{i686.nix => i686-unknown-linux-gnu.nix} (100%) delete mode 100644 third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/loongson2f.nix rename third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/{mips64el.nix => mips64el-unknown-linux-gnuabi64.nix} (100%) rename third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/{mips64el-n32.nix => mips64el-unknown-linux-gnuabin32.nix} (100%) rename third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/{mipsel.nix => mipsel-unknown-linux-gnu.nix} (100%) rename third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/{powerpc64le.nix => powerpc64le-unknown-linux-gnu.nix} (100%) rename third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/{riscv64.nix => riscv64-unknown-linux-gnu.nix} (100%) rename third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/{x86_64.nix => x86_64-unknown-linux-gnu.nix} (88%) rename third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/{x86_64-musl.nix => x86_64-unknown-linux-musl.nix} (100%) create mode 100644 third_party/nixpkgs/pkgs/test/cc-wrapper/fortify1-example.c create mode 100644 third_party/nixpkgs/pkgs/test/cc-wrapper/fortify2-example.c create mode 100644 third_party/nixpkgs/pkgs/test/cc-wrapper/fortify3-example.c create mode 100644 third_party/nixpkgs/pkgs/test/cc-wrapper/hardening.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/.envrc create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/.gitignore rename third_party/nixpkgs/pkgs/{applications/misc/mission-center/proxy-Cargo.lock => test/nixpkgs-check-by-name/Cargo.lock} (52%) create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/Cargo.toml create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/README.md create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/shell.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/eval.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/eval.rs create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/main.rs create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/references.rs create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/structure.rs create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/src/utils.rs create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/broken-autocall/pkgs/by-name/fo/foo/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/incorrect-shard/pkgs/by-name/aa/FOO/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-package-name/pkgs/by-name/fo/fo@/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/pkgs/by-name/A/A/.git-keep create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/invalid-shard-name/pkgs/by-name/A/A/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/missing-package-nix/pkgs/by-name/fo/foo/.git-keep create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/mock-nixpkgs.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/no-by-name/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-attrs/pkgs/by-name/no/nonDerivation/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/non-derivation/pkgs/by-name/no/nonDerivation/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/one-letter/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/one-letter/pkgs/by-name/a/a/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/all-packages.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/pkgs/by-name/no/nonDerivation/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-different-file/someDrv.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/all-packages.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-call-package/pkgs/by-name/no/nonDerivation/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/all-packages.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/override-no-file/pkgs/by-name/no/nonDerivation/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-dir-is-file/pkgs/by-name/fo/foo create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/package-nix-dir/pkgs/by-name/fo/foo/package.nix/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-absolute/pkgs/by-name/aa/aa/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-escape/pkgs/by-name/aa/aa/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-nix-path/pkgs/by-name/aa/aa/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/pkgs/by-name/aa/aa/invalid.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-parse-failure/pkgs/by-name/aa/aa/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-path-subexpr/pkgs/by-name/aa/aa/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/dir/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/file create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/file.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/ref-success/pkgs/by-name/aa/aa/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/shard-file/pkgs/by-name/fo create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/success/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/success/pkgs/by-name/fo/foo/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/expected create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/pkgs/by-name/fo/foo/package.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-escape/someDrv.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/default.nix create mode 100644 third_party/nixpkgs/pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/expected create mode 100644 third_party/nixpkgs/pkgs/test/top-level/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/X11/gobble/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/X11/sbs/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/admin/itamae/Gemfile create mode 100644 third_party/nixpkgs/pkgs/tools/admin/itamae/Gemfile.lock create mode 100644 third_party/nixpkgs/pkgs/tools/admin/itamae/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/admin/itamae/gemset.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/admin/manta/package-lock.json delete mode 100644 third_party/nixpkgs/pkgs/tools/admin/manta/source.json delete mode 100755 third_party/nixpkgs/pkgs/tools/admin/manta/update.sh delete mode 100644 third_party/nixpkgs/pkgs/tools/admin/meshcentral/yarn.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/admin/synapse-admin/yarn.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/archivers/7zz/fix-build-on-darwin.patch create mode 100644 third_party/nixpkgs/pkgs/tools/archivers/7zz/fix-empty-expr-stmt.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/audio/acoustid-fingerprinter/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/audio/bark/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/audio/dl-librescore/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/audio/shaq/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/audio/wyoming/openwakeword.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/bluetooth/nrfconnect/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/cd-dvd/ecm-tools/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/compression/asar/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/compression/asar/package.json create mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/suse-bug-580609.patch create mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/curlftpfs/suse-bug-955687.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/irods/irods_root_path.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/irods/zmqcpp-deprecated-send_recv.patch create mode 100644 third_party/nixpkgs/pkgs/tools/games/minecraft/mcaselector/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/games/pocket-updater-utility/add-runtime-identifier.patch create mode 100644 third_party/nixpkgs/pkgs/tools/games/pocket-updater-utility/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/games/pocket-updater-utility/deps.nix create mode 100644 third_party/nixpkgs/pkgs/tools/games/ps3iso-utils/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/graphics/epstool/gcc43.patch create mode 100644 third_party/nixpkgs/pkgs/tools/graphics/plotutils/c++17-register-usage-fix.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/graphics/puppeteer-cli/package.json delete mode 100644 third_party/nixpkgs/pkgs/tools/graphics/puppeteer-cli/yarn.lock delete mode 100644 third_party/nixpkgs/pkgs/tools/graphics/puppeteer-cli/yarn.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/graphics/structure-synth/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/graphics/structure-synth/gcc47.patch create mode 100644 third_party/nixpkgs/pkgs/tools/graphics/termimage/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/sources.nix create mode 100755 third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/update.sh create mode 100755 third_party/nixpkgs/pkgs/tools/graphics/vulkan-cts/vk-cts-sources.py create mode 100644 third_party/nixpkgs/pkgs/tools/graphics/vulkan-helper/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/add-missing-macro-definition.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/skip-qnx-extension.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/inputmethods/ibus/ibus-qt.nix create mode 100644 third_party/nixpkgs/pkgs/tools/llm/heygpt/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/llm/open-interpreter/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/backdown/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/btc-rpc-explorer/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/citron/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/clubhouse-cli/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/debianutils/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/diffoci/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/diffoscope/fix-test_fit.patch create mode 100644 third_party/nixpkgs/pkgs/tools/misc/djenrandom/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/domine/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/domine/pubspec.lock create mode 100644 third_party/nixpkgs/pkgs/tools/misc/dtool/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/exa/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/file/32-bit-time_t.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/file/pyzip.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/fuc/add_missing_feature.patch create mode 100644 third_party/nixpkgs/pkgs/tools/misc/gradescope-submit/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/hsd/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/hyperpotamus/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/less/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/moon-phases/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/near-cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/near-cli/package.json create mode 100644 third_party/nixpkgs/pkgs/tools/misc/node-glob/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/pb/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/pricehist/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/rot8/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/seaborn-data/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/sharedown/yarndeps.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/slingshot/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/srisum/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/timetagger_cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/timidity/configure-compat.patch create mode 100644 third_party/nixpkgs/pkgs/tools/misc/urlencode/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/vector/rust-1.71-unnecessary-mut.diff create mode 100644 third_party/nixpkgs/pkgs/tools/misc/vsc-leetcode-cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/zf/deps.nix rename third_party/nixpkgs/pkgs/tools/{misc/wasm-tools => networking/bandwhich}/Cargo.lock (58%) delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/bandwhich/update-socket2-for-rust-1.64.diff create mode 100644 third_party/nixpkgs/pkgs/tools/networking/cfspeedtest/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/connman/connman/create-libppp-compat.h.patch rename third_party/nixpkgs/pkgs/tools/networking/{dnscrypt-proxy2 => dnscrypt-proxy}/default.nix (91%) create mode 100644 third_party/nixpkgs/pkgs/tools/networking/graphqurl/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/iouyap/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/maubot/allow-building-plugins-from-nix-store.patch create mode 100644 third_party/nixpkgs/pkgs/tools/networking/maubot/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/narrowlink/Cargo.lock.patch create mode 100644 third_party/nixpkgs/pkgs/tools/networking/narrowlink/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/ntpd-rs/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/pgrok/build-deps/package.json create mode 100755 third_party/nixpkgs/pkgs/tools/networking/pgrok/update.sh create mode 100644 third_party/nixpkgs/pkgs/tools/networking/pgrok/web.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/qcard/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/rosenpass/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/ssl-proxy/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/nix/fh/default.nix rename third_party/nixpkgs/pkgs/tools/nix/nix-init/{get-nix-license.nix => get_nix_license.nix} (97%) create mode 100644 third_party/nixpkgs/pkgs/tools/package-management/npm-check-updates/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/biscuit-cli/version-0.4.0.patch create mode 100644 third_party/nixpkgs/pkgs/tools/security/der-ascii/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/earlybird/fix-go.mod-dependency.patch create mode 100644 third_party/nixpkgs/pkgs/tools/security/holehe/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/hstsparser/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/imdshift/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/kepler/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/knowsmore/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/mfoc-hardnested/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/nbtscanner/Cargo.lock.patch create mode 100644 third_party/nixpkgs/pkgs/tools/security/nitrokey-app2/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/omapd/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/omapd/zlib.patch create mode 100644 third_party/nixpkgs/pkgs/tools/security/rblake2sum/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/sirikali/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/steamguard-cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/sudo-rs/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/security/super/0001-Remove-references-to-dropped-sys_nerr-sys_errlist-fo.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/security/super/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/weggli/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/system/auto-cpufreq/prevent-update.patch create mode 100644 third_party/nixpkgs/pkgs/tools/system/hddfancontrol/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/markdownlint-cli2/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/math-review/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/text/nawk/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/text/platinum-searcher/deps.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/yx/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/typesetting/carbon-now-cli/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/typesetting/marp/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/typesetting/tex/catdvi/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/setup-hook.sh create mode 100644 third_party/nixpkgs/pkgs/tools/typesetting/tex/texlive/tlpdb-overrides.nix create mode 100644 third_party/nixpkgs/pkgs/tools/video/blackmagic-desktop-video/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/0002-Add-Udhcpc-support.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/wayland/shotman/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/tools/wayland/stacktile/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/wayland/wleave/default.nix create mode 100644 third_party/nixpkgs/pkgs/top-level/by-name-overlay.nix diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index ba5bf4eef2..ea2da0a5fe 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -23,23 +23,25 @@ # Libraries /lib @edolstra @infinisil -/lib/systems @alyssais @ericson2314 @matthewbauer @amjoseph-nixpkgs +/lib/systems @alyssais @ericson2314 @amjoseph-nixpkgs /lib/generators.nix @edolstra @Profpatsch /lib/cli.nix @edolstra @Profpatsch /lib/debug.nix @edolstra @Profpatsch /lib/asserts.nix @edolstra @Profpatsch /lib/path.* @infinisil @fricklerhandwerk +/lib/fileset @infinisil +/doc/functions/fileset.section.md @infinisil # Nixpkgs Internals /default.nix @Ericson2314 /pkgs/top-level/default.nix @Ericson2314 /pkgs/top-level/impure.nix @Ericson2314 -/pkgs/top-level/stage.nix @Ericson2314 @matthewbauer -/pkgs/top-level/splice.nix @Ericson2314 @matthewbauer -/pkgs/top-level/release-cross.nix @Ericson2314 @matthewbauer -/pkgs/stdenv/generic @Ericson2314 @matthewbauer @amjoseph-nixpkgs -/pkgs/stdenv/generic/check-meta.nix @Ericson2314 @matthewbauer @piegamesde -/pkgs/stdenv/cross @Ericson2314 @matthewbauer @amjoseph-nixpkgs +/pkgs/top-level/stage.nix @Ericson2314 +/pkgs/top-level/splice.nix @Ericson2314 +/pkgs/top-level/release-cross.nix @Ericson2314 +/pkgs/stdenv/generic @Ericson2314 @amjoseph-nixpkgs +/pkgs/stdenv/generic/check-meta.nix @Ericson2314 @piegamesde +/pkgs/stdenv/cross @Ericson2314 @amjoseph-nixpkgs /pkgs/build-support/cc-wrapper @Ericson2314 @amjoseph-nixpkgs /pkgs/build-support/bintools-wrapper @Ericson2314 /pkgs/build-support/setup-hooks @Ericson2314 @@ -47,6 +49,12 @@ /pkgs/build-support/setup-hooks/auto-patchelf.py @layus /pkgs/pkgs-lib @infinisil +# pkgs/by-name +/pkgs/test/nixpkgs-check-by-name @infinisil +/pkgs/by-name/README.md @infinisil +/pkgs/top-level/by-name-overlay.nix @infinisil +/.github/workflows/check-by-name.nix @infinisil + # Nixpkgs build-support /pkgs/build-support/writers @lassulus @Profpatsch @@ -93,6 +101,10 @@ /nixos/lib/systemd-*.nix @NixOS/systemd /pkgs/os-specific/linux/systemd @NixOS/systemd +# Images and installer media +/nixos/modules/installer/cd-dvd/ @samueldr +/nixos/modules/installer/sd-card/ @samueldr + # Updaters ## update.nix /maintainers/scripts/update.nix @jtojnar @@ -135,12 +147,8 @@ /doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda # C compilers -/pkgs/development/compilers/gcc @matthewbauer @amjoseph-nixpkgs -/pkgs/development/compilers/llvm @matthewbauer @RaitoBezarius - -# Compatibility stuff -/pkgs/top-level/unix-tools.nix @matthewbauer -/pkgs/development/tools/xcbuild @matthewbauer +/pkgs/development/compilers/gcc @amjoseph-nixpkgs +/pkgs/development/compilers/llvm @RaitoBezarius # Audio /nixos/modules/services/audio/botamusique.nix @mweinelt @@ -245,7 +253,8 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt # PHP interpreter, packages, extensions, tests and documentation /doc/languages-frameworks/php.section.md @aanderse @drupol @etu @globin @ma27 @talyz /nixos/tests/php @aanderse @drupol @etu @globin @ma27 @talyz -/pkgs/build-support/build-pecl.nix @aanderse @drupol @etu @globin @ma27 @talyz +/pkgs/build-support/php/build-pecl.nix @aanderse @drupol @etu @globin @ma27 @talyz +/pkgs/build-support/php @drupol @etu /pkgs/development/interpreters/php @jtojnar @aanderse @drupol @etu @globin @ma27 @talyz /pkgs/development/php-packages @aanderse @drupol @etu @globin @ma27 @talyz /pkgs/top-level/php-packages.nix @jtojnar @aanderse @drupol @etu @globin @ma27 @talyz @@ -293,6 +302,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /nixos/modules/services/misc/matrix-conduit.nix @piegamesde /nixos/tests/matrix-conduit.nix @piegamesde +# Forgejo +nixos/modules/services/misc/forgejo.nix @bendlas @emilylange +pkgs/applications/version-management/forgejo @bendlas @emilylange + # Dotnet /pkgs/build-support/dotnet @IvarWithoutBones /pkgs/development/compilers/dotnet @IvarWithoutBones diff --git a/third_party/nixpkgs/.github/workflows/backport.yml b/third_party/nixpkgs/.github/workflows/backport.yml index 81fc5306fe..d174203238 100644 --- a/third_party/nixpkgs/.github/workflows/backport.yml +++ b/third_party/nixpkgs/.github/workflows/backport.yml @@ -20,7 +20,7 @@ jobs: if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - name: Create backport PRs @@ -31,5 +31,5 @@ jobs: pull_description: |- Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}. - * [ ] Before merging, ensure that this backport complies with the [Criteria for Backporting](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#criteria-for-backporting-changes). - * Even as a non-commiter, if you find that it does not comply, leave a comment. + * [ ] Before merging, ensure that this backport is [acceptable for the release](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-acceptable-for-releases). + * Even as a non-commiter, if you find that it is not acceptable, leave a comment. diff --git a/third_party/nixpkgs/.github/workflows/basic-eval.yml b/third_party/nixpkgs/.github/workflows/basic-eval.yml index 272447ecee..9eb5efabc3 100644 --- a/third_party/nixpkgs/.github/workflows/basic-eval.yml +++ b/third_party/nixpkgs/.github/workflows/basic-eval.yml @@ -18,8 +18,8 @@ jobs: runs-on: ubuntu-latest # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v23 - uses: cachix/cachix-action@v12 with: # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere. diff --git a/third_party/nixpkgs/.github/workflows/check-by-name.yml b/third_party/nixpkgs/.github/workflows/check-by-name.yml new file mode 100644 index 0000000000..90ab843839 --- /dev/null +++ b/third_party/nixpkgs/.github/workflows/check-by-name.yml @@ -0,0 +1,151 @@ +# Checks pkgs/by-name (see pkgs/by-name/README.md) +# using the nixpkgs-check-by-name tool (see pkgs/test/nixpkgs-check-by-name) +name: Check pkgs/by-name + +# The pre-built tool is fetched from a channel, +# making it work predictable on all PRs. +on: + # Using pull_request_target instead of pull_request avoids having to approve first time contributors + pull_request_target + +# The tool doesn't need any permissions, it only outputs success or not based on the checkout +permissions: {} + +jobs: + check: + # This is x86_64-linux, for which the tool is always prebuilt on the nixos-* channels, + # as specified in nixos/release-combined.nix + runs-on: ubuntu-latest + steps: + - name: Resolving the merge commit + run: | + if result=$(git ls-remote --exit-code ${{ github.event.pull_request.base.repo.clone_url }} refs/pull/${{ github.event.pull_request.number }}/merge); then + mergedSha=$(cut -f1 <<< "$result") + echo "The PR appears to not have any conflicts, checking the merge commit $mergedSha" + else + echo "The PR may have a merge conflict" + exit 1 + fi + echo "mergedSha=$mergedSha" >> "$GITHUB_ENV" + - uses: actions/checkout@v4 + with: + # pull_request_target checks out the base branch by default + ref: ${{ env.mergedSha }} + # Fetches the merge commit and its parents + fetch-depth: 2 + - name: Determining PR git hashes + run: | + # For pull_request_target this is the same as $GITHUB_SHA + echo "baseSha=$(git rev-parse HEAD^1)" >> "$GITHUB_ENV" + + echo "headSha=$(git rev-parse HEAD^2)" >> "$GITHUB_ENV" + - uses: cachix/install-nix-action@v23 + - name: Determining channel to use for dependencies + run: | + echo "Determining which channel to use for PR base branch $GITHUB_BASE_REF" + if [[ "$GITHUB_BASE_REF" =~ ^(release|staging|staging-next)-([0-9][0-9]\.[0-9][0-9])$ ]]; then + # Use the release channel for all PRs to release-XX.YY, staging-XX.YY and staging-next-XX.YY + channel=nixos-${BASH_REMATCH[2]} + echo "PR is for a release branch, using release channel $channel" + else + # Use the nixos-unstable channel for all other PRs + channel=nixos-unstable + echo "PR is for a non-release branch, using unstable channel $channel" + fi + echo "channel=$channel" >> "$GITHUB_ENV" + - name: Fetching latest version of channel + run: | + echo "Fetching latest version of channel $channel" + # This is probably the easiest way to get Nix to output the path to a downloaded channel! + nixpkgs=$(nix-instantiate --find-file nixpkgs -I nixpkgs=channel:"$channel") + # This file only exists in channels + rev=$(<"$nixpkgs"/.git-revision) + echo "Channel $channel is at revision $rev" + echo "nixpkgs=$nixpkgs" >> "$GITHUB_ENV" + echo "rev=$rev" >> "$GITHUB_ENV" + - name: Fetching pre-built nixpkgs-check-by-name from the channel + run: | + echo "Fetching pre-built nixpkgs-check-by-name from channel $channel at revision $rev" + # Passing --max-jobs 0 makes sure that we won't build anything + nix-build "$nixpkgs" -A tests.nixpkgs-check-by-name --max-jobs 0 + - name: Running nixpkgs-check-by-name + run: | + echo "Checking whether the check succeeds on the base branch $GITHUB_BASE_REF" + git checkout -q "$baseSha" + if baseOutput=$(result/bin/nixpkgs-check-by-name . 2>&1); then + baseSuccess=1 + else + baseSuccess= + fi + printf "%s\n" "$baseOutput" + + echo "Checking whether the check would succeed after merging this pull request" + git checkout -q "$mergedSha" + if mergedOutput=$(result/bin/nixpkgs-check-by-name . 2>&1); then + mergedSuccess=1 + exitCode=0 + else + mergedSuccess= + exitCode=1 + fi + printf "%s\n" "$mergedOutput" + + resultToEmoji() { + if [[ -n "$1" ]]; then + echo ":heavy_check_mark:" + else + echo ":x:" + fi + } + + # Print a markdown summary in GitHub actions + { + echo "| Nixpkgs version | Check result |" + echo "| --- | --- |" + echo "| Latest base commit | $(resultToEmoji "$baseSuccess") |" + echo "| After merging this PR | $(resultToEmoji "$mergedSuccess") |" + echo "" + + if [[ -n "$baseSuccess" ]]; then + if [[ -n "$mergedSuccess" ]]; then + echo "The check succeeds on both the base branch and after merging this PR" + else + echo "The check succeeds on the base branch, but would fail after merging this PR:" + echo "\`\`\`" + echo "$mergedOutput" + echo "\`\`\`" + echo "" + fi + else + if [[ -n "$mergedSuccess" ]]; then + echo "The check fails on the base branch, but this PR fixes it, nicely done!" + else + echo "The check fails on both the base branch and after merging this PR, unknown if only this PRs changes would satisfy the check, the base branch needs to be fixed first." + echo "" + echo "Failure on the base branch:" + echo "\`\`\`" + echo "$baseOutput" + echo "\`\`\`" + echo "" + echo "Failure after merging this PR:" + echo "\`\`\`" + echo "$mergedOutput" + echo "\`\`\`" + echo "" + fi + fi + + echo "### Details" + echo "- nixpkgs-check-by-name tool:" + echo " - Channel: $channel" + echo " - Nixpkgs commit: [$rev](https://github.com/${GITHUB_REPOSITORY}/commit/$rev)" + echo " - Store path: \`$(realpath result)\`" + echo "- Tested Nixpkgs:" + echo " - Base branch: $GITHUB_BASE_REF" + echo " - Latest base branch commit: [$baseSha](https://github.com/${GITHUB_REPOSITORY}/commit/$baseSha)" + echo " - Latest PR commit: [$headSha](https://github.com/${GITHUB_REPOSITORY}/commit/$headSha)" + echo " - Merge commit: [$mergedSha](https://github.com/${GITHUB_REPOSITORY}/commit/$mergedSha)" + } >> "$GITHUB_STEP_SUMMARY" + + exit "$exitCode" + diff --git a/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml b/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml index 652ddd0749..d399951f65 100644 --- a/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml +++ b/third_party/nixpkgs/.github/workflows/check-maintainers-sorted.yaml @@ -12,11 +12,11 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/third_party/nixpkgs/.github/workflows/editorconfig.yml b/third_party/nixpkgs/.github/workflows/editorconfig.yml index e72f706def..b5c3c7fd95 100644 --- a/third_party/nixpkgs/.github/workflows/editorconfig.yml +++ b/third_party/nixpkgs/.github/workflows/editorconfig.yml @@ -24,11 +24,11 @@ jobs: - name: print list of changed files run: | cat "$HOME/changed_files" - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: # nixpkgs commit is pinned so that it doesn't break # editorconfig-checker 2.4.0 diff --git a/third_party/nixpkgs/.github/workflows/manual-nixos.yml b/third_party/nixpkgs/.github/workflows/manual-nixos.yml index 9862d8d724..6be47caf27 100644 --- a/third_party/nixpkgs/.github/workflows/manual-nixos.yml +++ b/third_party/nixpkgs/.github/workflows/manual-nixos.yml @@ -14,11 +14,11 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml b/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml index 812907ab84..f148aee076 100644 --- a/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml +++ b/third_party/nixpkgs/.github/workflows/manual-nixpkgs.yml @@ -15,11 +15,11 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'NixOS' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # pull_request_target checks out the base branch by default ref: refs/pull/${{ github.event.pull_request.number }}/merge - - uses: cachix/install-nix-action@v22 + - uses: cachix/install-nix-action@v23 with: # explicitly enable sandbox extra_nix_config: sandbox = true diff --git a/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml b/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml index abfb51244f..32c32397dc 100644 --- a/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml +++ b/third_party/nixpkgs/.github/workflows/periodic-merge-24h.yml @@ -40,7 +40,7 @@ jobs: into: staging-23.05 name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@1.4.0 diff --git a/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml b/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml index 300c418054..687c1b99ad 100644 --- a/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml +++ b/third_party/nixpkgs/.github/workflows/periodic-merge-6h.yml @@ -38,7 +38,7 @@ jobs: into: staging name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }} uses: devmasx/merge-branch@1.4.0 diff --git a/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml b/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml index e7767dbffa..5aa1693bc9 100644 --- a/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml +++ b/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml @@ -1,8 +1,8 @@ name: "Update terraform-providers" on: - schedule: - - cron: "0 3 * * *" + #schedule: + # - cron: "0 3 * * *" workflow_dispatch: permissions: @@ -16,8 +16,8 @@ jobs: if: github.repository_owner == 'NixOS' && github.ref == 'refs/heads/master' # ensure workflow_dispatch only runs on master runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: cachix/install-nix-action@v22 + - uses: actions/checkout@v4 + - uses: cachix/install-nix-action@v23 with: nix_path: nixpkgs=channel:nixpkgs-unstable - name: setup diff --git a/third_party/nixpkgs/.gitignore b/third_party/nixpkgs/.gitignore index b23460ec91..f0807473f0 100644 --- a/third_party/nixpkgs/.gitignore +++ b/third_party/nixpkgs/.gitignore @@ -5,6 +5,7 @@ .\#* \#*\# .idea/ +.nixos-test-history .vscode/ outputs/ result-* diff --git a/third_party/nixpkgs/CONTRIBUTING.md b/third_party/nixpkgs/CONTRIBUTING.md index 2d3f274847..e30a4bb0f9 100644 --- a/third_party/nixpkgs/CONTRIBUTING.md +++ b/third_party/nixpkgs/CONTRIBUTING.md @@ -129,7 +129,7 @@ When a PR is created, it will be pre-populated with some checkboxes detailed bel #### Tested using sandboxing -When sandbox builds are enabled, Nix will setup an isolated environment for each build process. It is used to remove further hidden dependencies set by the build environment to improve reproducibility. This includes access to the network during the build outside of `fetch*` functions and files outside the Nix store. Depending on the operating system access to other resources are blocked as well (ex. inter process communication is isolated on Linux); see [sandbox](https://nixos.org/nix/manual/#conf-sandbox) in Nix manual for details. +When sandbox builds are enabled, Nix will setup an isolated environment for each build process. It is used to remove further hidden dependencies set by the build environment to improve reproducibility. This includes access to the network during the build outside of `fetch*` functions and files outside the Nix store. Depending on the operating system access to other resources are blocked as well (ex. inter process communication is isolated on Linux); see [sandbox](https://nixos.org/manual/nix/stable/command-ref/conf-file#conf-sandbox) in the Nix manual for details. Sandboxing is not enabled by default in Nix due to a small performance hit on each build. In pull requests for [nixpkgs](https://github.com/NixOS/nixpkgs/) people are asked to test builds with sandboxing enabled (see `Tested using sandboxing` in the pull request template) because in [Hydra](https://nixos.org/hydra/) sandboxing is also used. @@ -483,17 +483,17 @@ The oldest supported release (`YYMM`) can be found using nix-instantiate --eval -A lib.trivial.oldestSupportedRelease ``` -The release branches should generally not receive any breaking changes, both for the Nix expressions and derivations. -So these changes are acceptable to backport: -- New packages, modules and functions -- Security fixes -- Package version updates - - Patch versions with fixes - - Minor versions with new functionality, but no breaking changes +The release branches should generally only receive backwards-compatible changes, both for the Nix expressions and derivations. +Here are some examples of backwards-compatible changes that are okay to backport: +- ✔️ New packages, modules and functions +- ✔️ Security fixes +- ✔️ Package version updates + - ✔️ Patch versions with fixes + - ✔️ Minor versions with new functionality, but no breaking changes In addition, major package version updates with breaking changes are also acceptable for: -- Services that would fail without up-to-date client software, such as `spotify`, `steam`, and `discord` -- Security critical applications, such as `firefox` and `chromium` +- ✔️ Services that would fail without up-to-date client software, such as `spotify`, `steam`, and `discord` +- ✔️ Security critical applications, such as `firefox` and `chromium` ### Changes causing mass rebuilds [mass-rebuild]: #changes-causing-mass-rebuilds @@ -535,6 +535,11 @@ To get a sense for what changes are considered mass rebuilds, see [previously me The old config generation system used impure shell scripts and could break in specific circumstances (see #1234). + When adding yourself as maintainer, in the same pull request, make a separate + commit with the message `maintainers: add `. + Add the commit before those making changes to the package or module. + See [Nixpkgs Maintainers](../maintainers/README.md) for details. + ### Writing good commit messages In addition to writing properly formatted commit messages, it's important to include relevant information so other developers can later understand *why* a change was made. While this information usually can be found by digging code, mailing list/Discourse archives, pull request discussions or upstream changes, it may require a lot of work. diff --git a/third_party/nixpkgs/doc/builders/fetchers.chapter.md b/third_party/nixpkgs/doc/builders/fetchers.chapter.md index 4d4f3f427c..75a261db8d 100644 --- a/third_party/nixpkgs/doc/builders/fetchers.chapter.md +++ b/third_party/nixpkgs/doc/builders/fetchers.chapter.md @@ -82,6 +82,53 @@ Note that because the checksum is computed after applying these effects, using o Most other fetchers return a directory rather than a single file. + +## `fetchDebianPatch` {#fetchdebianpatch} + +A wrapper around `fetchpatch`, which takes: +- `patch` and `hash`: the patch's filename, + and its hash after normalization by `fetchpatch` ; +- `pname`: the Debian source package's name ; +- `version`: the upstream version number ; +- `debianRevision`: the [Debian revision number] if applicable ; +- the `area` of the Debian archive: `main` (default), `contrib`, or `non-free`. + +Here is an example of `fetchDebianPatch` in action: + +```nix +{ lib +, fetchDebianPatch +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "pysimplesoap"; + version = "1.16.2"; + src = ...; + + patches = [ + (fetchDebianPatch { + inherit pname version; + debianRevision = "5"; + name = "Add-quotes-to-SOAPAction-header-in-SoapClient.patch"; + hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0="; + }) + ]; + + ... +} +``` + +Patches are fetched from `sources.debian.org`, and so must come from a +package version that was uploaded to the Debian archive. Packages may +be removed from there once that specific version isn't in any suite +anymore (stable, testing, unstable, etc.), so maintainers should use +`copy-tarballs.pl` to archive the patch if it needs to be available +longer-term. + +[Debian revision number]: https://www.debian.org/doc/debian-policy/ch-controlfields.html#version + + ## `fetchsvn` {#fetchsvn} Used with Subversion. Expects `url` to a Subversion directory, `rev`, and `hash`. @@ -181,7 +228,7 @@ Otherwise, the builder will run, but fail with a message explaining to the user requireFile { name = "jdk-${version}_linux-x64_bin.tar.gz"; url = "https://www.oracle.com/java/technologies/javase-jdk11-downloads.html"; - sha256 = "94bd34f85ee38d3ef59e5289ec7450b9443b924c55625661fffe66b03f2c8de2"; + hash = "sha256-lL00+F7jjT71nlKJ7HRQuUQ7kkxVYlZh//5msD8sjeI="; } ``` results in this error message: diff --git a/third_party/nixpkgs/doc/builders/packages/emacs.section.md b/third_party/nixpkgs/doc/builders/packages/emacs.section.md index d46f890858..c50c781553 100644 --- a/third_party/nixpkgs/doc/builders/packages/emacs.section.md +++ b/third_party/nixpkgs/doc/builders/packages/emacs.section.md @@ -26,10 +26,6 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t { packageOverrides = pkgs: with pkgs; rec { myEmacsConfig = writeText "default.el" '' - ;; initialize package - - (require 'package) - (package-initialize 'noactivate) (eval-when-compile (require 'use-package)) @@ -103,7 +99,7 @@ You can install it like any other packages via `nix-env -iA myEmacs`. However, t This provides a fairly full Emacs start file. It will load in addition to the user's personal config. You can always disable it by passing `-q` to the Emacs command. -Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to Melpa Unstable, and the highest for packages manually defined in `pkgs/top-level/emacs-packages.nix`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope`. +Sometimes `emacs.pkgs.withPackages` is not enough, as this package set has some priorities imposed on packages (with the lowest priority assigned to GNU-devel ELPA, and the highest for packages manually defined in `pkgs/applications/editors/emacs/elisp-packages/manual-packages`). But you can't control these priorities when some package is installed as a dependency. You can override it on a per-package-basis, providing all the required dependencies manually, but it's tedious and there is always a possibility that an unwanted dependency will sneak in through some other package. To completely override such a package, you can use `overrideScope`. ```nix overrides = self: super: rec { diff --git a/third_party/nixpkgs/doc/builders/packages/ibus.section.md b/third_party/nixpkgs/doc/builders/packages/ibus.section.md index 4eb74c0b69..817e55d56f 100644 --- a/third_party/nixpkgs/doc/builders/packages/ibus.section.md +++ b/third_party/nixpkgs/doc/builders/packages/ibus.section.md @@ -29,12 +29,12 @@ _Note: each language passed to `langs` must be an attribute name in `pkgs.hunspe ## Built-in emoji picker {#sec-ibus-typing-booster-emoji-picker} -The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-emoji` is needed: +The `ibus-engines.typing-booster` package contains a program named `emoji-picker`. To display all emojis correctly, a special font such as `noto-fonts-color-emoji` is needed: On NixOS, it can be installed using the following expression: ```nix { pkgs, ... }: { - fonts.packages = with pkgs; [ noto-fonts-emoji ]; + fonts.packages = with pkgs; [ noto-fonts-color-emoji ]; } ``` diff --git a/third_party/nixpkgs/doc/builders/trivial-builders.chapter.md b/third_party/nixpkgs/doc/builders/trivial-builders.chapter.md index c05511785b..2cb1f2debc 100644 --- a/third_party/nixpkgs/doc/builders/trivial-builders.chapter.md +++ b/third_party/nixpkgs/doc/builders/trivial-builders.chapter.md @@ -4,9 +4,25 @@ Nixpkgs provides a couple of functions that help with building derivations. The ## `runCommand` {#trivial-builder-runCommand} -This takes three arguments, `name`, `env`, and `buildCommand`. `name` is just the name that Nix will append to the store path in the same way that `stdenv.mkDerivation` uses its `name` attribute. `env` is an attribute set specifying environment variables that will be set for this derivation. These attributes are then passed to the wrapped `stdenv.mkDerivation`. `buildCommand` specifies the commands that will be run to create this derivation. Note that you will need to create `$out` for Nix to register the command as successful. +`runCommand :: String -> AttrSet -> String -> Derivation` -An example of using `runCommand` is provided below. +`runCommand name drvAttrs buildCommand` returns a derivation that is built by running the specified shell commands. + +`name :: String` +: The name that Nix will append to the store path in the same way that `stdenv.mkDerivation` uses its `name` attribute. + +`drvAttr :: AttrSet` +: Attributes to pass to the underlying call to [`stdenv.mkDerivation`](#chap-stdenv). + +`buildCommand :: String` +: Shell commands to run in the derivation builder. + + ::: {.note} + You have to create a file or directory `$out` for Nix to be able to run the builder successfully. + ::: + +::: {.example #ex-runcommand-simple} +# Invocation of `runCommand` ```nix (import {}).runCommand "my-example" {} '' @@ -28,6 +44,7 @@ An example of using `runCommand` is provided below. date '' ``` +::: ## `runCommandCC` {#trivial-builder-runCommandCC} diff --git a/third_party/nixpkgs/doc/default.nix b/third_party/nixpkgs/doc/default.nix index f4270ae856..18e12c1a8a 100644 --- a/third_party/nixpkgs/doc/default.nix +++ b/third_party/nixpkgs/doc/default.nix @@ -19,8 +19,10 @@ let { name = "options"; description = "NixOS / nixpkgs option handling"; } { name = "path"; description = "path functions"; } { name = "filesystem"; description = "filesystem functions"; } + { name = "fileset"; description = "file set functions"; } { name = "sources"; description = "source filtering functions"; } { name = "cli"; description = "command-line serialization functions"; } + { name = "gvariant"; description = "GVariant formatted string serialization functions"; } ]; }; diff --git a/third_party/nixpkgs/doc/functions.md b/third_party/nixpkgs/doc/functions.md index 09033c9e3c..551ba522a9 100644 --- a/third_party/nixpkgs/doc/functions.md +++ b/third_party/nixpkgs/doc/functions.md @@ -8,4 +8,5 @@ functions/generators.section.md functions/debug.section.md functions/prefer-remote-fetch.section.md functions/nix-gitignore.section.md +functions/fileset.section.md ``` diff --git a/third_party/nixpkgs/doc/functions/fileset.section.md b/third_party/nixpkgs/doc/functions/fileset.section.md new file mode 100644 index 0000000000..08b9ba9eae --- /dev/null +++ b/third_party/nixpkgs/doc/functions/fileset.section.md @@ -0,0 +1,51 @@ + + +# File sets {#sec-fileset} + +The [`lib.fileset`](#sec-functions-library-fileset) library allows you to work with _file sets_. +A file set is a mathematical set of local files that can be added to the Nix store for use in Nix derivations. +File sets are easy and safe to use, providing obvious and composable semantics with good error messages to prevent mistakes. + +These sections apply to the entire library. +See the [function reference](#sec-functions-library-fileset) for function-specific documentation. + +The file set library is currently somewhat limited but is being expanded to include more functions over time. + +## Implicit coercion from paths to file sets {#sec-fileset-path-coercion} + +All functions accepting file sets as arguments can also accept [paths](https://nixos.org/manual/nix/stable/language/values.html#type-path) as arguments. +Such path arguments are implicitly coerced to file sets containing all files under that path: +- A path to a file turns into a file set containing that single file. +- A path to a directory turns into a file set containing all files _recursively_ in that directory. + +If the path points to a non-existent location, an error is thrown. + +::: {.note} +Just like in Git, file sets cannot represent empty directories. +Because of this, a path to a directory that contains no files (recursively) will turn into a file set containing no files. +::: + +:::{.note} +File set coercion does _not_ add any of the files under the coerced paths to the store. +Only the [`toSource`](#function-library-lib.fileset.toSource) function adds files to the Nix store, and only those files contained in the `fileset` argument. +This is in contrast to using [paths in string interpolation](https://nixos.org/manual/nix/stable/language/values.html#type-path), which does add the entire referenced path to the store. +::: + +### Example {#sec-fileset-path-coercion-example} + +Assume we are in a local directory with a file hierarchy like this: +``` +├─ a/ +│ ├─ x (file) +│ └─ b/ +│   └─ y (file) +└─ c/ +   └─ d/ +``` + +Here's a listing of which files get included when different path expressions get coerced to file sets: +- `./.` as a file set contains both `a/x` and `a/b/y` (`c/` does not contain any files and is therefore omitted). +- `./a` as a file set contains both `a/x` and `a/b/y`. +- `./a/x` as a file set contains only `a/x`. +- `./a/b` as a file set contains only `a/b/y`. +- `./c` as a file set is empty, since neither `c` nor `c/d` contain any files. diff --git a/third_party/nixpkgs/doc/hooks/bmake.section.md b/third_party/nixpkgs/doc/hooks/bmake.section.md new file mode 100644 index 0000000000..6b40ac13e8 --- /dev/null +++ b/third_party/nixpkgs/doc/hooks/bmake.section.md @@ -0,0 +1,7 @@ +# bmake {#bmake-hook} + +[bmake](https://www.crufty.net/help/sjg/bmake.html) is the portable variant of +NetBSD make utility. + +In Nixpkgs, `bmake` comes with a hook that overrides the default build, check, +install and dist phases. diff --git a/third_party/nixpkgs/doc/hooks/index.md b/third_party/nixpkgs/doc/hooks/index.md index 602febaf9d..363d627e52 100644 --- a/third_party/nixpkgs/doc/hooks/index.md +++ b/third_party/nixpkgs/doc/hooks/index.md @@ -8,6 +8,7 @@ The stdenv built-in hooks are documented in [](#ssec-setup-hooks). autoconf.section.md automake.section.md autopatchelf.section.md +bmake.section.md breakpoint.section.md cmake.section.md gdk-pixbuf.section.md @@ -17,6 +18,7 @@ installShellFiles.section.md libiconv.section.md libxml2.section.md meson.section.md +mpi-check-hook.section.md ninja.section.md patch-rc-path-hooks.section.md perl.section.md diff --git a/third_party/nixpkgs/doc/hooks/mpi-check-hook.section.md b/third_party/nixpkgs/doc/hooks/mpi-check-hook.section.md new file mode 100644 index 0000000000..586ee2cc7c --- /dev/null +++ b/third_party/nixpkgs/doc/hooks/mpi-check-hook.section.md @@ -0,0 +1,24 @@ +# mpiCheckPhaseHook {#setup-hook-mpi-check} + + +This hook can be used to setup a check phase that +requires running a MPI application. It detects the +used present MPI implementation type and exports +the neceesary environment variables to use +`mpirun` and `mpiexec` in a Nix sandbox. + + +Example: + +```nix + { mpiCheckPhaseHook, mpi, ... }: + + ... + + nativeCheckInputs = [ + openssh + mpiCheckPhaseHook + ]; +``` + + diff --git a/third_party/nixpkgs/doc/hooks/waf.section.md b/third_party/nixpkgs/doc/hooks/waf.section.md index ee1bccff1d..fa027d87a9 100644 --- a/third_party/nixpkgs/doc/hooks/waf.section.md +++ b/third_party/nixpkgs/doc/hooks/waf.section.md @@ -1,3 +1,58 @@ -# wafHook {#wafhook} +# wafHook {#waf-hook} -Overrides the configure, build, and install phases. This will run the “waf” script used by many projects. If `wafPath` (default `./waf`) doesn’t exist, it will copy the version of waf available in Nixpkgs. `wafFlags` can be used to pass flags to the waf script. +[Waf](https://waf.io) is a Python-based software building system. + +In Nixpkgs, `wafHook` overrides the default configure, build, and install phases. + +## Variables controlling wafHook {#waf-hook-variables-controlling} + +### `wafHook` Exclusive Variables {#waf-hook-exclusive-variables} + +The variables below are exclusive of `wafHook`. + +#### `wafPath` {#waf-path} + +Location of the `waf` tool. It defaults to `./waf`, to honor software projects that include it directly inside their source trees. + +If `wafPath` doesn't exist, then `wafHook` will copy the `waf` provided from Nixpkgs to it. + +#### `wafFlags` {#waf-flags} + +Controls the flags passed to waf tool during build and install phases. For settings specific to build or install phases, use `wafBuildFlags` or `wafInstallFlags` respectively. + +#### `dontAddWafCrossFlags` {#dont-add-waf-cross-flags} + +When set to `true`, don't add cross compilation flags during configure phase. + +#### `dontUseWafConfigure` {#dont-use-waf-configure} + +When set to true, don't use the predefined `wafConfigurePhase`. + +#### `dontUseWafBuild` {#dont-use-waf-build} + +When set to true, don't use the predefined `wafBuildPhase`. + +#### `dontUseWafInstall` {#dont-use-waf-install} + +When set to true, don't use the predefined `wafInstallPhase`. + +### Similar variables {#waf-hook-similar-variables} + +The following variables are similar to their `stdenv.mkDerivation` counterparts. + +| `wafHook` Variable | `stdenv.mkDerivation` Counterpart | +|-----------------------|-----------------------------------| +| `wafConfigureFlags` | `configureFlags` | +| `wafConfigureTargets` | `configureTargets` | +| `wafBuildFlags` | `buildFlags` | +| `wafBuildTargets` | `buildTargets` | +| `wafInstallFlags` | `installFlags` | +| `wafInstallTargets` | `installTargets` | + +### Honored variables {#waf-hook-honored-variables} + +The following variables commonly used by `stdenv.mkDerivation` are honored by `wafHook`. + +- `prefixKey` +- `enableParallelBuilding` +- `enableParallelInstalling` diff --git a/third_party/nixpkgs/doc/hooks/zig.section.md b/third_party/nixpkgs/doc/hooks/zig.section.md index 483fd285f4..1a09491649 100644 --- a/third_party/nixpkgs/doc/hooks/zig.section.md +++ b/third_party/nixpkgs/doc/hooks/zig.section.md @@ -4,7 +4,7 @@ In Nixpkgs, `zig.hook` overrides the default build, check and install phases. -## Example code snippet {#example-code-snippet} +## Example code snippet {#zig-hook-example-code-snippet} ```nix { lib @@ -27,33 +27,37 @@ stdenv.mkDerivation { } ``` -## Variables controlling zig.hook {#variables-controlling-zig-hook} +## Variables controlling zig.hook {#zig-hook-variables-controlling} -### `dontUseZigBuild` {#dontUseZigBuild} +### `zig.hook` Exclusive Variables {#zig-hook-exclusive-variables} + +The variables below are exclusive to `zig.hook`. + +#### `dontUseZigBuild` {#dont-use-zig-build} Disables using `zigBuildPhase`. -### `zigBuildFlags` {#zigBuildFlags} - -Controls the flags passed to the build phase. - -### `dontUseZigCheck` {#dontUseZigCheck} +#### `dontUseZigCheck` {#dont-use-zig-check} Disables using `zigCheckPhase`. -### `zigCheckFlags` {#zigCheckFlags} - -Controls the flags passed to the check phase. - -### `dontUseZigInstall` {#dontUseZigInstall} +#### `dontUseZigInstall` {#dont-use-zig-install} Disables using `zigInstallPhase`. -### `zigInstallFlags` {#zigInstallFlags} +### Similar variables {#zig-hook-similar-variables} -Controls the flags passed to the install phase. +The following variables are similar to their `stdenv.mkDerivation` counterparts. -### Variables honored by zig.hook {#variables-honored-by-zig-hook} +| `zig.hook` Variable | `stdenv.mkDerivation` Counterpart | +|---------------------|-----------------------------------| +| `zigBuildFlags` | `buildFlags` | +| `zigCheckFlags` | `checkFlags` | +| `zigInstallFlags` | `installFlags` | + +### Variables honored by zig.hook {#zig-hook-variables-honored} + +The following variables commonly used by `stdenv.mkDerivation` are honored by `zig.hook`. - `prefixKey` - `dontAddPrefix` diff --git a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md index 4c1650781f..2cb4863fc5 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md @@ -44,11 +44,29 @@ There is also a `buildMix` helper, whose behavior is closer to that of `buildErl ## How to Install BEAM Packages {#how-to-install-beam-packages} -BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users. To install any of those builders into your profile, refer to them by their attribute path `beamPackages.rebar3`: +BEAM builders are not registered at the top level, simply because they are not relevant to the vast majority of Nix users. +To use any of those builders into your environment, refer to them by their attribute path under `beamPackages`, e.g. `beamPackages.rebar3`: + +::: {.example #ex-beam-ephemeral-shell} +# Ephemeral shell ```ShellSession -$ nix-env -f "" -iA beamPackages.rebar3 +$ nix-shell -p beamPackages.rebar3 ``` +::: + +::: {.example #ex-beam-declarative-shell} +# Declarative shell + +```nix +let + pkgs = import { config = {}; overlays = []; }; +in +pkgs.mkShell { + packages = [ pkgs.beamPackages.rebar3 ]; +} +``` +::: ## Packaging BEAM Applications {#packaging-beam-applications} @@ -154,7 +172,7 @@ Here is how your `default.nix` file would look for a phoenix project. with import { }; let - # beam.interpreters.erlang_23 is available if you need a particular version + # beam.interpreters.erlang_26 is available if you need a particular version packages = beam.packagesWith beam.interpreters.erlang; pname = "your_project"; diff --git a/third_party/nixpkgs/doc/languages-frameworks/chicken.section.md b/third_party/nixpkgs/doc/languages-frameworks/chicken.section.md index d329943dc3..72c2642a64 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/chicken.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/chicken.section.md @@ -47,3 +47,32 @@ To include more eggs, edit `pkgs/development/compilers/chicken/5/eggs.scm`. The first section of this file lists eggs which are required by `egg2nix` itself; all other eggs go into the second section. After editing, follow the procedure for updating eggs. + +## Override Scope {#sec-chicken-override-scope} + +The chicken package and its eggs, respectively, reside in a scope. This means, +the scope can be overridden to effect other packages in it. + +This example shows how to use a local copy of `srfi-180` and have it affect +all the other eggs: + +```nix +let + myChickenPackages = pkgs.chickenPackages.overrideScope' (self: super: { + # The chicken package itself can be overridden to effect the whole ecosystem. + # chicken = super.chicken.overrideAttrs { + # src = ... + # }; + + chickenEggs = super.chickenEggs.overrideScope' (eggself: eggsuper: { + srfi-180 = eggsuper.srfi-180.overrideAttrs { + # path to a local copy of srfi-180 + src = ... + }; + }); + }); +in +# Here, `myChickenPackages.chickenEggs.json-rpc`, which depends on `srfi-180` will use +# the local copy of `srfi-180`. +# ... +``` diff --git a/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md b/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md index 2d680ea6b3..01a4f20da9 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/cuda.section.md @@ -54,3 +54,65 @@ for your specific card(s). Library maintainers should consult [NVCC Docs](https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/) and release notes for their software package. + +## Adding a new CUDA release {#adding-a-new-cuda-release} + +> **WARNING** +> +> This section of the docs is still very much in progress. Feedback is welcome in GitHub Issues tagging @NixOS/cuda-maintainers or on [Matrix](https://matrix.to/#/#cuda:nixos.org). + +The CUDA Toolkit is a suite of CUDA libraries and software meant to provide a development environment for CUDA-accelerated applications. Until the release of CUDA 11.4, NVIDIA had only made the CUDA Toolkit available as a multi-gigabyte runfile installer, which we provide through the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute. From CUDA 11.4 and onwards, NVIDIA has also provided CUDA redistributables (“CUDA-redist”): individually packaged CUDA Toolkit components meant to facilitate redistribution and inclusion in downstream projects. These packages are available in the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set. + +All new projects should use the CUDA redistributables available in [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) in place of [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit), as they are much easier to maintain and update. + +### Updating CUDA redistributables {#updating-cuda-redistributables} + +1. Go to NVIDIA's index of CUDA redistributables: +2. Copy the `redistrib_*.json` corresponding to the release to `pkgs/development/compilers/cudatoolkit/redist/manifests`. +3. Generate the `redistrib_features_*.json` file by running: + + ```bash + nix run github:ConnorBaker/cuda-redist-find-features -- + ``` + + That command will generate the `redistrib_features_*.json` file in the same directory as the manifest. + +4. Include the path to the new manifest in `pkgs/development/compilers/cudatoolkit/redist/extension.nix`. + +### Updating the CUDA Toolkit runfile installer {#updating-the-cuda-toolkit} + +> **WARNING** +> +> While the CUDA Toolkit runfile installer is still available in Nixpkgs as the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute, its use is not recommended and should it be considered deprecated. Please migrate to the CUDA redistributables provided by the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set. +> +> To ensure packages relying on the CUDA Toolkit runfile installer continue to build, it will continue to be updated until a migration path is available. + +1. Go to NVIDIA's CUDA Toolkit runfile installer download page: +2. Select the appropriate OS, architecture, distribution, and version, and installer type. + + - For example: Linux, x86_64, Ubuntu, 22.04, runfile (local) + - NOTE: Typically, we use the Ubuntu runfile. It is unclear if the runfile for other distributions will work. + +3. Take the link provided by the installer instructions on the webpage after selecting the installer type and get its hash by running: + + ```bash + nix store prefetch-file --hash-type sha256 + ``` + +4. Update `pkgs/development/compilers/cudatoolkit/versions.toml` to include the release. + +### Updating the CUDA package set {#updating-the-cuda-package-set} + +1. Include a new `cudaPackages__` package set in `pkgs/top-level/all-packages.nix`. + + - NOTE: Changing the default CUDA package set should occur in a separate PR, allowing time for additional testing. + +2. Successfully build the closure of the new package set, updating `pkgs/development/compilers/cudatoolkit/redist/overrides.nix` as needed. Below are some common failures: + +| Unable to ... | During ... | Reason | Solution | Note | +| --- | --- | --- | --- | --- | +| Find headers | `configurePhase` or `buildPhase` | Missing dependency on a `dev` output | Add the missing dependency | The `dev` output typically contain the headers | +| Find libraries | `configurePhase` | Missing dependency on a `dev` output | Add the missing dependency | The `dev` output typically contain CMake configuration files | +| Find libraries | `buildPhase` or `patchelf` | Missing dependency on a `lib` or `static` output | Add the missing dependency | The `lib` or `static` output typically contain the libraries | + +In the scenario you are unable to run the resulting binary: this is arguably the most complicated as it could be any combination of the previous reasons. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. As a first step, ensure that dependencies are patched with [`cudaPackages.autoAddOpenGLRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.autoAddOpenGLRunpath). Failing that, try running the application with [`nixGL`](https://github.com/guibou/nixGL) or a similar wrapper tool. If that works, it likely means that the application is attempting to load a library that is not in the `RPATH` or `RUNPATH` of the binary. diff --git a/third_party/nixpkgs/doc/languages-frameworks/dhall.section.md b/third_party/nixpkgs/doc/languages-frameworks/dhall.section.md index 846b8cfd31..7322a61687 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/dhall.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/dhall.section.md @@ -91,7 +91,7 @@ buildDhallPackage { let nixpkgs = builtins.fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/94b2848559b12a8ed1fe433084686b2a81123c99.tar.gz"; - sha256 = "sha256-B4Q3c6IvTLg3Q92qYa8y+i4uTaphtFdjp+Ir3QQjdN0="; + hash = "sha256-B4Q3c6IvTLg3Q92qYa8y+i4uTaphtFdjp+Ir3QQjdN0="; }; dhallOverlay = self: super: { @@ -303,11 +303,8 @@ You can use the `dhall-to-nixpkgs` command-line utility to automate packaging Dhall code. For example: ```ShellSession -$ nix-env --install --attr haskellPackages.dhall-nixpkgs - -$ nix-env --install --attr nix-prefetch-git # Used by dhall-to-nixpkgs - -$ dhall-to-nixpkgs github https://github.com/Gabriella439/dhall-semver.git +$ nix-shell -p haskellPackages.dhall-nixpkgs nix-prefetch-git +[nix-shell]$ dhall-to-nixpkgs github https://github.com/Gabriella439/dhall-semver.git { buildDhallGitHubPackage, Prelude }: buildDhallGitHubPackage { name = "dhall-semver"; @@ -325,6 +322,10 @@ $ dhall-to-nixpkgs github https://github.com/Gabriella439/dhall-semver.git } ``` +:::{.note} +`nix-prefetch-git` has to be in `$PATH` for `dhall-to-nixpkgs` to work. +::: + The utility takes care of automatically detecting remote imports and converting them to package dependencies. You can also use the utility on local Dhall directories, too: diff --git a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md index 39e7416182..9ba0fef2a2 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md @@ -161,7 +161,7 @@ in buildDotnetModule rec { They can be installed either as a global tool for the entire system, or as a local tool specific to project. The local installation is the easiest and works on NixOS in the same way as on other Linux distributions. -[See dotnet documention](https://learn.microsoft.com/en-us/dotnet/core/tools/global-tools#install-a-local-tool) to learn more. +[See dotnet documentation](https://learn.microsoft.com/en-us/dotnet/core/tools/global-tools#install-a-local-tool) to learn more. [The global installation method](https://learn.microsoft.com/en-us/dotnet/core/tools/global-tools#install-a-global-tool) should also work most of the time. You have to remember to update the `PATH` diff --git a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md index 6097233184..6b9ce32d17 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/haskell.section.md @@ -221,7 +221,7 @@ Sadly we currently don’t have tooling for this. For this you might be interested in the alternative [haskell.nix] framework, which, be warned, is completely incompatible with packages from `haskellPackages`. - + ## `haskellPackages.mkDerivation` {#haskell-mkderivation} @@ -1029,7 +1029,7 @@ ugly, and we may want to deprecate them at some point. --> `disableCabalFlag flag drv` : Makes sure that the Cabal flag `flag` is disabled in Cabal's configure step. -`appendBuildflags list drv` +`appendBuildFlags list drv` : Adds the strings in `list` to the `buildFlags` argument for `drv`. @@ -1192,7 +1192,7 @@ with GHC), it is recommended to use overlays for Nixpkgs to change them. Since the interrelated parts, i.e. the package set and GHC, are connected via the Nixpkgs fixpoint, we need to modify them both in a way that preserves their connection (or else we'd have to wire it up again manually). This is -achieved by changing GHC and the package set in seperate overlays to prevent +achieved by changing GHC and the package set in separate overlays to prevent the package set from pulling in GHC from `prev`. The result is two overlays like the ones shown below. Adjustable parts are diff --git a/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md b/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md index 0a2099b0a6..f35fd83cc5 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md @@ -161,6 +161,8 @@ git config --global url."https://github.com/".insteadOf git://github.com/ `buildNpmPackage` allows you to package npm-based projects in Nixpkgs without the use of an auto-generated dependencies file (as used in [node2nix](#javascript-node2nix)). It works by utilizing npm's cache functionality -- creating a reproducible cache that contains the dependencies of a project, and pointing npm to it. +Here's an example: + ```nix { lib, buildNpmPackage, fetchFromGitHub }: @@ -191,6 +193,8 @@ buildNpmPackage rec { } ``` +In the default `installPhase` set by `buildNpmPackage`, it uses `npm pack --json --dry-run` to decide what files to install in `$out/lib/node_modules/$name/`, where `$name` is the `name` string defined in the package's `package.json`. Additionally, the `bin` and `man` keys in the source's `package.json` are used to decide what binaries and manpages are supposed to be installed. If these are not defined, `npm pack` may miss some files, and no binaries will be produced. + #### Arguments {#javascript-buildNpmPackage-arguments} * `npmDepsHash`: The output hash of the dependencies for this project. Can be calculated in advance with [`prefetch-npm-deps`](#javascript-buildNpmPackage-prefetch-npm-deps). @@ -204,10 +208,11 @@ buildNpmPackage rec { * `npmBuildFlags`: Flags to pass to `npm run ${npmBuildScript}`. * `npmPackFlags`: Flags to pass to `npm pack`. * `npmPruneFlags`: Flags to pass to `npm prune`. Defaults to the value of `npmInstallFlags`. +* `makeWrapperArgs`: Flags to pass to `makeWrapper`, added to executable calling the generated `.js` with `node` as an interpreter. These scripts are defined in `package.json`. #### prefetch-npm-deps {#javascript-buildNpmPackage-prefetch-npm-deps} -`prefetch-npm-deps` can calculate the hash of the dependencies of an npm project ahead of time. +`prefetch-npm-deps` is a Nixpkgs package that calculates the hash of the dependencies of an npm project ahead of time. ```console $ ls @@ -217,6 +222,19 @@ $ prefetch-npm-deps package-lock.json sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= ``` +#### fetchNpmDeps {#javascript-buildNpmPackage-fetchNpmDeps} + +`fetchNpmDeps` is a Nix function that requires the following mandatory arguments: + +- `src`: A directory / tarball with `package-lock.json` file +- `hash`: The output hash of the node dependencies defined in `package-lock.json`. + +It returns a derivation with all `package-lock.json` dependencies downloaded into `$out/`, usable as an npm cache. + +### corepack {#javascript-corepack} + +This package puts the corepack wrappers for pnpm and yarn in your PATH, and they will honor the `packageManager` setting in the `package.json`. + ### node2nix {#javascript-node2nix} #### Preparation {#javascript-node2nix-preparation} diff --git a/third_party/nixpkgs/doc/languages-frameworks/lisp.section.md b/third_party/nixpkgs/doc/languages-frameworks/lisp.section.md index 3c408eaa09..8712c34120 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/lisp.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/lisp.section.md @@ -1,36 +1,32 @@ # lisp-modules {#lisp} This document describes the Nixpkgs infrastructure for building Common Lisp -libraries that use ASDF (Another System Definition Facility). It lives in -`pkgs/development/lisp-modules`. +systems that use [ASDF](https://asdf.common-lisp.dev/) (Another System +Definition Facility). It lives in `pkgs/development/lisp-modules`. ## Overview {#lisp-overview} The main entry point of the API are the Common Lisp implementation packages -(e.g. `abcl`, `ccl`, `clasp-common-lisp`, `clisp` `ecl`, `sbcl`) -themselves. They have the `pkgs` and `withPackages` attributes, which can be -used to discover available packages and to build wrappers, respectively. +themselves (e.g. `abcl`, `ccl`, `clasp-common-lisp`, `clisp`, `ecl`, +`sbcl`). They have the `pkgs` and `withPackages` attributes, which can be used +to discover available packages and to build wrappers, respectively. -The `pkgs` attribute set contains packages that were automatically imported from -Quicklisp, and any other manually defined ones. Not every package works for all -the CL implementations (e.g. `nyxt` only makes sense for `sbcl`). +The `pkgs` attribute set contains packages that were automatically +[imported](#lisp-importing-packages-from-quicklisp) from Quicklisp, and any +other [manually defined](#lisp-defining-packages-inside) ones. Not every package +works for all the CL implementations (e.g. `nyxt` only makes sense for `sbcl`). -The `withPackages` function is of primary utility. It is used to build runnable -wrappers, with a pinned and pre-built ASDF FASL available in the `ASDF` -environment variable, and `CL_SOURCE_REGISTRY`/`ASDF_OUTPUT_TRANSLATIONS` -configured to find the desired systems on runtime. - -With a few exceptions, the primary thing that the infrastructure does is to run -`asdf:load-system` for each system specified in the `systems` argument to -`build-asdf-system`, and save the FASLs to the Nix store. Then, it makes these -FASLs available to wrappers. Any other use-cases, such as producing SBCL -executables with `sb-ext:save-lisp-and-die`, are achieved via overriding the -`buildPhase` etc. +The `withPackages` function is of primary utility. It is used to build +[runnable wrappers](#lisp-building-wrappers), with a pinned and pre-built +[ASDF FASL](#lisp-loading-asdf) available in the `ASDF` environment variable, +and `CL_SOURCE_REGISTRY`/`ASDF_OUTPUT_TRANSLATIONS` configured to +[find the desired systems on runtime](#lisp-loading-systems). In addition, Lisps have the `withOverrides` function, which can be used to -substitute any package in the scope of their `pkgs`. This will be useful -together with `overrideLispAttrs` when dealing with slashy ASDF systems, because -they should stay in the main package and be build by specifying the `systems` +[substitute](#lisp-including-external-pkg-in-scope) any package in the scope of +their `pkgs`. This will also be useful together with `overrideLispAttrs` when +[dealing with slashy systems](#lisp-dealing-with-slashy-systems), because they +should stay in the main package and be built by specifying the `systems` argument to `build-asdf-system`. ## The 90% use case example {#lisp-use-case-example} @@ -42,7 +38,7 @@ The most common way to use the library is to run ad-hoc wrappers like this: Then, in a shell: ``` -$ result/bin/sbcl +$ sbcl * (load (sb-ext:posix-getenv "ASDF")) * (asdf:load-system 'alexandria) ``` @@ -53,7 +49,7 @@ Also one can create a `pkgs.mkShell` environment in `shell.nix`/`flake.nix`: let sbcl' = sbcl.withPackages (ps: [ ps.alexandria ]); in mkShell { - buildInputs = [ sbcl' ]; + packages = [ sbcl' ]; } ``` @@ -67,32 +63,37 @@ buildPhase = '' ## Importing packages from Quicklisp {#lisp-importing-packages-from-quicklisp} -The library is able to very quickly import all the packages distributed by -Quicklisp by parsing its `releases.txt` and `systems.txt` files. These files are -available from [http://beta.quicklisp.org/dist/quicklisp.txt]. +To save some work of writing Nix expressions, there is a script that imports all +the packages distributed by Quicklisp into `imported.nix`. This works by parsing +its `releases.txt` and `systems.txt` files, which are published every couple of +months on [quicklisp.org](http://beta.quicklisp.org/dist/quicklisp.txt). The import process is implemented in the `import` directory as Common Lisp -functions in the `org.lispbuilds.nix` ASDF system. To run the script, one can +code in the `org.lispbuilds.nix` ASDF system. To run the script, one can execute `ql-import.lisp`: ``` +cd pkgs/development/lisp-modules nix-shell --run 'sbcl --script ql-import.lisp' ``` The script will: 1. Download the latest Quicklisp `systems.txt` and `releases.txt` files -2. Generate an SQLite database of all QL systems in `packages.sqlite` +2. Generate a temporary SQLite database of all QL systems in `packages.sqlite` 3. Generate an `imported.nix` file from the database -The maintainer's job there is to: +(The `packages.sqlite` file can be deleted at will, because it is regenerated +each time the script runs.) -1. Re-run the `ql-import.lisp` script -2. Add missing native dependencies in `ql.nix` -3. For packages that still don't build, package them manually in `packages.nix` +The maintainer's job is to: + +1. Re-run the `ql-import.lisp` script when there is a new Quicklisp release +2. [Add any missing native dependencies](#lisp-quicklisp-adding-native-dependencies) in `ql.nix` +3. For packages that still don't build, [package them manually](#lisp-defining-packages-inside) in `packages.nix` Also, the `imported.nix` file **must not be edited manually**! It should only be -generated as described in this section. +generated as described in this section (by running `ql-import.lisp`). ### Adding native dependencies {#lisp-quicklisp-adding-native-dependencies} @@ -108,7 +109,7 @@ Packages defined in `packages.nix` contain these dependencies naturally. The previous implementation of `lisp-modules` didn't fully trust the Quicklisp data, because there were times where the dependencies specified were not -complete, and caused broken builds. It instead used a `nix-shell` environment to +complete and caused broken builds. It instead used a `nix-shell` environment to discover real dependencies by using the ASDF APIs. The current implementation has chosen to trust this data, because it's faster to @@ -126,33 +127,46 @@ replace the `systems` attribute of the affected packages. (See the definition of During Quicklisp import: -- `+` in names are converted to `_plus{_,}`: `cl+ssl`->`cl_plus_ssl`, `alexandria+`->`alexandria_plus` -- `.` to `_dot_`: `iolib.base`->`iolib_dot_base` +- `+` in names is converted to `_plus{_,}`: `cl+ssl`->`cl_plus_ssl`, `alexandria+`->`alexandria_plus` +- `.` in names is converted to `_dot_`: `iolib.base`->`iolib_dot_base` - names starting with a number have a `_` prepended (`3d-vectors`->`_3d-vectors`) - `_` in names is converted to `__` for reversibility ## Defining packages manually inside Nixpkgs {#lisp-defining-packages-inside} -New packages, that for some reason are not in Quicklisp, and so cannot be -auto-imported, can be written in the `packages.nix` file. +Packages that for some reason are not in Quicklisp, and so cannot be +auto-imported, or don't work straight from the import, are defined in the +`packages.nix` file. In that file, use the `build-asdf-system` function, which is a wrapper around `mkDerivation` for building ASDF systems. Various other hacks are present, such as `build-with-compile-into-pwd` for systems which create files during -compilation. +compilation (such as cl-unicode). -The `build-asdf-system` function is documented with comments in -`nix-cl.nix`. Also, `packages.nix` is full of examples of how to use it. +The `build-asdf-system` function is documented +[here](#lisp-defining-packages-outside). Also, `packages.nix` is full of +examples of how to use it. ## Defining packages manually outside Nixpkgs {#lisp-defining-packages-outside} Lisp derivations (`abcl`, `sbcl` etc.) also export the `buildASDFSystem` -function, which is the same as `build-asdf-system`, except for the `lisp` -argument which is set to the given CL implementation. +function, which is similar to `build-asdf-system` from `packages.nix`, but is +part of the public API. + +It takes the following arguments: + +- `pname`: the package name +- `version`: the package version +- `src`: the package source +- `patches`: patches to apply to the source before build +- `nativeLibs`: native libraries used by CFFI and grovelling +- `javaLibs`: Java libraries for ABCL +- `lispLibs`: dependencies on other packages build with `buildASDFSystem` +- `systems`: list of systems to build It can be used to define packages outside Nixpkgs, and, for example, add them -into the package scope with `withOverrides` which will be discussed later on. +into the package scope with `withOverrides`. ### Including an external package in scope {#lisp-including-external-pkg-in-scope} @@ -198,28 +212,6 @@ sbcl.pkgs.alexandria.overrideLispAttrs (oldAttrs: rec { }) ``` -## Overriding packages in scope {#lisp-overriding-packages-in-scope} - -Packages can be woven into a new scope by using `withOverrides`: - -``` -let - sbcl' = sbcl.withOverrides (self: super: { - alexandria = super.alexandria.overrideLispAttrs (oldAttrs: rec { - pname = "alexandria"; - version = "1.4"; - src = fetchFromGitLab { - domain = "gitlab.common-lisp.net"; - owner = "alexandria"; - repo = "alexandria"; - rev = "v${version}"; - hash = "sha256-1Hzxt65dZvgOFIljjjlSGgKYkj+YBLwJCACi5DZsKmQ="; - }; - }); - }); -in builtins.elemAt sbcl'.pkgs.bordeaux-threads.lispLibs 0 -``` - ### Dealing with slashy systems {#lisp-dealing-with-slashy-systems} Slashy (secondary) systems should not exist in their own packages! Instead, they @@ -240,8 +232,8 @@ ecl.pkgs.alexandria.overrideLispAttrs (oldAttrs: { }) ``` -See the respective section on using `withOverrides` for how to weave it back -into `ecl.pkgs`. +See the [respective section](#lisp-including-external-pkg-in-scope) on using +`withOverrides` for how to weave it back into `ecl.pkgs`. Note that sometimes the slashy systems might not only have more dependencies than the main one, but create a circular dependency between `.asd` @@ -253,13 +245,16 @@ Wrappers can be built using the `withPackages` function of Common Lisp implementations (`abcl`, `ecl`, `sbcl` etc.): ``` -sbcl.withPackages (ps: [ ps.alexandria ps.bordeaux-threads ]) +nix-shell -p 'sbcl.withPackages (ps: [ ps.alexandria ps.bordeaux-threads ])' ``` -Such a wrapper can then be executed like this: +Such a wrapper can then be used like this: ``` -result/bin/sbcl +$ sbcl +* (load (sb-ext:posix-getenv "ASDF")) +* (asdf:load-system 'alexandria) +* (asdf:load-system 'bordeaux-threads) ``` ### Loading ASDF {#lisp-loading-asdf} diff --git a/third_party/nixpkgs/doc/languages-frameworks/php.section.md b/third_party/nixpkgs/doc/languages-frameworks/php.section.md index 6c4315f5c4..377e3947b2 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/php.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/php.section.md @@ -130,6 +130,7 @@ package: a project may depend on certain extensions and `composer` won't work with that project unless those extensions are loaded. Example of building `composer` with additional extensions: + ```nix (php.withExtensions ({ all, enabled }: enabled ++ (with all; [ imagick redis ])) @@ -138,7 +139,9 @@ Example of building `composer` with additional extensions: ### Overriding PHP packages {#ssec-php-user-guide-overriding-packages} -`php-packages.nix` form a scope, allowing us to override the packages defined within. For example, to apply a patch to a `mysqlnd` extension, you can simply pass an overlay-style function to `php`’s `packageOverrides` argument: +`php-packages.nix` form a scope, allowing us to override the packages defined +within. For example, to apply a patch to a `mysqlnd` extension, you can simply +pass an overlay-style function to `php`’s `packageOverrides` argument: ```nix php.override { @@ -153,3 +156,138 @@ php.override { }; } ``` + +### Building PHP projects {#ssec-building-php-projects} + +With [Composer](https://getcomposer.org/), you can effectively build PHP +projects by streamlining dependency management. As the de-facto standard +dependency manager for PHP, Composer enables you to declare and manage the +libraries your project relies on, ensuring a more organized and efficient +development process. + +Composer is not a package manager in the same sense as `Yum` or `Apt` are. Yes, +it deals with "packages" or libraries, but it manages them on a per-project +basis, installing them in a directory (e.g. `vendor`) inside your project. By +default, it does not install anything globally. This idea is not new and +Composer is strongly inspired by node's `npm` and ruby's `bundler`. + +Currently, there is no other PHP tool that offers the same functionality as +Composer. Consequently, incorporating a helper in Nix to facilitate building +such applications is a logical choice. + +In a Composer project, dependencies are defined in a `composer.json` file, +while their specific versions are locked in a `composer.lock` file. Some +Composer-based projects opt to include this `composer.lock` file in their source +code, while others choose not to. + +In Nix, there are multiple approaches to building a Composer-based project. + +One such method is the `php.buildComposerProject` helper function, which serves +as a wrapper around `mkDerivation`. + +Using this function, you can build a PHP project that includes both a +`composer.json` and `composer.lock` file. If the project specifies binaries +using the `bin` attribute in `composer.json`, these binaries will be +automatically linked and made accessible in the derivation. In this context, +"binaries" refer to PHP scripts that are intended to be executable. + +To use the helper effectively, simply add the `vendorHash` attribute, which +enables the wrapper to handle the heavy lifting. + +Internally, the helper operates in three stages: + +1. It constructs a `composerRepository` attribute derivation by creating a + composer repository on the filesystem containing dependencies specified in + `composer.json`. This process uses the function + `php.mkComposerRepository` which in turn uses the + `php.composerHooks.composerRepositoryHook` hook. Internally this function uses + a custom + [Composer plugin](https://github.com/nix-community/composer-local-repo-plugin) to + generate the repository. +2. The resulting `composerRepository` derivation is then used by the + `php.composerHooks.composerInstallHook` hook, which is responsible for + creating the final `vendor` directory. +3. Any "binary" specified in the `composer.json` are linked and made accessible + in the derivation. + +As the autoloader optimization can be activated directly within the +`composer.json` file, we do not enable any autoloader optimization flags. + +To customize the PHP version, you can specify the `php` attribute. Similarly, if +you wish to modify the Composer version, use the `composer` attribute. It is +important to note that both attributes should be of the `derivation` type. + +Here's an example of working code example using `php.buildComposerProject`: + +```nix +{ php, fetchFromGitHub }: + +php.buildComposerProject (finalAttrs: { + pname = "php-app"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "git-owner"; + repo = "git-repo"; + rev = finalAttrs.version; + hash = "sha256-VcQRSss2dssfkJ+iUb5qT+FJ10GHiFDzySigcmuVI+8="; + }; + + # PHP version containing the `ast` extension enabled + php = php.buildEnv { + extensions = ({ enabled, all }: enabled ++ (with all; [ + ast + ])); + }; + + # The composer vendor hash + vendorHash = "sha256-86s/F+/5cBAwBqZ2yaGRM5rTGLmou5//aLRK5SA0WiQ="; + + # If the composer.lock file is missing from the repository, add it: + # composerLock = ./path/to/composer.lock; +}) +``` + +In case the file `composer.lock` is missing from the repository, it is possible +to specify it using the `composerLock` attribute. + +The other method is to use all these methods and hooks individually. This has +the advantage of building a PHP library within another derivation very easily +when necessary. + +Here's a working code example to build a PHP library using `mkDerivation` and +separate functions and hooks: + +```nix +{ stdenvNoCC, fetchFromGitHub, php }: + +stdenvNoCC.mkDerivation (finalAttrs: +let + src = fetchFromGitHub { + owner = "git-owner"; + repo = "git-repo"; + rev = finalAttrs.version; + hash = "sha256-VcQRSss2dssfkJ+iUb5qT+FJ10GHiFDzySigcmuVI+8="; + }; +in { + inherit src; + pname = "php-app"; + version = "1.0.0"; + + buildInputs = [ php ]; + + nativeBuildInputs = [ + php.packages.composer + # This hook will use the attribute `composerRepository` + php.composerHooks.composerInstallHook + ]; + + composerRepository = php.mkComposerRepository { + inherit (finalAttrs) src; + # Specifying a custom composer.lock since it is not present in the sources. + composerLock = ./composer.lock; + # The composer vendor hash + vendorHash = "sha256-86s/F+/5cBAwBqZ2yaGRM5rTGLmou5//aLRK5SA0WiQ="; + }; +}) +``` diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index 2ced6d69ed..40236d141d 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -32,8 +32,8 @@ Each interpreter has the following attributes: - `libPrefix`. Name of the folder in `${python}/lib/` for corresponding interpreter. - `interpreter`. Alias for `${python}/bin/${executable}`. -- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation. -- `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation. +- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See [](#python.buildenv-function) for usage and documentation. +- `withPackages`. Simpler interface to `buildEnv`. See [](#python.withpackages-function) for usage and documentation. - `sitePackages`. Alias for `lib/${libPrefix}/site-packages`. - `executable`. Name of the interpreter executable, e.g. `python3.10`. - `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`. @@ -41,8 +41,8 @@ Each interpreter has the following attributes: ### Building packages and applications {#building-packages-and-applications} Python libraries and applications that use `setuptools` or -`distutils` are typically built with respectively the `buildPythonPackage` and -`buildPythonApplication` functions. These two functions also support installing a `wheel`. +`distutils` are typically built with respectively the [`buildPythonPackage`](#buildpythonpackage-function) and +[`buildPythonApplication`](#buildpythonapplication-function) functions. These two functions also support installing a `wheel`. All Python packages reside in `pkgs/top-level/python-packages.nix` and all applications elsewhere. In case a package is used as both a library and an @@ -101,7 +101,7 @@ The following is an example: buildPythonPackage rec { pname = "pytest"; version = "3.3.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -141,23 +141,23 @@ buildPythonPackage rec { The `buildPythonPackage` mainly does four things: -* In the `buildPhase`, it calls `${python.pythonForBuild.interpreter} setup.py bdist_wheel` to +* In the [`buildPhase`](#build-phase), it calls `${python.pythonForBuild.interpreter} setup.py bdist_wheel` to build a wheel binary zipfile. -* In the `installPhase`, it installs the wheel file using `pip install *.whl`. -* In the `postFixup` phase, the `wrapPythonPrograms` bash function is called to +* In the [`installPhase`](#ssec-install-phase), it installs the wheel file using `pip install *.whl`. +* In the [`postFixup`](#var-stdenv-postFixup) phase, the `wrapPythonPrograms` bash function is called to wrap all programs in the `$out/bin/*` directory to include `$PATH` environment variable and add dependent libraries to script's `sys.path`. -* In the `installCheck` phase, `${python.interpreter} setup.py test` is run. +* In the [`installCheck`](#ssec-installCheck-phase) phase, `${python.interpreter} setup.py test` is run. -By default tests are run because `doCheck = true`. Test dependencies, like -e.g. the test runner, should be added to `nativeCheckInputs`. +By default tests are run because [`doCheck = true`](#var-stdenv-doCheck). Test dependencies, like +e.g. the test runner, should be added to [`nativeCheckInputs`](#var-stdenv-nativeCheckInputs). By default `meta.platforms` is set to the same value as the interpreter unless overridden otherwise. ##### `buildPythonPackage` parameters {#buildpythonpackage-parameters} -All parameters from `stdenv.mkDerivation` function are still supported. The +All parameters from [`stdenv.mkDerivation`](#sec-using-stdenv) function are still supported. The following are specific to `buildPythonPackage`: * `catchConflicts ? true`: If `true`, abort package build if a package name @@ -167,15 +167,18 @@ following are specific to `buildPythonPackage`: * `dontWrapPythonPrograms ? false`: Skip wrapping of Python programs. * `permitUserSite ? false`: Skip setting the `PYTHONNOUSERSITE` environment variable in wrapped programs. -* `format ? "setuptools"`: Format of the source. Valid options are - `"setuptools"`, `"pyproject"`, `"flit"`, `"wheel"`, and `"other"`. - `"setuptools"` is for when the source has a `setup.py` and `setuptools` is - used to build a wheel, `flit`, in case `flit` should be used to build a wheel, - and `wheel` in case a wheel is provided. Use `other` when a custom - `buildPhase` and/or `installPhase` is needed. +* `pyproject`: Whether the pyproject format should be used. When set to `true`, + `pypaBuildHook` will be used, and you can add the required build dependencies + from `build-system.requires` to `nativeBuildInputs`. Note that the pyproject + format falls back to using `setuptools`, so you can use `pyproject = true` + even if the package only has a `setup.py`. When set to `false`, you can + use the existing [hooks](#setup-hooks0 or provide your own logic to build the + package. This can be useful for packages that don't support the pyproject + format. When unset, the legacy `setuptools` hooks are used for backwards + compatibility. * `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to - `makeWrapper`, which wraps generated binaries. By default, the arguments to - `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling + [`makeWrapper`](#fun-makeWrapper), which wraps generated binaries. By default, the arguments to + [`makeWrapper`](#fun-makeWrapper) set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`. @@ -187,7 +190,7 @@ following are specific to `buildPythonPackage`: * `pipBuildFlags ? []`: A list of strings. Arguments to be passed to `pip wheel`. * `pypaBuildFlags ? []`: A list of strings. Arguments to be passed to `python -m build --wheel`. * `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages - in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`). + in `pythonPath` are not propagated (contrary to [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs)). * `preShellHook`: Hook to execute commands before `shellHook`. * `postShellHook`: Hook to execute commands after `shellHook`. * `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only @@ -195,7 +198,7 @@ following are specific to `buildPythonPackage`: * `setupPyGlobalFlags ? []`: List of flags passed to `setup.py` command. * `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command. -The `stdenv.mkDerivation` function accepts various parameters for describing +The [`stdenv.mkDerivation`](#sec-using-stdenv) function accepts various parameters for describing build inputs (see "Specifying dependencies"). The following are of special interest for Python packages, either because these are primarily used, or because their behaviour is different: @@ -205,8 +208,8 @@ because their behaviour is different: * `buildInputs ? []`: Build and/or run-time dependencies that need to be compiled for the host machine. Typically non-Python libraries which are being linked. -* `nativeCheckInputs ? []`: Dependencies needed for running the `checkPhase`. These - are added to `nativeBuildInputs` when `doCheck = true`. Items listed in +* `nativeCheckInputs ? []`: Dependencies needed for running the [`checkPhase`](#ssec-check-phase). These + are added to [`nativeBuildInputs`](#var-stdenv-nativeBuildInputs) when [`doCheck = true`](#var-stdenv-doCheck). Items listed in `tests_require` go here. * `propagatedBuildInputs ? []`: Aside from propagating dependencies, `buildPythonPackage` also injects code into and wraps executables with the @@ -263,17 +266,17 @@ compilation issues, because scipy dependencies need to use the same blas impleme #### `buildPythonApplication` function {#buildpythonapplication-function} -The `buildPythonApplication` function is practically the same as -`buildPythonPackage`. The main purpose of this function is to build a Python +The [`buildPythonApplication`](#buildpythonapplication-function) function is practically the same as +[`buildPythonPackage`](#buildpythonpackage-function). The main purpose of this function is to build a Python package where one is interested only in the executables, and not importable -modules. For that reason, when adding this package to a `python.buildEnv`, the +modules. For that reason, when adding this package to a [`python.buildEnv`](#python.buildenv-function), the modules won't be made available. -Another difference is that `buildPythonPackage` by default prefixes the names of +Another difference is that [`buildPythonPackage`](#buildpythonpackage-function) by default prefixes the names of the packages with the version of the interpreter. Because this is irrelevant for applications, the prefix is omitted. -When packaging a Python application with `buildPythonApplication`, it should be +When packaging a Python application with [`buildPythonApplication`](#buildpythonapplication-function), it should be called with `callPackage` and passed `python` or `pythonPackages` (possibly specifying an interpreter version), like this: @@ -286,20 +289,25 @@ specifying an interpreter version), like this: python3.pkgs.buildPythonApplication rec { pname = "luigi"; version = "2.7.9"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw="; }; + nativeBuildInputs = [ + python3.pkgs.setuptools + python3.pkgs.wheel + ]; + propagatedBuildInputs = with python3.pkgs; [ tornado python-daemon ]; meta = with lib; { - ... + # ... }; } ``` @@ -321,7 +329,7 @@ package is used as both. In this case the package is added as a library to duplication the `toPythonApplication` can be used to convert a library to an application. -The Nix expression shall use `buildPythonPackage` and be called from +The Nix expression shall use [`buildPythonPackage`](#buildpythonpackage-function) and be called from `python-packages.nix`. A reference shall be created from `all-packages.nix` to the attribute in `python-packages.nix`, and the `toPythonApplication` shall be applied to the reference: @@ -333,7 +341,7 @@ youtube-dl = with pythonPackages; toPythonApplication youtube-dl; #### `toPythonModule` function {#topythonmodule-function} In some cases, such as bindings, a package is created using -`stdenv.mkDerivation` and added as attribute in `all-packages.nix`. The Python +[`stdenv.mkDerivation`](#sec-using-stdenv) and added as attribute in `all-packages.nix`. The Python bindings should be made available from `python-packages.nix`. The `toPythonModule` function takes a derivation and makes certain Python-specific modifications. @@ -399,9 +407,9 @@ specified packages in its path. #### `python.withPackages` function {#python.withpackages-function} -The `python.withPackages` function provides a simpler interface to the `python.buildEnv` functionality. +The [`python.withPackages`](#python.withpackages-function) function provides a simpler interface to the [`python.buildEnv`](#python.buildenv-function) functionality. It takes a function as an argument that is passed the set of python packages and returns the list -of the packages to be included in the environment. Using the `withPackages` function, the previous +of the packages to be included in the environment. Using the [`withPackages`](#python.withpackages-function) function, the previous example for the Pyramid Web Framework environment can be written like this: ```nix @@ -410,7 +418,7 @@ with import {}; python.withPackages (ps: [ ps.pyramid ]) ``` -`withPackages` passes the correct package set for the specific interpreter +[`withPackages`](#python.withpackages-function) passes the correct package set for the specific interpreter version as an argument to the function. In the above example, `ps` equals `pythonPackages`. But you can also easily switch to using python3: @@ -422,7 +430,7 @@ python3.withPackages (ps: [ ps.pyramid ]) Now, `ps` is set to `python3Packages`, matching the version of the interpreter. -As `python.withPackages` simply uses `python.buildEnv` under the hood, it also +As [`python.withPackages`](#python.withpackages-function) simply uses [`python.buildEnv`](#python.buildenv-function) under the hood, it also supports the `env` attribute. The `shell.nix` file from the previous section can thus be also written like this: @@ -435,23 +443,22 @@ with import {}; ])).env ``` -In contrast to `python.buildEnv`, `python.withPackages` does not support the +In contrast to [`python.buildEnv`](#python.buildenv-function), [`python.withPackages`](#python.withpackages-function) does not support the more advanced options such as `ignoreCollisions = true` or `postBuild`. If you -need them, you have to use `python.buildEnv`. +need them, you have to use [`python.buildEnv`](#python.buildenv-function). Python 2 namespace packages may provide `__init__.py` that collide. In that case -`python.buildEnv` should be used with `ignoreCollisions = true`. +[`python.buildEnv`](#python.buildenv-function) should be used with `ignoreCollisions = true`. #### Setup hooks {#setup-hooks} The following are setup hooks specifically for Python packages. Most of these -are used in `buildPythonPackage`. +are used in [`buildPythonPackage`](#buildpythonpackage-function). - `eggUnpackhook` to move an egg to the correct folder so it can be installed with the `eggInstallHook` - `eggBuildHook` to skip building for eggs. - `eggInstallHook` to install eggs. -- `flitBuildHook` to build a wheel using `flit`. - `pipBuildHook` to build a wheel using `pip` and PEP 517. Note a build system (e.g. `setuptools` or `flit`) should still be added as `nativeBuildInput`. - `pypaBuildHook` to build a wheel using @@ -478,7 +485,7 @@ are used in `buildPythonPackage`. ### Development mode {#development-mode} Development or editable mode is supported. To develop Python packages -`buildPythonPackage` has additional logic inside `shellPhase` to run `pip +[`buildPythonPackage`](#buildpythonpackage-function) has additional logic inside `shellPhase` to run `pip install -e . --prefix $TMPDIR/`for the package. Warning: `shellPhase` is executed only if `setup.py` exists. @@ -559,7 +566,7 @@ without impacting other applications or polluting your user environment. But Python libraries you would like to use for development cannot be installed, at least not individually, because they won't be able to find each other resulting in import errors. Instead, it is possible to create an environment -with `python.buildEnv` or `python.withPackages` where the interpreter and other +with [`python.buildEnv`](#python.buildenv-function) or [`python.withPackages`](#python.withpackages-function) where the interpreter and other executables are wrapped to be able to find each other and all of the modules. In the following examples we will start by creating a simple, ad-hoc environment @@ -716,8 +723,8 @@ We've now seen how to create an ad-hoc temporary shell session, and how to create a single script with Python dependencies, but in the course of normal development we're usually working in an entire package repository. -As explained in the Nix manual, `nix-shell` can also load an expression from a -`.nix` file. Say we want to have Python 3.11, `numpy` and `toolz`, like before, +As explained [in the `nix-shell` section](https://nixos.org/manual/nix/stable/command-ref/nix-shell) of the Nix manual, `nix-shell` can also load an expression from a `.nix` file. +Say we want to have Python 3.11, `numpy` and `toolz`, like before, in an environment. We can add a `shell.nix` file describing our dependencies: ```nix @@ -739,8 +746,8 @@ What's happening here? imports the `` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. These attributes form the main package set. -2. Then we create a Python 3.11 environment with the `withPackages` function, as before. -3. The `withPackages` function expects us to provide a function as an argument +2. Then we create a Python 3.11 environment with the [`withPackages`](#python.withpackages-function) function, as before. +3. The [`withPackages`](#python.withpackages-function) function expects us to provide a function as an argument that takes the set of all Python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` from the package set. @@ -851,25 +858,32 @@ we will look at how you can use development mode with your code. #### Python library packages in Nixpkgs {#python-library-packages-in-nixpkgs} With Nix all packages are built by functions. The main function in Nix for -building Python libraries is `buildPythonPackage`. Let's see how we can build the +building Python libraries is [`buildPythonPackage`](#buildpythonpackage-function). Let's see how we can build the `toolz` package. ```nix { lib , buildPythonPackage , fetchPypi +, setuptools +, wheel }: buildPythonPackage rec { pname = "toolz"; version = "0.10.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + # has no tests doCheck = false; @@ -889,13 +903,13 @@ buildPythonPackage rec { } ``` -What happens here? The function `buildPythonPackage` is called and as argument +What happens here? The function [`buildPythonPackage`](#buildpythonpackage-function) is called and as argument it accepts a set. In this case the set is a recursive set, `rec`. One of the arguments is the name of the package, which consists of a basename (generally following the name on PyPi) and a version. Another argument, `src` specifies the source, which in this case is fetched from PyPI using the helper function `fetchPypi`. The argument `doCheck` is used to set whether tests should be run -when building the package. Since there are no tests, we rely on `pythonImportsCheck` +when building the package. Since there are no tests, we rely on [`pythonImportsCheck`](#using-pythonimportscheck) to test whether the package can be imported. Furthermore, we specify some meta information. The output of the function is a derivation. @@ -918,13 +932,18 @@ with import {}; my_toolz = python311.pkgs.buildPythonPackage rec { pname = "toolz"; version = "0.10.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; + nativeBuildInputs = [ + python311.pkgs.setuptools + python311.pkgs.wheel + ]; + # has no tests doCheck = false; @@ -949,7 +968,7 @@ for which Python version we want to build a package. So, what did we do here? Well, we took the Nix expression that we used earlier to build a Python environment, and said that we wanted to include our own version of `toolz`, named `my_toolz`. To introduce our own package in the scope -of `withPackages` we used a `let` expression. You can see that we used +of [`withPackages`](#python.withpackages-function) we used a `let` expression. You can see that we used `ps.numpy` to select numpy from the nixpkgs package set (`ps`). We did not take `toolz` from the Nixpkgs package set this time, but instead took our own version that we introduced with the `let` expression. @@ -957,14 +976,14 @@ that we introduced with the `let` expression. #### Handling dependencies {#handling-dependencies} Our example, `toolz`, does not have any dependencies on other Python packages or -system libraries. According to the manual, `buildPythonPackage` uses the -arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If +system libraries. According to the manual, [`buildPythonPackage`](#buildpythonpackage-function) uses the +arguments [`buildInputs`](#var-stdenv-buildInputs) and [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs) to specify dependencies. If something is exclusively a build-time dependency, then the dependency should be -included in `buildInputs`, but if it is (also) a runtime dependency, then it -should be added to `propagatedBuildInputs`. Test dependencies are considered -build-time dependencies and passed to `nativeCheckInputs`. +included in [`buildInputs`](#var-stdenv-buildInputs), but if it is (also) a runtime dependency, then it +should be added to [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs). Test dependencies are considered +build-time dependencies and passed to [`nativeCheckInputs`](#var-stdenv-nativeCheckInputs). -The following example shows which arguments are given to `buildPythonPackage` in +The following example shows which arguments are given to [`buildPythonPackage`](#buildpythonpackage-function) in order to build [`datashape`](https://github.com/blaze/datashape). ```nix @@ -972,6 +991,9 @@ order to build [`datashape`](https://github.com/blaze/datashape). , buildPythonPackage , fetchPypi +# build dependencies +, setuptools, wheel + # dependencies , numpy, multipledispatch, python-dateutil @@ -982,13 +1004,18 @@ order to build [`datashape`](https://github.com/blaze/datashape). buildPythonPackage rec { pname = "datashape"; version = "0.4.7"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-FLLvdm1MllKrgTGC6Gb0k0deZeVYvtCCLji/B7uhong="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ multipledispatch numpy @@ -1010,19 +1037,21 @@ buildPythonPackage rec { ``` We can see several runtime dependencies, `numpy`, `multipledispatch`, and -`python-dateutil`. Furthermore, we have `nativeCheckInputs` with `pytest`. -`pytest` is a test runner and is only used during the `checkPhase` and is -therefore not added to `propagatedBuildInputs`. +`python-dateutil`. Furthermore, we have [`nativeCheckInputs`](#var-stdenv-nativeCheckInputs) with `pytest`. +`pytest` is a test runner and is only used during the [`checkPhase`](#ssec-check-phase) and is +therefore not added to [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs). In the previous case we had only dependencies on other Python packages to consider. Occasionally you have also system libraries to consider. E.g., `lxml` provides Python bindings to `libxml2` and `libxslt`. These libraries are only required -when building the bindings and are therefore added as `buildInputs`. +when building the bindings and are therefore added as [`buildInputs`](#var-stdenv-buildInputs). ```nix { lib , buildPythonPackage , fetchPypi +, setuptools +, wheel , libxml2 , libxslt }: @@ -1030,13 +1059,18 @@ when building the bindings and are therefore added as `buildInputs`. buildPythonPackage rec { pname = "lxml"; version = "3.4.4"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-s9NiusRxFydHzaNRMjjxFcvWxfi45jGb9ql6eJJyQJk="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + buildInputs = [ libxml2 libxslt @@ -1058,7 +1092,7 @@ files of the dependencies are. This is not always the case. The example below shows bindings to The Fastest Fourier Transform in the West, commonly known as FFTW. On Nix we have separate packages of FFTW for the different types of floats (`"single"`, `"double"`, `"long-double"`). The -bindings need all three types, and therefore we add all three as `buildInputs`. +bindings need all three types, and therefore we add all three as [`buildInputs`](#var-stdenv-buildInputs). The bindings don't expect to find each of them in a different folder, and therefore we have to set `LDFLAGS` and `CFLAGS`. @@ -1067,6 +1101,10 @@ therefore we have to set `LDFLAGS` and `CFLAGS`. , buildPythonPackage , fetchPypi +# build dependencies +, setuptools +, wheel + # dependencies , fftw , fftwFloat @@ -1078,13 +1116,18 @@ therefore we have to set `LDFLAGS` and `CFLAGS`. buildPythonPackage rec { pname = "pyFFTW"; version = "0.9.2"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-9ru2r6kwhUCaskiFoaPNuJCfCVoUL01J40byvRt4kHQ="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + buildInputs = [ fftw fftwFloat @@ -1114,7 +1157,7 @@ buildPythonPackage rec { } ``` -Note also the line `doCheck = false;`, we explicitly disabled running the test-suite. +Note also the line [`doCheck = false;`](#var-stdenv-doCheck), we explicitly disabled running the test-suite. #### Testing Python Packages {#testing-python-packages} @@ -1123,10 +1166,10 @@ helps to avoid situations where the package was able to build and install, but is not usable at runtime. Currently, all packages will use the `test` command provided by the setup.py (i.e. `python setup.py test`). However, this is currently deprecated https://github.com/pypa/setuptools/pull/1878 -and your package should provide its own checkPhase. +and your package should provide its own [`checkPhase`](#ssec-check-phase). ::: {.note} -The `checkPhase` for python maps to the `installCheckPhase` on a +The [`checkPhase`](#ssec-check-phase) for python maps to the `installCheckPhase` on a normal derivation. This is due to many python packages not behaving well to the pre-installed version of the package. Version info, and natively compiled extensions generally only exist in the install directory, and @@ -1191,7 +1234,7 @@ been removed, in this case, it's recommended to use `pytestCheckHook`. #### Using pytestCheckHook {#using-pytestcheckhook} `pytestCheckHook` is a convenient hook which will substitute the setuptools -`test` command for a `checkPhase` which runs `pytest`. This is also beneficial +`test` command for a [`checkPhase`](#ssec-check-phase) which runs `pytest`. This is also beneficial when a package may need many items disabled to run the test suite. Using the example above, the analogous `pytestCheckHook` usage would be: @@ -1236,14 +1279,14 @@ for example: ``` Trying to concatenate the related strings to disable tests in a regular -`checkPhase` would be much harder to read. This also enables us to comment on +[`checkPhase`](#ssec-check-phase) would be much harder to read. This also enables us to comment on why specific tests are disabled. #### Using pythonImportsCheck {#using-pythonimportscheck} Although unit tests are highly preferred to validate correctness of a package, not all packages have test suites that can be run easily, and some have none at all. -To help ensure the package still works, `pythonImportsCheck` can attempt to import +To help ensure the package still works, [`pythonImportsCheck`](#using-pythonimportscheck) can attempt to import the listed modules. ``` @@ -1262,7 +1305,7 @@ roughly translates to: ''; ``` -However, this is done in its own phase, and not dependent on whether `doCheck = true;`. +However, this is done in its own phase, and not dependent on whether [`doCheck = true;`](#var-stdenv-doCheck). This can also be useful in verifying that the package doesn't assume commonly present packages (e.g. `setuptools`). @@ -1334,13 +1377,11 @@ instead of a dev dependency). Keep in mind that while the examples above are done with `requirements.txt`, `pythonRelaxDepsHook` works by modifying the resulting wheel file, so it should -work in any of the formats supported by `buildPythonPackage` currently, -with the exception of `other` (see `format` in -[`buildPythonPackage` parameters](#buildpythonpackage-parameters) for more details). +work with any of the [existing hooks](#setup-hooks). #### Using unittestCheckHook {#using-unittestcheckhook} -`unittestCheckHook` is a hook which will substitute the setuptools `test` command for a `checkPhase` which runs `python -m unittest discover`: +`unittestCheckHook` is a hook which will substitute the setuptools `test` command for a [`checkPhase`](#ssec-check-phase) which runs `python -m unittest discover`: ``` nativeCheckInputs = [ @@ -1410,15 +1451,15 @@ mode is also available. Let's see how you can use it. In the previous Nix expression the source was fetched from a url. We can also refer to a local source instead using `src = ./path/to/source/tree;` -If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src` +If we create a `shell.nix` file which calls [`buildPythonPackage`](#buildpythonpackage-function), and if `src` is a local source, and if the local source has a `setup.py`, then development mode is activated. In the following example, we create a simple environment that has a Python 3.11 version of our package in it, as well as its dependencies and other packages we -like to have in the environment, all specified with `propagatedBuildInputs`. +like to have in the environment, all specified with [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs). Indeed, we can just add any package we like to have in our environment to -`propagatedBuildInputs`. +[`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs). ```nix with import {}; @@ -1452,7 +1493,7 @@ own packages. The important functions here are `import` and `callPackage`. ### Including a derivation using `callPackage` {#including-a-derivation-using-callpackage} -Earlier we created a Python environment using `withPackages`, and included the +Earlier we created a Python environment using [`withPackages`](#python.withpackages-function), and included the `toolz` package via a `let` expression. Let's split the package definition from the environment definition. @@ -1461,18 +1502,26 @@ We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` ```nix { lib , buildPythonPackage +, fetchPypi +, setuptools +, wheel }: buildPythonPackage rec { pname = "toolz"; version = "0.10.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; + nativeBuildInputs = [ + setuptools + wheel + ]; + meta = with lib; { changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}"; homepage = "https://github.com/pytoolz/toolz/"; @@ -1483,7 +1532,7 @@ buildPythonPackage rec { } ``` -It takes an argument `buildPythonPackage`. We now call this function using +It takes an argument [`buildPythonPackage`](#buildpythonpackage-function). We now call this function using `callPackage` in the definition of our environment ```nix @@ -1502,10 +1551,10 @@ Packages.buildPythonPackage; ``` Important to remember is that the Python version for which the package is made -depends on the `python` derivation that is passed to `buildPythonPackage`. Nix +depends on the `python` derivation that is passed to [`buildPythonPackage`](#buildpythonpackage-function). Nix tries to automatically pass arguments when possible, which is why generally you don't explicitly define which `python` derivation should be used. In the above -example we use `buildPythonPackage` that is part of the set `python3Packages`, +example we use [`buildPythonPackage`](#buildpythonpackage-function) that is part of the set `python3Packages`, and in this case the `python3` interpreter is automatically used. ## FAQ {#faq} @@ -1648,7 +1697,7 @@ Python, guarantees the right versions of the interpreter and libraries or packages are available. There is therefore no need to maintain a global `site-packages`. If you want to create a Python environment for development, then the recommended -method is to use `nix-shell`, either with or without the `python.buildEnv` +method is to use `nix-shell`, either with or without the [`python.buildEnv`](#python.buildenv-function) function. ### How to consume Python modules using pip in a virtual environment like I am used to on other Operating Systems? {#how-to-consume-python-modules-using-pip-in-a-virtual-environment-like-i-am-used-to-on-other-operating-systems} @@ -1825,7 +1874,7 @@ self: super: { ### How to override a Python package for all Python versions using extensions? {#how-to-override-a-python-package-for-all-python-versions-using-extensions} -The following overlay overrides the call to `buildPythonPackage` for the +The following overlay overrides the call to [`buildPythonPackage`](#buildpythonpackage-function) for the `foo` package for all interpreters by appending a Python extension to the `pythonPackagesExtensions` list of extensions. @@ -1852,9 +1901,9 @@ configure alternatives](#sec-overlays-alternatives-blas-lapack)". In a `setup.py` or `setup.cfg` it is common to declare dependencies: -* `setup_requires` corresponds to `nativeBuildInputs` -* `install_requires` corresponds to `propagatedBuildInputs` -* `tests_require` corresponds to `nativeCheckInputs` +* `setup_requires` corresponds to [`nativeBuildInputs`](#var-stdenv-nativeBuildInputs) +* `install_requires` corresponds to [`propagatedBuildInputs`](#var-stdenv-propagatedBuildInputs) +* `tests_require` corresponds to [`nativeCheckInputs`](#var-stdenv-nativeCheckInputs) ### How to enable interpreter optimizations? {#optimizations} @@ -1901,7 +1950,7 @@ collisions. ### How to contribute a Python package to nixpkgs? {#tools} -Packages inside nixpkgs must use the `buildPythonPackage` or `buildPythonApplication` function directly, +Packages inside nixpkgs must use the [`buildPythonPackage`](#buildpythonpackage-function) or [`buildPythonApplication`](#buildpythonapplication-function) function directly, because we can only provide security support for non-vendored dependencies. We recommend [nix-init](https://github.com/nix-community/nix-init) for creating new python packages within nixpkgs, @@ -1915,7 +1964,7 @@ has security implications and is relevant for those using Python in a `nix-shell`. When the environment variable `DETERMINISTIC_BUILD` is set, all bytecode will -have timestamp 1. The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` +have timestamp 1. The [`buildPythonPackage`](#buildpythonpackage-function) function sets `DETERMINISTIC_BUILD=1` and [PYTHONHASHSEED=0](https://docs.python.org/3.11/using/cmdline.html#envvar-PYTHONHASHSEED). Both are also exported in `nix-shell`. @@ -1925,12 +1974,12 @@ It is recommended to test packages as part of the build process. Source distributions (`sdist`) often include test files, but not always. By default the command `python setup.py test` is run as part of the -`checkPhase`, but often it is necessary to pass a custom `checkPhase`. An +[`checkPhase`](#ssec-check-phase), but often it is necessary to pass a custom [`checkPhase`](#ssec-check-phase). An example of such a situation is when `py.test` is used. #### Common issues {#common-issues} -* Non-working tests can often be deselected. By default `buildPythonPackage` +* Non-working tests can often be deselected. By default [`buildPythonPackage`](#buildpythonpackage-function) runs `python setup.py test`. which is deprecated. Most Python modules however do follow the standard test protocol where the pytest runner can be used instead. `pytest` supports the `-k` and `--ignore` parameters to ignore test @@ -1965,10 +2014,10 @@ example of such a situation is when `py.test` is used. The following rules are desired to be respected: * Python libraries are called from `python-packages.nix` and packaged with - `buildPythonPackage`. The expression of a library should be in + [`buildPythonPackage`](#buildpythonpackage-function). The expression of a library should be in `pkgs/development/python-modules//default.nix`. * Python applications live outside of `python-packages.nix` and are packaged - with `buildPythonApplication`. + with [`buildPythonApplication`](#buildpythonapplication-function). * Make sure libraries build for all Python interpreters. * By default we enable tests. Make sure the tests are found and, in the case of libraries, are passing for all interpreters. If certain tests fail they can be diff --git a/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md b/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md index f1953500fa..d3b896686c 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md @@ -32,7 +32,8 @@ Again, it's possible to launch the interpreter from the shell. The Ruby interpre #### Load Ruby environment from `.nix` expression {#load-ruby-environment-from-.nix-expression} -As explained in the Nix manual, `nix-shell` can also load an expression from a `.nix` file. Say we want to have Ruby 2.6, `nokogori`, and `pry`. Consider a `shell.nix` file with: +As explained [in the `nix-shell` section](https://nixos.org/manual/nix/stable/command-ref/nix-shell) of the Nix manual, `nix-shell` can also load an expression from a `.nix` file. +Say we want to have Ruby 2.6, `nokogori`, and `pry`. Consider a `shell.nix` file with: ```nix with import {}; @@ -120,6 +121,16 @@ One common issue that you might have is that you have Ruby 2.6, but also `bundle mkShell { buildInputs = [ gems (lowPrio gems.wrappedRuby) ]; } ``` +Sometimes a Gemfile references other files. Such as `.ruby-version` or vendored gems. When copying the Gemfile to the nix store we need to copy those files alongside. This can be done using `extraConfigPaths`. For example: + +```nix + gems = bundlerEnv { + name = "gems-for-some-project"; + gemdir = ./.; + extraConfigPaths = [ "${./.}/.ruby-version" ]; + }; +``` + ### Gem-specific configurations and workarounds {#gem-specific-configurations-and-workarounds} In some cases, especially if the gem has native extensions, you might need to modify the way the gem is built. diff --git a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md index 0873802644..67e23cc74d 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md @@ -102,7 +102,7 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { inherit pname version; - sha256 = "sha256-aDQA4A5mScX9or3Lyiv/5GyAehidnpKKE0grhbP1Ctc="; + hash = "sha256-aDQA4A5mScX9or3Lyiv/5GyAehidnpKKE0grhbP1Ctc="; }; cargoHash = "sha256-tbrTbutUs5aPSV+yE0IBUZAAytgmZV7Eqxia7g+9zRs="; diff --git a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md index bf0d663179..1f3727f552 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/vim.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/vim.section.md @@ -134,7 +134,7 @@ If one of your favourite plugins isn't packaged, you can package it yourself: { config, pkgs, ... }: let - easygrep = pkgs.vimUtils.buildVimPluginFrom2Nix { + easygrep = pkgs.vimUtils.buildVimPlugin { name = "vim-easygrep"; src = pkgs.fetchFromGitHub { owner = "dkprice"; @@ -212,9 +212,9 @@ Note: this is not possible anymore for Neovim. ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs} -Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). +Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`nix-shell -p vimPluginsUpdater --run vim-plugins-updater`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/updater.nix). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). -After running `./update.py`, if nvim-treesitter received an update, also run [`nvim-treesitter/update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py) to update the tree sitter grammars for `nvim-treesitter`. +After running the updater, if nvim-treesitter received an update, also run [`nvim-treesitter/update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py) to update the tree sitter grammars for `nvim-treesitter`. Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: @@ -241,7 +241,8 @@ GITHUB_API_TOKEN=my_token ./pkgs/applications/editors/vim/plugins/update.py Alternatively, set the number of processes to a lower count to avoid rate-limiting. ```sh -./pkgs/applications/editors/vim/plugins/update.py --proc 1 + +nix-shell -p vimPluginsUpdater --run 'vim-plugins-updater --proc 1' ``` ## How to maintain an out-of-tree overlay of vim plugins ? {#vim-out-of-tree-overlays} @@ -250,7 +251,7 @@ You can use the updater script to generate basic packages out of a custom vim plugin list: ``` -pkgs/applications/editors/vim/plugins/update.py -i vim-plugin-names -o generated.nix --no-commit +nix-shell -p vimPluginsUpdater --run vim-plugins-updater -i vim-plugin-names -o generated.nix --no-commit ``` with the contents of `vim-plugin-names` being for example: @@ -264,7 +265,7 @@ You can then reference the generated vim plugins via: ```nix myVimPlugins = pkgs.vimPlugins.extend ( - (pkgs.callPackage generated.nix {}) + (pkgs.callPackage ./generated.nix {}) ); ``` diff --git a/third_party/nixpkgs/doc/preface.chapter.md b/third_party/nixpkgs/doc/preface.chapter.md index 7aae7fa905..aa6acca121 100644 --- a/third_party/nixpkgs/doc/preface.chapter.md +++ b/third_party/nixpkgs/doc/preface.chapter.md @@ -2,7 +2,7 @@ The Nix Packages collection (Nixpkgs) is a set of thousands of packages for the [Nix package manager](https://nixos.org/nix/), released under a -[permissive MIT/X11 license](https://github.com/NixOS/nixpkgs/blob/master/COPYING). +[permissive MIT license](https://github.com/NixOS/nixpkgs/blob/master/COPYING). Packages are available for several platforms, and can be used with the Nix package manager on most GNU/Linux distributions as well as [NixOS](https://nixos.org/nixos). diff --git a/third_party/nixpkgs/doc/stdenv/meta.chapter.md b/third_party/nixpkgs/doc/stdenv/meta.chapter.md index f6da0bb84b..c187f0602a 100644 --- a/third_party/nixpkgs/doc/stdenv/meta.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/meta.chapter.md @@ -24,7 +24,8 @@ It is expected that each meta-attribute is one of the following: ### `description` {#var-meta-description} -A short (one-line) description of the package. This is shown by `nix-env -q --description` and also on the Nixpkgs release pages. +A short (one-line) description of the package. +This is displayed on [search.nixos.org](https://search.nixos.org/packages). Don’t include a period at the end. Don’t include newline characters. Capitalise the first character. For brevity, don’t repeat the name of package --- just describe what it does. @@ -74,7 +75,7 @@ The name of the main binary for the package. This affects the binary `nix run` e ### `priority` {#var-meta-priority} -The *priority* of the package, used by `nix-env` to resolve file name conflicts between packages. See the Nix manual page for `nix-env` for details. Example: `"10"` (a low-priority package). +The *priority* of the package, used by `nix-env` to resolve file name conflicts between packages. See the [manual page for `nix-env`](https://nixos.org/manual/nix/stable/command-ref/nix-env) for details. Example: `"10"` (a low-priority package). ### `platforms` {#var-meta-platforms} diff --git a/third_party/nixpkgs/doc/stdenv/multiple-output.chapter.md b/third_party/nixpkgs/doc/stdenv/multiple-output.chapter.md index c19d497ab6..1ee063c0c2 100644 --- a/third_party/nixpkgs/doc/stdenv/multiple-output.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/multiple-output.chapter.md @@ -1,7 +1,5 @@ # Multiple-output packages {#chap-multiple-output} -## Introduction {#sec-multiple-outputs-introduction} - The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems. The outputs reside in separate Nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution. The exception is that building from source always produces all the outputs. The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced. Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime. As a result, closure sizes of many packages can get reduced to a half or even much less. @@ -10,44 +8,12 @@ The main motivation is to save disk space by reducing runtime closure sizes; con The reduction effects could be instead achieved by building the parts in completely separate derivations. That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once. This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb. ::: -A number of attributes can be used to work with a derivation with multiple outputs. The attribute `outputs` is a list of strings, which are the names of the outputs. For each of these names, an identically named attribute is created, corresponding to that output. The attribute `meta.outputsToInstall` is used to determine the default set of outputs to install when using the derivation name unqualified. +A number of attributes can be used to work with a derivation with multiple outputs. +The attribute `outputs` is a list of strings, which are the names of the outputs. +For each of these names, an identically named attribute is created, corresponding to that output. -## Installing a split package {#sec-multiple-outputs-installing} - -When installing a package with multiple outputs, the package’s `meta.outputsToInstall` attribute determines which outputs are actually installed. `meta.outputsToInstall` is a list whose [default installs binaries and the associated man pages](https://github.com/NixOS/nixpkgs/blob/f1680774340d5443a1409c3421ced84ac1163ba9/pkgs/stdenv/generic/make-derivation.nix#L310-L320). The following sections describe ways to install different outputs. - -### Selecting outputs to install via NixOS {#sec-multiple-outputs-installing-nixos} - -NixOS provides two ways to select the outputs to install for packages listed in `environment.systemPackages`: - -- The configuration option `environment.extraOutputsToInstall` is appended to each package’s `meta.outputsToInstall` attribute to determine the outputs to install. It can for example be used to install `info` documentation or debug symbols for all packages. - -- The outputs can be listed as packages in `environment.systemPackages`. For example, the `"out"` and `"info"` outputs for the `coreutils` package can be installed by including `coreutils` and `coreutils.info` in `environment.systemPackages`. - -### Selecting outputs to install via `nix-env` {#sec-multiple-outputs-installing-nix-env} - -`nix-env` lacks an easy way to select the outputs to install. When installing a package, `nix-env` always installs the outputs listed in `meta.outputsToInstall`, even when the user explicitly selects an output. - -::: {.warning} -`nix-env` silently disregards the outputs selected by the user, and instead installs the outputs from `meta.outputsToInstall`. For example, - -```ShellSession -$ nix-env -iA nixpkgs.coreutils.info -``` - -installs the `"out"` output (`coreutils.meta.outputsToInstall` is `[ "out" ]`) instead of the requested `"info"`. -::: - -The only recourse to select an output with `nix-env` is to override the package’s `meta.outputsToInstall`, using the functions described in [](#chap-overrides). For example, the following overlay adds the `"info"` output for the `coreutils` package: - -```nix -self: super: -{ - coreutils = super.coreutils.overrideAttrs (oldAttrs: { - meta = oldAttrs.meta // { outputsToInstall = oldAttrs.meta.outputsToInstall or [ "out" ] ++ [ "info" ]; }; - }); -} -``` +The attribute `meta.outputsToInstall` is used to determine the [default set of outputs to install](https://github.com/NixOS/nixpkgs/blob/08c3198f1c6fd89a09f8f0ea09b425028a34de3e/pkgs/stdenv/generic/check-meta.nix#L411-L426) when using the derivation name unqualified: +`bin`, or `out`, or the first specified output; as well as `man` if that is specified. ## Using a split package {#sec-multiple-outputs-using-split-packages} diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md index 56843467fa..366c519751 100644 --- a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md @@ -180,7 +180,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz"; - sha256 = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw="; + hash = "sha256-viwrS9lnaU8sTGuzK/+L/PlMM/xRRtgVuK5pixVeDEw="; }; nativeBuildInputs = [ makeWrapper pkg-config ]; @@ -937,6 +937,28 @@ Like `stripDebugList`, but only applies to packages’ target platform. By defau Flags passed to the `strip` command applied to the files in the directories listed in `stripDebugList`. Defaults to `-S` (i.e. `--strip-debug`). +##### `stripExclude` {#var-stdenv-stripExclude} + +A list of filenames or path patterns to avoid stripping. A file is excluded if its name _or_ path (from the derivation root) matches. + +This example prevents all `*.rlib` files from being stripped: + +```nix +stdenv.mkDerivation { + # ... + stripExclude = [ "*.rlib" ] +} +``` + +This example prevents files within certain paths from being stripped: + +```nix +stdenv.mkDerivation { + # ... + stripExclude = [ "lib/modules/*/build/* ] +} +``` + ##### `dontPatchELF` {#var-stdenv-dontPatchELF} If set, the `patchelf` command is not used to remove unnecessary `RPATH` entries. Only applies to Linux. @@ -969,13 +991,56 @@ Hook executed at the end of the fixup phase. If set to `true`, the standard environment will enable debug information in C/C++ builds. After installation, the debug information will be separated from the executables and stored in the output named `debug`. (This output is enabled automatically; you don’t need to set the `outputs` attribute explicitly.) To be precise, the debug information is stored in `debug/lib/debug/.build-id/XX/YYYY…`, where \ is the \ of the binary — a SHA-1 hash of the contents of the binary. Debuggers like GDB use the build ID to look up the separated debug information. -For example, with GDB, you can add +:::{.example #ex-gdb-debug-symbols-socat} -``` -set debug-file-directory ~/.nix-profile/lib/debug +# Enable debug symbols for use with GDB + +To make GDB find debug information for the `socat` package and its dependencies, you can use the following `shell.nix`: + +```nix +let + pkgs = import ./. { + config = {}; + overlays = [ + (final: prev: { + ncurses = prev.ncurses.overrideAttrs { separateDebugInfo = true; }; + readline = prev.readline.overrideAttrs { separateDebugInfo = true; }; + }) + ]; + }; + + myDebugInfoDirs = pkgs.symlinkJoin { + name = "myDebugInfoDirs"; + paths = with pkgs; [ + glibc.debug + ncurses.debug + openssl.debug + readline.debug + ]; + }; +in + pkgs.mkShell { + + NIX_DEBUG_INFO_DIRS = "${pkgs.lib.getLib myDebugInfoDirs}/lib/debug"; + + packages = [ + pkgs.gdb + pkgs.socat + ]; + + shellHook = '' + ${pkgs.lib.getBin pkgs.gdb}/bin/gdb ${pkgs.lib.getBin pkgs.socat}/bin/socat + ''; + } ``` -to `~/.gdbinit`. GDB will then be able to find debug information installed via `nix-env -i`. +This setup works as follows: +- Add [`overlays`](#chap-overlays) to the package set, since debug symbols are disabled for `ncurses` and `readline` by default. +- Create a derivation to combine all required debug symbols under one path with [`symlinkJoin`](#trivial-builder-symlinkJoin). +- Set the environment variable `NIX_DEBUG_INFO_DIRS` in the shell. Nixpkgs patches `gdb` to use it for looking up debug symbols. +- Run `gdb` on the `socat` binary on shell startup in the [`shellHook`](#sec-pkgs-mkShell). Here we use [`lib.getBin`](#function-library-lib.attrsets.getBin) to ensure that the correct derivation output is selected rather than the default one. + +::: ### The installCheck phase {#ssec-installCheck-phase} @@ -1179,7 +1244,7 @@ someVar=$(stripHash $name) ### `wrapProgram` \ \ {#fun-wrapProgram} -Convenience function for `makeWrapper` that replaces `<\executable\>` with a wrapper that executes the original program. It takes all the same arguments as `makeWrapper`, except for `--inherit-argv0` (used by the `makeBinaryWrapper` implementation) and `--argv0` (used by both `makeWrapper` and `makeBinaryWrapper` wrapper implementations). +Convenience function for `makeWrapper` that replaces `` with a wrapper that executes the original program. It takes all the same arguments as `makeWrapper`, except for `--inherit-argv0` (used by the `makeBinaryWrapper` implementation) and `--argv0` (used by both `makeWrapper` and `makeBinaryWrapper` wrapper implementations). If you will apply it multiple times, it will overwrite the wrapper file and you will end up with double wrapping, which should be avoided. @@ -1456,7 +1521,7 @@ This flag can break dynamic shared object loading. For instance, the module syst #### `bindnow` {#bindnow} -Adds the `-z bindnow` linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to `relro`). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn’t be an issue for daemons. +Adds the `-z now` linker option. During program load, all dynamic symbols are resolved, allowing for the complete GOT to be marked read-only (due to `relro`). This prevents GOT overwrite attacks. For very large applications, this can incur some performance loss during initial load while symbols are resolved, but this shouldn’t be an issue for daemons. This flag can break dynamic shared object loading. For instance, the module systems of Xorg and PHP are incompatible with this flag. Programs incompatible with this flag often fail at runtime due to missing symbols, like: diff --git a/third_party/nixpkgs/doc/using-nixpkgs.md b/third_party/nixpkgs/doc/using-nixpkgs.md index bb222ae384..f850b2e83c 100644 --- a/third_party/nixpkgs/doc/using-nixpkgs.md +++ b/third_party/nixpkgs/doc/using-nixpkgs.md @@ -1,6 +1,7 @@ # Using Nixpkgs {#part-using} ```{=include=} chapters +using/platform-support.chapter.md using/configuration.chapter.md using/overlays.chapter.md using/overrides.chapter.md diff --git a/third_party/nixpkgs/doc/using/overlays.chapter.md b/third_party/nixpkgs/doc/using/overlays.chapter.md index a51aa9ee8f..6ee52215a4 100644 --- a/third_party/nixpkgs/doc/using/overlays.chapter.md +++ b/third_party/nixpkgs/doc/using/overlays.chapter.md @@ -24,7 +24,7 @@ The list of overlays is determined as follows. 2. Otherwise, if the Nix path entry `` exists, we look for overlays at that path, as described below. - See the section on `NIX_PATH` in the Nix manual for more details on how to set a value for `.` + See the [section on `NIX_PATH`](https://nixos.org/manual/nix/stable/command-ref/env-common.html#env-NIX_PATH) in the Nix manual for more details on how to set a value for `.` 3. If one of `~/.config/nixpkgs/overlays.nix` and `~/.config/nixpkgs/overlays/` exists, then we look for overlays at that path, as described below. It is an error if both exist. diff --git a/third_party/nixpkgs/doc/using/platform-support.chapter.md b/third_party/nixpkgs/doc/using/platform-support.chapter.md new file mode 100644 index 0000000000..3f91b3d5d9 --- /dev/null +++ b/third_party/nixpkgs/doc/using/platform-support.chapter.md @@ -0,0 +1,18 @@ +# Platform Support {#chap-platform-support} + +Packages receive varying degrees of support, both in terms of maintainer attention and available computation resources for continuous integration (CI). + +Below is the list of the best supported platforms: + +- `x86_64-linux`: Highest level of support. +- `aarch64-linux`: Well supported, with most packages building successfully in CI. +- `aarch64-darwin`: Receives better support than `x86_64-darwin`. +- `x86_64-darwin`: Receives some support. + +There are many other platforms with varying levels of support. +The provisional platform list in [Appendix A] of [RFC046], while not up to date, can be used as guidance. + +A more formal definition of the platform support tiers is provided in [RFC046], but has not been fully implemented yet. + +[RFC046]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md +[Appendix A]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#appendix-a-non-normative-description-of-platforms-in-november-2019 diff --git a/third_party/nixpkgs/lib/README.md b/third_party/nixpkgs/lib/README.md index ac7cbd4330..627086843d 100644 --- a/third_party/nixpkgs/lib/README.md +++ b/third_party/nixpkgs/lib/README.md @@ -70,4 +70,7 @@ tests/filesystem.sh # Run the lib.path property tests path/tests/prop.sh + +# Run the lib.fileset tests +fileset/tests.sh ``` diff --git a/third_party/nixpkgs/lib/attrsets.nix b/third_party/nixpkgs/lib/attrsets.nix index 77e36d3271..b8960cf73f 100644 --- a/third_party/nixpkgs/lib/attrsets.nix +++ b/third_party/nixpkgs/lib/attrsets.nix @@ -338,7 +338,7 @@ rec { ); /* - Like builtins.foldl' but for attribute sets. + Like [`lib.lists.foldl'`](#function-library-lib.lists.foldl-prime) but for attribute sets. Iterates over every name-value pair in the given attribute set. The result of the callback function is often called `acc` for accumulator. It is passed between callbacks from left to right and the final `acc` is the return value of `foldlAttrs`. @@ -372,9 +372,9 @@ rec { 123 foldlAttrs - (_: _: v: v) - (throw "initial accumulator not needed") - { z = 3; a = 2; }; + (acc: _: _: acc) + 3 + { z = throw "value not needed"; a = throw "value not needed"; }; -> 3 diff --git a/third_party/nixpkgs/lib/customisation.nix b/third_party/nixpkgs/lib/customisation.nix index 0d023aa361..ec2513021f 100644 --- a/third_party/nixpkgs/lib/customisation.nix +++ b/third_party/nixpkgs/lib/customisation.nix @@ -19,7 +19,7 @@ rec { name = "sed-4.2.2-pre"; src = fetchurl { url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2; - sha256 = "11nq06d131y4wmf3drm0yk502d2xc6n5qy82cg88rb9nqd2lj41k"; + hash = "sha256-MxBJRcM2rYzQYwJ5XKxhXTQByvSg5jZc5cSHEZoB2IY="; }; patches = []; }); diff --git a/third_party/nixpkgs/lib/default.nix b/third_party/nixpkgs/lib/default.nix index 136f4a4a46..169f013191 100644 --- a/third_party/nixpkgs/lib/default.nix +++ b/third_party/nixpkgs/lib/default.nix @@ -41,6 +41,7 @@ let # serialization cli = callLibs ./cli.nix; + gvariant = callLibs ./gvariant.nix; generators = callLibs ./generators.nix; # misc @@ -54,6 +55,7 @@ let # Eval-time filesystem handling path = callLibs ./path; filesystem = callLibs ./filesystem.nix; + fileset = callLibs ./fileset; sources = callLibs ./sources.nix; # back-compat aliases @@ -104,6 +106,7 @@ let upperChars toLower toUpper addContextFrom splitString removePrefix removeSuffix versionOlder versionAtLeast getName getVersion + cmakeOptionType cmakeBool cmakeFeature mesonOption mesonBool mesonEnable nameFromURL enableFeature enableFeatureAs withFeature withFeatureAs fixedWidthString fixedWidthNumber diff --git a/third_party/nixpkgs/lib/fileset/README.md b/third_party/nixpkgs/lib/fileset/README.md new file mode 100644 index 0000000000..1aed7efec4 --- /dev/null +++ b/third_party/nixpkgs/lib/fileset/README.md @@ -0,0 +1,216 @@ +# File set library + +This is the internal contributor documentation. +The user documentation is [in the Nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-fileset). + +## Goals + +The main goal of the file set library is to be able to select local files that should be added to the Nix store. +It should have the following properties: +- Easy: + The functions should have obvious semantics, be low in number and be composable. +- Safe: + Throw early and helpful errors when mistakes are detected. +- Lazy: + Only compute values when necessary. + +Non-goals are: +- Efficient: + If the abstraction proves itself worthwhile but too slow, it can be still be optimized further. + +## Tests + +Tests are declared in [`tests.sh`](./tests.sh) and can be run using +``` +./tests.sh +``` + +## Benchmark + +A simple benchmark against the HEAD commit can be run using +``` +./benchmark.sh HEAD +``` + +This is intended to be run manually and is not checked by CI. + +## Internal representation + +The internal representation is versioned in order to allow file sets from different Nixpkgs versions to be composed with each other, see [`internal.nix`](./internal.nix) for the versions and conversions between them. +This section describes only the current representation, but past versions will have to be supported by the code. + +### `fileset` + +An attribute set with these values: + +- `_type` (constant string `"fileset"`): + Tag to indicate this value is a file set. + +- `_internalVersion` (constant `3`, the current version): + Version of the representation. + +- `_internalIsEmptyWithoutBase` (bool): + Whether this file set is the empty file set without a base path. + If `true`, `_internalBase*` and `_internalTree` are not set. + This is the only way to represent an empty file set without needing a base path. + + Such a value can be used as the identity element for `union` and the return value of `unions []` and co. + +- `_internalBase` (path): + Any files outside of this path cannot influence the set of files. + This is always a directory. + +- `_internalBaseRoot` (path): + The filesystem root of `_internalBase`, same as `(lib.path.splitRoot _internalBase).root`. + This is here because this needs to be computed anyway, and this computation shouldn't be duplicated. + +- `_internalBaseComponents` (list of strings): + The path components of `_internalBase`, same as `lib.path.subpath.components (lib.path.splitRoot _internalBase).subpath`. + This is here because this needs to be computed anyway, and this computation shouldn't be duplicated. + +- `_internalTree` ([filesetTree](#filesettree)): + A tree representation of all included files under `_internalBase`. + +- `__noEval` (error): + An error indicating that directly evaluating file sets is not supported. + +## `filesetTree` + +One of the following: + +- `{ = filesetTree; }`: + A directory with a nested `filesetTree` value for directory entries. + Entries not included may either be omitted or set to `null`, as necessary to improve efficiency or laziness. + +- `"directory"`: + A directory with all its files included recursively, allowing early cutoff for some operations. + This specific string is chosen to be compatible with `builtins.readDir` for a simpler implementation. + +- `"regular"`, `"symlink"`, `"unknown"` or any other non-`"directory"` string: + A nested file with its file type. + These specific strings are chosen to be compatible with `builtins.readDir` for a simpler implementation. + Distinguishing between different file types is not strictly necessary for the functionality this library, + but it does allow nicer printing of file sets. + +- `null`: + A file or directory that is excluded from the tree. + It may still exist on the file system. + +## API design decisions + +This section justifies API design decisions. + +### Internal structure + +The representation of the file set data type is internal and can be changed over time. + +Arguments: +- (+) The point of this library is to provide high-level functions, users don't need to be concerned with how it's implemented +- (+) It allows adjustments to the representation, which is especially useful in the early days of the library. +- (+) It still allows the representation to be stabilized later if necessary and if it has proven itself + +### Influence tracking + +File set operations internally track the top-most directory that could influence the exact contents of a file set. +Specifically, `toSource` requires that the given `fileset` is completely determined by files within the directory specified by the `root` argument. +For example, even with `dir/file.txt` being the only file in `./.`, `toSource { root = ./dir; fileset = ./.; }` gives an error. +This is because `fileset` may as well be the result of filtering `./.` in a way that excludes `dir`. + +Arguments: +- (+) This gives us the guarantee that adding new files to a project never breaks a file set expression. + This is also true in a lesser form for removed files: + only removing files explicitly referenced by paths can break a file set expression. +- (+) This can be removed later, if we discover it's too restrictive +- (-) It leads to errors when a sensible result could sometimes be returned, such as in the above example. + +### Empty file set without a base + +There is a special representation for an empty file set without a base path. +This is used for return values that should be empty but when there's no base path that would makes sense. + +Arguments: +- Alternative: This could also be represented using `_internalBase = /.` and `_internalTree = null`. + - (+) Removes the need for a special representation. + - (-) Due to [influence tracking](#influence-tracking), + `union empty ./.` would have `/.` as the base path, + which would then prevent `toSource { root = ./.; fileset = union empty ./.; }` from working, + which is not as one would expect. + - (-) With the assumption that there can be multiple filesystem roots (as established with the [path library](../path/README.md)), + this would have to cause an error with `union empty pathWithAnotherFilesystemRoot`, + which is not as one would expect. +- Alternative: Do not have such a value and error when it would be needed as a return value + - (+) Removes the need for a special representation. + - (-) Leaves us with no identity element for `union` and no reasonable return value for `unions []`. + From a set theory perspective, which has a well-known notion of empty sets, this is unintuitive. + +### Empty directories + +File sets can only represent a _set_ of local files, directories on their own are not representable. + +Arguments: +- (+) There does not seem to be a sensible set of combinators when directories can be represented on their own. + Here's some possibilities: + - `./.` represents the files in `./.` _and_ the directory itself including its subdirectories, meaning that even if there's no files, the entire structure of `./.` is preserved + + In that case, what should `fileFilter (file: false) ./.` return? + It could return the entire directory structure unchanged, but with all files removed, which would not be what one would expect. + + Trying to have a filter function that also supports directories will lead to the question of: + What should the behavior be if `./foo` itself is excluded but all of its contents are included? + It leads to having to define when directories are recursed into, but then we're effectively back at how the `builtins.path`-based filters work. + + - `./.` represents all files in `./.` _and_ the directory itself, but not its subdirectories, meaning that at least `./.` will be preserved even if it's empty. + + In that case, `intersect ./. ./foo` should only include files and no directories themselves, since `./.` includes only `./.` as a directory, and same for `./foo`, so there's no overlap in directories. + But intuitively this operation should result in the same as `./foo` – everything else is just confusing. +- (+) This matches how Git only supports files, so developers should already be used to it. +- (-) Empty directories (even if they contain nested directories) are neither representable nor preserved when coercing from paths. + - (+) It is very rare that empty directories are necessary. + - (+) We can implement a workaround, allowing `toSource` to take an extra argument for ensuring certain extra directories exist in the result. +- (-) It slows down store imports, since the evaluator needs to traverse the entire tree to remove any empty directories + - (+) This can still be optimized by introducing more Nix builtins if necessary + +### String paths + +File sets do not support Nix store paths in strings such as `"/nix/store/...-source"`. + +Arguments: +- (+) Such paths are usually produced by derivations, which means `toSource` would either: + - Require IFD if `builtins.path` is used as the underlying primitive + - Require importing the entire `root` into the store such that derivations can be used to do the filtering +- (+) The convenient path coercion like `union ./foo ./bar` wouldn't work for absolute paths, requiring more verbose alternate interfaces: + - `let root = "/nix/store/...-source"; in union "${root}/foo" "${root}/bar"` + + Verbose and dangerous because if `root` was a path, the entire path would get imported into the store. + + - `toSource { root = "/nix/store/...-source"; fileset = union "./foo" "./bar"; }` + + Does not allow debug printing intermediate file set contents, since we don't know the paths contents before having a `root`. + + - `let fs = lib.fileset.withRoot "/nix/store/...-source"; in fs.union "./foo" "./bar"` + + Makes library functions impure since they depend on the contextual root path, questionable composability. + +- (+) The point of the file set abstraction is to specify which files should get imported into the store. + + This use case makes little sense for files that are already in the store. + This should be a separate abstraction as e.g. `pkgs.drvLayout` instead, which could have a similar interface but be specific to derivations. + Additional capabilities could be supported that can't be done at evaluation time, such as renaming files, creating new directories, setting executable bits, etc. + +### Single files + +File sets cannot add single files to the store, they can only import files under directories. + +Arguments: +- (+) There's no point in using this library for a single file, since you can't do anything other than add it to the store or not. + And it would be unclear how the library should behave if the one file wouldn't be added to the store: + `toSource { root = ./file.nix; fileset = ; }` has no reasonable result because returing an empty store path wouldn't match the file type, and there's no way to have an empty file store path, whatever that would mean. + +## To update in the future + +Here's a list of places in the library that need to be updated in the future: +- > The file set library is currently somewhat limited but is being expanded to include more functions over time. + + in [the manual](../../doc/functions/fileset.section.md) +- If/Once a function to convert `lib.sources` values into file sets exists, the `_coerce` and `toSource` functions should be updated to mention that function in the error when such a value is passed +- If/Once a function exists that can optionally include a path depending on whether it exists, the error message for the path not existing in `_coerce` should mention the new function diff --git a/third_party/nixpkgs/lib/fileset/benchmark.sh b/third_party/nixpkgs/lib/fileset/benchmark.sh new file mode 100755 index 0000000000..59ddb6d49a --- /dev/null +++ b/third_party/nixpkgs/lib/fileset/benchmark.sh @@ -0,0 +1,140 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p sta jq bc nix -I nixpkgs=../.. +# shellcheck disable=SC2016 + +# Benchmarks lib.fileset +# Run: +# [nixpkgs]$ lib/fileset/benchmark.sh HEAD + +set -euo pipefail +shopt -s inherit_errexit dotglob + +if (( $# == 0 )); then + echo "Usage: $0 HEAD" + echo "Benchmarks the current tree against the HEAD commit. Any git ref will work." + exit 1 +fi +compareTo=$1 + +SCRIPT_FILE=$(readlink -f "${BASH_SOURCE[0]}") +SCRIPT_DIR=$(dirname "$SCRIPT_FILE") + +nixpkgs=$(cd "$SCRIPT_DIR/../.."; pwd) + +tmp="$(mktemp -d)" +clean_up() { + rm -rf "$tmp" +} +trap clean_up EXIT SIGINT SIGTERM +work="$tmp/work" +mkdir "$work" +cd "$work" + +declare -a stats=( + ".envs.elements" + ".envs.number" + ".gc.totalBytes" + ".list.concats" + ".list.elements" + ".nrFunctionCalls" + ".nrLookups" + ".nrOpUpdates" + ".nrPrimOpCalls" + ".nrThunks" + ".sets.elements" + ".sets.number" + ".symbols.number" + ".values.number" +) + +runs=10 + +run() { + # Empty the file + : > cpuTimes + + for i in $(seq 0 "$runs"); do + NIX_PATH=nixpkgs=$1 NIX_SHOW_STATS=1 NIX_SHOW_STATS_PATH=$tmp/stats.json \ + nix-instantiate --eval --strict --show-trace >/dev/null \ + --expr 'with import ; with fileset; '"$2" + + # Only measure the time after the first run, one is warmup + if (( i > 0 )); then + jq '.cpuTime' "$tmp/stats.json" >> cpuTimes + fi + done + + # Compute mean and standard deviation + read -r mean sd < <(sta --mean --sd --brief &2 + #echo "Running benchmark on index" >&2 + run "$nixpkgs" "$1" > "$tmp/new.json" + ( + #echo "Checking out $compareTo" >&2 + git -C "$nixpkgs" worktree add --quiet "$tmp/worktree" "$compareTo" + trap 'git -C "$nixpkgs" worktree remove "$tmp/worktree"' EXIT + #echo "Running benchmark on $compareTo" >&2 + run "$tmp/worktree" "$1" > "$tmp/old.json" + ) + + read -r oldMean oldSd newMean newSd percentageMean percentageSd < \ + <(jq -rn --slurpfile old "$tmp/old.json" --slurpfile new "$tmp/new.json" \ + ' $old[0].cpuTimeMean as $om + | $old[0].cpuTimeSd as $os + | $new[0].cpuTimeMean as $nm + | $new[0].cpuTimeSd as $ns + | (100 / $om * $nm) as $pm + # Copied from https://github.com/sharkdp/hyperfine/blob/b38d550b89b1dab85139eada01c91a60798db9cc/src/benchmark/relative_speed.rs#L46-L53 + | ($pm * pow(pow($ns / $nm; 2) + pow($os / $om; 2); 0.5)) as $ps + | [ $om, $os, $nm, $ns, $pm, $ps ] + | @sh') + + echo -e "Mean CPU time $newMean (σ = $newSd) for $runs runs is \e[0;33m$percentageMean% (σ = $percentageSd%)\e[0m of the old value $oldMean (σ = $oldSd)" >&2 + + different=0 + for stat in "${stats[@]}"; do + oldValue=$(jq "$stat" "$tmp/old.json") + newValue=$(jq "$stat" "$tmp/new.json") + if (( oldValue != newValue )); then + percent=$(bc <<< "scale=100; result = 100/$oldValue*$newValue; scale=4; result / 1") + if (( oldValue < newValue )); then + echo -e "Statistic $stat ($newValue) is \e[0;31m$percent% (+$(( newValue - oldValue )))\e[0m of the old value $oldValue" >&2 + else + echo -e "Statistic $stat ($newValue) is \e[0;32m$percent% (-$(( oldValue - newValue )))\e[0m of the old value $oldValue" >&2 + fi + (( different++ )) || true + fi + done + echo "$different stats differ between the current tree and $compareTo" + echo "" +} + +# Create a fairly populated tree +touch f{0..5} +mkdir d{0..5} +mkdir e{0..5} +touch d{0..5}/f{0..5} +mkdir -p d{0..5}/d{0..5} +mkdir -p e{0..5}/e{0..5} +touch d{0..5}/d{0..5}/f{0..5} +mkdir -p d{0..5}/d{0..5}/d{0..5} +mkdir -p e{0..5}/e{0..5}/e{0..5} +touch d{0..5}/d{0..5}/d{0..5}/f{0..5} +mkdir -p d{0..5}/d{0..5}/d{0..5}/d{0..5} +mkdir -p e{0..5}/e{0..5}/e{0..5}/e{0..5} +touch d{0..5}/d{0..5}/d{0..5}/d{0..5}/f{0..5} + +bench 'toSource { root = ./.; fileset = ./.; }' + +rm -rf -- * + +touch {0..1000} +bench 'toSource { root = ./.; fileset = unions (mapAttrsToList (name: value: ./. + "/${name}") (builtins.readDir ./.)); }' +rm -rf -- * diff --git a/third_party/nixpkgs/lib/fileset/default.nix b/third_party/nixpkgs/lib/fileset/default.nix new file mode 100644 index 0000000000..93a552262b --- /dev/null +++ b/third_party/nixpkgs/lib/fileset/default.nix @@ -0,0 +1,368 @@ +{ lib }: +let + + inherit (import ./internal.nix { inherit lib; }) + _coerce + _coerceMany + _toSourceFilter + _unionMany + _printFileset + ; + + inherit (builtins) + isList + isPath + pathExists + seq + typeOf + ; + + inherit (lib.lists) + imap0 + ; + + inherit (lib.path) + hasPrefix + splitRoot + ; + + inherit (lib.strings) + isStringLike + ; + + inherit (lib.filesystem) + pathType + ; + + inherit (lib.sources) + cleanSourceWith + ; + + inherit (lib.trivial) + pipe + ; + +in { + + /* + Add the local files contained in `fileset` to the store as a single [store path](https://nixos.org/manual/nix/stable/glossary#gloss-store-path) rooted at `root`. + + The result is the store path as a string-like value, making it usable e.g. as the `src` of a derivation, or in string interpolation: + ```nix + stdenv.mkDerivation { + src = lib.fileset.toSource { ... }; + # ... + } + ``` + + The name of the store path is always `source`. + + Type: + toSource :: { + root :: Path, + fileset :: FileSet, + } -> SourceLike + + Example: + # Import the current directory into the store + # but only include files under ./src + toSource { + root = ./.; + fileset = ./src; + } + => "/nix/store/...-source" + + # Import the current directory into the store + # but only include ./Makefile and all files under ./src + toSource { + root = ./.; + fileset = union + ./Makefile + ./src; + } + => "/nix/store/...-source" + + # Trying to include a file outside the root will fail + toSource { + root = ./.; + fileset = unions [ + ./Makefile + ./src + ../LICENSE + ]; + } + => + + # The root needs to point to a directory that contains all the files + toSource { + root = ../.; + fileset = unions [ + ./Makefile + ./src + ../LICENSE + ]; + } + => "/nix/store/...-source" + + # The root has to be a local filesystem path + toSource { + root = "/nix/store/...-source"; + fileset = ./.; + } + => + */ + toSource = { + /* + (required) The local directory [path](https://nixos.org/manual/nix/stable/language/values.html#type-path) that will correspond to the root of the resulting store path. + Paths in [strings](https://nixos.org/manual/nix/stable/language/values.html#type-string), including Nix store paths, cannot be passed as `root`. + `root` has to be a directory. + + +:::{.note} +Changing `root` only affects the directory structure of the resulting store path, it does not change which files are added to the store. +The only way to change which files get added to the store is by changing the `fileset` attribute. +::: + */ + root, + /* + (required) The file set whose files to import into the store. + File sets can be created using other functions in this library. + This argument can also be a path, + which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + + +:::{.note} +If a directory does not recursively contain any file, it is omitted from the store path contents. +::: + + */ + fileset, + }: + let + # We cannot rename matched attribute arguments, so let's work around it with an extra `let in` statement + filesetArg = fileset; + in + let + fileset = _coerce "lib.fileset.toSource: `fileset`" filesetArg; + rootFilesystemRoot = (splitRoot root).root; + filesetFilesystemRoot = (splitRoot fileset._internalBase).root; + sourceFilter = _toSourceFilter fileset; + in + if ! isPath root then + if isStringLike root then + throw '' + lib.fileset.toSource: `root` ("${toString root}") is a string-like value, but it should be a path instead. + Paths in strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.'' + else + throw '' + lib.fileset.toSource: `root` is of type ${typeOf root}, but it should be a path instead.'' + # Currently all Nix paths have the same filesystem root, but this could change in the future. + # See also ../path/README.md + else if ! fileset._internalIsEmptyWithoutBase && rootFilesystemRoot != filesetFilesystemRoot then + throw '' + lib.fileset.toSource: Filesystem roots are not the same for `fileset` and `root` ("${toString root}"): + `root`: root "${toString rootFilesystemRoot}" + `fileset`: root "${toString filesetFilesystemRoot}" + Different roots are not supported.'' + else if ! pathExists root then + throw '' + lib.fileset.toSource: `root` (${toString root}) does not exist.'' + else if pathType root != "directory" then + throw '' + lib.fileset.toSource: `root` (${toString root}) is a file, but it should be a directory instead. Potential solutions: + - If you want to import the file into the store _without_ a containing directory, use string interpolation or `builtins.path` instead of this function. + - If you want to import the file into the store _with_ a containing directory, set `root` to the containing directory, such as ${toString (dirOf root)}, and set `fileset` to the file path.'' + else if ! fileset._internalIsEmptyWithoutBase && ! hasPrefix root fileset._internalBase then + throw '' + lib.fileset.toSource: `fileset` could contain files in ${toString fileset._internalBase}, which is not under the `root` (${toString root}). Potential solutions: + - Set `root` to ${toString fileset._internalBase} or any directory higher up. This changes the layout of the resulting store path. + - Set `fileset` to a file set that cannot contain files outside the `root` (${toString root}). This could change the files included in the result.'' + else + builtins.seq sourceFilter + cleanSourceWith { + name = "source"; + src = root; + filter = sourceFilter; + }; + + /* + The file set containing all files that are in either of two given file sets. + This is the same as [`unions`](#function-library-lib.fileset.unions), + but takes just two file sets instead of a list. + See also [Union (set theory)](https://en.wikipedia.org/wiki/Union_(set_theory)). + + The given file sets are evaluated as lazily as possible, + with the first argument being evaluated first if needed. + + Type: + union :: FileSet -> FileSet -> FileSet + + Example: + # Create a file set containing the file `Makefile` + # and all files recursively in the `src` directory + union ./Makefile ./src + + # Create a file set containing the file `Makefile` + # and the LICENSE file from the parent directory + union ./Makefile ../LICENSE + */ + union = + # The first file set. + # This argument can also be a path, + # which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + fileset1: + # The second file set. + # This argument can also be a path, + # which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + fileset2: + _unionMany + (_coerceMany "lib.fileset.union" [ + { + context = "first argument"; + value = fileset1; + } + { + context = "second argument"; + value = fileset2; + } + ]); + + /* + The file set containing all files that are in any of the given file sets. + This is the same as [`union`](#function-library-lib.fileset.unions), + but takes a list of file sets instead of just two. + See also [Union (set theory)](https://en.wikipedia.org/wiki/Union_(set_theory)). + + The given file sets are evaluated as lazily as possible, + with earlier elements being evaluated first if needed. + + Type: + unions :: [ FileSet ] -> FileSet + + Example: + # Create a file set containing selected files + unions [ + # Include the single file `Makefile` in the current directory + # This errors if the file doesn't exist + ./Makefile + + # Recursively include all files in the `src/code` directory + # If this directory is empty this has no effect + ./src/code + + # Include the files `run.sh` and `unit.c` from the `tests` directory + ./tests/run.sh + ./tests/unit.c + + # Include the `LICENSE` file from the parent directory + ../LICENSE + ] + */ + unions = + # A list of file sets. + # The elements can also be paths, + # which get [implicitly coerced to file sets](#sec-fileset-path-coercion). + filesets: + if ! isList filesets then + throw "lib.fileset.unions: Expected argument to be a list, but got a ${typeOf filesets}." + else + pipe filesets [ + # Annotate the elements with context, used by _coerceMany for better errors + (imap0 (i: el: { + context = "element ${toString i}"; + value = el; + })) + (_coerceMany "lib.fileset.unions") + _unionMany + ]; + + /* + Incrementally evaluate and trace a file set in a pretty way. + This function is only intended for debugging purposes. + The exact tracing format is unspecified and may change. + + This function takes a final argument to return. + In comparison, [`traceVal`](#function-library-lib.fileset.traceVal) returns + the given file set argument. + + This variant is useful for tracing file sets in the Nix repl. + + Type: + trace :: FileSet -> Any -> Any + + Example: + trace (unions [ ./Makefile ./src ./tests/run.sh ]) null + => + trace: /home/user/src/myProject + trace: - Makefile (regular) + trace: - src (all files in directory) + trace: - tests + trace: - run.sh (regular) + null + */ + trace = + /* + The file set to trace. + + This argument can also be a path, + which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + */ + fileset: + let + # "fileset" would be a better name, but that would clash with the argument name, + # and we cannot change that because of https://github.com/nix-community/nixdoc/issues/76 + actualFileset = _coerce "lib.fileset.trace: argument" fileset; + in + seq + (_printFileset actualFileset) + (x: x); + + /* + Incrementally evaluate and trace a file set in a pretty way. + This function is only intended for debugging purposes. + The exact tracing format is unspecified and may change. + + This function returns the given file set. + In comparison, [`trace`](#function-library-lib.fileset.trace) takes another argument to return. + + This variant is useful for tracing file sets passed as arguments to other functions. + + Type: + traceVal :: FileSet -> FileSet + + Example: + toSource { + root = ./.; + fileset = traceVal (unions [ + ./Makefile + ./src + ./tests/run.sh + ]); + } + => + trace: /home/user/src/myProject + trace: - Makefile (regular) + trace: - src (all files in directory) + trace: - tests + trace: - run.sh (regular) + "/nix/store/...-source" + */ + traceVal = + /* + The file set to trace and return. + + This argument can also be a path, + which gets [implicitly coerced to a file set](#sec-fileset-path-coercion). + */ + fileset: + let + # "fileset" would be a better name, but that would clash with the argument name, + # and we cannot change that because of https://github.com/nix-community/nixdoc/issues/76 + actualFileset = _coerce "lib.fileset.traceVal: argument" fileset; + in + seq + (_printFileset actualFileset) + # We could also return the original fileset argument here, + # but that would then duplicate work for consumers of the fileset, because then they have to coerce it again + actualFileset; +} diff --git a/third_party/nixpkgs/lib/fileset/internal.nix b/third_party/nixpkgs/lib/fileset/internal.nix new file mode 100644 index 0000000000..d18e37e9d6 --- /dev/null +++ b/third_party/nixpkgs/lib/fileset/internal.nix @@ -0,0 +1,536 @@ +{ lib ? import ../. }: +let + + inherit (builtins) + isAttrs + isPath + isString + pathExists + readDir + seq + split + trace + typeOf + ; + + inherit (lib.attrsets) + attrNames + attrValues + mapAttrs + setAttrByPath + zipAttrsWith + ; + + inherit (lib.filesystem) + pathType + ; + + inherit (lib.lists) + all + commonPrefix + drop + elemAt + filter + findFirst + findFirstIndex + foldl' + head + length + sublist + tail + ; + + inherit (lib.path) + append + splitRoot + ; + + inherit (lib.path.subpath) + components + join + ; + + inherit (lib.strings) + isStringLike + concatStringsSep + substring + stringLength + ; + +in +# Rare case of justified usage of rec: +# - This file is internal, so the return value doesn't matter, no need to make things overridable +# - The functions depend on each other +# - We want to expose all of these functions for easy testing +rec { + + # If you change the internal representation, make sure to: + # - Increment this version + # - Add an additional migration function below + # - Update the description of the internal representation in ./README.md + _currentVersion = 3; + + # Migrations between versions. The 0th element converts from v0 to v1, and so on + migrations = [ + # Convert v0 into v1: Add the _internalBase{Root,Components} attributes + ( + filesetV0: + let + parts = splitRoot filesetV0._internalBase; + in + filesetV0 // { + _internalVersion = 1; + _internalBaseRoot = parts.root; + _internalBaseComponents = components parts.subpath; + } + ) + + # Convert v1 into v2: filesetTree's can now also omit attributes to signal paths not being included + ( + filesetV1: + # This change is backwards compatible (but not forwards compatible, so we still need a new version) + filesetV1 // { + _internalVersion = 2; + } + ) + + # Convert v2 into v3: filesetTree's now have a representation for an empty file set without a base path + ( + filesetV2: + filesetV2 // { + # All v1 file sets are not the new empty file set + _internalIsEmptyWithoutBase = false; + _internalVersion = 3; + } + ) + ]; + + _noEvalMessage = '' + lib.fileset: Directly evaluating a file set is not supported. + To turn it into a usable source, use `lib.fileset.toSource`. + To pretty-print the contents, use `lib.fileset.trace` or `lib.fileset.traceVal`.''; + + # The empty file set without a base path + _emptyWithoutBase = { + _type = "fileset"; + + _internalVersion = _currentVersion; + + # The one and only! + _internalIsEmptyWithoutBase = true; + + # Due to alphabetical ordering, this is evaluated last, + # which makes the nix repl output nicer than if it would be ordered first. + # It also allows evaluating it strictly up to this error, which could be useful + _noEval = throw _noEvalMessage; + }; + + # Create a fileset, see ./README.md#fileset + # Type: path -> filesetTree -> fileset + _create = base: tree: + let + # Decompose the base into its components + # See ../path/README.md for why we're not just using `toString` + parts = splitRoot base; + in + { + _type = "fileset"; + + _internalVersion = _currentVersion; + + _internalIsEmptyWithoutBase = false; + _internalBase = base; + _internalBaseRoot = parts.root; + _internalBaseComponents = components parts.subpath; + _internalTree = tree; + + # Due to alphabetical ordering, this is evaluated last, + # which makes the nix repl output nicer than if it would be ordered first. + # It also allows evaluating it strictly up to this error, which could be useful + _noEval = throw _noEvalMessage; + }; + + # Coerce a value to a fileset, erroring when the value cannot be coerced. + # The string gives the context for error messages. + # Type: String -> (fileset | Path) -> fileset + _coerce = context: value: + if value._type or "" == "fileset" then + if value._internalVersion > _currentVersion then + throw '' + ${context} is a file set created from a future version of the file set library with a different internal representation: + - Internal version of the file set: ${toString value._internalVersion} + - Internal version of the library: ${toString _currentVersion} + Make sure to update your Nixpkgs to have a newer version of `lib.fileset`.'' + else if value._internalVersion < _currentVersion then + let + # Get all the migration functions necessary to convert from the old to the current version + migrationsToApply = sublist value._internalVersion (_currentVersion - value._internalVersion) migrations; + in + foldl' (value: migration: migration value) value migrationsToApply + else + value + else if ! isPath value then + if isStringLike value then + throw '' + ${context} ("${toString value}") is a string-like value, but it should be a path instead. + Paths represented as strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.'' + else + throw '' + ${context} is of type ${typeOf value}, but it should be a path instead.'' + else if ! pathExists value then + throw '' + ${context} (${toString value}) does not exist.'' + else + _singleton value; + + # Coerce many values to filesets, erroring when any value cannot be coerced, + # or if the filesystem root of the values doesn't match. + # Type: String -> [ { context :: String, value :: fileset | Path } ] -> [ fileset ] + _coerceMany = functionContext: list: + let + filesets = map ({ context, value }: + _coerce "${functionContext}: ${context}" value + ) list; + + # Find the first value with a base, there may be none! + firstWithBase = findFirst (fileset: ! fileset._internalIsEmptyWithoutBase) null filesets; + # This value is only accessed if first != null + firstBaseRoot = firstWithBase._internalBaseRoot; + + # Finds the first element with a filesystem root different than the first element, if any + differentIndex = findFirstIndex (fileset: + # The empty value without a base doesn't have a base path + ! fileset._internalIsEmptyWithoutBase + && firstBaseRoot != fileset._internalBaseRoot + ) null filesets; + in + # Only evaluates `differentIndex` if there are any elements with a base + if firstWithBase != null && differentIndex != null then + throw '' + ${functionContext}: Filesystem roots are not the same: + ${(head list).context}: root "${toString firstBaseRoot}" + ${(elemAt list differentIndex).context}: root "${toString (elemAt filesets differentIndex)._internalBaseRoot}" + Different roots are not supported.'' + else + filesets; + + # Create a file set from a path. + # Type: Path -> fileset + _singleton = path: + let + type = pathType path; + in + if type == "directory" then + _create path type + else + # This turns a file path ./default.nix into a fileset with + # - _internalBase: ./. + # - _internalTree: { + # "default.nix" = ; + # } + # See ./README.md#single-files + _create (dirOf path) + { + ${baseNameOf path} = type; + }; + + # Expand a directory representation to an equivalent one in attribute set form. + # All directory entries are included in the result. + # Type: Path -> filesetTree -> { = filesetTree; } + _directoryEntries = path: value: + if value == "directory" then + readDir path + else + # Set all entries not present to null + mapAttrs (name: value: null) (readDir path) + // value; + + /* + A normalisation of a filesetTree suitable filtering with `builtins.path`: + - Replace all directories that have no files with `null`. + This removes directories that would be empty + - Replace all directories with all files with `"directory"`. + This speeds up the source filter function + + Note that this function is strict, it evaluates the entire tree + + Type: Path -> filesetTree -> filesetTree + */ + _normaliseTreeFilter = path: tree: + if tree == "directory" || isAttrs tree then + let + entries = _directoryEntries path tree; + normalisedSubtrees = mapAttrs (name: _normaliseTreeFilter (path + "/${name}")) entries; + subtreeValues = attrValues normalisedSubtrees; + in + # This triggers either when all files in a directory are filtered out + # Or when the directory doesn't contain any files at all + if all isNull subtreeValues then + null + # Triggers when we have the same as a `readDir path`, so we can turn it back into an equivalent "directory". + else if all isString subtreeValues then + "directory" + else + normalisedSubtrees + else + tree; + + /* + A minimal normalisation of a filesetTree, intended for pretty-printing: + - If all children of a path are recursively included or empty directories, the path itself is also recursively included + - If all children of a path are fully excluded or empty directories, the path itself is an empty directory + - Other empty directories are represented with the special "emptyDir" string + While these could be replaced with `null`, that would take another mapAttrs + + Note that this function is partially lazy. + + Type: Path -> filesetTree -> filesetTree (with "emptyDir"'s) + */ + _normaliseTreeMinimal = path: tree: + if tree == "directory" || isAttrs tree then + let + entries = _directoryEntries path tree; + normalisedSubtrees = mapAttrs (name: _normaliseTreeMinimal (path + "/${name}")) entries; + subtreeValues = attrValues normalisedSubtrees; + in + # If there are no entries, or all entries are empty directories, return "emptyDir". + # After this branch we know that there's at least one file + if all (value: value == "emptyDir") subtreeValues then + "emptyDir" + + # If all subtrees are fully included or empty directories + # (both of which are coincidentally represented as strings), return "directory". + # This takes advantage of the fact that empty directories can be represented as included directories. + # Note that the tree == "directory" check allows avoiding recursion + else if tree == "directory" || all (value: isString value) subtreeValues then + "directory" + + # If all subtrees are fully excluded or empty directories, return null. + # This takes advantage of the fact that empty directories can be represented as excluded directories + else if all (value: isNull value || value == "emptyDir") subtreeValues then + null + + # Mix of included and excluded entries + else + normalisedSubtrees + else + tree; + + # Trace a filesetTree in a pretty way when the resulting value is evaluated. + # This can handle both normal filesetTree's, and ones returned from _normaliseTreeMinimal + # Type: Path -> filesetTree (with "emptyDir"'s) -> Null + _printMinimalTree = base: tree: + let + treeSuffix = tree: + if isAttrs tree then + "" + else if tree == "directory" then + " (all files in directory)" + else + # This does "leak" the file type strings of the internal representation, + # but this is the main reason these file type strings even are in the representation! + # TODO: Consider removing that information from the internal representation for performance. + # The file types can still be printed by querying them only during tracing + " (${tree})"; + + # Only for attribute set trees + traceTreeAttrs = prevLine: indent: tree: + foldl' (prevLine: name: + let + subtree = tree.${name}; + + # Evaluating this prints the line for this subtree + thisLine = + trace "${indent}- ${name}${treeSuffix subtree}" prevLine; + in + if subtree == null || subtree == "emptyDir" then + # Don't print anything at all if this subtree is empty + prevLine + else if isAttrs subtree then + # A directory with explicit entries + # Do print this node, but also recurse + traceTreeAttrs thisLine "${indent} " subtree + else + # Either a file, or a recursively included directory + # Do print this node but no further recursion needed + thisLine + ) prevLine (attrNames tree); + + # Evaluating this will print the first line + firstLine = + if tree == null || tree == "emptyDir" then + trace "(empty)" null + else + trace "${toString base}${treeSuffix tree}" null; + in + if isAttrs tree then + traceTreeAttrs firstLine "" tree + else + firstLine; + + # Pretty-print a file set in a pretty way when the resulting value is evaluated + # Type: fileset -> Null + _printFileset = fileset: + if fileset._internalIsEmptyWithoutBase then + trace "(empty)" null + else + _printMinimalTree fileset._internalBase + (_normaliseTreeMinimal fileset._internalBase fileset._internalTree); + + # Turn a fileset into a source filter function suitable for `builtins.path` + # Only directories recursively containing at least one files are recursed into + # Type: Path -> fileset -> (String -> String -> Bool) + _toSourceFilter = fileset: + let + # Simplify the tree, necessary to make sure all empty directories are null + # which has the effect that they aren't included in the result + tree = _normaliseTreeFilter fileset._internalBase fileset._internalTree; + + # The base path as a string with a single trailing slash + baseString = + if fileset._internalBaseComponents == [] then + # Need to handle the filesystem root specially + "/" + else + "/" + concatStringsSep "/" fileset._internalBaseComponents + "/"; + + baseLength = stringLength baseString; + + # Check whether a list of path components under the base path exists in the tree. + # This function is called often, so it should be fast. + # Type: [ String ] -> Bool + inTree = components: + let + recurse = index: localTree: + if isAttrs localTree then + # We have an attribute set, meaning this is a directory with at least one file + if index >= length components then + # The path may have no more components though, meaning the filter is running on the directory itself, + # so we always include it, again because there's at least one file in it. + true + else + # If we do have more components, the filter runs on some entry inside this directory, so we need to recurse + # We do +2 because builtins.split is an interleaved list of the inbetweens and the matches + recurse (index + 2) localTree.${elemAt components index} + else + # If it's not an attribute set it can only be either null (in which case it's not included) + # or a string ("directory" or "regular", etc.) in which case it's included + localTree != null; + in recurse 0 tree; + + # Filter suited when there's no files + empty = _: _: false; + + # Filter suited when there's some files + # This can't be used for when there's no files, because the base directory is always included + nonEmpty = + path: _: + let + # Add a slash to the path string, turning "/foo" to "/foo/", + # making sure to not have any false prefix matches below. + # Note that this would produce "//" for "/", + # but builtins.path doesn't call the filter function on the `path` argument itself, + # meaning this function can never receive "/" as an argument + pathSlash = path + "/"; + in + # Same as `hasPrefix pathSlash baseString`, but more efficient. + # With base /foo/bar we need to include /foo: + # hasPrefix "/foo/" "/foo/bar/" + if substring 0 (stringLength pathSlash) baseString == pathSlash then + true + # Same as `! hasPrefix baseString pathSlash`, but more efficient. + # With base /foo/bar we need to exclude /baz + # ! hasPrefix "/baz/" "/foo/bar/" + else if substring 0 baseLength pathSlash != baseString then + false + else + # Same as `removePrefix baseString path`, but more efficient. + # From the above code we know that hasPrefix baseString pathSlash holds, so this is safe. + # We don't use pathSlash here because we only needed the trailing slash for the prefix matching. + # With base /foo and path /foo/bar/baz this gives + # inTree (split "/" (removePrefix "/foo/" "/foo/bar/baz")) + # == inTree (split "/" "bar/baz") + # == inTree [ "bar" "baz" ] + inTree (split "/" (substring baseLength (-1) path)); + in + # Special case because the code below assumes that the _internalBase is always included in the result + # which shouldn't be done when we have no files at all in the base + # This also forces the tree before returning the filter, leads to earlier error messages + if fileset._internalIsEmptyWithoutBase || tree == null then + empty + else + nonEmpty; + + # Computes the union of a list of filesets. + # The filesets must already be coerced and validated to be in the same filesystem root + # Type: [ Fileset ] -> Fileset + _unionMany = filesets: + let + # All filesets that have a base, aka not the ones that are the empty value without a base + filesetsWithBase = filter (fileset: ! fileset._internalIsEmptyWithoutBase) filesets; + + # The first fileset that has a base. + # This value is only accessed if there are at all. + firstWithBase = head filesetsWithBase; + + # To be able to union filesetTree's together, they need to have the same base path. + # Base paths can be unioned by taking their common prefix, + # e.g. such that `union /foo/bar /foo/baz` has the base path `/foo` + + # A list of path components common to all base paths. + # Note that commonPrefix can only be fully evaluated, + # so this cannot cause a stack overflow due to a build-up of unevaluated thunks. + commonBaseComponents = foldl' + (components: el: commonPrefix components el._internalBaseComponents) + firstWithBase._internalBaseComponents + # We could also not do the `tail` here to avoid a list allocation, + # but then we'd have to pay for a potentially expensive + # but unnecessary `commonPrefix` call + (tail filesetsWithBase); + + # The common base path assembled from a filesystem root and the common components + commonBase = append firstWithBase._internalBaseRoot (join commonBaseComponents); + + # A list of filesetTree's that all have the same base path + # This is achieved by nesting the trees into the components they have over the common base path + # E.g. `union /foo/bar /foo/baz` has the base path /foo + # So the tree under `/foo/bar` gets nested under `{ bar = ...; ... }`, + # while the tree under `/foo/baz` gets nested under `{ baz = ...; ... }` + # Therefore allowing combined operations over them. + trees = map (fileset: + setAttrByPath + (drop (length commonBaseComponents) fileset._internalBaseComponents) + fileset._internalTree + ) filesetsWithBase; + + # Folds all trees together into a single one using _unionTree + # We do not use a fold here because it would cause a thunk build-up + # which could cause a stack overflow for a large number of trees + resultTree = _unionTrees trees; + in + # If there's no values with a base, we have no files + if filesetsWithBase == [ ] then + _emptyWithoutBase + else + _create commonBase resultTree; + + # The union of multiple filesetTree's with the same base path. + # Later elements are only evaluated if necessary. + # Type: [ filesetTree ] -> filesetTree + _unionTrees = trees: + let + stringIndex = findFirstIndex isString null trees; + withoutNull = filter (tree: tree != null) trees; + in + if stringIndex != null then + # If there's a string, it's always a fully included tree (dir or file), + # no need to look at other elements + elemAt trees stringIndex + else if withoutNull == [ ] then + # If all trees are null, then the resulting tree is also null + null + else + # The non-null elements have to be attribute sets representing partial trees + # We need to recurse into those + zipAttrsWith (name: _unionTrees) withoutNull; +} diff --git a/third_party/nixpkgs/lib/fileset/mock-splitRoot.nix b/third_party/nixpkgs/lib/fileset/mock-splitRoot.nix new file mode 100644 index 0000000000..3c18ab1b1a --- /dev/null +++ b/third_party/nixpkgs/lib/fileset/mock-splitRoot.nix @@ -0,0 +1,26 @@ +# This overlay implements mocking of the lib.path.splitRoot function +# It pretends that the last component named "mock-root" is the root: +# +# splitRoot /foo/mock-root/bar/mock-root/baz +# => { +# root = /foo/mock-root/bar/mock-root; +# subpath = "./baz"; +# } +self: super: { + path = super.path // { + splitRoot = path: + let + parts = super.path.splitRoot path; + components = self.path.subpath.components parts.subpath; + count = self.length components; + rootIndex = count - self.lists.findFirstIndex + (component: component == "mock-root") + (self.length components) + (self.reverseList components); + root = self.path.append parts.root (self.path.subpath.join (self.take rootIndex components)); + subpath = self.path.subpath.join (self.drop rootIndex components); + in { + inherit root subpath; + }; + }; +} diff --git a/third_party/nixpkgs/lib/fileset/tests.sh b/third_party/nixpkgs/lib/fileset/tests.sh new file mode 100755 index 0000000000..9e09da8092 --- /dev/null +++ b/third_party/nixpkgs/lib/fileset/tests.sh @@ -0,0 +1,733 @@ +#!/usr/bin/env bash +# shellcheck disable=SC2016 + +# Tests lib.fileset +# Run: +# [nixpkgs]$ lib/fileset/tests.sh +# or: +# [nixpkgs]$ nix-build lib/tests/release.nix + +set -euo pipefail +shopt -s inherit_errexit dotglob + +die() { + # The second to last entry contains the line number of the top-level caller + lineIndex=$(( ${#BASH_LINENO[@]} - 2 )) + echo >&2 -e "test case at ${BASH_SOURCE[0]}:${BASH_LINENO[$lineIndex]} failed:" "$@" + exit 1 +} + +if test -n "${TEST_LIB:-}"; then + NIX_PATH=nixpkgs="$(dirname "$TEST_LIB")" +else + NIX_PATH=nixpkgs="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.."; pwd)" +fi +export NIX_PATH + +tmp="$(mktemp -d)" +clean_up() { + rm -rf "$tmp" +} +trap clean_up EXIT SIGINT SIGTERM +work="$tmp/work" +mkdir "$work" +cd "$work" + +# Crudely unquotes a JSON string by just taking everything between the first and the second quote. +# We're only using this for resulting /nix/store paths, which can't contain " anyways, +# nor can they contain any other characters that would need to be escaped specially in JSON +# This way we don't need to add a dependency on e.g. jq +crudeUnquoteJSON() { + cut -d \" -f2 +} + +prefixExpression='let + lib = import ; + internal = import { + inherit lib; + }; +in +with lib; +with internal; +with lib.fileset;' + +# Check that two nix expression successfully evaluate to the same value. +# The expressions have `lib.fileset` in scope. +# Usage: expectEqual NIX NIX +expectEqual() { + local actualExpr=$1 + local expectedExpr=$2 + if actualResult=$(nix-instantiate --eval --strict --show-trace 2>"$tmp"/actualStderr \ + --expr "$prefixExpression ($actualExpr)"); then + actualExitCode=$? + else + actualExitCode=$? + fi + actualStderr=$(< "$tmp"/actualStderr) + + if expectedResult=$(nix-instantiate --eval --strict --show-trace 2>"$tmp"/expectedStderr \ + --expr "$prefixExpression ($expectedExpr)"); then + expectedExitCode=$? + else + expectedExitCode=$? + fi + expectedStderr=$(< "$tmp"/expectedStderr) + + if [[ "$actualExitCode" != "$expectedExitCode" ]]; then + echo "$actualStderr" >&2 + echo "$actualResult" >&2 + die "$actualExpr should have exited with $expectedExitCode, but it exited with $actualExitCode" + fi + + if [[ "$actualResult" != "$expectedResult" ]]; then + die "$actualExpr should have evaluated to $expectedExpr:\n$expectedResult\n\nbut it evaluated to\n$actualResult" + fi + + if [[ "$actualStderr" != "$expectedStderr" ]]; then + die "$actualExpr should have had this on stderr:\n$expectedStderr\n\nbut it was\n$actualStderr" + fi +} + +# Check that a nix expression evaluates successfully to a store path and returns it (without quotes). +# The expression has `lib.fileset` in scope. +# Usage: expectStorePath NIX +expectStorePath() { + local expr=$1 + if ! result=$(nix-instantiate --eval --strict --json --read-write-mode --show-trace \ + --expr "$prefixExpression ($expr)"); then + die "$expr failed to evaluate, but it was expected to succeed" + fi + # This is safe because we assume to get back a store path in a string + crudeUnquoteJSON <<< "$result" +} + +# Check that a nix expression fails to evaluate (strictly, read-write-mode). +# And check the received stderr against a regex +# The expression has `lib.fileset` in scope. +# Usage: expectFailure NIX REGEX +expectFailure() { + local expr=$1 + local expectedErrorRegex=$2 + if result=$(nix-instantiate --eval --strict --read-write-mode --show-trace 2>"$tmp/stderr" \ + --expr "$prefixExpression $expr"); then + die "$expr evaluated successfully to $result, but it was expected to fail" + fi + stderr=$(<"$tmp/stderr") + if [[ ! "$stderr" =~ $expectedErrorRegex ]]; then + die "$expr should have errored with this regex pattern:\n\n$expectedErrorRegex\n\nbut this was the actual error:\n\n$stderr" + fi +} + +# Check that the traces of a Nix expression are as expected when evaluated. +# The expression has `lib.fileset` in scope. +# Usage: expectTrace NIX STR +expectTrace() { + local expr=$1 + local expectedTrace=$2 + + nix-instantiate --eval --show-trace >/dev/null 2>"$tmp"/stderrTrace \ + --expr "$prefixExpression trace ($expr)" || true + + actualTrace=$(sed -n 's/^trace: //p' "$tmp/stderrTrace") + + nix-instantiate --eval --show-trace >/dev/null 2>"$tmp"/stderrTraceVal \ + --expr "$prefixExpression traceVal ($expr)" || true + + actualTraceVal=$(sed -n 's/^trace: //p' "$tmp/stderrTraceVal") + + # Test that traceVal returns the same trace as trace + if [[ "$actualTrace" != "$actualTraceVal" ]]; then + cat "$tmp"/stderrTrace >&2 + die "$expr traced this for lib.fileset.trace:\n\n$actualTrace\n\nand something different for lib.fileset.traceVal:\n\n$actualTraceVal" + fi + + if [[ "$actualTrace" != "$expectedTrace" ]]; then + cat "$tmp"/stderrTrace >&2 + die "$expr should have traced this:\n\n$expectedTrace\n\nbut this was actually traced:\n\n$actualTrace" + fi +} + +# We conditionally use inotifywait in withFileMonitor. +# Check early whether it's available +# TODO: Darwin support, though not crucial since we have Linux CI +if type inotifywait 2>/dev/null >/dev/null; then + canMonitor=1 +else + echo "Warning: Cannot check for paths not getting read since the inotifywait command (from the inotify-tools package) is not available" >&2 + canMonitor= +fi + +# Run a function while monitoring that it doesn't read certain paths +# Usage: withFileMonitor FUNNAME PATH... +# - FUNNAME should be a bash function that: +# - Performs some operation that should not read some paths +# - Delete the paths it shouldn't read without triggering any open events +# - PATH... are the paths that should not get read +# +# This function outputs the same as FUNNAME +withFileMonitor() { + local funName=$1 + shift + + # If we can't monitor files or have none to monitor, just run the function directly + if [[ -z "$canMonitor" ]] || (( "$#" == 0 )); then + "$funName" + else + + # Use a subshell to start the coprocess in and use a trap to kill it when exiting the subshell + ( + # Assigned by coproc, makes shellcheck happy + local watcher watcher_PID + + # Start inotifywait in the background to monitor all excluded paths + coproc watcher { + # inotifywait outputs a string on stderr when ready + # Redirect it to stdout so we can access it from the coproc's stdout fd + # exec so that the coprocess is inotify itself, making the kill below work correctly + # See below why we listen to both open and delete_self events + exec inotifywait --format='%e %w' --event open,delete_self --monitor "$@" 2>&1 + } + + # This will trigger when this subshell exits, no matter if successful or not + # After exiting the subshell, the parent shell will continue executing + trap 'kill "${watcher_PID}"' exit + + # Synchronously wait until inotifywait is ready + while read -r -u "${watcher[0]}" line && [[ "$line" != "Watches established." ]]; do + : + done + + # Call the function that should not read the given paths and delete them afterwards + "$funName" + + # Get the first event + read -r -u "${watcher[0]}" event file + + # With funName potentially reading files first before deleting them, + # there's only these two possible event timelines: + # - open*, ..., open*, delete_self, ..., delete_self: If some excluded paths were read + # - delete_self, ..., delete_self: If no excluded paths were read + # So by looking at the first event we can figure out which one it is! + # This also means we don't have to wait to collect all events. + case "$event" in + OPEN*) + die "$funName opened excluded file $file when it shouldn't have" + ;; + DELETE_SELF) + # Expected events + ;; + *) + die "During $funName, Unexpected event type '$event' on file $file that should be excluded" + ;; + esac + ) + fi +} + +# Check whether a file set includes/excludes declared paths as expected, usage: +# +# tree=( +# [a/b] =1 # Declare that file a/b should exist and expect it to be included in the store path +# [c/a] = # Declare that file c/a should exist and expect it to be excluded in the store path +# [c/d/]= # Declare that directory c/d/ should exist and expect it to be excluded in the store path +# ) +# checkFileset './a' # Pass the fileset as the argument +declare -A tree +checkFileset() { + # New subshell so that we can have a separate trap handler, see `trap` below + local fileset=$1 + + # Process the tree into separate arrays for included paths, excluded paths and excluded files. + local -a included=() + local -a excluded=() + local -a excludedFiles=() + # Track which paths need to be created + local -a dirsToCreate=() + local -a filesToCreate=() + for p in "${!tree[@]}"; do + # If keys end with a `/` we treat them as directories, otherwise files + if [[ "$p" =~ /$ ]]; then + dirsToCreate+=("$p") + isFile= + else + filesToCreate+=("$p") + isFile=1 + fi + case "${tree[$p]}" in + 1) + included+=("$p") + ;; + 0) + excluded+=("$p") + if [[ -n "$isFile" ]]; then + excludedFiles+=("$p") + fi + ;; + *) + die "Unsupported tree value: ${tree[$p]}" + esac + done + + # Create all the necessary paths. + # This is done with only a fixed number of processes, + # in order to not be too slow + # Though this does mean we're a bit limited with how many files can be created + if (( ${#dirsToCreate[@]} != 0 )); then + mkdir -p "${dirsToCreate[@]}" + fi + if (( ${#filesToCreate[@]} != 0 )); then + readarray -d '' -t parentsToCreate < <(dirname -z "${filesToCreate[@]}") + mkdir -p "${parentsToCreate[@]}" + touch "${filesToCreate[@]}" + fi + + expression="toSource { root = ./.; fileset = $fileset; }" + + # We don't have lambda's in bash unfortunately, + # so we just define a function instead and then pass its name + # shellcheck disable=SC2317 + run() { + # Call toSource with the fileset, triggering open events for all files that are added to the store + expectStorePath "$expression" + if (( ${#excludedFiles[@]} != 0 )); then + rm "${excludedFiles[@]}" + fi + } + + # Runs the function while checking that the given excluded files aren't read + storePath=$(withFileMonitor run "${excludedFiles[@]}") + + # For each path that should be included, make sure it does occur in the resulting store path + for p in "${included[@]}"; do + if [[ ! -e "$storePath/$p" ]]; then + die "$expression doesn't include path $p when it should have" + fi + done + + # For each path that should be excluded, make sure it doesn't occur in the resulting store path + for p in "${excluded[@]}"; do + if [[ -e "$storePath/$p" ]]; then + die "$expression included path $p when it shouldn't have" + fi + done + + rm -rf -- * +} + + +#### Error messages ##### + +# Absolute paths in strings cannot be passed as `root` +expectFailure 'toSource { root = "/nix/store/foobar"; fileset = ./.; }' 'lib.fileset.toSource: `root` \("/nix/store/foobar"\) is a string-like value, but it should be a path instead. +\s*Paths in strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.' + +# Only paths are accepted as `root` +expectFailure 'toSource { root = 10; fileset = ./.; }' 'lib.fileset.toSource: `root` is of type int, but it should be a path instead.' + +# Different filesystem roots in root and fileset are not supported +mkdir -p {foo,bar}/mock-root +expectFailure 'with ((import ).extend (import )).fileset; + toSource { root = ./foo/mock-root; fileset = ./bar/mock-root; } +' 'lib.fileset.toSource: Filesystem roots are not the same for `fileset` and `root` \("'"$work"'/foo/mock-root"\): +\s*`root`: root "'"$work"'/foo/mock-root" +\s*`fileset`: root "'"$work"'/bar/mock-root" +\s*Different roots are not supported.' +rm -rf * + +# `root` needs to exist +expectFailure 'toSource { root = ./a; fileset = ./.; }' 'lib.fileset.toSource: `root` \('"$work"'/a\) does not exist.' + +# `root` needs to be a file +touch a +expectFailure 'toSource { root = ./a; fileset = ./a; }' 'lib.fileset.toSource: `root` \('"$work"'/a\) is a file, but it should be a directory instead. Potential solutions: +\s*- If you want to import the file into the store _without_ a containing directory, use string interpolation or `builtins.path` instead of this function. +\s*- If you want to import the file into the store _with_ a containing directory, set `root` to the containing directory, such as '"$work"', and set `fileset` to the file path.' +rm -rf * + +# The fileset argument should be evaluated, even if the directory is empty +expectFailure 'toSource { root = ./.; fileset = abort "This should be evaluated"; }' 'evaluation aborted with the following error message: '\''This should be evaluated'\' + +# Only paths under `root` should be able to influence the result +mkdir a +expectFailure 'toSource { root = ./a; fileset = ./.; }' 'lib.fileset.toSource: `fileset` could contain files in '"$work"', which is not under the `root` \('"$work"'/a\). Potential solutions: +\s*- Set `root` to '"$work"' or any directory higher up. This changes the layout of the resulting store path. +\s*- Set `fileset` to a file set that cannot contain files outside the `root` \('"$work"'/a\). This could change the files included in the result.' +rm -rf * + +# Path coercion only works for paths +expectFailure 'toSource { root = ./.; fileset = 10; }' 'lib.fileset.toSource: `fileset` is of type int, but it should be a path instead.' +expectFailure 'toSource { root = ./.; fileset = "/some/path"; }' 'lib.fileset.toSource: `fileset` \("/some/path"\) is a string-like value, but it should be a path instead. +\s*Paths represented as strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.' + +# Path coercion errors for non-existent paths +expectFailure 'toSource { root = ./.; fileset = ./a; }' 'lib.fileset.toSource: `fileset` \('"$work"'/a\) does not exist.' + +# File sets cannot be evaluated directly +expectFailure 'union ./. ./.' 'lib.fileset: Directly evaluating a file set is not supported. +\s*To turn it into a usable source, use `lib.fileset.toSource`. +\s*To pretty-print the contents, use `lib.fileset.trace` or `lib.fileset.traceVal`.' +expectFailure '_emptyWithoutBase' 'lib.fileset: Directly evaluating a file set is not supported. +\s*To turn it into a usable source, use `lib.fileset.toSource`. +\s*To pretty-print the contents, use `lib.fileset.trace` or `lib.fileset.traceVal`.' + +# Past versions of the internal representation are supported +expectEqual '_coerce ": value" { _type = "fileset"; _internalVersion = 0; _internalBase = ./.; }' \ + '{ _internalBase = ./.; _internalBaseComponents = path.subpath.components (path.splitRoot ./.).subpath; _internalBaseRoot = /.; _internalIsEmptyWithoutBase = false; _internalVersion = 3; _type = "fileset"; }' +expectEqual '_coerce ": value" { _type = "fileset"; _internalVersion = 1; }' \ + '{ _type = "fileset"; _internalIsEmptyWithoutBase = false; _internalVersion = 3; }' +expectEqual '_coerce ": value" { _type = "fileset"; _internalVersion = 2; }' \ + '{ _type = "fileset"; _internalIsEmptyWithoutBase = false; _internalVersion = 3; }' + +# Future versions of the internal representation are unsupported +expectFailure '_coerce ": value" { _type = "fileset"; _internalVersion = 4; }' ': value is a file set created from a future version of the file set library with a different internal representation: +\s*- Internal version of the file set: 4 +\s*- Internal version of the library: 3 +\s*Make sure to update your Nixpkgs to have a newer version of `lib.fileset`.' + +# _create followed by _coerce should give the inputs back without any validation +expectEqual '{ + inherit (_coerce "" (_create ./. "directory")) + _internalVersion _internalBase _internalTree; +}' '{ _internalBase = ./.; _internalTree = "directory"; _internalVersion = 3; }' + +#### Resulting store path #### + +# The store path name should be "source" +expectEqual 'toSource { root = ./.; fileset = ./.; }' 'sources.cleanSourceWith { name = "source"; src = ./.; }' + +# We should be able to import an empty directory and end up with an empty result +tree=( +) +checkFileset './.' + +# The empty value without a base should also result in an empty result +tree=( + [a]=0 +) +checkFileset '_emptyWithoutBase' + +# Directories recursively containing no files are not included +tree=( + [e/]=0 + [d/e/]=0 + [d/d/e/]=0 + [d/d/f]=1 + [d/f]=1 + [f]=1 +) +checkFileset './.' + +# Check trees that could cause a naïve string prefix checking implementation to fail +tree=( + [a]=0 + [ab/x]=0 + [ab/xy]=1 + [ab/xyz]=0 + [abc]=0 +) +checkFileset './ab/xy' + +# Check path coercion examples in ../../doc/functions/fileset.section.md +tree=( + [a/x]=1 + [a/b/y]=1 + [c/]=0 + [c/d/]=0 +) +checkFileset './.' + +tree=( + [a/x]=1 + [a/b/y]=1 + [c/]=0 + [c/d/]=0 +) +checkFileset './a' + +tree=( + [a/x]=1 + [a/b/y]=0 + [c/]=0 + [c/d/]=0 +) +checkFileset './a/x' + +tree=( + [a/x]=0 + [a/b/y]=1 + [c/]=0 + [c/d/]=0 +) +checkFileset './a/b' + +tree=( + [a/x]=0 + [a/b/y]=0 + [c/]=0 + [c/d/]=0 +) +checkFileset './c' + +# Test the source filter for the somewhat special case of files in the filesystem root +# We can't easily test this with the above functions because we can't write to the filesystem root and we don't want to make any assumptions which files are there in the sandbox +expectEqual '_toSourceFilter (_create /. null) "/foo" ""' 'false' +expectEqual '_toSourceFilter (_create /. { foo = "regular"; }) "/foo" ""' 'true' +expectEqual '_toSourceFilter (_create /. { foo = null; }) "/foo" ""' 'false' + + +## lib.fileset.union, lib.fileset.unions + + +# Different filesystem roots in root and fileset are not supported +mkdir -p {foo,bar}/mock-root +expectFailure 'with ((import ).extend (import )).fileset; + toSource { root = ./.; fileset = union ./foo/mock-root ./bar/mock-root; } +' 'lib.fileset.union: Filesystem roots are not the same: +\s*first argument: root "'"$work"'/foo/mock-root" +\s*second argument: root "'"$work"'/bar/mock-root" +\s*Different roots are not supported.' + +expectFailure 'with ((import ).extend (import )).fileset; + toSource { root = ./.; fileset = unions [ ./foo/mock-root ./bar/mock-root ]; } +' 'lib.fileset.unions: Filesystem roots are not the same: +\s*element 0: root "'"$work"'/foo/mock-root" +\s*element 1: root "'"$work"'/bar/mock-root" +\s*Different roots are not supported.' +rm -rf * + +# Coercion errors show the correct context +expectFailure 'toSource { root = ./.; fileset = union ./a ./.; }' 'lib.fileset.union: first argument \('"$work"'/a\) does not exist.' +expectFailure 'toSource { root = ./.; fileset = union ./. ./b; }' 'lib.fileset.union: second argument \('"$work"'/b\) does not exist.' +expectFailure 'toSource { root = ./.; fileset = unions [ ./a ./. ]; }' 'lib.fileset.unions: element 0 \('"$work"'/a\) does not exist.' +expectFailure 'toSource { root = ./.; fileset = unions [ ./. ./b ]; }' 'lib.fileset.unions: element 1 \('"$work"'/b\) does not exist.' + +# unions needs a list +expectFailure 'toSource { root = ./.; fileset = unions null; }' 'lib.fileset.unions: Expected argument to be a list, but got a null.' + +# The tree of later arguments should not be evaluated if a former argument already includes all files +tree=() +checkFileset 'union ./. (_create ./. (abort "This should not be used!"))' +checkFileset 'unions [ ./. (_create ./. (abort "This should not be used!")) ]' + +# unions doesn't include any files for an empty list or only empty values without a base +tree=( + [x]=0 + [y/z]=0 +) +checkFileset 'unions [ ]' +checkFileset 'unions [ _emptyWithoutBase ]' +checkFileset 'unions [ _emptyWithoutBase _emptyWithoutBase ]' +checkFileset 'union _emptyWithoutBase _emptyWithoutBase' + +# The empty value without a base is the left and right identity of union +tree=( + [x]=1 + [y/z]=0 +) +checkFileset 'union ./x _emptyWithoutBase' +checkFileset 'union _emptyWithoutBase ./x' + +# union doesn't include files that weren't specified +tree=( + [x]=1 + [y]=1 + [z]=0 +) +checkFileset 'union ./x ./y' +checkFileset 'unions [ ./x ./y ]' + +# Also for directories +tree=( + [x/a]=1 + [x/b]=1 + [y/a]=1 + [y/b]=1 + [z/a]=0 + [z/b]=0 +) +checkFileset 'union ./x ./y' +checkFileset 'unions [ ./x ./y ]' + +# And for very specific paths +tree=( + [x/a]=1 + [x/b]=0 + [y/a]=0 + [y/b]=1 + [z/a]=0 + [z/b]=0 +) +checkFileset 'union ./x/a ./y/b' +checkFileset 'unions [ ./x/a ./y/b ]' + +# unions or chained union's can include more paths +tree=( + [x/a]=1 + [x/b]=1 + [y/a]=1 + [y/b]=0 + [z/a]=0 + [z/b]=1 +) +checkFileset 'unions [ ./x/a ./x/b ./y/a ./z/b ]' +checkFileset 'union (union ./x/a ./x/b) (union ./y/a ./z/b)' +checkFileset 'union (union (union ./x/a ./x/b) ./y/a) ./z/b' + +# unions should not stack overflow, even if many elements are passed +tree=() +for i in $(seq 1000); do + tree[$i/a]=1 + tree[$i/b]=0 +done +# This is actually really hard to test: +# A lot of files would be needed to cause a stack overflow. +# And while we could limit the maximum stack size using `ulimit -s`, +# that turns out to not be very deterministic: https://github.com/NixOS/nixpkgs/pull/256417#discussion_r1339396686. +# Meanwhile, the test infra here is not the fastest, creating 10000 would be too slow. +# So, just using 1000 files for now. +checkFileset 'unions (mapAttrsToList (name: _: ./. + "/${name}/a") (builtins.readDir ./.))' + +## Tracing + +# The second trace argument is returned +expectEqual 'trace ./. "some value"' 'builtins.trace "(empty)" "some value"' + +# The fileset traceVal argument is returned +expectEqual 'traceVal ./.' 'builtins.trace "(empty)" (_create ./. "directory")' + +# The tracing happens before the final argument is needed +expectEqual 'trace ./.' 'builtins.trace "(empty)" (x: x)' + +# Tracing an empty directory shows it as such +expectTrace './.' '(empty)' + +# This also works if there are directories, but all recursively without files +mkdir -p a/b/c +expectTrace './.' '(empty)' +rm -rf -- * + +# The empty file set without a base also prints as empty +expectTrace '_emptyWithoutBase' '(empty)' +expectTrace 'unions [ ]' '(empty)' + +# If a directory is fully included, print it as such +touch a +expectTrace './.' "$work"' (all files in directory)' +rm -rf -- * + +# If a directory is not fully included, recurse +mkdir a b +touch a/{x,y} b/{x,y} +expectTrace 'union ./a/x ./b' "$work"' +- a + - x (regular) +- b (all files in directory)' +rm -rf -- * + +# If an included path is a file, print its type +touch a x +ln -s a b +mkfifo c +expectTrace 'unions [ ./a ./b ./c ]' "$work"' +- a (regular) +- b (symlink) +- c (unknown)' +rm -rf -- * + +# Do not print directories without any files recursively +mkdir -p a/b/c +touch b x +expectTrace 'unions [ ./a ./b ]' "$work"' +- b (regular)' +rm -rf -- * + +# If all children are either fully included or empty directories, +# the parent should be printed as fully included +touch a +mkdir b +expectTrace 'union ./a ./b' "$work"' (all files in directory)' +rm -rf -- * + +mkdir -p x/b x/c +touch x/a +touch a +# If all children are either fully excluded or empty directories, +# the parent should be shown (or rather not shown) as fully excluded +expectTrace 'unions [ ./a ./x/b ./x/c ]' "$work"' +- a (regular)' +rm -rf -- * + +# Completely filtered out directories also print as empty +touch a +expectTrace '_create ./. {}' '(empty)' +rm -rf -- * + +# A general test to make sure the resulting format makes sense +# Such as indentation and ordering +mkdir -p bar/{qux,someDir} +touch bar/{baz,qux,someDir/a} foo +touch bar/qux/x +ln -s x bar/qux/a +mkfifo bar/qux/b +expectTrace 'unions [ + ./bar/baz + ./bar/qux/a + ./bar/qux/b + ./bar/someDir/a + ./foo +]' "$work"' +- bar + - baz (regular) + - qux + - a (symlink) + - b (unknown) + - someDir (all files in directory) +- foo (regular)' +rm -rf -- * + +# For recursively included directories, +# `(all files in directory)` should only be used if there's at least one file (otherwise it would be `(empty)`) +# and this should be determined without doing a full search +# +# a is intentionally ordered first here in order to allow triggering the short-circuit behavior +# We then check that b is not read +# In a more realistic scenario, some directories might need to be recursed into, +# but a file would be quickly found to trigger the short-circuit. +touch a +mkdir b +# We don't have lambda's in bash unfortunately, +# so we just define a function instead and then pass its name +# shellcheck disable=SC2317 +run() { + # This shouldn't read b/ + expectTrace './.' "$work"' (all files in directory)' + # Remove all files immediately after, triggering delete_self events for all of them + rmdir b +} +# Runs the function while checking that b isn't read +withFileMonitor run b +rm -rf -- * + +# Partially included directories trace entries as they are evaluated +touch a b c +expectTrace '_create ./. { a = null; b = "regular"; c = throw "b"; }' "$work"' +- b (regular)' + +# Except entries that need to be evaluated to even figure out if it's only partially included: +# Here the directory could be fully excluded or included just from seeing a and b, +# so c needs to be evaluated before anything can be traced +expectTrace '_create ./. { a = null; b = null; c = throw "c"; }' '' +expectTrace '_create ./. { a = "regular"; b = "regular"; c = throw "c"; }' '' +rm -rf -- * + +# We can trace large directories (10000 here) without any problems +filesToCreate=({0..9}{0..9}{0..9}{0..9}) +expectedTrace=$work$'\n'$(printf -- '- %s (regular)\n' "${filesToCreate[@]}") +# We need an excluded file so it doesn't print as `(all files in directory)` +touch 0 "${filesToCreate[@]}" +expectTrace 'unions (mapAttrsToList (n: _: ./. + "/${n}") (removeAttrs (builtins.readDir ./.) [ "0" ]))' "$expectedTrace" +rm -rf -- * + +# TODO: Once we have combinators and a property testing library, derive property tests from https://en.wikipedia.org/wiki/Algebra_of_sets + +echo >&2 tests ok diff --git a/third_party/nixpkgs/lib/generators.nix b/third_party/nixpkgs/lib/generators.nix index c37be1942d..8e93ed0491 100644 --- a/third_party/nixpkgs/lib/generators.nix +++ b/third_party/nixpkgs/lib/generators.nix @@ -189,10 +189,10 @@ rec { * } * *> [url "ssh://git@github.com/"] - *> insteadOf = https://github.com/ + *> insteadOf = "https://github.com" *> *> [user] - *> name = edolstra + *> name = "edolstra" */ toGitINI = attrs: with builtins; @@ -209,9 +209,17 @@ rec { else ''${section} "${subsection}"''; + mkValueString = v: + let + escapedV = '' + "${ + replaceStrings [ "\n" " " ''"'' "\\" ] [ "\\n" "\\t" ''\"'' "\\\\" ] v + }"''; + in mkValueStringDefault { } (if isString v then escapedV else v); + # generation for multiple ini values mkKeyValue = k: v: - let mkKeyValue = mkKeyValueDefault { } " = " k; + let mkKeyValue = mkKeyValueDefault { inherit mkValueString; } " = " k; in concatStringsSep "\n" (map (kv: "\t" + mkKeyValue kv) (lib.toList v)); # converts { a.b.c = 5; } to { "a.b".c = 5; } for toINI @@ -230,6 +238,14 @@ rec { in toINI_ (gitFlattenAttrs attrs); + # mkKeyValueDefault wrapper that handles dconf INI quirks. + # The main differences of the format is that it requires strings to be quoted. + mkDconfKeyValue = mkKeyValueDefault { mkValueString = v: toString (lib.gvariant.mkValue v); } "="; + + # Generates INI in dconf keyfile style. See https://help.gnome.org/admin/system-admin-guide/stable/dconf-keyfiles.html.en + # for details. + toDconfINI = toINI { mkKeyValue = mkDconfKeyValue; }; + /* Generates JSON from an arbitrary (non-function) value. * For more information see the documentation of the builtin. */ diff --git a/third_party/nixpkgs/lib/gvariant.nix b/third_party/nixpkgs/lib/gvariant.nix new file mode 100644 index 0000000000..3142ffc5f1 --- /dev/null +++ b/third_party/nixpkgs/lib/gvariant.nix @@ -0,0 +1,290 @@ +# This file is based on https://github.com/nix-community/home-manager +# Copyright (c) 2017-2022 Home Manager contributors +# + + +{ lib }: + +/* A partial and basic implementation of GVariant formatted strings. + See https://docs.gtk.org/glib/gvariant-format-strings.html for detauls. + + Note, this API is not considered fully stable and it might therefore + change in backwards incompatible ways without prior notice. +*/ +let + inherit (lib) + concatMapStringsSep concatStrings escape head replaceStrings; + + mkPrimitive = t: v: { + _type = "gvariant"; + type = t; + value = v; + __toString = self: "@${self.type} ${toString self.value}"; # https://docs.gtk.org/glib/gvariant-text.html + }; + + type = { + arrayOf = t: "a${t}"; + maybeOf = t: "m${t}"; + tupleOf = ts: "(${concatStrings ts})"; + dictionaryEntryOf = nameType: valueType: "{${nameType}${valueType}}"; + string = "s"; + boolean = "b"; + uchar = "y"; + int16 = "n"; + uint16 = "q"; + int32 = "i"; + uint32 = "u"; + int64 = "x"; + uint64 = "t"; + double = "d"; + variant = "v"; + }; + + /* Check if a value is a GVariant value + + Type: + isGVariant :: Any -> Bool + */ + isGVariant = v: v._type or "" == "gvariant"; + +in +rec { + + inherit type isGVariant; + + /* Returns the GVariant value that most closely matches the given Nix value. + If no GVariant value can be found unambiguously then error is thrown. + + Type: + mkValue :: Any -> gvariant + */ + mkValue = v: + if builtins.isBool v then + mkBoolean v + else if builtins.isFloat v then + mkDouble v + else if builtins.isString v then + mkString v + else if builtins.isList v then + mkArray v + else if isGVariant v then + v + else + throw "The GVariant type of ${v} can't be inferred."; + + /* Returns the GVariant array from the given type of the elements and a Nix list. + + Type: + mkArray :: [Any] -> gvariant + + Example: + # Creating a string array + lib.gvariant.mkArray [ "a" "b" "c" ] + */ + mkArray = elems: + let + vs = map mkValue (lib.throwIf (elems == [ ]) "Please create empty array with mkEmptyArray." elems); + elemType = lib.throwIfNot (lib.all (t: (head vs).type == t) (map (v: v.type) vs)) + "Elements in a list should have same type." + (head vs).type; + in + mkPrimitive (type.arrayOf elemType) vs // { + __toString = self: + "@${self.type} [${concatMapStringsSep "," toString self.value}]"; + }; + + /* Returns the GVariant array from the given empty Nix list. + + Type: + mkEmptyArray :: gvariant.type -> gvariant + + Example: + # Creating an empty string array + lib.gvariant.mkEmptyArray (lib.gvariant.type.string) + */ + mkEmptyArray = elemType: mkPrimitive (type.arrayOf elemType) [ ] // { + __toString = self: "@${self.type} []"; + }; + + + /* Returns the GVariant variant from the given Nix value. Variants are containers + of different GVariant type. + + Type: + mkVariant :: Any -> gvariant + + Example: + lib.gvariant.mkArray [ + (lib.gvariant.mkVariant "a string") + (lib.gvariant.mkVariant (lib.gvariant.mkInt32 1)) + ] + */ + mkVariant = elem: + let gvarElem = mkValue elem; + in mkPrimitive type.variant gvarElem // { + __toString = self: "<${toString self.value}>"; + }; + + /* Returns the GVariant dictionary entry from the given key and value. + + Type: + mkDictionaryEntry :: String -> Any -> gvariant + + Example: + # A dictionary describing an Epiphany’s search provider + [ + (lib.gvariant.mkDictionaryEntry "url" (lib.gvariant.mkVariant "https://duckduckgo.com/?q=%s&t=epiphany")) + (lib.gvariant.mkDictionaryEntry "bang" (lib.gvariant.mkVariant "!d")) + (lib.gvariant.mkDictionaryEntry "name" (lib.gvariant.mkVariant "DuckDuckGo")) + ] + */ + mkDictionaryEntry = + # The key of the entry + name: + # The value of the entry + value: + let + name' = mkValue name; + value' = mkValue value; + dictionaryType = type.dictionaryEntryOf name'.type value'.type; + in + mkPrimitive dictionaryType { inherit name value; } // { + __toString = self: "@${self.type} {${name'},${value'}}"; + }; + + /* Returns the GVariant maybe from the given element type. + + Type: + mkMaybe :: gvariant.type -> Any -> gvariant + */ + mkMaybe = elemType: elem: + mkPrimitive (type.maybeOf elemType) elem // { + __toString = self: + if self.value == null then + "@${self.type} nothing" + else + "just ${toString self.value}"; + }; + + /* Returns the GVariant nothing from the given element type. + + Type: + mkNothing :: gvariant.type -> gvariant + */ + mkNothing = elemType: mkMaybe elemType null; + + /* Returns the GVariant just from the given Nix value. + + Type: + mkJust :: Any -> gvariant + */ + mkJust = elem: let gvarElem = mkValue elem; in mkMaybe gvarElem.type gvarElem; + + /* Returns the GVariant tuple from the given Nix list. + + Type: + mkTuple :: [Any] -> gvariant + */ + mkTuple = elems: + let + gvarElems = map mkValue elems; + tupleType = type.tupleOf (map (e: e.type) gvarElems); + in + mkPrimitive tupleType gvarElems // { + __toString = self: + "@${self.type} (${concatMapStringsSep "," toString self.value})"; + }; + + /* Returns the GVariant boolean from the given Nix bool value. + + Type: + mkBoolean :: Bool -> gvariant + */ + mkBoolean = v: + mkPrimitive type.boolean v // { + __toString = self: if self.value then "true" else "false"; + }; + + /* Returns the GVariant string from the given Nix string value. + + Type: + mkString :: String -> gvariant + */ + mkString = v: + let sanitize = s: replaceStrings [ "\n" ] [ "\\n" ] (escape [ "'" "\\" ] s); + in mkPrimitive type.string v // { + __toString = self: "'${sanitize self.value}'"; + }; + + /* Returns the GVariant object path from the given Nix string value. + + Type: + mkObjectpath :: String -> gvariant + */ + mkObjectpath = v: + mkPrimitive type.string v // { + __toString = self: "objectpath '${escape [ "'" ] self.value}'"; + }; + + /* Returns the GVariant uchar from the given Nix int value. + + Type: + mkUchar :: Int -> gvariant + */ + mkUchar = mkPrimitive type.uchar; + + /* Returns the GVariant int16 from the given Nix int value. + + Type: + mkInt16 :: Int -> gvariant + */ + mkInt16 = mkPrimitive type.int16; + + /* Returns the GVariant uint16 from the given Nix int value. + + Type: + mkUint16 :: Int -> gvariant + */ + mkUint16 = mkPrimitive type.uint16; + + /* Returns the GVariant int32 from the given Nix int value. + + Type: + mkInt32 :: Int -> gvariant + */ + mkInt32 = v: + mkPrimitive type.int32 v // { + __toString = self: toString self.value; + }; + + /* Returns the GVariant uint32 from the given Nix int value. + + Type: + mkUint32 :: Int -> gvariant + */ + mkUint32 = mkPrimitive type.uint32; + + /* Returns the GVariant int64 from the given Nix int value. + + Type: + mkInt64 :: Int -> gvariant + */ + mkInt64 = mkPrimitive type.int64; + + /* Returns the GVariant uint64 from the given Nix int value. + + Type: + mkUint64 :: Int -> gvariant + */ + mkUint64 = mkPrimitive type.uint64; + + /* Returns the GVariant double from the given Nix float value. + + Type: + mkDouble :: Float -> gvariant + */ + mkDouble = v: + mkPrimitive type.double v // { + __toString = self: toString self.value; + }; +} diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix index 599e8ee53c..d9555ca66c 100644 --- a/third_party/nixpkgs/lib/licenses.nix +++ b/third_party/nixpkgs/lib/licenses.nix @@ -30,6 +30,14 @@ in mkLicense lset) ({ fullName = "Abstyles License"; }; + acsl14 = { + fullName = "Anti-Capitalist Software License v1.4"; + url = "https://anticapitalist.software/"; + /* restrictions on corporations apply for both use and redistribution */ + free = false; + redistributable = false; + }; + afl20 = { spdxId = "AFL-2.0"; fullName = "Academic Free License v2.0"; @@ -413,9 +421,9 @@ in mkLicense lset) ({ fullName = "Eiffel Forum License v2.0"; }; - elastic = { - fullName = "ELASTIC LICENSE"; - url = "https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt"; + elastic20 = { + fullName = "Elastic License 2.0"; + url = "https://github.com/elastic/elasticsearch/blob/main/licenses/ELASTIC-LICENSE-2.0.txt"; free = false; }; @@ -481,6 +489,11 @@ in mkLicense lset) ({ free = false; }; + fraunhofer-fdk = { + fullName = "Fraunhofer FDK AAC Codec Library"; + spdxId = "FDK-AAC"; + }; + free = { fullName = "Unspecified free software license"; }; @@ -610,11 +623,17 @@ in mkLicense lset) ({ }; inria-icesl = { - fullName = "INRIA Non-Commercial License Agreement for IceSL"; + fullName = "End User License Agreement for IceSL Software"; url = "https://icesl.loria.fr/assets/pdf/EULA_IceSL_binary.pdf"; free = false; }; + inria-zelus = { + fullName = "INRIA Non-Commercial License Agreement for the Zélus compiler"; + url = "https://github.com/INRIA/zelus/raw/829f2b97cba93b0543a9ca0272269e6b8fdad356/LICENSE"; + free = false; + }; + ipa = { spdxId = "IPA"; fullName = "IPA Font License"; @@ -840,6 +859,14 @@ in mkLicense lset) ({ fullName = "University of Illinois/NCSA Open Source License"; }; + ncul1 = { + spdxId = "NCUL1"; + fullName = "Netdata Cloud UI License v1.0"; + free = false; + redistributable = true; # Only if used in Netdata products. + url = "https://raw.githubusercontent.com/netdata/netdata/master/web/gui/v2/LICENSE.md"; + }; + nlpl = { spdxId = "NLPL"; fullName = "No Limit Public License"; @@ -856,6 +883,11 @@ in mkLicense lset) ({ free = false; }; + ocamlLgplLinkingException = { + spdxId = "OCaml-LGPL-linking-exception"; + fullName = "OCaml LGPL Linking Exception"; + }; + ocamlpro_nc = { fullName = "OCamlPro Non Commercial license version 1"; url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-2.2.0/OCamlPro-Non-Commercial-License.pdf"; diff --git a/third_party/nixpkgs/lib/lists.nix b/third_party/nixpkgs/lib/lists.nix index 0800aeb654..3835e3ba69 100644 --- a/third_party/nixpkgs/lib/lists.nix +++ b/third_party/nixpkgs/lib/lists.nix @@ -86,15 +86,63 @@ rec { else op (foldl' (n - 1)) (elemAt list n); in foldl' (length list - 1); - /* Strict version of `foldl`. + /* + Reduce a list by applying a binary operator from left to right, + starting with an initial accumulator. - The difference is that evaluation is forced upon access. Usually used - with small whole results (in contrast with lazily-generated list or large - lists where only a part is consumed.) + Before each application of the operator, the accumulator value is evaluated. + This behavior makes this function stricter than [`foldl`](#function-library-lib.lists.foldl). - Type: foldl' :: (b -> a -> b) -> b -> [a] -> b + Unlike [`builtins.foldl'`](https://nixos.org/manual/nix/unstable/language/builtins.html#builtins-foldl'), + the initial accumulator argument is evaluated before the first iteration. + + A call like + + ```nix + foldl' op acc₀ [ x₀ x₁ x₂ ... xₙ₋₁ xₙ ] + ``` + + is (denotationally) equivalent to the following, + but with the added benefit that `foldl'` itself will never overflow the stack. + + ```nix + let + acc₁ = builtins.seq acc₀ (op acc₀ x₀ ); + acc₂ = builtins.seq acc₁ (op acc₁ x₁ ); + acc₃ = builtins.seq acc₂ (op acc₂ x₂ ); + ... + accₙ = builtins.seq accₙ₋₁ (op accₙ₋₁ xₙ₋₁); + accₙ₊₁ = builtins.seq accₙ (op accₙ xₙ ); + in + accₙ₊₁ + + # Or ignoring builtins.seq + op (op (... (op (op (op acc₀ x₀) x₁) x₂) ...) xₙ₋₁) xₙ + ``` + + Type: foldl' :: (acc -> x -> acc) -> acc -> [x] -> acc + + Example: + foldl' (acc: x: acc + x) 0 [1 2 3] + => 6 */ - foldl' = builtins.foldl' or foldl; + foldl' = + /* The binary operation to run, where the two arguments are: + + 1. `acc`: The current accumulator value: Either the initial one for the first iteration, or the result of the previous iteration + 2. `x`: The corresponding list element for this iteration + */ + op: + # The initial accumulator value + acc: + # The list to fold + list: + + # The builtin `foldl'` is a bit lazier than one might expect. + # See https://github.com/NixOS/nix/pull/7158. + # In particular, the initial accumulator value is not forced before the first iteration starts. + builtins.seq acc + (builtins.foldl' op acc list); /* Map with index starting from 0 diff --git a/third_party/nixpkgs/lib/modules.nix b/third_party/nixpkgs/lib/modules.nix index 5c2fb48868..4acbce39e9 100644 --- a/third_party/nixpkgs/lib/modules.nix +++ b/third_party/nixpkgs/lib/modules.nix @@ -537,7 +537,7 @@ let mergeModules' prefix modules (concatMap (m: map (config: { file = m._file; inherit config; }) (pushDownProperties m.config)) modules); - mergeModules' = prefix: options: configs: + mergeModules' = prefix: modules: configs: let # an attrset 'name' => list of submodules that declare ‘name’. declsByName = @@ -554,11 +554,11 @@ let else mapAttrs (n: option: - [{ inherit (module) _file; options = option; }] + [{ inherit (module) _file; pos = builtins.unsafeGetAttrPos n subtree; options = option; }] ) subtree ) - options); + modules); # The root of any module definition must be an attrset. checkedConfigs = @@ -762,9 +762,16 @@ let else res.options; in opt.options // res // { declarations = res.declarations ++ [opt._file]; + # In the case of modules that are generated dynamically, we won't + # have exact declaration lines; fall back to just the file being + # evaluated. + declarationPositions = res.declarationPositions + ++ (if opt.pos != null + then [opt.pos] + else [{ file = opt._file; line = null; column = null; }]); options = submodules; } // typeSet - ) { inherit loc; declarations = []; options = []; } opts; + ) { inherit loc; declarations = []; declarationPositions = []; options = []; } opts; /* Merge all the definitions of an option to produce the final config value. */ diff --git a/third_party/nixpkgs/lib/strings.nix b/third_party/nixpkgs/lib/strings.nix index df891c8998..d7642ce10f 100644 --- a/third_party/nixpkgs/lib/strings.nix +++ b/third_party/nixpkgs/lib/strings.nix @@ -741,6 +741,64 @@ rec { name = head (splitString sep filename); in assert name != filename; name; + /* Create a "-D:=" string that can be passed to typical + CMake invocations. + + Type: cmakeOptionType :: string -> string -> string -> string + + @param feature The feature to be set + @param type The type of the feature to be set, as described in + https://cmake.org/cmake/help/latest/command/set.html + the possible values (case insensitive) are: + BOOL FILEPATH PATH STRING INTERNAL + @param value The desired value + + Example: + cmakeOptionType "string" "ENGINE" "sdl2" + => "-DENGINE:STRING=sdl2" + */ + cmakeOptionType = type: feature: value: + assert (lib.elem (lib.toUpper type) + [ "BOOL" "FILEPATH" "PATH" "STRING" "INTERNAL" ]); + assert (lib.isString feature); + assert (lib.isString value); + "-D${feature}:${lib.toUpper type}=${value}"; + + /* Create a -D={TRUE,FALSE} string that can be passed to typical + CMake invocations. + + Type: cmakeBool :: string -> bool -> string + + @param condition The condition to be made true or false + @param flag The controlling flag of the condition + + Example: + cmakeBool "ENABLE_STATIC_LIBS" false + => "-DENABLESTATIC_LIBS:BOOL=FALSE" + */ + cmakeBool = condition: flag: + assert (lib.isString condition); + assert (lib.isBool flag); + cmakeOptionType "bool" condition (lib.toUpper (lib.boolToString flag)); + + /* Create a -D:STRING= string that can be passed to typical + CMake invocations. + This is the most typical usage, so it deserves a special case. + + Type: cmakeFeature :: string -> string -> string + + @param condition The condition to be made true or false + @param flag The controlling flag of the condition + + Example: + cmakeFeature "MODULES" "badblock" + => "-DMODULES:STRING=badblock" + */ + cmakeFeature = feature: value: + assert (lib.isString feature); + assert (lib.isString value); + cmakeOptionType "string" feature value; + /* Create a -D= string that can be passed to typical Meson invocations. diff --git a/third_party/nixpkgs/lib/systems/default.nix b/third_party/nixpkgs/lib/systems/default.nix index 40a2c88f32..2790ea08d9 100644 --- a/third_party/nixpkgs/lib/systems/default.nix +++ b/third_party/nixpkgs/lib/systems/default.nix @@ -178,11 +178,18 @@ rec { else if final.isLoongArch64 then "loongarch" else final.parsed.cpu.name; + # https://source.denx.de/u-boot/u-boot/-/blob/9bfb567e5f1bfe7de8eb41f8c6d00f49d2b9a426/common/image.c#L81-106 + ubootArch = + if final.isx86_32 then "x86" # not i386 + else if final.isMips64 then "mips64" # uboot *does* distinguish between mips32/mips64 + else final.linuxArch; # other cases appear to agree with linuxArch + qemuArch = if final.isAarch32 then "arm" else if final.isS390 && !final.isS390x then null else if final.isx86_64 then "x86_64" else if final.isx86 then "i386" + else if final.isMips64n32 then "mipsn32${lib.optionalString final.isLittleEndian "el"}" else if final.isMips64 then "mips64${lib.optionalString final.isLittleEndian "el"}" else final.uname.processor; @@ -224,6 +231,7 @@ rec { gtkSupport = false; sdlSupport = false; pulseSupport = false; + pipewireSupport = false; smbdSupport = false; seccompSupport = false; enableDocs = false; diff --git a/third_party/nixpkgs/lib/systems/examples.nix b/third_party/nixpkgs/lib/systems/examples.nix index 8d9c09561d..0e704b7d7d 100644 --- a/third_party/nixpkgs/lib/systems/examples.nix +++ b/third_party/nixpkgs/lib/systems/examples.nix @@ -206,6 +206,7 @@ rec { aarch64-embedded = { config = "aarch64-none-elf"; libc = "newlib"; + rustc.config = "aarch64-unknown-none"; }; aarch64be-embedded = { @@ -313,6 +314,11 @@ rec { libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain }; + ucrt64 = { + config = "x86_64-w64-mingw32"; + libc = "ucrt"; # This distinguishes the mingw (non posix) toolchain + }; + # BSDs x86_64-freebsd = { diff --git a/third_party/nixpkgs/lib/tests/misc.nix b/third_party/nixpkgs/lib/tests/misc.nix index 6d55ae6847..ec306acbb7 100644 --- a/third_party/nixpkgs/lib/tests/misc.nix +++ b/third_party/nixpkgs/lib/tests/misc.nix @@ -505,6 +505,38 @@ runTests { }; }; + testFoldl'Empty = { + expr = foldl' (acc: el: abort "operation not called") 0 [ ]; + expected = 0; + }; + + testFoldl'IntegerAdding = { + expr = foldl' (acc: el: acc + el) 0 [ 1 2 3 ]; + expected = 6; + }; + + # The accumulator isn't forced deeply + testFoldl'NonDeep = { + expr = take 3 (foldl' + (acc: el: [ el ] ++ acc) + [ (abort "unevaluated list entry") ] + [ 1 2 3 ]); + expected = [ 3 2 1 ]; + }; + + # Compared to builtins.foldl', lib.foldl' evaluates the first accumulator strictly too + testFoldl'StrictInitial = { + expr = (builtins.tryEval (foldl' (acc: el: el) (throw "hello") [])).success; + expected = false; + }; + + # Make sure we don't get a stack overflow for large lists + # This number of elements would notably cause a stack overflow if it was implemented without the `foldl'` builtin + testFoldl'Large = { + expr = foldl' (acc: el: acc + el) 0 (range 0 100000); + expected = 5000050000; + }; + testTake = testAllTrue [ ([] == (take 0 [ 1 2 3 ])) ([1] == (take 1 [ 1 2 3 ])) @@ -708,7 +740,7 @@ runTests { # should just return the initial value emptySet = foldlAttrs (throw "function not needed") 123 { }; # should just evaluate to the last value - accNotNeeded = foldlAttrs (_acc: _name: v: v) (throw "accumulator not needed") { z = 3; a = 2; }; + valuesNotNeeded = foldlAttrs (acc: _name: _v: acc) 3 { z = throw "value z not needed"; a = throw "value a not needed"; }; # the accumulator doesnt have to be an attrset it can be as trivial as being just a number or string trivialAcc = foldlAttrs (acc: _name: v: acc * 10 + v) 1 { z = 1; a = 2; }; }; @@ -718,7 +750,7 @@ runTests { names = [ "bar" "foo" ]; }; emptySet = 123; - accNotNeeded = 3; + valuesNotNeeded = 3; trivialAcc = 121; }; }; @@ -948,6 +980,51 @@ runTests { ''; }; + testToGitINI = { + expr = generators.toGitINI { + user = { + email = "user@example.org"; + name = "John Doe"; + signingKey = "00112233445566778899AABBCCDDEEFF"; + }; + gpg.program = "path-to-gpg"; + tag.gpgSign = true; + include.path = "~/path/to/config.inc"; + includeIf."gitdif:~/src/dir".path = "~/path/to/conditional.inc"; + extra = { + boolean = true; + integer = 38; + name = "value"; + subsection.value = "test"; + };}; + expected = '' + [extra] + ${"\t"}boolean = true + ${"\t"}integer = 38 + ${"\t"}name = "value" + + [extra "subsection"] + ${"\t"}value = "test" + + [gpg] + ${"\t"}program = "path-to-gpg" + + [include] + ${"\t"}path = "~/path/to/config.inc" + + [includeIf "gitdif:~/src/dir"] + ${"\t"}path = "~/path/to/conditional.inc" + + [tag] + ${"\t"}gpgSign = true + + [user] + ${"\t"}email = "user@example.org" + ${"\t"}name = "John Doe" + ${"\t"}signingKey = "00112233445566778899AABBCCDDEEFF" + ''; + }; + /* right now only invocation check */ testToJSONSimple = let val = { diff --git a/third_party/nixpkgs/lib/tests/modules.sh b/third_party/nixpkgs/lib/tests/modules.sh index 2c5e4cdbce..05c99e6de8 100755 --- a/third_party/nixpkgs/lib/tests/modules.sh +++ b/third_party/nixpkgs/lib/tests/modules.sh @@ -39,7 +39,7 @@ reportFailure() { checkConfigOutput() { local outputContains=$1 shift - if evalConfig "$@" 2>/dev/null | grep --silent "$outputContains" ; then + if evalConfig "$@" 2>/dev/null | grep -E --silent "$outputContains" ; then ((++pass)) else echo 2>&1 "error: Expected result matching '$outputContains', while evaluating" @@ -91,6 +91,9 @@ checkConfigOutput '^true$' config.result ./test-mergeAttrDefinitionsWithPrio.nix # is the option. checkConfigOutput '^true$' config.result ./module-argument-default.nix +# gvariant +checkConfigOutput '^true$' config.assertion ./gvariant.nix + # types.pathInStore checkConfigOutput '".*/store/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv"' config.pathInStore.ok1 ./types.nix checkConfigOutput '".*/store/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15"' config.pathInStore.ok2 ./types.nix @@ -444,6 +447,24 @@ checkConfigOutput '^"The option `a\.b. defined in `.*/doRename-warnings\.nix. ha checkConfigOutput '^"pear"$' config.once.raw ./merge-module-with-key.nix checkConfigOutput '^"pear\\npear"$' config.twice.raw ./merge-module-with-key.nix +# Declaration positions +# Line should be present for direct options +checkConfigOutput '^10$' options.imported.line10.declarationPositions.0.line ./declaration-positions.nix +checkConfigOutput '/declaration-positions.nix"$' options.imported.line10.declarationPositions.0.file ./declaration-positions.nix +# Generated options may not have line numbers but they will at least get the +# right file +checkConfigOutput '/declaration-positions.nix"$' options.generated.line18.declarationPositions.0.file ./declaration-positions.nix +checkConfigOutput '^null$' options.generated.line18.declarationPositions.0.line ./declaration-positions.nix +# Submodules don't break it +checkConfigOutput '^39$' config.submoduleLine34.submodDeclLine39.0.line ./declaration-positions.nix +checkConfigOutput '/declaration-positions.nix"$' config.submoduleLine34.submodDeclLine39.0.file ./declaration-positions.nix +# New options under freeform submodules get collected into the parent submodule +# (consistent with .declarations behaviour, but weird; notably appears in system.build) +checkConfigOutput '^34|23$' options.submoduleLine34.declarationPositions.0.line ./declaration-positions.nix +checkConfigOutput '^34|23$' options.submoduleLine34.declarationPositions.1.line ./declaration-positions.nix +# nested options work +checkConfigOutput '^30$' options.nested.nestedLine30.declarationPositions.0.line ./declaration-positions.nix + cat < + ''; + }; +} diff --git a/third_party/nixpkgs/lib/tests/release.nix b/third_party/nixpkgs/lib/tests/release.nix index 805f7a7e95..c8d6b81012 100644 --- a/third_party/nixpkgs/lib/tests/release.nix +++ b/third_party/nixpkgs/lib/tests/release.nix @@ -6,6 +6,7 @@ }: let + lib = import ../.; testWithNix = nix: pkgs.runCommand "nixpkgs-lib-tests-nix-${nix.version}" { buildInputs = [ @@ -24,7 +25,7 @@ let ]; nativeBuildInputs = [ nix - ]; + ] ++ lib.optional pkgs.stdenv.isLinux pkgs.inotify-tools; strictDeps = true; } '' datadir="${nix}/share" @@ -50,6 +51,9 @@ let echo "Running lib/tests/sources.sh" TEST_LIB=$PWD/lib bash lib/tests/sources.sh + echo "Running lib/fileset/tests.sh" + TEST_LIB=$PWD/lib bash lib/fileset/tests.sh + echo "Running lib/tests/systems.nix" [[ $(nix-instantiate --eval --strict lib/tests/systems.nix | tee /dev/stderr) == '[ ]' ]]; diff --git a/third_party/nixpkgs/maintainers/README.md b/third_party/nixpkgs/maintainers/README.md index e128818519..5bb9c58db0 100644 --- a/third_party/nixpkgs/maintainers/README.md +++ b/third_party/nixpkgs/maintainers/README.md @@ -1,10 +1,63 @@ # Nixpkgs Maintainers -The *Nixpkgs maintainers* are people who have assigned themselves to -maintain specific individual packages. We encourage people who care -about a package to assign themselves as a maintainer. When a pull -request is made against a package, OfBorg will notify the appropriate -maintainer(s). +Unlike other packaging ecosystems, the maintainer doesn't have exclusive +control over the packages and modules they maintain. This more fluid approach +is one reason why we scale to so many packages. + +## Definition and role of the maintainer + +The main responsibility of a maintainer is to keep the packages they maintain +in a functioning state, and keep up with updates. In order to do that, they +are empowered to make decisions over the packages they maintain. + +That being said, the maintainer is not alone proposing changes to the +packages. Anybody (both bots and humans) can send PRs to bump or tweak the +package. + +We also allow other non-maintainer committers to merge changes to the package, +provided enough time and priority has been given to the maintainer. + +For most packages, we expect committers to wait at least a week before merging +changes not endorsed by a package maintainer (which may be themselves). This should leave enough time +for the maintainers to provide feedback. + +For critical packages, this convention needs to be negotiated with the +maintainer. A critical package is one that causes mass-rebuild, or where an +author is listed in the [`CODEOWNERS`](../.github/CODEOWNERS) file. + +In case of critical security updates, the [security team](https://nixos.org/community/teams/security) might override these +heuristics in order to get the fixes in as fast as possible. + +In case of conflict, the maintainer takes priority and is allowed to revert +the changes. This can happen for example if the maintainer was on holiday. + +### How to become a maintainer + +We encourage people who care about a package to assign themselves as a +maintainer. Commit access to the Nixpkgs repository is not required for that. + +In order to do so, add yourself to the +[`maintainer-list.nix`](./maintainer-list.nix), and then to the desired +package's `meta.maintainers` list, and send a PR with the changes. + +### How to lose maintainer status + +Maintainers who have become inactive on a given package can be removed. This +helps us keep an accurate view of the state of maintenance in Nixpkgs. + +The inactivity measure is currently not strictly enforced. We would typically +look at it if we notice that the author hasn't reacted to package-related +notifications for more than 3 months. + +Removing the maintainer happens by making a PR on the package, adding that +person as a reviewer, and then waiting a week for a reaction. + +The maintainer is welcome to come back at any time. + +### Tools for maintainers + +When a pull request is made against a package, OfBorg will notify the +appropriate maintainer(s). ## Reviewing contributions diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 39fb1ca3b5..bfbf5aa4cc 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -19,7 +19,7 @@ where - `handle` is the handle you are going to use in nixpkgs expressions, - - `name` is your, preferably real, name, + - `name` is a name that people would know and recognize you by, - `email` is your maintainer email address, - `matrix` is your Matrix user ID, - `github` is your GitHub handle (as it appears in the URL of your profile page, `https://github.com/`), @@ -132,6 +132,12 @@ github = "13r0ck"; githubId = 58987761; }; + _21eleven = { + name = "Noah Lidell"; + email = "noahlidell@gmail.com"; + github = "21eleven"; + githubId = 8813855; + }; _2gn = { name = "Hiram Tanner"; github = "2gn"; @@ -205,6 +211,16 @@ fingerprint = "7B59 F09E 0FE5 BC34 F032 1FB4 5270 1DE5 F5F5 1125"; }]; }; + _9glenda = { + email = "plan9git@proton.me"; + matrix = "@9front:matrix.org"; + github = "9glenda"; + githubId = 69043370; + name = "9glenda"; + keys = [{ + fingerprint = "DBF4 E6D0 90B8 BEA4 4BFE 1F1C 3442 4321 39B5 0691"; + }]; + }; a1russell = { email = "adamlr6+pub@gmail.com"; github = "a1russell"; @@ -295,6 +311,12 @@ githubId = 1174810; name = "Nikolay Amiantov"; }; + abdiramen = { + email = "abdirahman.osmanthus@gmail.com"; + github = "Abdiramen"; + githubId = 15805292; + name = "Abdirahman Osman"; + }; abhi18av = { email = "abhi18av@gmail.com"; github = "abhi18av"; @@ -436,6 +458,15 @@ githubId = 315003; name = "Adam Saponara"; }; + adtya = { + email = "adtya@adtya.xyz"; + github = "adtya"; + githubId = 22346805; + name = "Adithya Nair"; + keys = [{ + fingerprint = "51E4 F5AB 1B82 BE45 B422 9CC2 43A5 E25A A5A2 7849"; + }]; + }; aerialx = { email = "aaron+nixos@aaronlindsay.com"; github = "AerialX"; @@ -599,6 +630,12 @@ githubId = 65275785; name = "Alexander Kenji Berthold"; }; + akgrant43 = { + name = "Alistair Grant"; + email = "akg1012@fastmail.com.au"; + github = "akgrant43"; + githubId = 2062166; + }; akho = { name = "Alexander Khodyrev"; email = "a@akho.name"; @@ -722,6 +759,12 @@ github = "Alexnortung"; githubId = 1552267; }; + alexoundos = { + email = "alexoundos@gmail.com"; + github = "AleXoundOS"; + githubId = 464913; + name = "Alexander Tomokhov"; + }; alexshpilkin = { email = "ashpilkin@gmail.com"; github = "alexshpilkin"; @@ -786,6 +829,12 @@ githubId = 5892756; name = "Alec Snyder"; }; + allusive = { + email = "jasper@allusive.dev"; + name = "Allusive"; + github = "allusive-dev"; + githubId = 99632976; + }; almac = { email = "alma.cemerlic@gmail.com"; github = "a1mac"; @@ -852,6 +901,12 @@ githubId = 160476; name = "Amanjeev Sethi"; }; + amanse = { + email = "amansetiarjp@gmail.com"; + github = "amanse"; + githubId = 13214574; + name = "Aman Setia"; + }; amar1729 = { email = "amar.paul16@gmail.com"; github = "Amar1729"; @@ -864,6 +919,12 @@ githubId = 153175; name = "Andrew Marshall"; }; + amaxine = { + email = "max@ine.dev"; + github = "amaxine"; + githubId = 35892750; + name = "Maxine Aubrey"; + }; ambroisie = { email = "bruno.nixpkgs@belanyi.fr"; github = "ambroisie"; @@ -1060,6 +1121,11 @@ github = "an-empty-string"; githubId = 681716; }; + angaz = { + name = "Angus Dippenaar"; + github = "angaz"; + githubId = 10219618; + }; angristan = { email = "angristan@pm.me"; github = "angristan"; @@ -1499,6 +1565,11 @@ githubId = 11037075; name = "Ashley Hooper"; }; + ashvith-shetty = { + github = "Ashvith10"; + githubId = 113123021; + name = "Ashvith Shetty"; + }; aske = { email = "aske@fmap.me"; github = "aske"; @@ -1709,6 +1780,15 @@ githubId = 1222; name = "Aaron VonderHaar"; }; + aviallon = { + email = "antoine-nixos@lesviallon.fr"; + github = "aviallon"; + githubId = 7479436; + name = "Antoine Viallon"; + keys = [{ + fingerprint = "4AC4 A28D 7208 FC6F 2B51 5EA9 D126 B13A B555 E16F"; + }]; + }; avitex = { email = "theavitex@gmail.com"; github = "avitex"; @@ -2283,6 +2363,15 @@ github = "blaggacao"; githubId = 7548295; }; + blankparticle = { + name = "BlankParticle"; + email = "blankparticle@gmail.com"; + github = "BlankParticle"; + githubId = 130567419; + keys = [{ + fingerprint = "1757 64C3 7065 AA8D 614D 41C9 0ACE 126D 7B35 9261"; + }]; + }; blanky0230 = { email = "blanky0230@gmail.com"; github = "blanky0230"; @@ -2386,12 +2475,6 @@ githubId = 1743184; name = "Boris Babić"; }; - borlaag = { - email = "borlaag@proton.me"; - github = "Borlaag"; - githubId = 114830266; - name = "Børlaag"; - }; bosu = { email = "boriss@gmail.com"; github = "bosu"; @@ -2727,9 +2810,12 @@ }; CardboardTurkey = { name = "Kiran Ostrolenk"; - email = "kostrolenk@gmail.com"; + email = "kiran@ostrolenk.co.uk"; github = "CardboardTurkey"; githubId = 34030186; + keys = [{ + fingerprint = "8BC7 74E4 A2EC 7507 3B61 A647 0BBB 1C8B 1C36 39EE"; + }]; }; carlosdagos = { email = "m@cdagostino.io"; @@ -3069,7 +3155,7 @@ }; christianharke = { email = "christian@harke.ch"; - github = "christianharke"; + github = "rake5k"; githubId = 13007345; name = "Christian Harke"; keys = [{ @@ -3096,6 +3182,11 @@ fingerprint = "9C56 1D64 30B2 8D6B DCBC 9CEB 73D5 E7FD EE3D E49A"; }]; }; + chrpinedo = { + github = "chrpinedo"; + githubId = 2324630; + name = "Christian Pinedo"; + }; chuahou = { email = "human+github@chuahou.dev"; github = "chuahou"; @@ -3323,6 +3414,12 @@ githubId = 5561189; name = "Cody Opel"; }; + coffeeispower = { + email = "tiagodinis33@proton.me"; + github = "coffee-is-power"; + name = "Tiago Dinis"; + githubId = 92828847; + }; cofob = { name = "Egor Ternovoy"; email = "cofob@riseup.net"; @@ -3592,12 +3689,6 @@ githubId = 398996; name = "Christopher Singley"; }; - cstrahan = { - email = "charles@cstrahan.com"; - github = "cstrahan"; - githubId = 143982; - name = "Charles Strahan"; - }; cswank = { email = "craigswank@gmail.com"; github = "cswank"; @@ -3926,6 +4017,12 @@ githubId = 11422515; name = "David Sánchez"; }; + dawidd6 = { + email = "dawidd0811@gmail.com"; + github = "dawidd6"; + githubId = 9713907; + name = "Dawid Dziurla"; + }; dawidsowa = { email = "dawid_sowa@posteo.net"; github = "dawidsowa"; @@ -4413,7 +4510,7 @@ DomesticMoth = { name = "Andrew"; email = "silkmoth@protonmail.com"; - github = "DomesticMoth"; + github = "asciimoth"; githubId = 91414737; keys = [{ fingerprint = "7D6B AE0A A98A FDE9 3396 E721 F87E 15B8 3AA7 3087"; @@ -4482,6 +4579,16 @@ fingerprint = "4749 0887 CF3B 85A1 6355 C671 78C7 DD40 DF23 FB16"; }]; }; + dpc = { + email = "dpc@dpc.pw"; + github = "dpc"; + githubId = 9209; + matrix = "@dpc:matrix.org"; + name = "Dawid Ciężarkiewicz"; + keys = [{ + fingerprint = "0402 11D2 0830 2D71 5792 8197 86BB 1D5B 5575 7D38"; + }]; + }; DPDmancul = { name = "Davide Peressoni"; email = "davide.peressoni@tuta.io"; @@ -4619,6 +4726,16 @@ fingerprint = "5DD7 C6F6 0630 F08E DAE7 4711 1525 585D 1B43 C62A"; }]; }; + dunxen = { + email = "git@dunxen.dev"; + matrix = "@dunxen:x0f.org"; + github = "dunxen"; + githubId = 3072149; + name = "Duncan Dean"; + keys = [{ + fingerprint = "9484 44FC E03B 05BA 5AB0 591E C37B 1C1D 44C7 86EE"; + }]; + }; dwarfmaster = { email = "nixpkgs@dwarfmaster.net"; github = "dwarfmaster"; @@ -4749,6 +4866,12 @@ githubId = 50854; name = "edef"; }; + edeneast = { + email = "edenofest@gmail.com"; + github = "edeneast"; + githubId = 2746374; + name = "edeneast"; + }; ederoyd46 = { email = "matt@ederoyd.co.uk"; github = "ederoyd46"; @@ -4789,12 +4912,6 @@ githubId = 54799; name = "Edward Tjörnhammar"; }; - ee2500 = { - email = "earthengine@skiff.com"; - github = "ee2500"; - githubId = 134107129; - name = "EarthEngine"; - }; eelco = { email = "edolstra+nixpkgs@gmail.com"; github = "edolstra"; @@ -5521,11 +5638,11 @@ matrix = "@felipeqq2:pub.solar"; }; felixalbrigtsen = { - email = "felixalbrigtsen@gmail.com"; + email = "felix@albrigtsen.it"; github = "felixalbrigtsen"; githubId = 64613093; name = "Felix Albrigtsen"; - matrix = "@felixalb:pvv.ntnu.no"; + matrix = "@felixalb:feal.no"; }; felixscheinost = { name = "Felix Scheinost"; @@ -5718,11 +5835,21 @@ githubId = 5918766; name = "Franz Thoma"; }; + fogti = { + name = "Alain Fogtia Zscheile"; + email = "fogti+devel@ytrizja.de"; + github = "fogti"; + githubId = 1618343; + }; foo-dogsquared = { - email = "foo.dogsquared@gmail.com"; + email = "foodogsquared@foodogsquared.one"; github = "foo-dogsquared"; githubId = 34962634; + matrix = "@foodogsquared:matrix.org"; name = "Gabriel Arazas"; + keys = [{ + fingerprint = "DDD7 D0BD 602E 564B AA04 FC35 1431 0D91 4115 2B92"; + }]; }; fooker = { email = "fooker@lab.sh"; @@ -5803,6 +5930,12 @@ githubId = 7551358; name = "Frede Emil"; }; + frederictobiasc = { + email = "dev@ntr.li"; + github = "frederictobiasc"; + githubId = 26125115; + name = "Frédéric Christ"; + }; Freed-Wu = { email = "wuzhenyu@ustc.edu"; github = "Freed-Wu"; @@ -5874,6 +6007,15 @@ githubId = 134872; name = "Sergei Lukianov"; }; + fryuni = { + name = "Luiz Ferraz"; + email = "luiz@lferraz.com"; + github = "Fryuni"; + githubId = 11063910; + keys = [{ + fingerprint = "2109 4B0E 560B 031E F539 62C8 2B56 8731 DB24 47EC"; + }]; + }; fsagbuya = { email = "fa@m-labs.ph"; github = "fsagbuya"; @@ -5939,6 +6081,15 @@ githubId = 12715461; name = "Anders Bo Rasmussen"; }; + fwam = { + name = "Legion Orsetti"; + email = "fwam@queereen.dev"; + github = "fwam"; + githubId = 113541944; + keys = [{ + fingerprint = "3822 20B8 57ED 0602 3786 8A7A 18E1 AE22 D704 B4FC"; + }]; + }; fwc = { github = "fwc"; githubId = 29337229; @@ -6107,6 +6258,12 @@ githubId = 313929; name = "Gabriel Ebner"; }; + geluk = { + email = "johan+nix@geluk.io"; + github = "geluk"; + githubId = 1516985; + name = "Johan Geluk"; + }; genericnerdyusername = { name = "GenericNerdyUsername"; email = "genericnerdyusername@proton.me"; @@ -6301,6 +6458,12 @@ githubId = 1447245; name = "Robin Gloster"; }; + gmemstr = { + email = "git@gmem.ca"; + github = "gmemstr"; + githubId = 1878840; + name = "Gabriel Simmer"; + }; gnxlxnxx = { email = "gnxlxnxx@web.de"; github = "gnxlxnxx"; @@ -6642,6 +6805,12 @@ githubId = 33523827; name = "Harrison Thorne"; }; + haruki7049 = { + email = "tontonkirikiri@gmail.com"; + github = "haruki7049"; + githubId = 64677724; + name = "haruki7049"; + }; harvidsen = { email = "harvidsen@gmail.com"; github = "harvidsen"; @@ -6673,6 +6842,12 @@ githubId = 1379411; name = "Georg Haas"; }; + hbjydev = { + email = "hayden@kuraudo.io"; + github = "hbjydev"; + githubId = 22327045; + name = "Hayden Young"; + }; hbunke = { email = "bunke.hendrik@gmail.com"; github = "hbunke"; @@ -7108,6 +7283,12 @@ githubId = 69209; name = "Ian Duncan"; }; + ianliu = { + email = "ian.liu88@gmail.com"; + github = "ianliu"; + githubId = 30196; + name = "Ian Liu Rodrigues"; + }; ianmjones = { email = "ian@ianmjones.com"; github = "ianmjones"; @@ -7245,7 +7426,7 @@ }; imalison = { email = "IvanMalison@gmail.com"; - github = "IvanMalison"; + github = "colonelpanic8"; githubId = 1246619; name = "Ivan Malison"; }; @@ -7669,7 +7850,7 @@ jayesh-bhoot = { name = "Jayesh Bhoot"; email = "jb@jayeshbhoot.com"; - github = "bhootjb"; + github = "jyssh"; githubId = 1915507; }; jayman2000 = { @@ -7874,6 +8055,12 @@ githubId = 854319; name = "Matt McHenry"; }; + jerrysm64 = { + email = "jerry.starke@icloud.com"; + github = "jerrysm64"; + githubId = 42114389; + name = "Jerry Starke"; + }; jeschli = { email = "jeschli@gmail.com"; github = "0mbi"; @@ -8225,6 +8412,12 @@ githubId = 297653; name = "Joe Salisbury"; }; + johannwagner = { + email = "nix@wagner.digital"; + github = "johannwagner"; + githubId = 12380026; + name = "Johann Wagner"; + }; johanot = { email = "write@ownrisk.dk"; github = "johanot"; @@ -8335,7 +8528,7 @@ }; jonnybolton = { email = "jonnybolton@gmail.com"; - github = "jonnybolton"; + github = "jonnynightingale"; githubId = 8580434; name = "Jonny Bolton"; }; @@ -8372,8 +8565,9 @@ githubId = 4646725; }; joscha = { - name = "joscha Loos"; + name = "Joscha Loos"; email = "j.loos@posteo.net"; + github = "jooooscha"; githubId = 57965027; }; josephst = { @@ -8418,6 +8612,12 @@ githubId = 1918771; name = "Joe Doyle"; }; + jpentland = { + email = "joe.pentland@gmail.com"; + github = "jpentland"; + githubId = 1135582; + name = "Joe Pentland"; + }; jperras = { email = "joel@nerderati.com"; github = "jperras"; @@ -8498,6 +8698,12 @@ name = "John Soo"; githubId = 10039785; }; + jsusk = { + email = "joshua@suskalo.org"; + github = "IGJoshua"; + name = "Joshua Suskalo"; + githubId = 27734541; + }; jtbx = { email = "jtbx@duck.com"; name = "Jeremy Baxter"; @@ -8910,6 +9116,15 @@ githubId = 546087; name = "Kristoffer K. Føllesdal"; }; + kgtkr = { + email = "contact@kgtkr.net"; + github = "kgtkr"; + githubId = 17868838; + name = "kgtkr"; + keys = [{ + fingerprint = "B30D BE93 81E0 3D5D F301 88C8 1F6E B951 9F57 3241"; + }]; + }; khaneliman = { email = "khaneliman12@gmail.com"; github = "khaneliman"; @@ -8978,6 +9193,12 @@ githubId = 845652; name = "Kier Davis"; }; + kilianar = { + email = "mail@kilianar.de"; + github = "kilianar"; + githubId = 105428155; + name = "kilianar"; + }; kilimnik = { email = "mail@kilimnik.de"; github = "kilimnik"; @@ -9026,6 +9247,13 @@ githubId = 691290; name = "Keshav Kini"; }; + kip93 = { + name = "Leandro Reina Kiperman"; + email = "leandro@kip93.net"; + matrix = "@kip93:matrix.org"; + github = "kip93"; + githubId = 26793632; + }; kira-bruneau = { email = "kira.bruneau@pm.me"; name = "Kira Bruneau"; @@ -9145,6 +9373,12 @@ github = "KnairdA"; githubId = 498373; }; + knarkzel = { + email = "knarkzel@gmail.com"; + name = "Knarkzel"; + github = "Knarkzel"; + githubId = 85593302; + }; knedlsepp = { email = "josef.kemetmueller@gmail.com"; github = "knedlsepp"; @@ -9314,6 +9548,12 @@ name = "Tomas Krupka"; matrix = "@krupkat:matrix.org"; }; + krzaczek = { + name = "Pawel Krzaczkowski"; + email = "pawel@printu.pl"; + github = "krzaczek"; + githubId = 5773701; + }; ktf = { email = "giulio.eulisse@cern.ch"; github = "ktf"; @@ -9338,6 +9578,11 @@ githubId = 894884; name = "Jakub Kozłowski"; }; + kupac = { + github = "Kupac"; + githubId = 8224569; + name = "László Kupcsik"; + }; kurnevsky = { email = "kurnevsky@gmail.com"; github = "kurnevsky"; @@ -9472,6 +9717,12 @@ githubId = 621759; name = "Lassulus"; }; + laurailway = { + email = "laurailway.git@posteo.net"; + github = "LAURAilway"; + githubId = 118690640; + name = "Laura"; + }; laurent-f1z1 = { email = "laurent.nixpkgs@fainsin.bzh"; github = "Laurent2916"; @@ -9630,7 +9881,7 @@ }; lethalman = { email = "lucabru@src.gnome.org"; - github = "lethalman"; + github = "lucabrunox"; githubId = 480920; name = "Luca Bruno"; }; @@ -9789,6 +10040,13 @@ githubId = 725613; name = "Linus Arver"; }; + linuxissuper = { + email = "m+nix@linuxistcool.de"; + matrix = "@m:linuxistcool.de"; + github = "linuxissuper"; + githubId = 74221543; + name = "Moritz Goltdammer"; + }; lionello = { email = "lio@lunesu.com"; github = "lionello"; @@ -10059,7 +10317,7 @@ name = "Ludovic Courtès"; }; ludovicopiero = { - email = "ludovicopiero@pm.me"; + email = "lewdovico@gnuweeb.org"; github = "ludovicopiero"; githubId = 44255157; name = "Ludovico Piero"; @@ -10138,12 +10396,6 @@ githubId = 84395723; name = "Lukas Wurzinger"; }; - lukeadams = { - email = "luke.adams@belljar.io"; - github = "lukeadams"; - githubId = 3508077; - name = "Luke Adams"; - }; lukebfox = { email = "lbentley-fox1@sheffield.ac.uk"; github = "lukebfox"; @@ -10198,6 +10450,12 @@ githubId = 782440; name = "Luna Nova"; }; + luochen1990 = { + email = "luochen1990@gmail.com"; + github = "luochen1990"; + githubId = 2309868; + name = "Luo Chen"; + }; lurkki = { email = "jussi.kuokkanen@protonmail.com"; github = "Lurkki14"; @@ -10290,12 +10548,6 @@ github = "mac-chaffee"; githubId = 7581860; }; - maddiethecafebabe = { - email = "maddie@cafebabe.date"; - github = "maddiethecafebabe"; - githubId = 75337286; - name = "Madeline S."; - }; madjar = { email = "georges.dubus@compiletoi.net"; github = "madjar"; @@ -10431,6 +10683,12 @@ githubId = 40720523; name = "MangoIV"; }; + manipuladordedados = { + email = "manipuladordedados@gmail.com"; + github = "manipuladordedados"; + githubId = 1189862; + name = "Valter Nazianzeno"; + }; manojkarthick = { email = "smanojkarthick@gmail.com"; github = "manojkarthick"; @@ -10598,6 +10856,12 @@ githubId = 7878181; name = "Mateo Diaz"; }; + materus = { + email = "materus@podkos.pl"; + github = "materusPL"; + githubId = 28183516; + name = "Mateusz Słodkowicz"; + }; math-42 = { email = "matheus.4200@gmail.com"; github = "Math-42"; @@ -10723,7 +10987,7 @@ }]; }; max-amb = { - email = "maxpeterambaum@gmail.com"; + email = "max_a@e.email"; github = "max-amb"; githubId = 137820334; name = "Max Ambaum"; @@ -10743,12 +11007,6 @@ githubId = 502805; name = "Max Zerzouri"; }; - maxeaubrey = { - email = "maxeaubrey@gmail.com"; - github = "maxeaubrey"; - githubId = 35892750; - name = "Maxine Aubrey"; - }; maxhbr = { email = "nixos@maxhbr.dev"; github = "maxhbr"; @@ -10829,6 +11087,12 @@ githubId = 613740; name = "Martin Baillie"; }; + mbalatsko = { + email = "mbalatsko@gmail.com"; + github = "mbalatsko"; + githubId = 15967073; + name = "Maksym Balatsko"; + }; mbbx6spp = { email = "me@susanpotter.net"; github = "mbbx6spp"; @@ -10887,13 +11151,15 @@ name = "Matthias C. M. Troffaes"; }; McSinyx = { - email = "mcsinyx@disroot.org"; + email = "cnx@loang.net"; github = "McSinyx"; githubId = 13689192; + matrix = "@cnx:loang.net"; name = "Nguyễn Gia Phong"; - keys = [{ - fingerprint = "E90E 11B8 0493 343B 6132 E394 2714 8B2C 06A2 224B"; - }]; + keys = [ + { fingerprint = "E90E 11B8 0493 343B 6132 E394 2714 8B2C 06A2 224B"; } + { fingerprint = "838A FE0D 55DC 074E 360F 943A 84B6 9CE6 F3F6 B767"; } + ]; }; mcwitt = { email = "mcwitt@gmail.com"; @@ -11007,6 +11273,12 @@ githubId = 3300322; name = "Mitchell Fossen"; }; + mfrw = { + email = "falakreyaz@gmail.com"; + github = "mfrw"; + githubId = 4929861; + name = "Muhammad Falak R Wani"; + }; mgdelacroix = { email = "mgdelacroix@gmail.com"; github = "mgdelacroix"; @@ -11204,6 +11476,12 @@ githubId = 43088426; name = "Mihnea Stoian"; }; + mikaelfangel = { + email = "nixpkgs.bottle597@passfwd.com"; + github = "MikaelFangel"; + githubId = 34864484; + name = "Mikael Fangel"; + }; mikefaille = { email = "michael@faille.io"; github = "mikefaille"; @@ -11322,6 +11600,15 @@ githubId = 1776903; name = "Andrew Abbott"; }; + mirrorwitch = { + email = "mirrorwitch@transmom.love"; + github = "mirrorwitch"; + githubId = 146672255; + name = "mirrorwitch"; + keys = [{ + fingerprint = "C3E7 F8C4 9CBC 9320 D360 B117 8516 D0FA 7D8F 58FC"; + }]; + }; Misaka13514 = { name = "Misaka13514"; email = "Misaka13514@gmail.com"; @@ -11365,6 +11652,13 @@ githubId = 1001112; name = "Marcin Janczyk"; }; + mjm = { + email = "matt@mattmoriarity.com"; + github = "mjm"; + githubId = 1181; + matrix = "@mjm:beeper.com"; + name = "Matt Moriarity"; + }; mjp = { email = "mike@mythik.co.uk"; github = "MikePlayle"; @@ -11618,6 +11912,13 @@ githubId = 2072185; name = "Marc Scholten"; }; + mrcjkb = { + email = "marc@jakobi.dev"; + matrix = "@mrcjk:matrix.org"; + name = "Marc Jakobi"; + github = "mrcjkb"; + githubId = 12857160; + }; mredaelli = { email = "massimo@typish.io"; github = "mredaelli"; @@ -11858,6 +12159,11 @@ githubId = 59313755; name = "Maxim Karasev"; }; + mxmlnkn = { + github = "mxmlnkn"; + githubId = 6842824; + name = "Maximilian Knespel"; + }; myaats = { email = "mats@mats.sh"; github = "Myaats"; @@ -12028,12 +12334,6 @@ githubId = 77314501; name = "Maurice Zhou"; }; - nebulka = { - email = "arapun@proton.me"; - github = "nebulka1"; - githubId = 121920704; - name = "Nebulka"; - }; Necior = { email = "adrian@sadlocha.eu"; github = "Necior"; @@ -12213,6 +12513,12 @@ fingerprint = "7BC1 77D9 C222 B1DC FB2F 0484 C061 089E FEBF 7A35"; }]; }; + nicegamer7 = { + name = "Kermina Awad"; + email = "kerminaawad@gmail.com"; + github = "nicegamer7"; + githubId = 8083772; + }; nickcao = { name = "Nick Cao"; email = "nickcao@nichi.co"; @@ -12603,6 +12909,12 @@ githubId = 16027994; name = "Nathan Viets"; }; + nyanbinary = { + email = "vextium@skiff.com"; + github = "nyabinary"; + githubId = 97130632; + name = "Niko"; + }; nyanloutre = { email = "paul@nyanlout.re"; github = "nyanloutre"; @@ -12680,6 +12992,13 @@ fingerprint = "939E F8A5 CED8 7F50 5BB5 B2D0 24BC 2738 5F70 234F"; }]; }; + octodi = { + name = "octodi"; + email = "octodi@proton.me"; + matrix = "@octodi:matrix.org"; + github = "octodi"; + githubId = 127038896; + }; oddlama = { email = "oddlama@oddlama.org"; github = "oddlama"; @@ -12707,6 +13026,11 @@ githubId = 585547; name = "Jaka Hudoklin"; }; + offsetcyan = { + github = "offsetcyan"; + githubId = 49906709; + name = "Dakota"; + }; oida = { email = "oida@posteo.de"; github = "oida"; @@ -12804,6 +13128,12 @@ githubId = 915970; name = "Austin Platt"; }; + onur-ozkan = { + name = "Onur Ozkan"; + email = "contact@onurozkan.dev"; + github = "onur-ozkan"; + githubId = 39852038; + }; ony = { name = "Mykola Orliuk"; email = "virkony@gmail.com"; @@ -12845,7 +13175,7 @@ }; orichter = { email = "richter-oliver@gmx.net"; - github = "RichterOliver"; + github = "ORichterSec"; githubId = 135209509; name = "Oliver Richter"; }; @@ -13416,6 +13746,12 @@ githubId = 34967; name = "Julius de Bruijn"; }; + pineapplehunter = { + email = "peshogo+nixpkgs@gmail.com"; + github = "pineapplehunter"; + githubId = 8869894; + name = "Shogo Takata"; + }; pingiun = { email = "nixos@pingiun.com"; github = "pingiun"; @@ -13454,7 +13790,7 @@ }; pjbarnoy = { email = "pjbarnoy@gmail.com"; - github = "pjbarnoy"; + github = "waaamb"; githubId = 119460; name = "Perry Barnoy"; }; @@ -13500,7 +13836,7 @@ PlayerNameHere = { name = "Dixon Sean Low Yan Feng"; email = "dixonseanlow@protonmail.com"; - github = "PlayerNameHere"; + github = "dixslyf"; githubId = 56017218; keys = [{ fingerprint = "E6F4 BFB4 8DE3 893F 68FC A15F FF5F 4B30 A41B BAC8"; @@ -13672,7 +14008,7 @@ name = "Pedro Pombeiro"; }; pongo1231 = { - email = "pongo1999712@gmail.com"; + email = "pongo12310@gmail.com"; github = "pongo1231"; githubId = 4201956; name = "pongo1231"; @@ -13776,6 +14112,13 @@ fingerprint = "DD54 130B ABEC B65C 1F6B 2A38 8312 4F97 A318 EA18"; }]; }; + p-rintz = { + email = "nix@rintz.net"; + github = "p-rintz"; + githubId = 13933258; + name = "Philipp Rintz"; + matrix = "@philipp:srv.icu"; + }; ProducerMatt = { name = "Matthew Pherigo"; email = "ProducerMatt42@gmail.com"; @@ -13848,6 +14191,16 @@ githubId = 33375; name = "Peter Sanford"; }; + pschmitt = { + email = "philipp@schmitt.co"; + github = "pschmitt"; + githubId = 37886; + name = "Philipp Schmitt"; + matrix = "@pschmitt:one.ems.host"; + keys = [{ + fingerprint = "9FBF 2ABF FB37 F7F3 F502 44E5 DC43 9C47 EACB 17F9"; + }]; + }; pshirshov = { email = "pshirshov@eml.cc"; github = "pshirshov"; @@ -14145,6 +14498,12 @@ githubId = 121178; name = "Raphael Robatsch"; }; + rapiteanu = { + email = "rapiteanu.catalin@gmail.com"; + github = "Steinhagen"; + githubId = 4029937; + name = "Viorel-Cătălin Răpițeanu"; + }; raquelgb = { email = "raquel.garcia.bautista@gmail.com"; github = "raquelgb"; @@ -14183,7 +14542,7 @@ }; razvan = { email = "razvan.panda@gmail.com"; - github = "razvan-flavius-panda"; + github = "freeman42x"; githubId = 1758708; name = "Răzvan Flavius Panda"; }; @@ -14274,6 +14633,13 @@ githubId = 21069876; name = "Reed Williams"; }; + refi64 = { + name = "Ryan Gonzalez"; + email = "git@refi64.dev"; + matrix = "@refi64:linuxcafe.chat"; + github = "refi64"; + githubId = 1690697; + }; refnil = { email = "broemartino@gmail.com"; github = "refnil"; @@ -14670,6 +15036,12 @@ fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236"; }]; }; + rossabaker = { + name = "Ross A. Baker"; + email = "ross@rossabaker.com"; + github = "rossabaker"; + githubId = 142698; + }; RossComputerGuy = { name = "Tristan Ross"; email = "tristan.ross@midstall.com"; @@ -14784,6 +15156,12 @@ github = "rubyowo"; githubId = 105302757; }; + rudolfvesely = { + name = "Rudolf Vesely"; + email = "i@rudolfvesely.com"; + github = "rudolfvesely"; + githubId = 13966949; + }; Ruixi-rebirth = { name = "Ruixi-rebirth"; email = "ruixirebirth@gmail.com"; @@ -14820,6 +15198,12 @@ githubId = 7365864; name = "Rafael Varago"; }; + rvdp = { + email = "ramses@well-founded.dev"; + github = "R-VdP"; + githubId = 141248; + name = "Ramses"; + }; rvl = { email = "dev+nix@rodney.id.au"; github = "rvl"; @@ -14984,6 +15368,12 @@ githubId = 171470; name = "Sam Hug"; }; + SamirTalwar = { + email = "lazy.git@functional.computer"; + github = "SamirTalwar"; + githubId = 47852; + name = "Samir Talwar"; + }; samlich = { email = "nixos@samli.ch"; github = "samlich"; @@ -15024,6 +15414,12 @@ githubId = 107703; name = "Samuel Rivas"; }; + samueltardieu = { + email = "nixpkgs@sam.rfc1149.net"; + github = "samueltardieu"; + githubId = 44656; + name = "Samuel Tardieu"; + }; samw = { email = "sam@wlcx.cc"; github = "wlcx"; @@ -15481,6 +15877,15 @@ githubId = 293035; name = "Shawn Dellysse"; }; + shayne = { + email = "shaynesweeney@gmail.com"; + github = "shayne"; + githubId = 79330; + name = "Shayne Sweeney"; + keys = [{ + fingerprint = "AFCB 29A0 F12E F367 9575 DABE 69DA 13E8 6BF4 03B0"; + }]; + }; shazow = { email = "andrey.petrov@shazow.net"; github = "shazow"; @@ -15702,6 +16107,12 @@ fingerprint = "B234 EFD4 2B42 FE81 EE4D 7627 F72C 4A88 7F9A 24CA"; }]; }; + sironheart = { + email = "git@beisenherz.dev"; + github = "Sironheart"; + githubId = 13799656; + name = "Steffen Beisenherz"; + }; sirseruju = { email = "sir.seruju@yandex.ru"; github = "SirSeruju"; @@ -15826,6 +16237,15 @@ github = "syvb"; githubId = 10530973; }; + smona = { + name = "Mel Bourgeois"; + email = "mason.bourgeois@gmail.com"; + github = "Smona"; + githubId = 7091399; + keys = [{ + fingerprint = "897E 6BE3 0345 B43D CADD 05B7 290F CF08 1AED B3EC"; + }]; + }; sna = { email = "abouzahra.9@wright.edu"; github = "S-NA"; @@ -15926,6 +16346,16 @@ githubId = 53029739; name = "Joshua Ortiz"; }; + Sorixelle = { + email = "ruby+nixpkgs@srxl.me"; + matrix = "@ruby:isincredibly.gay"; + name = "Ruby Iris Juric"; + github = "Sorixelle"; + githubId = 38685302; + keys = [{ + fingerprint = "2D76 76C7 A28E 16FC 75C7 268D 1B55 6ED8 4B0E 303A"; + }]; + }; sorki = { email = "srk@48.io"; github = "sorki"; @@ -16165,12 +16595,6 @@ fingerprint = "5D8B FA8B 286A C2EF 6EE4 8598 F742 B72C 8926 1A51"; }]; }; - stepech = { - name = "stepech"; - github = "stepech"; - githubId = 29132060; - matrix = "@stepech:matrix.org"; - }; stephank = { email = "nix@stephank.nl"; matrix = "@skochen:matrix.org"; @@ -16675,7 +17099,7 @@ name = "Andy Tockman"; }; techknowlogick = { - email = "techknowlogick@gitea.io"; + email = "techknowlogick@gitea.com"; github = "techknowlogick"; githubId = 164197; name = "techknowlogick"; @@ -16881,7 +17305,7 @@ name = "The Hedgehog"; email = "hedgehog@mrhedgehog.xyz"; matrix = "@mrhedgehog:jupiterbroadcasting.com"; - github = "theHedgehog0"; + github = "pyrox0"; githubId = 35778371; keys = [{ fingerprint = "38A0 29B0 4A7E 4C13 A4BB 86C8 7D51 0786 6B1C 6752"; @@ -17385,6 +17809,13 @@ githubId = 25440339; name = "Tom Repetti"; }; + trevdev = { + email = "trev@trevdev.ca"; + matrix = "@trevdev:matrix.org"; + github = "trev-dev"; + githubId = 28788713; + name = "Trevor Richards"; + }; trevorj = { email = "nix@trevor.joynson.io"; github = "akatrevorjay"; @@ -17535,6 +17966,15 @@ github = "twitchyliquid64"; githubId = 6328589; }; + twz123 = { + name = "Tom Wieczorek"; + email = "tom@bibbu.net"; + github = "twz123"; + githubId = 1215104; + keys = [{ + fingerprint = "B1FD 4E2A 84B2 2379 F4BF 2EF5 FE33 A228 2371 E831"; + }]; + }; tylerjl = { email = "tyler+nixpkgs@langlois.to"; github = "tylerjl"; @@ -17863,6 +18303,12 @@ githubId = 245573; name = "Dmitry Kalinkin"; }; + victormeriqui = { + name = "Victor Meriqui"; + email = "victor.meriqui@ororatech.com"; + github = "victormeriqui"; + githubId = 1396008; + }; victormignot = { email = "root@victormignot.fr"; github = "victormignot"; @@ -17899,6 +18345,18 @@ fingerprint = "5814 50EB 6E17 E715 7C63 E7F1 9879 8C3C 4D68 8D6D"; }]; }; + viktornordling = { + email = "antique_paler_0i@icloud.com"; + github = "viktornordling"; + githubId = 90482; + name = "Viktor Nordling"; + }; + vilsol = { + email = "me@vil.so"; + github = "vilsol"; + githubId = 1759390; + name = "Vilsol"; + }; viluon = { email = "nix@viluon.me"; github = "viluon"; @@ -18059,6 +18517,12 @@ githubId = 16415673; name = "Van Tuan Vo"; }; + vuimuich = { + email = "vuimuich@quantentunnel.de"; + github = "VuiMuich"; + githubId = 4779365; + name = "Johannes Mayrhofer"; + }; vyorkin = { email = "vasiliy.yorkin@gmail.com"; github = "vyorkin"; @@ -18117,7 +18581,7 @@ githubId = 60148; }; water-sucks = { - email = "varun@cvte.org"; + email = "varun@snare.dev"; name = "Varun Narravula"; github = "water-sucks"; githubId = 68445574; @@ -18148,7 +18612,7 @@ }; weathercold = { name = "Weathercold"; - email = "weathercold.scr@gmail.com"; + email = "weathercold.scr@proton.me"; matrix = "@weathercold:matrix.org"; github = "Weathercold"; githubId = 49368953; @@ -18204,6 +18668,12 @@ fingerprint = "F844 80B2 0CA9 D6CC C7F5 2479 A776 D2AD 099E 8BC0"; }]; }; + wexder = { + email = "wexder19@gmail.com"; + github = "wexder"; + githubId = 24979302; + name = "Vladimír Zahradník"; + }; wheelsandmetal = { email = "jakob@schmutz.co.uk"; github = "wheelsandmetal"; @@ -18231,6 +18701,22 @@ githubId = 7121530; name = "Wolf Honoré"; }; + wietsedv = { + email = "wietsedv@proton.me"; + github = "wietsedv"; + githubId = 13139101; + name = "Wietse de Vries"; + }; + wigust = { + name = "Oleg Pykhalov"; + email = "go.wigust@gmail.com"; + github = "wigust"; + githubId = 7709598; + keys = [{ + # primary: "C955 CC5D C048 7FB1 7966 40A9 199A F6A3 67E9 4ABB" + fingerprint = "7238 7123 8EAC EB63 4548 5857 167F 8EA5 001A FA9C"; + }]; + }; wildsebastian = { name = "Sebastian Wild"; email = "sebastian@wild-siena.com"; @@ -18260,6 +18746,12 @@ githubId = 20464732; name = "Willi Butz"; }; + willswats = { + email = "williamstuwatson@gmail.com"; + github = "willswats"; + githubId = 86304139; + name = "William Watson"; + }; wilsonehusin = { name = "Wilson E. Husin"; email = "wilsonehusin@gmail.com"; @@ -18564,6 +19056,12 @@ github = "XYenon"; githubId = 20698483; }; + xyven1 = { + name = "Xyven"; + email = "nix@xyven.dev"; + github = "xyven1"; + githubId = 35360746; + }; xzfc = { email = "xzfcpw@gmail.com"; github = "xzfc"; @@ -18617,7 +19115,7 @@ ]; }; yayayayaka = { - email = "nixpkgs@uwu.is"; + email = "github@uwu.is"; matrix = "@yaya:uwu.is"; github = "yayayayaka"; githubId = 73759599; @@ -18879,6 +19377,12 @@ githubId = 1319905; name = "Uma Zalakain"; }; + zaldnoay = { + email = "zunway@outlook.com"; + github = "zaldnoay"; + githubId = 5986078; + name = "Zunway Liang"; + }; zanculmarktum = { name = "Azure Zanculmarktum"; email = "zanculmarktum@gmail.com"; @@ -19061,15 +19565,6 @@ githubId = 8100652; name = "David Mell"; }; - zseri = { - name = "zseri"; - email = "zseri.devel@ytrizja.de"; - github = "fogti"; - githubId = 1618343; - keys = [{ - fingerprint = "7AFB C595 0D3A 77BD B00F 947B 229E 63AE 5644 A96D"; - }]; - }; ztzg = { email = "dd@crosstwine.com"; github = "ztzg"; diff --git a/third_party/nixpkgs/maintainers/scripts/all-tarballs.nix b/third_party/nixpkgs/maintainers/scripts/all-tarballs.nix index 6a4de8a4b9..83236e6fa9 100644 --- a/third_party/nixpkgs/maintainers/scripts/all-tarballs.nix +++ b/third_party/nixpkgs/maintainers/scripts/all-tarballs.nix @@ -12,5 +12,5 @@ import ../../pkgs/top-level/release.nix scrubJobs = false; # No need to evaluate on i686. supportedSystems = [ "x86_64-linux" ]; - limitedSupportedSystems = []; + bootstrapConfigs = []; } diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs b/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs index 5f7e40a28b..5573e5e5af 100755 --- a/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs +++ b/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs @@ -30,7 +30,7 @@ Because step 1) is quite expensive and takes roughly ~5 minutes the result is ca {-# OPTIONS_GHC -Wall #-} {-# LANGUAGE DataKinds #-} -import Control.Monad (forM_, (<=<)) +import Control.Monad (forM_, forM, (<=<)) import Control.Monad.Trans (MonadIO (liftIO)) import Data.Aeson ( FromJSON, @@ -108,6 +108,7 @@ newtype JobsetEvalInputs = JobsetEvalInputs {nixpkgs :: Nixpkgs} data Eval = Eval { id :: Int , jobsetevalinputs :: JobsetEvalInputs + , builds :: Seq Int } deriving (Generic, ToJSON, FromJSON, Show) @@ -151,15 +152,20 @@ data Build = Build } deriving (Generic, ToJSON, FromJSON, Show) +data HydraSlownessWorkaroundFlag = HydraSlownessWorkaround | NoHydraSlownessWorkaround +data RequestLogsFlag = RequestLogs | NoRequestLogs + main :: IO () main = do args <- getArgs case args of - ["get-report"] -> getBuildReports + ["get-report", "--slow"] -> getBuildReports HydraSlownessWorkaround + ["get-report"] -> getBuildReports NoHydraSlownessWorkaround ["ping-maintainers"] -> printMaintainerPing - ["mark-broken-list"] -> printMarkBrokenList + ["mark-broken-list", "--no-request-logs"] -> printMarkBrokenList NoRequestLogs + ["mark-broken-list"] -> printMarkBrokenList RequestLogs ["eval-info"] -> printEvalInfo - _ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list | eval-info" + _ -> putStrLn "Usage: get-report [--slow] | ping-maintainers | mark-broken-list [--no-request-logs] | eval-info" reportFileName :: IO FilePath reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json" @@ -167,18 +173,27 @@ reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json" showT :: Show a => a -> Text showT = Text.pack . show -getBuildReports :: IO () -getBuildReports = runReq defaultHttpConfig do +getBuildReports :: HydraSlownessWorkaroundFlag -> IO () +getBuildReports opt = runReq defaultHttpConfig do evalMay <- Seq.lookup 0 . evals <$> hydraJSONQuery mempty ["jobset", "nixpkgs", "haskell-updates", "evals"] - eval@Eval{id} <- maybe (liftIO $ fail "No Evalution found") pure evalMay + eval@Eval{id} <- maybe (liftIO $ fail "No Evaluation found") pure evalMay liftIO . putStrLn $ "Fetching evaluation " <> show id <> " from Hydra. This might take a few minutes..." - buildReports :: Seq Build <- hydraJSONQuery (responseTimeout 600000000) ["eval", showT id, "builds"] + buildReports <- getEvalBuilds opt id liftIO do fileName <- reportFileName putStrLn $ "Finished fetching all builds from Hydra, saving report as " <> fileName now <- getCurrentTime encodeFile fileName (eval, now, buildReports) +getEvalBuilds :: HydraSlownessWorkaroundFlag -> Int -> Req (Seq Build) +getEvalBuilds NoHydraSlownessWorkaround id = + hydraJSONQuery (responseTimeout 900000000) ["eval", showT id, "builds"] +getEvalBuilds HydraSlownessWorkaround id = do + Eval{builds} <- hydraJSONQuery mempty [ "eval", showT id ] + forM builds $ \buildId -> do + liftIO $ putStrLn $ "Querying build " <> show buildId + hydraJSONQuery mempty [ "build", showT buildId ] + hydraQuery :: HttpResponse a => Proxy a -> Option 'Https -> [Text] -> Req (HttpResponseBody a) hydraQuery responseType option query = responseBody @@ -187,7 +202,7 @@ hydraQuery responseType option query = (foldl' (/:) (https "hydra.nixos.org") query) NoReqBody responseType - (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell)" <> option) + (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" <> option) hydraJSONQuery :: FromJSON a => Option 'Https -> [Text] -> Req a hydraJSONQuery = hydraQuery jsonResponse @@ -775,16 +790,20 @@ printMaintainerPing = do textBuildSummary = printBuildSummary eval fetchTime buildSum topBrokenRdeps Text.putStrLn textBuildSummary -printMarkBrokenList :: IO () -printMarkBrokenList = do +printMarkBrokenList :: RequestLogsFlag -> IO () +printMarkBrokenList reqLogs = do (_, fetchTime, buildReport) <- readBuildReports runReq defaultHttpConfig $ forM_ buildReport \build@Build{job, id} -> case (getBuildState build, Text.splitOn "." $ unJobName job) of (Failed, ["haskellPackages", name, "x86_64-linux"]) -> do - -- Fetch build log from hydra to figure out the cause of the error. - build_log <- ByteString.lines <$> hydraPlainQuery ["build", showT id, "nixlog", "1", "raw"] -- We use the last probable error cause found in the build log file. - let error_message = fromMaybe " failure " $ safeLast $ mapMaybe probableErrorCause build_log + error_message <- fromMaybe "failure" <$> + case reqLogs of + NoRequestLogs -> pure Nothing + RequestLogs -> do + -- Fetch build log from hydra to figure out the cause of the error. + build_log <- ByteString.lines <$> hydraPlainQuery ["build", showT id, "nixlog", "1", "raw"] + pure $ safeLast $ mapMaybe probableErrorCause build_log liftIO $ putStrLn $ " - " <> Text.unpack name <> " # " <> error_message <> " in job https://hydra.nixos.org/build/" <> show id <> " at " <> formatTime defaultTimeLocale "%Y-%m-%d" fetchTime _ -> pure () diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/mark-broken.sh b/third_party/nixpkgs/maintainers/scripts/haskell/mark-broken.sh index 2624311aac..9aa9433b80 100755 --- a/third_party/nixpkgs/maintainers/scripts/haskell/mark-broken.sh +++ b/third_party/nixpkgs/maintainers/scripts/haskell/mark-broken.sh @@ -10,6 +10,24 @@ set -euo pipefail +do_commit=false +mark_broken_list_flags="" + +for arg in "$@"; do + case "$arg" in + --do-commit) + do_commit=true + ;; + --no-request-logs) + mark_broken_list_flags="$mark_broken_list_flags $arg" + ;; + *) + echo "$0: unknown flag: $arg" + exit 100 + ;; + esac +done + broken_config="pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml" tmpfile=$(mktemp) @@ -17,7 +35,7 @@ trap "rm ${tmpfile}" 0 echo "Remember that you need to manually run 'maintainers/scripts/haskell/hydra-report.hs get-report' sometime before running this script." echo "Generating a list of broken builds and displaying for manual confirmation ..." -maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > "$tmpfile" +maintainers/scripts/haskell/hydra-report.hs mark-broken-list $mark_broken_list_flags | sort -i > "$tmpfile" $EDITOR "$tmpfile" @@ -34,7 +52,7 @@ clear="env -u HOME -u NIXPKGS_CONFIG" $clear maintainers/scripts/haskell/regenerate-hackage-packages.sh evalline=$(maintainers/scripts/haskell/hydra-report.hs eval-info) -if [[ "${1:-}" == "--do-commit" ]]; then +if $do_commit; then git add $broken_config git add pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml git add pkgs/development/haskell-modules/hackage-packages.nix diff --git a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv index 52ac8a9343..3ce3f3d734 100644 --- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -89,6 +89,7 @@ lyaml,,,,,,lblasc magick,,,,,,donovanglover markdown,,,,,, mediator_lua,,,,,, +middleclass,,,,,, mpack,,,,,, moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn nvim-client,https://github.com/neovim/lua-client.git,,,,, diff --git a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py index 6a607eb624..18b354f0be 100644 --- a/third_party/nixpkgs/maintainers/scripts/pluginupdate.py +++ b/third_party/nixpkgs/maintainers/scripts/pluginupdate.py @@ -321,8 +321,14 @@ def load_plugins_from_csv( return plugins -def run_nix_expr(expr): - with CleanEnvironment() as nix_path: + +def run_nix_expr(expr, nixpkgs: str): + ''' + :param expr nix expression to fetch current plugins + :param nixpkgs Path towards a nixpkgs checkout + ''' + # local_pkgs = str(Path(__file__).parent.parent.parent) + with CleanEnvironment(nixpkgs) as nix_path: cmd = [ "nix", "eval", @@ -396,9 +402,9 @@ class Editor: """CSV spec""" print("the update member function should be overriden in subclasses") - def get_current_plugins(self) -> List[Plugin]: + def get_current_plugins(self, nixpkgs) -> List[Plugin]: """To fill the cache""" - data = run_nix_expr(self.get_plugins) + data = run_nix_expr(self.get_plugins, nixpkgs) plugins = [] for name, attr in data.items(): p = Plugin(name, attr["rev"], attr["submodules"], attr["sha256"]) @@ -414,7 +420,7 @@ class Editor: raise NotImplementedError() def get_update(self, input_file: str, outfile: str, config: FetchConfig): - cache: Cache = Cache(self.get_current_plugins(), self.cache_file) + cache: Cache = Cache(self.get_current_plugins(self.nixpkgs), self.cache_file) _prefetch = functools.partial(prefetch, cache=cache) def update() -> dict: @@ -453,6 +459,12 @@ class Editor: By default from {self.default_in} to {self.default_out}""" ), ) + common.add_argument( + "--nixpkgs", + type=str, + default=os.getcwd(), + help="Adjust log level", + ) common.add_argument( "--input-names", "-i", @@ -541,22 +553,27 @@ class Editor: command = args.command or "update" log.setLevel(LOG_LEVELS[args.debug]) log.info("Chose to run command: %s", command) + self.nixpkgs = args.nixpkgs - if not args.no_commit: - self.nixpkgs_repo = git.Repo(self.root, search_parent_directories=True) + self.nixpkgs_repo = git.Repo(args.nixpkgs, search_parent_directories=True) getattr(self, command)(args) class CleanEnvironment(object): + def __init__(self, nixpkgs): + self.local_pkgs = nixpkgs + def __enter__(self) -> str: - self.old_environ = os.environ.copy() + """ local_pkgs = str(Path(__file__).parent.parent.parent) + """ + self.old_environ = os.environ.copy() self.empty_config = NamedTemporaryFile() self.empty_config.write(b"{}") self.empty_config.flush() - os.environ["NIXPKGS_CONFIG"] = self.empty_config.name - return f"localpkgs={local_pkgs}" + # os.environ["NIXPKGS_CONFIG"] = self.empty_config.name + return f"localpkgs={self.local_pkgs}" def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None: os.environ.update(self.old_environ) @@ -758,7 +775,8 @@ def commit(repo: git.Repo, message: str, files: List[Path]) -> None: def update_plugins(editor: Editor, args): - """The main entry function of this module. All input arguments are grouped in the `Editor`.""" + """The main entry function of this module. + All input arguments are grouped in the `Editor`.""" log.info("Start updating plugins") fetch_config = FetchConfig(args.proc, args.github_token) diff --git a/third_party/nixpkgs/maintainers/scripts/remove-old-aliases.py b/third_party/nixpkgs/maintainers/scripts/remove-old-aliases.py index 8f04a9be4f..3c5f8edc50 100755 --- a/third_party/nixpkgs/maintainers/scripts/remove-old-aliases.py +++ b/third_party/nixpkgs/maintainers/scripts/remove-old-aliases.py @@ -102,12 +102,13 @@ def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]: alias = before_equal alias_unquoted = before_equal.strip('"') - after_equal_list = [x.strip(";:") for x in after_equal.split()] + replacement = next(x.strip(";:") for x in after_equal.split()) + replacement = replacement.removeprefix("pkgs.") converted = ( - f"{indent}{alias} = throw \"'{alias_unquoted}' has been renamed to/replaced by" - f" '{after_equal_list.pop(0)}'\";" - f' # Converted to throw {datetime.today().strftime("%Y-%m-%d")}' + f"{indent}{alias} = throw \"'{alias_unquoted}' has been" + f" renamed to/replaced by '{replacement}'\";" + f" # Converted to throw {datetime.today().strftime('%Y-%m-%d')}" ) converted_list.append((line, converted)) diff --git a/third_party/nixpkgs/maintainers/scripts/sha-to-sri.py b/third_party/nixpkgs/maintainers/scripts/sha-to-sri.py new file mode 100755 index 0000000000..1af7ff215a --- /dev/null +++ b/third_party/nixpkgs/maintainers/scripts/sha-to-sri.py @@ -0,0 +1,228 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i "python3 -I" -p "python3.withPackages(p: with p; [ rich structlog ])" + +from abc import ABC, abstractclassmethod, abstractmethod +from contextlib import contextmanager +from pathlib import Path +from structlog.contextvars import bound_contextvars as log_context +from typing import ClassVar, List, Tuple + +import hashlib, re, structlog + + +logger = structlog.getLogger("sha-to-SRI") + + +class Encoding(ABC): + alphabet: ClassVar[str] + + @classmethod + @property + def name(cls) -> str: + return cls.__name__.lower() + + def toSRI(self, s: str) -> str: + digest = self.decode(s) + assert len(digest) == self.n + + from base64 import b64encode + return f"{self.hashName}-{b64encode(digest).decode()}" + + @classmethod + def all(cls, h) -> 'List[Encoding]': + return [ c(h) for c in cls.__subclasses__() ] + + def __init__(self, h): + self.n = h.digest_size + self.hashName = h.name + + @property + @abstractmethod + def length(self) -> int: + ... + + @property + def regex(self) -> str: + return f"[{self.alphabet}]{{{self.length}}}" + + @abstractmethod + def decode(self, s: str) -> bytes: + ... + + +class Nix32(Encoding): + alphabet = "0123456789abcdfghijklmnpqrsvwxyz" + inverted = { c: i for i, c in enumerate(alphabet) } + + @property + def length(self): + return 1 + (8 * self.n) // 5 + def decode(self, s: str): + assert len(s) == self.length + out = [ 0 for _ in range(self.n) ] + # TODO: Do better than a list of byte-sized ints + + for n, c in enumerate(reversed(s)): + digit = self.inverted[c] + i, j = divmod(5 * n, 8) + out[i] = out[i] | (digit << j) & 0xff + rem = digit >> (8 - j) + if rem == 0: + continue + elif i < self.n: + out[i+1] = rem + else: + raise ValueError(f"Invalid nix32 hash: '{s}'") + + return bytes(out) + +class Hex(Encoding): + alphabet = "0-9A-Fa-f" + + @property + def length(self): + return 2 * self.n + def decode(self, s: str): + from binascii import unhexlify + return unhexlify(s) + +class Base64(Encoding): + alphabet = "A-Za-z0-9+/" + + @property + def format(self) -> Tuple[int, int]: + """Number of characters in data and padding.""" + i, k = divmod(self.n, 3) + return 4 * i + (0 if k == 0 else k + 1), (3 - k) % 3 + @property + def length(self): + return sum(self.format) + @property + def regex(self): + data, padding = self.format + return f"[{self.alphabet}]{{{data}}}={{{padding}}}" + def decode(self, s): + from base64 import b64decode + return b64decode(s, validate = True) + + +_HASHES = (hashlib.new(n) for n in ('SHA-256', 'SHA-512')) +ENCODINGS = { + h.name: Encoding.all(h) + for h in _HASHES +} + +RE = { + h: "|".join( + (f"({h}-)?" if e.name == 'base64' else '') + + f"(?P<{h}_{e.name}>{e.regex})" + for e in encodings + ) for h, encodings in ENCODINGS.items() +} + +_DEF_RE = re.compile("|".join( + f"(?P<{h}>{h} = (?P<{h}_quote>['\"])({re})(?P={h}_quote);)" + for h, re in RE.items() +)) + + +def defToSRI(s: str) -> str: + def f(m: re.Match[str]) -> str: + try: + for h, encodings in ENCODINGS.items(): + if m.group(h) is None: + continue + + for e in encodings: + s = m.group(f"{h}_{e.name}") + if s is not None: + return f'hash = "{e.toSRI(s)}";' + + raise ValueError(f"Match with '{h}' but no subgroup") + raise ValueError("Match with no hash") + + except ValueError as exn: + logger.error( + "Skipping", + exc_info = exn, + ) + return m.group() + + return _DEF_RE.sub(f, s) + + +@contextmanager +def atomicFileUpdate(target: Path): + '''Atomically replace the contents of a file. + + Guarantees that no temporary files are left behind, and `target` is either + left untouched, or overwritten with new content if no exception was raised. + + Yields a pair `(original, new)` of open files. + `original` is the pre-existing file at `target`, open for reading; + `new` is an empty, temporary file in the same filder, open for writing. + + Upon exiting the context, the files are closed; if no exception was + raised, `new` (atomically) replaces the `target`, otherwise it is deleted. + ''' + # That's mostly copied from noto-emoji.py, should DRY it out + from tempfile import mkstemp + fd, _p = mkstemp( + dir = target.parent, + prefix = target.name, + ) + tmpPath = Path(_p) + + try: + with target.open() as original: + with tmpPath.open('w') as new: + yield (original, new) + + tmpPath.replace(target) + + except Exception: + tmpPath.unlink(missing_ok = True) + raise + + +def fileToSRI(p: Path): + with atomicFileUpdate(p) as (og, new): + for i, line in enumerate(og): + with log_context(line=i): + new.write(defToSRI(line)) + + +_SKIP_RE = re.compile( + "(generated by)|(do not edit)", + re.IGNORECASE +) + +if __name__ == "__main__": + from sys import argv, stderr + logger.info("Starting!") + + for arg in argv[1:]: + p = Path(arg) + with log_context(path=str(p)): + try: + if p.name == "yarn.nix" or p.name.find("generated") != -1: + logger.warning("File looks autogenerated, skipping!") + continue + + with p.open() as f: + for line in f: + if line.strip(): + break + + if _SKIP_RE.search(line): + logger.warning("File looks autogenerated, skipping!") + continue + + fileToSRI(p) + except Exception as exn: + logger.error( + "Unhandled exception, skipping file!", + exc_info = exn, + ) + else: + logger.info("Finished processing file") diff --git a/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages b/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages index 791cd8a1d8..32c2b44260 100755 --- a/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages +++ b/third_party/nixpkgs/maintainers/scripts/update-luarocks-packages @@ -2,11 +2,11 @@ #!nix-shell update-luarocks-shell.nix -i python3 # format: -# $ nix run nixpkgs.python3Packages.black -c black update.py +# $ nix run nixpkgs#python3Packages.black -- update.py # type-check: -# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py +# $ nix run nixpkgs#python3Packages.mypy -- update.py # linted: -# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py +# $ nix run nixpkgs#python3Packages.flake8 -- --ignore E501,E265,E402 update.py import inspect import os @@ -25,14 +25,14 @@ from pathlib import Path log = logging.getLogger() log.addHandler(logging.StreamHandler()) -ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore +ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore import pluginupdate from pluginupdate import update_plugins, FetchConfig, CleanEnvironment -PKG_LIST="maintainers/scripts/luarocks-packages.csv" -TMP_FILE="$(mktemp)" -GENERATED_NIXFILE="pkgs/development/lua-modules/generated-packages.nix" -LUAROCKS_CONFIG="maintainers/scripts/luarocks-config.lua" +PKG_LIST = "maintainers/scripts/luarocks-packages.csv" +TMP_FILE = "$(mktemp)" +GENERATED_NIXFILE = "pkgs/development/lua-modules/generated-packages.nix" +LUAROCKS_CONFIG = "maintainers/scripts/luarocks-config.lua" HEADER = """/* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! Regenerate it with: @@ -40,36 +40,40 @@ nixpkgs$ ./maintainers/scripts/update-luarocks-packages You can customize the generated packages in pkgs/development/lua-modules/overrides.nix */ -""".format(GENERATED_NIXFILE=GENERATED_NIXFILE) +""".format( + GENERATED_NIXFILE=GENERATED_NIXFILE +) -FOOTER=""" +FOOTER = """ } /* GENERATED - do not edit this file */ """ + @dataclass class LuaPlugin: name: str - '''Name of the plugin, as seen on luarocks.org''' + """Name of the plugin, as seen on luarocks.org""" src: str - '''address to the git repository''' + """address to the git repository""" ref: Optional[str] - '''git reference (branch name/tag)''' + """git reference (branch name/tag)""" version: Optional[str] - '''Set it to pin a package ''' + """Set it to pin a package """ server: Optional[str] - '''luarocks.org registers packages under different manifests. + """luarocks.org registers packages under different manifests. Its value can be 'http://luarocks.org/dev' - ''' + """ luaversion: Optional[str] - '''Attribue of the lua interpreter if a package is available only for a specific lua version''' + """Attribue of the lua interpreter if a package is available only for a specific lua version""" maintainers: Optional[str] - ''' Optional string listing maintainers separated by spaces''' + """ Optional string listing maintainers separated by spaces""" @property def normalized_name(self) -> str: return self.name.replace(".", "-") + # rename Editor to LangUpdate/ EcosystemUpdater class LuaEditor(pluginupdate.Editor): def get_current_plugins(self): @@ -77,11 +81,13 @@ class LuaEditor(pluginupdate.Editor): def load_plugin_spec(self, input_file) -> List[LuaPlugin]: luaPackages = [] - csvfilename=input_file + csvfilename = input_file log.info("Loading package descriptions from %s", csvfilename) - with open(csvfilename, newline='') as csvfile: - reader = csv.DictReader(csvfile,) + with open(csvfilename, newline="") as csvfile: + reader = csv.DictReader( + csvfile, + ) for row in reader: # name,server,version,luaversion,maintainers plugin = LuaPlugin(**row) @@ -91,23 +97,19 @@ class LuaEditor(pluginupdate.Editor): def update(self, args): update_plugins(self, args) - def generate_nix( - self, - results: List[Tuple[LuaPlugin, str]], - outfilename: str - ): - + def generate_nix(self, results: List[Tuple[LuaPlugin, str]], outfilename: str): with tempfile.NamedTemporaryFile("w+") as f: f.write(HEADER) header2 = textwrap.dedent( - # header2 = inspect.cleandoc( - """ + # header2 = inspect.cleandoc( + """ { self, stdenv, lib, fetchurl, fetchgit, callPackage, ... } @ args: final: prev: { - """) + """ + ) f.write(header2) - for (plugin, nix_expr) in results: + for plugin, nix_expr in results: f.write(f"{plugin.normalized_name} = {nix_expr}") f.write(FOOTER) f.flush() @@ -156,19 +158,20 @@ class LuaEditor(pluginupdate.Editor): # luaPackages.append(plugin) pass + def generate_pkg_nix(plug: LuaPlugin): - ''' + """ Generate nix expression for a luarocks package Our cache key associates "p.name-p.version" to its rockspec - ''' + """ log.debug("Generating nix expression for %s", plug.name) custom_env = os.environ.copy() - custom_env['LUAROCKS_CONFIG'] = LUAROCKS_CONFIG + custom_env["LUAROCKS_CONFIG"] = LUAROCKS_CONFIG # we add --dev else luarocks wont find all the "scm" (=dev) versions of the # packages - # , "--dev" - cmd = [ "luarocks", "nix" ] + # , "--dev" + cmd = ["luarocks", "nix"] if plug.maintainers: cmd.append(f"--maintainers={plug.maintainers}") @@ -176,7 +179,10 @@ def generate_pkg_nix(plug: LuaPlugin): # if plug.server == "src": if plug.src != "": if plug.src is None: - msg = "src must be set when 'version' is set to \"src\" for package %s" % plug.name + msg = ( + "src must be set when 'version' is set to \"src\" for package %s" + % plug.name + ) log.error(msg) raise RuntimeError(msg) log.debug("Updating from source %s", plug.src) @@ -185,7 +191,6 @@ def generate_pkg_nix(plug: LuaPlugin): else: cmd.append(plug.name) if plug.version and plug.version != "src": - cmd.append(plug.version) if plug.server != "src" and plug.server: @@ -194,23 +199,26 @@ def generate_pkg_nix(plug: LuaPlugin): if plug.luaversion: cmd.append(f"--lua-version={plug.luaversion}") - log.debug("running %s", ' '.join(cmd)) + log.debug("running %s", " ".join(cmd)) output = subprocess.check_output(cmd, env=custom_env, text=True) output = "callPackage(" + output.strip() + ") {};\n\n" return (plug, output) -def main(): - editor = LuaEditor("lua", ROOT, '', - default_in = ROOT.joinpath(PKG_LIST), - default_out = ROOT.joinpath(GENERATED_NIXFILE) - ) +def main(): + editor = LuaEditor( + "lua", + ROOT, + "", + default_in=ROOT.joinpath(PKG_LIST), + default_out=ROOT.joinpath(GENERATED_NIXFILE), + ) editor.run() -if __name__ == "__main__": +if __name__ == "__main__": main() # vim: set ft=python noet fdm=manual fenc=utf-8 ff=unix sts=0 sw=4 ts=4 : diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index b0bac14705..6b90ce3058 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -287,13 +287,24 @@ with lib.maintainers; { }; flutter = { - members = [ gilice mkg20001 RossComputerGuy FlafyDev hacker1024 ]; + members = [ mkg20001 RossComputerGuy FlafyDev hacker1024 ]; scope = "Maintain Flutter and Dart-related packages and build tools"; shortName = "flutter"; enableFeatureFreezePing = false; githubTeams = [ "flutter" ]; }; + flyingcircus = { + # Verify additions by approval of an already existing member of the team. + members = [ + theuni + dpausp + leona + ]; + scope = "Team for Flying Circus employees who collectively maintain packages."; + shortName = "Flying Circus employees"; + }; + freedesktop = { members = [ jtojnar ]; scope = "Maintain Freedesktop.org packages for graphical desktop."; @@ -354,7 +365,7 @@ with lib.maintainers; { hedning jtojnar dasj19 - maxeaubrey + amaxine ]; githubTeams = [ "gnome" @@ -638,15 +649,13 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; - nixos-modules = { + module-system = { members = [ - ericson2314 infinisil - qyliss roberth ]; - scope = "Maintain nixpkgs module system internals."; - shortName = "NixOS Modules / internals"; + scope = "Maintain the Nixpkgs module system."; + shortName = "Module system"; enableFeatureFreezePing = true; }; @@ -681,6 +690,17 @@ with lib.maintainers; { shortName = "OpenStack"; }; + ororatech = { + # email: nixdevs@ororatech.com + shortName = "OroraTech GmbH. employees"; + scope = "Team for packages maintained by employees of OroraTech GmbH."; + # Edits to this list should only be done by an already existing member. + members = [ + kip93 + victormeriqui + ]; + }; + pantheon = { members = [ davidak @@ -896,6 +916,18 @@ with lib.maintainers; { shortName = "Vim/Neovim"; }; + wdz = { + members = [ + n0emis + netali + vidister + johannwagner + yuka + ]; + scope = "Group registration for WDZ GmbH team members who collectively maintain packages."; + shortName = "WDZ GmbH"; + }; + xfce = { members = [ bobby285271 diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.section.md b/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.section.md index 89d3295506..2340723e07 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/adding-custom-packages.section.md @@ -44,7 +44,7 @@ environment.systemPackages = name = "hello-2.8"; src = fetchurl { url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; + hash = "sha256-5rd/gffPfa761Kn1tl3myunD8TuM+66oy1O7XqVGDXM="; }; }; in @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { name = "hello-2.8"; src = fetchurl { url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; + hash = "sha256-5rd/gffPfa761Kn1tl3myunD8TuM+66oy1O7XqVGDXM="; }; } ``` diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/customizing-packages.section.md b/third_party/nixpkgs/nixos/doc/manual/configuration/customizing-packages.section.md index 709a07b09c..76413b7d84 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/customizing-packages.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/customizing-packages.section.md @@ -1,11 +1,7 @@ # Customising Packages {#sec-customising-packages} Some packages in Nixpkgs have options to enable or disable optional -functionality or change other aspects of the package. For instance, the -Firefox wrapper package (which provides Firefox with a set of plugins -such as the Adobe Flash player) has an option to enable the Google Talk -plugin. It can be set in `configuration.nix` as follows: -`nixpkgs.config.firefox.enableGoogleTalkPlugin = true;` +functionality or change other aspects of the package. ::: {.warning} Unfortunately, Nixpkgs currently lacks a way to query available @@ -13,7 +9,7 @@ configuration options. ::: ::: {.note} -Alternatively, many packages come with extensions one might add. +For example, many packages come with extensions one might add. Examples include: - [`passExtensions.pass-otp`](https://search.nixos.org/packages/query=passExtensions.pass-otp) - [`python310Packages.requests`](https://search.nixos.org/packages/query=python310Packages.requests) diff --git a/third_party/nixpkgs/nixos/doc/manual/development/unit-handling.section.md b/third_party/nixpkgs/nixos/doc/manual/development/unit-handling.section.md index a7ccb3dbd0..32d44dbfff 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/unit-handling.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/unit-handling.section.md @@ -25,8 +25,11 @@ checks: since changes in their values are applied by systemd when systemd is reloaded. - - `.mount` units are **reload**ed. These mostly come from the `/etc/fstab` - parser. + - `.mount` units are **reload**ed if only their `Options` changed. If anything + else changed (like `What`), they are **restart**ed unless they are the mount + unit for `/` or `/nix` in which case they are reloaded to prevent the system + from crashing. Note that this is the case for `.mount` units and not for + mounts from `/etc/fstab`. These are explained in [](#sec-switching-systems). - `.socket` units are currently ignored. This is to be fixed at a later point. diff --git a/third_party/nixpkgs/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md b/third_party/nixpkgs/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md index 9cbec72980..5d6d67f1aa 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/what-happens-during-a-system-switch.chapter.md @@ -21,8 +21,9 @@ If the action is `switch` or `test`, the currently running system is inspected and the actions to switch to the new system are calculated. This process takes two data sources into account: `/etc/fstab` and the current systemd status. Mounts and swaps are read from `/etc/fstab` and the corresponding actions are -generated. If a new mount is added, for example, the proper `.mount` unit is -marked to be started. The current systemd state is inspected, the difference +generated. If the options of a mount are modified, for example, the proper `.mount` +unit is reloaded (or restarted if anything else changed and it's neither the root +mount or the nix store). The current systemd state is inspected, the difference between the current system and the desired configuration is calculated and actions are generated to get to this state. There are a lot of nuances that can be controlled by the units which are explained here. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.section.md index 080ca68d92..cae3f8a850 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.section.md @@ -353,7 +353,7 @@ When upgrading from a previous release, please be aware of the following incompa Another benefit of the refactoring is that we can now issue reloads via either `pkill -HUP unbound` and `systemctl reload unbound` to reload the running configuration without taking the daemon offline. A prerequisite of this was that unbound configuration is available on a well known path on the file system. We are using the path `/etc/unbound/unbound.conf` as that is the default in the CLI tooling which in turn enables us to use `unbound-control` without passing a custom configuration location. - The module has also been reworked to be [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) compliant. As such, `sevices.unbound.extraConfig` has been removed and replaced by [services.unbound.settings](options.html#opt-services.unbound.settings). `services.unbound.interfaces` has been renamed to `services.unbound.settings.server.interface`. + The module has also been reworked to be [RFC 0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md) compliant. As such, `services.unbound.extraConfig` has been removed and replaced by [services.unbound.settings](options.html#opt-services.unbound.settings). `services.unbound.interfaces` has been renamed to `services.unbound.settings.server.interface`. `services.unbound.forwardAddresses` and `services.unbound.allowedAccess` have also been changed to use the new settings interface. You can follow the instructions when executing `nixos-rebuild` to upgrade your configuration to use the new interface. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md index d4581fe944..6f5a807f47 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2205.section.md @@ -935,8 +935,7 @@ In addition to numerous new and upgraded packages, this release has the followin using the `pomerium-cli` command, you should now install the `pomerium-cli` package. -- The option - [services.networking.networkmanager.enableFccUnlock](#opt-networking.networkmanager.enableFccUnlock) +- The option `services.networking.networkmanager.enableFccUnlock` was added to support FCC unlock procedures. Since release 1.18.4, the ModemManager daemon no longer automatically performs the FCC unlock procedure by default. See [the docs](https://modemmanager.org/docs/modemmanager/fcc-unlock/) for more details. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md index c9da29063e..3d27d3fef8 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2305.section.md @@ -87,7 +87,7 @@ In addition to numerous new and updated packages, this release has the following - [gmediarender](https://github.com/hzeller/gmrender-resurrect), a simple, headless UPnP/DLNA renderer. Available as [services.gmediarender](options.html#opt-services.gmediarender.enable). -- [go2rtc](https://github.com/AlexxIT/go2rtc), a camera streaming appliation with support for RTSP, WebRTC, HomeKit, FFMPEG, RTMP and other protocols. Available as [services.go2rtc](options.html#opt-services.go2rtc.enable). +- [go2rtc](https://github.com/AlexxIT/go2rtc), a camera streaming application with support for RTSP, WebRTC, HomeKit, FFMPEG, RTMP and other protocols. Available as [services.go2rtc](options.html#opt-services.go2rtc.enable). - [goeland](https://github.com/slurdge/goeland), an alternative to rss2email written in Golang with many filters. Available as [services.goeland](#opt-services.goeland.enable). @@ -203,7 +203,7 @@ In addition to numerous new and updated packages, this release has the following - `graylog` has been updated to version 5, which can not be updated directly from the previously packaged version 3.3. If you had installed the previously packaged version 3.3, please follow the [upgrade path](https://go2docs.graylog.org/5-0/upgrading_graylog/upgrade_path.htm) from 3.3 to 4.0 to 4.3 to 5.0. -- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChroot` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs. +- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implementation is still available via `buildFHSEnvChroot` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs. - `nushell` has been updated to at least version 0.77.0, which includes potential breaking changes in aliases. The old aliases are now available as `old-alias` but it is recommended you migrate to the new format. See [Reworked aliases](https://www.nushell.sh/blog/2023-03-14-nushell_0_77.html#reworked-aliases-breaking-changes-kubouch). @@ -555,7 +555,7 @@ In addition to numerous new and updated packages, this release has the following - `buildDunePackage` now defaults to `strictDeps = true` which means that any library should go into `buildInputs` or `checkInputs`. Any executable that is run on the building machine should go into `nativeBuildInputs` or `nativeCheckInputs` respectively. Example of executables are `ocaml`, `findlib` and `menhir`. PPXs are libraries which are built by dune and should therefore not go into `nativeBuildInputs`. -- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implemenation is still available via `buildFHSEnvChroot` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs. +- `buildFHSUserEnv` is now called `buildFHSEnv` and uses FlatPak's Bubblewrap sandboxing tool rather than Nixpkgs' own chrootenv. The old chrootenv-based implementation is still available via `buildFHSEnvChroot` but is considered deprecated and will be removed when the remaining uses inside Nixpkgs have been migrated. If your FHSEnv-wrapped application misbehaves when using the new bubblewrap implementation, please create an issue in Nixpkgs. - Top-level `buildPlatform`, `hostPlatform`, `targetPlatform` have been deprecated, use `stdenv.X` instead. diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md index 825b1c5bd4..d1bbb5c389 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2311.section.md @@ -6,12 +6,34 @@ - Support for WiFi6 (IEEE 802.11ax) and WPA3-SAE-PK was enabled in the `hostapd` package, along with a significant rework of the hostapd module. +- LXD now supports virtual machine instances to complement the existing container support + +- The `nixos-rebuild` command has been given a `list-generations` subcommand. See `man nixos-rebuild` for more details. + +- [systemd](https://systemd.io) has been updated from v253 to v254, see [the release notes](https://github.com/systemd/systemd/blob/v254/NEWS#L3-L659) for more information on the changes. + - `boot.resumeDevice` **must be specified** when hibernating if not in EFI mode. + - systemd may warn your system about the permissions of your ESP partition (often `/boot`), this warning can be ignored for now, we are looking + into a satisfying solution regarding this problem. + - Updating with `nixos-rebuild boot` and rebooting is recommended, since in some rare cases the `nixos-rebuild switch` into the new generation on a live system might fail due to missing mount units. + +- [`sudo-rs`], a reimplementation of `sudo` in Rust, is now supported. + An experimental new module `security.sudo-rs` was added. + Switching to it (via `security.sudo.enable = false; security.sudo-rs.enable = true;`) introduces + slight changes in sudo behaviour, due to `sudo-rs`' current limitations: + - terminfo-related environment variables aren't preserved for `root` and `wheel`; + - `root` and `wheel` are not given the ability to set (or preserve) + arbitrary environment variables. + +[`sudo-rs`]: https://github.com/memorysafety/sudo-rs/ + ## New Services {#sec-release-23.11-new-services} - [MCHPRS](https://github.com/MCHPR/MCHPRS), a multithreaded Minecraft server built for redstone. Available as [services.mchprs](#opt-services.mchprs.enable). - [acme-dns](https://github.com/joohoi/acme-dns), a limited DNS server to handle ACME DNS challenges easily and securely. Available as [services.acme-dns](#opt-services.acme-dns.enable). +- [frp](https://github.com/fatedier/frp), a fast reverse proxy to help you expose a local server behind a NAT or firewall to the Internet. Available as [services.frp](#opt-services.frp.enable). + - [river](https://github.com/riverwm/river), A dynamic tiling wayland compositor. Available as [programs.river](#opt-programs.river.enable). @@ -20,17 +42,27 @@ - [mautrix-whatsapp](https://docs.mau.fi/bridges/go/whatsapp/index.html) A Matrix-WhatsApp puppeting bridge +- [hddfancontrol](https://github.com/desbma/hddfancontrol), a service to regulate fan speeds based on hard drive temperature. Available as [services.hddfancontrol](#opt-services.hddfancontrol.enable). + - [GoToSocial](https://gotosocial.org/), an ActivityPub social network server, written in Golang. Available as [services.gotosocial](#opt-services.gotosocial.enable). +- [Castopod](https://castopod.org/), an open-source hosting platform made for podcasters who want to engage and interact with their audience. Available as [services.castopod](#opt-services.castopod.enable). + - [Typesense](https://github.com/typesense/typesense), a fast, typo-tolerant search engine for building delightful search experiences. Available as [services.typesense](#opt-services.typesense.enable). * [NS-USBLoader](https://github.com/developersu/ns-usbloader/), an all-in-one tool for managing Nintendo Switch homebrew. Available as [programs.ns-usbloader](#opt-programs.ns-usbloader.enable). +- [Mobilizon](https://joinmobilizon.org/), a Fediverse platform for publishing events. + - [Anuko Time Tracker](https://github.com/anuko/timetracker), a simple, easy to use, open source time tracking system. Available as [services.anuko-time-tracker](#opt-services.anuko-time-tracker.enable). +- [Prometheus MySQL exporter](https://github.com/prometheus/mysqld_exporter), a MySQL server exporter for Prometheus. Available as [services.prometheus.exporters.mysqld](#opt-services.prometheus.exporters.mysqld.enable). + - [sitespeed-io](https://sitespeed.io), a tool that can generate metrics (timings, diagnostics) for websites. Available as [services.sitespeed-io](#opt-services.sitespeed-io.enable). -- [Jool](https://nicmx.github.io/Jool/en/index.html), an Open Source implementation of IPv4/IPv6 translation on Linux. Available as [networking.jool.enable](#opt-networking.jool.enable). +- [stalwart-mail](https://stalw.art), an all-in-one email server (SMTP, IMAP, JMAP). Available as [services.stalwart-mail](#opt-services.stalwart-mail.enable). + +- [Jool](https://nicmx.github.io/Jool/en/index.html), a kernelspace NAT64 and SIIT implementation, providing translation between IPv4 and IPv6. Available as [networking.jool.enable](#opt-networking.jool.enable). - [Apache Guacamole](https://guacamole.apache.org/), a cross-platform, clientless remote desktop gateway. Available as [services.guacamole-server](#opt-services.guacamole-server.enable) and [services.guacamole-client](#opt-services.guacamole-client.enable) services. @@ -46,8 +78,26 @@ - [eris-server](https://codeberg.org/eris/eris-go). [ERIS](https://eris.codeberg.page/) is an encoding for immutable storage and this server provides block exchange as well as content decoding over HTTP and through a FUSE file-system. Available as [services.eris-server](#opt-services.eris-server.enable). +- hardware/infiniband.nix adds infiniband subnet manager support using an [opensm](https://github.com/linux-rdma/opensm) systemd-template service, instantiated on card guids. The module also adds kernel modules and cli tooling to help administrators debug and measure performance. Available as [hardware.infiniband.enable](#opt-hardware.infiniband.enable). + +- [Honk](https://humungus.tedunangst.com/r/honk), a complete ActivityPub server with minimal setup and support costs. + Available as [services.honk](#opt-services.honk.enable). + +- [NNCP](http://www.nncpgo.org/). Added nncp-daemon and nncp-caller services. Configuration is set with [programs.nncp.settings](#opt-programs.nncp.settings) and the daemons are enabled at [services.nncp](#opt-services.nncp.caller.enable). + +- [tuxedo-rs](https://github.com/AaronErhardt/tuxedo-rs), Rust utilities for interacting with hardware from TUXEDO Computers. + +- [audiobookshelf](https://github.com/advplyr/audiobookshelf/), a self-hosted audiobook and podcast server. Available as [services.audiobookshelf](#opt-services.audiobookshelf.enable). + +- [ZITADEL](https://zitadel.com), a turnkey identity and access management platform. Available as [services.zitadel](#opt-services.zitadel.enable). + +- [netclient](https://github.com/gravitl/netclient), an automated WireGuard® Management Client. Available as [services.netclient](#opt-services.netclient.enable). + ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} +- `network-online.target` has been fixed to no longer time out for systems with `networking.useDHCP = true` and `networking.useNetworkd = true`. + Workarounds for this can be removed. + - The `boot.loader.raspberryPi` options have been marked deprecated, with intent for removal for NixOS 24.11. They had a limited use-case, and do not work like people expect. They required either very old installs ([before mid-2019](https://github.com/NixOS/nixpkgs/pull/62462)) or customized builds out of scope of the standard and generic AArch64 support. That option set never supported the Raspberry Pi 4 family of devices. - `python3.pkgs.sequoia` was removed in favor of `python3.pkgs.pysequoia`. The latter package is based on upstream's dedicated repository for sequoia's Python bindings, where the Python bindings from [gitlab:sequoia-pgp/sequoia](https://gitlab.com/sequoia-pgp/sequoia) were removed long ago. @@ -64,12 +114,25 @@ - `python3.pkgs.fetchPypi` (and `python3Packages.fetchPypi`) has been deprecated in favor of top-level `fetchPypi`. +- `pass` now does not contain `password-store.el`. Users should get `password-store.el` from Emacs lisp package set `emacs.pkgs.password-store`. + +- `services.knot` now supports `.settings` from RFC42. The previous `.extraConfig` still works the same, but it displays a warning now. + +- `mu` now does not install `mu4e` files by default. Users should get `mu4e` from Emacs lisp package set `emacs.pkgs.mu4e`. + - `mariadb` now defaults to `mariadb_1011` instead of `mariadb_106`, meaning the default version was upgraded from 10.6.x to 10.11.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-6-to-mariadb-10-11/) for potential issues. - `getent` has been moved from `glibc`'s `bin` output to its own dedicated output, reducing closure size for many dependents. Dependents using the `getent` alias should not be affected; others should move from using `glibc.bin` or `getBin glibc` to `getent` (which also improves compatibility with non-glibc platforms). +- The `users.users..passwordFile` has been renamed to `users.users..hashedPasswordFile` to avoid possible confusions. The option is in fact the file-based version of `hashedPassword`, not `password`, and expects a file containing the {manpage}`crypt(3)` hash of the user password. + - The `services.ananicy.extraRules` option now has the type of `listOf attrs` instead of `string`. +- `buildVimPluginFrom2Nix` has been renamed to `buildVimPlugin`, which now + now skips `configurePhase` and `buildPhase` + +- JACK tools (`jack_*` except `jack_control`) have moved from the `jack2` package to `jack-example-tools` + - The `matrix-synapse` package & module have undergone some significant internal changes, for most setups no intervention is needed, though: - The option [`services.matrix-synapse.package`](#opt-services.matrix-synapse.package) is now read-only. For modifying the package, use an overlay which modifies `matrix-synapse-unwrapped` instead. More on that below. - The `enableSystemd` & `enableRedis` arguments have been removed and `matrix-synapse` has been renamed to `matrix-synapse-unwrapped`. Also, several optional dependencies (such as `psycopg2` or `authlib`) have been removed. @@ -77,12 +140,18 @@ - A list of all extras (and the extras enabled by default) can be found at the [option's reference for `services.matrix-synapse.extras`](#opt-services.matrix-synapse.extras). - In some cases (e.g. for running synapse workers) it was necessary to re-use the `PYTHONPATH` of `matrix-synapse.service`'s environment to have all plugins available. This isn't necessary anymore, instead `config.services.matrix-synapse.package` can be used as it points to the wrapper with properly configured `extras` and also all plugins defined via [`services.matrix-synapse.plugins`](#opt-services.matrix-synapse.plugins) available. This is also the reason for why the option is read-only now, it's supposed to be set by the module only. +- `netbox` was updated to 3.6. NixOS' `services.netbox.package` still defaults to 3.5 if `stateVersion` is earlier than 23.11. Please review upstream's breaking changes [for 3.6.0](https://github.com/netbox-community/netbox/releases/tag/v3.6.0) and upgrade NetBox by changing `services.netbox.package`. Database migrations will be run automatically. + - `etcd` has been updated to 3.5, you will want to read the [3.3 to 3.4](https://etcd.io/docs/v3.5/upgrades/upgrade_3_4/) and [3.4 to 3.5](https://etcd.io/docs/v3.5/upgrades/upgrade_3_5/) upgrade guides +- `gitlab` installations created or updated between versions \[15.11.0, 15.11.2] have an incorrect database schema. This will become a problem when upgrading to `gitlab` >=16.2.0. A workaround for affected users can be found in the [GitLab docs](https://docs.gitlab.com/ee/update/versions/gitlab_16_changes.html#undefined-column-error-upgrading-to-162-or-later). + - `consul` has been updated to `1.16.0`. See the [release note](https://github.com/hashicorp/consul/releases/tag/v1.16.0) for more details. Once a new Consul version has started and upgraded its data directory, it generally cannot be downgraded to the previous version. - `himalaya` has been updated to `0.8.0`, which drops the native TLS support (in favor of Rustls) and add OAuth 2.0 support. See the [release note](https://github.com/soywod/himalaya/releases/tag/v0.8.0) for more details. +- `nix-prefetch-git` now ignores global and user git config, to improve reproducibility. + - The [services.caddy.acmeCA](#opt-services.caddy.acmeCA) option now defaults to `null` instead of `"https://acme-v02.api.letsencrypt.org/directory"`, to use all of Caddy's default ACME CAs and enable Caddy's automatic issuer fallback feature by default, as recommended by upstream. - The default priorities of [`services.nextcloud.phpOptions`](#opt-services.nextcloud.phpOptions) have changed. This means that e.g. @@ -105,12 +174,23 @@ - PHP now defaults to PHP 8.2, updated from 8.1. +- GraalVM has been updated to the latest version, and this brings significant changes. Upstream don't release multiple versions targeting different JVMs anymore, so now we only have one GraalVM derivation (`graalvm-ce`). While at first glance the version may seem a downgrade (22.3.1 -> 21.0.0), the major version is now following the JVM it targets (so this latest version targets JVM 21). Also some products like `llvm-installable-svm` and `native-image-svm` were incorporate to the main GraalVM derivation, so they're included by default. + +- GraalPy (`graalCEPackages.graalpy`), TruffleRuby (`graalCEPackages.truffleruby`), GraalJS (`graalCEPackages.graaljs`) and GraalNodeJS (`grallCEPackages.graalnodejs`) are now indepedent from the main GraalVM derivation. + - The ISC DHCP package and corresponding module have been removed, because they are end of life upstream. See https://www.isc.org/blogs/isc-dhcp-eol/ for details and switch to a different DHCP implementation like kea or dnsmasq. +- `prometheus-unbound-exporter` has been replaced by the Let's Encrypt maintained version, since the previous version was archived. This requires some changes to the module configuration, most notable `controlInterface` needs migration + towards `unbound.host` and requires either the `tcp://` or `unix://` URI scheme. + +- `odoo` now defaults to 16, updated from 15. + - `util-linux` is now supported on Darwin and is no longer an alias to `unixtools`. Use the `unixtools.util-linux` package for access to the Apple variants of the utilities. - `services.keyd` changed API. Now you can create multiple configuration files. +- `baloo`, the file indexer/search engine used by KDE now has a patch to prevent files from constantly being reindexed when the device ids of the their underlying storage changes. This happens frequently when using btrfs or LVM. The patch has not yet been accepted upstream but it provides a significantly improved experience. When upgrading, reset baloo to get a clean index: `balooctl disable ; balooctl purge ; balooctl enable`. + - `services.ddclient` has been removed on the request of the upstream maintainer because it is unmaintained and has bugs. Please switch to a different software like `inadyn` or `knsupdate`. - The `vlock` program from the `kbd` package has been moved into its own package output and should now be referenced explicitly as `kbd.vlock` or replaced with an alternative such as the standalone `vlock` package or `physlock`. @@ -129,6 +209,10 @@ - `spamassassin` no longer supports the `Hashcash` module. The module needs to be removed from the `loadplugin` list if it was copied over from the default `initPreConf` option. +- `nano` was removed from `environment.defaultPackages`. To not leave systems without a editor, now `programs.nano.enable` is enabled by default. + +- `programs.nano.nanorc` and `programs.nano.syntaxHighlight` no longer have an effect unless `programs.nano.enable` is set to true which is the default. + - `services.outline.sequelizeArguments` has been removed, as `outline` no longer executes database migrations via the `sequelize` cli. - The binary of the package `cloud-sql-proxy` has changed from `cloud_sql_proxy` to `cloud-sql-proxy`. @@ -137,11 +221,13 @@ - The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely. -- mdraid support is now optional. This reduces initramfs size and prevents the potentially undesired automatic detection and activation of software RAID pools. It is disabled by default in new configurations (determined by `stateVersion`), but the appropriate settings will be generated by `nixos-generate-config` when installing to a software RAID device, so the standard installation procedure should be unaffected. If you have custom configs relying on mdraid, ensure that you use `stateVersion` correctly or set `boot.swraid.enable` manually. +- mdraid support is now optional. This reduces initramfs size and prevents the potentially undesired automatic detection and activation of software RAID pools. It is disabled by default in new configurations (determined by `stateVersion`), but the appropriate settings will be generated by `nixos-generate-config` when installing to a software RAID device, so the standard installation procedure should be unaffected. If you have custom configs relying on mdraid, ensure that you use `stateVersion` correctly or set `boot.swraid.enable` manually. On systems with an updated `stateVersion` we now also emit warnings if `mdadm.conf` does not contain the minimum required configuration necessary to run the dynamically enabled monitoring daemons. - The `go-ethereum` package has been updated to v1.12.0. This drops support for proof-of-work. Its GraphQL API now encodes all numeric values as hex strings and the GraphQL UI is updated to version 2.0. The default database has changed from `leveldb` to `pebble` but `leveldb` can be forced with the --db.engine=leveldb flag. The `checkpoint-admin` command was [removed along with trusted checkpoints](https://github.com/ethereum/go-ethereum/pull/27147). -- The default `kops` version is now 1.27.0 and support for 1.24 and older has been dropped. +- The `aseprite-unfree` package has been upgraded from 1.2.16.3 to 1.2.40. The free version of aseprite has been dropped because it is EOL and the package attribute now points to the unfree version. A maintained fork of the last free version of Aseprite, named 'LibreSprite', is available in the `libresprite` package. + +- The default `kops` version is now 1.28.0 and support for 1.25 and older has been dropped. - `pharo` has been updated to latest stable (PharoVM 10.0.5), which is compatible with the latest stable and oldstable images (Pharo 10 and 11). The VM in question is the 64bit Spur. The 32bit version has been dropped due to lack of maintenance. The Cog VM has been deleted because it is severily outdated. Finally, the `pharo-launcher` package has been deleted because it was not compatible with the newer VM, and due to lack of maintenance. @@ -149,8 +235,37 @@ - Emacs macport version 29 was introduced. +- The option `services.networking.networkmanager.enableFccUnlock` was removed in favor of `networking.networkmanager.fccUnlockScripts`, which allows specifying unlock scripts explicitly. The previous option simply did enable all unlock scripts bundled with ModemManager, which is risky, and didn't allow using vendor-provided unlock scripts at all. + - The `html-proofer` package has been updated from major version 3 to major version 5, which includes [breaking changes](https://github.com/gjtorikian/html-proofer/blob/v5.0.8/UPGRADING.md). +- `kratos` has been updated from 0.10.1 to the first stable version 1.0.0, please read the [0.10.1 to 0.11.0](https://github.com/ory/kratos/releases/tag/v0.11.0), [0.11.0 to 0.11.1](https://github.com/ory/kratos/releases/tag/v0.11.1), [0.11.1 to 0.13.0](https://github.com/ory/kratos/releases/tag/v0.13.0) and [0.13.0 to 1.0.0](https://github.com/ory/kratos/releases/tag/v1.0.0) upgrade guides. The most notable breaking change is the introduction of one-time passwords (`code`) and update of the default recovery strategy from `link` to `code`. + +- The `hail` NixOS module was removed, as `hail` was unmaintained since 2017. + +- Package `noto-fonts-emoji` was renamed to `noto-fonts-color-emoji`; + see [#221181](https://github.com/NixOS/nixpkgs/issues/221181). + +- Package `pash` was removed due to being archived upstream. Use `powershell` as an alternative. + +- `security.sudo.extraRules` now includes `root`'s default rule, with ordering + priority 400. This is functionally identical for users not specifying rule + order, or relying on `mkBefore` and `mkAfter`, but may impact users calling + `mkOrder n` with n ≤ 400. + +- `networking.networkmanager.firewallBackend` was removed as NixOS is now using iptables-nftables-compat even when using iptables, therefore Networkmanager now uses the nftables backend unconditionally. + +- [`lib.lists.foldl'`](https://nixos.org/manual/nixpkgs/stable#function-library-lib.lists.foldl-prime) now always evaluates the initial accumulator argument first. + If you depend on the lazier behavior, consider using [`lib.lists.foldl`](https://nixos.org/manual/nixpkgs/stable#function-library-lib.lists.foldl) or [`builtins.foldl'`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-foldl') instead. + +- [`lib.attrsets.foldlAttrs`](https://nixos.org/manual/nixpkgs/stable#function-library-lib.attrsets.foldlAttrs) now always evaluates the initial accumulator argument first. + +- `rome` was removed because it is no longer maintained and is succeeded by `biome`. + +- The `services.mtr-exporter.target` has been removed in favor of `services.mtr-exporter.jobs` which allows specifying multiple targets. + +- Setting `nixpkgs.config` options while providing an external `pkgs` instance will now raise an error instead of silently ignoring the options. NixOS modules no longer set `nixpkgs.config` to accomodate this. This specifically affects `services.locate`, `services.xserver.displayManager.lightdm.greeters.tiny` and `programs.firefox` NixOS modules. No manual intervention should be required in most cases, however, configurations relying on those modules affecting packages outside the system environment should switch to explicit overlays. + ## Other Notable Changes {#sec-release-23.11-notable-changes} - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration. @@ -175,6 +290,8 @@ - New options were added to `services.searx` for better SearXNG support, including options for the built-in rate limiter and bot protection and automatically configuring a local redis server. +- `jq` was updated to 1.7, its [first release in 5 years](https://github.com/jqlang/jq/releases/tag/jq-1.7). + - A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant. - DocBook option documentation is no longer supported, all module documentation now uses markdown. @@ -191,22 +308,83 @@ Unfortunately all servers supporting new clients (newer version of anki-sync-server, anki's built in sync server and this new rust package) do not support the older sync protocol that was used in the old server, so such old clients will also need updating and in particular the anki package in nixpkgs is also being updated in this release. The module update takes care of the new config syntax and the data itself (user login and cards) are compatible, so users of the module will be able to just log in again after updating both client and server without any extra action. +- `services.matrix-synapse` has new options to configure worker processes for matrix-synapse using [`services.matrix-synapse.workers`](#opt-services.matrix-synapse.workers). It's also now possible to configure a local redis server using [`services.matrix-synapse.configureRedisLocally`](#opt-services.matrix-synapse.configureRedisLocally). + - `services.nginx` gained a `defaultListen` option at server-level with support for PROXY protocol listeners, also `proxyProtocol` is now exposed in `services.nginx.virtualHosts..listen` option. It is now possible to run PROXY listeners and non-PROXY listeners at a server-level, see [#213510](https://github.com/NixOS/nixpkgs/pull/213510/) for more details. +- `services.restic.backups` now adds wrapper scripts to your system path, which set the same environment variables as the service, so restic operations can easily be run from the command line. This behavior can be disabled by setting `createWrapper` to `false`, per backup configuration. + - `services.prometheus.exporters` has a new exporter to monitor electrical power consumption based on PowercapRAPL sensor called [Scaphandre](https://github.com/hubblo-org/scaphandre), see [#239803](https://github.com/NixOS/nixpkgs/pull/239803) for more details. +- The MariaDB C client library was upgraded from 3.2.x to 3.3.x. It is recommended to review the [upstream release notes](https://mariadb.com/kb/en/mariadb-connector-c-33-release-notes/). + - The module `services.calibre-server` has new options to configure the `host`, `port`, `auth.enable`, `auth.mode` and `auth.userDb` path, see [#216497](https://github.com/NixOS/nixpkgs/pull/216497/) for more details. +- Mattermost has been upgraded to extended support version 8.1 as the previously + packaged extended support version 7.8 is [reaching end of life](https://docs.mattermost.com/upgrade/extended-support-release.html). + Migration may take some time, see the [changelog](https://docs.mattermost.com/install/self-managed-changelog.html#release-v8-1-extended-support-release) + and [important upgrade notes](https://docs.mattermost.com/upgrade/important-upgrade-notes.html). + - `services.prometheus.exporters` has a new [exporter](https://github.com/hipages/php-fpm_exporter) to monitor PHP-FPM processes, see [#240394](https://github.com/NixOS/nixpkgs/pull/240394) for more details. +- `services.github-runner` / `services.github-runners.` gained the option `nodeRuntimes`. The option defaults to `[ "node20" ]`, i.e., the service supports Node.js 20 GitHub Actions only. The list of Node.js versions accepted by `nodeRuntimes` tracks the versions the upstream GitHub Actions runner supports. See [#249103](https://github.com/NixOS/nixpkgs/pull/249103) for details. + - `programs.gnupg.agent.pinentryFlavor` is now set in `/etc/gnupg/gpg-agent.conf`, and will no longer take precedence over a `pinentry-program` set in `~/.gnupg/gpg-agent.conf`. +- `programs.gnupg` now has the option `agent.settings` to set verbatim config values in `/etc/gnupg/gpg-agent.conf`. + +- `dockerTools.buildImage`, `dockerTools.buildLayeredImage` and `dockerTools.streamLayeredImage` now use `lib.makeOverridable` to allow `dockerTools`-based images to be customized more efficiently at the nix-level. + +- `services.influxdb2` now supports doing an automatic initial setup and provisioning of users, organizations, buckets and authentication tokens, see [#249502](https://github.com/NixOS/nixpkgs/pull/249502) for more details. + - `wrapHelm` now exposes `passthru.pluginsDir` which can be passed to `helmfile`. For convenience, a top-level package `helmfile-wrapped` has been added, which inherits `passthru.pluginsDir` from `kubernetes-helm-wrapped`. See [#217768](https://github.com/NixOS/nixpkgs/issues/217768) for details. - `boot.initrd.network.udhcp.enable` allows control over dhcp during stage 1 regardless of what `networking.useDHCP` is set to. - Suricata was upgraded from 6.0 to 7.0 and no longer considers HTTP/2 support as experimental, see [upstream release notes](https://forum.suricata.io/t/suricata-7-0-0-released/3715) for more details. +- `networking.nftables` now has the option `networking.nftables.table.` to create tables + and have them be updated atomically, instead of flushing the ruleset. + +- `networking.nftables` is no longer flushing all rulesets on every reload. + Use `networking.nftables.flushRuleset = true;` to get back the old behaviour. + +- The `cawbird` package is dropped from nixpkgs, as it got broken by the Twitter API closing down and has been abandoned upstream. + +- `hardware.nvidia` gained `datacenter` options for enabling NVIDIA Data Center drivers and configuration of NVLink/NVSwitch topologies through `nv-fabricmanager`. + +- Certificate generation via the `security.acme` now limits the concurrent number of running certificate renewals and generation jobs, to avoid spiking resource usage when processing many certificates at once. The limit defaults to *5* and can be adjusted via `maxConcurrentRenewals`. Setting it to *0* disables the limits altogether. + +- New `boot.bcache.enable` (default enabled) allows completely removing `bcache` mount support. + +- The module `services.mbpfan` now has the option `aggressive` enabled by default for better heat moderation. You can disable it for upstream defaults. + +- `security.sudo` now provides two extra options, that do not change the + module's default behaviour: + - `defaultOptions` controls the options used for the default rules; + - `keepTerminfo` controls whether `TERMINFO` and `TERMINFO_DIRS` are preserved + for `root` and the `wheel` group. + +- CoreDNS can now be built with external plugins by overriding `externalPlugins` and `vendorHash` arguments like this: + + ``` + services.coredns = { + enable = true; + package = pkgs.coredns.override { + externalPlugins = [ + {name = "fanout"; repo = "github.com/networkservicemesh/fanout"; version = "v1.9.1";} + ]; + vendorHash = ""; + }; + }; + ``` + + To get the necessary SRI hash, set `vendorHash = "";`. The build will fail and produce the correct `vendorHash` in the error message. + + If you use this feature, updates to CoreDNS may require updating `vendorHash` by following these steps again. + +- `fusuma` now enables the following plugins: [appmatcher](https://github.com/iberianpig/fusuma-plugin-appmatcher), [keypress](https://github.com/iberianpig/fusuma-plugin-keypress), [sendkey](https://github.com/iberianpig/fusuma-plugin-sendkey), [tap](https://github.com/iberianpig/fusuma-plugin-tap) and [wmctrl](https://github.com/iberianpig/fusuma-plugin-wmctrl). + ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals} - The use of `sourceRoot = "source";`, `sourceRoot = "source/subdir";`, and similar lines in package derivations using the default `unpackPhase` is deprecated as it requires `unpackPhase` to always produce a directory named "source". Use `sourceRoot = src.name`, `sourceRoot = "${src.name}/subdir";`, or `setSourceRoot = "sourceRoot=$(echo */subdir)";` or similar instead. @@ -225,7 +403,7 @@ The module update takes care of the new config syntax and the data itself (user - The `qemu-vm.nix` module by default now identifies block devices via persistent names available in `/dev/disk/by-*`. Because the rootDevice is - identfied by its filesystem label, it needs to be formatted before the VM is + identified by its filesystem label, it needs to be formatted before the VM is started. The functionality of automatically formatting the rootDevice in the initrd is removed from the QEMU module. However, for tests that depend on this functionality, a test utility for the scripted initrd is added @@ -234,3 +412,16 @@ The module update takes care of the new config syntax and the data itself (user ./common/auto-format-root-device.nix ];` When you use the systemd initrd, you can automatically format the root device by setting `virtualisation.fileSystems."/".autoFormat = true;`. + +- `python3.pkgs.flitBuildHook` has been removed. Use `flit-core` and `format = "pyproject"` instead. + +- The `qemu-vm.nix` module now supports disabling overriding `fileSystems` with + `virtualisation.fileSystems`. This enables the user to boot VMs from + "external" disk images not created by the qemu-vm module. You can stop the + qemu-vm module from overriding `fileSystems` by setting + `virtualisation.fileSystems = lib.mkForce { };`. + +- The `electron` packages now places its application files in `$out/libexec/electron` instead of `$out/lib/electron`. Packages using electron-builder will fail to build and need to be adjusted by changing `lib` to `libexec`. + +- `teleport` has been upgraded from major version 12 to major version 14. Please see upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/) and release notes for versions [13](https://goteleport.com/docs/changelog/#1300-050823) and [14](https://goteleport.com/docs/changelog/#1400-092023). Note that Teleport does not officially support upgrades across more than one major version at a time. If you're running Teleport server components, it is recommended to first upgrade to an intermediate 13.x version by setting `services.teleport.package = pkgs.teleport_13`. Afterwards, this option can be removed to upgrade to the default version (14). + diff --git a/third_party/nixpkgs/nixos/lib/make-btrfs-fs.nix b/third_party/nixpkgs/nixos/lib/make-btrfs-fs.nix new file mode 100644 index 0000000000..225666f9a5 --- /dev/null +++ b/third_party/nixpkgs/nixos/lib/make-btrfs-fs.nix @@ -0,0 +1,65 @@ +# Builds an btrfs image containing a populated /nix/store with the closure +# of store paths passed in the storePaths parameter, in addition to the +# contents of a directory that can be populated with commands. The +# generated image is sized to only fit its contents, with the expectation +# that a script resizes the filesystem at boot time. +{ pkgs +, lib +# List of derivations to be included +, storePaths +# Whether or not to compress the resulting image with zstd +, compressImage ? false, zstd +# Shell commands to populate the ./files directory. +# All files in that directory are copied to the root of the FS. +, populateImageCommands ? "" +, volumeLabel +, uuid ? "44444444-4444-4444-8888-888888888888" +, btrfs-progs +}: + +let + sdClosureInfo = pkgs.buildPackages.closureInfo { rootPaths = storePaths; }; +in +pkgs.stdenv.mkDerivation { + name = "btrfs-fs.img${lib.optionalString compressImage ".zst"}"; + + nativeBuildInputs = [ btrfs-progs ] ++ lib.optional compressImage zstd; + + buildCommand = + '' + ${if compressImage then "img=temp.img" else "img=$out"} + + set -x + ( + mkdir -p ./files + ${populateImageCommands} + ) + + mkdir -p ./rootImage/nix/store + + xargs -I % cp -a --reflink=auto % -t ./rootImage/nix/store/ < ${sdClosureInfo}/store-paths + ( + GLOBIGNORE=".:.." + shopt -u dotglob + + for f in ./files/*; do + cp -a --reflink=auto -t ./rootImage/ "$f" + done + ) + + cp ${sdClosureInfo}/registration ./rootImage/nix-path-registration + + touch $img + mkfs.btrfs -L ${volumeLabel} -U ${uuid} -r ./rootImage --shrink $img + + if ! btrfs check $img; then + echo "--- 'btrfs check' failed for BTRFS image ---" + return 1 + fi + + if [ ${builtins.toString compressImage} ]; then + echo "Compressing image" + zstd -v --no-progress ./$img -o $out + fi + ''; +} diff --git a/third_party/nixpkgs/nixos/lib/systemd-lib.nix b/third_party/nixpkgs/nixos/lib/systemd-lib.nix index 641b47def0..5669aae0bc 100644 --- a/third_party/nixpkgs/nixos/lib/systemd-lib.nix +++ b/third_party/nixpkgs/nixos/lib/systemd-lib.nix @@ -80,6 +80,10 @@ in rec { optional (attr ? ${name} && !elem attr.${name} values) "Systemd ${group} field `${name}' cannot have value `${toString attr.${name}}'."; + assertValuesSomeOfOr = name: values: default: group: attr: + optional (attr ? ${name} && !(all (x: elem x values) (splitString " " attr.${name}) || attr.${name} == default)) + "Systemd ${group} field `${name}' cannot have value `${toString attr.${name}}'."; + assertHasField = name: group: attr: optional (!(attr ? ${name})) "Systemd ${group} field `${name}' must exist."; @@ -274,7 +278,7 @@ in rec { }); in "${out}/bin/${scriptName}"; - unitConfig = { config, options, ... }: { + unitConfig = { config, name, options, ... }: { config = { unitConfig = optionalAttrs (config.requires != []) @@ -294,9 +298,9 @@ in rec { // optionalAttrs (config.requisite != []) { Requisite = toString config.requisite; } // optionalAttrs (config ? restartTriggers && config.restartTriggers != []) - { X-Restart-Triggers = "${pkgs.writeText "X-Restart-Triggers" (toString config.restartTriggers)}"; } + { X-Restart-Triggers = "${pkgs.writeText "X-Restart-Triggers-${name}" (toString config.restartTriggers)}"; } // optionalAttrs (config ? reloadTriggers && config.reloadTriggers != []) - { X-Reload-Triggers = "${pkgs.writeText "X-Reload-Triggers" (toString config.reloadTriggers)}"; } + { X-Reload-Triggers = "${pkgs.writeText "X-Reload-Triggers-${name}" (toString config.reloadTriggers)}"; } // optionalAttrs (config.description != "") { Description = config.description; } // optionalAttrs (config.documentation != []) { diff --git a/third_party/nixpkgs/nixos/lib/test-driver/default.nix b/third_party/nixpkgs/nixos/lib/test-driver/default.nix index 33313059ff..6e01e00b43 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/default.nix +++ b/third_party/nixpkgs/nixos/lib/test-driver/default.nix @@ -4,19 +4,20 @@ , qemu_pkg ? qemu_test , coreutils , imagemagick_light -, libtiff , netpbm , qemu_test , socat +, ruff , tesseract4 , vde2 , extraPythonPackages ? (_ : []) }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication { pname = "nixos-test-driver"; version = "1.1"; src = ./.; + format = "pyproject"; propagatedBuildInputs = [ coreutils @@ -31,14 +32,13 @@ python3Packages.buildPythonApplication rec { ++ extraPythonPackages python3Packages; doCheck = true; - nativeCheckInputs = with python3Packages; [ mypy pylint black ]; + nativeCheckInputs = with python3Packages; [ mypy ruff black ]; checkPhase = '' - mypy --disallow-untyped-defs \ - --no-implicit-optional \ - --pretty \ - --no-color-output \ - --ignore-missing-imports ${src}/test_driver - pylint --errors-only --enable=unused-import ${src}/test_driver - black --check --diff ${src}/test_driver + echo -e "\x1b[32m## run mypy\x1b[0m" + mypy test_driver extract-docstrings.py + echo -e "\x1b[32m## run ruff\x1b[0m" + ruff . + echo -e "\x1b[32m## run black\x1b[0m" + black --check --diff . ''; } diff --git a/third_party/nixpkgs/nixos/lib/test-driver/extract-docstrings.py b/third_party/nixpkgs/nixos/lib/test-driver/extract-docstrings.py index 5aec4c89a9..64850ca711 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/extract-docstrings.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/extract-docstrings.py @@ -1,5 +1,6 @@ import ast import sys +from pathlib import Path """ This program takes all the Machine class methods and prints its methods in @@ -40,27 +41,34 @@ some_function(param1, param2) """ -assert len(sys.argv) == 2 -with open(sys.argv[1], "r") as f: - module = ast.parse(f.read()) +def main() -> None: + if len(sys.argv) != 2: + print(f"Usage: {sys.argv[0]} ") + sys.exit(1) -class_definitions = (node for node in module.body if isinstance(node, ast.ClassDef)) + module = ast.parse(Path(sys.argv[1]).read_text()) -machine_class = next(filter(lambda x: x.name == "Machine", class_definitions)) -assert machine_class is not None + class_definitions = (node for node in module.body if isinstance(node, ast.ClassDef)) -function_definitions = [ - node for node in machine_class.body if isinstance(node, ast.FunctionDef) -] -function_definitions.sort(key=lambda x: x.name) + machine_class = next(filter(lambda x: x.name == "Machine", class_definitions)) + assert machine_class is not None -for f in function_definitions: - docstr = ast.get_docstring(f) - if docstr is not None: - args = ", ".join((a.arg for a in f.args.args[1:])) - args = f"({args})" + function_definitions = [ + node for node in machine_class.body if isinstance(node, ast.FunctionDef) + ] + function_definitions.sort(key=lambda x: x.name) - docstr = "\n".join((f" {l}" for l in docstr.strip().splitlines())) + for function in function_definitions: + docstr = ast.get_docstring(function) + if docstr is not None: + args = ", ".join(a.arg for a in function.args.args[1:]) + args = f"({args})" - print(f"{f.name}{args}\n\n:{docstr[1:]}\n") + docstr = "\n".join(f" {line}" for line in docstr.strip().splitlines()) + + print(f"{function.name}{args}\n\n:{docstr[1:]}\n") + + +if __name__ == "__main__": + main() diff --git a/third_party/nixpkgs/nixos/lib/test-driver/pyproject.toml b/third_party/nixpkgs/nixos/lib/test-driver/pyproject.toml new file mode 100644 index 0000000000..8638f14dfd --- /dev/null +++ b/third_party/nixpkgs/nixos/lib/test-driver/pyproject.toml @@ -0,0 +1,44 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" + +[project] +name = "nixos-test-driver" +version = "0.0.0" + +[project.scripts] +nixos-test-driver = "test_driver:main" +generate-driver-symbols = "test_driver:generate_driver_symbols" + +[tool.setuptools.packages] +find = {} + +[tool.setuptools.package-data] +test_driver = ["py.typed"] + +[tool.ruff] +line-length = 88 + +select = ["E", "F", "I", "U", "N"] +ignore = ["E501"] + +# xxx: we can import https://pypi.org/project/types-colorama/ here +[[tool.mypy.overrides]] +module = "colorama.*" +ignore_missing_imports = true + +[[tool.mypy.overrides]] +module = "ptpython.*" +ignore_missing_imports = true + +[tool.black] +line-length = 88 +target-version = ['py39'] +include = '\.pyi?$' + +[tool.mypy] +python_version = "3.10" +warn_redundant_casts = true +disallow_untyped_calls = true +disallow_untyped_defs = true +no_implicit_optional = true diff --git a/third_party/nixpkgs/nixos/lib/test-driver/setup.py b/third_party/nixpkgs/nixos/lib/test-driver/setup.py deleted file mode 100644 index 1719b988db..0000000000 --- a/third_party/nixpkgs/nixos/lib/test-driver/setup.py +++ /dev/null @@ -1,14 +0,0 @@ -from setuptools import setup, find_packages - -setup( - name="nixos-test-driver", - version='1.1', - packages=find_packages(), - package_data={"test_driver": ["py.typed"]}, - entry_points={ - "console_scripts": [ - "nixos-test-driver=test_driver:main", - "generate-driver-symbols=test_driver:generate_driver_symbols" - ] - }, -) diff --git a/third_party/nixpkgs/nixos/lib/test-driver/shell.nix b/third_party/nixpkgs/nixos/lib/test-driver/shell.nix new file mode 100644 index 0000000000..367bbad556 --- /dev/null +++ b/third_party/nixpkgs/nixos/lib/test-driver/shell.nix @@ -0,0 +1,2 @@ +with import ../../.. {}; +pkgs.callPackage ./default.nix {} diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/__init__.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/__init__.py index c90e3d9e1c..371719d7a9 100755 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/__init__.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/__init__.py @@ -1,11 +1,12 @@ -from pathlib import Path import argparse -import ptpython.repl import os import time +from pathlib import Path + +import ptpython.repl -from test_driver.logger import rootlog from test_driver.driver import Driver +from test_driver.logger import rootlog class EnvDefault(argparse.Action): @@ -25,9 +26,7 @@ class EnvDefault(argparse.Action): ) if required and default: required = False - super(EnvDefault, self).__init__( - default=default, required=required, nargs=nargs, **kwargs - ) + super().__init__(default=default, required=required, nargs=nargs, **kwargs) def __call__(self, parser, namespace, values, option_string=None): # type: ignore setattr(namespace, self.dest, values) diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py index 835d60ec3b..723c807178 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/driver.py @@ -1,14 +1,14 @@ -from contextlib import contextmanager -from pathlib import Path -from typing import Any, Dict, Iterator, List, Union, Optional, Callable, ContextManager import os import re import tempfile +from contextlib import contextmanager +from pathlib import Path +from typing import Any, Callable, ContextManager, Dict, Iterator, List, Optional, Union from test_driver.logger import rootlog from test_driver.machine import Machine, NixStartScript, retry -from test_driver.vlan import VLan from test_driver.polling_condition import PollingCondition +from test_driver.vlan import VLan def get_tmp_dir() -> Path: diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/logger.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/logger.py index e6182ff7c7..116244b5e4 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/logger.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/logger.py @@ -1,13 +1,17 @@ -from colorama import Style, Fore -from contextlib import contextmanager -from typing import Any, Dict, Iterator -from queue import Queue, Empty -from xml.sax.saxutils import XMLGenerator +# mypy: disable-error-code="no-untyped-call" +# drop the above line when mypy is upgraded to include +# https://github.com/python/typeshed/commit/49b717ca52bf0781a538b04c0d76a5513f7119b8 import codecs import os import sys import time import unicodedata +from contextlib import contextmanager +from queue import Empty, Queue +from typing import Any, Dict, Iterator +from xml.sax.saxutils import XMLGenerator + +from colorama import Fore, Style class Logger: diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py index 809fd690d7..7ed001a1df 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/machine.py @@ -1,7 +1,3 @@ -from contextlib import _GeneratorContextManager, nullcontext -from pathlib import Path -from queue import Queue -from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple import base64 import io import os @@ -16,6 +12,10 @@ import sys import tempfile import threading import time +from contextlib import _GeneratorContextManager, nullcontext +from pathlib import Path +from queue import Queue +from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple from test_driver.logger import rootlog @@ -236,14 +236,14 @@ class LegacyStartCommand(StartCommand): def __init__( self, - netBackendArgs: Optional[str] = None, - netFrontendArgs: Optional[str] = None, + netBackendArgs: Optional[str] = None, # noqa: N803 + netFrontendArgs: Optional[str] = None, # noqa: N803 hda: Optional[Tuple[Path, str]] = None, cdrom: Optional[str] = None, usb: Optional[str] = None, bios: Optional[str] = None, - qemuBinary: Optional[str] = None, - qemuFlags: Optional[str] = None, + qemuBinary: Optional[str] = None, # noqa: N803 + qemuFlags: Optional[str] = None, # noqa: N803 ): if qemuBinary is not None: self._cmd = qemuBinary @@ -599,7 +599,7 @@ class Machine: return (-1, output.decode()) # Get the return code - self.shell.send("echo ${PIPESTATUS[0]}\n".encode()) + self.shell.send(b"echo ${PIPESTATUS[0]}\n") rc = int(self._next_newline_closed_block_from_shell().strip()) return (rc, output.decode(errors="replace")) @@ -736,7 +736,7 @@ class Machine: ) return output - def wait_until_tty_matches(self, tty: str, regexp: str) -> None: + def wait_until_tty_matches(self, tty: str, regexp: str, timeout: int = 900) -> None: """Wait until the visible output on the chosen TTY matches regular expression. Throws an exception on timeout. """ @@ -752,7 +752,7 @@ class Machine: return len(matcher.findall(text)) > 0 with self.nested(f"waiting for {regexp} to appear on tty {tty}"): - retry(tty_matches) + retry(tty_matches, timeout) def send_chars(self, chars: str, delay: Optional[float] = 0.01) -> None: """ @@ -764,7 +764,7 @@ class Machine: for char in chars: self.send_key(char, delay, log=False) - def wait_for_file(self, filename: str) -> None: + def wait_for_file(self, filename: str, timeout: int = 900) -> None: """ Waits until the file exists in the machine's file system. """ @@ -774,9 +774,11 @@ class Machine: return status == 0 with self.nested(f"waiting for file '{filename}'"): - retry(check_file) + retry(check_file, timeout) - def wait_for_open_port(self, port: int, addr: str = "localhost") -> None: + def wait_for_open_port( + self, port: int, addr: str = "localhost", timeout: int = 900 + ) -> None: """ Wait until a process is listening on the given TCP port and IP address (default `localhost`). @@ -787,9 +789,11 @@ class Machine: return status == 0 with self.nested(f"waiting for TCP port {port} on {addr}"): - retry(port_is_open) + retry(port_is_open, timeout) - def wait_for_closed_port(self, port: int, addr: str = "localhost") -> None: + def wait_for_closed_port( + self, port: int, addr: str = "localhost", timeout: int = 900 + ) -> None: """ Wait until nobody is listening on the given TCP port and IP address (default `localhost`). @@ -800,7 +804,7 @@ class Machine: return status != 0 with self.nested(f"waiting for TCP port {port} on {addr} to be closed"): - retry(port_is_closed) + retry(port_is_closed, timeout) def start_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]: return self.systemctl(f"start {jobname}", user) @@ -839,6 +843,9 @@ class Machine: while True: chunk = self.shell.recv(1024) + # No need to print empty strings, it means we are waiting. + if len(chunk) == 0: + continue self.log(f"Guest shell says: {chunk!r}") # NOTE: for this to work, nothing must be printed after this line! if b"Spawning backdoor root shell..." in chunk: @@ -974,7 +981,7 @@ class Machine: """ return self._get_screen_text_variants([2])[0] - def wait_for_text(self, regex: str) -> None: + def wait_for_text(self, regex: str, timeout: int = 900) -> None: """ Wait until the supplied regular expressions matches the textual contents of the screen by using optical character recognition (see @@ -997,7 +1004,7 @@ class Machine: return False with self.nested(f"waiting for {regex} to appear on screen"): - retry(screen_matches) + retry(screen_matches, timeout) def wait_for_console_text(self, regex: str, timeout: int | None = None) -> None: """ @@ -1125,7 +1132,7 @@ class Machine: return assert self.shell - self.shell.send("poweroff\n".encode()) + self.shell.send(b"poweroff\n") self.wait_for_shutdown() def crash(self) -> None: @@ -1148,7 +1155,7 @@ class Machine: self.send_key("ctrl-alt-delete") self.connected = False - def wait_for_x(self) -> None: + def wait_for_x(self, timeout: int = 900) -> None: """ Wait until it is possible to connect to the X server. """ @@ -1165,14 +1172,14 @@ class Machine: return status == 0 with self.nested("waiting for the X11 server"): - retry(check_x) + retry(check_x, timeout) def get_window_names(self) -> List[str]: return self.succeed( r"xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'" ).splitlines() - def wait_for_window(self, regexp: str) -> None: + def wait_for_window(self, regexp: str, timeout: int = 900) -> None: """ Wait until an X11 window has appeared whose name matches the given regular expression, e.g., `wait_for_window("Terminal")`. @@ -1190,7 +1197,7 @@ class Machine: return any(pattern.search(name) for name in names) with self.nested("waiting for a window to appear"): - retry(window_is_visible) + retry(window_is_visible, timeout) def sleep(self, secs: int) -> None: # We want to sleep in *guest* time, not *host* time. diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/polling_condition.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/polling_condition.py index 02ca0a03ab..12cbad69e3 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/polling_condition.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/polling_condition.py @@ -1,11 +1,11 @@ -from typing import Callable, Optional -from math import isfinite import time +from math import isfinite +from typing import Callable, Optional from .logger import rootlog -class PollingConditionFailed(Exception): +class PollingConditionError(Exception): pass @@ -60,7 +60,7 @@ class PollingCondition: def maybe_raise(self) -> None: if not self.check(): - raise PollingConditionFailed(self.status_message(False)) + raise PollingConditionError(self.status_message(False)) def status_message(self, status: bool) -> str: return f"Polling condition {'succeeded' if status else 'failed'}: {self.description}" diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/vlan.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/vlan.py index f2a7f250d1..ec9679108e 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/vlan.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/vlan.py @@ -1,8 +1,8 @@ -from pathlib import Path import io import os import pty import subprocess +from pathlib import Path from test_driver.logger import rootlog diff --git a/third_party/nixpkgs/nixos/lib/testing/driver.nix b/third_party/nixpkgs/nixos/lib/testing/driver.nix index 23574698c0..cc97ca7208 100644 --- a/third_party/nixpkgs/nixos/lib/testing/driver.nix +++ b/third_party/nixpkgs/nixos/lib/testing/driver.nix @@ -175,7 +175,12 @@ in }; config = { - _module.args.hostPkgs = config.hostPkgs; + _module.args = { + hostPkgs = + # Comment is in nixos/modules/misc/nixpkgs.nix + lib.mkOverride lib.modules.defaultOverridePriority + config.hostPkgs.__splicedPackages; + }; driver = withChecks driver; diff --git a/third_party/nixpkgs/nixos/lib/testing/nodes.nix b/third_party/nixpkgs/nixos/lib/testing/nodes.nix index f58759b4cd..a47d1c98ec 100644 --- a/third_party/nixpkgs/nixos/lib/testing/nodes.nix +++ b/third_party/nixpkgs/nixos/lib/testing/nodes.nix @@ -28,15 +28,17 @@ let { virtualisation.qemu.package = testModuleArgs.config.qemu.package; }) - (optionalAttrs (!config.node.pkgsReadOnly) { + ({ options, ... }: { key = "nodes.nix-pkgs"; - config = { - # Ensure we do not use aliases. Ideally this is only set - # when the test framework is used by Nixpkgs NixOS tests. - nixpkgs.config.allowAliases = false; - # TODO: switch to nixpkgs.hostPlatform and make sure containers-imperative test still evaluates. - nixpkgs.system = hostPkgs.stdenv.hostPlatform.system; - }; + config = optionalAttrs (!config.node.pkgsReadOnly) ( + mkIf (!options.nixpkgs.pkgs.isDefined) { + # Ensure we do not use aliases. Ideally this is only set + # when the test framework is used by Nixpkgs NixOS tests. + nixpkgs.config.allowAliases = false; + # TODO: switch to nixpkgs.hostPlatform and make sure containers-imperative test still evaluates. + nixpkgs.system = hostPkgs.stdenv.hostPlatform.system; + } + ); }) testModuleArgs.config.extraBaseModules ]; diff --git a/third_party/nixpkgs/nixos/lib/utils.nix b/third_party/nixpkgs/nixos/lib/utils.nix index 7ea9d6a5c7..e618cf2f86 100644 --- a/third_party/nixpkgs/nixos/lib/utils.nix +++ b/third_party/nixpkgs/nixos/lib/utils.nix @@ -177,6 +177,7 @@ rec { genJqSecretsReplacementSnippet' = attr: set: output: let secrets = recursiveGetAttrWithJqPrefix set attr; + stringOrDefault = str: def: if str == "" then def else str; in '' if [[ -h '${output}' ]]; then rm '${output}' @@ -195,10 +196,12 @@ rec { (attrNames secrets)) + "\n" + "${pkgs.jq}/bin/jq >'${output}' " - + lib.escapeShellArg (concatStringsSep - " | " - (imap1 (index: name: ''${name} = $ENV.secret${toString index}'') - (attrNames secrets))) + + lib.escapeShellArg (stringOrDefault + (concatStringsSep + " | " + (imap1 (index: name: ''${name} = $ENV.secret${toString index}'') + (attrNames secrets))) + ".") + '' <<'EOF' ${builtins.toJSON set} diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix new file mode 100644 index 0000000000..7b743d170b --- /dev/null +++ b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-container-image-inner.nix @@ -0,0 +1,20 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, lib, ... }: + +{ + imports = + [ + # Include the default lxd configuration. + ../../../modules/virtualisation/lxc-container.nix + # Include the container-specific autogenerated configuration. + ./lxd.nix + ]; + + networking.useDHCP = false; + networking.interfaces.eth0.useDHCP = true; + + system.stateVersion = "21.05"; # Did you read the comment? +} diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-image.nix b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-container-image.nix similarity index 64% rename from third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-image.nix rename to third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-container-image.nix index 07605c5c31..3bd1320b2b 100644 --- a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-image.nix +++ b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-container-image.nix @@ -1,4 +1,4 @@ -{ lib, config, pkgs, ... }: +{ lib, pkgs, ... }: { imports = [ @@ -16,8 +16,8 @@ system.activationScripts.config = '' if [ ! -e /etc/nixos/configuration.nix ]; then mkdir -p /etc/nixos - cat ${./lxd-image-inner.nix} > /etc/nixos/configuration.nix - sed 's|../../../modules/virtualisation/lxc-container.nix||g' -i /etc/nixos/configuration.nix + cat ${./lxd-container-image-inner.nix} > /etc/nixos/configuration.nix + ${lib.getExe pkgs.gnused} 's|../../../modules/virtualisation/lxc-container.nix||g' -i /etc/nixos/configuration.nix fi ''; diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-image-inner.nix b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-image-inner.nix deleted file mode 100644 index c1a9b1aacd..0000000000 --- a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-image-inner.nix +++ /dev/null @@ -1,95 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, lib, ... }: - -{ - imports = - [ # Include the default lxd configuration. - ../../../modules/virtualisation/lxc-container.nix - # Include the container-specific autogenerated configuration. - ./lxd.nix - ]; - - # networking.hostName = mkForce "nixos"; # Overwrite the hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Set your time zone. - # time.timeZone = "Europe/Amsterdam"; - - # The global useDHCP flag is deprecated, therefore explicitly set to false here. - # Per-interface useDHCP will be mandatory in the future, so this generated config - # replicates the default behaviour. - networking.useDHCP = false; - networking.interfaces.eth0.useDHCP = true; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - # i18n.defaultLocale = "en_US.UTF-8"; - # console = { - # font = "Lat2-Terminus16"; - # keyMap = "us"; - # }; - - # Enable the X11 windowing system. - # services.xserver.enable = true; - - # Configure keymap in X11 - # services.xserver.layout = "us"; - # services.xserver.xkbOptions = "eurosign:e"; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # sound.enable = true; - # hardware.pulseaudio.enable = true; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.alice = { - # isNormalUser = true; - # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - # }; - - # List packages installed in system profile. To search, run: - # $ nix search wget - # environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget - # firefox - # ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - # programs.mtr.enable = true; - # programs.gnupg.agent = { - # enable = true; - # enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It’s perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "21.05"; # Did you read the comment? -} diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix new file mode 100644 index 0000000000..a8f2c63ac5 --- /dev/null +++ b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image-inner.nix @@ -0,0 +1,20 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, lib, ... }: + +{ + imports = + [ + # Include the default lxd configuration. + ../../../modules/virtualisation/lxd-virtual-machine.nix + # Include the container-specific autogenerated configuration. + ./lxd.nix + ]; + + networking.useDHCP = false; + networking.interfaces.eth0.useDHCP = true; + + system.stateVersion = "23.05"; # Did you read the comment? +} diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix new file mode 100644 index 0000000000..eb0d9217d4 --- /dev/null +++ b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix @@ -0,0 +1,27 @@ +{ lib, pkgs, ... }: + +{ + imports = [ + ../../../modules/virtualisation/lxd-virtual-machine.nix + ]; + + virtualisation.lxc.templates.nix = { + enable = true; + target = "/etc/nixos/lxd.nix"; + template = ./nix.tpl; + when = ["create" "copy"]; + }; + + # copy the config for nixos-rebuild + system.activationScripts.config = '' + if [ ! -e /etc/nixos/configuration.nix ]; then + mkdir -p /etc/nixos + cat ${./lxd-virtual-machine-image-inner.nix} > /etc/nixos/configuration.nix + ${lib.getExe pkgs.gnused} 's|../../../modules/virtualisation/lxd-virtual-machine.nix||g' -i /etc/nixos/configuration.nix + fi + ''; + + # Network + networking.useDHCP = false; + networking.interfaces.enp5s0.useDHCP = true; +} diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/oci/create-image.sh b/third_party/nixpkgs/nixos/maintainers/scripts/oci/create-image.sh new file mode 100755 index 0000000000..0d7332a0b2 --- /dev/null +++ b/third_party/nixpkgs/nixos/maintainers/scripts/oci/create-image.sh @@ -0,0 +1,24 @@ +#! /usr/bin/env bash + +set -euo pipefail + +export NIX_PATH=nixpkgs=$(dirname $(readlink -f $0))/../../../.. +export NIXOS_CONFIG=$(dirname $(readlink -f $0))/../../../modules/virtualisation/oci-image.nix + +if (( $# < 1 )); then + ( + echo "Usage: create-image.sh " + echo + echo "Where is one of:" + echo " x86_64-linux" + echo " aarch64-linux" + ) >&2 +fi + +system="$1"; shift + +nix-build '' \ + -A config.system.build.OCIImage \ + --argstr system "$system" \ + --option system-features kvm \ + -o oci-image diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/oci/upload-image.sh b/third_party/nixpkgs/nixos/maintainers/scripts/oci/upload-image.sh new file mode 100755 index 0000000000..e4870e94bf --- /dev/null +++ b/third_party/nixpkgs/nixos/maintainers/scripts/oci/upload-image.sh @@ -0,0 +1,100 @@ +#! /usr/bin/env bash + +set -euo pipefail + +script_dir="$(dirname $(readlink -f $0))" +nixpkgs_root="$script_dir/../../../.." +export NIX_PATH="nixpkgs=$nixpkgs_root" + +cat - < 1, binmode => ':utf8', perms => $perms // 0644 }, $contents) or die; } +# Converts an ISO date to number of days since 1970-01-01 +sub dateToDays { + my ($date) = @_; + my $time = Time::Piece->strptime($date, "%Y-%m-%d"); + return $time->epoch / 60 / 60 / 24; +} + sub nscdInvalidate { system("nscd", "--invalidate", $_[0]) unless $is_dry; } @@ -231,12 +239,12 @@ foreach my $u (@{$spec->{users}}) { chmod oct($u->{homeMode}), $u->{home}; } - if (defined $u->{passwordFile}) { - if (-e $u->{passwordFile}) { - $u->{hashedPassword} = read_file($u->{passwordFile}); + if (defined $u->{hashedPasswordFile}) { + if (-e $u->{hashedPasswordFile}) { + $u->{hashedPassword} = read_file($u->{hashedPasswordFile}); chomp $u->{hashedPassword}; } else { - warn "warning: password file ‘$u->{passwordFile}’ does not exist\n"; + warn "warning: password file ‘$u->{hashedPasswordFile}’ does not exist\n"; } } elsif (defined $u->{password}) { $u->{hashedPassword} = hashPassword($u->{password}); @@ -285,22 +293,26 @@ my %shadowSeen; foreach my $line (-f "/etc/shadow" ? read_file("/etc/shadow", { binmode => ":utf8" }) : ()) { chomp $line; - my ($name, $hashedPassword, @rest) = split(':', $line, -9); - my $u = $usersOut{$name};; + # struct name copied from `man 3 shadow` + my ($sp_namp, $sp_pwdp, $sp_lstch, $sp_min, $sp_max, $sp_warn, $sp_inact, $sp_expire, $sp_flag) = split(':', $line, -9); + my $u = $usersOut{$sp_namp};; next if !defined $u; - $hashedPassword = "!" if !$spec->{mutableUsers}; - $hashedPassword = $u->{hashedPassword} if defined $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME - chomp $hashedPassword; - push @shadowNew, join(":", $name, $hashedPassword, @rest) . "\n"; - $shadowSeen{$name} = 1; + $sp_pwdp = "!" if !$spec->{mutableUsers}; + $sp_pwdp = $u->{hashedPassword} if defined $u->{hashedPassword} && !$spec->{mutableUsers}; # FIXME + $sp_expire = dateToDays($u->{expires}) if defined $u->{expires}; + chomp $sp_pwdp; + push @shadowNew, join(":", $sp_namp, $sp_pwdp, $sp_lstch, $sp_min, $sp_max, $sp_warn, $sp_inact, $sp_expire, $sp_flag) . "\n"; + $shadowSeen{$sp_namp} = 1; } foreach my $u (values %usersOut) { next if defined $shadowSeen{$u->{name}}; my $hashedPassword = "!"; $hashedPassword = $u->{hashedPassword} if defined $u->{hashedPassword}; + my $expires = ""; + $expires = dateToDays($u->{expires}) if defined $u->{expires}; # FIXME: set correct value for sp_lstchg. - push @shadowNew, join(":", $u->{name}, $hashedPassword, "1::::::") . "\n"; + push @shadowNew, join(":", $u->{name}, $hashedPassword, "1::::", $expires, "") . "\n"; } updateFile("/etc/shadow", \@shadowNew, 0640); diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix index 4c9e286ea5..f11a1f82fc 100644 --- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix +++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix @@ -18,11 +18,11 @@ let passwordDescription = '' The options {option}`hashedPassword`, - {option}`password` and {option}`passwordFile` + {option}`password` and {option}`hashedPasswordFile` controls what password is set for the user. {option}`hashedPassword` overrides both - {option}`password` and {option}`passwordFile`. - {option}`password` overrides {option}`passwordFile`. + {option}`password` and {option}`hashedPasswordFile`. + {option}`password` overrides {option}`hashedPasswordFile`. If none of these three options are set, no password is assigned to the user, and the user will not be able to do password logins. If the option {option}`users.mutableUsers` is true, the @@ -250,16 +250,24 @@ let ''; }; + hashedPasswordFile = mkOption { + type = with types; nullOr str; + default = cfg.users.${name}.passwordFile; + defaultText = literalExpression "null"; + description = lib.mdDoc '' + The full path to a file that contains the hash of the user's + password. The password file is read on each system activation. The + file should contain exactly one line, which should be the password in + an encrypted form that is suitable for the `chpasswd -e` command. + ${passwordDescription} + ''; + }; + passwordFile = mkOption { type = with types; nullOr str; default = null; - description = lib.mdDoc '' - The full path to a file that contains the user's password. The password - file is read on each system activation. The file should contain - exactly one line, which should be the password in an encrypted form - that is suitable for the `chpasswd -e` command. - ${passwordDescription} - ''; + visible = false; + description = lib.mdDoc "Deprecated alias of hashedPasswordFile"; }; initialHashedPassword = mkOption { @@ -311,6 +319,17 @@ let ''; }; + expires = mkOption { + type = types.nullOr (types.strMatching "[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}"); + default = null; + description = lib.mdDoc '' + Set the date on which the user's account will no longer be + accessible. The date is expressed in the format YYYY-MM-DD, or null + to disable the expiry. + A user whose account is locked must contact the system + administrator before being able to use the system again. + ''; + }; }; config = mkMerge @@ -430,15 +449,17 @@ let gidsAreUnique = idsAreUnique (filterAttrs (n: g: g.gid != null) cfg.groups) "gid"; sdInitrdUidsAreUnique = idsAreUnique (filterAttrs (n: u: u.uid != null) config.boot.initrd.systemd.users) "uid"; sdInitrdGidsAreUnique = idsAreUnique (filterAttrs (n: g: g.gid != null) config.boot.initrd.systemd.groups) "gid"; + groupNames = lib.mapAttrsToList (n: g: g.name) cfg.groups; + usersWithoutExistingGroup = lib.filterAttrs (n: u: !lib.elem u.group groupNames) cfg.users; spec = pkgs.writeText "users-groups.json" (builtins.toJSON { inherit (cfg) mutableUsers; users = mapAttrsToList (_: u: { inherit (u) name uid group description home homeMode createHome isSystemUser - password passwordFile hashedPassword + password hashedPasswordFile hashedPassword autoSubUidGidRange subUidRanges subGidRanges - initialPassword initialHashedPassword; + initialPassword initialHashedPassword expires; shell = utils.toShellPath u.shell; }) cfg.users; groups = attrValues cfg.groups; @@ -681,6 +702,7 @@ in { environment.profiles = [ "$HOME/.nix-profile" + "\${XDG_STATE_HOME:-$HOME/.local/state}/nix/profile" "/etc/profiles/per-user/$USER" ]; @@ -730,6 +752,18 @@ in { { assertion = !cfg.enforceIdUniqueness || (sdInitrdUidsAreUnique && sdInitrdGidsAreUnique); message = "systemd initrd UIDs and GIDs must be unique!"; } + { assertion = usersWithoutExistingGroup == {}; + message = + let + errUsers = lib.attrNames usersWithoutExistingGroup; + missingGroups = lib.unique (lib.mapAttrsToList (n: u: u.group) usersWithoutExistingGroup); + mkConfigHint = group: "users.groups.${group} = {};"; + in '' + The following users have a primary group that is undefined: ${lib.concatStringsSep " " errUsers} + Hint: Add this to your NixOS configuration: + ${lib.concatStringsSep "\n " (map mkConfigHint missingGroups)} + ''; + } { # If mutableUsers is false, to prevent users creating a # configuration that locks them out of the system, ensure that # there is at least one "privileged" account that has a @@ -745,7 +779,7 @@ in { && (allowsLogin cfg.hashedPassword || cfg.password != null - || cfg.passwordFile != null + || cfg.hashedPasswordFile != null || cfg.openssh.authorizedKeys.keys != [] || cfg.openssh.authorizedKeys.keyFiles != []) ) cfg.users ++ [ @@ -834,9 +868,13 @@ in { The password hash of user "${user.name}" may be invalid. You must set a valid hash or the user will be locked out of their account. Please check the value of option `users.users."${user.name}".hashedPassword`.'' - else null - )); - + else null) + ++ flip mapAttrsToList cfg.users (name: user: + if user.passwordFile != null then + ''The option `users.users."${name}".passwordFile' has been renamed '' + + ''to `users.users."${name}".hashedPasswordFile'.'' + else null) + ); }; } diff --git a/third_party/nixpkgs/nixos/modules/config/zram.nix b/third_party/nixpkgs/nixos/modules/config/zram.nix index 991387ea9b..ec8b4ed6e9 100644 --- a/third_party/nixpkgs/nixos/modules/config/zram.nix +++ b/third_party/nixpkgs/nixos/modules/config/zram.nix @@ -105,36 +105,25 @@ in } ]; + services.zram-generator.enable = true; - system.requiredKernelConfig = with config.lib.kernelConfig; [ - (isModule "ZRAM") - ]; - - # Disabling this for the moment, as it would create and mkswap devices twice, - # once in stage 2 boot, and again when the zram-reloader service starts. - # boot.kernelModules = [ "zram" ]; - - systemd.packages = [ pkgs.zram-generator ]; - systemd.services."systemd-zram-setup@".path = [ pkgs.util-linux ]; # for mkswap - - environment.etc."systemd/zram-generator.conf".source = - (pkgs.formats.ini { }).generate "zram-generator.conf" (lib.listToAttrs - (builtins.map - (dev: { - name = dev; - value = - let - size = "${toString cfg.memoryPercent} / 100 * ram"; - in - { - zram-size = if cfg.memoryMax != null then "min(${size}, ${toString cfg.memoryMax} / 1024 / 1024)" else size; - compression-algorithm = cfg.algorithm; - swap-priority = cfg.priority; - } // lib.optionalAttrs (cfg.writebackDevice != null) { - writeback-device = cfg.writebackDevice; - }; - }) - devices)); + services.zram-generator.settings = lib.listToAttrs + (builtins.map + (dev: { + name = dev; + value = + let + size = "${toString cfg.memoryPercent} / 100 * ram"; + in + { + zram-size = if cfg.memoryMax != null then "min(${size}, ${toString cfg.memoryMax} / 1024 / 1024)" else size; + compression-algorithm = cfg.algorithm; + swap-priority = cfg.priority; + } // lib.optionalAttrs (cfg.writebackDevice != null) { + writeback-device = cfg.writebackDevice; + }; + }) + devices); }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix index 9e7a01c58a..08141bb0e8 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix @@ -69,7 +69,7 @@ in { }) (mkIf cfg.enableAllFirmware { assertions = [{ - assertion = !cfg.enableAllFirmware || config.nixpkgs.config.allowUnfree; + assertion = !cfg.enableAllFirmware || pkgs.config.allowUnfree; message = '' the list of hardware.enableAllFirmware contains non-redistributable licensed firmware files. This requires nixpkgs.config.allowUnfree to be true. diff --git a/third_party/nixpkgs/nixos/modules/hardware/cpu/amd-sev.nix b/third_party/nixpkgs/nixos/modules/hardware/cpu/amd-sev.nix index 28ee07f005..08e1de4963 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/cpu/amd-sev.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/cpu/amd-sev.nix @@ -1,37 +1,43 @@ -{ config, lib, ... }: +{ config, options, lib, ... }: with lib; let - cfg = config.hardware.cpu.amd.sev; - defaultGroup = "sev"; -in - with lib; { - options.hardware.cpu.amd.sev = { - enable = mkEnableOption (lib.mdDoc "access to the AMD SEV device"); - user = mkOption { - description = lib.mdDoc "Owner to assign to the SEV device."; - type = types.str; - default = "root"; - }; - group = mkOption { - description = lib.mdDoc "Group to assign to the SEV device."; - type = types.str; - default = defaultGroup; - }; - mode = mkOption { - description = lib.mdDoc "Mode to set for the SEV device."; - type = types.str; - default = "0660"; - }; - }; + cfgSev = config.hardware.cpu.amd.sev; + cfgSevGuest = config.hardware.cpu.amd.sevGuest; - config = mkIf cfg.enable { + optionsFor = device: group: { + enable = mkEnableOption (lib.mdDoc "access to the AMD ${device} device"); + user = mkOption { + description = lib.mdDoc "Owner to assign to the ${device} device."; + type = types.str; + default = "root"; + }; + group = mkOption { + description = lib.mdDoc "Group to assign to the ${device} device."; + type = types.str; + default = group; + }; + mode = mkOption { + description = lib.mdDoc "Mode to set for the ${device} device."; + type = types.str; + default = "0660"; + }; + }; +in +with lib; { + options.hardware.cpu.amd.sev = optionsFor "SEV" "sev"; + + options.hardware.cpu.amd.sevGuest = optionsFor "SEV guest" "sev-guest"; + + config = mkMerge [ + # /dev/sev + (mkIf cfgSev.enable { assertions = [ { - assertion = hasAttr cfg.user config.users.users; + assertion = hasAttr cfgSev.user config.users.users; message = "Given user does not exist"; } { - assertion = (cfg.group == defaultGroup) || (hasAttr cfg.group config.users.groups); + assertion = (cfgSev.group == options.hardware.cpu.amd.sev.group.default) || (hasAttr cfgSev.group config.users.groups); message = "Given group does not exist"; } ]; @@ -40,12 +46,35 @@ in options kvm_amd sev=1 ''; - users.groups = optionalAttrs (cfg.group == defaultGroup) { - "${cfg.group}" = {}; + users.groups = optionalAttrs (cfgSev.group == options.hardware.cpu.amd.sev.group.default) { + "${cfgSev.group}" = { }; }; - services.udev.extraRules = with cfg; '' + services.udev.extraRules = with cfgSev; '' KERNEL=="sev", OWNER="${user}", GROUP="${group}", MODE="${mode}" ''; - }; - } + }) + + # /dev/sev-guest + (mkIf cfgSevGuest.enable { + assertions = [ + { + assertion = hasAttr cfgSevGuest.user config.users.users; + message = "Given user does not exist"; + } + { + assertion = (cfgSevGuest.group == options.hardware.cpu.amd.sevGuest.group.default) || (hasAttr cfgSevGuest.group config.users.groups); + message = "Given group does not exist"; + } + ]; + + users.groups = optionalAttrs (cfgSevGuest.group == options.hardware.cpu.amd.sevGuest.group.default) { + "${cfgSevGuest.group}" = { }; + }; + + services.udev.extraRules = with cfgSevGuest; '' + KERNEL=="sev-guest", OWNER="${user}", GROUP="${group}", MODE="${mode}" + ''; + }) + ]; +} diff --git a/third_party/nixpkgs/nixos/modules/hardware/decklink.nix b/third_party/nixpkgs/nixos/modules/hardware/decklink.nix new file mode 100644 index 0000000000..d179e1d763 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/hardware/decklink.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.hardware.decklink; + kernelPackages = config.boot.kernelPackages; +in +{ + options.hardware.decklink.enable = lib.mkEnableOption "hardware support for the Blackmagic Design Decklink audio/video interfaces"; + + config = lib.mkIf cfg.enable { + boot.kernelModules = [ "blackmagic" "blackmagic-io" "snd_blackmagic-io" ]; + boot.extraModulePackages = [ kernelPackages.decklink ]; + systemd.packages = [ pkgs.blackmagic-desktop-video ]; + systemd.services.DesktopVideoHelper.wantedBy = [ "multi-user.target" ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix b/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix index c568f52ab6..6ab13c0eb7 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix @@ -66,36 +66,32 @@ let }; filterDTBs = src: if cfg.filter == null - then "${src}/dtbs" + then src else pkgs.runCommand "dtbs-filtered" {} '' mkdir -p $out - cd ${src}/dtbs + cd ${src} find . -type f -name '${cfg.filter}' -print0 \ | xargs -0 cp -v --no-preserve=mode --target-directory $out --parents ''; - filteredDTBs = filterDTBs cfg.kernelPackage; - - # Compile single Device Tree overlay source - # file (.dts) into its compiled variant (.dtbo) - compileDTS = name: f: pkgs.callPackage({ stdenv, dtc }: stdenv.mkDerivation { - name = "${name}-dtbo"; - - nativeBuildInputs = [ dtc ]; - - buildCommand = '' - $CC -E -nostdinc -I${getDev cfg.kernelPackage}/lib/modules/${cfg.kernelPackage.modDirVersion}/source/scripts/dtc/include-prefixes -undef -D__DTS__ -x assembler-with-cpp ${f} | \ - dtc -I dts -O dtb -@ -o $out - ''; - }) {}; + filteredDTBs = filterDTBs cfg.dtbSource; # Fill in `dtboFile` for each overlay if not set already. # Existence of one of these is guarded by assertion below withDTBOs = xs: flip map xs (o: o // { dtboFile = + let + includePaths = ["${getDev cfg.kernelPackage}/lib/modules/${cfg.kernelPackage.modDirVersion}/source/scripts/dtc/include-prefixes"] ++ cfg.dtboBuildExtraIncludePaths; + extraPreprocessorFlags = cfg.dtboBuildExtraPreprocessorFlags; + in if o.dtboFile == null then - if o.dtsFile != null then compileDTS o.name o.dtsFile - else compileDTS o.name (pkgs.writeText "dts" o.dtsText) + let + dtsFile = if o.dtsFile == null then (pkgs.writeText "dts" o.dtsText) else o.dtsFile; + in + pkgs.deviceTree.compileDTS { + name = "${o.name}-dtbo"; + inherit includePaths extraPreprocessorFlags dtsFile; + } else o.dtboFile; } ); in @@ -121,7 +117,39 @@ in example = literalExpression "pkgs.linux_latest"; type = types.path; description = lib.mdDoc '' - Kernel package containing the base device-tree (.dtb) to boot. Uses + Kernel package where device tree include directory is from. Also used as default source of dtb package to apply overlays to + ''; + }; + + dtboBuildExtraPreprocessorFlags = mkOption { + default = []; + example = literalExpression "[ \"-DMY_DTB_DEFINE\" ]"; + type = types.listOf types.str; + description = lib.mdDoc '' + Additional flags to pass to the preprocessor during dtbo compilations + ''; + }; + + dtboBuildExtraIncludePaths = mkOption { + default = []; + example = literalExpression '' + [ + ./my_custom_include_dir_1 + ./custom_include_dir_2 + ] + ''; + type = types.listOf types.path; + description = lib.mdDoc '' + Additional include paths that will be passed to the preprocessor when creating the final .dts to compile into .dtbo + ''; + }; + + dtbSource = mkOption { + default = "${cfg.kernelPackage}/dtbs"; + defaultText = literalExpression "\${cfg.kernelPackage}/dtbs"; + type = types.path; + description = lib.mdDoc '' + Path to dtb directory that overlays and other processing will be applied to. Uses device trees bundled with the Linux kernel by default. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/glasgow.nix b/third_party/nixpkgs/nixos/modules/hardware/glasgow.nix new file mode 100644 index 0000000000..f8ebb772c4 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/hardware/glasgow.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.hardware.glasgow; + +in +{ + options.hardware.glasgow = { + enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Enables Glasgow udev rules and ensures 'plugdev' group exists. + This is a prerequisite to using Glasgow without being root. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + services.udev.packages = [ pkgs.glasgow ]; + users.groups.plugdev = { }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/hardware/infiniband.nix b/third_party/nixpkgs/nixos/modules/hardware/infiniband.nix new file mode 100644 index 0000000000..962883fa79 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/hardware/infiniband.nix @@ -0,0 +1,58 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.hardware.infiniband; + opensm-services = { + "opensm@" = { + enable = true; + description = "Starts OpenSM Infiniband fabric Subnet Managers"; + before = [ "network.target"]; + unitConfig = { + ConditionPathExists = "/sys/class/infiniband_mad/abi_version"; + }; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.opensm}/bin/opensm --guid %I --log_file /var/log/opensm.%I.log"; + }; + }; + } // (builtins.listToAttrs (map (guid: { + name = "opensm@${guid}"; + value = { + enable = true; + wantedBy = [ "machines.target" ]; + overrideStrategy = "asDropin"; + }; + } ) cfg.guids)); + +in + +{ + options.hardware.infiniband = { + enable = mkEnableOption "Infiniband support"; + guids = mkOption { + type = with types; listOf str; + default = []; + example = [ "0xe8ebd30000eee2e1" ]; + description = lib.mdDoc '' + A list of infiniband port guids on the system. This is discoverable using `ibstat -p` + ''; + }; + }; + + config = mkIf cfg.enable { + boot.initrd.kernelModules = [ + "mlx5_core" "mlx5_ib" "ib_cm" + "rdma_cm" "rdma_ucm" "rpcrdma" + "ib_ipoib" "ib_isert" "ib_umad" "ib_uverbs" + ]; + # rdma-core exposes ibstat, mstflint exposes mstconfig (which can be needed for + # setting link configurations), qperf needed to affirm link speeds + environment.systemPackages = with pkgs; [ + rdma-core mstflint qperf + ]; + systemd.services = opensm-services; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/amdgpu-pro.nix b/third_party/nixpkgs/nixos/modules/hardware/video/amdgpu-pro.nix index 299a30b062..605aa6ef8b 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/amdgpu-pro.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/amdgpu-pro.nix @@ -20,9 +20,6 @@ in { config = mkIf enabled { - - nixpkgs.config.xorg.abiCompat = "1.20"; - services.xserver.drivers = singleton { name = "amdgpu"; modules = [ package ]; display = true; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix index 67c3afcf32..a40713ac25 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix @@ -4,8 +4,9 @@ pkgs, ... }: let + nvidiaEnabled = (lib.elem "nvidia" config.services.xserver.videoDrivers); nvidia_x11 = - if (lib.elem "nvidia" config.services.xserver.videoDrivers) + if nvidiaEnabled || cfg.datacenter.enable then cfg.package else null; @@ -18,9 +19,64 @@ primeEnabled = syncCfg.enable || reverseSyncCfg.enable || offloadCfg.enable; busIDType = lib.types.strMatching "([[:print:]]+[\:\@][0-9]{1,3}\:[0-9]{1,2}\:[0-9])?"; ibtSupport = cfg.open || (nvidia_x11.ibtSupport or false); + settingsFormat = pkgs.formats.keyValue {}; in { options = { hardware.nvidia = { + datacenter.enable = lib.mkEnableOption (lib.mdDoc '' + Data Center drivers for NVIDIA cards on a NVLink topology. + ''); + datacenter.settings = lib.mkOption { + type = settingsFormat.type; + default = { + LOG_LEVEL=4; + LOG_FILE_NAME="/var/log/fabricmanager.log"; + LOG_APPEND_TO_LOG=1; + LOG_FILE_MAX_SIZE=1024; + LOG_USE_SYSLOG=0; + DAEMONIZE=1; + BIND_INTERFACE_IP="127.0.0.1"; + STARTING_TCP_PORT=16000; + FABRIC_MODE=0; + FABRIC_MODE_RESTART=0; + STATE_FILE_NAME="/var/tmp/fabricmanager.state"; + FM_CMD_BIND_INTERFACE="127.0.0.1"; + FM_CMD_PORT_NUMBER=6666; + FM_STAY_RESIDENT_ON_FAILURES=0; + ACCESS_LINK_FAILURE_MODE=0; + TRUNK_LINK_FAILURE_MODE=0; + NVSWITCH_FAILURE_MODE=0; + ABORT_CUDA_JOBS_ON_FM_EXIT=1; + TOPOLOGY_FILE_PATH=nvidia_x11.fabricmanager + "/share/nvidia-fabricmanager/nvidia/nvswitch"; + }; + defaultText = lib.literalExpression '' + { + LOG_LEVEL=4; + LOG_FILE_NAME="/var/log/fabricmanager.log"; + LOG_APPEND_TO_LOG=1; + LOG_FILE_MAX_SIZE=1024; + LOG_USE_SYSLOG=0; + DAEMONIZE=1; + BIND_INTERFACE_IP="127.0.0.1"; + STARTING_TCP_PORT=16000; + FABRIC_MODE=0; + FABRIC_MODE_RESTART=0; + STATE_FILE_NAME="/var/tmp/fabricmanager.state"; + FM_CMD_BIND_INTERFACE="127.0.0.1"; + FM_CMD_PORT_NUMBER=6666; + FM_STAY_RESIDENT_ON_FAILURES=0; + ACCESS_LINK_FAILURE_MODE=0; + TRUNK_LINK_FAILURE_MODE=0; + NVSWITCH_FAILURE_MODE=0; + ABORT_CUDA_JOBS_ON_FM_EXIT=1; + TOPOLOGY_FILE_PATH=nvidia_x11.fabricmanager + "/share/nvidia-fabricmanager/nvidia/nvswitch"; + } + ''; + description = lib.mdDoc '' + Additional configuration options for fabricmanager. + ''; + }; + powerManagement.enable = lib.mkEnableOption (lib.mdDoc '' experimental power management through systemd. For more information, see the NVIDIA docs, on Chapter 21. Configuring Power Management Support. @@ -167,9 +223,15 @@ in { It also drastically increases the time the driver needs to clock down after load. ''); - package = lib.mkPackageOptionMD config.boot.kernelPackages.nvidiaPackages "nvidia_x11" { - default = "stable"; + package = lib.mkOption { + default = config.boot.kernelPackages.nvidiaPackages."${if cfg.datacenter.enable then "dc" else "stable"}"; + defaultText = lib.literalExpression '' + config.boot.kernelPackages.nvidiaPackages."\$\{if cfg.datacenter.enable then "dc" else "stable"}" + ''; example = lib.mdDoc "config.boot.kernelPackages.nvidiaPackages.legacy_470"; + description = lib.mdDoc '' + The NVIDIA driver package to use. + ''; }; open = lib.mkEnableOption (lib.mdDoc '' @@ -188,8 +250,46 @@ in { then pCfg.intelBusId else pCfg.amdgpuBusId; in - lib.mkIf (nvidia_x11 != null) { - assertions = [ + lib.mkIf (nvidia_x11 != null) (lib.mkMerge [ + # Common + ({ + assertions = [ + { + assertion = !(nvidiaEnabled && cfg.datacenter.enable); + message = "You cannot configure both X11 and Data Center drivers at the same time."; + } + ]; + boot = { + blacklistedKernelModules = ["nouveau" "nvidiafb"]; + kernelModules = [ "nvidia-uvm" ]; + }; + systemd.tmpfiles.rules = + lib.optional config.virtualisation.docker.enableNvidia + "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin"; + services.udev.extraRules = + '' + # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. + KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'" + KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do mknod -m 666 /dev/nvidia$${i} c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) $${i}; done'" + KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'" + KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" + KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'" + ''; + hardware.opengl = { + extraPackages = [ + nvidia_x11.out + ]; + extraPackages32 = [ + nvidia_x11.lib32 + ]; + }; + environment.systemPackages = [ + nvidia_x11.bin + ]; + }) + # X11 + (lib.mkIf nvidiaEnabled { + assertions = [ { assertion = primeEnabled -> pCfg.intelBusId == "" || pCfg.amdgpuBusId == ""; message = "You cannot configure both an Intel iGPU and an AMD APU. Pick the one corresponding to your processor."; @@ -248,227 +348,207 @@ in { { assertion = cfg.dynamicBoost.enable -> lib.versionAtLeast nvidia_x11.version "510.39.01"; message = "NVIDIA's Dynamic Boost feature only exists on versions >= 510.39.01"; - } - ]; + }]; - # If Optimus/PRIME is enabled, we: - # - Specify the configured NVIDIA GPU bus ID in the Device section for the - # "nvidia" driver. - # - Add the AllowEmptyInitialConfiguration option to the Screen section for the - # "nvidia" driver, in order to allow the X server to start without any outputs. - # - Add a separate Device section for the Intel GPU, using the "modesetting" - # driver and with the configured BusID. - # - OR add a separate Device section for the AMD APU, using the "amdgpu" - # driver and with the configures BusID. - # - Reference that Device section from the ServerLayout section as an inactive - # device. - # - Configure the display manager to run specific `xrandr` commands which will - # configure/enable displays connected to the Intel iGPU / AMD APU. + # If Optimus/PRIME is enabled, we: + # - Specify the configured NVIDIA GPU bus ID in the Device section for the + # "nvidia" driver. + # - Add the AllowEmptyInitialConfiguration option to the Screen section for the + # "nvidia" driver, in order to allow the X server to start without any outputs. + # - Add a separate Device section for the Intel GPU, using the "modesetting" + # driver and with the configured BusID. + # - OR add a separate Device section for the AMD APU, using the "amdgpu" + # driver and with the configures BusID. + # - Reference that Device section from the ServerLayout section as an inactive + # device. + # - Configure the display manager to run specific `xrandr` commands which will + # configure/enable displays connected to the Intel iGPU / AMD APU. - # reverse sync implies offloading - hardware.nvidia.prime.offload.enable = lib.mkDefault reverseSyncCfg.enable; + # reverse sync implies offloading + hardware.nvidia.prime.offload.enable = lib.mkDefault reverseSyncCfg.enable; - services.xserver.drivers = - lib.optional primeEnabled { - name = igpuDriver; - display = offloadCfg.enable; - modules = lib.optional (igpuDriver == "amdgpu") pkgs.xorg.xf86videoamdgpu; - deviceSection = - '' - BusID "${igpuBusId}" - '' - + lib.optionalString (syncCfg.enable && igpuDriver != "amdgpu") '' - Option "AccelMethod" "none" - ''; - } - ++ lib.singleton { - name = "nvidia"; - modules = [nvidia_x11.bin]; - display = !offloadCfg.enable; - deviceSection = - lib.optionalString primeEnabled - '' - BusID "${pCfg.nvidiaBusId}" - '' - + lib.optionalString pCfg.allowExternalGpu '' - Option "AllowExternalGpus" - ''; - screenSection = - '' - Option "RandRRotation" "on" - '' - + lib.optionalString syncCfg.enable '' - Option "AllowEmptyInitialConfiguration" - '' - + lib.optionalString cfg.forceFullCompositionPipeline '' - Option "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}" - Option "AllowIndirectGLXProtocol" "off" - Option "TripleBuffer" "on" - ''; - }; - - services.xserver.serverLayoutSection = - lib.optionalString syncCfg.enable '' - Inactive "Device-${igpuDriver}[0]" - '' - + lib.optionalString reverseSyncCfg.enable '' - Inactive "Device-nvidia[0]" - '' - + lib.optionalString offloadCfg.enable '' - Option "AllowNVIDIAGPUScreens" - ''; - - services.xserver.displayManager.setupCommands = let - gpuProviderName = - if igpuDriver == "amdgpu" - then - # find the name of the provider if amdgpu - "`${lib.getExe pkgs.xorg.xrandr} --listproviders | ${lib.getExe pkgs.gnugrep} -i AMD | ${lib.getExe pkgs.gnused} -n 's/^.*name://p'`" - else igpuDriver; - providerCmdParams = - if syncCfg.enable - then "\"${gpuProviderName}\" NVIDIA-0" - else "NVIDIA-G0 \"${gpuProviderName}\""; - in - lib.optionalString (syncCfg.enable || reverseSyncCfg.enable) '' - # Added by nvidia configuration module for Optimus/PRIME. - ${lib.getExe pkgs.xorg.xrandr} --setprovideroutputsource ${providerCmdParams} - ${lib.getExe pkgs.xorg.xrandr} --auto - ''; - - environment.etc = { - "nvidia/nvidia-application-profiles-rc" = lib.mkIf nvidia_x11.useProfiles {source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc";}; - - # 'nvidia_x11' installs it's files to /run/opengl-driver/... - "egl/egl_external_platform.d".source = "/run/opengl-driver/share/egl/egl_external_platform.d/"; - }; - - hardware.opengl = { - extraPackages = [ - nvidia_x11.out - pkgs.nvidia-vaapi-driver - ]; - extraPackages32 = [ - nvidia_x11.lib32 - pkgs.pkgsi686Linux.nvidia-vaapi-driver - ]; - }; - environment.systemPackages = - [nvidia_x11.bin] - ++ lib.optional cfg.nvidiaSettings nvidia_x11.settings - ++ lib.optional cfg.nvidiaPersistenced nvidia_x11.persistenced - ++ lib.optional offloadCfg.enableOffloadCmd - (pkgs.writeShellScriptBin "nvidia-offload" '' - export __NV_PRIME_RENDER_OFFLOAD=1 - export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 - export __GLX_VENDOR_LIBRARY_NAME=nvidia - export __VK_LAYER_NV_optimus=NVIDIA_only - exec "$@" - ''); - - systemd.packages = lib.optional cfg.powerManagement.enable nvidia_x11.out; - - systemd.services = let - nvidiaService = state: { - description = "NVIDIA system ${state} actions"; - path = [pkgs.kbd]; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${nvidia_x11.out}/bin/nvidia-sleep.sh '${state}'"; + services.xserver.drivers = + lib.optional primeEnabled { + name = igpuDriver; + display = offloadCfg.enable; + modules = lib.optional (igpuDriver == "amdgpu") pkgs.xorg.xf86videoamdgpu; + deviceSection = + '' + BusID "${igpuBusId}" + '' + + lib.optionalString (syncCfg.enable && igpuDriver != "amdgpu") '' + Option "AccelMethod" "none" + ''; + } + ++ lib.singleton { + name = "nvidia"; + modules = [nvidia_x11.bin]; + display = !offloadCfg.enable; + deviceSection = + lib.optionalString primeEnabled + '' + BusID "${pCfg.nvidiaBusId}" + '' + + lib.optionalString pCfg.allowExternalGpu '' + Option "AllowExternalGpus" + ''; + screenSection = + '' + Option "RandRRotation" "on" + '' + + lib.optionalString syncCfg.enable '' + Option "AllowEmptyInitialConfiguration" + '' + + lib.optionalString cfg.forceFullCompositionPipeline '' + Option "metamodes" "nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}" + Option "AllowIndirectGLXProtocol" "off" + Option "TripleBuffer" "on" + ''; }; - before = ["systemd-${state}.service"]; - requiredBy = ["systemd-${state}.service"]; + + services.xserver.serverLayoutSection = + lib.optionalString syncCfg.enable '' + Inactive "Device-${igpuDriver}[0]" + '' + + lib.optionalString reverseSyncCfg.enable '' + Inactive "Device-nvidia[0]" + '' + + lib.optionalString offloadCfg.enable '' + Option "AllowNVIDIAGPUScreens" + ''; + + services.xserver.displayManager.setupCommands = let + gpuProviderName = + if igpuDriver == "amdgpu" + then + # find the name of the provider if amdgpu + "`${lib.getExe pkgs.xorg.xrandr} --listproviders | ${lib.getExe pkgs.gnugrep} -i AMD | ${lib.getExe pkgs.gnused} -n 's/^.*name://p'`" + else igpuDriver; + providerCmdParams = + if syncCfg.enable + then "\"${gpuProviderName}\" NVIDIA-0" + else "NVIDIA-G0 \"${gpuProviderName}\""; + in + lib.optionalString (syncCfg.enable || reverseSyncCfg.enable) '' + # Added by nvidia configuration module for Optimus/PRIME. + ${lib.getExe pkgs.xorg.xrandr} --setprovideroutputsource ${providerCmdParams} + ${lib.getExe pkgs.xorg.xrandr} --auto + ''; + + environment.etc = { + "nvidia/nvidia-application-profiles-rc" = lib.mkIf nvidia_x11.useProfiles {source = "${nvidia_x11.bin}/share/nvidia/nvidia-application-profiles-rc";}; + + # 'nvidia_x11' installs it's files to /run/opengl-driver/... + "egl/egl_external_platform.d".source = "/run/opengl-driver/share/egl/egl_external_platform.d/"; }; - in - lib.mkMerge [ - (lib.mkIf cfg.powerManagement.enable { - nvidia-suspend = nvidiaService "suspend"; - nvidia-hibernate = nvidiaService "hibernate"; - nvidia-resume = - (nvidiaService "resume") - // { - before = []; - after = ["systemd-suspend.service" "systemd-hibernate.service"]; - requiredBy = ["systemd-suspend.service" "systemd-hibernate.service"]; - }; - }) - (lib.mkIf cfg.nvidiaPersistenced { - "nvidia-persistenced" = { - description = "NVIDIA Persistence Daemon"; - wantedBy = ["multi-user.target"]; - serviceConfig = { - Type = "forking"; - Restart = "always"; - PIDFile = "/var/run/nvidia-persistenced/nvidia-persistenced.pid"; - ExecStart = "${lib.getExe nvidia_x11.persistenced} --verbose"; - ExecStopPost = "${pkgs.coreutils}/bin/rm -rf /var/run/nvidia-persistenced"; - }; + + hardware.opengl = { + extraPackages = [ + pkgs.nvidia-vaapi-driver + ]; + extraPackages32 = [ + pkgs.pkgsi686Linux.nvidia-vaapi-driver + ]; + }; + environment.systemPackages = + lib.optional cfg.nvidiaSettings nvidia_x11.settings + ++ lib.optional cfg.nvidiaPersistenced nvidia_x11.persistenced + ++ lib.optional offloadCfg.enableOffloadCmd + (pkgs.writeShellScriptBin "nvidia-offload" '' + export __NV_PRIME_RENDER_OFFLOAD=1 + export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 + export __GLX_VENDOR_LIBRARY_NAME=nvidia + export __VK_LAYER_NV_optimus=NVIDIA_only + exec "$@" + ''); + + systemd.packages = lib.optional cfg.powerManagement.enable nvidia_x11.out; + + systemd.services = let + nvidiaService = state: { + description = "NVIDIA system ${state} actions"; + path = [pkgs.kbd]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${nvidia_x11.out}/bin/nvidia-sleep.sh '${state}'"; }; - }) - (lib.mkIf cfg.dynamicBoost.enable { - "nvidia-powerd" = { - description = "nvidia-powerd service"; - path = [ - pkgs.util-linux # nvidia-powerd wants lscpu - ]; - wantedBy = ["multi-user.target"]; - serviceConfig = { - Type = "dbus"; - BusName = "nvidia.powerd.server"; - ExecStart = "${nvidia_x11.bin}/bin/nvidia-powerd"; + before = ["systemd-${state}.service"]; + requiredBy = ["systemd-${state}.service"]; + }; + in + lib.mkMerge [ + (lib.mkIf cfg.powerManagement.enable { + nvidia-suspend = nvidiaService "suspend"; + nvidia-hibernate = nvidiaService "hibernate"; + nvidia-resume = + (nvidiaService "resume") + // { + before = []; + after = ["systemd-suspend.service" "systemd-hibernate.service"]; + requiredBy = ["systemd-suspend.service" "systemd-hibernate.service"]; + }; + }) + (lib.mkIf cfg.nvidiaPersistenced { + "nvidia-persistenced" = { + description = "NVIDIA Persistence Daemon"; + wantedBy = ["multi-user.target"]; + serviceConfig = { + Type = "forking"; + Restart = "always"; + PIDFile = "/var/run/nvidia-persistenced/nvidia-persistenced.pid"; + ExecStart = "${lib.getExe nvidia_x11.persistenced} --verbose"; + ExecStopPost = "${pkgs.coreutils}/bin/rm -rf /var/run/nvidia-persistenced"; + }; }; - }; - }) - ]; + }) + (lib.mkIf cfg.dynamicBoost.enable { + "nvidia-powerd" = { + description = "nvidia-powerd service"; + path = [ + pkgs.util-linux # nvidia-powerd wants lscpu + ]; + wantedBy = ["multi-user.target"]; + serviceConfig = { + Type = "dbus"; + BusName = "nvidia.powerd.server"; + ExecStart = "${nvidia_x11.bin}/bin/nvidia-powerd"; + }; + }; + }) + ]; + services.acpid.enable = true; - services.acpid.enable = true; + services.dbus.packages = lib.optional cfg.dynamicBoost.enable nvidia_x11.bin; - services.dbus.packages = lib.optional cfg.dynamicBoost.enable nvidia_x11.bin; + hardware.firmware = lib.optional cfg.open nvidia_x11.firmware; - hardware.firmware = lib.optional cfg.open nvidia_x11.firmware; + systemd.tmpfiles.rules = + lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia) + "L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced"; - systemd.tmpfiles.rules = - lib.optional config.virtualisation.docker.enableNvidia - "L+ /run/nvidia-docker/bin - - - - ${nvidia_x11.bin}/origBin" - ++ lib.optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia) - "L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced"; + boot = { + extraModulePackages = + if cfg.open + then [nvidia_x11.open] + else [nvidia_x11.bin]; + # nvidia-uvm is required by CUDA applications. + kernelModules = + lib.optionals config.services.xserver.enable ["nvidia" "nvidia_modeset" "nvidia_drm"]; - boot = { - blacklistedKernelModules = ["nouveau" "nvidiafb"]; + # If requested enable modesetting via kernel parameter. + kernelParams = + lib.optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1" + ++ lib.optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1" + ++ lib.optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1" + ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport) "ibt=off"; - extraModulePackages = - if cfg.open - then [nvidia_x11.open] - else [nvidia_x11.bin]; - - # nvidia-uvm is required by CUDA applications. - kernelModules = - ["nvidia-uvm"] - ++ lib.optionals config.services.xserver.enable ["nvidia" "nvidia_modeset" "nvidia_drm"]; - - # If requested enable modesetting via kernel parameter. - kernelParams = - lib.optional (offloadCfg.enable || cfg.modesetting.enable) "nvidia-drm.modeset=1" - ++ lib.optional cfg.powerManagement.enable "nvidia.NVreg_PreserveVideoMemoryAllocations=1" - ++ lib.optional cfg.open "nvidia.NVreg_OpenRmEnableUnsupportedGpus=1" - ++ lib.optional (config.boot.kernelPackages.kernel.kernelAtLeast "6.2" && !ibtSupport) "ibt=off"; - - # enable finegrained power management - extraModprobeConfig = lib.optionalString cfg.powerManagement.finegrained '' - options nvidia "NVreg_DynamicPowerManagement=0x02" - ''; - }; - - services.udev.extraRules = - '' - # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. - KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'" - KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do mknod -m 666 /dev/nvidia$${i} c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) $${i}; done'" - KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'" - KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" - KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'" - '' - + lib.optionalString cfg.powerManagement.finegrained ( + # enable finegrained power management + extraModprobeConfig = lib.optionalString cfg.powerManagement.finegrained '' + options nvidia "NVreg_DynamicPowerManagement=0x02" + ''; + }; + services.udev.extraRules = + lib.optionalString cfg.powerManagement.finegrained ( lib.optionalString (lib.versionOlder config.boot.kernelPackages.kernel.version "5.5") '' # Remove NVIDIA USB xHCI Host Controller devices, if present ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{remove}="1" @@ -489,5 +569,30 @@ in { ACTION=="unbind", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x030200", TEST=="power/control", ATTR{power/control}="on" '' ); - }; + }) + # Data Center + (lib.mkIf (cfg.datacenter.enable) { + boot.extraModulePackages = [ + nvidia_x11.bin + ]; + systemd.services.nvidia-fabricmanager = { + enable = true; + description = "Start NVIDIA NVLink Management"; + wantedBy = [ "multi-user.target" ]; + unitConfig.After = [ "network-online.target" ]; + unitConfig.Requires = [ "network-online.target" ]; + serviceConfig = { + Type = "forking"; + TimeoutStartSec = 240; + ExecStart = let + nv-fab-conf = settingsFormat.generate "fabricmanager.conf" cfg.datacenter.settings; + in + nvidia_x11.fabricmanager + "/bin/nv-fabricmanager -c " + nv-fab-conf; + LimitCORE="infinity"; + }; + }; + environment.systemPackages = + lib.optional cfg.datacenter.enable nvidia_x11.fabricmanager; + }) + ]); } diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/uim.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/uim.nix index 9491ab2640..7225783b2a 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/uim.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/uim.nix @@ -10,7 +10,7 @@ in i18n.inputMethod.uim = { toolbar = mkOption { - type = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt4" ]; + type = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt5" ]; default = "gtk"; example = "gtk-systray"; description = lib.mdDoc '' diff --git a/third_party/nixpkgs/nixos/modules/image/repart.nix b/third_party/nixpkgs/nixos/modules/image/repart.nix index 4a0021e9a5..e567485c9d 100644 --- a/third_party/nixpkgs/nixos/modules/image/repart.nix +++ b/third_party/nixpkgs/nixos/modules/image/repart.nix @@ -188,6 +188,7 @@ in nativeBuildInputs = [ cfg.package pkgs.fakeroot + pkgs.util-linux ] ++ fileSystemTools; } '' amendedRepartDefinitions=$(${amendRepartDefinitions} ${partitions} ${definitionsDirectory}) @@ -195,7 +196,7 @@ in mkdir -p $out cd $out - fakeroot systemd-repart \ + unshare --map-root-user fakeroot systemd-repart \ --dry-run=no \ --empty=create \ --size=auto \ diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index ea8056ff87..573b31b439 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -6,7 +6,6 @@ imports = [ ./installation-cd-graphical-base.nix ]; isoImage.edition = "gnome"; - isoImage.graphicalGrub = true; services.xserver.desktopManager.gnome = { # Add Firefox and other tools useful for installation to the launcher diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix index c430048d65..0b5135c088 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix @@ -24,6 +24,9 @@ let # Name appended to menuentry defaults to params if no specific name given. option.name or (optionalString (option ? params) "(${option.params})") }' ${optionalString (option ? class) " --class ${option.class}"} { + # Fallback to UEFI console for boot, efifb sometimes has difficulties. + terminal_output console + linux ${defaults.image} \''${isoboot} ${defaults.params} ${ option.params or "" } @@ -185,33 +188,25 @@ let # So instead we'll list a lot of possibly valid modes :/ #"3840x2160" #"2560x1440" + "1920x1200" "1920x1080" "1366x768" + "1280x800" "1280x720" + "1200x1920" "1024x768" + "800x1280" "800x600" "auto" ]} - # Fonts can be loaded? - # (This font is assumed to always be provided as a fallback by NixOS) - if loadfont (\$root)/EFI/boot/unicode.pf2; then - set with_fonts=true - fi - if [ "\$textmode" != "true" -a "\$with_fonts" == "true" ]; then - # Use graphical term, it can be either with background image or a theme. - # input is "console", while output is "gfxterm". - # This enables "serial" input and output only when possible. - # Otherwise the failure mode is to not even enable gfxterm. - if test "\$with_serial" == "yes"; then - terminal_output gfxterm serial - terminal_input console serial - else - terminal_output gfxterm - terminal_input console - fi + if [ "\$textmode" == "false" ]; then + terminal_output gfxterm + terminal_input console else - # Sets colors for the non-graphical term. + terminal_output console + terminal_input console + # Sets colors for console term. set menu_color_normal=cyan/blue set menu_color_highlight=white/blue fi @@ -250,18 +245,58 @@ let touch $out/EFI/nixos-installer-image # ALWAYS required modules. - MODULES="fat iso9660 part_gpt part_msdos \ - normal boot linux configfile loopback chain halt \ - efifwsetup efi_gop \ - ls search search_label search_fs_uuid search_fs_file \ - gfxmenu gfxterm gfxterm_background gfxterm_menu test all_video loadenv \ - exfat ext2 ntfs btrfs hfsplus udf \ - videoinfo png \ - echo serial \ - " + MODULES=( + # Basic modules for filesystems and partition schemes + "fat" + "iso9660" + "part_gpt" + "part_msdos" + + # Basic stuff + "normal" + "boot" + "linux" + "configfile" + "loopback" + "chain" + "halt" + + # Allows rebooting into firmware setup interface + "efifwsetup" + + # EFI Graphics Output Protocol + "efi_gop" + + # User commands + "ls" + + # System commands + "search" + "search_label" + "search_fs_uuid" + "search_fs_file" + "echo" + + # We're not using it anymore, but we'll leave it in so it can be used + # by user, with the console using "C" + "serial" + + # Graphical mode stuff + "gfxmenu" + "gfxterm" + "gfxterm_background" + "gfxterm_menu" + "test" + "loadenv" + "all_video" + "videoinfo" + + # File types for graphical mode + "png" + ) echo "Building GRUB with modules:" - for mod in $MODULES; do + for mod in ''${MODULES[@]}; do echo " - $mod" done @@ -270,31 +305,27 @@ let for mod in efi_uga; do if [ -f ${grubPkgs.grub2_efi}/lib/grub/${grubPkgs.grub2_efi.grubTarget}/$mod.mod ]; then echo " - $mod" - MODULES+=" $mod" + MODULES+=("$mod") fi done # Make our own efi program, we can't rely on "grub-install" since it seems to # probe for devices, even with --skip-fs-probe. - grub-mkimage --directory=${grubPkgs.grub2_efi}/lib/grub/${grubPkgs.grub2_efi.grubTarget} -o $out/EFI/boot/boot${targetArch}.efi -p /EFI/boot -O ${grubPkgs.grub2_efi.grubTarget} \ - $MODULES + grub-mkimage \ + --directory=${grubPkgs.grub2_efi}/lib/grub/${grubPkgs.grub2_efi.grubTarget} \ + -o $out/EFI/boot/boot${targetArch}.efi \ + -p /EFI/boot \ + -O ${grubPkgs.grub2_efi.grubTarget} \ + ''${MODULES[@]} cp ${grubPkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/ cat < $out/EFI/boot/grub.cfg - set with_fonts=false - set textmode=${boolToString (!config.isoImage.graphicalGrub)} - # If you want to use serial for "terminal_*" commands, you need to set one up: - # Example manual configuration: - # → serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1 - # This uses the defaults, and makes the serial terminal available. - set with_serial=no - if serial; then set with_serial=yes ;fi - export with_serial - clear + set textmode=${boolToString (config.isoImage.forceTextMode)} set timeout=${toString grubEfiTimeout} - # This message will only be viewable when "gfxterm" is not used. + clear + # This message will only be viewable on the default (UEFI) console. echo "" echo "Loading graphical boot menu..." echo "" @@ -306,7 +337,7 @@ let hiddenentry 'Text mode' --hotkey 't' { loadfont (\$root)/EFI/boot/unicode.pf2 set textmode=true - terminal_output gfxterm console + terminal_output console } hiddenentry 'GUI mode' --hotkey 'g' { $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (\$root)/EFI/boot/grub-theme/%P\n") @@ -400,6 +431,8 @@ let } EOF + grub-script-check $out/EFI/boot/grub.cfg + ${refind} ''; @@ -658,13 +691,17 @@ in ''; }; - isoImage.graphicalGrub = mkOption { + isoImage.forceTextMode = mkOption { default = false; type = types.bool; example = true; description = lib.mdDoc '' - Whether to use textmode or graphical grub. - false means we use textmode grub. + Whether to use text mode instead of graphical grub. + A value of `true` means graphical mode is not tried to be used. + + This is useful for validating that graphics mode usage is not at the root cause of a problem with the iso image. + + If text mode is required off-handedly (e.g. for serial use) you can use the `T` key, after being prompted, to use text mode for the current boot. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix index 6564b58346..78bcbbe2db 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix @@ -134,8 +134,8 @@ in system.nixos-generate-config.configuration = mkDefault '' # Edit this configuration file to define what should be installed on - # your system. Help is available in the configuration.nix(5) man page - # and in the NixOS manual (accessible by running `nixos-help`). + # your system. Help is available in the configuration.nix(5) man page, on + # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). { config, lib, pkgs, ... }: diff --git a/third_party/nixpkgs/nixos/modules/misc/locate.nix b/third_party/nixpkgs/nixos/modules/misc/locate.nix index acf441cda6..3c76d17086 100644 --- a/third_party/nixpkgs/nixos/modules/misc/locate.nix +++ b/third_party/nixpkgs/nixos/modules/misc/locate.nix @@ -4,14 +4,15 @@ with lib; let cfg = config.services.locate; - isMLocate = hasPrefix "mlocate" cfg.locate.name; - isPLocate = hasPrefix "plocate" cfg.locate.name; - isMorPLocate = (isMLocate || isPLocate); - isFindutils = hasPrefix "findutils" cfg.locate.name; + isMLocate = hasPrefix "mlocate" cfg.package.name; + isPLocate = hasPrefix "plocate" cfg.package.name; + isMorPLocate = isMLocate || isPLocate; + isFindutils = hasPrefix "findutils" cfg.package.name; in { imports = [ (mkRenamedOptionModule [ "services" "locate" "period" ] [ "services" "locate" "interval" ]) + (mkRenamedOptionModule [ "services" "locate" "locate" ] [ "services" "locate" "package" ]) (mkRemovedOptionModule [ "services" "locate" "includeStore" ] "Use services.locate.prunePaths") ]; @@ -25,10 +26,10 @@ in ''; }; - locate = mkOption { + package = mkOption { type = package; default = pkgs.findutils.locate; - defaultText = literalExpression "pkgs.findutils"; + defaultText = literalExpression "pkgs.findutils.locate"; example = literalExpression "pkgs.mlocate"; description = lib.mdDoc '' The locate implementation to use @@ -216,25 +217,23 @@ in setgid = true; setuid = false; }; - mlocate = (mkIf isMLocate { + mlocate = mkIf isMLocate { group = "mlocate"; - source = "${cfg.locate}/bin/locate"; - }); - plocate = (mkIf isPLocate { + source = "${cfg.package}/bin/locate"; + }; + plocate = mkIf isPLocate { group = "plocate"; - source = "${cfg.locate}/bin/plocate"; - }); + source = "${cfg.package}/bin/plocate"; + }; in mkIf isMorPLocate { locate = mkMerge [ common mlocate plocate ]; - plocate = (mkIf isPLocate (mkMerge [ common plocate ])); + plocate = mkIf isPLocate (mkMerge [ common plocate ]); }; - nixpkgs.config = { locate.dbfile = cfg.output; }; + environment.systemPackages = [ cfg.package ]; - environment.systemPackages = [ cfg.locate ]; - - environment.variables = mkIf (!isMorPLocate) { LOCATE_PATH = cfg.output; }; + environment.variables.LOCATE_PATH = cfg.output; environment.etc = { # write /etc/updatedb.conf for manual calls to `updatedb` @@ -270,13 +269,13 @@ in args = concatLists (map toFlags [ "pruneFS" "pruneNames" "prunePaths" ]); in '' - exec ${cfg.locate}/bin/updatedb \ + exec ${cfg.package}/bin/updatedb \ --output ${toString cfg.output} ${concatStringsSep " " args} \ --prune-bind-mounts ${if cfg.pruneBindMounts then "yes" else "no"} \ ${concatStringsSep " " cfg.extraFlags} '' else '' - exec ${cfg.locate}/bin/updatedb \ + exec ${cfg.package}/bin/updatedb \ ${optionalString (cfg.localuser != null && !isMorPLocate) "--localuser=${cfg.localuser}"} \ --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags} ''; diff --git a/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix b/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix index f9d8bccea2..bfcae9c7a9 100644 --- a/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix +++ b/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix @@ -176,16 +176,12 @@ in ''; type = types.listOf overlayType; description = lib.mdDoc '' - List of overlays to use with the Nix Packages collection. - (For details, see the Nixpkgs documentation.) It allows - you to override packages globally. Each function in the list - takes as an argument the *original* Nixpkgs. - The first argument should be used for finding dependencies, and - the second should be used for overriding recipes. + List of overlays to apply to Nixpkgs. + This option allows modifying the Nixpkgs package set accessed through the `pkgs` module argument. - If `nixpkgs.pkgs` is set, overlays specified here - will be applied after the overlays that were already present - in `nixpkgs.pkgs`. + For details, see the [Overlays chapter in the Nixpkgs manual](https://nixos.org/manual/nixpkgs/stable/#chap-overlays). + + If the {option}`nixpkgs.pkgs` option is set, overlays specified using `nixpkgs.overlays` will be applied after the overlays that were already included in `nixpkgs.pkgs`. ''; }; @@ -383,6 +379,16 @@ in the legacy definitions. ''; } + { + assertion = opt.pkgs.isDefined -> cfg.config == {}; + message = '' + Your system configures nixpkgs with an externally created instance. + `nixpkgs.config` options should be passed when creating the instance instead. + + Current value: + ${lib.generators.toPretty { multiline = true; } opt.config} + ''; + } ]; }; diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 97b8f61e1e..e94c5d906a 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -55,14 +55,17 @@ ./hardware/cpu/amd-sev.nix ./hardware/cpu/intel-microcode.nix ./hardware/cpu/intel-sgx.nix + ./hardware/decklink.nix ./hardware/device-tree.nix ./hardware/digitalbitbox.nix ./hardware/flipperzero.nix ./hardware/flirc.nix ./hardware/gkraken.nix + ./hardware/glasgow.nix ./hardware/gpgsmartcards.nix ./hardware/hackrf.nix ./hardware/i2c.nix + ./hardware/infiniband.nix ./hardware/keyboard/qmk.nix ./hardware/keyboard/teck.nix ./hardware/keyboard/uhk.nix @@ -163,6 +166,7 @@ ./programs/direnv.nix ./programs/dmrconfig.nix ./programs/droidcam.nix + ./programs/ecryptfs.nix ./programs/environment.nix ./programs/evince.nix ./programs/extra-container.nix @@ -276,6 +280,8 @@ ./programs/xss-lock.nix ./programs/xwayland.nix ./programs/yabar.nix + ./programs/yazi.nix + ./programs/yubikey-touch-detector.nix ./programs/zmap.nix ./programs/zsh/oh-my-zsh.nix ./programs/zsh/zsh-autoenv.nix @@ -305,6 +311,7 @@ ./security/rngd.nix ./security/rtkit.nix ./security/sudo.nix + ./security/sudo-rs.nix ./security/systemd-confinement.nix ./security/tpm2.nix ./security/wrappers/default.nix @@ -317,6 +324,7 @@ ./services/amqp/rabbitmq.nix ./services/audio/alsa.nix ./services/audio/botamusique.nix + ./services/audio/castopod.nix ./services/audio/gmediarender.nix ./services/audio/gonic.nix ./services/audio/goxlr-utility.nix @@ -338,6 +346,7 @@ ./services/audio/squeezelite.nix ./services/audio/tts.nix ./services/audio/wyoming/faster-whisper.nix + ./services/audio/wyoming/openwakeword.nix ./services/audio/wyoming/piper.nix ./services/audio/ympd.nix ./services/backup/automysqlbackup.nix @@ -393,7 +402,6 @@ ./services/continuous-integration/gitlab-runner.nix ./services/continuous-integration/gocd-agent/default.nix ./services/continuous-integration/gocd-server/default.nix - ./services/continuous-integration/hail.nix ./services/continuous-integration/hercules-ci-agent/default.nix ./services/continuous-integration/hydra/default.nix ./services/continuous-integration/jenkins/default.nix @@ -493,6 +501,7 @@ ./services/games/quake3-server.nix ./services/games/teeworlds.nix ./services/games/terraria.nix + ./services/games/xonotic.nix ./services/hardware/acpid.nix ./services/hardware/actkbd.nix ./services/hardware/argonone.nix @@ -505,6 +514,7 @@ ./services/hardware/fancontrol.nix ./services/hardware/freefall.nix ./services/hardware/fwupd.nix + ./services/hardware/hddfancontrol.nix ./services/hardware/illum.nix ./services/hardware/interception-tools.nix ./services/hardware/irqbalance.nix @@ -532,6 +542,7 @@ ./services/hardware/tlp.nix ./services/hardware/trezord.nix ./services/hardware/triggerhappy.nix + ./services/hardware/tuxedo-rs.nix ./services/hardware/udev.nix ./services/hardware/udisks2.nix ./services/hardware/undervolt.nix @@ -593,6 +604,7 @@ ./services/mail/rss2email.nix ./services/mail/schleuder.nix ./services/mail/spamassassin.nix + ./services/mail/stalwart-mail.nix ./services/mail/sympa.nix ./services/mail/zeyple.nix ./services/matrix/appservice-discord.nix @@ -642,6 +654,7 @@ ./services/misc/etesync-dav.nix ./services/misc/evdevremapkeys.nix ./services/misc/felix.nix + ./services/misc/forgejo.nix ./services/misc/freeswitch.nix ./services/misc/fstrim.nix ./services/misc/gammu-smsd.nix @@ -892,6 +905,7 @@ ./services/networking/flannel.nix ./services/networking/freenet.nix ./services/networking/freeradius.nix + ./services/networking/frp.nix ./services/networking/frr.nix ./services/networking/gateone.nix ./services/networking/gdomap.nix @@ -971,6 +985,7 @@ ./services/networking/ndppd.nix ./services/networking/nebula.nix ./services/networking/netbird.nix + ./services/networking/netclient.nix ./services/networking/networkd-dispatcher.nix ./services/networking/networkmanager.nix ./services/networking/nextdns.nix @@ -980,6 +995,7 @@ ./services/networking/nix-serve.nix ./services/networking/nix-store-gcs-proxy.nix ./services/networking/nixops-dns.nix + ./services/networking/nncp.nix ./services/networking/nntp-proxy.nix ./services/networking/nomad.nix ./services/networking/nsd.nix @@ -1061,7 +1077,6 @@ ./services/networking/tayga.nix ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix - ./services/networking/tedicross.nix ./services/networking/teleport.nix ./services/networking/tetrd.nix ./services/networking/tftpd.nix @@ -1171,6 +1186,7 @@ ./services/system/self-deploy.nix ./services/system/systembus-notify.nix ./services/system/uptimed.nix + ./services/system/zram-generator.nix ./services/torrent/deluge.nix ./services/torrent/flexget.nix ./services/torrent/magnetico.nix @@ -1197,6 +1213,7 @@ ./services/web-apps/atlassian/confluence.nix ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix + ./services/web-apps/audiobookshelf.nix ./services/web-apps/bookstack.nix ./services/web-apps/calibre-web.nix ./services/web-apps/coder.nix @@ -1225,6 +1242,7 @@ ./services/web-apps/healthchecks.nix ./services/web-apps/hedgedoc.nix ./services/web-apps/hledger-web.nix + ./services/web-apps/honk.nix ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/invidious.nix @@ -1243,6 +1261,7 @@ ./services/web-apps/matomo.nix ./services/web-apps/mattermost.nix ./services/web-apps/mediawiki.nix + ./services/web-apps/meme-bingo-web.nix ./services/web-apps/miniflux.nix ./services/web-apps/monica.nix ./services/web-apps/moodle.nix @@ -1254,6 +1273,7 @@ ./services/web-apps/node-red.nix ./services/web-apps/onlyoffice.nix ./services/web-apps/openvscode-server.nix + ./services/web-apps/mobilizon.nix ./services/web-apps/openwebrx.nix ./services/web-apps/outline.nix ./services/web-apps/peering-manager.nix @@ -1267,6 +1287,7 @@ ./services/web-apps/powerdns-admin.nix ./services/web-apps/prosody-filer.nix ./services/web-apps/restya-board.nix + ./services/web-apps/rimgo.nix ./services/web-apps/sftpgo.nix ./services/web-apps/rss-bridge.nix ./services/web-apps/selfoss.nix @@ -1283,6 +1304,7 @@ ./services/web-apps/writefreely.nix ./services/web-apps/youtrack.nix ./services/web-apps/zabbix.nix + ./services/web-apps/zitadel.nix ./services/web-servers/agate.nix ./services/web-servers/apache-httpd/default.nix ./services/web-servers/caddy/default.nix @@ -1471,6 +1493,7 @@ ./virtualisation/nixos-containers.nix ./virtualisation/oci-containers.nix ./virtualisation/openstack-options.nix + ./virtualisation/oci-options.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/podman/default.nix diff --git a/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix b/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix index 19e7eb32e8..52750cd472 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix @@ -102,8 +102,6 @@ with lib; jq # for closureInfo # For boot.initrd.systemd makeInitrdNGTool - systemdStage1 - systemdStage1Network ]; boot.swraid.enable = true; diff --git a/third_party/nixpkgs/nixos/modules/programs/bash/bash.nix b/third_party/nixpkgs/nixos/modules/programs/bash/bash.nix index 286faeadc4..7d3322ea5e 100644 --- a/third_party/nixpkgs/nixos/modules/programs/bash/bash.nix +++ b/third_party/nixpkgs/nixos/modules/programs/bash/bash.nix @@ -81,7 +81,7 @@ in if [ "$TERM" != "dumb" ] || [ -n "$INSIDE_EMACS" ]; then PROMPT_COLOR="1;31m" ((UID)) && PROMPT_COLOR="1;32m" - if [ -n "$INSIDE_EMACS" ] || [ "$TERM" = "eterm" ] || [ "$TERM" = "eterm-color" ]; then + if [ -n "$INSIDE_EMACS" ]; then # Emacs term mode doesn't support xterm title escape sequence (\e]0;) PS1="\n\[\033[$PROMPT_COLOR\][\u@\h:\w]\\$\[\033[0m\] " else diff --git a/third_party/nixpkgs/nixos/modules/programs/browserpass.nix b/third_party/nixpkgs/nixos/modules/programs/browserpass.nix index 346d38e5e8..abd99056ff 100644 --- a/third_party/nixpkgs/nixos/modules/programs/browserpass.nix +++ b/third_party/nixpkgs/nixos/modules/programs/browserpass.nix @@ -27,6 +27,6 @@ with lib; "opt/brave/native-messaging-hosts/${appId}".source = source "hosts/chromium"; "opt/brave/policies/managed/${appId}".source = source "policies/chromium"; }; - nixpkgs.config.firefox.enableBrowserpass = true; + programs.firefox.wrapperConfig.enableBrowserpass = true; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/clash-verge.nix b/third_party/nixpkgs/nixos/modules/programs/clash-verge.nix index 29977be385..57a1c0377e 100644 --- a/third_party/nixpkgs/nixos/modules/programs/clash-verge.nix +++ b/third_party/nixpkgs/nixos/modules/programs/clash-verge.nix @@ -2,17 +2,9 @@ { options.programs.clash-verge = { - enable = lib.mkEnableOption (lib.mdDoc '' - Clash Verge. - ''); - - autoStart = lib.mkEnableOption (lib.mdDoc '' - Clash Verge Auto Launch. - ''); - - tunMode = lib.mkEnableOption (lib.mdDoc '' - Clash Verge Tun Mode. - ''); + enable = lib.mkEnableOption (lib.mdDoc "Clash Verge"); + autoStart = lib.mkEnableOption (lib.mdDoc "Clash Verge auto launch"); + tunMode = lib.mkEnableOption (lib.mdDoc "Clash Verge TUN mode"); }; config = diff --git a/third_party/nixpkgs/nixos/modules/programs/dconf.nix b/third_party/nixpkgs/nixos/modules/programs/dconf.nix index 7261a14352..cf53658c4f 100644 --- a/third_party/nixpkgs/nixos/modules/programs/dconf.nix +++ b/third_party/nixpkgs/nixos/modules/programs/dconf.nix @@ -1,55 +1,217 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.programs.dconf; - cfgDir = pkgs.symlinkJoin { - name = "dconf-system-config"; - paths = map (x: "${x}/etc/dconf") cfg.packages; - postBuild = '' - mkdir -p $out/profile - mkdir -p $out/db - '' + ( - concatStringsSep "\n" ( - mapAttrsToList ( - name: path: '' - ln -s ${path} $out/profile/${name} - '' - ) cfg.profiles - ) - ) + '' - ${pkgs.dconf}/bin/dconf update $out/db - ''; + + # Compile keyfiles to dconf DB + compileDconfDb = dir: pkgs.runCommand "dconf-db" + { + nativeBuildInputs = [ (lib.getBin pkgs.dconf) ]; + } "dconf compile $out ${dir}"; + + # Check if dconf keyfiles are valid + checkDconfKeyfiles = dir: pkgs.runCommand "check-dconf-keyfiles" + { + nativeBuildInputs = [ (lib.getBin pkgs.dconf) ]; + } '' + if [[ -f ${dir} ]]; then + echo "dconf keyfiles should be a directory but a file is provided: ${dir}" + exit 1 + fi + + dconf compile db ${dir} || ( + echo "The dconf keyfiles are invalid: ${dir}" + exit 1 + ) + cp -R ${dir} $out + ''; + + mkAllLocks = settings: lib.flatten ( + lib.mapAttrsToList (k: v: lib.mapAttrsToList (k': _: "/${k}/${k'}") v) settings); + + # Generate dconf DB from dconfDatabase and keyfiles + mkDconfDb = val: compileDconfDb (pkgs.symlinkJoin { + name = "nixos-generated-dconf-keyfiles"; + paths = [ + (pkgs.writeTextDir "nixos-generated-dconf-keyfiles" (lib.generators.toDconfINI val.settings)) + (pkgs.writeTextDir "locks/nixos-generated-dconf-locks" (lib.concatStringsSep "\n" + (if val.lockAll then mkAllLocks val.settings else val.locks) + )) + ] ++ (map checkDconfKeyfiles val.keyfiles); + }); + + # Check if a dconf DB file is valid. The dconf cli doesn't return 1 when it can't + # open the database file so we have to check if the output is empty. + checkDconfDb = file: pkgs.runCommand "check-dconf-db" + { + nativeBuildInputs = [ (lib.getBin pkgs.dconf) ]; + } '' + if [[ -d ${file} ]]; then + echo "dconf DB should be a file but a directory is provided: ${file}" + exit 1 + fi + + echo "file-db:${file}" > profile + DCONF_PROFILE=$(pwd)/profile dconf dump / > output 2> error + if [[ ! -s output ]] && [[ -s error ]]; then + cat error + echo "The dconf DB file is invalid: ${file}" + exit 1 + fi + + cp ${file} $out + ''; + + # Generate dconf profile + mkDconfProfile = name: value: + if lib.isDerivation value || lib.isPath value then + pkgs.runCommand "dconf-profile" { } '' + if [[ -d ${value} ]]; then + echo "Dconf profile should be a file but a directory is provided." + exit 1 + fi + mkdir -p $out/etc/dconf/profile/ + cp ${value} $out/etc/dconf/profile/${name} + '' + else + pkgs.writeTextDir "etc/dconf/profile/${name}" ( + lib.concatMapStrings (x: "${x}\n") (( + lib.optional value.enableUserDb "user-db:user" + ) ++ ( + map + (value: + let + db = if lib.isAttrs value && !lib.isDerivation value then mkDconfDb value else checkDconfDb value; + in + "file-db:${db}") + value.databases + )) + ); + + dconfDatabase = with lib.types; submodule { + options = { + keyfiles = lib.mkOption { + type = listOf (oneOf [ path package ]); + default = [ ]; + description = lib.mdDoc "A list of dconf keyfile directories."; + }; + settings = lib.mkOption { + type = attrs; + default = { }; + description = lib.mdDoc "An attrset used to generate dconf keyfile."; + example = literalExpression '' + with lib.gvariant; + { + "com/raggesilver/BlackBox" = { + scrollback-lines = mkUint32 10000; + theme-dark = "Tommorow Night"; + }; + } + ''; + }; + locks = lib.mkOption { + type = with lib.types; listOf str; + default = [ ]; + description = lib.mdDoc '' + A list of dconf keys to be lockdown. This doesn't take effect if `lockAll` + is set. + ''; + example = literalExpression '' + [ "/org/gnome/desktop/background/picture-uri" ] + ''; + }; + lockAll = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc "Lockdown all dconf keys in `settings`."; + }; + }; }; -in -{ - ###### interface - options = { - programs.dconf = { - enable = mkEnableOption (lib.mdDoc "dconf"); - - profiles = mkOption { - type = types.attrsOf types.path; - default = {}; - description = lib.mdDoc "Set of dconf profile files, installed at {file}`/etc/dconf/profiles/«name»`."; - internal = true; + dconfProfile = with lib.types; submodule { + options = { + enableUserDb = lib.mkOption { + type = bool; + default = true; + description = lib.mdDoc "Add `user-db:user` at the beginning of the profile."; }; - packages = mkOption { - type = types.listOf types.package; - default = []; + databases = lib.mkOption { + type = with lib.types; listOf (oneOf [ + path + package + dconfDatabase + ]); + default = [ ]; + description = lib.mdDoc '' + List of data sources for the profile. An element can be an attrset, + or the path of an already compiled database. Each element is converted + to a file-db. + + A key is searched from up to down and the first result takes the + priority. If a lock for a particular key is installed then the value from + the last database in the profile where the key is locked will be used. + This can be used to enforce mandatory settings. + ''; + }; + }; + }; + +in +{ + options = { + programs.dconf = { + enable = lib.mkEnableOption (lib.mdDoc "dconf"); + + profiles = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ + path + package + dconfProfile + ]); + default = { }; + description = lib.mdDoc '' + Attrset of dconf profiles. By default the `user` profile is used which + ends up in `/etc/dconf/profile/user`. + ''; + example = lib.literalExpression '' + { + # A "user" profile with a database + user.databases = [ + { + settings = { }; + } + ]; + # A "bar" profile from a package + bar = pkgs.bar-dconf-profile; + # A "foo" profile from a path + foo = ''${./foo} + }; + ''; + }; + + packages = lib.mkOption { + type = lib.types.listOf lib.types.package; + default = [ ]; description = lib.mdDoc "A list of packages which provide dconf profiles and databases in {file}`/etc/dconf`."; }; }; }; - ###### implementation + config = lib.mkIf (cfg.profiles != { } || cfg.enable) { + programs.dconf.packages = lib.mapAttrsToList mkDconfProfile cfg.profiles; - config = mkIf (cfg.profiles != {} || cfg.enable) { - environment.etc.dconf = mkIf (cfg.profiles != {} || cfg.packages != []) { - source = cfgDir; + environment.etc.dconf = lib.mkIf (cfg.packages != [ ]) { + source = pkgs.symlinkJoin { + name = "dconf-system-config"; + paths = map (x: "${x}/etc/dconf") cfg.packages; + nativeBuildInputs = [ (lib.getBin pkgs.dconf) ]; + postBuild = '' + if test -d $out/db; then + dconf update $out/db + fi + ''; + }; }; services.dbus.packages = [ pkgs.dconf ]; @@ -59,8 +221,9 @@ in # For dconf executable environment.systemPackages = [ pkgs.dconf ]; - # Needed for unwrapped applications - environment.sessionVariables.GIO_EXTRA_MODULES = mkIf cfg.enable [ "${pkgs.dconf.lib}/lib/gio/modules" ]; + environment.sessionVariables = lib.mkIf cfg.enable { + # Needed for unwrapped applications + GIO_EXTRA_MODULES = [ "${pkgs.dconf.lib}/lib/gio/modules" ]; + }; }; - } diff --git a/third_party/nixpkgs/nixos/modules/programs/direnv.nix b/third_party/nixpkgs/nixos/modules/programs/direnv.nix index 53717fae11..1a80cb2028 100644 --- a/third_party/nixpkgs/nixos/modules/programs/direnv.nix +++ b/third_party/nixpkgs/nixos/modules/programs/direnv.nix @@ -32,15 +32,6 @@ in { the hiding of direnv logging ''); - persistDerivations = - (lib.mkEnableOption (lib.mdDoc '' - setting keep-derivations and keep-outputs to true - to prevent shells from getting garbage collected - '')) - // { - default = true; - }; - loadInNixShell = lib.mkEnableOption (lib.mdDoc '' loading direnv in `nix-shell` `nix shell` or `nix develop` @@ -62,6 +53,10 @@ in { }; }; + imports = [ + (lib.mkRemovedOptionModule ["programs" "direnv" "persistDerivations"] "persistDerivations was removed as it is on longer necessary") + ]; + config = lib.mkIf cfg.enable { programs = { @@ -87,11 +82,6 @@ in { ''; }; - nix.settings = lib.mkIf cfg.persistDerivations { - keep-outputs = true; - keep-derivations = true; - }; - environment = { systemPackages = if cfg.loadInNixShell then [cfg.package] diff --git a/third_party/nixpkgs/nixos/modules/programs/ecryptfs.nix b/third_party/nixpkgs/nixos/modules/programs/ecryptfs.nix new file mode 100644 index 0000000000..63c1a3ad44 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/ecryptfs.nix @@ -0,0 +1,31 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.ecryptfs; + +in { + options.programs.ecryptfs = { + enable = mkEnableOption (lib.mdDoc "ecryptfs setuid mount wrappers"); + }; + + config = mkIf cfg.enable { + security.wrappers = { + + "mount.ecryptfs_private" = { + setuid = true; + owner = "root"; + group = "root"; + source = "${lib.getBin pkgs.ecryptfs}/bin/mount.ecryptfs_private"; + }; + "umount.ecryptfs_private" = { + setuid = true; + owner = "root"; + group = "root"; + source = "${lib.getBin pkgs.ecryptfs}/bin/umount.ecryptfs_private"; + }; + + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/environment.nix b/third_party/nixpkgs/nixos/modules/programs/environment.nix index 3fbda153e0..6cf9257d03 100644 --- a/third_party/nixpkgs/nixos/modules/programs/environment.nix +++ b/third_party/nixpkgs/nixos/modules/programs/environment.nix @@ -22,7 +22,6 @@ in # be specified here; do so in the default value of programs.less.envVariables instead PAGER = mkDefault "less"; EDITOR = mkDefault "nano"; - XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc }; # since we set PAGER to this above, make sure it's installed @@ -33,17 +32,19 @@ in "/run/current-system/sw" ]; + environment.sessionVariables = + { + XDG_CONFIG_DIRS = [ "/etc/xdg" ]; # needs to be before profile-relative paths to allow changes through environment.etc + }; + # TODO: move most of these elsewhere environment.profileRelativeSessionVariables = { PATH = [ "/bin" ]; INFOPATH = [ "/info" "/share/info" ]; - KDEDIRS = [ "" ]; - QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ]; QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ]; GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" "/lib/gtk-4.0" ]; XDG_CONFIG_DIRS = [ "/etc/xdg" ]; XDG_DATA_DIRS = [ "/share" ]; - MOZ_PLUGIN_PATH = [ "/lib/mozilla/plugins" ]; LIBEXEC_PATH = [ "/lib/libexec" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/firefox.nix b/third_party/nixpkgs/nixos/modules/programs/firefox.nix index 8653f066cf..83a3edaf81 100644 --- a/third_party/nixpkgs/nixos/modules/programs/firefox.nix +++ b/third_party/nixpkgs/nixos/modules/programs/firefox.nix @@ -36,6 +36,12 @@ in ]; }; + wrapperConfig = mkOption { + type = types.attrs; + default = {}; + description = mdDoc "Arguments to pass to Firefox wrapper"; + }; + policies = mkOption { type = policyFormat.type; default = { }; @@ -227,17 +233,23 @@ in ] ++ optionals nmh.passff [ passff-host ]; + cfg = let + # copy-pasted from the wrapper; TODO: figure out fix + applicationName = cfg.package.binaryName or (lib.getName cfg.package); + + nixpkgsConfig = pkgs.config.${applicationName} or {}; + optionConfig = cfg.wrapperConfig; + nmhConfig = { + enableBrowserpass = nmh.browserpass; + enableBukubrow = nmh.bukubrow; + enableTridactylNative = nmh.tridactyl; + enableUgetIntegrator = nmh.ugetIntegrator; + enableFXCastBridge = nmh.fxCast; + }; + in nixpkgsConfig // optionConfig // nmhConfig; }) ]; - nixpkgs.config.firefox = { - enableBrowserpass = nmh.browserpass; - enableBukubrow = nmh.bukubrow; - enableTridactylNative = nmh.tridactyl; - enableUgetIntegrator = nmh.ugetIntegrator; - enableFXCastBridge = nmh.fxCast; - }; - environment.etc = let policiesJSON = policyFormat.generate "firefox-policies.json" { inherit (cfg) policies; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/fish.nix b/third_party/nixpkgs/nixos/modules/programs/fish.nix index c85097f45e..b500b8f24b 100644 --- a/third_party/nixpkgs/nixos/modules/programs/fish.nix +++ b/third_party/nixpkgs/nixos/modules/programs/fish.nix @@ -258,16 +258,13 @@ in preferLocalBuild = true; allowSubstitutes = false; }; - generateCompletions = package: pkgs.runCommand - "${package.name}_fish-completions" - ( - { - inherit package; - preferLocalBuild = true; - allowSubstitutes = false; - } - // optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; } - ) + generateCompletions = package: pkgs.runCommandLocal + ( with lib.strings; let + storeLength = stringLength storeDir + 34; # Nix' StorePath::HashLen + 2 for the separating slash and dash + pathName = substring storeLength (stringLength package - storeLength) package; + in (package.name or pathName) + "_fish-completions") + ( { inherit package; } // + optionalAttrs (package ? meta.priority) { meta.priority = package.meta.priority; }) '' mkdir -p $out if [ -d $package/share/man ]; then diff --git a/third_party/nixpkgs/nixos/modules/programs/gnupg.nix b/third_party/nixpkgs/nixos/modules/programs/gnupg.nix index 697b6e9a0b..aa1a536247 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gnupg.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gnupg.nix @@ -6,6 +6,10 @@ let cfg = config.programs.gnupg; + agentSettingsFormat = pkgs.formats.keyValue { + mkKeyValue = lib.generators.mkKeyValueDefault { } " "; + }; + xserverCfg = config.services.xserver; defaultPinentryFlavor = @@ -82,6 +86,18 @@ in ''; }; + agent.settings = mkOption { + type = agentSettingsFormat.type; + default = { }; + example = { + default-cache-ttl = 600; + }; + description = lib.mdDoc '' + Configuration for /etc/gnupg/gpg-agent.conf. + See {manpage}`gpg-agent(1)` for supported options. + ''; + }; + dirmngr.enable = mkOption { type = types.bool; default = false; @@ -92,17 +108,20 @@ in }; config = mkIf cfg.agent.enable { - environment.etc."gnupg/gpg-agent.conf".text = - lib.optionalString (cfg.agent.pinentryFlavor != null) '' - pinentry-program ${pkgs.pinentry.${cfg.agent.pinentryFlavor}}/bin/pinentry - ''; + programs.gnupg.agent.settings = { + pinentry-program = lib.mkIf (cfg.agent.pinentryFlavor != null) + "${pkgs.pinentry.${cfg.agent.pinentryFlavor}}/bin/pinentry"; + }; + + environment.etc."gnupg/gpg-agent.conf".source = + agentSettingsFormat.generate "gpg-agent.conf" cfg.agent.settings; # This overrides the systemd user unit shipped with the gnupg package systemd.user.services.gpg-agent = { unitConfig = { Description = "GnuPG cryptographic agent and passphrase cache"; Documentation = "man:gpg-agent(1)"; - Requires = [ "gpg-agent.socket" ]; + Requires = [ "sockets.target" ]; }; serviceConfig = { ExecStart = "${cfg.package}/bin/gpg-agent --supervised"; diff --git a/third_party/nixpkgs/nixos/modules/programs/hyprland.nix b/third_party/nixpkgs/nixos/modules/programs/hyprland.nix index e0ee5b6bd2..638dfb98e8 100644 --- a/third_party/nixpkgs/nixos/modules/programs/hyprland.nix +++ b/third_party/nixpkgs/nixos/modules/programs/hyprland.nix @@ -7,9 +7,7 @@ with lib; let cfg = config.programs.hyprland; finalPortalPackage = cfg.portalPackage.override { - hyprland-share-picker = pkgs.hyprland-share-picker.override { - hyprland = cfg.finalPackage; - }; + hyprland = cfg.finalPackage; }; in { diff --git a/third_party/nixpkgs/nixos/modules/programs/nano.nix b/third_party/nixpkgs/nixos/modules/programs/nano.nix index 7705bf0ddc..28ddb4aaf6 100644 --- a/third_party/nixpkgs/nixos/modules/programs/nano.nix +++ b/third_party/nixpkgs/nixos/modules/programs/nano.nix @@ -2,14 +2,16 @@ let cfg = config.programs.nano; - LF = "\n"; in { - ###### interface - options = { programs.nano = { + enable = lib.mkEnableOption (lib.mdDoc "nano") // { + default = true; + }; + + package = lib.mkPackageOptionMD pkgs "nano" { }; nanorc = lib.mkOption { type = lib.types.lines; @@ -24,28 +26,22 @@ in set tabsize 2 ''; }; + syntaxHighlight = lib.mkOption { type = lib.types.bool; - default = true; + default = false; description = lib.mdDoc "Whether to enable syntax highlight for various languages."; }; }; }; - ###### implementation - - config = lib.mkIf (cfg.nanorc != "" || cfg.syntaxHighlight) { - environment.etc.nanorc.text = lib.concatStringsSep LF ( - ( lib.optionals cfg.syntaxHighlight [ - "# The line below is added because value of programs.nano.syntaxHighlight is set to true" - ''include "${pkgs.nano}/share/nano/*.nanorc"'' - "" - ]) - ++ ( lib.optionals (cfg.nanorc != "") [ - "# The lines below have been set from value of programs.nano.nanorc" - cfg.nanorc - ]) - ); + config = lib.mkIf cfg.enable { + environment = { + etc.nanorc.text = (lib.optionalString cfg.syntaxHighlight '' + # load syntax highlighting files + include "${cfg.package}/share/nano/*.nanorc" + '') + cfg.nanorc; + systemPackages = [ cfg.package ]; + }; }; - } diff --git a/third_party/nixpkgs/nixos/modules/programs/regreet.nix b/third_party/nixpkgs/nixos/modules/programs/regreet.nix index f6c750a45b..640bc25957 100644 --- a/third_party/nixpkgs/nixos/modules/programs/regreet.nix +++ b/third_party/nixpkgs/nixos/modules/programs/regreet.nix @@ -66,10 +66,10 @@ in }; systemd.tmpfiles.rules = let - user = config.services.greetd.settings.default_session.user; + group = config.users.users.${config.services.greetd.settings.default_session.user}.group; in [ - "d /var/log/regreet 0755 greeter ${user} - -" - "d /var/cache/regreet 0755 greeter ${user} - -" + "d /var/log/regreet 0755 greeter ${group} - -" + "d /var/cache/regreet 0755 greeter ${group} - -" ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/rust-motd.nix b/third_party/nixpkgs/nixos/modules/programs/rust-motd.nix index d5f1820ba7..4c9b101859 100644 --- a/third_party/nixpkgs/nixos/modules/programs/rust-motd.nix +++ b/third_party/nixpkgs/nixos/modules/programs/rust-motd.nix @@ -5,6 +5,23 @@ with lib; let cfg = config.programs.rust-motd; format = pkgs.formats.toml { }; + + # Order the sections in the TOML according to the order of sections + # in `cfg.order`. + motdConf = pkgs.runCommand "motd.conf" + { + __structuredAttrs = true; + inherit (cfg) order settings; + nativeBuildInputs = [ pkgs.remarshal pkgs.jq ]; + } + '' + cat "$NIX_ATTRS_JSON_FILE" \ + | jq '.settings as $settings + | .order + | map({ key: ., value: $settings."\(.)" }) + | from_entries' -r \ + | json2toml /dev/stdin "$out" + ''; in { options.programs.rust-motd = { enable = mkEnableOption (lib.mdDoc "rust-motd"); @@ -27,10 +44,43 @@ in { For possible formats, please refer to {manpage}`systemd.time(7)`. ''; }; + order = mkOption { + type = types.listOf types.str; + default = attrNames cfg.settings; + defaultText = literalExpression "attrNames cfg.settings"; + description = mdDoc '' + The order of the sections in [](#opt-programs.rust-motd.settings). + By default they are ordered alphabetically. + + Context: since attribute sets in Nix are always + ordered alphabetically internally this means that + + ```nix + { + uptime = { /* ... */ }; + banner = { /* ... */ }; + } + ``` + + will still have `banner` displayed before `uptime`. + + To work around that, this option can be used to define the order of all keys, + i.e. + + ```nix + { + order = [ + "uptime" + "banner" + ]; + } + ``` + + makes sure that `uptime` is placed before `banner` in the motd. + ''; + }; settings = mkOption { - type = types.submodule { - freeformType = format.type; - }; + type = types.attrsOf format.type; description = mdDoc '' Settings on what to generate. Please read the [upstream documentation](https://github.com/rust-motd/rust-motd/blob/main/README.md#configuration) @@ -45,14 +95,21 @@ in { `programs.rust-motd` is incompatible with `users.motd`! ''; } + { assertion = sort (a: b: a < b) cfg.order == attrNames cfg.settings; + message = '' + Please ensure that every section from `programs.rust-motd.settings` is present in + `programs.rust-motd.order`. + ''; + } ]; systemd.services.rust-motd = { path = with pkgs; [ bash ]; documentation = [ "https://github.com/rust-motd/rust-motd/blob/v${pkgs.rust-motd.version}/README.md" ]; description = "motd generator"; + wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${pkgs.writeShellScript "update-motd" '' - ${pkgs.rust-motd}/bin/rust-motd ${format.generate "motd.conf" cfg.settings} > motd + ${pkgs.rust-motd}/bin/rust-motd ${motdConf} > motd ''}"; CapabilityBoundingSet = [ "" ]; LockPersonality = true; diff --git a/third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix b/third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix index 4c055029e3..220f0a35f1 100644 --- a/third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix +++ b/third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix @@ -24,7 +24,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ cfg.package - (mkIf cfg.autoStart (makeAutostartItem { name = "streamdeck-ui"; package = cfg.package; })) + (mkIf cfg.autoStart (makeAutostartItem { name = "streamdeck-ui-noui"; package = cfg.package; })) ]; services.udev.packages = [ cfg.package ]; diff --git a/third_party/nixpkgs/nixos/modules/programs/tmux.nix b/third_party/nixpkgs/nixos/modules/programs/tmux.nix index 4f452f1d7f..0d1c7c9cdf 100644 --- a/third_party/nixpkgs/nixos/modules/programs/tmux.nix +++ b/third_party/nixpkgs/nixos/modules/programs/tmux.nix @@ -52,6 +52,8 @@ let set -s escape-time ${toString cfg.escapeTime} set -g history-limit ${toString cfg.historyLimit} + ${cfg.extraConfigBeforePlugins} + ${lib.optionalString (cfg.plugins != []) '' # Run plugins ${lib.concatMapStringsSep "\n" (x: "run-shell ${x.rtp}") cfg.plugins} @@ -108,10 +110,18 @@ in { description = lib.mdDoc "Time in milliseconds for which tmux waits after an escape is input."; }; + extraConfigBeforePlugins = mkOption { + default = ""; + description = lib.mdDoc '' + Additional contents of /etc/tmux.conf, to be run before sourcing plugins. + ''; + type = types.lines; + }; + extraConfig = mkOption { default = ""; description = lib.mdDoc '' - Additional contents of /etc/tmux.conf + Additional contents of /etc/tmux.conf, to be run after sourcing plugins. ''; type = types.lines; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix index 698d9c2b46..de739faabe 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wayland/sway.nix @@ -42,6 +42,11 @@ in { and "man 5 sway" for more information''); + enableRealtime = mkEnableOption (lib.mdDoc '' + add CAP_SYS_NICE capability on `sway` binary for realtime scheduling + privileges. This may improve latency and reduce stuttering, specially in + high load scenarios'') // { default = true; }; + package = mkOption { type = with types; nullOr package; default = defaultSwayPackage; @@ -149,6 +154,14 @@ in { "sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config"; }; }; + security.wrappers = mkIf (cfg.enableRealtime && cfg.package != null) { + sway = { + owner = "root"; + group = "root"; + source = "${cfg.package}/bin/sway"; + capabilities = "cap_sys_nice+ep"; + }; + }; # To make a Sway session available if a display manager like SDDM is enabled: services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ]; } (import ./wayland-session.nix { inherit lib pkgs; }) diff --git a/third_party/nixpkgs/nixos/modules/programs/yazi.nix b/third_party/nixpkgs/nixos/modules/programs/yazi.nix new file mode 100644 index 0000000000..973f5c0122 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/yazi.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.programs.yazi; + + settingsFormat = pkgs.formats.toml { }; + + names = [ "yazi" "theme" "keymap" ]; +in +{ + options.programs.yazi = { + enable = lib.mkEnableOption (lib.mdDoc "yazi terminal file manager"); + + package = lib.mkPackageOptionMD pkgs "yazi" { }; + + settings = lib.mkOption { + type = with lib.types; submodule { + options = lib.listToAttrs (map + (name: lib.nameValuePair name (lib.mkOption { + inherit (settingsFormat) type; + default = { }; + description = lib.mdDoc '' + Configuration included in `${name}.toml`. + + See https://github.com/sxyazi/yazi/blob/v${cfg.package.version}/config/docs/${name}.md for documentation. + ''; + })) + names); + }; + default = { }; + description = lib.mdDoc '' + Configuration included in `$YAZI_CONFIG_HOME`. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + environment = { + systemPackages = [ cfg.package ]; + variables.YAZI_CONFIG_HOME = "/etc/yazi/"; + etc = lib.attrsets.mergeAttrsList (map + (name: lib.optionalAttrs (cfg.settings.${name} != { }) { + "yazi/${name}.toml".source = settingsFormat.generate "${name}.toml" cfg.settings.${name}; + }) + names); + }; + }; + meta = { + maintainers = with lib.maintainers; [ linsui ]; + # The version of the package is used in the doc. + buildDocsInSandbox = false; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/yubikey-touch-detector.nix b/third_party/nixpkgs/nixos/modules/programs/yubikey-touch-detector.nix new file mode 100644 index 0000000000..9a0d107f73 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/yubikey-touch-detector.nix @@ -0,0 +1,21 @@ +{ config, lib, pkgs, ... }: +let cfg = config.programs.yubikey-touch-detector; +in { + options = { + programs.yubikey-touch-detector = { + enable = lib.mkEnableOption "yubikey-touch-detector"; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.packages = [ pkgs.yubikey-touch-detector ]; + + systemd.user.services.yubikey-touch-detector = { + path = [ pkgs.gnupg ]; + wantedBy = [ "graphical-session.target" ]; + }; + systemd.user.sockets.yubikey-touch-detector = { + wantedBy = [ "sockets.target" ]; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix index 6bb21cb3ef..cad639f299 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix @@ -159,6 +159,14 @@ in type = types.bool; }; + enableLsColors = mkOption { + default = true; + description = lib.mdDoc '' + Enable extra colors in directory listings (used by `ls` and `tree`). + ''; + type = types.bool; + }; + }; }; @@ -263,6 +271,11 @@ in ${cfg.interactiveShellInit} + ${optionalString cfg.enableLsColors '' + # Extra colors for directory listings. + eval "$(${pkgs.coreutils}/bin/dircolors -b)" + ''} + # Setup aliases. ${zshAliases} diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index 45014ed3c6..408c515044 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -124,6 +124,9 @@ in See https://www.isc.org/blogs/isc-dhcp-eol/ for details. Please switch to a different implementation like kea or dnsmasq. '') + (mkRemovedOptionModule [ "services" "tedicross" ] '' + The corresponding package was broken and removed from nixpkgs. + '') # Do NOT add any option renames here, see top of the file ]; diff --git a/third_party/nixpkgs/nixos/modules/security/acme/default.md b/third_party/nixpkgs/nixos/modules/security/acme/default.md index 8ff97b55f6..31548ad181 100644 --- a/third_party/nixpkgs/nixos/modules/security/acme/default.md +++ b/third_party/nixpkgs/nixos/modules/security/acme/default.md @@ -189,7 +189,7 @@ security.acme.defaults.email = "admin+acme@example.com"; security.acme.certs."example.com" = { domain = "*.example.com"; dnsProvider = "rfc2136"; - credentialsFile = "/var/lib/secrets/certs.secret"; + environmentFile = "/var/lib/secrets/certs.secret"; # We don't need to wait for propagation since this is a local DNS server dnsPropagationCheck = false; }; @@ -256,7 +256,7 @@ security.acme.acceptTerms = true; security.acme.defaults.email = "admin+acme@example.com"; security.acme.defaults = { dnsProvider = "rfc2136"; - credentialsFile = "/var/lib/secrets/certs.secret"; + environmentFile = "/var/lib/secrets/certs.secret"; # We don't need to wait for propagation since this is a local DNS server dnsPropagationCheck = false; }; diff --git a/third_party/nixpkgs/nixos/modules/security/acme/default.nix b/third_party/nixpkgs/nixos/modules/security/acme/default.nix index 8aee71c864..92bed172f4 100644 --- a/third_party/nixpkgs/nixos/modules/security/acme/default.nix +++ b/third_party/nixpkgs/nixos/modules/security/acme/default.nix @@ -1,6 +1,8 @@ { config, lib, pkgs, options, ... }: with lib; let + + cfg = config.security.acme; opt = options.security.acme; user = if cfg.useRoot then "root" else "acme"; @@ -14,6 +16,36 @@ let mkAccountHash = acmeServer: data: mkHash "${toString acmeServer} ${data.keyType} ${data.email}"; accountDirRoot = "/var/lib/acme/.lego/accounts/"; + lockdir = "/run/acme/"; + concurrencyLockfiles = map (n: "${toString n}.lock") (lib.range 1 cfg.maxConcurrentRenewals); + # Assign elements of `baseList` to each element of `needAssignmentList`, until the latter is exhausted. + # returns: [{fst = "element of baseList"; snd = "element of needAssignmentList"}] + roundRobinAssign = baseList: needAssignmentList: + if baseList == [] then [] + else _rrCycler baseList baseList needAssignmentList; + _rrCycler = with builtins; origBaseList: workingBaseList: needAssignmentList: + if (workingBaseList == [] || needAssignmentList == []) + then [] + else + [{ fst = head workingBaseList; snd = head needAssignmentList;}] ++ + _rrCycler origBaseList (if (tail workingBaseList == []) then origBaseList else tail workingBaseList) (tail needAssignmentList); + attrsToList = mapAttrsToList (attrname: attrval: {name = attrname; value = attrval;}); + # for an AttrSet `funcsAttrs` having functions as values, apply single arguments from + # `argsList` to them in a round-robin manner. + # Returns an attribute set with the applied functions as values. + roundRobinApplyAttrs = funcsAttrs: argsList: lib.listToAttrs (map (x: {inherit (x.snd) name; value = x.snd.value x.fst;}) (roundRobinAssign argsList (attrsToList funcsAttrs))); + wrapInFlock = lockfilePath: script: + # explainer: https://stackoverflow.com/a/60896531 + '' + exec {LOCKFD}> ${lockfilePath} + echo "Waiting to acquire lock ${lockfilePath}" + ${pkgs.flock}/bin/flock ''${LOCKFD} || exit 1 + echo "Acquired lock ${lockfilePath}" + '' + + script + "\n" + + ''echo "Releasing lock ${lockfilePath}" # only released after process exit''; + + # There are many services required to make cert renewals work. # They all follow a common structure: # - They inherit this commonServiceConfig @@ -31,6 +63,7 @@ let ProtectSystem = "strict"; ReadWritePaths = [ "/var/lib/acme" + lockdir ]; PrivateTmp = true; @@ -118,7 +151,8 @@ let # We don't want this to run every time a renewal happens RemainAfterExit = true; - # These StateDirectory entries negate the need for tmpfiles + # StateDirectory entries are a cleaner, service-level mechanism + # for dealing with persistent service data StateDirectory = [ "acme" "acme/.lego" "acme/.lego/accounts" ]; StateDirectoryMode = 755; WorkingDirectory = "/var/lib/acme"; @@ -127,6 +161,25 @@ let ExecStart = "+" + (pkgs.writeShellScript "acme-fixperms" script); }; }; + lockfilePrepareService = { + description = "Manage lock files for acme services"; + + # ensure all required lock files exist, but none more + script = '' + GLOBIGNORE="${concatStringsSep ":" concurrencyLockfiles}" + rm -f * + unset GLOBIGNORE + + xargs touch <<< "${toString concurrencyLockfiles}" + ''; + + serviceConfig = commonServiceConfig // { + # We don't want this to run every time a renewal happens + RemainAfterExit = true; + WorkingDirectory = lockdir; + }; + }; + certToConfig = cert: data: let acmeServer = data.server; @@ -229,10 +282,10 @@ let }; }; - selfsignService = { + selfsignService = lockfileName: { description = "Generate self-signed certificate for ${cert}"; - after = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ]; - requires = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ]; + after = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ] ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; + requires = [ "acme-selfsigned-ca.service" "acme-fixperms.service" ] ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; path = with pkgs; [ minica ]; @@ -256,7 +309,7 @@ let # Working directory will be /tmp # minica will output to a folder sharing the name of the first domain # in the list, which will be ${data.domain} - script = '' + script = (if (lockfileName == null) then lib.id else wrapInFlock "${lockdir}${lockfileName}") '' minica \ --ca-key ca/key.pem \ --ca-cert ca/cert.pem \ @@ -277,10 +330,10 @@ let ''; }; - renewService = { + renewService = lockfileName: { description = "Renew ACME certificate for ${cert}"; - after = [ "network.target" "network-online.target" "acme-fixperms.service" "nss-lookup.target" ] ++ selfsignedDeps; - wants = [ "network-online.target" "acme-fixperms.service" ] ++ selfsignedDeps; + after = [ "network.target" "network-online.target" "acme-fixperms.service" "nss-lookup.target" ] ++ selfsignedDeps ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; + wants = [ "network-online.target" "acme-fixperms.service" ] ++ selfsignedDeps ++ optional (cfg.maxConcurrentRenewals > 0) "acme-lockfiles.service"; # https://github.com/NixOS/nixpkgs/pull/81371#issuecomment-605526099 wantedBy = optionals (!config.boot.isContainer) [ "multi-user.target" ]; @@ -309,8 +362,14 @@ let "/var/lib/acme/.lego/${cert}/${certDir}:/tmp/certificates" ]; - # Only try loading the credentialsFile if the dns challenge is enabled - EnvironmentFile = mkIf useDns data.credentialsFile; + # Only try loading the environmentFile if the dns challenge is enabled + EnvironmentFile = mkIf useDns data.environmentFile; + + Environment = mkIf useDns + (mapAttrsToList (k: v: ''"${k}=%d/${k}"'') data.credentialFiles); + + LoadCredential = mkIf useDns + (mapAttrsToList (k: v: "${k}:${v}") data.credentialFiles); # Run as root (Prefixed with +) ExecStartPost = "+" + (pkgs.writeShellScript "acme-postrun" '' @@ -329,7 +388,7 @@ let }; # Working directory will be /tmp - script = '' + script = (if (lockfileName == null) then lib.id else wrapInFlock "${lockdir}${lockfileName}") '' ${optionalString data.enableDebugLogs "set -x"} set -euo pipefail @@ -443,6 +502,10 @@ let defaultText = if isDefaults then default else literalExpression "config.security.acme.defaults.${name}"; }; in { + imports = [ + (mkRenamedOptionModule [ "credentialsFile" ] [ "environmentFile" ]) + ]; + options = { validMinDays = mkOption { type = types.int; @@ -554,9 +617,9 @@ let ''; }; - credentialsFile = mkOption { + environmentFile = mkOption { type = types.nullOr types.path; - inherit (defaultAndText "credentialsFile" null) default defaultText; + inherit (defaultAndText "environmentFile" null) default defaultText; description = lib.mdDoc '' Path to an EnvironmentFile for the cert's service containing any required and optional environment variables for your selected dnsProvider. @@ -566,6 +629,24 @@ let example = "/var/src/secrets/example.org-route53-api-token"; }; + credentialFiles = mkOption { + type = types.attrsOf (types.path); + inherit (defaultAndText "credentialFiles" {}) default defaultText; + description = lib.mdDoc '' + Environment variables suffixed by "_FILE" to set for the cert's service + for your selected dnsProvider. + To find out what values you need to set, consult the documentation at + for the corresponding dnsProvider. + This allows to securely pass credential files to lego by leveraging systemd + credentials. + ''; + example = literalExpression '' + { + "RFC2136_TSIG_SECRET_FILE" = "/run/secrets/tsig-secret-example.org"; + } + ''; + }; + dnsPropagationCheck = mkOption { type = types.bool; inherit (defaultAndText "dnsPropagationCheck" true) default defaultText; @@ -755,6 +836,17 @@ in { } ''; }; + maxConcurrentRenewals = mkOption { + default = 5; + type = types.int; + description = lib.mdDoc '' + Maximum number of concurrent certificate generation or renewal jobs. All other + jobs will queue and wait running jobs to finish. Reduces the system load of + certificate generation. + + Set to `0` to allow unlimited number of concurrent job runs." + ''; + }; }; }; @@ -865,6 +957,13 @@ in { `security.acme.certs.${cert}.listenHTTP` must be provided. ''; } + { + assertion = all (hasSuffix "_FILE") (attrNames data.credentialFiles); + message = '' + Option `security.acme.certs.${cert}.credentialFiles` can only be + used for variables suffixed by "_FILE". + ''; + } ]) cfg.certs)); users.users.acme = { @@ -875,12 +974,28 @@ in { users.groups.acme = {}; - systemd.services = { - "acme-fixperms" = userMigrationService; - } // (mapAttrs' (cert: conf: nameValuePair "acme-${cert}" conf.renewService) certConfigs) + # for lock files, still use tmpfiles as they should better reside in /run + systemd.tmpfiles.rules = [ + "d ${lockdir} 0700 ${user} - - -" + "Z ${lockdir} 0700 ${user} - - -" + ]; + + systemd.services = let + renewServiceFunctions = mapAttrs' (cert: conf: nameValuePair "acme-${cert}" conf.renewService) certConfigs; + renewServices = if cfg.maxConcurrentRenewals > 0 + then roundRobinApplyAttrs renewServiceFunctions concurrencyLockfiles + else mapAttrs (_: f: f null) renewServiceFunctions; + selfsignServiceFunctions = mapAttrs' (cert: conf: nameValuePair "acme-selfsigned-${cert}" conf.selfsignService) certConfigs; + selfsignServices = if cfg.maxConcurrentRenewals > 0 + then roundRobinApplyAttrs selfsignServiceFunctions concurrencyLockfiles + else mapAttrs (_: f: f null) selfsignServiceFunctions; + in + { "acme-fixperms" = userMigrationService; } + // (optionalAttrs (cfg.maxConcurrentRenewals > 0) {"acme-lockfiles" = lockfilePrepareService; }) + // renewServices // (optionalAttrs (cfg.preliminarySelfsigned) ({ "acme-selfsigned-ca" = selfsignCAService; - } // (mapAttrs' (cert: conf: nameValuePair "acme-selfsigned-${cert}" conf.selfsignService) certConfigs))); + } // selfsignServices)); systemd.timers = mapAttrs' (cert: conf: nameValuePair "acme-${cert}" conf.renewTimer) certConfigs; diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index a431817fe1..d83259ccbe 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -1303,7 +1303,7 @@ in security.pam.enableEcryptfs = mkEnableOption (lib.mdDoc "eCryptfs PAM module (mounting ecryptfs home directory on login)"); security.pam.enableFscrypt = mkEnableOption (lib.mdDoc '' - Enables fscrypt to automatically unlock directories with the user's login password. + fscrypt to automatically unlock directories with the user's login password. This also enables a service at security.pam.services.fscrypt which is used by fscrypt to verify the user's password when setting up a new protector. If you diff --git a/third_party/nixpkgs/nixos/modules/security/sudo-rs.nix b/third_party/nixpkgs/nixos/modules/security/sudo-rs.nix new file mode 100644 index 0000000000..6b8f09a8d3 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/security/sudo-rs.nix @@ -0,0 +1,296 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + inherit (pkgs) sudo sudo-rs; + + cfg = config.security.sudo-rs; + + enableSSHAgentAuth = + with config.security; + pam.enableSSHAgentAuth && pam.sudo.sshAgentAuth; + + usingMillersSudo = cfg.package.pname == sudo.pname; + usingSudoRs = cfg.package.pname == sudo-rs.pname; + + toUserString = user: if (isInt user) then "#${toString user}" else "${user}"; + toGroupString = group: if (isInt group) then "%#${toString group}" else "%${group}"; + + toCommandOptionsString = options: + "${concatStringsSep ":" options}${optionalString (length options != 0) ":"} "; + + toCommandsString = commands: + concatStringsSep ", " ( + map (command: + if (isString command) then + command + else + "${toCommandOptionsString command.options}${command.command}" + ) commands + ); + +in + +{ + + ###### interface + + options.security.sudo-rs = { + + defaultOptions = mkOption { + type = with types; listOf str; + default = optional usingMillersSudo "SETENV"; + defaultText = literalMD '' + `[ "SETENV" ]` if using the default `sudo` implementation + ''; + description = mdDoc '' + Options used for the default rules, granting `root` and the + `wheel` group permission to run any command as any user. + ''; + }; + + enable = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + Whether to enable the {command}`sudo` command, which + allows non-root users to execute commands as root. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.sudo-rs; + defaultText = literalExpression "pkgs.sudo-rs"; + description = mdDoc '' + Which package to use for `sudo`. + ''; + }; + + wheelNeedsPassword = mkOption { + type = types.bool; + default = true; + description = mdDoc '' + Whether users of the `wheel` group must + provide a password to run commands as super user via {command}`sudo`. + ''; + }; + + execWheelOnly = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + Only allow members of the `wheel` group to execute sudo by + setting the executable's permissions accordingly. + This prevents users that are not members of `wheel` from + exploiting vulnerabilities in sudo such as CVE-2021-3156. + ''; + }; + + configFile = mkOption { + type = types.lines; + # Note: if syntax errors are detected in this file, the NixOS + # configuration will fail to build. + description = mdDoc '' + This string contains the contents of the + {file}`sudoers` file. + ''; + }; + + extraRules = mkOption { + description = mdDoc '' + Define specific rules to be in the {file}`sudoers` file. + More specific rules should come after more general ones in order to + yield the expected behavior. You can use mkBefore/mkAfter to ensure + this is the case when configuration options are merged. + ''; + default = []; + example = literalExpression '' + [ + # Allow execution of any command by all users in group sudo, + # requiring a password. + { groups = [ "sudo" ]; commands = [ "ALL" ]; } + + # Allow execution of "/home/root/secret.sh" by user `backup`, `database` + # and the group with GID `1006` without a password. + { users = [ "backup" "database" ]; groups = [ 1006 ]; + commands = [ { command = "/home/root/secret.sh"; options = [ "SETENV" "NOPASSWD" ]; } ]; } + + # Allow all users of group `bar` to run two executables as user `foo` + # with arguments being pre-set. + { groups = [ "bar" ]; runAs = "foo"; + commands = + [ "/home/baz/cmd1.sh hello-sudo" + { command = '''/home/baz/cmd2.sh ""'''; options = [ "SETENV" ]; } ]; } + ] + ''; + type = with types; listOf (submodule { + options = { + users = mkOption { + type = with types; listOf (either str int); + description = mdDoc '' + The usernames / UIDs this rule should apply for. + ''; + default = []; + }; + + groups = mkOption { + type = with types; listOf (either str int); + description = mdDoc '' + The groups / GIDs this rule should apply for. + ''; + default = []; + }; + + host = mkOption { + type = types.str; + default = "ALL"; + description = mdDoc '' + For what host this rule should apply. + ''; + }; + + runAs = mkOption { + type = with types; str; + default = "ALL:ALL"; + description = mdDoc '' + Under which user/group the specified command is allowed to run. + + A user can be specified using just the username: `"foo"`. + It is also possible to specify a user/group combination using `"foo:bar"` + or to only allow running as a specific group with `":bar"`. + ''; + }; + + commands = mkOption { + description = mdDoc '' + The commands for which the rule should apply. + ''; + type = with types; listOf (either str (submodule { + + options = { + command = mkOption { + type = with types; str; + description = mdDoc '' + A command being either just a path to a binary to allow any arguments, + the full command with arguments pre-set or with `""` used as the argument, + not allowing arguments to the command at all. + ''; + }; + + options = mkOption { + type = with types; listOf (enum [ "NOPASSWD" "PASSWD" "NOEXEC" "EXEC" "SETENV" "NOSETENV" "LOG_INPUT" "NOLOG_INPUT" "LOG_OUTPUT" "NOLOG_OUTPUT" ]); + description = mdDoc '' + Options for running the command. Refer to the [sudo manual](https://www.sudo.ws/man/1.7.10/sudoers.man.html). + ''; + default = []; + }; + }; + + })); + }; + }; + }); + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = mdDoc '' + Extra configuration text appended to {file}`sudoers`. + ''; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + security.sudo-rs.extraRules = + let + defaultRule = { users ? [], groups ? [], opts ? [] }: [ { + inherit users groups; + commands = [ { + command = "ALL"; + options = opts ++ cfg.defaultOptions; + } ]; + } ]; + in mkMerge [ + # This is ordered before users' `mkBefore` rules, + # so as not to introduce unexpected changes. + (mkOrder 400 (defaultRule { users = [ "root" ]; })) + + # This is ordered to show before (most) other rules, but + # late-enough for a user to `mkBefore` it. + (mkOrder 600 (defaultRule { + groups = [ "wheel" ]; + opts = (optional (!cfg.wheelNeedsPassword) "NOPASSWD"); + })) + ]; + + security.sudo-rs.configFile = concatStringsSep "\n" (filter (s: s != "") [ + '' + # Don't edit this file. Set the NixOS options ‘security.sudo-rs.configFile’ + # or ‘security.sudo-rs.extraRules’ instead. + '' + (optionalString enableSSHAgentAuth '' + # Keep SSH_AUTH_SOCK so that pam_ssh_agent_auth.so can do its magic. + Defaults env_keep+=SSH_AUTH_SOCK + '') + (concatStringsSep "\n" ( + lists.flatten ( + map ( + rule: optionals (length rule.commands != 0) [ + (map (user: "${toUserString user} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.users) + (map (group: "${toGroupString group} ${rule.host}=(${rule.runAs}) ${toCommandsString rule.commands}") rule.groups) + ] + ) cfg.extraRules + ) + ) + "\n") + (optionalString (cfg.extraConfig != "") '' + # extraConfig + ${cfg.extraConfig} + '') + ]); + + security.wrappers = let + owner = "root"; + group = if cfg.execWheelOnly then "wheel" else "root"; + setuid = true; + permissions = if cfg.execWheelOnly then "u+rx,g+x" else "u+rx,g+x,o+x"; + in { + sudo = { + source = "${cfg.package.out}/bin/sudo"; + inherit owner group setuid permissions; + }; + # sudo-rs does not yet ship a sudoedit (as of v0.2.0) + sudoedit = mkIf usingMillersSudo { + source = "${cfg.package.out}/bin/sudoedit"; + inherit owner group setuid permissions; + }; + }; + + environment.systemPackages = [ sudo ]; + + security.pam.services.sudo = { sshAgentAuth = true; usshAuth = true; }; + security.pam.services.sudo-i = mkIf usingSudoRs + { sshAgentAuth = true; usshAuth = true; }; + + environment.etc.sudoers = + { source = + pkgs.runCommand "sudoers" + { + src = pkgs.writeText "sudoers-in" cfg.configFile; + preferLocalBuild = true; + } + "${pkgs.buildPackages."${cfg.package.pname}"}/bin/visudo -f $src -c && cp $src $out"; + mode = "0440"; + }; + + }; + + meta.maintainers = [ lib.maintainers.nicoo ]; + +} diff --git a/third_party/nixpkgs/nixos/modules/security/sudo.nix b/third_party/nixpkgs/nixos/modules/security/sudo.nix index 9ac91bd0d3..d225442773 100644 --- a/third_party/nixpkgs/nixos/modules/security/sudo.nix +++ b/third_party/nixpkgs/nixos/modules/security/sudo.nix @@ -192,6 +192,10 @@ in ###### implementation config = mkIf cfg.enable { + assertions = [ + { assertion = cfg.package.pname != "sudo-rs"; + message = "The NixOS `sudo` module does not work with `sudo-rs` yet."; } + ]; # We `mkOrder 600` so that the default rule shows up first, but there is # still enough room for a user to `mkBefore` it. diff --git a/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix b/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix index 12255d8392..a8bb0650b1 100644 --- a/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix +++ b/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix @@ -5,8 +5,29 @@ let parentWrapperDir = dirOf wrapperDir; - securityWrapper = pkgs.callPackage ./wrapper.nix { - inherit parentWrapperDir; + # This is security-sensitive code, and glibc vulns happen from time to time. + # musl is security-focused and generally more minimal, so it's a better choice here. + # The dynamic linker is still a fairly complex piece of code, and the wrappers are + # quite small, so linking it statically is more appropriate. + securityWrapper = sourceProg : pkgs.pkgsStatic.callPackage ./wrapper.nix { + inherit sourceProg; + + # glibc definitions of insecure environment variables + # + # We extract the single header file we need into its own derivation, + # so that we don't have to pull full glibc sources to build wrappers. + # + # They're taken from pkgs.glibc so that we don't have to keep as close + # an eye on glibc changes. Not every relevant variable is in this header, + # so we maintain a slightly stricter list in wrapper.c itself as well. + unsecvars = lib.overrideDerivation (pkgs.srcOnly pkgs.glibc) + ({ name, ... }: { + name = "${name}-unsecvars"; + installPhase = '' + mkdir $out + cp sysdeps/generic/unsecvars.h $out + ''; + }); }; fileModeType = @@ -91,8 +112,7 @@ let , ... }: '' - cp ${securityWrapper}/bin/security-wrapper "$wrapperDir/${program}" - echo -n "${source}" > "$wrapperDir/${program}.real" + cp ${securityWrapper source}/bin/security-wrapper "$wrapperDir/${program}" # Prevent races chmod 0000 "$wrapperDir/${program}" @@ -119,8 +139,7 @@ let , ... }: '' - cp ${securityWrapper}/bin/security-wrapper "$wrapperDir/${program}" - echo -n "${source}" > "$wrapperDir/${program}.real" + cp ${securityWrapper source}/bin/security-wrapper "$wrapperDir/${program}" # Prevent races chmod 0000 "$wrapperDir/${program}" @@ -248,11 +267,13 @@ in export PATH="${wrapperDir}:$PATH" ''; - security.apparmor.includes."nixos/security.wrappers" = '' - include "${pkgs.apparmorRulesFromClosure { name="security.wrappers"; } [ - securityWrapper + security.apparmor.includes = lib.mapAttrs' (wrapName: wrap: lib.nameValuePair + "nixos/security.wrappers/${wrapName}" '' + include "${pkgs.apparmorRulesFromClosure { name="security.wrappers.${wrapName}"; } [ + (securityWrapper wrap.source) ]}" - ''; + mrpx ${wrap.source}, + '') wrappers; ###### wrappers activation script system.activationScripts.wrappers = diff --git a/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.c b/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.c index 17776a97af..cf19c7a4aa 100644 --- a/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.c +++ b/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.c @@ -17,6 +17,13 @@ #include #include +// imported from glibc +#include "unsecvars.h" + +#ifndef SOURCE_PROG +#error SOURCE_PROG should be defined via preprocessor commandline +#endif + // aborts when false, printing the failed expression #define ASSERT(expr) ((expr) ? (void) 0 : assert_failure(#expr)) // aborts when returns non-zero, printing the failed expression and errno @@ -24,10 +31,6 @@ extern char **environ; -// The WRAPPER_DIR macro is supplied at compile time so that it cannot -// be changed at runtime -static char *wrapper_dir = WRAPPER_DIR; - // Wrapper debug variable name static char *wrapper_debug = "WRAPPER_DEBUG"; @@ -151,115 +154,66 @@ static int make_caps_ambient(const char *self_path) { return 0; } -int readlink_malloc(const char *p, char **ret) { - size_t l = FILENAME_MAX+1; - int r; - - for (;;) { - char *c = calloc(l, sizeof(char)); - if (!c) { - return -ENOMEM; - } - - ssize_t n = readlink(p, c, l-1); - if (n < 0) { - r = -errno; - free(c); - return r; - } - - if ((size_t) n < l-1) { - c[n] = 0; - *ret = c; - return 0; - } - - free(c); - l *= 2; - } -} +// These are environment variable aliases for glibc tunables. +// This list shouldn't grow further, since this is a legacy mechanism. +// Any future tunables are expected to only be accessible through GLIBC_TUNABLES. +// +// They are not included in the glibc-provided UNSECURE_ENVVARS list, +// since any SUID executable ignores them. This wrapper also serves +// executables that are merely granted ambient capabilities, rather than +// being SUID, and hence don't run in secure mode. We'd like them to +// defend those in depth as well, so we clear these explicitly. +// +// Except for MALLOC_CHECK_ (which is marked SXID_ERASE), these are all +// marked SXID_IGNORE (ignored in secure mode), so even the glibc version +// of this wrapper would leave them intact. +#define UNSECURE_ENVVARS_TUNABLES \ + "MALLOC_CHECK_\0" \ + "MALLOC_TOP_PAD_\0" \ + "MALLOC_PERTURB_\0" \ + "MALLOC_MMAP_THRESHOLD_\0" \ + "MALLOC_TRIM_THRESHOLD_\0" \ + "MALLOC_MMAP_MAX_\0" \ + "MALLOC_ARENA_MAX\0" \ + "MALLOC_ARENA_TEST\0" int main(int argc, char **argv) { ASSERT(argc >= 1); - char *self_path = NULL; - int self_path_size = readlink_malloc("/proc/self/exe", &self_path); - if (self_path_size < 0) { - fprintf(stderr, "cannot readlink /proc/self/exe: %s", strerror(-self_path_size)); + + int debug = getenv(wrapper_debug) != NULL; + + // Drop insecure environment variables explicitly + // + // glibc does this automatically in SUID binaries, but we'd like to cover this: + // + // a) before it gets to glibc + // b) in binaries that are only granted ambient capabilities by the wrapper, + // but don't run with an altered effective UID/GID, nor directly gain + // capabilities themselves, and thus don't run in secure mode. + // + // We're using musl, which doesn't drop environment variables in secure mode, + // and we'd also like glibc-specific variables to be covered. + // + // If we don't explicitly unset them, it's quite easy to just set LD_PRELOAD, + // have it passed through to the wrapped program, and gain privileges. + for (char *unsec = UNSECURE_ENVVARS_TUNABLES UNSECURE_ENVVARS; *unsec; unsec = strchr(unsec, 0) + 1) { + if (debug) { + fprintf(stderr, "unsetting %s\n", unsec); + } + unsetenv(unsec); } - unsigned int ruid, euid, suid, rgid, egid, sgid; - MUSTSUCCEED(getresuid(&ruid, &euid, &suid)); - MUSTSUCCEED(getresgid(&rgid, &egid, &sgid)); - - // If true, then we did not benefit from setuid privilege escalation, - // where the original uid is still in ruid and different from euid == suid. - int didnt_suid = (ruid == euid) && (euid == suid); - // If true, then we did not benefit from setgid privilege escalation - int didnt_sgid = (rgid == egid) && (egid == sgid); - - - // Make sure that we are being executed from the right location, - // i.e., `safe_wrapper_dir'. This is to prevent someone from creating - // hard link `X' from some other location, along with a false - // `X.real' file, to allow arbitrary programs from being executed - // with elevated capabilities. - int len = strlen(wrapper_dir); - if (len > 0 && '/' == wrapper_dir[len - 1]) - --len; - ASSERT(!strncmp(self_path, wrapper_dir, len)); - ASSERT('/' == wrapper_dir[0]); - ASSERT('/' == self_path[len]); - - // If we got privileges with the fs set[ug]id bit, check that the privilege we - // got matches the one one we expected, ie that our effective uid/gid - // matches the uid/gid of `self_path`. This ensures that we were executed as - // `self_path', and not, say, as some other setuid program. - // We don't check that if we did not benefit from the set[ug]id bit, as - // can be the case in nosuid mounts or user namespaces. - struct stat st; - ASSERT(lstat(self_path, &st) != -1); - - // if the wrapper gained privilege with suid, check that we got the uid of the file owner - ASSERT(!((st.st_mode & S_ISUID) && !didnt_suid) || (st.st_uid == euid)); - // if the wrapper gained privilege with sgid, check that we got the gid of the file group - ASSERT(!((st.st_mode & S_ISGID) && !didnt_sgid) || (st.st_gid == egid)); - // same, but with suid instead of euid - ASSERT(!((st.st_mode & S_ISUID) && !didnt_suid) || (st.st_uid == suid)); - ASSERT(!((st.st_mode & S_ISGID) && !didnt_sgid) || (st.st_gid == sgid)); - - // And, of course, we shouldn't be writable. - ASSERT(!(st.st_mode & (S_IWGRP | S_IWOTH))); - - // Read the path of the real (wrapped) program from .real. - char real_fn[PATH_MAX + 10]; - int real_fn_size = snprintf(real_fn, sizeof(real_fn), "%s.real", self_path); - ASSERT(real_fn_size < sizeof(real_fn)); - - int fd_self = open(real_fn, O_RDONLY); - ASSERT(fd_self != -1); - - char source_prog[PATH_MAX]; - len = read(fd_self, source_prog, PATH_MAX); - ASSERT(len != -1); - ASSERT(len < sizeof(source_prog)); - ASSERT(len > 0); - source_prog[len] = 0; - - close(fd_self); - // Read the capabilities set on the wrapper and raise them in to // the ambient set so the program we're wrapping receives the // capabilities too! - if (make_caps_ambient(self_path) != 0) { - free(self_path); + if (make_caps_ambient("/proc/self/exe") != 0) { return 1; } - free(self_path); - execve(source_prog, argv, environ); + execve(SOURCE_PROG, argv, environ); fprintf(stderr, "%s: cannot run `%s': %s\n", - argv[0], source_prog, strerror(errno)); + argv[0], SOURCE_PROG, strerror(errno)); return 1; } diff --git a/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.nix b/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.nix index e3620fb222..da2fca98d5 100644 --- a/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.nix +++ b/third_party/nixpkgs/nixos/modules/security/wrappers/wrapper.nix @@ -1,4 +1,4 @@ -{ stdenv, linuxHeaders, parentWrapperDir, debug ? false }: +{ stdenv, unsecvars, linuxHeaders, sourceProg, debug ? false }: # For testing: # $ nix-build -E 'with import {}; pkgs.callPackage ./wrapper.nix { parentWrapperDir = "/run/wrappers"; debug = true; }' stdenv.mkDerivation { @@ -7,7 +7,7 @@ stdenv.mkDerivation { dontUnpack = true; hardeningEnable = [ "pie" ]; CFLAGS = [ - ''-DWRAPPER_DIR="${parentWrapperDir}"'' + ''-DSOURCE_PROG="${sourceProg}"'' ] ++ (if debug then [ "-Werror" "-Og" "-g" ] else [ @@ -16,6 +16,6 @@ stdenv.mkDerivation { dontStrip = debug; installPhase = '' mkdir -p $out/bin - $CC $CFLAGS ${./wrapper.c} -o $out/bin/security-wrapper + $CC $CFLAGS ${./wrapper.c} -I${unsecvars} -o $out/bin/security-wrapper ''; } diff --git a/third_party/nixpkgs/nixos/modules/services/audio/castopod.md b/third_party/nixpkgs/nixos/modules/services/audio/castopod.md new file mode 100644 index 0000000000..ee8590737a --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/audio/castopod.md @@ -0,0 +1,22 @@ +# Castopod {#module-services-castopod} + +Castopod is an open-source hosting platform made for podcasters who want to engage and interact with their audience. + +## Quickstart {#module-services-castopod-quickstart} + +Use the following configuration to start a public instance of Castopod on `castopod.example.com` domain: + +```nix +networking.firewall.allowedTCPPorts = [ 80 443 ]; +services.castopod = { + enable = true; + database.createLocally = true; + nginx.virtualHost = { + serverName = "castopod.example.com"; + enableACME = true; + forceSSL = true; + }; +}; +``` + +Go to `https://castopod.example.com/cp-install` to create superadmin account after applying the above configuration. diff --git a/third_party/nixpkgs/nixos/modules/services/audio/castopod.nix b/third_party/nixpkgs/nixos/modules/services/audio/castopod.nix new file mode 100644 index 0000000000..b782b54891 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/audio/castopod.nix @@ -0,0 +1,287 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.castopod; + fpm = config.services.phpfpm.pools.castopod; + + user = "castopod"; + stateDirectory = "/var/lib/castopod"; + + # https://docs.castopod.org/getting-started/install.html#requirements + phpPackage = pkgs.php.withExtensions ({ enabled, all }: with all; [ + intl + curl + mbstring + gd + exif + mysqlnd + ] ++ enabled); +in +{ + meta.doc = ./castopod.md; + meta.maintainers = with lib.maintainers; [ alexoundos misuzu ]; + + options.services = { + castopod = { + enable = lib.mkEnableOption (lib.mdDoc "Castopod"); + package = lib.mkOption { + type = lib.types.package; + default = pkgs.castopod; + defaultText = lib.literalMD "pkgs.castopod"; + description = lib.mdDoc "Which Castopod package to use."; + }; + database = { + createLocally = lib.mkOption { + type = lib.types.bool; + default = true; + description = lib.mdDoc '' + Create the database and database user locally. + ''; + }; + hostname = lib.mkOption { + type = lib.types.str; + default = "localhost"; + description = lib.mdDoc "Database hostname."; + }; + name = lib.mkOption { + type = lib.types.str; + default = "castopod"; + description = lib.mdDoc "Database name."; + }; + user = lib.mkOption { + type = lib.types.str; + default = user; + description = lib.mdDoc "Database user."; + }; + passwordFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/keys/castopod-dbpassword"; + description = lib.mdDoc '' + A file containing the password corresponding to + [](#opt-services.castopod.database.user). + ''; + }; + }; + settings = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ str int bool ]); + default = { }; + example = { + "email.protocol" = "smtp"; + "email.SMTPHost" = "localhost"; + "email.SMTPUser" = "myuser"; + "email.fromEmail" = "castopod@example.com"; + }; + description = lib.mdDoc '' + Environment variables used for Castopod. + See [](https://code.castopod.org/adaures/castopod/-/blob/main/.env.example) + for available environment variables. + ''; + }; + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/keys/castopod-env"; + description = lib.mdDoc '' + Environment file to inject e.g. secrets into the configuration. + See [](https://code.castopod.org/adaures/castopod/-/blob/main/.env.example) + for available environment variables. + ''; + }; + configureNginx = lib.mkOption { + type = lib.types.bool; + default = true; + description = lib.mdDoc "Configure nginx as a reverse proxy for CastoPod."; + }; + localDomain = lib.mkOption { + type = lib.types.str; + example = "castopod.example.org"; + description = lib.mdDoc "The domain serving your CastoPod instance."; + }; + poolSettings = lib.mkOption { + type = with lib.types; attrsOf (oneOf [ str int bool ]); + default = { + "pm" = "dynamic"; + "pm.max_children" = "32"; + "pm.start_servers" = "2"; + "pm.min_spare_servers" = "2"; + "pm.max_spare_servers" = "4"; + "pm.max_requests" = "500"; + }; + description = lib.mdDoc '' + Options for Castopod's PHP pool. See the documentation on `php-fpm.conf` for details on configuration directives. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + services.castopod.settings = + let + sslEnabled = with config.services.nginx.virtualHosts.${cfg.localDomain}; addSSL || forceSSL || onlySSL || enableACME || useACMEHost != null; + baseURL = "http${lib.optionalString sslEnabled "s"}://${cfg.localDomain}"; + in + lib.mapAttrs (name: lib.mkDefault) { + "app.forceGlobalSecureRequests" = sslEnabled; + "app.baseURL" = baseURL; + + "media.baseURL" = "/"; + "media.root" = "media"; + "media.storage" = stateDirectory; + + "admin.gateway" = "admin"; + "auth.gateway" = "auth"; + + "database.default.hostname" = cfg.database.hostname; + "database.default.database" = cfg.database.name; + "database.default.username" = cfg.database.user; + "database.default.DBPrefix" = "cp_"; + + "cache.handler" = "file"; + }; + + services.phpfpm.pools.castopod = { + inherit user; + group = config.services.nginx.group; + phpPackage = phpPackage; + phpOptions = '' + # https://code.castopod.org/adaures/castopod/-/blob/main/docker/production/app/uploads.ini + file_uploads = On + memory_limit = 512M + upload_max_filesize = 500M + post_max_size = 512M + max_execution_time = 300 + max_input_time = 300 + ''; + settings = { + "listen.owner" = config.services.nginx.user; + "listen.group" = config.services.nginx.group; + } // cfg.poolSettings; + }; + + systemd.services.castopod-setup = { + after = lib.optional config.services.mysql.enable "mysql.service"; + requires = lib.optional config.services.mysql.enable "mysql.service"; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.openssl phpPackage ]; + script = + let + envFile = "${stateDirectory}/.env"; + media = "${cfg.settings."media.storage"}/${cfg.settings."media.root"}"; + in + '' + mkdir -p ${stateDirectory}/writable/{cache,logs,session,temp,uploads} + + if [ ! -d ${lib.escapeShellArg media} ]; then + cp --no-preserve=mode,ownership -r ${cfg.package}/share/castopod/public/media ${lib.escapeShellArg media} + fi + + if [ ! -f ${stateDirectory}/salt ]; then + openssl rand -base64 33 > ${stateDirectory}/salt + fi + + cat <<'EOF' > ${envFile} + ${lib.generators.toKeyValue { } cfg.settings} + EOF + + echo "analytics.salt=$(cat ${stateDirectory}/salt)" >> ${envFile} + + ${if (cfg.database.passwordFile != null) then '' + echo "database.default.password=$(cat ${lib.escapeShellArg cfg.database.passwordFile})" >> ${envFile} + '' else '' + echo "database.default.password=" >> ${envFile} + ''} + + ${lib.optionalString (cfg.environmentFile != null) '' + cat ${lib.escapeShellArg cfg.environmentFile}) >> ${envFile} + ''} + + php spark castopod:database-update + ''; + serviceConfig = { + StateDirectory = "castopod"; + WorkingDirectory = "${cfg.package}/share/castopod"; + Type = "oneshot"; + RemainAfterExit = true; + User = user; + Group = config.services.nginx.group; + }; + }; + + systemd.services.castopod-scheduled = { + after = [ "castopod-setup.service" ]; + wantedBy = [ "multi-user.target" ]; + path = [ phpPackage ]; + script = '' + php public/index.php scheduled-activities + php public/index.php scheduled-websub-publish + php public/index.php scheduled-video-clips + ''; + serviceConfig = { + StateDirectory = "castopod"; + WorkingDirectory = "${cfg.package}/share/castopod"; + Type = "oneshot"; + User = user; + Group = config.services.nginx.group; + }; + }; + + systemd.timers.castopod-scheduled = { + wantedBy = [ "timers.target" ]; + timerConfig = { + OnCalendar = "*-*-* *:*:00"; + Unit = "castopod-scheduled.service"; + }; + }; + + services.mysql = lib.mkIf cfg.database.createLocally { + enable = true; + package = lib.mkDefault pkgs.mariadb; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [{ + name = cfg.database.user; + ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; + }]; + }; + + services.nginx = lib.mkIf cfg.configureNginx { + enable = true; + virtualHosts."${cfg.localDomain}" = { + root = lib.mkForce "${cfg.package}/share/castopod/public"; + + extraConfig = '' + try_files $uri $uri/ /index.php?$args; + index index.php index.html; + ''; + + locations."^~ /${cfg.settings."media.root"}/" = { + root = cfg.settings."media.storage"; + extraConfig = '' + add_header Access-Control-Allow-Origin "*"; + expires max; + access_log off; + ''; + }; + + locations."~ \.php$" = { + fastcgiParams = { + SERVER_NAME = "$host"; + }; + extraConfig = '' + fastcgi_intercept_errors on; + fastcgi_index index.php; + fastcgi_pass unix:${fpm.socket}; + try_files $uri =404; + fastcgi_read_timeout 3600; + fastcgi_send_timeout 3600; + ''; + }; + }; + }; + + users.users.${user} = lib.mapAttrs (name: lib.mkDefault) { + description = "Castopod user"; + isSystemUser = true; + group = config.services.nginx.group; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/audio/gonic.nix b/third_party/nixpkgs/nixos/modules/services/audio/gonic.nix index 65cf10f2c4..66daeb60b5 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/gonic.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/gonic.nix @@ -57,6 +57,7 @@ in ReadWritePaths = ""; BindReadOnlyPaths = [ # gonic can access scrobbling services + "-/etc/resolv.conf" "-/etc/ssl/certs/ca-certificates.crt" builtins.storeDir cfg.settings.podcast-path diff --git a/third_party/nixpkgs/nixos/modules/services/audio/tts.nix b/third_party/nixpkgs/nixos/modules/services/audio/tts.nix index 1a355c8ee3..0d93224ec0 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/tts.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/tts.nix @@ -134,6 +134,7 @@ in ProtectProc = "invisible"; ProcSubset = "pid"; RestrictAddressFamilies = [ + "AF_UNIX" "AF_INET" "AF_INET6" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/wyoming/openwakeword.nix b/third_party/nixpkgs/nixos/modules/services/audio/wyoming/openwakeword.nix new file mode 100644 index 0000000000..e1993407da --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/audio/wyoming/openwakeword.nix @@ -0,0 +1,157 @@ +{ config +, lib +, pkgs +, ... +}: + +let + cfg = config.services.wyoming.openwakeword; + + inherit (lib) + concatMapStringsSep + escapeShellArgs + mkOption + mdDoc + mkEnableOption + mkIf + mkPackageOptionMD + types + ; + + inherit (builtins) + toString + ; + + models = [ + # wyoming_openwakeword/models/*.tflite + "alexa" + "hey_jarvis" + "hey_mycroft" + "hey_rhasspy" + "ok_nabu" + ]; + +in + +{ + meta.buildDocsInSandbox = false; + + options.services.wyoming.openwakeword = with types; { + enable = mkEnableOption (mdDoc "Wyoming openWakeWord server"); + + package = mkPackageOptionMD pkgs "wyoming-openwakeword" { }; + + uri = mkOption { + type = strMatching "^(tcp|unix)://.*$"; + default = "tcp://0.0.0.0:10400"; + example = "tcp://192.0.2.1:5000"; + description = mdDoc '' + URI to bind the wyoming server to. + ''; + }; + + models = mkOption { + type = listOf (enum models); + default = models; + description = mdDoc '' + List of wake word models that should be made available. + ''; + }; + + preloadModels = mkOption { + type = listOf (enum models); + default = [ + "ok_nabu" + ]; + description = mdDoc '' + List of wake word models to preload after startup. + ''; + }; + + threshold = mkOption { + type = float; + default = 0.5; + description = mdDoc '' + Activation threshold (0-1), where higher means fewer activations. + + See trigger level for the relationship between activations and + wake word detections. + ''; + apply = toString; + }; + + triggerLevel = mkOption { + type = int; + default = 1; + description = mdDoc '' + Number of activations before a detection is registered. + + A higher trigger level means fewer detections. + ''; + apply = toString; + }; + + extraArgs = mkOption { + type = listOf str; + default = [ ]; + description = mdDoc '' + Extra arguments to pass to the server commandline. + ''; + apply = escapeShellArgs; + }; + }; + + config = mkIf cfg.enable { + systemd.services."wyoming-openwakeword" = { + description = "Wyoming openWakeWord server"; + after = [ + "network-online.target" + ]; + wantedBy = [ + "multi-user.target" + ]; + serviceConfig = { + DynamicUser = true; + User = "wyoming-openwakeword"; + # https://github.com/home-assistant/addons/blob/master/openwakeword/rootfs/etc/s6-overlay/s6-rc.d/openwakeword/run + ExecStart = '' + ${cfg.package}/bin/wyoming-openwakeword \ + --uri ${cfg.uri} \ + ${concatMapStringsSep " " (model: "--model ${model}") cfg.models} \ + ${concatMapStringsSep " " (model: "--preload-model ${model}") cfg.preloadModels} \ + --threshold ${cfg.threshold} \ + --trigger-level ${cfg.triggerLevel} ${cfg.extraArgs} + ''; + CapabilityBoundingSet = ""; + DeviceAllow = ""; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RuntimeDirectory = "wyoming-openwakeword"; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + UMask = "0077"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix index 3b44f097ab..28887f8e2a 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix @@ -84,8 +84,8 @@ let backupScript = mkBackupScript backupJobName cfg; in nameValuePair backupJobName { description = "BorgBackup job ${name}"; - path = with pkgs; [ - borgbackup openssh + path = [ + config.services.borgbackup.package pkgs.openssh ]; script = "exec " + optionalString cfg.inhibitsSleep ''\ ${pkgs.systemd}/bin/systemd-inhibit \ @@ -137,7 +137,7 @@ let ''); mkBorgWrapper = name: cfg: mkWrapperDrv { - original = "${pkgs.borgbackup}/bin/borg"; + original = getExe config.services.borgbackup.package; name = "borg-job-${name}"; set = { BORG_REPO = cfg.repo; } // (mkPassEnv cfg) // cfg.environment; }; @@ -231,6 +231,8 @@ in { ###### interface + options.services.borgbackup.package = mkPackageOptionMD pkgs "borgbackup" { }; + options.services.borgbackup.jobs = mkOption { description = lib.mdDoc '' Deduplicating backups using BorgBackup. @@ -769,6 +771,7 @@ in { users = mkMerge (mapAttrsToList mkUsersConfig repos); - environment.systemPackages = with pkgs; [ borgbackup ] ++ (mapAttrsToList mkBorgWrapper jobs); + environment.systemPackages = + [ config.services.borgbackup.package ] ++ (mapAttrsToList mkBorgWrapper jobs); }); } diff --git a/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix b/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix index b838c17455..9b7f1566eb 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix @@ -166,7 +166,7 @@ in { command = "${pkgs.coreutils}/bin/mkdir"; options = [ "NOPASSWD" ]; } { command = "${pkgs.coreutils}/bin/readlink"; options = [ "NOPASSWD" ]; } # for ssh, they are not the same than the one hard coded in ${pkgs.btrbk} - { command = "/run/current-system/bin/btrfs"; options = [ "NOPASSWD" ]; } + { command = "/run/current-system/sw/bin/btrfs"; options = [ "NOPASSWD" ]; } { command = "/run/current-system/sw/bin/mkdir"; options = [ "NOPASSWD" ]; } { command = "/run/current-system/sw/bin/readlink"; options = [ "NOPASSWD" ]; } ]; @@ -182,7 +182,7 @@ in (doasCmdNoPass "${pkgs.coreutils}/bin/mkdir") (doasCmdNoPass "${pkgs.coreutils}/bin/readlink") # for ssh, they are not the same than the one hard coded in ${pkgs.btrbk} - (doasCmdNoPass "/run/current-system/bin/btrfs") + (doasCmdNoPass "/run/current-system/sw/bin/btrfs") (doasCmdNoPass "/run/current-system/sw/bin/mkdir") (doasCmdNoPass "/run/current-system/sw/bin/readlink") diff --git a/third_party/nixpkgs/nixos/modules/services/backup/duplicati.nix b/third_party/nixpkgs/nixos/modules/services/backup/duplicati.nix index 007396ebfc..9b422635e7 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/duplicati.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/duplicati.nix @@ -10,6 +10,8 @@ in services.duplicati = { enable = mkEnableOption (lib.mdDoc "Duplicati"); + package = mkPackageOptionMD pkgs "duplicati" { }; + port = mkOption { default = 8200; type = types.port; @@ -53,7 +55,7 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.duplicati ]; + environment.systemPackages = [ cfg.package ]; systemd.services.duplicati = { description = "Duplicati backup"; @@ -63,7 +65,7 @@ in { User = cfg.user; Group = "duplicati"; - ExecStart = "${pkgs.duplicati}/bin/duplicati-server --webservice-interface=${cfg.interface} --webservice-port=${toString cfg.port} --server-datafolder=${cfg.dataDir}"; + ExecStart = "${cfg.package}/bin/duplicati-server --webservice-interface=${cfg.interface} --webservice-port=${toString cfg.port} --server-datafolder=${cfg.dataDir}"; Restart = "on-failure"; } (mkIf (cfg.dataDir == "/var/lib/duplicati") { @@ -83,4 +85,3 @@ in }; } - diff --git a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix index 1620770e5b..78220e99c3 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix @@ -260,6 +260,16 @@ in Restic package to use. ''; }; + + createWrapper = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to generate and add a script to the system path, that has the same environment variables set + as the systemd service. This can be used to e.g. mount snapshots or perform other opterations, without + having to manually specify most options. + ''; + }; }; })); default = { }; @@ -316,7 +326,8 @@ in in nameValuePair "restic-backups-${name}" ({ environment = { - RESTIC_CACHE_DIR = "%C/restic-backups-${name}"; + # not %C, because that wouldn't work in the wrapper script + RESTIC_CACHE_DIR = "/var/cache/restic-backups-${name}"; RESTIC_PASSWORD_FILE = backup.passwordFile; RESTIC_REPOSITORY = backup.repository; RESTIC_REPOSITORY_FILE = backup.repositoryFile; @@ -331,8 +342,10 @@ in nameValuePair (rcloneAttrToConf name) (toRcloneVal value) ) backup.rcloneConfig); - path = [ pkgs.openssh ]; + path = [ config.programs.ssh.package ]; restartIfChanged = false; + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; serviceConfig = { Type = "oneshot"; ExecStart = (optionals (backupPaths != "") [ "${resticCmd} backup ${concatStringsSep " " (backup.extraBackupArgs ++ excludeFlags)} ${backupPaths}" ]) @@ -376,5 +389,22 @@ in timerConfig = backup.timerConfig; }) config.services.restic.backups; + + # generate wrapper scripts, as described in the createWrapper option + environment.systemPackages = lib.mapAttrsToList (name: backup: let + extraOptions = lib.concatMapStrings (arg: " -o ${arg}") backup.extraOptions; + resticCmd = "${backup.package}/bin/restic${extraOptions}"; + in pkgs.writeShellScriptBin "restic-${name}" '' + set -a # automatically export variables + ${lib.optionalString (backup.environmentFile != null) "source ${backup.environmentFile}"} + # set same environment variables as the systemd service + ${lib.pipe config.systemd.services."restic-backups-${name}".environment [ + (lib.filterAttrs (_: v: v != null)) + (lib.mapAttrsToList (n: v: "${n}=${v}")) + (lib.concatStringsSep "\n") + ]} + + exec ${resticCmd} $@ + '') (lib.filterAttrs (_: v: v.createWrapper) config.services.restic.backups); }; } diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix index 595374ea1e..9a89745055 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -15,6 +15,7 @@ let defaultMasterCfg = pkgs.writeText "master.cfg" '' from buildbot.plugins import * + ${cfg.extraImports} factory = util.BuildFactory() c = BuildmasterConfig = dict( workers = [${concatStringsSep "," cfg.workers}], @@ -28,6 +29,7 @@ let schedulers = [ ${concatStringsSep "," cfg.schedulers} ], builders = [ ${concatStringsSep "," cfg.builders} ], services = [ ${concatStringsSep "," cfg.reporters} ], + configurators = [ ${concatStringsSep "," cfg.configurators} ], ) for step in [ ${concatStringsSep "," cfg.factorySteps} ]: factory.addStep(step) @@ -79,6 +81,15 @@ in { ]; }; + configurators = mkOption { + type = types.listOf types.str; + description = lib.mdDoc "Configurator Steps, see https://docs.buildbot.net/latest/manual/configuration/configurators.html"; + default = []; + example = [ + "util.JanitorConfigurator(logHorizon=timedelta(weeks=4), hour=12, dayOfWeek=6)" + ]; + }; + enable = mkOption { type = types.bool; default = false; @@ -91,6 +102,13 @@ in { default = "c['buildbotNetUsageData'] = None"; }; + extraImports = mkOption { + type = types.str; + description = lib.mdDoc "Extra python imports to prepend to master.cfg"; + default = ""; + example = "from buildbot.process.project import Project"; + }; + masterCfg = mkOption { type = types.path; description = lib.mdDoc "Optionally pass master.cfg path. Other options in this configuration will be ignored."; @@ -272,7 +290,13 @@ in { Group = cfg.group; WorkingDirectory = cfg.home; # NOTE: call twistd directly with stdout logging for systemd - ExecStart = "${python.pkgs.twisted}/bin/twistd -o --nodaemon --pidfile= --logfile - --python ${tacFile}"; + ExecStart = "${python.pkgs.twisted}/bin/twistd -o --nodaemon --pidfile= --logfile - --python ${cfg.buildbotDir}/buildbot.tac"; + # To reload on upgrade, set the following in your configuration: + # systemd.services.buildbot-master.reloadIfChanged = true; + ExecReload = [ + "${pkgs.coreutils}/bin/ln -sf ${tacFile} ${cfg.buildbotDir}/buildbot.tac" + "${pkgs.coreutils}/bin/kill -HUP $MAINPID" + ]; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner/options.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner/options.nix index ce88092137..f2887c7711 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner/options.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner/options.nix @@ -208,4 +208,12 @@ with lib; ''; default = null; }; + + nodeRuntimes = mkOption { + type = with types; nonEmptyListOf (enum [ "node16" "node20" ]); + default = [ "node20" ]; + description = mdDoc '' + List of Node.js runtimes the runner should support. + ''; + }; } diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner/service.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner/service.nix index 55df83362c..535df7f68e 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner/service.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner/service.nix @@ -22,6 +22,7 @@ with lib; let workDir = if cfg.workDir == null then runtimeDir else cfg.workDir; + package = cfg.package.override { inherit (cfg) nodeRuntimes; }; in { description = "GitHub Actions runner"; @@ -47,7 +48,7 @@ in serviceConfig = mkMerge [ { - ExecStart = "${cfg.package}/bin/Runner.Listener run --startuptype service"; + ExecStart = "${package}/bin/Runner.Listener run --startuptype service"; # Does the following, sequentially: # - If the module configuration or the token has changed, purge the state directory, @@ -149,7 +150,7 @@ in else args+=(--token "$token") fi - ${cfg.package}/bin/Runner.Listener configure "''${args[@]}" + ${package}/bin/Runner.Listener configure "''${args[@]}" # Move the automatically created _diag dir to the logs dir mkdir -p "$STATE_DIRECTORY/_diag" cp -r "$STATE_DIRECTORY/_diag/." "$LOGS_DIRECTORY/" diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hail.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hail.nix deleted file mode 100644 index 62e8b8077c..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hail.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ config, lib, pkgs, ...}: - -with lib; - -let - cfg = config.services.hail; -in { - - - ###### interface - - options.services.hail = { - enable = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc '' - Enables the Hail Auto Update Service. Hail can automatically deploy artifacts - built by a Hydra Continuous Integration server. A common use case is to provide - continuous deployment for single services or a full NixOS configuration.''; - }; - profile = mkOption { - type = types.str; - default = "hail-profile"; - description = lib.mdDoc "The name of the Nix profile used by Hail."; - }; - hydraJobUri = mkOption { - type = types.str; - description = lib.mdDoc "The URI of the Hydra Job."; - }; - netrc = mkOption { - type = types.nullOr types.path; - description = lib.mdDoc "The netrc file to use when fetching data from Hydra."; - default = null; - }; - package = mkOption { - type = types.package; - default = pkgs.haskellPackages.hail; - defaultText = literalExpression "pkgs.haskellPackages.hail"; - description = lib.mdDoc "Hail package to use."; - }; - }; - - - ###### implementation - - config = mkIf cfg.enable { - systemd.services.hail = { - description = "Hail Auto Update Service"; - wants = [ "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ nix ]; - environment = { - HOME = "/var/lib/empty"; - }; - serviceConfig = { - ExecStart = "${cfg.package}/bin/hail --profile ${cfg.profile} --job-uri ${cfg.hydraJobUri}" - + lib.optionalString (cfg.netrc != null) " --netrc-file ${cfg.netrc}"; - }; - }; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/agents.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/agents.nix index cc5b903afd..3b883c72ff 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/agents.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/woodpecker/agents.nix @@ -35,6 +35,16 @@ let ''; }; + path = lib.mkOption { + type = lib.types.listOf lib.types.package; + default = [ ]; + example = [ "" ]; + description = lib.mdDoc '' + Additional packages that should be added to the agent's `PATH`. + Mostly useful for the `local` backend. + ''; + }; + environmentFile = lib.mkOption { type = lib.types.listOf lib.types.path; default = [ ]; @@ -94,7 +104,7 @@ let "-/etc/localtime" ]; }; - inherit (agentCfg) environment; + inherit (agentCfg) environment path; }; }; in @@ -106,28 +116,41 @@ in agents = lib.mkOption { default = { }; type = lib.types.attrsOf agentModule; - example = { - docker = { - environment = { - WOODPECKER_SERVER = "localhost:9000"; - WOODPECKER_BACKEND = "docker"; - DOCKER_HOST = "unix:///run/podman/podman.sock"; + example = lib.literalExpression '' + { + podman = { + environment = { + WOODPECKER_SERVER = "localhost:9000"; + WOODPECKER_BACKEND = "docker"; + DOCKER_HOST = "unix:///run/podman/podman.sock"; + }; + + extraGroups = [ "podman" ]; + + environmentFile = [ "/run/secrets/woodpecker/agent-secret.txt" ]; }; - extraGroups = [ "docker" ]; + exec = { + environment = { + WOODPECKER_SERVER = "localhost:9000"; + WOODPECKER_BACKEND = "local"; + }; - environmentFile = "/run/secrets/woodpecker/agent-secret.txt"; - }; + environmentFile = [ "/run/secrets/woodpecker/agent-secret.txt" ]; - exec = { - environment = { - WOODPECKER_SERVER = "localhost:9000"; - WOODPECKER_BACKEND = "exec"; + path = [ + # Needed to clone repos + git + git-lfs + woodpecker-plugin-git + # Used by the runner as the default shell + bash + # Most likely to be used in pipeline definitions + coreutils + ]; }; - - environmentFile = "/run/secrets/woodpecker/agent-secret.txt"; - }; - }; + } + ''; description = lib.mdDoc "woodpecker-agents configurations"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix b/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix index 329533b35d..3740cd01b5 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix @@ -3,34 +3,291 @@ let inherit (lib) + any + attrNames + attrValues + count escapeShellArg + filterAttrs + flatten + flip + getExe hasAttr + hasInfix + listToAttrs literalExpression + mapAttrsToList + mdDoc mkEnableOption mkIf mkOption + nameValuePair + optional + subtractLists types + unique ; format = pkgs.formats.json { }; cfg = config.services.influxdb2; configFile = format.generate "config.json" cfg.settings; + + validPermissions = [ + "authorizations" + "buckets" + "dashboards" + "orgs" + "tasks" + "telegrafs" + "users" + "variables" + "secrets" + "labels" + "views" + "documents" + "notificationRules" + "notificationEndpoints" + "checks" + "dbrp" + "annotations" + "sources" + "scrapers" + "notebooks" + "remotes" + "replications" + ]; + + # Determines whether at least one active api token is defined + anyAuthDefined = + flip any (attrValues cfg.provision.organizations) + (o: o.present && flip any (attrValues o.auths) + (a: a.present && a.tokenFile != null)); + + provisionState = pkgs.writeText "provision_state.json" (builtins.toJSON { + inherit (cfg.provision) organizations users; + }); + + provisioningScript = pkgs.writeShellScript "post-start-provision" '' + set -euo pipefail + export INFLUX_HOST="http://"${escapeShellArg ( + if ! hasAttr "http-bind-address" cfg.settings + || hasInfix "0.0.0.0" cfg.settings.http-bind-address + then "localhost:8086" + else cfg.settings.http-bind-address + )} + + # Wait for the influxdb server to come online + count=0 + while ! influx ping &>/dev/null; do + if [ "$count" -eq 300 ]; then + echo "Tried for 30 seconds, giving up..." + exit 1 + fi + + if ! kill -0 "$MAINPID"; then + echo "Main server died, giving up..." + exit 1 + fi + + sleep 0.1 + count=$((count++)) + done + + # Do the initial database setup. Pass /dev/null as configs-path to + # avoid saving the token as the active config. + if test -e "$STATE_DIRECTORY/.first_startup"; then + influx setup \ + --configs-path /dev/null \ + --org ${escapeShellArg cfg.provision.initialSetup.organization} \ + --bucket ${escapeShellArg cfg.provision.initialSetup.bucket} \ + --username ${escapeShellArg cfg.provision.initialSetup.username} \ + --password "$(< "$CREDENTIALS_DIRECTORY/admin-password")" \ + --token "$(< "$CREDENTIALS_DIRECTORY/admin-token")" \ + --retention ${toString cfg.provision.initialSetup.retention}s \ + --force >/dev/null + + rm -f "$STATE_DIRECTORY/.first_startup" + fi + + provision_result=$(${getExe pkgs.influxdb2-provision} ${provisionState} "$INFLUX_HOST" "$(< "$CREDENTIALS_DIRECTORY/admin-token")") + if [[ "$(jq '[.auths[] | select(.action == "created")] | length' <<< "$provision_result")" -gt 0 ]]; then + echo "Created at least one new token, queueing service restart so we can manipulate secrets" + touch "$STATE_DIRECTORY/.needs_restart" + fi + ''; + + restarterScript = pkgs.writeShellScript "post-start-restarter" '' + set -euo pipefail + if test -e "$STATE_DIRECTORY/.needs_restart"; then + rm -f "$STATE_DIRECTORY/.needs_restart" + /run/current-system/systemd/bin/systemctl restart influxdb2 + fi + ''; + + organizationSubmodule = types.submodule (organizationSubmod: let + org = organizationSubmod.config._module.args.name; + in { + options = { + present = mkOption { + description = mdDoc "Whether to ensure that this organization is present or absent."; + type = types.bool; + default = true; + }; + + description = mkOption { + description = mdDoc "Optional description for the organization."; + default = null; + type = types.nullOr types.str; + }; + + buckets = mkOption { + description = mdDoc "Buckets to provision in this organization."; + default = {}; + type = types.attrsOf (types.submodule (bucketSubmod: let + bucket = bucketSubmod.config._module.args.name; + in { + options = { + present = mkOption { + description = mdDoc "Whether to ensure that this bucket is present or absent."; + type = types.bool; + default = true; + }; + + description = mkOption { + description = mdDoc "Optional description for the bucket."; + default = null; + type = types.nullOr types.str; + }; + + retention = mkOption { + type = types.ints.unsigned; + default = 0; + description = mdDoc "The duration in seconds for which the bucket will retain data (0 is infinite)."; + }; + }; + })); + }; + + auths = mkOption { + description = mdDoc "API tokens to provision for the user in this organization."; + default = {}; + type = types.attrsOf (types.submodule (authSubmod: let + auth = authSubmod.config._module.args.name; + in { + options = { + id = mkOption { + description = mdDoc "A unique identifier for this authentication token. Since influx doesn't store names for tokens, this will be hashed and appended to the description to identify the token."; + readOnly = true; + default = builtins.substring 0 32 (builtins.hashString "sha256" "${org}:${auth}"); + defaultText = ""; + type = types.str; + }; + + present = mkOption { + description = mdDoc "Whether to ensure that this user is present or absent."; + type = types.bool; + default = true; + }; + + description = mkOption { + description = '' + Optional description for the API token. + Note that the actual token will always be created with a descriptionregardless + of whether this is given or not. The name is always added plus a unique suffix + to later identify the token to track whether it has already been created. + ''; + default = null; + type = types.nullOr types.str; + }; + + tokenFile = mkOption { + type = types.nullOr types.path; + default = null; + description = mdDoc "The token value. If not given, influx will automatically generate one."; + }; + + operator = mkOption { + description = mdDoc "Grants all permissions in all organizations."; + default = false; + type = types.bool; + }; + + allAccess = mkOption { + description = mdDoc "Grants all permissions in the associated organization."; + default = false; + type = types.bool; + }; + + readPermissions = mkOption { + description = mdDoc '' + The read permissions to include for this token. Access is usually granted only + for resources in the associated organization. + + Available permissions are `authorizations`, `buckets`, `dashboards`, + `orgs`, `tasks`, `telegrafs`, `users`, `variables`, `secrets`, `labels`, `views`, + `documents`, `notificationRules`, `notificationEndpoints`, `checks`, `dbrp`, + `annotations`, `sources`, `scrapers`, `notebooks`, `remotes`, `replications`. + + Refer to `influx auth create --help` for a full list with descriptions. + + `buckets` grants read access to all associated buckets. Use `readBuckets` to define + more granular access permissions. + ''; + default = []; + type = types.listOf (types.enum validPermissions); + }; + + writePermissions = mkOption { + description = mdDoc '' + The read permissions to include for this token. Access is usually granted only + for resources in the associated organization. + + Available permissions are `authorizations`, `buckets`, `dashboards`, + `orgs`, `tasks`, `telegrafs`, `users`, `variables`, `secrets`, `labels`, `views`, + `documents`, `notificationRules`, `notificationEndpoints`, `checks`, `dbrp`, + `annotations`, `sources`, `scrapers`, `notebooks`, `remotes`, `replications`. + + Refer to `influx auth create --help` for a full list with descriptions. + + `buckets` grants write access to all associated buckets. Use `writeBuckets` to define + more granular access permissions. + ''; + default = []; + type = types.listOf (types.enum validPermissions); + }; + + readBuckets = mkOption { + description = mdDoc "The organization's buckets which should be allowed to be read"; + default = []; + type = types.listOf types.str; + }; + + writeBuckets = mkOption { + description = mdDoc "The organization's buckets which should be allowed to be written"; + default = []; + type = types.listOf types.str; + }; + }; + })); + }; + }; + }); in { options = { services.influxdb2 = { - enable = mkEnableOption (lib.mdDoc "the influxdb2 server"); + enable = mkEnableOption (mdDoc "the influxdb2 server"); package = mkOption { default = pkgs.influxdb2-server; defaultText = literalExpression "pkgs.influxdb2"; - description = lib.mdDoc "influxdb2 derivation to use."; + description = mdDoc "influxdb2 derivation to use."; type = types.package; }; settings = mkOption { default = { }; - description = lib.mdDoc ''configuration options for influxdb2, see for details.''; + description = mdDoc ''configuration options for influxdb2, see for details.''; type = format.type; }; @@ -41,52 +298,135 @@ in organization = mkOption { type = types.str; example = "main"; - description = "Primary organization name"; + description = mdDoc "Primary organization name"; }; bucket = mkOption { type = types.str; example = "example"; - description = "Primary bucket name"; + description = mdDoc "Primary bucket name"; }; username = mkOption { type = types.str; default = "admin"; - description = "Primary username"; + description = mdDoc "Primary username"; }; retention = mkOption { - type = types.str; - default = "0"; - description = '' - The duration for which the bucket will retain data (0 is infinite). - Accepted units are `ns` (nanoseconds), `us` or `µs` (microseconds), `ms` (milliseconds), - `s` (seconds), `m` (minutes), `h` (hours), `d` (days) and `w` (weeks). - ''; + type = types.ints.unsigned; + default = 0; + description = mdDoc "The duration in seconds for which the bucket will retain data (0 is infinite)."; }; passwordFile = mkOption { type = types.path; - description = "Password for primary user. Don't use a file from the nix store!"; + description = mdDoc "Password for primary user. Don't use a file from the nix store!"; }; tokenFile = mkOption { type = types.path; - description = "API Token to set for the admin user. Don't use a file from the nix store!"; + description = mdDoc "API Token to set for the admin user. Don't use a file from the nix store!"; }; }; + + organizations = mkOption { + description = mdDoc "Organizations to provision."; + example = literalExpression '' + { + myorg = { + description = "My organization"; + buckets.mybucket = { + description = "My bucket"; + retention = 31536000; # 1 year + }; + auths.mytoken = { + readBuckets = ["mybucket"]; + tokenFile = "/run/secrets/mytoken"; + }; + }; + } + ''; + default = {}; + type = types.attrsOf organizationSubmodule; + }; + + users = mkOption { + description = mdDoc "Users to provision."; + default = {}; + example = literalExpression '' + { + # admin = {}; /* The initialSetup.username will automatically be added. */ + myuser.passwordFile = "/run/secrets/myuser_password"; + } + ''; + type = types.attrsOf (types.submodule (userSubmod: let + user = userSubmod.config._module.args.name; + org = userSubmod.config.org; + in { + options = { + present = mkOption { + description = mdDoc "Whether to ensure that this user is present or absent."; + type = types.bool; + default = true; + }; + + passwordFile = mkOption { + description = mdDoc "Password for the user. If unset, the user will not be able to log in until a password is set by an operator! Don't use a file from the nix store!"; + default = null; + type = types.nullOr types.path; + }; + }; + })); + }; }; }; }; config = mkIf cfg.enable { - assertions = [ - { - assertion = !(hasAttr "bolt-path" cfg.settings) && !(hasAttr "engine-path" cfg.settings); - message = "services.influxdb2.config: bolt-path and engine-path should not be set as they are managed by systemd"; - } - ]; + assertions = + [ + { + assertion = !(hasAttr "bolt-path" cfg.settings) && !(hasAttr "engine-path" cfg.settings); + message = "services.influxdb2.config: bolt-path and engine-path should not be set as they are managed by systemd"; + } + ] + ++ flatten (flip mapAttrsToList cfg.provision.organizations (orgName: org: + flip mapAttrsToList org.auths (authName: auth: + [ + { + assertion = 1 == count (x: x) [ + auth.operator + auth.allAccess + (auth.readPermissions != [] + || auth.writePermissions != [] + || auth.readBuckets != [] + || auth.writeBuckets != []) + ]; + message = "influxdb2: provision.organizations.${orgName}.auths.${authName}: The `operator` and `allAccess` options are mutually exclusive with each other and the granular permission settings."; + } + (let unknownBuckets = subtractLists (attrNames org.buckets) auth.readBuckets; in { + assertion = unknownBuckets == []; + message = "influxdb2: provision.organizations.${orgName}.auths.${authName}: Refers to invalid buckets in readBuckets: ${toString unknownBuckets}"; + }) + (let unknownBuckets = subtractLists (attrNames org.buckets) auth.writeBuckets; in { + assertion = unknownBuckets == []; + message = "influxdb2: provision.organizations.${orgName}.auths.${authName}: Refers to invalid buckets in writeBuckets: ${toString unknownBuckets}"; + }) + ] + ) + )); + + services.influxdb2.provision = mkIf cfg.provision.enable { + organizations.${cfg.provision.initialSetup.organization} = { + buckets.${cfg.provision.initialSetup.bucket} = { + inherit (cfg.provision.initialSetup) retention; + }; + }; + users.${cfg.provision.initialSetup.username} = { + inherit (cfg.provision.initialSetup) passwordFile; + }; + }; systemd.services.influxdb2 = { description = "InfluxDB is an open-source, distributed, time series database"; @@ -111,58 +451,38 @@ in "admin-password:${cfg.provision.initialSetup.passwordFile}" "admin-token:${cfg.provision.initialSetup.tokenFile}" ]; + + ExecStartPost = mkIf cfg.provision.enable ( + [provisioningScript] ++ + # Only the restarter runs with elevated privileges + optional anyAuthDefined "+${restarterScript}" + ); }; - path = [pkgs.influxdb2-cli]; + path = [ + pkgs.influxdb2-cli + pkgs.jq + ]; - # Mark if this is the first startup so postStart can do the initial setup - preStart = mkIf cfg.provision.enable '' + # Mark if this is the first startup so postStart can do the initial setup. + # Also extract any token secret mappings and apply them if this isn't the first start. + preStart = let + tokenPaths = listToAttrs (flatten + # For all organizations + (flip mapAttrsToList cfg.provision.organizations + # For each contained token that has a token file + (_: org: flip mapAttrsToList (filterAttrs (_: x: x.tokenFile != null) org.auths) + # Collect id -> tokenFile for the mapping + (_: auth: nameValuePair auth.id auth.tokenFile)))); + tokenMappings = pkgs.writeText "token_mappings.json" (builtins.toJSON tokenPaths); + in mkIf cfg.provision.enable '' if ! test -e "$STATE_DIRECTORY/influxd.bolt"; then touch "$STATE_DIRECTORY/.first_startup" + else + # Manipulate provisioned api tokens if necessary + ${getExe pkgs.influxdb2-token-manipulator} "$STATE_DIRECTORY/influxd.bolt" ${tokenMappings} fi ''; - - postStart = let - initCfg = cfg.provision.initialSetup; - in mkIf cfg.provision.enable ( - '' - set -euo pipefail - export INFLUX_HOST="http://"${escapeShellArg (cfg.settings.http-bind-address or "localhost:8086")} - - # Wait for the influxdb server to come online - count=0 - while ! influx ping &>/dev/null; do - if [ "$count" -eq 300 ]; then - echo "Tried for 30 seconds, giving up..." - exit 1 - fi - - if ! kill -0 "$MAINPID"; then - echo "Main server died, giving up..." - exit 1 - fi - - sleep 0.1 - count=$((count++)) - done - - # Do the initial database setup. Pass /dev/null as configs-path to - # avoid saving the token as the active config. - if test -e "$STATE_DIRECTORY/.first_startup"; then - influx setup \ - --configs-path /dev/null \ - --org ${escapeShellArg initCfg.organization} \ - --bucket ${escapeShellArg initCfg.bucket} \ - --username ${escapeShellArg initCfg.username} \ - --password "$(< "$CREDENTIALS_DIRECTORY/admin-password")" \ - --token "$(< "$CREDENTIALS_DIRECTORY/admin-token")" \ - --retention ${escapeShellArg initCfg.retention} \ - --force >/dev/null - - rm -f "$STATE_DIRECTORY/.first_startup" - fi - '' - ); }; users.extraUsers.influxdb2 = { diff --git a/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix b/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix index cbf988d596..12c8253ab4 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix @@ -187,7 +187,7 @@ in { serviceConfig = { User = pgmanage; Group = pgmanage; - ExecStart = "${pkgs.pgmanage}/sbin/pgmanage -c ${confFile}" + + ExecStart = "${cfg.package}/sbin/pgmanage -c ${confFile}" + optionalString cfg.localOnly " --local-only=true"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix index 0acaf0fd00..7a4fa708ea 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix @@ -106,12 +106,14 @@ in identMap = mkOption { type = types.lines; default = ""; + example = '' + map-name-0 system-username-0 database-username-0 + map-name-1 system-username-1 database-username-1 + ''; description = lib.mdDoc '' Defines the mapping from system users to database users. - The general form is: - - map-name system-username database-username + See the [auth doc](https://postgresql.org/docs/current/auth-username-maps.html). ''; }; @@ -128,6 +130,11 @@ in initialScript = mkOption { type = types.nullOr types.path; default = null; + example = literalExpression '' + pkgs.writeText "init-sql-script" ''' + alter user postgres with password 'myPassword'; + ''';''; + description = lib.mdDoc '' A file containing SQL statements to execute on first startup. ''; @@ -464,13 +471,16 @@ in services.postgresql.dataDir = mkDefault "/var/lib/postgresql/${cfg.package.psqlSchema}"; - services.postgresql.authentication = mkAfter + services.postgresql.authentication = mkMerge [ + (mkBefore "# Generated file; do not edit!") + (mkAfter '' - # Generated file; do not edit! + # default value of services.postgresql.authentication local all all peer host all all 127.0.0.1/32 md5 host all all ::1/128 md5 - ''; + '') + ]; users.users.postgres = { name = "postgres"; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/surrealdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/surrealdb.nix index 050a5336cb..28bd97cd73 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/surrealdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/surrealdb.nix @@ -47,17 +47,13 @@ in { example = 8000; }; - userNamePath = mkOption { - type = types.path; + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + example = [ "--allow-all" "--auth" "--user root" "--pass root" ]; description = lib.mdDoc '' - Path to read the username from. - ''; - }; - - passwordPath = mkOption { - type = types.path; - description = lib.mdDoc '' - Path to read the password from. + Specify a list of additional command line flags, + which get escaped and are then passed to surrealdb. ''; }; }; @@ -73,19 +69,8 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; - script = '' - ${cfg.package}/bin/surreal start \ - --user $(${pkgs.systemd}/bin/systemd-creds cat SURREALDB_USERNAME) \ - --pass $(${pkgs.systemd}/bin/systemd-creds cat SURREALDB_PASSWORD) \ - --bind ${cfg.host}:${toString cfg.port} \ - -- ${cfg.dbPath} - ''; serviceConfig = { - LoadCredential = [ - "SURREALDB_USERNAME:${cfg.userNamePath}" - "SURREALDB_PASSWORD:${cfg.passwordPath}" - ]; - + ExecStart = "${cfg.package}/bin/surreal start --bind ${cfg.host}:${toString cfg.port} ${escapeShellArgs cfg.extraFlags} -- ${cfg.dbPath}"; DynamicUser = true; Restart = "on-failure"; StateDirectory = "surrealdb"; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix index 5d4ddce942..9a45d83962 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-browser-connector.nix @@ -42,6 +42,6 @@ in services.dbus.packages = [ pkgs.gnome-browser-connector ]; - nixpkgs.config.firefox.enableGnomeExtensions = true; + programs.firefox.wrapperConfig.enableGnomeExtensions = true; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/editors/emacs.md b/third_party/nixpkgs/nixos/modules/services/editors/emacs.md index 72364b2951..9db1bd5941 100644 --- a/third_party/nixpkgs/nixos/modules/services/editors/emacs.md +++ b/third_party/nixpkgs/nixos/modules/services/editors/emacs.md @@ -286,11 +286,11 @@ The server should now be ready to serve Emacs clients. ### Starting the client {#module-services-emacs-starting-client} -Ensure that the emacs server is enabled, either by customizing the +Ensure that the Emacs server is enabled, either by customizing the {var}`server-mode` variable, or by adding `(server-start)` to {file}`~/.emacs`. -To connect to the emacs daemon, run one of the following: +To connect to the Emacs daemon, run one of the following: ``` emacsclient FILENAME emacsclient --create-frame # opens a new frame (window) @@ -339,24 +339,10 @@ This will add the symlink ## Configuring Emacs {#module-services-emacs-configuring} -The Emacs init file should be changed to load the extension packages at -startup: +If you want to only use extension packages from Nixpkgs, you can add +`(setq package-archives nil)` to your init file. -::: {.example #module-services-emacs-package-initialisation} -### Package initialization in `.emacs` - -``` -(require 'package) - -;; optional. makes unpure packages archives unavailable -(setq package-archives nil) - -(setq package-enable-at-startup nil) -(package-initialize) -``` -::: - -After the declarative emacs package configuration has been tested, +After the declarative Emacs package configuration has been tested, previously downloaded packages can be cleaned up by removing {file}`~/.emacs.d/elpa` (do make a backup first, in case you forgot a package). diff --git a/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix b/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix index fe3a101597..fad4f39ff2 100644 --- a/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix +++ b/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix @@ -80,6 +80,15 @@ in using the EDITOR environment variable. ''; }; + + startWithGraphical = mkOption { + type = types.bool; + default = config.services.xserver.enable; + defaultText = literalExpression "config.services.xserver.enable"; + description = lib.mdDoc '' + Start emacs with the graphical session instead of any session. Without this, emacs clients will not be able to create frames in the graphical session. + ''; + }; }; config = mkIf (cfg.enable || cfg.install) { @@ -92,7 +101,13 @@ in ExecStop = "${cfg.package}/bin/emacsclient --eval (kill-emacs)"; Restart = "always"; }; - } // optionalAttrs cfg.enable { wantedBy = [ "default.target" ]; }; + + unitConfig = optionalAttrs cfg.startWithGraphical { + After = "graphical-session.target"; + }; + } // optionalAttrs cfg.enable { + wantedBy = if cfg.startWithGraphical then [ "graphical-session.target" ] else [ "default.target" ]; + }; environment.systemPackages = [ cfg.package editorScript desktopApplicationFile ]; diff --git a/third_party/nixpkgs/nixos/modules/services/finance/odoo.nix b/third_party/nixpkgs/nixos/modules/services/finance/odoo.nix index fee9af574b..eec7c4e30c 100644 --- a/third_party/nixpkgs/nixos/modules/services/finance/odoo.nix +++ b/third_party/nixpkgs/nixos/modules/services/finance/odoo.nix @@ -31,6 +31,12 @@ in description = lib.mdDoc '' Odoo configuration settings. For more details see ''; + example = literalExpression '' + options = { + db_user = "odoo"; + db_password="odoo"; + }; + ''; }; domain = mkOption { @@ -112,11 +118,11 @@ in services.postgresql = { enable = true; + ensureDatabases = [ "odoo" ]; ensureUsers = [{ name = "odoo"; ensurePermissions = { "DATABASE odoo" = "ALL PRIVILEGES"; }; }]; - ensureDatabases = [ "odoo" ]; }; }); } diff --git a/third_party/nixpkgs/nixos/modules/services/games/xonotic.nix b/third_party/nixpkgs/nixos/modules/services/games/xonotic.nix new file mode 100644 index 0000000000..c84347ddc9 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/games/xonotic.nix @@ -0,0 +1,198 @@ +{ config +, pkgs +, lib +, ... +}: + +let + cfg = config.services.xonotic; + + serverCfg = pkgs.writeText "xonotic-server.cfg" ( + toString cfg.prependConfig + + "\n" + + builtins.concatStringsSep "\n" ( + lib.mapAttrsToList (key: option: + let + escape = s: lib.escape [ "\"" ] s; + quote = s: "\"${s}\""; + + toValue = x: quote (escape (toString x)); + + value = (if lib.isList option then + builtins.concatStringsSep + " " + (builtins.map (x: toValue x) option) + else + toValue option + ); + in + "${key} ${value}" + ) cfg.settings + ) + + "\n" + + toString cfg.appendConfig + ); +in + +{ + options.services.xonotic = { + enable = lib.mkEnableOption (lib.mdDoc "Xonotic dedicated server"); + + package = lib.mkPackageOption pkgs "xonotic-dedicated" {}; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = lib.mdDoc '' + Open the firewall for TCP and UDP on the specified port. + ''; + }; + + dataDir = lib.mkOption { + type = lib.types.path; + readOnly = true; + default = "/var/lib/xonotic"; + description = lib.mdDoc '' + Data directory. + ''; + }; + + settings = lib.mkOption { + description = lib.mdDoc '' + Generates the `server.cfg` file. Refer to [upstream's example][0] for + details. + + [0]: https://gitlab.com/xonotic/xonotic/-/blob/master/server/server.cfg + ''; + default = {}; + type = lib.types.submodule { + freeformType = with lib.types; let + scalars = oneOf [ singleLineStr int float ]; + in + attrsOf (oneOf [ scalars (nonEmptyListOf scalars) ]); + + options.sv_public = lib.mkOption { + type = lib.types.int; + default = 0; + example = [ (-1) 1 ]; + description = lib.mdDoc '' + Controls whether the server will be publicly listed. + ''; + }; + + options.hostname = lib.mkOption { + type = lib.types.singleLineStr; + default = "Xonotic $g_xonoticversion Server"; + description = lib.mdDoc '' + The name that will appear in the server list. `$g_xonoticversion` + gets replaced with the current version. + ''; + }; + + options.sv_motd = lib.mkOption { + type = lib.types.singleLineStr; + default = ""; + description = lib.mdDoc '' + Text displayed when players join the server. + ''; + }; + + options.sv_termsofservice_url = lib.mkOption { + type = lib.types.singleLineStr; + default = ""; + description = lib.mdDoc '' + URL for the Terms of Service for playing on your server. + ''; + }; + + options.maxplayers = lib.mkOption { + type = lib.types.int; + default = 16; + description = lib.mdDoc '' + Number of player slots on the server, including spectators. + ''; + }; + + options.net_address = lib.mkOption { + type = lib.types.singleLineStr; + default = "0.0.0.0"; + description = lib.mdDoc '' + The address Xonotic will listen on. + ''; + }; + + options.port = lib.mkOption { + type = lib.types.port; + default = 26000; + description = lib.mdDoc '' + The port Xonotic will listen on. + ''; + }; + }; + }; + + # Still useful even though we're using RFC 42 settings because *some* keys + # can be repeated. + appendConfig = lib.mkOption { + type = with lib.types; nullOr lines; + default = null; + description = lib.mdDoc '' + Literal text to insert at the end of `server.cfg`. + ''; + }; + + # Certain changes need to happen at the beginning of the file. + prependConfig = lib.mkOption { + type = with lib.types; nullOr lines; + default = null; + description = lib.mdDoc '' + Literal text to insert at the start of `server.cfg`. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.xonotic = { + description = "Xonotic server"; + wantedBy = [ "multi-user.target" ]; + + environment = { + # Required or else it tries to write the lock file into the nix store + HOME = cfg.dataDir; + }; + + serviceConfig = { + DynamicUser = true; + User = "xonotic"; + StateDirectory = "xonotic"; + ExecStart = "${cfg.package}/bin/xonotic-dedicated"; + + # Symlink the configuration from the nix store to where Xonotic actually + # looks for it + ExecStartPre = [ + "${pkgs.coreutils}/bin/mkdir -p ${cfg.dataDir}/.xonotic/data" + '' + ${pkgs.coreutils}/bin/ln -sf ${serverCfg} \ + ${cfg.dataDir}/.xonotic/data/server.cfg + '' + ]; + + # Cargo-culted from search results about writing Xonotic systemd units + ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID"; + + Restart = "on-failure"; + RestartSec = 10; + StartLimitBurst = 5; + }; + }; + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ + cfg.settings.port + ]; + networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall [ + cfg.settings.port + ]; + }; + + meta.maintainers = with lib.maintainers; [ CobaltCause ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/auto-cpufreq.nix b/third_party/nixpkgs/nixos/modules/services/hardware/auto-cpufreq.nix index fd2e03ef12..9c69ba8920 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/auto-cpufreq.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/auto-cpufreq.nix @@ -15,8 +15,7 @@ in { description = lib.mdDoc '' Configuration for `auto-cpufreq`. - See its [example configuration file] for supported settings. - [example configuration file]: https://github.com/AdnanHodzic/auto-cpufreq/blob/master/auto-cpufreq.conf-example + The available options can be found in [the example configuration file](https://github.com/AdnanHodzic/auto-cpufreq/blob/v${pkgs.auto-cpufreq.version}/auto-cpufreq.conf-example). ''; default = {}; @@ -35,6 +34,7 @@ in { wantedBy = [ "multi-user.target" ]; path = with pkgs; [ bash coreutils ]; + serviceConfig.WorkingDirectory = ""; serviceConfig.ExecStart = [ "" "${lib.getExe pkgs.auto-cpufreq} --daemon --config ${cfgFile}" @@ -42,4 +42,10 @@ in { }; }; }; + + # uses attributes of the linked package + meta = { + buildDocsInSandbox = false; + maintainers = with lib.maintainers; [ nicoo ]; + }; } diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/hddfancontrol.nix b/third_party/nixpkgs/nixos/modules/services/hardware/hddfancontrol.nix new file mode 100644 index 0000000000..f472b5774c --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/hardware/hddfancontrol.nix @@ -0,0 +1,66 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.hddfancontrol; + types = lib.types; +in + +{ + options = { + + services.hddfancontrol.enable = lib.mkEnableOption (lib.mdDoc "hddfancontrol daemon"); + + services.hddfancontrol.disks = lib.mkOption { + type = with types; listOf path; + default = []; + description = lib.mdDoc '' + Drive(s) to get temperature from + ''; + example = ["/dev/sda"]; + }; + + services.hddfancontrol.pwmPaths = lib.mkOption { + type = with types; listOf path; + default = []; + description = lib.mdDoc '' + PWM filepath(s) to control fan speed (under /sys) + ''; + example = ["/sys/class/hwmon/hwmon2/pwm1"]; + }; + + services.hddfancontrol.smartctl = lib.mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Probe temperature using smartctl instead of hddtemp or hdparm + ''; + }; + + services.hddfancontrol.extraArgs = lib.mkOption { + type = with types; listOf str; + default = []; + description = lib.mdDoc '' + Extra commandline arguments for hddfancontrol + ''; + example = ["--pwm-start-value=32" + "--pwm-stop-value=0" + "--spin-down-time=900"]; + }; + }; + + config = lib.mkIf cfg.enable ( + let args = lib.concatLists [ + ["-d"] cfg.disks + ["-p"] cfg.pwmPaths + (lib.optional cfg.smartctl "--smartctl") + cfg.extraArgs + ]; in { + systemd.packages = [pkgs.hddfancontrol]; + + systemd.services.hddfancontrol = { + wantedBy = [ "multi-user.target" ]; + environment.HDDFANCONTROL_ARGS = lib.escapeShellArgs args; + }; + } + ); +} diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/kanata.nix b/third_party/nixpkgs/nixos/modules/services/hardware/kanata.nix index 7d54405013..aac20c6c76 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/kanata.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/kanata.nix @@ -9,8 +9,14 @@ let options = { devices = mkOption { type = types.listOf types.str; + default = [ ]; example = [ "/dev/input/by-id/usb-0000_0000-event-kbd" ]; - description = mdDoc "Paths to keyboard devices."; + description = mdDoc '' + Paths to keyboard devices. + + An empty list, the default value, lets kanata detect which + input devices are keyboards and intercept them all. + ''; }; config = mkOption { type = types.lines; @@ -162,6 +168,14 @@ in }; config = mkIf cfg.enable { + warnings = + let + keyboardsWithEmptyDevices = filterAttrs (name: keyboard: keyboard.devices == [ ]) cfg.keyboards; + existEmptyDevices = length (attrNames keyboardsWithEmptyDevices) > 0; + moreThanOneKeyboard = length (attrNames cfg.keyboards) > 1; + in + optional (existEmptyDevices && moreThanOneKeyboard) "One device can only be intercepted by one kanata instance. Setting services.kanata.keyboards.${head (attrNames keyboardsWithEmptyDevices)}.devices = [ ] and using more than one services.kanata.keyboards may cause a race condition."; + hardware.uinput.enable = true; systemd.services = mapAttrs' mkService cfg.keyboards; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/keyd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/keyd.nix index ead2f456a2..724e9b9568 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/keyd.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/keyd.nix @@ -2,7 +2,6 @@ with lib; let cfg = config.services.keyd; - settingsFormat = pkgs.formats.ini { }; keyboardOptions = { ... }: { options = { @@ -16,7 +15,7 @@ let }; settings = mkOption { - type = settingsFormat.type; + type = (pkgs.formats.ini { }).type; default = { }; example = { main = { @@ -37,6 +36,20 @@ let See how to configure. ''; }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + example = '' + [control+shift] + h = left + ''; + description = lib.mdDoc '' + Extra configuration that is appended to the end of the file. + **Do not** write `ids` section here, use a separate option for it. + You can use this option to define compound layers that must always be defined after the layer they are comprised. + ''; + }; }; }; in @@ -85,15 +98,12 @@ in environment.etc = mapAttrs' (name: options: nameValuePair "keyd/${name}.conf" { - source = pkgs.runCommand "${name}.conf" - { - ids = '' - [ids] - ${concatStringsSep "\n" options.ids} - ''; - passAsFile = [ "ids" ]; - } '' - cat $idsPath <(echo) ${settingsFormat.generate "keyd-${name}.conf" options.settings} >$out + text = '' + [ids] + ${concatStringsSep "\n" options.ids} + + ${generators.toINI {} options.settings} + ${options.extraConfig} ''; }) cfg.keyboards; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/openrgb.nix b/third_party/nixpkgs/nixos/modules/services/hardware/openrgb.nix index 310615ecc5..13b1d07e53 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/openrgb.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/openrgb.nix @@ -17,7 +17,14 @@ in { motherboard = mkOption { type = types.nullOr (types.enum [ "amd" "intel" ]); - default = null; + default = if config.hardware.cpu.intel.updateMicrocode then "intel" + else if config.hardware.cpu.amd.updateMicrocode then "amd" + else null; + defaultText = literalMD '' + if config.hardware.cpu.intel.updateMicrocode then "intel" + else if config.hardware.cpu.amd.updateMicrocode then "amd" + else null; + ''; description = lib.mdDoc "CPU family of motherboard. Allows for addition motherboard i2c support."; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/tlp.nix b/third_party/nixpkgs/nixos/modules/services/hardware/tlp.nix index d2cc7c661c..cad510e571 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/tlp.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/tlp.nix @@ -65,7 +65,7 @@ in "tlp.conf".text = (mkTlpConfig cfg.settings) + cfg.extraConfig; } // optionalAttrs enableRDW { "NetworkManager/dispatcher.d/99tlp-rdw-nm".source = - "${tlp}/etc/NetworkManager/dispatcher.d/99tlp-rdw-nm"; + "${tlp}/usr/lib/NetworkManager/dispatcher.d/99tlp-rdw-nm"; }; environment.systemPackages = [ tlp ]; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/tuxedo-rs.nix b/third_party/nixpkgs/nixos/modules/services/hardware/tuxedo-rs.nix new file mode 100644 index 0000000000..343f6845fa --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/hardware/tuxedo-rs.nix @@ -0,0 +1,49 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.hardware.tuxedo-rs; + +in +{ + options = { + hardware.tuxedo-rs = { + enable = mkEnableOption (lib.mdDoc "Rust utilities for interacting with hardware from TUXEDO Computers."); + + tailor-gui.enable = mkEnableOption (lib.mdDoc "Alternative to TUXEDO Control Center, written in Rust."); + }; + }; + + config = mkIf cfg.enable (mkMerge [ + { + hardware.tuxedo-keyboard.enable = true; + + systemd = { + services.tailord = { + enable = true; + description = "Tuxedo Tailor hardware control service"; + after = [ "systemd-logind.service" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "dbus"; + BusName = "com.tux.Tailor"; + ExecStart = "${pkgs.tuxedo-rs}/bin/tailord"; + Environment = "RUST_BACKTRACE=1"; + Restart = "on-failure"; + }; + }; + }; + + services.dbus.packages = [ pkgs.tuxedo-rs ]; + + environment.systemPackages = [ pkgs.tuxedo-rs ]; + } + (mkIf cfg.tailor-gui.enable { + environment.systemPackages = [ pkgs.tailor-gui ]; + }) + ]); + + meta.maintainers = with maintainers; [ mrcjkb ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix index 0b8b1d7194..7dc08d4356 100644 --- a/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix +++ b/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix @@ -457,10 +457,12 @@ in { "inkbird" "keymitt_ble" "led_ble" + "medcom_ble" "melnor" "moat" "mopeka" "oralb" + "private_ble_device" "qingping" "rapt_ble" "ruuvi_gateway" diff --git a/third_party/nixpkgs/nixos/modules/services/home-automation/zigbee2mqtt.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/zigbee2mqtt.nix index 796de3a491..6b5bd8a0d9 100644 --- a/third_party/nixpkgs/nixos/modules/services/home-automation/zigbee2mqtt.nix +++ b/third_party/nixpkgs/nixos/modules/services/home-automation/zigbee2mqtt.nix @@ -66,9 +66,10 @@ in server = mkDefault "mqtt://localhost:1883"; }; serial.port = mkDefault "/dev/ttyACM0"; - # reference device configuration, that is kept in a separate file + # reference device/group configuration, that is kept in a separate file # to prevent it being overwritten in the units ExecStartPre script devices = mkDefault "devices.yaml"; + groups = mkDefault "groups.yaml"; }; systemd.services.zigbee2mqtt = { diff --git a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix index 342ac5ec6e..ba1445f083 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; @@ -220,6 +220,12 @@ in in this case you can disable the failing check with this option. ''; }; + + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = []; + description = "Additional command line arguments to pass on logrotate invocation"; + }; }; }; @@ -231,7 +237,7 @@ in serviceConfig = { Restart = "no"; User = "root"; - ExecStart = "${pkgs.logrotate}/sbin/logrotate ${mailOption} ${cfg.configFile}"; + ExecStart = "${pkgs.logrotate}/sbin/logrotate ${utils.escapeSystemdExecArgs cfg.extraArgs} ${mailOption} ${cfg.configFile}"; }; }; systemd.services.logrotate-checkconf = { @@ -240,7 +246,7 @@ in serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - ExecStart = "${pkgs.logrotate}/sbin/logrotate --debug ${cfg.configFile}"; + ExecStart = "${pkgs.logrotate}/sbin/logrotate ${utils.escapeSystemdExecArgs cfg.extraArgs} --debug ${cfg.configFile}"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/ulogd.nix b/third_party/nixpkgs/nixos/modules/services/logging/ulogd.nix index 065032b531..05c9797bb2 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/ulogd.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/ulogd.nix @@ -3,7 +3,7 @@ with lib; let cfg = config.services.ulogd; - settingsFormat = pkgs.formats.ini { }; + settingsFormat = pkgs.formats.ini { listsAsDuplicateKeys = true; }; settingsFile = settingsFormat.generate "ulogd.conf" cfg.settings; in { options = { @@ -12,22 +12,34 @@ in { settings = mkOption { example = { - global.stack = "stack=log1:NFLOG,base1:BASE,pcap1:PCAP"; + global.stack = [ + "log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU" + "log1:NFLOG,base1:BASE,pcap1:PCAP" + ]; + log1.group = 2; + pcap1 = { - file = "/var/log/ulogd.pcap"; sync = 1; + file = "/var/log/ulogd.pcap"; + }; + + emu1 = { + sync = 1; + file = "/var/log/ulogd_pkts.log"; }; }; type = settingsFormat.type; default = { }; - description = lib.mdDoc "Configuration for ulogd. See {file}`/share/doc/ulogd/` in `pkgs.ulogd.doc`."; + description = lib.mdDoc + "Configuration for ulogd. See {file}`/share/doc/ulogd/` in `pkgs.ulogd.doc`."; }; logLevel = mkOption { type = types.enum [ 1 3 5 7 8 ]; default = 5; - description = lib.mdDoc "Log level (1 = debug, 3 = info, 5 = notice, 7 = error, 8 = fatal)"; + description = lib.mdDoc + "Log level (1 = debug, 3 = info, 5 = notice, 7 = error, 8 = fatal)"; }; }; }; @@ -40,7 +52,10 @@ in { before = [ "network-pre.target" ]; serviceConfig = { - ExecStart = "${pkgs.ulogd}/bin/ulogd -c ${settingsFile} --verbose --loglevel ${toString cfg.logLevel}"; + ExecStart = + "${pkgs.ulogd}/bin/ulogd -c ${settingsFile} --verbose --loglevel ${ + toString cfg.logLevel + }"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/listmonk.nix b/third_party/nixpkgs/nixos/modules/services/mail/listmonk.nix index 251362fdd8..11b2a51862 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/listmonk.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/listmonk.nix @@ -54,7 +54,7 @@ let smtp = mkOption { type = listOf (submodule { - freeformType = with types; attrsOf (oneOf [ str int bool ]); + freeformType = with types; attrsOf anything; options = { enabled = mkEnableOption (lib.mdDoc "this SMTP server for listmonk"); @@ -86,7 +86,7 @@ let # TODO: refine this type based on the smtp one. "bounce.mailboxes" = mkOption { type = listOf - (submodule { freeformType = with types; oneOf [ str int bool ]; }); + (submodule { freeformType = with types; listOf (attrsOf anything); }); default = [ ]; description = lib.mdDoc "List of bounce mailboxes"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/stalwart-mail.nix b/third_party/nixpkgs/nixos/modules/services/mail/stalwart-mail.nix new file mode 100644 index 0000000000..eb87d9f6f6 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/mail/stalwart-mail.nix @@ -0,0 +1,106 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.stalwart-mail; + configFormat = pkgs.formats.toml { }; + configFile = configFormat.generate "stalwart-mail.toml" cfg.settings; + dataDir = "/var/lib/stalwart-mail"; + +in { + options.services.stalwart-mail = { + enable = mkEnableOption (mdDoc "the Stalwart all-in-one email server"); + package = mkPackageOptionMD pkgs "stalwart-mail" { }; + + settings = mkOption { + inherit (configFormat) type; + default = { }; + description = mdDoc '' + Configuration options for the Stalwart email server. + See for available options. + + By default, the module is configured to store everything locally. + ''; + }; + }; + + config = mkIf cfg.enable { + # Default config: all local + services.stalwart-mail.settings = { + global.tracing.method = mkDefault "stdout"; + global.tracing.level = mkDefault "info"; + queue.path = mkDefault "${dataDir}/queue"; + report.path = mkDefault "${dataDir}/reports"; + store.db.path = mkDefault "${dataDir}/data/index.sqlite3"; + store.blob.type = mkDefault "local"; + store.blob.local.path = mkDefault "${dataDir}/data/blobs"; + resolver.type = mkDefault "system"; + }; + + systemd.services.stalwart-mail = { + wantedBy = [ "multi-user.target" ]; + after = [ "local-fs.target" "network.target" ]; + + preStart = '' + mkdir -p ${dataDir}/{queue,reports,data/blobs} + ''; + + serviceConfig = { + ExecStart = + "${cfg.package}/bin/stalwart-mail --config=${configFile}"; + + # Base from template resources/systemd/stalwart-mail.service + Type = "simple"; + LimitNOFILE = 65536; + KillMode = "process"; + KillSignal = "SIGINT"; + Restart = "on-failure"; + RestartSec = 5; + StandardOutput = "syslog"; + StandardError = "syslog"; + SyslogIdentifier = "stalwart-mail"; + + DynamicUser = true; + User = "stalwart-mail"; + StateDirectory = "stalwart-mail"; + + # Bind standard privileged ports + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; + + # Hardening + DeviceAllow = [ "" ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + PrivateDevices = true; + PrivateUsers = false; # incompatible with CAP_NET_BIND_SERVICE + ProcSubset = "pid"; + PrivateTmp = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" ]; + UMask = "0077"; + }; + }; + + # Make admin commands available in the shell + environment.systemPackages = [ cfg.package ]; + }; + + meta = { + maintainers = with maintainers; [ happysalada pacien ]; + }; +} 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 index 9bf4de3317..7e464d6ed5 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/matrix-sliding-sync.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/matrix-sliding-sync.nix @@ -7,7 +7,7 @@ in options.services.matrix-synapse.sliding-sync = { enable = lib.mkEnableOption (lib.mdDoc "sliding sync"); - package = lib.mkPackageOption pkgs "matrix-sliding-sync" { }; + package = lib.mkPackageOptionMD pkgs "matrix-sliding-sync" { }; settings = lib.mkOption { type = lib.types.submodule { @@ -44,7 +44,7 @@ in }; }; default = { }; - description = '' + description = lib.mdDoc '' Freeform environment variables passed to the sliding sync proxy. Refer to for all supported values. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-telegram.nix b/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-telegram.nix index 17032ed808..97a6ba858e 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-telegram.nix @@ -159,7 +159,6 @@ in { if [ ! -f '${registrationFile}' ]; then ${pkgs.mautrix-telegram}/bin/mautrix-telegram \ --generate-registration \ - --base-config='${pkgs.mautrix-telegram}/${pkgs.mautrix-telegram.pythonModule.sitePackages}/mautrix_telegram/example-config.yaml' \ --config='${settingsFile}' \ --registration='${registrationFile}' fi diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-whatsapp.nix b/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-whatsapp.nix index 80c8598019..c4dc482134 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-whatsapp.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-whatsapp.nix @@ -11,53 +11,47 @@ settingsFileUnsubstituted = settingsFormat.generate "mautrix-whatsapp-config-unsubstituted.json" cfg.settings; settingsFormat = pkgs.formats.json {}; appservicePort = 29318; + + mkDefaults = lib.mapAttrsRecursive (n: v: lib.mkDefault v); + defaultConfig = { + homeserver.address = "http://localhost:8448"; + appservice = { + hostname = "[::]"; + port = appservicePort; + database.type = "sqlite3"; + database.uri = "${dataDir}/mautrix-whatsapp.db"; + id = "whatsapp"; + bot.username = "whatsappbot"; + bot.displayname = "WhatsApp Bridge Bot"; + as_token = ""; + hs_token = ""; + }; + bridge = { + username_template = "whatsapp_{{.}}"; + displayname_template = "{{if .BusinessName}}{{.BusinessName}}{{else if .PushName}}{{.PushName}}{{else}}{{.JID}}{{end}} (WA)"; + double_puppet_server_map = {}; + login_shared_secret_map = {}; + command_prefix = "!wa"; + permissions."*" = "relay"; + relay.enabled = true; + }; + logging = { + min_level = "info"; + writers = lib.singleton { + type = "stdout"; + format = "pretty-colored"; + time_format = " "; + }; + }; + }; + in { - imports = []; options.services.mautrix-whatsapp = { - enable = lib.mkEnableOption "mautrix-whatsapp, a puppeting/relaybot bridge between Matrix and WhatsApp."; + enable = lib.mkEnableOption (lib.mdDoc "mautrix-whatsapp, a puppeting/relaybot bridge between Matrix and WhatsApp."); settings = lib.mkOption { type = settingsFormat.type; - default = { - appservice = { - address = "http://localhost:${toString appservicePort}"; - hostname = "[::]"; - port = appservicePort; - database = { - type = "sqlite3"; - uri = "${dataDir}/mautrix-whatsapp.db"; - }; - id = "whatsapp"; - bot = { - username = "whatsappbot"; - displayname = "WhatsApp Bridge Bot"; - }; - as_token = ""; - hs_token = ""; - }; - bridge = { - username_template = "whatsapp_{{.}}"; - displayname_template = "{{if .BusinessName}}{{.BusinessName}}{{else if .PushName}}{{.PushName}}{{else}}{{.JID}}{{end}} (WA)"; - double_puppet_server_map = {}; - login_shared_secret_map = {}; - command_prefix = "!wa"; - permissions."*" = "relay"; - relay.enabled = true; - }; - logging = { - min_level = "info"; - writers = [ - { - type = "stdout"; - format = "pretty-colored"; - } - { - type = "file"; - format = "json"; - } - ]; - }; - }; + default = defaultConfig; description = lib.mdDoc '' {file}`config.yaml` configuration as a Nix attribute set. Configuration options should match those described in @@ -117,10 +111,22 @@ in { }; config = lib.mkIf cfg.enable { - services.mautrix-whatsapp.settings = { - homeserver.domain = lib.mkDefault config.services.matrix-synapse.settings.server_name; + + users.users.mautrix-whatsapp = { + isSystemUser = true; + group = "mautrix-whatsapp"; + home = dataDir; + description = "Mautrix-WhatsApp bridge user"; }; + users.groups.mautrix-whatsapp = {}; + + services.mautrix-whatsapp.settings = lib.mkMerge (map mkDefaults [ + defaultConfig + # Note: this is defined here to avoid the docs depending on `config` + { homeserver.domain = config.services.matrix-synapse.settings.server_name; } + ]); + systemd.services.mautrix-whatsapp = { description = "Mautrix-WhatsApp Service - A WhatsApp bridge for Matrix"; @@ -158,10 +164,11 @@ in { ''; serviceConfig = { - DynamicUser = true; + User = "mautrix-whatsapp"; + Group = "mautrix-whatsapp"; EnvironmentFile = cfg.environmentFile; StateDirectory = baseNameOf dataDir; - WorkingDirectory = "${dataDir}"; + WorkingDirectory = dataDir; ExecStart = '' ${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp \ --config='${settingsFile}' \ diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/synapse-log_config.yaml b/third_party/nixpkgs/nixos/modules/services/matrix/synapse-log_config.yaml deleted file mode 100644 index d85bdd1208..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/matrix/synapse-log_config.yaml +++ /dev/null @@ -1,25 +0,0 @@ -version: 1 - -# In systemd's journal, loglevel is implicitly stored, so let's omit it -# from the message text. -formatters: - journal_fmt: - format: '%(name)s: [%(request)s] %(message)s' - -filters: - context: - (): synapse.util.logcontext.LoggingContextFilter - request: "" - -handlers: - journal: - class: systemd.journal.JournalHandler - formatter: journal_fmt - filters: [context] - SYSLOG_IDENTIFIER: synapse - -root: - level: INFO - handlers: [journal] - -disable_existing_loggers: False diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/synapse.md b/third_party/nixpkgs/nixos/modules/services/matrix/synapse.md index 1d22805b47..58be24204f 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/synapse.md +++ b/third_party/nixpkgs/nixos/modules/services/matrix/synapse.md @@ -31,7 +31,7 @@ let clientConfig."m.homeserver".base_url = baseUrl; serverConfig."m.server" = "${fqdn}:443"; mkWellKnown = data: '' - add_header Content-Type application/json; + default_type application/json; add_header Access-Control-Allow-Origin *; return 200 '${builtins.toJSON data}'; ''; diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/synapse.nix b/third_party/nixpkgs/nixos/modules/services/matrix/synapse.nix index ef69a8adeb..1354a8cb58 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/synapse.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/synapse.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.matrix-synapse; - format = pkgs.formats.yaml {}; + format = pkgs.formats.yaml { }; # remove null values from the final configuration finalSettings = lib.filterAttrsRecursive (_: v: v != null) cfg.settings; @@ -13,27 +13,28 @@ let usePostgresql = cfg.settings.database.name == "psycopg2"; hasLocalPostgresDB = let args = cfg.settings.database.args; in usePostgresql && (!(args ? host) || (elem args.host [ "localhost" "127.0.0.1" "::1" ])); + hasWorkers = cfg.workers != { }; + + listenerSupportsResource = resource: listener: + lib.any ({ names, ... }: builtins.elem resource names) listener.resources; + + clientListener = findFirst + (listenerSupportsResource "client") + null + (cfg.settings.listeners + ++ concatMap ({ worker_listeners, ... }: worker_listeners) (attrValues cfg.workers)); registerNewMatrixUser = let - isIpv6 = x: lib.length (lib.splitString ":" x) > 1; - listener = - lib.findFirst ( - listener: lib.any ( - resource: lib.any ( - name: name == "client" - ) resource.names - ) listener.resources - ) (lib.last cfg.settings.listeners) cfg.settings.listeners; - # FIXME: Handle cases with missing client listener properly, - # don't rely on lib.last, this will not work. + isIpv6 = hasInfix ":"; # add a tail, so that without any bind_addresses we still have a useable address - bindAddress = head (listener.bind_addresses ++ [ "127.0.0.1" ]); - listenerProtocol = if listener.tls + bindAddress = head (clientListener.bind_addresses ++ [ "127.0.0.1" ]); + listenerProtocol = if clientListener.tls then "https" else "http"; in + assert assertMsg (clientListener != null) "No client listener found in synapse or one of its workers"; pkgs.writeShellScriptBin "matrix-synapse-register_new_matrix_user" '' exec ${cfg.package}/bin/register_new_matrix_user \ $@ \ @@ -43,7 +44,7 @@ let "[${bindAddress}]" else "${bindAddress}" - }:${builtins.toString listener.port}/" + }:${builtins.toString clientListener.port}/" ''; defaultExtras = [ @@ -68,6 +69,48 @@ let extras = wantedExtras; inherit (cfg) plugins; }; + + logConfig = logName: { + version = 1; + formatters.journal_fmt.format = "%(name)s: [%(request)s] %(message)s"; + handlers.journal = { + class = "systemd.journal.JournalHandler"; + formatter = "journal_fmt"; + SYSLOG_IDENTIFIER = logName; + }; + root = { + level = "INFO"; + handlers = [ "journal" ]; + }; + disable_existing_loggers = false; + }; + logConfigText = logName: + let + expr = '' + { + version = 1; + formatters.journal_fmt.format = "%(name)s: [%(request)s] %(message)s"; + handlers.journal = { + class = "systemd.journal.JournalHandler"; + formatter = "journal_fmt"; + SYSLOG_IDENTIFIER = "${logName}"; + }; + root = { + level = "INFO"; + handlers = [ "journal" ]; + }; + disable_existing_loggers = false; + }; + ''; + in + lib.literalMD '' + Path to a yaml file generated from this Nix expression: + + ``` + ${expr} + ``` + ''; + genLogConfigFile = logName: format.generate "synapse-log-${logName}.yaml" (logConfig logName); in { imports = [ @@ -154,7 +197,108 @@ in { ]; - options = { + options = let + listenerType = workerContext: types.submodule { + options = { + port = mkOption { + type = types.port; + example = 8448; + description = lib.mdDoc '' + The port to listen for HTTP(S) requests on. + ''; + }; + + bind_addresses = mkOption { + type = types.listOf types.str; + default = [ + "::1" + "127.0.0.1" + ]; + example = literalExpression '' + [ + "::" + "0.0.0.0" + ] + ''; + description = lib.mdDoc '' + IP addresses to bind the listener to. + ''; + }; + + type = mkOption { + type = types.enum [ + "http" + "manhole" + "metrics" + "replication" + ]; + default = "http"; + example = "metrics"; + description = lib.mdDoc '' + The type of the listener, usually http. + ''; + }; + + tls = mkOption { + type = types.bool; + default = !workerContext; + example = false; + description = lib.mdDoc '' + Whether to enable TLS on the listener socket. + ''; + }; + + x_forwarded = mkOption { + type = types.bool; + default = false; + example = true; + description = lib.mdDoc '' + Use the X-Forwarded-For (XFF) header as the client IP and not the + actual client IP. + ''; + }; + + resources = mkOption { + type = types.listOf (types.submodule { + options = { + names = mkOption { + type = types.listOf (types.enum [ + "client" + "consent" + "federation" + "health" + "keys" + "media" + "metrics" + "openid" + "replication" + "static" + ]); + description = lib.mdDoc '' + List of resources to host on this listener. + ''; + example = [ + "client" + ]; + }; + compress = mkOption { + default = false; + type = types.bool; + description = lib.mdDoc '' + Whether synapse should compress HTTP responses to clients that support it. + This should be disabled if running synapse behind a load balancer + that can do automatic compression. + ''; + }; + }; + }); + description = lib.mdDoc '' + List of HTTP resources to serve on this listener. + ''; + }; + }; + }; + in { services.matrix-synapse = { enable = mkEnableOption (lib.mdDoc "matrix.org synapse"); @@ -251,7 +395,7 @@ in { }; settings = mkOption { - default = {}; + default = { }; description = mdDoc '' The primary synapse configuration. See the [sample configuration](https://github.com/matrix-org/synapse/blob/v${pkgs.matrix-synapse-unwrapped.version}/docs/sample_config.yaml) @@ -346,8 +490,8 @@ in { log_config = mkOption { type = types.path; - default = ./synapse-log_config.yaml; - defaultText = lib.literalExpression "nixos/modules/services/matrix/synapse-log_config.yaml"; + default = genLogConfigFile "synapse"; + defaultText = logConfigText "synapse"; description = lib.mdDoc '' The file that holds the logging configuration. ''; @@ -409,120 +553,37 @@ in { }; listeners = mkOption { - type = types.listOf (types.submodule { - options = { - port = mkOption { - type = types.port; - example = 8448; - description = lib.mdDoc '' - The port to listen for HTTP(S) requests on. - ''; - }; - - bind_addresses = mkOption { - type = types.listOf types.str; - default = [ - "::1" - "127.0.0.1" - ]; - example = literalExpression '' - [ - "::" - "0.0.0.0" - ] - ''; - description = lib.mdDoc '' - IP addresses to bind the listener to. - ''; - }; - - type = mkOption { - type = types.enum [ - "http" - "manhole" - "metrics" - "replication" - ]; - default = "http"; - example = "metrics"; - description = lib.mdDoc '' - The type of the listener, usually http. - ''; - }; - - tls = mkOption { - type = types.bool; - default = true; - example = false; - description = lib.mdDoc '' - Whether to enable TLS on the listener socket. - ''; - }; - - x_forwarded = mkOption { - type = types.bool; - default = false; - example = true; - description = lib.mdDoc '' - Use the X-Forwarded-For (XFF) header as the client IP and not the - actual client IP. - ''; - }; - - resources = mkOption { - type = types.listOf (types.submodule { - options = { - names = mkOption { - type = types.listOf (types.enum [ - "client" - "consent" - "federation" - "keys" - "media" - "metrics" - "openid" - "replication" - "static" - ]); - description = lib.mdDoc '' - List of resources to host on this listener. - ''; - example = [ - "client" - ]; - }; - compress = mkOption { - type = types.bool; - description = lib.mdDoc '' - Should synapse compress HTTP responses to clients that support it? - This should be disabled if running synapse behind a load balancer - that can do automatic compression. - ''; - }; - }; - }); - description = lib.mdDoc '' - List of HTTP resources to serve on this listener. - ''; - }; - }; - }); - default = [ { + type = types.listOf (listenerType false); + default = [{ port = 8008; bind_addresses = [ "127.0.0.1" ]; type = "http"; tls = false; x_forwarded = true; - resources = [ { + resources = [{ names = [ "client" ]; compress = true; } { names = [ "federation" ]; compress = false; - } ]; - } ]; + }]; + }] ++ lib.optional hasWorkers { + port = 9093; + bind_addresses = [ "127.0.0.1" ]; + type = "http"; + tls = false; + x_forwarded = false; + resources = [{ + names = [ "replication" ]; + compress = false; + }]; + }; description = lib.mdDoc '' List of ports that Synapse should listen on, their purpose and their configuration. + + By default, synapse will be configured for client and federation traffic on port 8008, and + for worker replication traffic on port 9093. See [`services.matrix-synapse.workers`](#opt-services.matrix-synapse.workers) + for more details. ''; }; @@ -534,7 +595,7 @@ in { default = if versionAtLeast config.system.stateVersion "18.03" then "psycopg2" else "sqlite3"; - defaultText = literalExpression '' + defaultText = literalExpression '' if versionAtLeast config.system.stateVersion "18.03" then "psycopg2" else "sqlite3" @@ -551,10 +612,10 @@ in { psycopg2 = "matrix-synapse"; }.${cfg.settings.database.name}; defaultText = literalExpression '' - { - sqlite3 = "''${${options.services.matrix-synapse.dataDir}}/homeserver.db"; - psycopg2 = "matrix-synapse"; - }.''${${options.services.matrix-synapse.settings}.database.name}; + { + sqlite3 = "''${${options.services.matrix-synapse.dataDir}}/homeserver.db"; + psycopg2 = "matrix-synapse"; + }.''${${options.services.matrix-synapse.settings}.database.name}; ''; description = lib.mdDoc '' Name of the database when using the psycopg2 backend, @@ -622,7 +683,7 @@ in { url_preview_ip_range_whitelist = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; description = lib.mdDoc '' List of IP address CIDR ranges that the URL preview spider is allowed to access even if they are specified in url_preview_ip_range_blacklist. @@ -630,8 +691,27 @@ in { }; url_preview_url_blacklist = mkOption { - type = types.listOf types.str; - default = []; + # FIXME revert to just `listOf (attrsOf str)` after some time(tm). + type = types.listOf ( + types.coercedTo + types.str + (const (throw '' + Setting `config.services.matrix-synapse.settings.url_preview_url_blacklist` + to a list of strings has never worked. Due to a bug, this was the type accepted + by the module, but in practice it broke on runtime and as a result, no URL + preview worked anywhere if this was set. + + See https://matrix-org.github.io/synapse/latest/usage/configuration/config_documentation.html#url_preview_url_blacklist + on how to configure it properly. + '')) + (types.attrsOf types.str)); + default = [ ]; + example = literalExpression '' + [ + { scheme = "http"; } # no http previews + { netloc = "www.acme.com"; path = "/foo"; } # block http(s)://www.acme.com/foo + ] + ''; description = lib.mdDoc '' Optional list of URL matches that the URL preview spider is denied from accessing. @@ -671,7 +751,7 @@ in { turn_uris = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; example = [ "turn:turn.example.com:3487?transport=udp" "turn:turn.example.com:3487?transport=tcp" @@ -708,12 +788,12 @@ in { }; }; }); - default = [ { + default = [{ server_name = "matrix.org"; verify_keys = { "ed25519:auto" = "Noi6WqcDj0QmPxCNQqgezwTlBKrfqehY1u2FyWP9uYw"; }; - } ]; + }]; description = lib.mdDoc '' The trusted servers to download signing keys from. ''; @@ -727,13 +807,114 @@ in { ''; }; + redis = lib.mkOption { + type = types.submodule { + freeformType = format.type; + options = { + enabled = lib.mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to use redis support + ''; + }; + }; + }; + default = { }; + description = lib.mdDoc '' + Redis configuration for synapse. + + See the + [upstream documentation](https://github.com/matrix-org/synapse/blob/v${pkgs.matrix-synapse-unwrapped.version}/usage/configuration/config_documentation.md#redis) + for available options. + ''; + }; }; }; }; + workers = lib.mkOption { + default = { }; + description = lib.mdDoc '' + Options for configuring workers. Worker support will be enabled if at least one worker is configured here. + + See the [worker documention](https://matrix-org.github.io/synapse/latest/workers.html#worker-configuration) + for possible options for each worker. Worker-specific options overriding the shared homeserver configuration can be + specified here for each worker. + + ::: {.note} + Worker support will add a replication listener on port 9093 to the main synapse process using the default + value of [`services.matrix-synapse.settings.listeners`](#opt-services.matrix-synapse.settings.listeners) and configure that + listener as `services.matrix-synapse.settings.instance_map.main`. + If you set either of those options, make sure to configure a replication listener yourself. + + A redis server is required for running workers. A local one can be enabled + using [`services.matrix-synapse.configureRedisLocally`](#opt-services.matrix-synapse.configureRedisLocally). + + Workers also require a proper reverse proxy setup to direct incoming requests to the appropriate process. See + the [reverse proxy documentation](https://matrix-org.github.io/synapse/latest/reverse_proxy.html) for a + general reverse proxying setup and + the [worker documentation](https://matrix-org.github.io/synapse/latest/workers.html#available-worker-applications) + for the available endpoints per worker application. + ::: + ''; + type = types.attrsOf (types.submodule ({name, ...}: { + freeformType = format.type; + options = { + worker_app = lib.mkOption { + type = types.enum [ + "synapse.app.generic_worker" + "synapse.app.media_repository" + ]; + description = "Type of this worker"; + default = "synapse.app.generic_worker"; + }; + worker_listeners = lib.mkOption { + default = [ ]; + type = types.listOf (listenerType true); + description = lib.mdDoc '' + List of ports that this worker should listen on, their purpose and their configuration. + ''; + }; + worker_log_config = lib.mkOption { + type = types.path; + default = genLogConfigFile "synapse-${name}"; + defaultText = logConfigText "synapse-${name}"; + description = lib.mdDoc '' + The file for log configuration. + + See the [python documentation](https://docs.python.org/3/library/logging.config.html#configuration-dictionary-schema) + for the schema and the [upstream repository](https://github.com/matrix-org/synapse/blob/v${pkgs.matrix-synapse-unwrapped.version}/docs/sample_log_config.yaml) + for an example. + ''; + }; + }; + })); + default = { }; + example = lib.literalExpression '' + { + "federation_sender" = { }; + "federation_receiver" = { + worker_listeners = [ + { + type = "http"; + port = 8009; + bind_addresses = [ "127.0.0.1" ]; + tls = false; + x_forwarded = true; + resources = [{ + names = [ "federation" ]; + }]; + } + ]; + }; + } + ''; + }; + extraConfigFiles = mkOption { type = types.listOf types.path; - default = []; + default = [ ]; description = lib.mdDoc '' Extra config files to include. @@ -743,12 +924,28 @@ in { NixOps is in use. ''; }; + + configureRedisLocally = lib.mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to automatically configure a local redis server for matrix-synapse. + ''; + }; }; }; config = mkIf cfg.enable { assertions = [ - { assertion = hasLocalPostgresDB -> config.services.postgresql.enable; + { + assertion = clientListener != null; + message = '' + At least one listener which serves the `client` resource via HTTP is required + by synapse in `services.matrix-synapse.settings.listeners` or in one of the workers! + ''; + } + { + assertion = hasLocalPostgresDB -> config.services.postgresql.enable; message = '' Cannot deploy matrix-synapse with a configuration for a local postgresql database and a missing postgresql service. Since 20.03 it's mandatory to manually configure the @@ -764,8 +961,47 @@ in { For further information about this update, please read the release-notes of 20.03 carefully. ''; } + { + assertion = hasWorkers -> cfg.settings.redis.enabled; + message = '' + Workers for matrix-synapse require configuring a redis instance. This can be done + automatically by setting `services.matrix-synapse.configureRedisLocally = true`. + ''; + } + { + assertion = + let + main = cfg.settings.instance_map.main; + listener = lib.findFirst + ( + listener: + listener.port == main.port + && listenerSupportsResource "replication" listener + && (lib.any (bind: bind == main.host || bind == "0.0.0.0" || bind == "::") listener.bind_addresses) + ) + null + cfg.settings.listeners; + in + hasWorkers -> (cfg.settings.instance_map ? main && listener != null); + message = '' + Workers for matrix-synapse require setting `services.matrix-synapse.settings.instance_map.main` + to any listener configured in `services.matrix-synapse.settings.listeners` with a `"replication"` + resource. + + This is done by default unless you manually configure either of those settings. + ''; + } ]; + services.matrix-synapse.settings.redis = lib.mkIf cfg.configureRedisLocally { + enabled = true; + path = config.services.redis.servers.matrix-synapse.unixSocket; + }; + services.matrix-synapse.settings.instance_map.main = lib.mkIf hasWorkers (lib.mkDefault { + host = "127.0.0.1"; + port = 9093; + }); + services.matrix-synapse.configFile = configFile; services.matrix-synapse.package = wrapped; @@ -784,64 +1020,124 @@ in { gid = config.ids.gids.matrix-synapse; }; - systemd.services.matrix-synapse = { - description = "Synapse Matrix homeserver"; - after = [ "network.target" ] ++ optional hasLocalPostgresDB "postgresql.service"; + systemd.targets.matrix-synapse = lib.mkIf hasWorkers { + description = "Synapse Matrix parent target"; + after = [ "network-online.target" ] ++ optional hasLocalPostgresDB "postgresql.service"; wantedBy = [ "multi-user.target" ]; - preStart = '' - ${cfg.package}/bin/synapse_homeserver \ - --config-path ${configFile} \ - --keys-directory ${cfg.dataDir} \ - --generate-keys - ''; - environment = optionalAttrs (cfg.withJemalloc) { - LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so"; - }; - serviceConfig = { - Type = "notify"; - User = "matrix-synapse"; - Group = "matrix-synapse"; - WorkingDirectory = cfg.dataDir; - ExecStartPre = [ ("+" + (pkgs.writeShellScript "matrix-synapse-fix-permissions" '' - chown matrix-synapse:matrix-synapse ${cfg.settings.signing_key_path} - chmod 0600 ${cfg.settings.signing_key_path} - '')) ]; - ExecStart = '' - ${cfg.package}/bin/synapse_homeserver \ - ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } - --keys-directory ${cfg.dataDir} - ''; - ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID"; - Restart = "on-failure"; - UMask = "0077"; + }; - # Security Hardening - # Refer to systemd.exec(5) for option descriptions. - CapabilityBoundingSet = [ "" ]; - LockPersonality = true; - NoNewPrivileges = true; - PrivateDevices = true; - PrivateTmp = true; - PrivateUsers = true; - ProcSubset = "pid"; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectProc = "invisible"; - ProtectSystem = "strict"; - ReadWritePaths = [ cfg.dataDir ]; - RemoveIPC = true; - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; - RestrictNamespaces = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - SystemCallArchitectures = "native"; - SystemCallFilter = [ "@system-service" "~@resources" "~@privileged" ]; - }; + systemd.services = + let + targetConfig = + if hasWorkers + then { + partOf = [ "matrix-synapse.target" ]; + wantedBy = [ "matrix-synapse.target" ]; + unitConfig.ReloadPropagatedFrom = "matrix-synapse.target"; + } + else { + after = [ "network-online.target" ] ++ optional hasLocalPostgresDB "postgresql.service"; + wantedBy = [ "multi-user.target" ]; + }; + baseServiceConfig = { + environment = optionalAttrs (cfg.withJemalloc) { + LD_PRELOAD = "${pkgs.jemalloc}/lib/libjemalloc.so"; + }; + serviceConfig = { + Type = "notify"; + User = "matrix-synapse"; + Group = "matrix-synapse"; + WorkingDirectory = cfg.dataDir; + ExecReload = "${pkgs.util-linux}/bin/kill -HUP $MAINPID"; + Restart = "on-failure"; + UMask = "0077"; + + # Security Hardening + # Refer to systemd.exec(5) for option descriptions. + CapabilityBoundingSet = [ "" ]; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + ReadWritePaths = [ cfg.dataDir ]; + RemoveIPC = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@resources" "~@privileged" ]; + }; + } + // targetConfig; + genWorkerService = name: workerCfg: + let + finalWorkerCfg = workerCfg // { worker_name = name; }; + workerConfigFile = format.generate "worker-${name}.yaml" finalWorkerCfg; + in + { + name = "matrix-synapse-worker-${name}"; + value = lib.mkMerge [ + baseServiceConfig + { + description = "Synapse Matrix worker ${name}"; + # make sure the main process starts first for potential database migrations + after = [ "matrix-synapse.service" ]; + requires = [ "matrix-synapse.service" ]; + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/synapse_worker \ + ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile workerConfigFile ] ++ cfg.extraConfigFiles) } + --keys-directory ${cfg.dataDir} + ''; + }; + } + ]; + }; + in + { + matrix-synapse = lib.mkMerge [ + baseServiceConfig + { + description = "Synapse Matrix homeserver"; + preStart = '' + ${cfg.package}/bin/synapse_homeserver \ + --config-path ${configFile} \ + --keys-directory ${cfg.dataDir} \ + --generate-keys + ''; + serviceConfig = { + ExecStartPre = [ + ("+" + (pkgs.writeShellScript "matrix-synapse-fix-permissions" '' + chown matrix-synapse:matrix-synapse ${cfg.settings.signing_key_path} + chmod 0600 ${cfg.settings.signing_key_path} + '')) + ]; + ExecStart = '' + ${cfg.package}/bin/synapse_homeserver \ + ${ concatMapStringsSep "\n " (x: "--config-path ${x} \\") ([ configFile ] ++ cfg.extraConfigFiles) } + --keys-directory ${cfg.dataDir} + ''; + }; + } + ]; + } + // (lib.mapAttrs' genWorkerService cfg.workers); + + services.redis.servers.matrix-synapse = lib.mkIf cfg.configureRedisLocally { + enable = true; + user = "matrix-synapse"; }; environment.systemPackages = [ registerNewMatrixUser ]; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix b/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix index 57ff02df7d..8d2c1b5242 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/atuin.nix @@ -6,7 +6,7 @@ in { options = { services.atuin = { - enable = lib.mkEnableOption (mdDoc "Enable server for shell history sync with atuin"); + enable = lib.mkEnableOption (mdDoc "Atuin server for shell history sync"); openRegistration = mkOption { type = types.bool; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/cfdyndns.nix b/third_party/nixpkgs/nixos/modules/services/misc/cfdyndns.nix index 9cd8b188ff..dba8ac2001 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/cfdyndns.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/cfdyndns.nix @@ -23,6 +23,15 @@ in ''; }; + apiTokenFile = mkOption { + default = null; + type = types.nullOr types.str; + description = lib.mdDoc '' + The path to a file containing the API Token + used to authenticate with CloudFlare. + ''; + }; + apikeyFile = mkOption { default = null; type = types.nullOr types.str; @@ -51,32 +60,22 @@ in startAt = "*:0/5"; serviceConfig = { Type = "simple"; - User = config.ids.uids.cfdyndns; - Group = config.ids.gids.cfdyndns; + LoadCredential = lib.optional (cfg.apiTokenFile != null) "CLOUDFLARE_APITOKEN_FILE:${cfg.apiTokenFile}"; + DynamicUser = true; }; environment = { - CLOUDFLARE_EMAIL="${cfg.email}"; CLOUDFLARE_RECORDS="${concatStringsSep "," cfg.records}"; }; script = '' ${optionalString (cfg.apikeyFile != null) '' export CLOUDFLARE_APIKEY="$(cat ${escapeShellArg cfg.apikeyFile})" + export CLOUDFLARE_EMAIL="${cfg.email}" + ''} + ${optionalString (cfg.apiTokenFile != null) '' + export CLOUDFLARE_APITOKEN=$(${pkgs.systemd}/bin/systemd-creds cat CLOUDFLARE_APITOKEN_FILE) ''} ${pkgs.cfdyndns}/bin/cfdyndns ''; }; - - users.users = { - cfdyndns = { - group = "cfdyndns"; - uid = config.ids.uids.cfdyndns; - }; - }; - - users.groups = { - cfdyndns = { - gid = config.ids.gids.cfdyndns; - }; - }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix b/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix index 0f92265ccb..129345e381 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix @@ -223,7 +223,7 @@ in ejabberdUser = config.services.ejabberd.user; }; } // lib.optionalAttrs (config.services.mysql.enable) { mysql-database = { - mysqlPort = config.services.mysql.port; + mysqlPort = config.services.mysql.settings.mysqld.port; mysqlSocket = "/run/mysqld/mysqld.sock"; } // lib.optionalAttrs cfg.enableAuthentication { mysqlUsername = "root"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/forgejo.nix b/third_party/nixpkgs/nixos/modules/services/misc/forgejo.nix new file mode 100644 index 0000000000..f26658b7bc --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/misc/forgejo.nix @@ -0,0 +1,668 @@ +{ config, lib, options, pkgs, ... }: + +let + cfg = config.services.forgejo; + opt = options.services.forgejo; + format = pkgs.formats.ini { }; + + exe = lib.getExe cfg.package; + + pg = config.services.postgresql; + useMysql = cfg.database.type == "mysql"; + usePostgresql = cfg.database.type == "postgres"; + useSqlite = cfg.database.type == "sqlite3"; + + inherit (lib) + literalExpression + mdDoc + mkChangedOptionModule + mkDefault + mkEnableOption + mkIf + mkMerge + mkOption + mkPackageOptionMD + mkRemovedOptionModule + mkRenamedOptionModule + optionalAttrs + optionals + optionalString + types + ; +in +{ + imports = [ + (mkRenamedOptionModule [ "services" "forgejo" "appName" ] [ "services" "forgejo" "settings" "DEFAULT" "APP_NAME" ]) + (mkRemovedOptionModule [ "services" "forgejo" "extraConfig" ] "services.forgejo.extraConfig has been removed. Please use the freeform services.forgejo.settings option instead") + (mkRemovedOptionModule [ "services" "forgejo" "database" "password" ] "services.forgejo.database.password has been removed. Please use services.forgejo.database.passwordFile instead") + + # copied from services.gitea; remove at some point + (mkRenamedOptionModule [ "services" "forgejo" "cookieSecure" ] [ "services" "forgejo" "settings" "session" "COOKIE_SECURE" ]) + (mkRenamedOptionModule [ "services" "forgejo" "disableRegistration" ] [ "services" "forgejo" "settings" "service" "DISABLE_REGISTRATION" ]) + (mkRenamedOptionModule [ "services" "forgejo" "domain" ] [ "services" "forgejo" "settings" "server" "DOMAIN" ]) + (mkRenamedOptionModule [ "services" "forgejo" "httpAddress" ] [ "services" "forgejo" "settings" "server" "HTTP_ADDR" ]) + (mkRenamedOptionModule [ "services" "forgejo" "httpPort" ] [ "services" "forgejo" "settings" "server" "HTTP_PORT" ]) + (mkRenamedOptionModule [ "services" "forgejo" "log" "level" ] [ "services" "forgejo" "settings" "log" "LEVEL" ]) + (mkRenamedOptionModule [ "services" "forgejo" "log" "rootPath" ] [ "services" "forgejo" "settings" "log" "ROOT_PATH" ]) + (mkRenamedOptionModule [ "services" "forgejo" "rootUrl" ] [ "services" "forgejo" "settings" "server" "ROOT_URL" ]) + (mkRenamedOptionModule [ "services" "forgejo" "ssh" "clonePort" ] [ "services" "forgejo" "settings" "server" "SSH_PORT" ]) + (mkRenamedOptionModule [ "services" "forgejo" "staticRootPath" ] [ "services" "forgejo" "settings" "server" "STATIC_ROOT_PATH" ]) + (mkChangedOptionModule [ "services" "forgejo" "enableUnixSocket" ] [ "services" "forgejo" "settings" "server" "PROTOCOL" ] ( + config: if config.services.forgejo.enableUnixSocket then "http+unix" else "http" + )) + (mkRemovedOptionModule [ "services" "forgejo" "ssh" "enable" ] "services.forgejo.ssh.enable has been migrated into freeform setting services.forgejo.settings.server.DISABLE_SSH. Keep in mind that the setting is inverted") + ]; + + options = { + services.forgejo = { + enable = mkEnableOption (mdDoc "Forgejo"); + + package = mkPackageOptionMD pkgs "forgejo" { }; + + useWizard = mkOption { + default = false; + type = types.bool; + description = mdDoc '' + Whether to use the built-in installation wizard instead of + declaratively managing the {file}`app.ini` config file in nix. + ''; + }; + + stateDir = mkOption { + default = "/var/lib/forgejo"; + type = types.str; + description = mdDoc "Forgejo data directory."; + }; + + customDir = mkOption { + default = "${cfg.stateDir}/custom"; + defaultText = literalExpression ''"''${config.${opt.stateDir}}/custom"''; + type = types.str; + description = mdDoc '' + Base directory for custom templates and other options. + + If {option}`${opt.useWizard}` is disabled (default), this directory will also + hold secrets and the resulting {file}`app.ini` config at runtime. + ''; + }; + + user = mkOption { + type = types.str; + default = "forgejo"; + description = mdDoc "User account under which Forgejo runs."; + }; + + group = mkOption { + type = types.str; + default = "forgejo"; + description = mdDoc "Group under which Forgejo runs."; + }; + + database = { + type = mkOption { + type = types.enum [ "sqlite3" "mysql" "postgres" ]; + example = "mysql"; + default = "sqlite3"; + description = mdDoc "Database engine to use."; + }; + + host = mkOption { + type = types.str; + default = "127.0.0.1"; + description = mdDoc "Database host address."; + }; + + port = mkOption { + type = types.port; + default = if !usePostgresql then 3306 else pg.port; + defaultText = literalExpression '' + if config.${opt.database.type} != "postgresql" + then 3306 + else config.${options.services.postgresql.port} + ''; + description = mdDoc "Database host port."; + }; + + name = mkOption { + type = types.str; + default = "forgejo"; + description = mdDoc "Database name."; + }; + + user = mkOption { + type = types.str; + default = "forgejo"; + description = mdDoc "Database user."; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/forgejo-dbpassword"; + description = mdDoc '' + A file containing the password corresponding to + {option}`${opt.database.user}`. + ''; + }; + + socket = mkOption { + type = types.nullOr types.path; + default = if (cfg.database.createDatabase && usePostgresql) then "/run/postgresql" else if (cfg.database.createDatabase && useMysql) then "/run/mysqld/mysqld.sock" else null; + defaultText = literalExpression "null"; + example = "/run/mysqld/mysqld.sock"; + description = mdDoc "Path to the unix socket file to use for authentication."; + }; + + path = mkOption { + type = types.str; + default = "${cfg.stateDir}/data/forgejo.db"; + defaultText = literalExpression ''"''${config.${opt.stateDir}}/data/forgejo.db"''; + description = mdDoc "Path to the sqlite3 database file."; + }; + + createDatabase = mkOption { + type = types.bool; + default = true; + description = mdDoc "Whether to create a local database automatically."; + }; + }; + + dump = { + enable = mkEnableOption (mdDoc "periodic dumps via the [built-in {command}`dump` command](https://forgejo.org/docs/latest/admin/command-line/#dump)"); + + interval = mkOption { + type = types.str; + default = "04:31"; + example = "hourly"; + description = mdDoc '' + Run a Forgejo dump at this interval. Runs by default at 04:31 every day. + + The format is described in + {manpage}`systemd.time(7)`. + ''; + }; + + backupDir = mkOption { + type = types.str; + default = "${cfg.stateDir}/dump"; + defaultText = literalExpression ''"''${config.${opt.stateDir}}/dump"''; + description = mdDoc "Path to the directory where the dump archives will be stored."; + }; + + type = mkOption { + type = types.enum [ "zip" "tar" "tar.sz" "tar.gz" "tar.xz" "tar.bz2" "tar.br" "tar.lz4" "tar.zst" ]; + default = "zip"; + description = mdDoc "Archive format used to store the dump file."; + }; + + file = mkOption { + type = types.nullOr types.str; + default = null; + description = mdDoc "Filename to be used for the dump. If `null` a default name is chosen by forgejo."; + example = "forgejo-dump"; + }; + }; + + lfs = { + enable = mkOption { + type = types.bool; + default = false; + description = mdDoc "Enables git-lfs support."; + }; + + contentDir = mkOption { + type = types.str; + default = "${cfg.stateDir}/data/lfs"; + defaultText = literalExpression ''"''${config.${opt.stateDir}}/data/lfs"''; + description = mdDoc "Where to store LFS files."; + }; + }; + + repositoryRoot = mkOption { + type = types.str; + default = "${cfg.stateDir}/repositories"; + defaultText = literalExpression ''"''${config.${opt.stateDir}}/repositories"''; + description = mdDoc "Path to the git repositories."; + }; + + mailerPasswordFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/run/keys/forgejo-mailpw"; + description = mdDoc "Path to a file containing the SMTP password."; + }; + + settings = mkOption { + default = { }; + description = mdDoc '' + Free-form settings written directly to the `app.ini` configfile file. + Refer to for supported values. + ''; + example = literalExpression '' + { + DEFAULT = { + RUN_MODE = "dev"; + }; + "cron.sync_external_users" = { + RUN_AT_START = true; + SCHEDULE = "@every 24h"; + UPDATE_EXISTING = true; + }; + mailer = { + ENABLED = true; + MAILER_TYPE = "sendmail"; + FROM = "do-not-reply@example.org"; + SENDMAIL_PATH = "''${pkgs.system-sendmail}/bin/sendmail"; + }; + other = { + SHOW_FOOTER_VERSION = false; + }; + } + ''; + type = types.submodule { + freeformType = format.type; + options = { + log = { + ROOT_PATH = mkOption { + default = "${cfg.stateDir}/log"; + defaultText = literalExpression ''"''${config.${opt.stateDir}}/log"''; + type = types.str; + description = mdDoc "Root path for log files."; + }; + LEVEL = mkOption { + default = "Info"; + type = types.enum [ "Trace" "Debug" "Info" "Warn" "Error" "Critical" ]; + description = mdDoc "General log level."; + }; + }; + + server = { + PROTOCOL = mkOption { + type = types.enum [ "http" "https" "fcgi" "http+unix" "fcgi+unix" ]; + default = "http"; + description = mdDoc ''Listen protocol. `+unix` means "over unix", not "in addition to."''; + }; + + HTTP_ADDR = mkOption { + type = types.either types.str types.path; + default = if lib.hasSuffix "+unix" cfg.settings.server.PROTOCOL then "/run/forgejo/forgejo.sock" else "0.0.0.0"; + defaultText = literalExpression ''if lib.hasSuffix "+unix" cfg.settings.server.PROTOCOL then "/run/forgejo/forgejo.sock" else "0.0.0.0"''; + description = mdDoc "Listen address. Must be a path when using a unix socket."; + }; + + HTTP_PORT = mkOption { + type = types.port; + default = 3000; + description = mdDoc "Listen port. Ignored when using a unix socket."; + }; + + DOMAIN = mkOption { + type = types.str; + default = "localhost"; + description = mdDoc "Domain name of your server."; + }; + + ROOT_URL = mkOption { + type = types.str; + default = "http://${cfg.settings.server.DOMAIN}:${toString cfg.settings.server.HTTP_PORT}/"; + defaultText = literalExpression ''"http://''${config.services.forgejo.settings.server.DOMAIN}:''${toString config.services.forgejo.settings.server.HTTP_PORT}/"''; + description = mdDoc "Full public URL of Forgejo server."; + }; + + STATIC_ROOT_PATH = mkOption { + type = types.either types.str types.path; + default = cfg.package.data; + defaultText = literalExpression "config.${opt.package}.data"; + example = "/var/lib/forgejo/data"; + description = mdDoc "Upper level of template and static files path."; + }; + + DISABLE_SSH = mkOption { + type = types.bool; + default = false; + description = mdDoc "Disable external SSH feature."; + }; + + SSH_PORT = mkOption { + type = types.port; + default = 22; + example = 2222; + description = mdDoc '' + SSH port displayed in clone URL. + The option is required to configure a service when the external visible port + differs from the local listening port i.e. if port forwarding is used. + ''; + }; + }; + + session = { + COOKIE_SECURE = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + Marks session cookies as "secure" as a hint for browsers to only send + them via HTTPS. This option is recommend, if Forgejo is being served over HTTPS. + ''; + }; + }; + }; + }; + }; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.database.createDatabase -> useSqlite || cfg.database.user == cfg.user; + message = "services.forgejo.database.user must match services.forgejo.user if the database is to be automatically provisioned"; + } + ]; + + services.forgejo.settings = { + DEFAULT = { + RUN_MODE = mkDefault "prod"; + RUN_USER = mkDefault cfg.user; + WORK_PATH = mkDefault cfg.stateDir; + }; + + database = mkMerge [ + { + DB_TYPE = cfg.database.type; + } + (mkIf (useMysql || usePostgresql) { + HOST = if cfg.database.socket != null then cfg.database.socket else cfg.database.host + ":" + toString cfg.database.port; + NAME = cfg.database.name; + USER = cfg.database.user; + PASSWD = "#dbpass#"; + }) + (mkIf useSqlite { + PATH = cfg.database.path; + }) + (mkIf usePostgresql { + SSL_MODE = "disable"; + }) + ]; + + repository = { + ROOT = cfg.repositoryRoot; + }; + + server = mkIf cfg.lfs.enable { + LFS_START_SERVER = true; + LFS_JWT_SECRET = "#lfsjwtsecret#"; + }; + + session = { + COOKIE_NAME = mkDefault "session"; + }; + + security = { + SECRET_KEY = "#secretkey#"; + INTERNAL_TOKEN = "#internaltoken#"; + INSTALL_LOCK = true; + }; + + mailer = mkIf (cfg.mailerPasswordFile != null) { + PASSWD = "#mailerpass#"; + }; + + oauth2 = { + JWT_SECRET = "#oauth2jwtsecret#"; + }; + + lfs = mkIf cfg.lfs.enable { + PATH = cfg.lfs.contentDir; + }; + }; + + services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) { + enable = mkDefault true; + + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { + name = cfg.database.user; + ensurePermissions = { "DATABASE ${cfg.database.name}" = "ALL PRIVILEGES"; }; + } + ]; + }; + + services.mysql = optionalAttrs (useMysql && cfg.database.createDatabase) { + enable = mkDefault true; + package = mkDefault pkgs.mariadb; + + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [ + { + name = cfg.database.user; + ensurePermissions = { "${cfg.database.name}.*" = "ALL PRIVILEGES"; }; + } + ]; + }; + + systemd.tmpfiles.rules = [ + "d '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -" + "d '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -" + "d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -" + "d '${cfg.stateDir}/conf' 0750 ${cfg.user} ${cfg.group} - -" + "d '${cfg.customDir}' 0750 ${cfg.user} ${cfg.group} - -" + "d '${cfg.customDir}/conf' 0750 ${cfg.user} ${cfg.group} - -" + "d '${cfg.stateDir}/data' 0750 ${cfg.user} ${cfg.group} - -" + "d '${cfg.stateDir}/log' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.stateDir}/.ssh' 0700 ${cfg.user} ${cfg.group} - -" + "z '${cfg.stateDir}/conf' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.customDir}' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.customDir}/conf' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.stateDir}/data' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.stateDir}/log' 0750 ${cfg.user} ${cfg.group} - -" + + # If we have a folder or symlink with Forgejo locales, remove it + # And symlink the current Forgejo locales in place + "L+ '${cfg.stateDir}/conf/locale' - - - - ${cfg.package.out}/locale" + + ] ++ optionals cfg.lfs.enable [ + "d '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -" + "z '${cfg.lfs.contentDir}' 0750 ${cfg.user} ${cfg.group} - -" + ]; + + systemd.services.forgejo = { + description = "Forgejo (Beyond coding. We forge.)"; + after = [ + "network.target" + ] ++ optionals usePostgresql [ + "postgresql.service" + ] ++ optionals useMysql [ + "mysql.service" + ]; + requires = optionals (cfg.database.createDatabase && usePostgresql) [ + "postgresql.service" + ] ++ optionals (cfg.database.createDatabase && useMysql) [ + "mysql.service" + ]; + wantedBy = [ "multi-user.target" ]; + path = [ cfg.package pkgs.git pkgs.gnupg ]; + + # In older versions the secret naming for JWT was kind of confusing. + # The file jwt_secret hold the value for LFS_JWT_SECRET and JWT_SECRET + # wasn't persistent at all. + # To fix that, there is now the file oauth2_jwt_secret containing the + # values for JWT_SECRET and the file jwt_secret gets renamed to + # lfs_jwt_secret. + # We have to consider this to stay compatible with older installations. + preStart = + let + runConfig = "${cfg.customDir}/conf/app.ini"; + secretKey = "${cfg.customDir}/conf/secret_key"; + oauth2JwtSecret = "${cfg.customDir}/conf/oauth2_jwt_secret"; + oldLfsJwtSecret = "${cfg.customDir}/conf/jwt_secret"; # old file for LFS_JWT_SECRET + lfsJwtSecret = "${cfg.customDir}/conf/lfs_jwt_secret"; # new file for LFS_JWT_SECRET + internalToken = "${cfg.customDir}/conf/internal_token"; + replaceSecretBin = "${pkgs.replace-secret}/bin/replace-secret"; + in + '' + # copy custom configuration and generate random secrets if needed + ${lib.optionalString (!cfg.useWizard) '' + function forgejo_setup { + cp -f '${format.generate "app.ini" cfg.settings}' '${runConfig}' + + if [ ! -s '${secretKey}' ]; then + ${exe} generate secret SECRET_KEY > '${secretKey}' + fi + + # Migrate LFS_JWT_SECRET filename + if [[ -s '${oldLfsJwtSecret}' && ! -s '${lfsJwtSecret}' ]]; then + mv '${oldLfsJwtSecret}' '${lfsJwtSecret}' + fi + + if [ ! -s '${oauth2JwtSecret}' ]; then + ${exe} generate secret JWT_SECRET > '${oauth2JwtSecret}' + fi + + ${optionalString cfg.lfs.enable '' + if [ ! -s '${lfsJwtSecret}' ]; then + ${exe} generate secret LFS_JWT_SECRET > '${lfsJwtSecret}' + fi + ''} + + if [ ! -s '${internalToken}' ]; then + ${exe} generate secret INTERNAL_TOKEN > '${internalToken}' + fi + + chmod u+w '${runConfig}' + ${replaceSecretBin} '#secretkey#' '${secretKey}' '${runConfig}' + ${replaceSecretBin} '#oauth2jwtsecret#' '${oauth2JwtSecret}' '${runConfig}' + ${replaceSecretBin} '#internaltoken#' '${internalToken}' '${runConfig}' + + ${optionalString cfg.lfs.enable '' + ${replaceSecretBin} '#lfsjwtsecret#' '${lfsJwtSecret}' '${runConfig}' + ''} + + ${optionalString (cfg.database.passwordFile != null) '' + ${replaceSecretBin} '#dbpass#' '${cfg.database.passwordFile}' '${runConfig}' + ''} + + ${optionalString (cfg.mailerPasswordFile != null) '' + ${replaceSecretBin} '#mailerpass#' '${cfg.mailerPasswordFile}' '${runConfig}' + ''} + chmod u-w '${runConfig}' + } + (umask 027; forgejo_setup) + ''} + + # run migrations/init the database + ${exe} migrate + + # update all hooks' binary paths + ${exe} admin regenerate hooks + + # update command option in authorized_keys + if [ -r ${cfg.stateDir}/.ssh/authorized_keys ] + then + ${exe} admin regenerate keys + fi + ''; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = cfg.stateDir; + ExecStart = "${exe} web --pid /run/forgejo/forgejo.pid"; + Restart = "always"; + # Runtime directory and mode + RuntimeDirectory = "forgejo"; + RuntimeDirectoryMode = "0755"; + # Proc filesystem + ProcSubset = "pid"; + ProtectProc = "invisible"; + # Access write directories + ReadWritePaths = [ cfg.customDir cfg.dump.backupDir cfg.repositoryRoot cfg.stateDir cfg.lfs.contentDir ]; + UMask = "0027"; + # Capabilities + CapabilityBoundingSet = ""; + # Security + NoNewPrivileges = true; + # Sandboxing + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateUsers = 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; + # System Call Filtering + SystemCallArchitectures = "native"; + SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" "setrlimit" ]; + }; + + environment = { + USER = cfg.user; + HOME = cfg.stateDir; + # `GITEA_` prefix until https://codeberg.org/forgejo/forgejo/issues/497 + # is resolved. + GITEA_WORK_DIR = cfg.stateDir; + GITEA_CUSTOM = cfg.customDir; + }; + }; + + users.users = mkIf (cfg.user == "forgejo") { + forgejo = { + home = cfg.stateDir; + useDefaultShell = true; + group = cfg.group; + isSystemUser = true; + }; + }; + + users.groups = mkIf (cfg.group == "forgejo") { + forgejo = { }; + }; + + systemd.services.forgejo-dump = mkIf cfg.dump.enable { + description = "forgejo dump"; + after = [ "forgejo.service" ]; + path = [ cfg.package ]; + + environment = { + USER = cfg.user; + HOME = cfg.stateDir; + # `GITEA_` prefix until https://codeberg.org/forgejo/forgejo/issues/497 + # is resolved. + GITEA_WORK_DIR = cfg.stateDir; + GITEA_CUSTOM = cfg.customDir; + }; + + serviceConfig = { + Type = "oneshot"; + User = cfg.user; + ExecStart = "${exe} dump --type ${cfg.dump.type}" + optionalString (cfg.dump.file != null) " --file ${cfg.dump.file}"; + WorkingDirectory = cfg.dump.backupDir; + }; + }; + + systemd.timers.forgejo-dump = mkIf cfg.dump.enable { + description = "Forgejo dump timer"; + partOf = [ "forgejo-dump.service" ]; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = cfg.dump.interval; + }; + }; + + meta.maintainers = with lib.maintainers; [ bendlas emilylange ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix index f6ef2bb919..3f690f85d6 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix @@ -246,6 +246,13 @@ in description = lib.mdDoc "Path to a file containing the SMTP password."; }; + metricsTokenFile = mkOption { + type = types.nullOr types.str; + default = null; + example = "/var/lib/secrets/gitea/metrics_token"; + description = lib.mdDoc "Path to a file containing the metrics authentication token."; + }; + settings = mkOption { default = {}; description = lib.mdDoc '' @@ -433,6 +440,10 @@ in PASSWD = "#mailerpass#"; }; + metrics = mkIf (cfg.metricsTokenFile != null) { + TOKEN = "#metricstoken#"; + }; + oauth2 = { JWT_SECRET = "#oauth2jwtsecret#"; }; @@ -559,6 +570,10 @@ in ${lib.optionalString (cfg.mailerPasswordFile != null) '' ${replaceSecretBin} '#mailerpass#' '${cfg.mailerPasswordFile}' '${runConfig}' ''} + + ${lib.optionalString (cfg.metricsTokenFile != null) '' + ${replaceSecretBin} '#metricstoken#' '${cfg.metricsTokenFile}' '${runConfig}' + ''} chmod u-w '${runConfig}' } (umask 027; gitea_setup) diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix index c5e38b4988..b399ccc38f 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix @@ -1088,6 +1088,11 @@ in { ''Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release. Please back up your data and migrate to the gitlab-container-registry package.'' ) + (mkIf + (versionAtLeast (getVersion cfg.packages.gitlab) "16.2.0" && versionOlder (getVersion cfg.packages.gitlab) "16.5.0") + ''GitLab instances created or updated between versions [15.11.0, 15.11.2] have an incorrect database schema. + Check the upstream documentation for a workaround: https://docs.gitlab.com/ee/update/versions/gitlab_16_changes.html#undefined-column-error-upgrading-to-162-or-later'' + ) ]; assertions = [ @@ -1655,7 +1660,7 @@ in { Restart = "on-failure"; WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab"; ExecStart = concatStringsSep " " [ - "${cfg.packages.gitlab.rubyEnv}/bin/puma" + "${cfg.packages.gitlab.rubyEnv}/bin/bundle" "exec" "puma" "-e production" "-C ${cfg.statePath}/config/puma.rb" "-w ${cfg.puma.workers}" diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix b/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix index d607e92e5e..b73528abaf 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix @@ -154,5 +154,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ erictapen bbenno joscha ]; + meta.maintainers = with lib.maintainers; [ erictapen bbenno ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gpsd.nix b/third_party/nixpkgs/nixos/modules/services/misc/gpsd.nix index ce0f9bb3ba..5d2e806181 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gpsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gpsd.nix @@ -92,6 +92,16 @@ in { ''; }; + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "-r" "-s" "19200" ]; + description = lib.mdDoc '' + A list of extra command line arguments to pass to gpsd. + Check gpsd(8) mangpage for possible arguments. + ''; + }; + }; }; @@ -117,12 +127,14 @@ in { Type = "forking"; ExecStart = let devices = utils.escapeSystemdExecArgs cfg.devices; + extraArgs = utils.escapeSystemdExecArgs cfg.extraArgs; in '' ${pkgs.gpsd}/sbin/gpsd -D "${toString cfg.debugLevel}" \ -S "${toString cfg.port}" \ ${optionalString cfg.readonly "-b"} \ ${optionalString cfg.nowait "-n"} \ ${optionalString cfg.listenany "-G"} \ + ${extraArgs} \ ${devices} ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix b/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix index 2a4483199d..43fdc09f45 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix @@ -46,7 +46,8 @@ in config = mkIf cfg.enable { systemd.services.jellyfin = { description = "Jellyfin Media Server"; - after = [ "network.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; # This is mostly follows: https://github.com/jellyfin/jellyfin/blob/master/fedora/jellyfin.service diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix b/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix index e75c352541..8f64fb2d9c 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix @@ -26,7 +26,7 @@ in { aggressive = mkOption { type = types.bool; - default = false; + default = true; description = lib.mdDoc "If true, favors higher default fan speeds."; }; @@ -38,17 +38,20 @@ in { options.general.low_temp = mkOption { type = types.int; - default = 63; + default = (if cfg.aggressive then 55 else 63); + defaultText = literalExpression "55"; description = lib.mdDoc "If temperature is below this, fans will run at minimum speed."; }; options.general.high_temp = mkOption { type = types.int; - default = 66; + default = (if cfg.aggressive then 58 else 66); + defaultText = literalExpression "58"; description = lib.mdDoc "If temperature is above this, fan speed will gradually increase."; }; options.general.max_temp = mkOption { type = types.int; - default = 86; + default = (if cfg.aggressive then 78 else 86); + defaultText = literalExpression "78"; description = lib.mdDoc "If temperature is above this, fans will run at maximum speed."; }; options.general.polling_interval = mkOption { @@ -70,13 +73,6 @@ in { ]; config = mkIf cfg.enable { - services.mbpfan.settings = mkIf cfg.aggressive { - general.min_fan1_speed = mkDefault 2000; - general.low_temp = mkDefault 55; - general.high_temp = mkDefault 58; - general.max_temp = mkDefault 70; - }; - boot.kernelModules = [ "coretemp" "applesmc" ]; environment.systemPackages = [ cfg.package ]; environment.etc."mbpfan.conf".source = settingsFile; @@ -86,6 +82,7 @@ in { wantedBy = [ "sysinit.target" ]; after = [ "syslog.target" "sysinit.target" ]; restartTriggers = [ config.environment.etc."mbpfan.conf".source ]; + serviceConfig = { Type = "simple"; ExecStart = "${cfg.package}/bin/mbpfan -f${verbose}"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/moonraker.nix b/third_party/nixpkgs/nixos/modules/services/misc/moonraker.nix index 7e306d718e..797e145c47 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/moonraker.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/moonraker.nix @@ -1,8 +1,8 @@ { config, lib, options, pkgs, ... }: with lib; let - pkg = pkgs.moonraker; cfg = config.services.moonraker; + pkg = cfg.package; opt = options.services.moonraker; format = pkgs.formats.ini { # https://github.com/NixOS/nixpkgs/pull/121613#issuecomment-885241996 @@ -18,6 +18,14 @@ in { services.moonraker = { enable = mkEnableOption (lib.mdDoc "Moonraker, an API web server for Klipper"); + package = mkOption { + type = with types; nullOr package; + default = pkgs.moonraker; + defaultText = literalExpression "pkgs.moonraker"; + example = literalExpression "pkgs.moonraker.override { useGpiod = true; }"; + description = lib.mdDoc "Moonraker package to use"; + }; + klipperSocket = mkOption { type = types.path; default = config.services.klipper.apiSocket; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix b/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix index 0683a1f922..74a3b49ac9 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix @@ -43,6 +43,8 @@ let "-/etc/nsswitch.conf" "-/etc/hosts" "-/etc/localtime" + "-/etc/ssl/certs" + "-/etc/static/ssl/certs" "-/run/postgresql" ] ++ (optional enableRedis redisServer.unixSocket); BindPaths = [ diff --git a/third_party/nixpkgs/nixos/modules/services/misc/xmr-stak.nix b/third_party/nixpkgs/nixos/modules/services/misc/xmr-stak.nix index 6e123cf038..54efae48d5 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/xmr-stak.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/xmr-stak.nix @@ -7,7 +7,7 @@ let cfg = config.services.xmr-stak; pkg = pkgs.xmr-stak.override { - inherit (cfg) openclSupport cudaSupport; + inherit (cfg) openclSupport; }; in @@ -17,7 +17,6 @@ in services.xmr-stak = { enable = mkEnableOption (lib.mdDoc "xmr-stak miner"); openclSupport = mkEnableOption (lib.mdDoc "support for OpenCL (AMD/ATI graphics cards)"); - cudaSupport = mkEnableOption (lib.mdDoc "support for CUDA (NVidia graphics cards)"); extraArgs = mkOption { type = types.listOf types.str; @@ -64,15 +63,12 @@ in wantedBy = [ "multi-user.target" ]; bindsTo = [ "network-online.target" ]; after = [ "network-online.target" ]; - environment = mkIf cfg.cudaSupport { - LD_LIBRARY_PATH = "${pkgs.linuxPackages_latest.nvidia_x11}/lib"; - }; preStart = concatStrings (flip mapAttrsToList cfg.configFiles (fn: content: '' ln -sf '${pkgs.writeText "xmr-stak-${fn}" content}' '${fn}' '')); - serviceConfig = let rootRequired = cfg.openclSupport || cfg.cudaSupport; in { + serviceConfig = let rootRequired = cfg.openclSupport; in { ExecStart = "${pkg}/bin/xmr-stak ${concatStringsSep " " cfg.extraArgs}"; # xmr-stak generates cpu and/or gpu configuration files WorkingDirectory = "/tmp"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/below.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/below.nix index 92ee3882ca..4a7135162a 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/below.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/below.nix @@ -103,4 +103,6 @@ in { }; }; }; + + meta.maintainers = with lib.maintainers; [ nicoo ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix index 571b9a3aee..e90a0e9d16 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix @@ -88,26 +88,6 @@ let # Get a submodule without any embedded metadata: _filter = x: filterAttrs (k: v: k != "_module") x; - # FIXME(@Ma27) remove before 23.05. This is just a helper-type - # because `mkRenamedOptionModule` doesn't work if `foo.bar` is renamed - # to `foo.bar.baz`. - submodule' = module: types.coercedTo - (mkOptionType { - name = "grafana-provision-submodule"; - description = "Wrapper-type for backwards compat of Grafana's declarative provisioning"; - check = x: - if builtins.isList x then - throw '' - Provisioning dashboards and datasources declaratively by - setting `dashboards` or `datasources` to a list is not supported - anymore. Use `services.grafana.provision.datasources.settings.datasources` - (or `services.grafana.provision.dashboards.settings.providers`) instead. - '' - else isAttrs x || isFunction x; - }) - id - (types.submodule module); - # http://docs.grafana.org/administration/provisioning/#datasources grafanaTypes.datasourceConfig = types.submodule { freeformType = provisioningSettingsFormat.type; @@ -1160,7 +1140,7 @@ in Declaratively provision Grafana's datasources. ''; default = { }; - type = submodule' { + type = types.submodule { options.settings = mkOption { description = lib.mdDoc '' Grafana datasource configuration in Nix. Can't be used with @@ -1235,7 +1215,7 @@ in Declaratively provision Grafana's dashboards. ''; default = { }; - type = submodule' { + type = types.submodule { options.settings = mkOption { description = lib.mdDoc '' Grafana dashboard configuration in Nix. Can't be used with diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/mimir.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/mimir.nix index edca9b7be4..6ed139b229 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/mimir.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/mimir.nix @@ -32,11 +32,21 @@ in { type = types.package; description = lib.mdDoc ''Mimir package to use.''; }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + example = [ "--config.expand-env=true" ]; + description = lib.mdDoc '' + Specify a list of additional command line flags, + which get escaped and are then passed to Mimir. + ''; + }; }; config = mkIf cfg.enable { # for mimirtool - environment.systemPackages = [ pkgs.mimir ]; + environment.systemPackages = [ cfg.package ]; assertions = [{ assertion = ( @@ -60,7 +70,7 @@ in { else cfg.configFile; in { - ExecStart = "${cfg.package}/bin/mimir --config.file=${conf}"; + ExecStart = "${cfg.package}/bin/mimir --config.file=${conf} ${escapeShellArgs cfg.extraFlags}"; DynamicUser = true; Restart = "always"; ProtectSystem = "full"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index f5b97c5118..b423624290 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -50,6 +50,7 @@ let "mikrotik" "minio" "modemmanager" + "mysqld" "nextcloud" "nginx" "nginxlog" @@ -57,6 +58,7 @@ let "nut" "openldap" "openvpn" + "pgbouncer" "php-fpm" "pihole" "postfix" @@ -67,6 +69,7 @@ let "redis" "rspamd" "rtl_433" + "sabnzbd" "scaphandre" "script" "shelly" @@ -296,6 +299,39 @@ in Please specify either 'services.prometheus.exporters.mail.configuration' or 'services.prometheus.exporters.mail.configFile'. ''; + } { + assertion = cfg.mysqld.runAsLocalSuperUser -> config.services.mysql.enable; + message = '' + The exporter is configured to run as 'services.mysql.user', but + 'services.mysql.enable' is set to false. + ''; + } { + assertion = cfg.nextcloud.enable -> ( + (cfg.nextcloud.passwordFile == null) != (cfg.nextcloud.tokenFile == null) + ); + message = '' + Please specify either 'services.prometheus.exporters.nextcloud.passwordFile' or + 'services.prometheus.exporters.nextcloud.tokenFile' + ''; + } { + assertion = cfg.pgbouncer.enable -> ( + (cfg.pgbouncer.connectionStringFile != null || cfg.pgbouncer.connectionString != "") + ); + message = '' + PgBouncer exporter needs either connectionStringFile or connectionString configured" + ''; + } { + assertion = cfg.pgbouncer.enable -> ( + config.services.pgbouncer.ignoreStartupParameters != null && builtins.match ".*extra_float_digits.*" config.services.pgbouncer.ignoreStartupParameters != null + ); + message = '' + Prometheus PgBouncer exporter requires including `extra_float_digits` in services.pgbouncer.ignoreStartupParameters + + Example: + services.pgbouncer.ignoreStartupParameters = extra_float_digits; + + See https://github.com/prometheus-community/pgbouncer_exporter#pgbouncer-configuration + ''; } { assertion = cfg.sql.enable -> ( (cfg.sql.configFile == null) != (cfg.sql.configuration == null) @@ -334,12 +370,24 @@ in `openFirewall' is set to `true'! ''; })) ++ config.services.prometheus.exporters.assertions; - warnings = [(mkIf (config.services.prometheus.exporters.idrac.enable && config.services.prometheus.exporters.idrac.configurationPath != null) '' - Configuration file in `services.prometheus.exporters.idrac.configurationPath` may override - `services.prometheus.exporters.idrac.listenAddress` and/or `services.prometheus.exporters.idrac.port`. - Consider using `services.prometheus.exporters.idrac.configuration` instead. - '' - )] ++ config.services.prometheus.exporters.warnings; + warnings = [ + (mkIf (config.services.prometheus.exporters.idrac.enable && config.services.prometheus.exporters.idrac.configurationPath != null) '' + Configuration file in `services.prometheus.exporters.idrac.configurationPath` may override + `services.prometheus.exporters.idrac.listenAddress` and/or `services.prometheus.exporters.idrac.port`. + Consider using `services.prometheus.exporters.idrac.configuration` instead. + '' + ) + (mkIf + (cfg.pgbouncer.enable && cfg.pgbouncer.connectionString != "") '' + config.services.prometheus.exporters.pgbouncer.connectionString is insecure. Use connectionStringFile instead. + '' + ) + (mkIf + (cfg.pgbouncer.enable && config.services.pgbouncer.authType != "any") '' + Admin user (with password or passwordless) MUST exist in the services.pgbouncer.authFile if authType other than any is used. + '' + ) + ] ++ config.services.prometheus.exporters.warnings; }] ++ [(mkIf config.services.minio.enable { services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000"; services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix index 66eaed51d2..407bff1d62 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/blackbox.nix @@ -21,7 +21,7 @@ let throw "${logPrefix}: configuration file must not reside within /tmp - it won't be visible to the systemd service." else - true; + file; checkConfig = file: pkgs.runCommand "checked-blackbox-exporter.conf" { preferLocalBuild = true; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix new file mode 100644 index 0000000000..849c514de6 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mysqld.nix @@ -0,0 +1,60 @@ +{ config, lib, pkgs, options }: +let + cfg = config.services.prometheus.exporters.mysqld; + inherit (lib) types mkOption mdDoc mkIf mkForce cli concatStringsSep optionalString escapeShellArgs; +in { + port = 9104; + extraOpts = { + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = mdDoc '' + Path under which to expose metrics. + ''; + }; + + runAsLocalSuperUser = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + Whether to run the exporter as {option}`services.mysql.user`. + ''; + }; + + configFile = mkOption { + type = types.path; + example = "/var/lib/prometheus-mysqld-exporter.cnf"; + description = mdDoc '' + Path to the services config file. + + See for more information about + the available options. + + ::: {.warn} + Please do not store this file in the nix store if you choose to include any credentials here, + as it would be world-readable. + ::: + ''; + }; + }; + + serviceOpts = { + serviceConfig = { + DynamicUser = !cfg.runAsLocalSuperUser; + User = mkIf cfg.runAsLocalSuperUser (mkForce config.services.mysql.user); + LoadCredential = mkIf (cfg.configFile != null) (mkForce ("config:" + cfg.configFile)); + ExecStart = concatStringsSep " " [ + "${pkgs.prometheus-mysqld-exporter}/bin/mysqld_exporter" + "--web.listen-address=${cfg.listenAddress}:${toString cfg.port}" + "--web.telemetry-path=${cfg.telemetryPath}" + (optionalString (cfg.configFile != null) ''--config.my-cnf=''${CREDENTIALS_DIRECTORY}/config'') + (escapeShellArgs cfg.extraFlags) + ]; + RestrictAddressFamilies = [ + # The exporter can be configured to talk to a local mysql server via a unix socket. + "AF_UNIX" + ]; + }; + }; +} + diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix index 7808c8861a..28a3eb6a13 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/nextcloud.nix @@ -23,16 +23,27 @@ in description = lib.mdDoc '' Username for connecting to Nextcloud. Note that this account needs to have admin privileges in Nextcloud. + Unused when using token authentication. ''; }; passwordFile = mkOption { - type = types.path; + type = types.nullOr types.path; + default = null; example = "/path/to/password-file"; description = lib.mdDoc '' File containing the password for connecting to Nextcloud. Make sure that this file is readable by the exporter user. ''; }; + tokenFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/path/to/token-file"; + description = lib.mdDoc '' + File containing the token for connecting to Nextcloud. + Make sure that this file is readable by the exporter user. + ''; + }; timeout = mkOption { type = types.str; default = "5s"; @@ -47,12 +58,15 @@ in ExecStart = '' ${pkgs.prometheus-nextcloud-exporter}/bin/nextcloud-exporter \ --addr ${cfg.listenAddress}:${toString cfg.port} \ - --username ${cfg.username} \ --timeout ${cfg.timeout} \ --server ${cfg.url} \ - --password ${escapeShellArg "@${cfg.passwordFile}"} \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; + ${if cfg.passwordFile != null then '' + --username ${cfg.username} \ + --password ${escapeShellArg "@${cfg.passwordFile}"} \ + '' else '' + --auth-token ${escapeShellArg "@${cfg.tokenFile}"} \ + ''} \ + ${concatStringsSep " \\\n " cfg.extraFlags}''; }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix new file mode 100644 index 0000000000..9e55cadae5 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix @@ -0,0 +1,145 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.pgbouncer; +in +{ + port = 9127; + extraOpts = { + + telemetryPath = mkOption { + type = types.str; + default = "/metrics"; + description = lib.mdDoc '' + Path under which to expose metrics. + ''; + }; + + connectionString = mkOption { + type = types.str; + default = ""; + example = "postgres://admin:@localhost:6432/pgbouncer?sslmode=require"; + description = lib.mdDoc '' + Connection string for accessing pgBouncer. + + NOTE: You MUST keep pgbouncer as database name (special internal db)!!! + + NOTE: Admin user (with password or passwordless) MUST exist + in the services.pgbouncer.authFile if authType other than any is used. + + WARNING: this secret is stored in the world-readable Nix store! + Use {option}`connectionStringFile` instead. + ''; + }; + + connectionStringFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/pgBouncer-connection-string"; + description = lib.mdDoc '' + File that contains pgBouncer connection string in format: + postgres://admin:@localhost:6432/pgbouncer?sslmode=require + + NOTE: You MUST keep pgbouncer as database name (special internal db)!!! + + NOTE: Admin user (with password or passwordless) MUST exist + in the services.pgbouncer.authFile if authType other than any is used. + + {option}`connectionStringFile` takes precedence over {option}`connectionString` + ''; + }; + + pidFile = mkOption { + type = types.nullOr types.str; + default = null; + description = lib.mdDoc '' + Path to PgBouncer pid file. + + If provided, the standard process metrics get exported for the PgBouncer + process, prefixed with 'pgbouncer_process_...'. The pgbouncer_process exporter + needs to have read access to files owned by the PgBouncer process. Depends on + the availability of /proc. + + https://prometheus.io/docs/instrumenting/writing_clientlibs/#process-metrics. + + ''; + }; + + webSystemdSocket = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Use systemd socket activation listeners instead of port listeners (Linux only). + ''; + }; + + logLevel = mkOption { + type = types.enum ["debug" "info" "warn" "error" ]; + default = "info"; + description = lib.mdDoc '' + Only log messages with the given severity or above. + ''; + }; + + logFormat = mkOption { + type = types.enum ["logfmt" "json"]; + default = "logfmt"; + description = lib.mdDoc '' + Output format of log messages. One of: [logfmt, json] + ''; + }; + + webConfigFile = mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mdDoc '' + Path to configuration file that can enable TLS or authentication. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = [ ]; + description = lib.mdDoc '' + Extra commandline options when launching Prometheus. + ''; + }; + + }; + + serviceOpts = { + after = [ "pgbouncer.service" ]; + serviceConfig = let + startScript = pkgs.writeShellScriptBin "pgbouncer-start" "${concatStringsSep " " ([ + "${pkgs.prometheus-pgbouncer-exporter}/bin/pgbouncer_exporter" + "--web.listen-address ${cfg.listenAddress}:${toString cfg.port}" + "--pgBouncer.connectionString ${if cfg.connectionStringFile != null then + "$(head -n1 ${cfg.connectionStringFile})" else "${escapeShellArg cfg.connectionString}"}" + ] + ++ optionals (cfg.telemetryPath != null) [ + "--web.telemetry-path ${escapeShellArg cfg.telemetryPath}" + ] + ++ optionals (cfg.pidFile != null) [ + "--pgBouncer.pid-file= ${escapeShellArg cfg.pidFile}" + ] + ++ optionals (cfg.logLevel != null) [ + "--log.level ${escapeShellArg cfg.logLevel}" + ] + ++ optionals (cfg.logFormat != null) [ + "--log.format ${escapeShellArg cfg.logFormat}" + ] + ++ optionals (cfg.webSystemdSocket != false) [ + "--web.systemd-socket ${escapeShellArg cfg.webSystemdSocket}" + ] + ++ optionals (cfg.webConfigFile != null) [ + "--web.config.file ${escapeShellArg cfg.webConfigFile}" + ] + ++ cfg.extraFlags)}"; + in + { + ExecStart = "${startScript}/bin/pgbouncer-start"; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/sabnzbd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/sabnzbd.nix new file mode 100644 index 0000000000..4112774940 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/sabnzbd.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, options }: + +let + inherit (lib) mkOption types; + cfg = config.services.prometheus.exporters.sabnzbd; +in +{ + port = 9387; + + extraOpts = { + servers = mkOption { + description = "List of sabnzbd servers to connect to."; + type = types.listOf (types.submodule { + options = { + baseUrl = mkOption { + type = types.str; + description = "Base URL of the sabnzbd server."; + example = "http://localhost:8080/sabnzbd"; + }; + apiKeyFile = mkOption { + type = types.str; + description = "File containing the API key."; + example = "/run/secrets/sabnzbd_apikey"; + }; + }; + }); + }; + }; + + serviceOpts = + let + servers = lib.zipAttrs cfg.servers; + apiKeys = lib.concatStringsSep "," (builtins.map (file: "$(cat ${file})") servers.apiKeyFile); + in + { + environment = { + METRICS_PORT = toString cfg.port; + METRICS_ADDR = cfg.listenAddress; + SABNZBD_BASEURLS = lib.concatStringsSep "," servers.baseUrl; + }; + + script = '' + export SABNZBD_APIKEYS="${apiKeys}" + exec ${lib.getExe pkgs.prometheus-sabnzbd-exporter} + ''; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix index f52d92a73d..f2336429d4 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/unbound.nix @@ -1,4 +1,8 @@ -{ config, lib, pkgs, options }: +{ config +, lib +, pkgs +, options +}: with lib; @@ -6,17 +10,14 @@ let cfg = config.services.prometheus.exporters.unbound; in { + imports = [ + (mkRemovedOptionModule [ "controlInterface" ] "This option was removed, use the `unbound.host` option instead.") + (mkRemovedOptionModule [ "fetchType" ] "This option was removed, use the `unbound.host` option instead.") + ({ options.warnings = options.warnings; options.assertions = options.assertions; }) + ]; + port = 9167; extraOpts = { - fetchType = mkOption { - # TODO: add shm when upstream implemented it - type = types.enum [ "tcp" "uds" ]; - default = "uds"; - description = lib.mdDoc '' - Which methods the exporter uses to get the information from unbound. - ''; - }; - telemetryPath = mkOption { type = types.str; default = "/metrics"; @@ -25,34 +26,65 @@ in ''; }; - controlInterface = mkOption { - type = types.nullOr types.str; - default = null; - example = "/run/unbound/unbound.socket"; - description = lib.mdDoc '' - Path to the unbound socket for uds mode or the control interface port for tcp mode. + unbound = { + ca = mkOption { + type = types.nullOr types.path; + default = "/var/lib/unbound/unbound_server.pem"; + example = null; + description = '' + Path to the Unbound server certificate authority + ''; + }; - Example: - uds-mode: /run/unbound/unbound.socket - tcp-mode: 127.0.0.1:8953 - ''; + certificate = mkOption { + type = types.nullOr types.path; + default = "/var/lib/unbound/unbound_control.pem"; + example = null; + description = '' + Path to the Unbound control socket certificate + ''; + }; + + key = mkOption { + type = types.nullOr types.path; + default = "/var/lib/unbound/unbound_control.key"; + example = null; + description = '' + Path to the Unbound control socket key. + ''; + }; + + host = mkOption { + type = types.str; + default = "tcp://127.0.0.1:8953"; + example = "unix:///run/unbound/unbound.socket"; + description = lib.mdDoc '' + Path to the unbound control socket. Supports unix domain sockets, as well as the TCP interface. + ''; + }; }; }; serviceOpts = mkMerge ([{ serviceConfig = { + User = "unbound"; # to access the unbound_control.key ExecStart = '' - ${pkgs.prometheus-unbound-exporter}/bin/unbound-telemetry \ - ${cfg.fetchType} \ - --bind ${cfg.listenAddress}:${toString cfg.port} \ - --path ${cfg.telemetryPath} \ - ${optionalString (cfg.controlInterface != null) "--control-interface ${cfg.controlInterface}"} \ + ${pkgs.prometheus-unbound-exporter}/bin/unbound_exporter \ + --unbound.host "${cfg.unbound.host}" \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --web.telemetry-path ${cfg.telemetryPath} \ + ${optionalString (cfg.unbound.ca != null) "--unbound.ca ${cfg.unbound.ca}"} \ + ${optionalString (cfg.unbound.certificate != null) "--unbound.cert ${cfg.unbound.certificate}"} \ + ${optionalString (cfg.unbound.key != null) "--unbound.key ${cfg.unbound.key}"} \ ${toString cfg.extraFlags} ''; RestrictAddressFamilies = [ - # Need AF_UNIX to collect data "AF_UNIX" + "AF_INET" + "AF_INET6" ]; + } // optionalAttrs (!config.services.unbound.enable) { + DynamicUser = true; }; }] ++ [ (mkIf config.services.unbound.enable { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/vmagent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/vmagent.nix index c793bb0731..0e2ffb31c5 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/vmagent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/vmagent.nix @@ -62,6 +62,16 @@ in { Whether to open the firewall for the default ports. ''; }; + + extraArgs = mkOption { + type = types.listOf types.str; + default = []; + description = lib.mdDoc '' + Extra args to pass to `vmagent`. See the docs: + + or {command}`vmagent -help` for more information. + ''; + }; }; config = mkIf cfg.enable { @@ -90,7 +100,7 @@ in { Type = "simple"; Restart = "on-failure"; WorkingDirectory = cfg.dataDir; - ExecStart = "${cfg.package}/bin/vmagent -remoteWrite.url=${cfg.remoteWriteUrl} -promscrape.config=${prometheusConfig}"; + ExecStart = "${cfg.package}/bin/vmagent -remoteWrite.url=${cfg.remoteWriteUrl} -promscrape.config=${prometheusConfig} ${escapeShellArgs cfg.extraArgs}"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix index e20e7975eb..085b64e4c0 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix @@ -192,7 +192,7 @@ in { # orangefs daemon will run as user users.users.orangefs = { isSystemUser = true; - group = "orangfs"; + group = "orangefs"; }; users.groups.orangefs = {}; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix b/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix index 1701e5b439..399d838ccc 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix @@ -17,6 +17,7 @@ let text = builtins.toJSON cfg.settings; checkPhase = "${pkgs.adguardhome}/bin/adguardhome -c $out --check-config"; }; + defaultBindPort = 3000; in { @@ -86,7 +87,7 @@ in ''; }; bind_port = mkOption { - default = 3000; + default = defaultBindPort; type = port; description = lib.mdDoc '' Port to serve HTTP pages on. @@ -169,6 +170,6 @@ in }; }; - networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.bind_port ]; + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.bind_port or defaultBindPort ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/coredns.nix b/third_party/nixpkgs/nixos/modules/services/networking/coredns.nix index f928cdf961..f1fe7b2f12 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/coredns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/coredns.nix @@ -29,6 +29,13 @@ in { type = types.package; description = lib.mdDoc "Coredns package to use."; }; + + extraArgs = mkOption { + default = []; + example = [ "-dns.port=53" ]; + type = types.listOf types.str; + description = lib.mdDoc "Extra arguments to pass to coredns."; + }; }; config = mkIf cfg.enable { @@ -44,7 +51,7 @@ in { AmbientCapabilities = "cap_net_bind_service"; NoNewPrivileges = true; DynamicUser = true; - ExecStart = "${getBin cfg.package}/bin/coredns -conf=${configFile}"; + ExecStart = "${getBin cfg.package}/bin/coredns -conf=${configFile} ${lib.escapeShellArgs cfg.extraArgs}"; ExecReload = "${pkgs.coreutils}/bin/kill -SIGUSR1 $MAINPID"; Restart = "on-failure"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dae.nix b/third_party/nixpkgs/nixos/modules/services/networking/dae.nix index 231c555b33..42ed3c7f8d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dae.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dae.nix @@ -1,41 +1,161 @@ -{ config, pkgs, lib, ... }: +{ config, lib, pkgs, ... }: + let cfg = config.services.dae; + assets = cfg.assets; + genAssetsDrv = paths: pkgs.symlinkJoin { + name = "dae-assets"; + inherit paths; + }; in { - meta.maintainers = with lib.maintainers; [ pokon548 ]; + meta.maintainers = with lib.maintainers; [ pokon548 oluceps ]; options = { - services.dae = { - enable = lib.options.mkEnableOption (lib.mdDoc "the dae service"); - package = lib.mkPackageOptionMD pkgs "dae" { }; + services.dae = with lib;{ + enable = mkEnableOption + (mdDoc "A Linux high-performance transparent proxy solution based on eBPF"); + + package = mkPackageOptionMD pkgs "dae" { }; + + assets = mkOption { + type = with types;(listOf path); + default = with pkgs; [ v2ray-geoip v2ray-domain-list-community ]; + defaultText = literalExpression "with pkgs; [ v2ray-geoip v2ray-domain-list-community ]"; + description = mdDoc '' + Assets required to run dae. + ''; + }; + + assetsPath = mkOption { + type = types.str; + default = "${genAssetsDrv assets}/share/v2ray"; + defaultText = literalExpression '' + (symlinkJoin { + name = "dae-assets"; + paths = assets; + })/share/v2ray + ''; + description = mdDoc '' + The path which contains geolocation database. + This option will override `assets`. + ''; + }; + + openFirewall = mkOption { + type = with types; submodule { + options = { + enable = mkEnableOption "enable"; + port = mkOption { + type = types.int; + description = '' + Port to be opened. Consist with field `tproxy_port` in config file. + ''; + }; + }; + }; + default = { + enable = true; + port = 12345; + }; + defaultText = literalExpression '' + { + enable = true; + port = 12345; + } + ''; + description = mdDoc '' + Open the firewall port. + ''; + }; + + configFile = mkOption { + type = types.path; + default = "/etc/dae/config.dae"; + example = "/path/to/your/config.dae"; + description = mdDoc '' + The path of dae config file, end with `.dae`. + ''; + }; + + config = mkOption { + type = types.str; + default = '' + global{} + routing{} + ''; + description = mdDoc '' + Config text for dae. + + See . + ''; + }; + + disableTxChecksumIpGeneric = + mkEnableOption (mdDoc "See "); + }; }; - config = lib.mkIf config.services.dae.enable { - networking.firewall.allowedTCPPorts = [ 12345 ]; - networking.firewall.allowedUDPPorts = [ 12345 ]; + config = lib.mkIf cfg.enable - systemd.services.dae = { - unitConfig = { - Description = "dae Service"; - Documentation = "https://github.com/daeuniverse/dae"; - After = [ "network-online.target" "systemd-sysctl.service" ]; - Wants = [ "network-online.target" ]; + { + environment.systemPackages = [ cfg.package ]; + systemd.packages = [ cfg.package ]; + + environment.etc."dae/config.dae" = { + mode = "0400"; + source = pkgs.writeText "config.dae" cfg.config; }; - serviceConfig = { - User = "root"; - ExecStartPre = "${lib.getExe cfg.package} validate -c /etc/dae/config.dae"; - ExecStart = "${lib.getExe cfg.package} run --disable-timestamp -c /etc/dae/config.dae"; - ExecReload = "${lib.getExe cfg.package} reload $MAINPID"; - LimitNPROC = 512; - LimitNOFILE = 1048576; - Restart = "on-abnormal"; - Type = "notify"; + networking = lib.mkIf cfg.openFirewall.enable { + firewall = + let portToOpen = cfg.openFirewall.port; + in + { + allowedTCPPorts = [ portToOpen ]; + allowedUDPPorts = [ portToOpen ]; + }; }; - wantedBy = [ "multi-user.target" ]; + systemd.services.dae = + let + daeBin = lib.getExe cfg.package; + TxChecksumIpGenericWorkaround = with lib;(getExe pkgs.writeShellApplication { + name = "disable-tx-checksum-ip-generic"; + text = with pkgs; '' + iface=$(${iproute2}/bin/ip route | ${lib.getExe gawk} '/default/ {print $5}') + ${lib.getExe ethtool} -K "$iface" tx-checksum-ip-generic off + ''; + }); + in + { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStartPre = [ "" "${daeBin} validate -c ${cfg.configFile}" ] + ++ (with lib; optional cfg.disableTxChecksumIpGeneric TxChecksumIpGenericWorkaround); + ExecStart = [ "" "${daeBin} run --disable-timestamp -c ${cfg.configFile}" ]; + Environment = "DAE_LOCATION_ASSET=${cfg.assetsPath}"; + }; + }; + + assertions = [ + { + assertion = lib.pathExists (toString (genAssetsDrv cfg.assets) + "/share/v2ray"); + message = '' + Packages in `assets` has no preset paths included. + Please set `assetsPath` instead. + ''; + } + + { + assertion = !((config.services.dae.config != "global{}\nrouting{}\n") + && (config.services.dae.configFile != "/etc/dae/config.dae")); + message = '' + Option `config` and `configFile` could not be set + at the same time. + ''; + } + ]; }; - }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix index de1ca0d2f2..4592a0c2f6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix @@ -11,7 +11,7 @@ in settings = mkOption { description = lib.mdDoc '' Attrset that is converted and passed as TOML config file. - For available params, see: + For available params, see: ''; example = literalExpression '' { @@ -49,7 +49,7 @@ in passAsFile = [ "json" ]; } '' ${if cfg.upstreamDefaults then '' - ${pkgs.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy2.src}/dnscrypt-proxy/example-dnscrypt-proxy.toml > example.json + ${pkgs.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy.src}/dnscrypt-proxy/example-dnscrypt-proxy.toml > example.json ${pkgs.jq}/bin/jq --slurp add example.json $jsonPath > config.json # merges the two '' else '' cp $jsonPath config.json @@ -80,7 +80,7 @@ in AmbientCapabilities = "CAP_NET_BIND_SERVICE"; CacheDirectory = "dnscrypt-proxy"; DynamicUser = true; - ExecStart = "${pkgs.dnscrypt-proxy2}/bin/dnscrypt-proxy -config ${cfg.configFile}"; + ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy -config ${cfg.configFile}"; LockPersonality = true; LogsDirectory = "dnscrypt-proxy"; MemoryDenyWriteExecute = true; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix index 4886654e8c..14bbe334e5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.dnsmasq; - dnsmasq = pkgs.dnsmasq; + dnsmasq = cfg.package; stateDir = "/var/lib/dnsmasq"; # True values are just put as `name` instead of `name=true`, and false values @@ -53,6 +53,8 @@ in ''; }; + package = mkPackageOptionMD pkgs "dnsmasq" {}; + resolveLocalQueries = mkOption { type = types.bool; default = true; 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 452dd97d89..7c7136cc96 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/firewall-nftables.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/firewall-nftables.nix @@ -70,10 +70,8 @@ in } ]; - networking.nftables.ruleset = '' - - table inet nixos-fw { - + networking.nftables.tables."nixos-fw".family = "inet"; + networking.nftables.tables."nixos-fw".content = '' ${optionalString (cfg.checkReversePath != false) '' chain rpfilter { type filter hook prerouting priority mangle + 10; policy drop; @@ -169,9 +167,6 @@ in } ''} - - } - ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/frp.nix b/third_party/nixpkgs/nixos/modules/services/networking/frp.nix new file mode 100644 index 0000000000..e4f9a220b5 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/frp.nix @@ -0,0 +1,93 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.frp; + settingsFormat = pkgs.formats.ini { }; + configFile = settingsFormat.generate "frp.ini" cfg.settings; + isClient = (cfg.role == "client"); + isServer = (cfg.role == "server"); +in +{ + options = { + services.frp = { + enable = mkEnableOption (mdDoc "frp"); + + package = mkPackageOptionMD pkgs "frp" { }; + + role = mkOption { + type = types.enum [ "server" "client" ]; + description = mdDoc '' + The frp consists of `client` and `server`. The server is usually + deployed on the machine with a public IP address, and + the client is usually deployed on the machine + where the Intranet service to be penetrated resides. + ''; + }; + + settings = mkOption { + type = settingsFormat.type; + default = { }; + description = mdDoc '' + Frp configuration, for configuration options + see the example of [client](https://github.com/fatedier/frp/blob/dev/conf/frpc_legacy_full.ini) + or [server](https://github.com/fatedier/frp/blob/dev/conf/frps_legacy_full.ini) on github. + ''; + example = literalExpression '' + { + common = { + server_addr = "x.x.x.x"; + server_port = 7000; + }; + } + ''; + }; + }; + }; + + config = + let + serviceCapability = optionals isServer [ "CAP_NET_BIND_SERVICE" ]; + executableFile = if isClient then "frpc" else "frps"; + in + mkIf cfg.enable { + systemd.services = { + frp = { + wants = optionals isClient [ "network-online.target" ]; + after = if isClient then [ "network-online.target" ] else [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + description = "A fast reverse proxy frp ${cfg.role}"; + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + RestartSec = 15; + ExecStart = "${cfg.package}/bin/${executableFile} -c ${configFile}"; + StateDirectoryMode = optionalString isServer "0700"; + DynamicUser = true; + # Hardening + UMask = optionalString isServer "0007"; + CapabilityBoundingSet = serviceCapability; + AmbientCapabilities = serviceCapability; + PrivateDevices = true; + ProtectHostname = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ] ++ optionals isClient [ "AF_UNIX" ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + PrivateMounts = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" ]; + }; + }; + }; + }; + + meta.maintainers = with maintainers; [ zaldnoay ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/frr.nix b/third_party/nixpkgs/nixos/modules/services/networking/frr.nix index d350fe3548..8488a4e4ef 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/frr.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/frr.nix @@ -23,6 +23,7 @@ let "pbr" "bfd" "fabric" + "mgmt" ]; allServices = services ++ [ "zebra" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/jool.nix b/third_party/nixpkgs/nixos/modules/services/networking/jool.nix index 3aafbe4096..d2d2b0956e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/jool.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/jool.nix @@ -16,7 +16,7 @@ let TemporaryFileSystem = [ "/" ]; BindReadOnlyPaths = [ builtins.storeDir - "/run/current-system/kernel-modules" + "/run/booted-system/kernel-modules" ]; # Give capabilities to load the module and configure it @@ -31,26 +31,96 @@ let configFormat = pkgs.formats.json {}; - mkDefaultAttrs = lib.mapAttrs (n: v: lib.mkDefault v); + # Generate the config file of instance `name` + nat64Conf = name: + configFormat.generate "jool-nat64-${name}.conf" + (cfg.nat64.${name} // { instance = name; }); + siitConf = name: + configFormat.generate "jool-siit-${name}.conf" + (cfg.siit.${name} // { instance = name; }); - defaultNat64 = { - instance = "default"; - framework = "netfilter"; - global.pool6 = "64:ff9b::/96"; - }; - defaultSiit = { - instance = "default"; - framework = "netfilter"; + # NAT64 config type + nat64Options = lib.types.submodule { + # The format is plain JSON + freeformType = configFormat.type; + # Some options with a default value + options.framework = lib.mkOption { + type = lib.types.enum [ "netfilter" "iptables" ]; + default = "netfilter"; + description = lib.mdDoc '' + The framework to use for attaching Jool's translation to the exist + kernel packet processing rules. See the + [documentation](https://nicmx.github.io/Jool/en/intro-jool.html#design) + for the differences between the two options. + ''; + }; + options.global.pool6 = lib.mkOption { + type = lib.types.strMatching "[[:xdigit:]:]+/[[:digit:]]+" + // { description = "Network prefix in CIDR notation"; }; + default = "64:ff9b::/96"; + description = lib.mdDoc '' + The prefix used for embedding IPv4 into IPv6 addresses. + Defaults to the well-known NAT64 prefix, defined by + [RFC 6052](https://datatracker.ietf.org/doc/html/rfc6052). + ''; + }; }; - nat64Conf = configFormat.generate "jool-nat64.conf" cfg.nat64.config; - siitConf = configFormat.generate "jool-siit.conf" cfg.siit.config; + # SIIT config type + siitOptions = lib.types.submodule { + # The format is, again, plain JSON + freeformType = configFormat.type; + # Some options with a default value + options = { inherit (nat64Options.getSubOptions []) framework; }; + }; + + makeNat64Unit = name: opts: { + "jool-nat64-${name}" = { + description = "Jool, NAT64 setup of instance ${name}"; + documentation = [ "https://nicmx.github.io/Jool/en/documentation.html" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStartPre = "${pkgs.kmod}/bin/modprobe jool"; + ExecStart = "${jool-cli}/bin/jool file handle ${nat64Conf name}"; + ExecStop = "${jool-cli}/bin/jool -f ${nat64Conf name} instance remove"; + } // hardening; + }; + }; + + makeSiitUnit = name: opts: { + "jool-siit-${name}" = { + description = "Jool, SIIT setup of instance ${name}"; + documentation = [ "https://nicmx.github.io/Jool/en/documentation.html" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStartPre = "${pkgs.kmod}/bin/modprobe jool_siit"; + ExecStart = "${jool-cli}/bin/jool_siit file handle ${siitConf name}"; + ExecStop = "${jool-cli}/bin/jool_siit -f ${siitConf name} instance remove"; + } // hardening; + }; + }; + + checkNat64 = name: _: '' + printf 'Validating Jool configuration for NAT64 instance "${name}"... ' + jool file check ${nat64Conf name} + printf 'Ok.\n'; touch "$out" + ''; + + checkSiit = name: _: '' + printf 'Validating Jool configuration for SIIT instance "${name}"... ' + jool_siit file check ${siitConf name} + printf 'Ok.\n'; touch "$out" + ''; in { - ###### interface - options = { networking.jool.enable = lib.mkOption { type = lib.types.bool; @@ -64,157 +134,146 @@ in NAT64, analogous to the IPv4 NAPT. Refer to the upstream [documentation](https://nicmx.github.io/Jool/en/intro-xlat.html) for the supported modes of translation and how to configure them. + + Enabling this option will install the Jool kernel module and the + command line tools for controlling it. ''; }; - networking.jool.nat64.enable = lib.mkEnableOption (lib.mdDoc "a NAT64 instance of Jool."); - networking.jool.nat64.config = lib.mkOption { - type = configFormat.type; - default = defaultNat64; + networking.jool.nat64 = lib.mkOption { + type = lib.types.attrsOf nat64Options; + default = { }; example = lib.literalExpression '' { - # custom NAT64 prefix - global.pool6 = "2001:db8:64::/96"; + default = { + # custom NAT64 prefix + global.pool6 = "2001:db8:64::/96"; - # Port forwarding - bib = [ - { # SSH 192.0.2.16 → 2001:db8:a::1 - "protocol" = "TCP"; - "ipv4 address" = "192.0.2.16#22"; - "ipv6 address" = "2001:db8:a::1#22"; - } - { # DNS (TCP) 192.0.2.16 → 2001:db8:a::2 - "protocol" = "TCP"; - "ipv4 address" = "192.0.2.16#53"; - "ipv6 address" = "2001:db8:a::2#53"; - } - { # DNS (UDP) 192.0.2.16 → 2001:db8:a::2 - "protocol" = "UDP"; - "ipv4 address" = "192.0.2.16#53"; - "ipv6 address" = "2001:db8:a::2#53"; - } - ]; + # Port forwarding + bib = [ + { # SSH 192.0.2.16 → 2001:db8:a::1 + "protocol" = "TCP"; + "ipv4 address" = "192.0.2.16#22"; + "ipv6 address" = "2001:db8:a::1#22"; + } + { # DNS (TCP) 192.0.2.16 → 2001:db8:a::2 + "protocol" = "TCP"; + "ipv4 address" = "192.0.2.16#53"; + "ipv6 address" = "2001:db8:a::2#53"; + } + { # DNS (UDP) 192.0.2.16 → 2001:db8:a::2 + "protocol" = "UDP"; + "ipv4 address" = "192.0.2.16#53"; + "ipv6 address" = "2001:db8:a::2#53"; + } + ]; - pool4 = [ - # Ports for dynamic translation - { protocol = "TCP"; prefix = "192.0.2.16/32"; "port range" = "40001-65535"; } - { protocol = "UDP"; prefix = "192.0.2.16/32"; "port range" = "40001-65535"; } - { protocol = "ICMP"; prefix = "192.0.2.16/32"; "port range" = "40001-65535"; } + pool4 = [ + # Port ranges for dynamic translation + { protocol = "TCP"; prefix = "192.0.2.16/32"; "port range" = "40001-65535"; } + { protocol = "UDP"; prefix = "192.0.2.16/32"; "port range" = "40001-65535"; } + { protocol = "ICMP"; prefix = "192.0.2.16/32"; "port range" = "40001-65535"; } - # Ports for static BIB entries - { protocol = "TCP"; prefix = "192.0.2.16/32"; "port range" = "22"; } - { protocol = "UDP"; prefix = "192.0.2.16/32"; "port range" = "53"; } - ]; + # Ports for static BIB entries + { protocol = "TCP"; prefix = "192.0.2.16/32"; "port range" = "22"; } + { protocol = "UDP"; prefix = "192.0.2.16/32"; "port range" = "53"; } + ]; + }; } ''; description = lib.mdDoc '' - The configuration of a stateful NAT64 instance of Jool managed through - NixOS. See https://nicmx.github.io/Jool/en/config-atomic.html for the - available options. + Definitions of NAT64 instances of Jool. + See the + [documentation](https://nicmx.github.io/Jool/en/config-atomic.html) for + the available options. Also check out the + [tutorial](https://nicmx.github.io/Jool/en/run-nat64.html) for an + introduction to NAT64 and how to troubleshoot the setup. + + The attribute name defines the name of the instance, with the main one + being `default`: this can be accessed from the command line without + specifying the name with `-i`. ::: {.note} - Existing or more instances created manually will not interfere with the - NixOS instance, provided the respective `pool4` addresses and port - ranges are not overlapping. + Instances created imperatively from the command line will not interfere + with the NixOS instances, provided the respective `pool4` addresses and + port ranges are not overlapping. ::: ::: {.warning} - Changes to the NixOS instance performed via `jool instance nixos-nat64` - are applied correctly but will be lost after restarting - `jool-nat64.service`. + Changes to an instance performed via `jool -i ` are applied + correctly but will be lost after restarting the respective + `jool-nat64-.service`. ::: ''; }; - networking.jool.siit.enable = lib.mkEnableOption (lib.mdDoc "a SIIT instance of Jool."); - networking.jool.siit.config = lib.mkOption { - type = configFormat.type; - default = defaultSiit; + networking.jool.siit = lib.mkOption { + type = lib.types.attrsOf siitOptions; + default = { }; example = lib.literalExpression '' { - # Maps any IPv4 address x.y.z.t to 2001:db8::x.y.z.t and v.v. - pool6 = "2001:db8::/96"; + default = { + # Maps any IPv4 address x.y.z.t to 2001:db8::x.y.z.t and v.v. + global.pool6 = "2001:db8::/96"; - # Explicit address mappings - eamt = [ - # 2001:db8:1:: ←→ 192.0.2.0 - { "ipv6 prefix": "2001:db8:1::/128", "ipv4 prefix": "192.0.2.0" } - # 2001:db8:1::x ←→ 198.51.100.x - { "ipv6 prefix": "2001:db8:2::/120", "ipv4 prefix": "198.51.100.0/24" } - ] + # Explicit address mappings + eamt = [ + # 2001:db8:1:: ←→ 192.0.2.0 + { "ipv6 prefix" = "2001:db8:1::/128"; "ipv4 prefix" = "192.0.2.0"; } + # 2001:db8:1::x ←→ 198.51.100.x + { "ipv6 prefix" = "2001:db8:2::/120"; "ipv4 prefix" = "198.51.100.0/24"; } + ]; + }; } ''; description = lib.mdDoc '' - The configuration of a SIIT instance of Jool managed through - NixOS. See https://nicmx.github.io/Jool/en/config-atomic.html for the - available options. + Definitions of SIIT instances of Jool. + See the + [documentation](https://nicmx.github.io/Jool/en/config-atomic.html) for + the available options. Also check out the + [tutorial](https://nicmx.github.io/Jool/en/run-vanilla.html) for an + introduction to SIIT and how to troubleshoot the setup. + + The attribute name defines the name of the instance, with the main one + being `default`: this can be accessed from the command line without + specifying the name with `-i`. ::: {.note} - Existing or more instances created manually will not interfere with the - NixOS instance, provided the respective `EAMT` address mappings are not - overlapping. + Instances created imperatively from the command line will not interfere + with the NixOS instances, provided the respective EAMT addresses and + port ranges are not overlapping. ::: ::: {.warning} - Changes to the NixOS instance performed via `jool instance nixos-siit` - are applied correctly but will be lost after restarting - `jool-siit.service`. + Changes to an instance performed via `jool -i ` are applied + correctly but will be lost after restarting the respective + `jool-siit-.service`. ::: ''; }; }; - ###### implementation - config = lib.mkIf cfg.enable { - environment.systemPackages = [ jool-cli ]; + # Install kernel module and cli tools boot.extraModulePackages = [ jool ]; + environment.systemPackages = [ jool-cli ]; - systemd.services.jool-nat64 = lib.mkIf cfg.nat64.enable { - description = "Jool, NAT64 setup"; - documentation = [ "https://nicmx.github.io/Jool/en/documentation.html" ]; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - reloadIfChanged = true; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStartPre = "${pkgs.kmod}/bin/modprobe jool"; - ExecStart = "${jool-cli}/bin/jool file handle ${nat64Conf}"; - ExecStop = "${jool-cli}/bin/jool -f ${nat64Conf} instance remove"; - } // hardening; - }; - - systemd.services.jool-siit = lib.mkIf cfg.siit.enable { - description = "Jool, SIIT setup"; - documentation = [ "https://nicmx.github.io/Jool/en/documentation.html" ]; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - reloadIfChanged = true; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStartPre = "${pkgs.kmod}/bin/modprobe jool_siit"; - ExecStart = "${jool-cli}/bin/jool_siit file handle ${siitConf}"; - ExecStop = "${jool-cli}/bin/jool_siit -f ${siitConf} instance remove"; - } // hardening; - }; - - system.checks = lib.singleton (pkgs.runCommand "jool-validated" { - nativeBuildInputs = [ pkgs.buildPackages.jool-cli ]; - preferLocalBuild = true; - } '' - printf 'Validating Jool configuration... ' - ${lib.optionalString cfg.siit.enable "jool_siit file check ${siitConf}"} - ${lib.optionalString cfg.nat64.enable "jool file check ${nat64Conf}"} - printf 'ok\n' - touch "$out" - ''); - - networking.jool.nat64.config = mkDefaultAttrs defaultNat64; - networking.jool.siit.config = mkDefaultAttrs defaultSiit; + # Install services for each instance + systemd.services = lib.mkMerge + (lib.mapAttrsToList makeNat64Unit cfg.nat64 ++ + lib.mapAttrsToList makeSiitUnit cfg.siit); + # Check the configuration of each instance + system.checks = lib.optional (cfg.nat64 != {} || cfg.siit != {}) + (pkgs.runCommand "jool-validated" + { + nativeBuildInputs = with pkgs.buildPackages; [ jool-cli ]; + preferLocalBuild = true; + } + (lib.concatStrings + (lib.mapAttrsToList checkNat64 cfg.nat64 ++ + lib.mapAttrsToList checkSiit cfg.siit))); }; meta.maintainers = with lib.maintainers; [ rnhmjoj ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/knot.nix b/third_party/nixpkgs/nixos/modules/services/networking/knot.nix index e97195d829..4f6ac945cf 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/knot.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/knot.nix @@ -5,10 +5,114 @@ with lib; let cfg = config.services.knot; - configFile = pkgs.writeTextFile { + yamlConfig = let + result = assert secsCheck; nix2yaml cfg.settings; + + secAllow = n: hasPrefix "mod-" n || elem n [ + "module" + "server" "xdp" "control" + "log" + "statistics" "database" + "keystore" "key" "remote" "remotes" "acl" "submission" "policy" + "template" + "zone" + "include" + ]; + secsCheck = let + secsBad = filter (n: !secAllow n) (attrNames cfg.settings); + in if secsBad == [] then true else throw + ("services.knot.settings contains unknown sections: " + toString secsBad); + + nix2yaml = nix_def: concatStrings ( + # We output the config section in the upstream-mandated order. + # Ordering is important due to forward-references not being allowed. + # See definition of conf_export and 'const yp_item_t conf_schema' + # upstream for reference. Last updated for 3.3. + # When changing the set of sections, also update secAllow above. + [ (sec_list_fa "id" nix_def "module") ] + ++ map (sec_plain nix_def) + [ "server" "xdp" "control" ] + ++ [ (sec_list_fa "target" nix_def "log") ] + ++ map (sec_plain nix_def) + [ "statistics" "database" ] + ++ map (sec_list_fa "id" nix_def) + [ "keystore" "key" "remote" "remotes" "acl" "submission" "policy" ] + + # Export module sections before the template section. + ++ map (sec_list_fa "id" nix_def) (filter (hasPrefix "mod-") (attrNames nix_def)) + + ++ [ (sec_list_fa "id" nix_def "template") ] + ++ [ (sec_list_fa "domain" nix_def "zone") ] + ++ [ (sec_plain nix_def "include") ] + ); + + # A plain section contains directly attributes (we don't really check that ATM). + sec_plain = nix_def: sec_name: if !hasAttr sec_name nix_def then "" else + n2y "" { ${sec_name} = nix_def.${sec_name}; }; + + # This section contains a list of attribute sets. In each of the sets + # there's an attribute (`fa_name`, typically "id") that must exist and come first. + # Alternatively we support using attribute sets instead of lists; example diff: + # -template = [ { id = "default"; /* other attributes */ } { id = "foo"; } ] + # +template = { default = { /* those attributes */ }; foo = { }; } + sec_list_fa = fa_name: nix_def: sec_name: if !hasAttr sec_name nix_def then "" else + let + elem2yaml = fa_val: other_attrs: + " - " + n2y "" { ${fa_name} = fa_val; } + + " " + n2y " " other_attrs + + "\n"; + sec = nix_def.${sec_name}; + in + sec_name + ":\n" + + (if isList sec + then flip concatMapStrings sec + (elem: elem2yaml elem.${fa_name} (removeAttrs elem [ fa_name ])) + else concatStrings (mapAttrsToList elem2yaml sec) + ); + + # This convertor doesn't care about ordering of attributes. + # TODO: it could probably be simplified even more, now that it's not + # to be used directly, but we might want some other tweaks, too. + n2y = indent: val: + if doRecurse val then concatStringsSep "\n${indent}" + (mapAttrsToList + # This is a bit wacky - set directly under a set would start on bad indent, + # so we start those on a new line, but not other types of attribute values. + (aname: aval: "${aname}:${if doRecurse aval then "\n${indent} " else " "}" + + n2y (indent + " ") aval) + val + ) + + "\n" + else + /* + if isList val && stringLength indent < 4 then concatMapStrings + (elem: "\n${indent}- " + n2y (indent + " ") elem) + val + else + */ + if isList val /* and long indent */ then + "[ " + concatMapStringsSep ", " quoteString val + " ]" else + if isBool val then (if val then "on" else "off") else + quoteString val; + + # We don't want paths like ./my-zone.txt be converted to plain strings. + quoteString = s: ''"${if builtins.typeOf s == "path" then s else toString s}"''; + # We don't want to walk the insides of derivation attributes. + doRecurse = val: isAttrs val && !isDerivation val; + + in result; + + configFile = if cfg.settingsFile != null then + # Note: with extraConfig, the 23.05 compat code did include keyFiles from settingsFile. + assert cfg.settings == {} && (cfg.keyFiles == [] || cfg.extraConfig != null); + cfg.settingsFile + else + mkConfigFile yamlConfig; + + mkConfigFile = configString: pkgs.writeTextFile { name = "knot.conf"; - text = (concatMapStringsSep "\n" (file: "include: ${file}") cfg.keyFiles) + "\n" + - cfg.extraConfig; + text = (concatMapStringsSep "\n" (file: "include: ${file}") cfg.keyFiles) + "\n" + configString; + # TODO: maybe we could do some checks even when private keys complicate this? checkPhase = lib.optionalString (cfg.keyFiles == []) '' ${cfg.package}/bin/knotc --config=$out conf-check ''; @@ -60,11 +164,21 @@ in { ''; }; - extraConfig = mkOption { - type = types.lines; - default = ""; + settings = mkOption { + type = types.attrs; + default = {}; description = lib.mdDoc '' - Extra lines to be added verbatim to knot.conf + Extra configuration as nix values. + ''; + }; + + settingsFile = mkOption { + type = types.nullOr types.path; + default = null; + description = lib.mdDoc '' + As alternative to ``settings``, you can provide whole configuration + directly in the almost-YAML format of Knot DNS. + You might want to utilize ``pkgs.writeText "knot.conf" "longConfigString"`` for this. ''; }; @@ -78,6 +192,12 @@ in { }; }; }; + imports = [ + # Compatibility with NixOS 23.05. + (mkChangedOptionModule [ "services" "knot" "extraConfig" ] [ "services" "knot" "settingsFile" ] + (config: mkConfigFile config.services.knot.extraConfig) + ) + ]; config = mkIf config.services.knot.enable { users.groups.knot = {}; @@ -87,6 +207,8 @@ in { description = "Knot daemon user"; }; + environment.etc."knot/knot.conf".source = configFile; # just for user's convenience + systemd.services.knot = { unitConfig.Documentation = "man:knotd(8) man:knot.conf(5) man:knotc(8) https://www.knot-dns.cz/docs/${cfg.package.version}/html/"; description = cfg.package.meta.description; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mtr-exporter.nix b/third_party/nixpkgs/nixos/modules/services/networking/mtr-exporter.nix index 43ebbbe96d..af694c3e73 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mtr-exporter.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mtr-exporter.nix @@ -2,32 +2,26 @@ let inherit (lib) - maintainers types mkEnableOption mkOption mkIf - literalExpression escapeShellArg escapeShellArgs; + maintainers types literalExpression + escapeShellArg escapeShellArgs + mkEnableOption mkOption mkRemovedOptionModule mkIf mdDoc + optionalString concatMapStrings concatStringsSep; + cfg = config.services.mtr-exporter; + + jobsConfig = pkgs.writeText "mtr-exporter.conf" (concatMapStrings (job: '' + ${job.name} -- ${job.schedule} -- ${concatStringsSep " " job.flags} ${job.address} + '') cfg.jobs); in { + imports = [ + (mkRemovedOptionModule [ "services" "mtr-exporter" "target" ] "Use services.mtr-exporter.jobs instead.") + (mkRemovedOptionModule [ "services" "mtr-exporter" "mtrFlags" ] "Use services.mtr-exporter.jobs..flags instead.") + ]; + options = { services = { mtr-exporter = { - enable = mkEnableOption (lib.mdDoc "a Prometheus exporter for MTR"); - - target = mkOption { - type = types.str; - example = "example.org"; - description = lib.mdDoc "Target to check using MTR."; - }; - - interval = mkOption { - type = types.int; - default = 60; - description = lib.mdDoc "Interval between MTR checks in seconds."; - }; - - port = mkOption { - type = types.port; - default = 8080; - description = lib.mdDoc "Listen port for MTR exporter."; - }; + enable = mkEnableOption (mdDoc "a Prometheus exporter for MTR"); address = mkOption { type = types.str; @@ -35,30 +29,87 @@ in { description = lib.mdDoc "Listen address for MTR exporter."; }; - mtrFlags = mkOption { - type = with types; listOf str; + port = mkOption { + type = types.port; + default = 8080; + description = mdDoc "Listen port for MTR exporter."; + }; + + extraFlags = mkOption { + type = types.listOf types.str; default = []; - example = ["-G1"]; - description = lib.mdDoc "Additional flags to pass to MTR."; + example = ["-flag.deprecatedMetrics"]; + description = mdDoc '' + Extra command line options to pass to MTR exporter. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.mtr-exporter; + defaultText = literalExpression "pkgs.mtr-exporter"; + description = mdDoc "The MTR exporter package to use."; + }; + + mtrPackage = mkOption { + type = types.package; + default = pkgs.mtr; + defaultText = literalExpression "pkgs.mtr"; + description = mdDoc "The MTR package to use."; + }; + + jobs = mkOption { + description = mdDoc "List of MTR jobs. Will be added to /etc/mtr-exporter.conf"; + type = types.nonEmptyListOf (types.submodule { + options = { + name = mkOption { + type = types.str; + description = mdDoc "Name of ICMP pinging job."; + }; + + address = mkOption { + type = types.str; + example = "host.example.org:1234"; + description = mdDoc "Target address for MTR client."; + }; + + schedule = mkOption { + type = types.str; + default = "@every 60s"; + example = "@hourly"; + description = mdDoc "Schedule of MTR checks. Also accepts Cron format."; + }; + + flags = mkOption { + type = with types; listOf str; + default = []; + example = ["-G1"]; + description = mdDoc "Additional flags to pass to MTR."; + }; + }; + }); }; }; }; }; config = mkIf cfg.enable { + environment.etc."mtr-exporter.conf" = { + source = jobsConfig; + }; + systemd.services.mtr-exporter = { - script = '' - exec ${pkgs.mtr-exporter}/bin/mtr-exporter \ - -mtr ${pkgs.mtr}/bin/mtr \ - -schedule '@every ${toString cfg.interval}s' \ - -bind ${escapeShellArg cfg.address}:${toString cfg.port} \ - -- \ - ${escapeShellArgs (cfg.mtrFlags ++ [ cfg.target ])} - ''; wantedBy = [ "multi-user.target" ]; requires = [ "network.target" ]; after = [ "network.target" ]; serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/mtr-exporter \ + -mtr '${cfg.mtrPackage}/bin/mtr' \ + -bind ${escapeShellArg "${cfg.address}:${toString cfg.port}"} \ + -jobs '${jobsConfig}' \ + ${escapeShellArgs cfg.extraFlags} + ''; Restart = "on-failure"; # Hardening CapabilityBoundingSet = [ "" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nat-nftables.nix b/third_party/nixpkgs/nixos/modules/services/networking/nat-nftables.nix index 483910a166..4b2317ca2f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nat-nftables.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nat-nftables.nix @@ -145,28 +145,28 @@ in } ]; - networking.nftables.ruleset = '' - table ip nixos-nat { - ${mkTable { + networking.nftables.tables = { + "nixos-nat" = { + family = "ip"; + content = mkTable { ipVer = "ip"; inherit dest ipSet; forwardPorts = filter (x: !(isIPv6 x.destination)) cfg.forwardPorts; inherit (cfg) dmzHost; - }} - } - - ${optionalString cfg.enableIPv6 '' - table ip6 nixos-nat { - ${mkTable { - ipVer = "ip6"; - dest = destIPv6; - ipSet = ipv6Set; - forwardPorts = filter (x: isIPv6 x.destination) cfg.forwardPorts; - dmzHost = null; - }} - } - ''} - ''; + }; + }; + "nixos-nat6" = mkIf cfg.enableIPv6 { + family = "ip6"; + name = "nixos-nat"; + content = mkTable { + ipVer = "ip6"; + dest = destIPv6; + ipSet = ipv6Set; + forwardPorts = filter (x: isIPv6 x.destination) cfg.forwardPorts; + dmzHost = null; + }; + }; + }; networking.firewall.extraForwardRules = optionalString config.networking.firewall.filterForward '' ${optionalString (ifaceSet != "") '' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/netclient.nix b/third_party/nixpkgs/nixos/modules/services/networking/netclient.nix new file mode 100644 index 0000000000..124735fd71 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/netclient.nix @@ -0,0 +1,27 @@ +{ config, pkgs, lib, ... }: +let + cfg = config.services.netclient; +in +{ + meta.maintainers = with lib.maintainers; [ wexder ]; + + options.services.netclient = { + enable = lib.mkEnableOption (lib.mdDoc "Netclient Daemon"); + package = lib.mkPackageOptionMD pkgs "netclient" { }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + systemd.services.netclient = { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + description = "Netclient Daemon"; + serviceConfig = { + Type = "simple"; + ExecStart = "${lib.getExe cfg.package} daemon"; + Restart = "on-failure"; + RestartSec = "15s"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix index e28f96f7a6..53c847ee3c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.networking.networkmanager; - delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != []; + delegateWireless = config.networking.wireless.enable == true && cfg.unmanaged != [ ]; enableIwd = cfg.wifi.backend == "iwd"; @@ -30,17 +30,15 @@ let configFile = pkgs.writeText "NetworkManager.conf" (lib.concatStringsSep "\n" [ (mkSection "main" { plugins = "keyfile"; - dhcp = cfg.dhcp; - dns = cfg.dns; + inherit (cfg) dhcp dns; # If resolvconf is disabled that means that resolv.conf is managed by some other module. rc-manager = if config.networking.resolvconf.enable then "resolvconf" else "unmanaged"; - firewall-backend = cfg.firewallBackend; }) (mkSection "keyfile" { unmanaged-devices = - if cfg.unmanaged == [] then null + if cfg.unmanaged == [ ] then null else lib.concatStringsSep ";" cfg.unmanaged; }) (mkSection "logging" { @@ -103,7 +101,7 @@ let }; macAddressOpt = mkOption { - type = types.either types.str (types.enum ["permanent" "preserve" "random" "stable"]); + type = types.either types.str (types.enum [ "permanent" "preserve" "random" "stable" ]); default = "preserve"; example = "00:11:22:33:44:55"; description = lib.mdDoc '' @@ -126,7 +124,8 @@ let pkgs.wpa_supplicant ]; -in { +in +{ meta = { maintainers = teams.freedesktop.members; @@ -156,7 +155,7 @@ in { int str ])); - default = {}; + default = { }; description = lib.mdDoc '' Configuration for the [connection] section of NetworkManager.conf. Refer to @@ -186,7 +185,7 @@ in { unmanaged = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; description = lib.mdDoc '' List of interfaces that will not be managed by NetworkManager. Interface name can be specified here, but if you need more fidelity, @@ -232,15 +231,6 @@ in { ''; }; - firewallBackend = mkOption { - type = types.enum [ "iptables" "nftables" "none" ]; - default = "iptables"; - description = lib.mdDoc '' - Which firewall backend should be used for configuring masquerading with shared mode. - If set to none, NetworkManager doesn't manage the configuration at all. - ''; - }; - logLevel = mkOption { type = types.enum [ "OFF" "ERR" "WARN" "INFO" "DEBUG" "TRACE" ]; default = "WARN"; @@ -251,7 +241,7 @@ in { appendNameservers = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; description = lib.mdDoc '' A list of name servers that should be appended to the ones configured in NetworkManager or received by DHCP. @@ -260,7 +250,7 @@ in { insertNameservers = mkOption { type = types.listOf types.str; - default = []; + default = [ ]; description = lib.mdDoc '' A list of name servers that should be inserted before the ones configured in NetworkManager or received by DHCP. @@ -336,23 +326,23 @@ in { }; }; }); - default = []; + default = [ ]; example = literalExpression '' - [ { - source = pkgs.writeText "upHook" ''' + [ { + source = pkgs.writeText "upHook" ''' + if [ "$2" != "up" ]; then + logger "exit: event $2 != up" + exit + fi - if [ "$2" != "up" ]; then - logger "exit: event $2 != up" - exit - fi - - # coreutils and iproute are in PATH too - logger "Device $DEVICE_IFACE coming up" + # coreutils and iproute are in PATH too + logger "Device $DEVICE_IFACE coming up" '''; type = "basic"; - } ]''; + } ] + ''; description = lib.mdDoc '' - A list of scripts which will be executed in response to network events. + A list of scripts which will be executed in response to network events. ''; }; @@ -369,14 +359,24 @@ in { ''; }; - enableFccUnlock = mkOption { - type = types.bool; - default = false; + fccUnlockScripts = mkOption { + type = types.listOf (types.submodule { + options = { + id = mkOption { + type = types.str; + description = lib.mdDoc "vid:pid of either the PCI or USB vendor and product ID"; + }; + path = mkOption { + type = types.path; + description = lib.mdDoc "Path to the unlock script"; + }; + }; + }); + default = [ ]; + example = literalExpression ''[{ name = "03f0:4e1d"; script = "''${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/03f0:4e1d"; }]''; description = lib.mdDoc '' - Enable FCC unlock procedures. Since release 1.18.4, the ModemManager daemon no longer - automatically performs the FCC unlock procedure by default. See - [the docs](https://modemmanager.org/docs/modemmanager/fcc-unlock/) - for more details. + List of FCC unlock scripts to enable on the system, behaving as described in + https://modemmanager.org/docs/modemmanager/fcc-unlock/#integration-with-third-party-fcc-unlock-tools. ''; }; }; @@ -387,7 +387,14 @@ in { [ "networking" "networkmanager" "packages" ] [ "networking" "networkmanager" "plugins" ]) (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ]) - (mkRemovedOptionModule ["networking" "networkmanager" "dynamicHosts"] '' + (mkRemovedOptionModule [ "networking" "networkmanager" "enableFccUnlock" ] '' + This option was removed, because using bundled FCC unlock scripts is risky, + might conflict with vendor-provided unlock scripts, and should + be a conscious decision on a per-device basis. + Instead it's recommended to use the + `networking.networkmanager.fccUnlockScripts` option. + '') + (mkRemovedOptionModule [ "networking" "networkmanager" "dynamicHosts" ] '' This option was removed because allowing (multiple) regular users to override host entries affecting the whole system opens up a huge attack vector. There seem to be very rare cases where this might be useful. @@ -395,6 +402,9 @@ in { them via the DNS server in your network, or use environment.etc to add a file into /etc/NetworkManager/dnsmasq.d reconfiguring hostsdir. '') + (mkRemovedOptionModule [ "networking" "networkmanager" "firewallBackend" ] '' + This option was removed as NixOS is now using iptables-nftables-compat even when using iptables, therefore Networkmanager now uses the nftables backend unconditionally. + '') ]; @@ -403,7 +413,8 @@ in { config = mkIf cfg.enable { assertions = [ - { assertion = config.networking.wireless.enable == true -> cfg.unmanaged != []; + { + assertion = config.networking.wireless.enable == true -> cfg.unmanaged != [ ]; message = '' You can not use networking.networkmanager with networking.wireless. Except if you mark some interfaces as unmanaged by NetworkManager. @@ -414,25 +425,29 @@ in { hardware.wirelessRegulatoryDatabase = true; environment.etc = { - "NetworkManager/NetworkManager.conf".source = configFile; - } - // builtins.listToAttrs (map (pkg: nameValuePair "NetworkManager/${pkg.networkManagerPlugin}" { + "NetworkManager/NetworkManager.conf".source = configFile; + } + // builtins.listToAttrs (map + (pkg: nameValuePair "NetworkManager/${pkg.networkManagerPlugin}" { source = "${pkg}/lib/NetworkManager/${pkg.networkManagerPlugin}"; - }) cfg.plugins) - // optionalAttrs cfg.enableFccUnlock - { - "ModemManager/fcc-unlock.d".source = - "${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/*"; - } - // optionalAttrs (cfg.appendNameservers != [] || cfg.insertNameservers != []) - { - "NetworkManager/dispatcher.d/02overridedns".source = overrideNameserversScript; - } - // listToAttrs (lib.imap1 (i: s: - { - name = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}"; - value = { mode = "0544"; inherit (s) source; }; - }) cfg.dispatcherScripts); + }) + cfg.plugins) + // builtins.listToAttrs (map + (e: nameValuePair "ModemManager/fcc-unlock.d/${e.id}" { + source = e.path; + }) + cfg.fccUnlockScripts) + // optionalAttrs (cfg.appendNameservers != [ ] || cfg.insertNameservers != [ ]) + { + "NetworkManager/dispatcher.d/02overridedns".source = overrideNameserversScript; + } + // listToAttrs (lib.imap1 + (i: s: + { + name = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}"; + value = { mode = "0544"; inherit (s) source; }; + }) + cfg.dispatcherScripts); environment.systemPackages = packages; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix b/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix index faff1dca89..a0afdb4527 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix @@ -2,6 +2,35 @@ with lib; let cfg = config.networking.nftables; + + tableSubmodule = { name, ... }: { + options = { + enable = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc "Enable this table."; + }; + + name = mkOption { + type = types.str; + description = lib.mdDoc "Table name."; + }; + + content = mkOption { + type = types.lines; + description = lib.mdDoc "The table content."; + }; + + family = mkOption { + description = lib.mdDoc "Table family."; + type = types.enum [ "ip" "ip6" "inet" "arp" "bridge" "netdev" ]; + }; + }; + + config = { + name = mkDefault name; + }; + }; in { ###### interface @@ -41,6 +70,26 @@ in ''; }; + networking.nftables.checkRulesetRedirects = mkOption { + type = types.addCheck (types.attrsOf types.path) (attrs: all types.path.check (attrNames attrs)); + default = { + "/etc/hosts" = config.environment.etc.hosts.source; + "/etc/protocols" = config.environment.etc.protocols.source; + "/etc/services" = config.environment.etc.services.source; + }; + defaultText = literalExpression '' + { + "/etc/hosts" = config.environment.etc.hosts.source; + "/etc/protocols" = config.environment.etc.protocols.source; + "/etc/services" = config.environment.etc.services.source; + } + ''; + description = mdDoc '' + Set of paths that should be intercepted and rewritten while checking the ruleset + using `pkgs.buildPackages.libredirect`. + ''; + }; + networking.nftables.preCheckRuleset = mkOption { type = types.lines; default = ""; @@ -54,6 +103,24 @@ in ''; }; + networking.nftables.flushRuleset = mkEnableOption (lib.mdDoc "Flush the entire ruleset on each reload."); + + networking.nftables.extraDeletions = mkOption { + type = types.lines; + default = ""; + example = '' + # this makes deleting a non-existing table a no-op instead of an error + table inet some-table; + + delete table inet some-table; + ''; + description = + lib.mdDoc '' + Extra deletion commands to be run on every firewall start, reload + and after stopping the firewall. + ''; + }; + networking.nftables.ruleset = mkOption { type = types.lines; default = ""; @@ -103,7 +170,10 @@ in lib.mdDoc '' The ruleset to be used with nftables. Should be in a format that can be loaded using "/bin/nft -f". The ruleset is updated atomically. - This option conflicts with rulesetFile. + Note that if the tables should be cleaned first, either: + - networking.nftables.flushRuleset = true; needs to be set (flushes all tables) + - networking.nftables.extraDeletions needs to be set + - or networking.nftables.tables can be used, which will clean up the table automatically ''; }; networking.nftables.rulesetFile = mkOption { @@ -113,9 +183,64 @@ in lib.mdDoc '' The ruleset file to be used with nftables. Should be in a format that can be loaded using "nft -f". The ruleset is updated atomically. - This option conflicts with ruleset and nftables based firewall. ''; }; + networking.nftables.tables = mkOption { + type = types.attrsOf (types.submodule tableSubmodule); + + default = {}; + + description = lib.mdDoc '' + Tables to be added to ruleset. + Tables will be added together with delete statements to clean up the table before every update. + ''; + + example = { + filter = { + family = "inet"; + content = '' + # Check out https://wiki.nftables.org/ for better documentation. + # Table for both IPv4 and IPv6. + # Block all incoming connections traffic except SSH and "ping". + chain input { + type filter hook input priority 0; + + # accept any localhost traffic + iifname lo accept + + # accept traffic originated from us + ct state {established, related} accept + + # ICMP + # routers may also want: mld-listener-query, nd-router-solicit + ip6 nexthdr icmpv6 icmpv6 type { destination-unreachable, packet-too-big, time-exceeded, parameter-problem, nd-router-advert, nd-neighbor-solicit, nd-neighbor-advert } accept + ip protocol icmp icmp type { destination-unreachable, router-advertisement, time-exceeded, parameter-problem } accept + + # allow "ping" + ip6 nexthdr icmpv6 icmpv6 type echo-request accept + ip protocol icmp icmp type echo-request accept + + # accept SSH connections (required for a server) + tcp dport 22 accept + + # count and drop any other traffic + counter drop + } + + # Allow all outgoing connections. + chain output { + type filter hook output priority 0; + accept + } + + chain forward { + type filter hook forward priority 0; + accept + } + ''; + }; + }; + }; }; ###### implementation @@ -123,7 +248,8 @@ in config = mkIf cfg.enable { boot.blacklistedKernelModules = [ "ip_tables" ]; environment.systemPackages = [ pkgs.nftables ]; - networking.networkmanager.firewallBackend = mkDefault "nftables"; + # versionOlder for backportability, remove afterwards + networking.nftables.flushRuleset = mkDefault (versionOlder config.system.stateVersion "23.11" || (cfg.rulesetFile != null || cfg.ruleset != "")); systemd.services.nftables = { description = "nftables firewall"; before = [ "network-pre.target" ]; @@ -131,20 +257,51 @@ in wantedBy = [ "multi-user.target" ]; reloadIfChanged = true; serviceConfig = let + enabledTables = filterAttrs (_: table: table.enable) cfg.tables; + deletionsScript = pkgs.writeScript "nftables-deletions" '' + #! ${pkgs.nftables}/bin/nft -f + ${if cfg.flushRuleset then "flush ruleset" + else concatStringsSep "\n" (mapAttrsToList (_: table: '' + table ${table.family} ${table.name} + delete table ${table.family} ${table.name} + '') enabledTables)} + ${cfg.extraDeletions} + ''; + deletionsScriptVar = "/var/lib/nftables/deletions.nft"; + ensureDeletions = pkgs.writeShellScript "nftables-ensure-deletions" '' + touch ${deletionsScriptVar} + chmod +x ${deletionsScriptVar} + ''; + saveDeletionsScript = pkgs.writeShellScript "nftables-save-deletions" '' + cp ${deletionsScript} ${deletionsScriptVar} + ''; + cleanupDeletionsScript = pkgs.writeShellScript "nftables-cleanup-deletions" '' + rm ${deletionsScriptVar} + ''; rulesScript = pkgs.writeTextFile { name = "nftables-rules"; executable = true; text = '' #! ${pkgs.nftables}/bin/nft -f - flush ruleset - ${if cfg.rulesetFile != null then '' + # previous deletions, if any + include "${deletionsScriptVar}" + # current deletions + include "${deletionsScript}" + ${concatStringsSep "\n" (mapAttrsToList (_: table: '' + table ${table.family} ${table.name} { + ${table.content} + } + '') enabledTables)} + ${cfg.ruleset} + ${lib.optionalString (cfg.rulesetFile != null) '' include "${cfg.rulesetFile}" - '' else cfg.ruleset} + ''} ''; checkPhase = lib.optionalString cfg.checkRuleset '' cp $out ruleset.conf + sed 's|include "${deletionsScriptVar}"||' -i ruleset.conf ${cfg.preCheckRuleset} - export NIX_REDIRECTS=/etc/protocols=${pkgs.buildPackages.iana-etc}/etc/protocols:/etc/services=${pkgs.buildPackages.iana-etc}/etc/services + export NIX_REDIRECTS=${escapeShellArg (concatStringsSep ":" (mapAttrsToList (n: v: "${n}=${v}") cfg.checkRulesetRedirects))} LD_PRELOAD="${pkgs.buildPackages.libredirect}/lib/libredirect.so ${pkgs.buildPackages.lklWithFirewall.lib}/lib/liblkl-hijack.so" \ ${pkgs.buildPackages.nftables}/bin/nft --check --file ruleset.conf ''; @@ -152,9 +309,11 @@ in in { Type = "oneshot"; RemainAfterExit = true; - ExecStart = rulesScript; - ExecReload = rulesScript; - ExecStop = "${pkgs.nftables}/bin/nft flush ruleset"; + ExecStart = [ ensureDeletions rulesScript ]; + ExecStartPost = saveDeletionsScript; + ExecReload = [ ensureDeletions rulesScript saveDeletionsScript ]; + ExecStop = [ deletionsScriptVar cleanupDeletionsScript ]; + StateDirectory = "nftables"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nncp.nix b/third_party/nixpkgs/nixos/modules/services/networking/nncp.nix new file mode 100644 index 0000000000..3cfe41995e --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/nncp.nix @@ -0,0 +1,131 @@ +{ config, lib, pkgs, ... }: +with lib; + +let + nncpCfgFile = "/run/nncp.hjson"; + programCfg = config.programs.nncp; + callerCfg = config.services.nncp.caller; + daemonCfg = config.services.nncp.daemon; + settingsFormat = pkgs.formats.json { }; + jsonCfgFile = settingsFormat.generate "nncp.json" programCfg.settings; + pkg = programCfg.package; +in { + options = { + + services.nncp = { + caller = { + enable = mkEnableOption '' + cron'ed NNCP TCP daemon caller. + The daemon will take configuration from + [](#opt-programs.nncp.settings) + ''; + extraArgs = mkOption { + type = with types; listOf str; + description = "Extra command-line arguments to pass to caller."; + default = [ ]; + example = [ "-autotoss" ]; + }; + }; + + daemon = { + enable = mkEnableOption '' + NNCP TCP synronization daemon. + The daemon will take configuration from + [](#opt-programs.nncp.settings) + ''; + socketActivation = { + enable = mkEnableOption '' + Whether to run nncp-daemon persistently or socket-activated. + ''; + listenStreams = mkOption { + type = with types; listOf str; + description = lib.mdDoc '' + TCP sockets to bind to. + See [](#opt-systemd.sockets._name_.listenStreams). + ''; + default = [ "5400" ]; + }; + }; + extraArgs = mkOption { + type = with types; listOf str; + description = "Extra command-line arguments to pass to daemon."; + default = [ ]; + example = [ "-autotoss" ]; + }; + }; + + }; + }; + + config = mkIf (programCfg.enable or callerCfg.enable or daemonCfg.enable) { + + assertions = [{ + assertion = with builtins; + let + callerCongfigured = + let neigh = config.programs.nncp.settings.neigh or { }; + in lib.lists.any (x: hasAttr "calls" x && x.calls != [ ]) + (attrValues neigh); + in !callerCfg.enable || callerCongfigured; + message = "NNCP caller enabled but call configuration is missing"; + }]; + + systemd.services."nncp-caller" = { + inherit (callerCfg) enable; + description = "Croned NNCP TCP daemon caller."; + documentation = [ "http://www.nncpgo.org/nncp_002dcaller.html" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${pkg}/bin/nncp-caller -noprogress -cfg "${nncpCfgFile}" ${ + lib.strings.escapeShellArgs callerCfg.extraArgs + }''; + Group = "uucp"; + UMask = "0002"; + }; + }; + + systemd.services."nncp-daemon" = mkIf daemonCfg.enable { + enable = !daemonCfg.socketActivation.enable; + description = "NNCP TCP syncronization daemon."; + documentation = [ "http://www.nncpgo.org/nncp_002ddaemon.html" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = '' + ${pkg}/bin/nncp-daemon -noprogress -cfg "${nncpCfgFile}" ${ + lib.strings.escapeShellArgs daemonCfg.extraArgs + }''; + Restart = "on-failure"; + Group = "uucp"; + UMask = "0002"; + }; + }; + + systemd.services."nncp-daemon@" = mkIf daemonCfg.socketActivation.enable { + description = "NNCP TCP syncronization daemon."; + documentation = [ "http://www.nncpgo.org/nncp_002ddaemon.html" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = '' + ${pkg}/bin/nncp-daemon -noprogress -ucspi -cfg "${nncpCfgFile}" ${ + lib.strings.escapeShellArgs daemonCfg.extraArgs + }''; + Group = "uucp"; + UMask = "0002"; + StandardInput = "socket"; + StandardOutput = "inherit"; + StandardError = "journal"; + }; + }; + + systemd.sockets.nncp-daemon = mkIf daemonCfg.socketActivation.enable { + inherit (daemonCfg.socketActivation) listenStreams; + description = "socket for NNCP TCP syncronization."; + conflicts = [ "nncp-daemon.service" ]; + wantedBy = [ "sockets.target" ]; + socketConfig.Accept = true; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix index 78d02aaa11..619490a4c0 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix @@ -12,7 +12,7 @@ let else "${name} ${toString val}\n"; configType = with types; - let atom = oneOf [ int bool string path ]; + let atom = oneOf [ int bool str path ]; in attrsOf (either atom (listOf atom)) // { description = '' privoxy configuration type. The format consists of an attribute diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix index e75239e059..327d19daca 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix @@ -27,14 +27,11 @@ let mkValueString = mkValueStringSshd; } " ";}); - configFile = settingsFormat.generate "config" cfg.settings; - sshconf = pkgs.runCommand "sshd.conf-validated" { nativeBuildInputs = [ validationPackage ]; } '' + configFile = settingsFormat.generate "sshd.conf-settings" cfg.settings; + sshconf = pkgs.runCommand "sshd.conf-final" { } '' cat ${configFile} - >$out < /dev/null") + cfg.ports} + ${concatMapStringsSep "\n" + (la: "sshd -G -T -C ${escapeShellArg "laddr=${la.addr},lport=${toString la.port}"} -f ${sshconf} > /dev/null") + cfg.listenAddresses} + touch $out + '') + ]; + assertions = [{ assertion = if cfg.settings.X11Forwarding then cfgc.setXAuthLocation else true; message = "cannot enable X11 forwarding without setting xauth location";} (let diff --git a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix index 346b50700c..d3f6853424 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix @@ -100,13 +100,13 @@ let the Nix configured list of IDs */ + lib.optionalString s.override '' - old_conf_${conf_type}_ids="$(curl -X GET ${s.baseAddress} | ${jq} --raw-output '.[].${s.GET_IdAttrName}')" - for id in ''${old_conf_${conf_type}_ids}; do - if echo ${lib.concatStringsSep " " s.new_conf_IDs} | grep -q $id; then - continue - else - curl -X DELETE ${s.baseAddress}/$id - fi + stale_${conf_type}_ids="$(curl -X GET ${s.baseAddress} | ${jq} \ + --argjson new_ids ${lib.escapeShellArg (builtins.toJSON s.new_conf_IDs)} \ + --raw-output \ + '[.[].${s.GET_IdAttrName}] - $new_ids | .[]' + )" + for id in ''${stale_${conf_type}_ids}; do + curl -X DELETE ${s.baseAddress}/$id done '' )) diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix index f308b7e331..8b35cc8d66 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix @@ -6,7 +6,7 @@ let cfg = config.services.tailscale; isNetworkd = config.networking.useNetworkd; in { - meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 ]; + meta.maintainers = with maintainers; [ danderson mbaillie twitchyliquid64 mfrw ]; options.services.tailscale = { enable = mkEnableOption (lib.mdDoc "Tailscale client daemon"); diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tedicross.nix b/third_party/nixpkgs/nixos/modules/services/networking/tedicross.nix deleted file mode 100644 index cee7e11f4f..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/networking/tedicross.nix +++ /dev/null @@ -1,100 +0,0 @@ -{ config, pkgs, lib, ... }: - -with lib; - -let - dataDir = "/var/lib/tedicross"; - cfg = config.services.tedicross; - configJSON = pkgs.writeText "tedicross-settings.json" (builtins.toJSON cfg.config); - configYAML = pkgs.runCommand "tedicross-settings.yaml" { preferLocalBuild = true; } '' - ${pkgs.remarshal}/bin/json2yaml -i ${configJSON} -o $out - ''; - -in { - options = { - services.tedicross = { - enable = mkEnableOption (lib.mdDoc "the TediCross Telegram-Discord bridge service"); - - config = mkOption { - type = types.attrs; - # from https://github.com/TediCross/TediCross/blob/master/example.settings.yaml - example = literalExpression '' - { - telegram = { - useFirstNameInsteadOfUsername = false; - colonAfterSenderName = false; - skipOldMessages = true; - sendEmojiWithStickers = true; - }; - discord = { - useNickname = false; - skipOldMessages = true; - displayTelegramReplies = "embed"; - replyLength = 100; - }; - bridges = [ - { - name = "Default bridge"; - direction = "both"; - telegram = { - chatId = -123456789; - relayJoinMessages = true; - relayLeaveMessages = true; - sendUsernames = true; - ignoreCommands = true; - }; - discord = { - serverId = "DISCORD_SERVER_ID"; - channelId = "DISCORD_CHANNEL_ID"; - relayJoinMessages = true; - relayLeaveMessages = true; - sendUsernames = true; - crossDeleteOnTelegram = true; - }; - } - ]; - - debug = false; - } - ''; - description = lib.mdDoc '' - {file}`settings.yaml` configuration as a Nix attribute set. - Secret tokens should be specified using {option}`environmentFile` - instead of this world-readable file. - ''; - }; - - environmentFile = mkOption { - type = types.nullOr types.path; - default = null; - description = lib.mdDoc '' - File containing environment variables to be passed to the TediCross service, - in which secret tokens can be specified securely using the - `TELEGRAM_BOT_TOKEN` and `DISCORD_BOT_TOKEN` - keys. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - # from https://github.com/TediCross/TediCross/blob/master/guides/autostart/Linux.md - systemd.services.tedicross = { - description = "TediCross Telegram-Discord bridge service"; - wantedBy = [ "multi-user.target" ]; - wants = [ "network-online.target" ]; - after = [ "network-online.target" ]; - serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.nodePackages.tedicross}/bin/tedicross --config='${configYAML}' --data-dir='${dataDir}'"; - Restart = "always"; - DynamicUser = true; - StateDirectory = baseNameOf dataDir; - EnvironmentFile = cfg.environmentFile; - }; - }; - }; - - meta.maintainers = with maintainers; [ pacien ]; -} - diff --git a/third_party/nixpkgs/nixos/modules/services/networking/trust-dns.nix b/third_party/nixpkgs/nixos/modules/services/networking/trust-dns.nix index a3b4d12479..4196d124a2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/trust-dns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/trust-dns.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, ... }: - let cfg = config.services.trust-dns; toml = pkgs.formats.toml { }; @@ -55,7 +54,7 @@ in defaultText = "pkgs.trust-dns"; description = mdDoc '' Trust-dns package to use. - Only `bin/named` need be provided: the other trust-dns utilities (client and resolver) are not needed. + Only `bin/trust-dns` need be provided: the other trust-dns utilities (client and resolver) are not needed. ''; }; quiet = mkOption { @@ -136,7 +135,7 @@ in flags = (lib.optional cfg.debug "--debug") ++ (lib.optional cfg.quiet "--quiet"); flagsStr = builtins.concatStringsSep " " flags; in '' - ${cfg.package}/bin/named --config ${configFile} ${flagsStr} + ${cfg.package}/bin/trust-dns --config ${configFile} ${flagsStr} ''; Type = "simple"; Restart = "on-failure"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/twingate.nix b/third_party/nixpkgs/nixos/modules/services/networking/twingate.nix index 170d392bf2..03c68fc874 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/twingate.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/twingate.nix @@ -17,7 +17,7 @@ in }; networking.firewall.checkReversePath = lib.mkDefault "loose"; - services.resolved.enable = !(config.networking.networkmanager.enable); + services.resolved.enable = lib.mkIf (!config.networking.networkmanager.enable) true; environment.systemPackages = [ cfg.package ]; # For the CLI. }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix b/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix index 3579d67aa5..37a739f41d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix @@ -5,6 +5,10 @@ let stateDir = "/var/lib/unifi"; cmd = '' @${cfg.jrePackage}/bin/java java \ + ${optionalString (lib.versionAtLeast (lib.getVersion cfg.jrePackage) "16") + "--add-opens java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED " + + "--add-opens java.base/sun.security.util=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED " + + "--add-opens java.rmi/sun.rmi.transport=ALL-UNNAMED"} \ ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \ ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \ -jar ${stateDir}/lib/ace.jar @@ -24,8 +28,8 @@ in services.unifi.jrePackage = mkOption { type = types.package; - default = if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3") then pkgs.jdk11 else pkgs.jre8; - defaultText = literalExpression ''if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3" then pkgs.jdk11 else pkgs.jre8''; + default = if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.5") then pkgs.jdk17_headless else if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3") then pkgs.jdk11 else pkgs.jre8; + defaultText = literalExpression ''if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.5") then pkgs.jdk17_headless else if (lib.versionAtLeast (lib.getVersion cfg.unifiPackage) "7.3" then pkgs.jdk11 else pkgs.jre8''; description = lib.mdDoc '' The JRE package to use. Check the release notes to ensure it is supported. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/websockify.nix b/third_party/nixpkgs/nixos/modules/services/networking/websockify.nix index 45a3487bd3..27ad8953d3 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/websockify.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/websockify.nix @@ -38,7 +38,7 @@ let cfg = config.services.networking.websockify; in { description = "Service to forward websocket connections to TCP connections (from port:to port %I)"; script = '' IFS=':' read -a array <<< "$1" - ${pkgs.pythonPackages.websockify}/bin/websockify --ssl-only \ + ${pkgs.python3Packages.websockify}/bin/websockify --ssl-only \ --cert=${cfg.sslCert} --key=${cfg.sslKey} 0.0.0.0:''${array[0]} 0.0.0.0:''${array[1]} ''; scriptArgs = "%i"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wg-quick.nix b/third_party/nixpkgs/nixos/modules/services/networking/wg-quick.nix index 34210580f5..68e0e06d04 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wg-quick.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wg-quick.nix @@ -17,6 +17,8 @@ let type = with types; nullOr str; description = lib.mdDoc '' wg-quick .conf file, describing the interface. + Using this option can be a useful means of configuring WireGuard if + one has an existing .conf file. This overrides any other configuration interface configuration options. See wg-quick manpage for more details. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix b/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix index 21473388d7..d4099be12a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix @@ -164,6 +164,15 @@ let of the wireguard network has to be adjusted as well. ''; }; + + metric = mkOption { + default = null; + type = with types; nullOr int; + example = 700; + description = lib.mdDoc '' + Set the metric of routes related to this Wireguard interface. + ''; + }; }; }; @@ -395,7 +404,7 @@ let optionalString interfaceCfg.allowedIPsAsRoutes (concatMapStringsSep "\n" (allowedIP: - ''${ip} route replace "${allowedIP}" dev "${interfaceName}" table "${interfaceCfg.table}"'' + ''${ip} route replace "${allowedIP}" dev "${interfaceName}" table "${interfaceCfg.table}" ${optionalString (interfaceCfg.metric != null) "metric ${toString interfaceCfg.metric}"}'' ) peer.allowedIPs); in '' ${wg_setup} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wstunnel.nix b/third_party/nixpkgs/nixos/modules/services/networking/wstunnel.nix index 067d5df487..3c3ecc3e04 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wstunnel.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wstunnel.nix @@ -86,12 +86,12 @@ let description = mdDoc "Address and port to listen on. Setting the port to a value below 1024 will also give the process the required `CAP_NET_BIND_SERVICE` capability."; type = types.submodule hostPortSubmodule; default = { - address = "0.0.0.0"; + host = "0.0.0.0"; port = if config.enableHTTPS then 443 else 80; }; defaultText = literalExpression '' { - address = "0.0.0.0"; + host = "0.0.0.0"; port = if enableHTTPS then 443 else 80; } ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix index 55a6002d61..8335583d2d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix @@ -121,6 +121,13 @@ in restarted. Keys are stored at ${keysPath}. ''); + extraArgs = mkOption { + type = listOf str; + default = [ ]; + example = [ "-loglevel" "info" ]; + description = lib.mdDoc "Extra command line arguments."; + }; + }; }; @@ -181,7 +188,7 @@ in "${binYggdrasil} -genconf") + " > /run/yggdrasil/yggdrasil.conf"} # start yggdrasil - ${binYggdrasil} -useconffile /run/yggdrasil/yggdrasil.conf + ${binYggdrasil} -useconffile /run/yggdrasil/yggdrasil.conf ${lib.strings.escapeShellArgs cfg.extraArgs} ''; serviceConfig = { diff --git a/third_party/nixpkgs/nixos/modules/services/search/typesense.nix b/third_party/nixpkgs/nixos/modules/services/search/typesense.nix index 856c3cad22..c158d04fea 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/typesense.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/typesense.nix @@ -83,12 +83,12 @@ in { Group = "typesense"; StateDirectory = "typesense"; - StateDirectoryMode = "0700"; + StateDirectoryMode = "0750"; # Hardening CapabilityBoundingSet = ""; LockPersonality = true; - MemoryDenyWriteExecute = true; + # MemoryDenyWriteExecute = true; needed since 0.25.1 NoNewPrivileges = true; PrivateUsers = true; PrivateTmp = true; diff --git a/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix b/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix index d8a99dee59..6f4d1dc382 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix @@ -137,7 +137,7 @@ in default = { }; description = lib.mdDoc '' Settings for Kanidm, see - [the documentation](https://github.com/kanidm/kanidm/blob/master/kanidm_book/src/server_configuration.md) + [the documentation](https://kanidm.github.io/kanidm/stable/server_configuration.html) and [example configuration](https://github.com/kanidm/kanidm/blob/master/examples/server.toml) for possible values. ''; @@ -155,7 +155,7 @@ in }; description = lib.mdDoc '' Configure Kanidm clients, needed for the PAM daemon. See - [the documentation](https://github.com/kanidm/kanidm/blob/master/kanidm_book/src/client_tools.md#kanidm-configuration) + [the documentation](https://kanidm.github.io/kanidm/stable/client_tools.html#kanidm-configuration) and [example configuration](https://github.com/kanidm/kanidm/blob/master/examples/config) for possible values. ''; @@ -173,7 +173,7 @@ in }; description = lib.mdDoc '' Configure Kanidm unix daemon. - See [the documentation](https://github.com/kanidm/kanidm/blob/master/kanidm_book/src/pam_and_nsswitch.md#the-unix-daemon) + See [the documentation](https://kanidm.github.io/kanidm/stable/integrations/pam_and_nsswitch.html#the-unix-daemon) and [example configuration](https://github.com/kanidm/kanidm/blob/master/examples/unixd) for possible values. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix b/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix index 9b158bb9d1..071e699751 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix @@ -7,10 +7,8 @@ let # valid policy options policy = (types.enum [ "allow" "block" "reject" "keep" "apply-policy" ]); - defaultRuleFile = "/var/lib/usbguard/rules.conf"; - # decide what file to use for rules - ruleFile = if cfg.rules != null then pkgs.writeText "usbguard-rules" cfg.rules else defaultRuleFile; + ruleFile = if cfg.rules != null then pkgs.writeText "usbguard-rules" cfg.rules else cfg.ruleFile; daemonConf = '' # generated by nixos/modules/services/security/usbguard.nix @@ -51,6 +49,19 @@ in ''; }; + ruleFile = mkOption { + type = types.nullOr types.path; + default = "/var/lib/usbguard/rules.conf"; + example = "/run/secrets/usbguard-rules"; + description = lib.mdDoc '' + This tells the USBGuard daemon which file to load as policy rule set. + + The file can be changed manually or via the IPC interface assuming it has the right file permissions. + + For more details see {manpage}`usbguard-rules.conf(5)`. + ''; + + }; rules = mkOption { type = types.nullOr types.lines; default = null; @@ -63,8 +74,7 @@ in be changed by the IPC interface. If you do not set this option, the USBGuard daemon will load - it's policy rule set from `${defaultRuleFile}`. - This file can be changed manually or via the IPC interface. + it's policy rule set from the option configured in `services.usbguard.ruleFile`. Running `usbguard generate-policy` as root will generate a config for your currently plugged in devices. @@ -248,7 +258,6 @@ in ''; }; imports = [ - (mkRemovedOptionModule [ "services" "usbguard" "ruleFile" ] "The usbguard module now uses ${defaultRuleFile} as ruleFile. Alternatively, use services.usbguard.rules to configure rules.") (mkRemovedOptionModule [ "services" "usbguard" "IPCAccessControlFiles" ] "The usbguard module now hardcodes IPCAccessControlFiles to /var/lib/usbguard/IPCAccessControl.d.") (mkRemovedOptionModule [ "services" "usbguard" "auditFilePath" ] "Removed usbguard module audit log files. Audit logs can be found in the systemd journal.") (mkRenamedOptionModule [ "services" "usbguard" "implictPolicyTarget" ] [ "services" "usbguard" "implicitPolicyTarget" ]) diff --git a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix index d22e6b5b40..0517615a4c 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix @@ -60,10 +60,8 @@ in { config = mkOption { type = attrsOf (nullOr (oneOf [ bool int str ])); default = { - config = { - ROCKET_ADDRESS = "::1"; # default to localhost - ROCKET_PORT = 8222; - }; + ROCKET_ADDRESS = "::1"; # default to localhost + ROCKET_PORT = 8222; }; example = literalExpression '' { diff --git a/third_party/nixpkgs/nixos/modules/services/system/zram-generator.nix b/third_party/nixpkgs/nixos/modules/services/system/zram-generator.nix new file mode 100644 index 0000000000..5902eda556 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/system/zram-generator.nix @@ -0,0 +1,38 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.zram-generator; + settingsFormat = pkgs.formats.ini { }; +in +{ + meta = { + maintainers = with lib.maintainers; [ nickcao ]; + }; + + options.services.zram-generator = { + enable = lib.mkEnableOption (lib.mdDoc "Systemd unit generator for zram devices"); + + package = lib.mkPackageOptionMD pkgs "zram-generator" { }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + }; + default = { }; + description = lib.mdDoc '' + Configuration for zram-generator, + see https://github.com/systemd/zram-generator for documentation. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + system.requiredKernelConfig = with config.lib.kernelConfig; [ + (isModule "ZRAM") + ]; + + systemd.packages = [ cfg.package ]; + systemd.services."systemd-zram-setup@".path = [ pkgs.util-linux ]; # for mkswap + + environment.etc."systemd/zram-generator.conf".source = settingsFormat.generate "zram-generator.conf" cfg.settings; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix b/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix index 752ab91fe6..b98cb5283a 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix @@ -182,7 +182,7 @@ in example = "770"; description = lib.mdDoc '' If not `null`, is used as the permissions - set by `systemd.activationScripts.transmission-daemon` + set by `system.activationScripts.transmission-daemon` on the directories [](#opt-services.transmission.settings.download-dir), [](#opt-services.transmission.settings.incomplete-dir). and [](#opt-services.transmission.settings.watch-dir). diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/audiobookshelf.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/audiobookshelf.nix new file mode 100644 index 0000000000..84dffc5f9d --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/audiobookshelf.nix @@ -0,0 +1,90 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.audiobookshelf; +in +{ + options = { + services.audiobookshelf = { + enable = mkEnableOption "Audiobookshelf, self-hosted audiobook and podcast server."; + + package = mkPackageOption pkgs "audiobookshelf" { }; + + dataDir = mkOption { + description = "Path to Audiobookshelf config and metadata inside of /var/lib."; + default = "audiobookshelf"; + type = types.str; + }; + + host = mkOption { + description = "The host Audiobookshelf binds to."; + default = "127.0.0.1"; + example = "0.0.0.0"; + type = types.str; + }; + + port = mkOption { + description = "The TCP port Audiobookshelf will listen on."; + default = 8000; + type = types.port; + }; + + user = mkOption { + description = "User account under which Audiobookshelf runs."; + default = "audiobookshelf"; + type = types.str; + }; + + group = mkOption { + description = "Group under which Audiobookshelf runs."; + default = "audiobookshelf"; + type = types.str; + }; + + openFirewall = mkOption { + description = "Open ports in the firewall for the Audiobookshelf web interface."; + default = false; + type = types.bool; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.audiobookshelf = { + description = "Audiobookshelf is a self-hosted audiobook and podcast server"; + + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + StateDirectory = cfg.dataDir; + WorkingDirectory = "/var/lib/${cfg.dataDir}"; + ExecStart = "${cfg.package}/bin/audiobookshelf --host ${cfg.host} --port ${toString cfg.port}"; + Restart = "on-failure"; + }; + }; + + users.users = mkIf (cfg.user == "audiobookshelf") { + audiobookshelf = { + isSystemUser = true; + group = cfg.group; + home = "/var/lib/${cfg.dataDir}"; + }; + }; + + users.groups = mkIf (cfg.group == "audiobookshelf") { + audiobookshelf = { }; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + }; + + meta.maintainers = with maintainers; [ wietsedv ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/calibre-web.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/calibre-web.nix index 143decfc09..80567db10c 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/calibre-web.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/calibre-web.nix @@ -10,6 +10,8 @@ in services.calibre-web = { enable = mkEnableOption (lib.mdDoc "Calibre-Web"); + package = lib.mkPackageOption pkgs "calibre-web" { }; + listen = { ip = mkOption { type = types.str; @@ -73,6 +75,8 @@ in ''; }; + enableKepubify = mkEnableOption (lib.mdDoc "kebup conversion support"); + enableBookUploading = mkOption { type = types.bool; default = false; @@ -106,7 +110,7 @@ in systemd.services.calibre-web = let appDb = "/var/lib/${cfg.dataDir}/app.db"; gdriveDb = "/var/lib/${cfg.dataDir}/gdrive.db"; - calibreWebCmd = "${pkgs.calibre-web}/bin/calibre-web -p ${appDb} -g ${gdriveDb}"; + calibreWebCmd = "${cfg.package}/bin/calibre-web -p ${appDb} -g ${gdriveDb}"; settings = concatStringsSep ", " ( [ @@ -117,6 +121,7 @@ in ] ++ optional (cfg.options.calibreLibrary != null) "config_calibre_dir = '${cfg.options.calibreLibrary}'" ++ optional cfg.options.enableBookConversion "config_converterpath = '${pkgs.calibre}/bin/ebook-convert'" + ++ optional cfg.options.enableKepubify "config_kepubifypath = '${pkgs.kepubify}/bin/kepubify'" ); in { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix index 9261de8d43..da2cf93d7f 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/cloudlog.nix @@ -308,8 +308,6 @@ in pools.cloudlog = { inherit (cfg) user; group = config.services.nginx.group; - # cloudlog is currently broken on php 8.2 - phpPackage = pkgs.php81; settings = { "listen.owner" = config.services.nginx.user; "listen.group" = config.services.nginx.group; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix index 747b85f94c..81fed8a0b9 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix @@ -186,7 +186,7 @@ in ProtectSystem = "strict"; ReadWritePaths = cfg.recordingsDir; RemoveIPC = true; - RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_NETLINK" ]; RestrictNamespaces = true; RestrictRealtime = true; RestrictSUIDSGID = true; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix index b0d3c44cea..fe40a3c209 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix @@ -8,6 +8,8 @@ in { options.services.grocy = { enable = mkEnableOption (lib.mdDoc "grocy"); + package = mkPackageOptionMD pkgs "grocy" { }; + hostName = mkOption { type = types.str; description = lib.mdDoc '' @@ -115,9 +117,9 @@ in { user = "grocy"; group = "nginx"; - # PHP 8.1 is the only version which is supported/tested by upstream: - # https://github.com/grocy/grocy/blob/v4.0.0/README.md#platform-support - phpPackage = pkgs.php81; + # PHP 8.1 and 8.2 are the only version which are supported/tested by upstream: + # https://github.com/grocy/grocy/blob/v4.0.2/README.md#platform-support + phpPackage = pkgs.php82; inherit (cfg.phpfpm) settings; @@ -130,10 +132,20 @@ in { }; }; + # After an update of grocy, the viewcache needs to be deleted. Otherwise grocy will not work + # https://github.com/grocy/grocy#how-to-update + systemd.services.grocy-setup = { + wantedBy = [ "multi-user.target" ]; + before = [ "phpfpm-grocy.service" ]; + script = '' + rm -rf ${cfg.dataDir}/viewcache/* + ''; + }; + services.nginx = { enable = true; virtualHosts."${cfg.hostName}" = mkMerge [ - { root = "${pkgs.grocy}/public"; + { root = "${cfg.package}/public"; locations."/".extraConfig = '' rewrite ^ /index.php; ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/healthchecks.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/healthchecks.nix index b3fdb681e2..b925250755 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/healthchecks.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/healthchecks.nix @@ -1,16 +1,16 @@ -{ config, lib, pkgs, buildEnv, ... }: +{ config, lib, options, pkgs, buildEnv, ... }: with lib; let defaultUser = "healthchecks"; cfg = config.services.healthchecks; + opt = options.services.healthchecks; pkg = cfg.package; boolToPython = b: if b then "True" else "False"; environment = { PYTHONPATH = pkg.pythonPath; STATIC_ROOT = cfg.dataDir + "/static"; - DB_NAME = "${cfg.dataDir}/healthchecks.sqlite"; } // cfg.settings; environmentFile = pkgs.writeText "healthchecks-environment" (lib.generators.toKeyValue { } environment); @@ -98,17 +98,24 @@ in description = lib.mdDoc '' Environment variables which are read by healthchecks `(local)_settings.py`. - Settings which are explicitly covered in options bewlow, are type-checked and/or transformed + Settings which are explicitly covered in options below, are type-checked and/or transformed before added to the environment, everything else is passed as a string. See for a full documentation of settings. - We add two variables to this list inside the packages `local_settings.py.` - - STATIC_ROOT to set a state directory for dynamically generated static files. - - SECRET_KEY_FILE to read SECRET_KEY from a file at runtime and keep it out of /nix/store. + We add additional variables to this list inside the packages `local_settings.py.` + - `STATIC_ROOT` to set a state directory for dynamically generated static files. + - `SECRET_KEY_FILE` to read `SECRET_KEY` from a file at runtime and keep it out of + /nix/store. + - `_FILE` variants for several values that hold sensitive information in + [Healthchecks configuration](https://healthchecks.io/docs/self_hosted_configuration/) so + that they also can be read from a file and kept out of /nix/store. To see which values + have support for a `_FILE` variant, run: + - `nix-instantiate --eval --expr '(import {}).healthchecks.secrets'` + - or `nix eval 'nixpkgs#healthchecks.secrets'` if the flake support has been enabled. ''; - type = types.submodule { + type = types.submodule (settings: { freeformType = types.attrsOf types.str; options = { ALLOWED_HOSTS = lib.mkOption { @@ -143,8 +150,28 @@ in ''; apply = boolToPython; }; + + DB = mkOption { + type = types.enum [ "sqlite" "postgres" "mysql" ]; + default = "sqlite"; + description = lib.mdDoc "Database engine to use."; + }; + + DB_NAME = mkOption { + type = types.str; + default = + if settings.config.DB == "sqlite" + then "${cfg.dataDir}/healthchecks.sqlite" + else "hc"; + defaultText = lib.literalExpression '' + if config.${settings.options.DB} == "sqlite" + then "''${config.${opt.dataDir}}/healthchecks.sqlite" + else "hc" + ''; + description = lib.mdDoc "Database name."; + }; }; - }; + }); }; }; @@ -168,7 +195,7 @@ in StateDirectoryMode = mkIf (cfg.dataDir == "/var/lib/healthchecks") "0750"; }; in - { + { healthchecks-migration = { description = "Healthchecks migrations"; wantedBy = [ "healthchecks.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/honk.md b/third_party/nixpkgs/nixos/modules/services/web-apps/honk.md new file mode 100644 index 0000000000..f34085f7dc --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/honk.md @@ -0,0 +1,23 @@ +# Honk {#module-services-honk} + +With Honk on NixOS you can quickly configure a complete ActivityPub server with +minimal setup and support costs. + +## Basic usage {#module-services-honk-basic-usage} + +A minimal configuration looks like this: + +```nix +{ + services.honk = { + enable = true; + host = "0.0.0.0"; + port = 8080; + username = "username"; + passwordFile = "/etc/honk/password.txt"; + servername = "honk.example.com"; + }; + + networking.firewall.allowedTCPPorts = [ 8080 ]; +} +``` diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/honk.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/honk.nix new file mode 100644 index 0000000000..d47b17e54f --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/honk.nix @@ -0,0 +1,153 @@ +{ config +, lib +, pkgs +, ... +}: +let + cfg = config.services.honk; + + honk-initdb-script = cfg: pkgs.writeShellApplication { + name = "honk-initdb-script"; + + runtimeInputs = with pkgs; [ coreutils ]; + + text = '' + PW=$(cat "$CREDENTIALS_DIRECTORY/honk_passwordFile") + + echo -e "${cfg.username}\n''$PW\n${cfg.host}:${toString cfg.port}\n${cfg.servername}" | ${lib.getExe cfg.package} -datadir "$STATE_DIRECTORY" init + ''; + }; +in +{ + options = { + services.honk = { + enable = lib.mkEnableOption (lib.mdDoc "the Honk server"); + package = lib.mkPackageOptionMD pkgs "honk" { }; + + host = lib.mkOption { + default = "127.0.0.1"; + description = lib.mdDoc '' + The host name or IP address the server should listen to. + ''; + type = lib.types.str; + }; + + port = lib.mkOption { + default = 8080; + description = lib.mdDoc '' + The port the server should listen to. + ''; + type = lib.types.port; + }; + + username = lib.mkOption { + description = lib.mdDoc '' + The admin account username. + ''; + type = lib.types.str; + }; + + passwordFile = lib.mkOption { + description = lib.mdDoc '' + Password for admin account. + NOTE: Should be string not a store path, to prevent the password from being world readable + ''; + type = lib.types.path; + }; + + servername = lib.mkOption { + description = lib.mdDoc '' + The server name. + ''; + type = lib.types.str; + }; + + extraJS = lib.mkOption { + default = null; + description = lib.mdDoc '' + An extra JavaScript file to be loaded by the client. + ''; + type = lib.types.nullOr lib.types.path; + }; + + extraCSS = lib.mkOption { + default = null; + description = lib.mdDoc '' + An extra CSS file to be loaded by the client. + ''; + type = lib.types.nullOr lib.types.path; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = cfg.username or "" != ""; + message = '' + You have to define a username for Honk (`services.honk.username`). + ''; + } + { + assertion = cfg.servername or "" != ""; + message = '' + You have to define a servername for Honk (`services.honk.servername`). + ''; + } + ]; + + systemd.services.honk-initdb = { + description = "Honk server database setup"; + requiredBy = [ "honk.service" ]; + before = [ "honk.service" ]; + + serviceConfig = { + LoadCredential = [ + "honk_passwordFile:${cfg.passwordFile}" + ]; + Type = "oneshot"; + StateDirectory = "honk"; + DynamicUser = true; + RemainAfterExit = true; + ExecStart = lib.getExe (honk-initdb-script cfg); + PrivateTmp = true; + }; + + unitConfig = { + ConditionPathExists = [ + # Skip this service if the database already exists + "!%S/honk/honk.db" + ]; + }; + }; + + systemd.services.honk = { + description = "Honk server"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + bindsTo = [ "honk-initdb.service" ]; + preStart = '' + mkdir -p $STATE_DIRECTORY/views + ${lib.optionalString (cfg.extraJS != null) "ln -fs ${cfg.extraJS} $STATE_DIRECTORY/views/local.js"} + ${lib.optionalString (cfg.extraCSS != null) "ln -fs ${cfg.extraCSS} $STATE_DIRECTORY/views/local.css"} + ${lib.getExe cfg.package} -datadir $STATE_DIRECTORY -viewdir ${cfg.package}/share/honk backup $STATE_DIRECTORY/backup + ${lib.getExe cfg.package} -datadir $STATE_DIRECTORY -viewdir ${cfg.package}/share/honk upgrade + ${lib.getExe cfg.package} -datadir $STATE_DIRECTORY -viewdir ${cfg.package}/share/honk cleanup + ''; + serviceConfig = { + ExecStart = '' + ${lib.getExe cfg.package} -datadir $STATE_DIRECTORY -viewdir ${cfg.package}/share/honk + ''; + StateDirectory = "honk"; + DynamicUser = true; + PrivateTmp = "yes"; + Restart = "on-failure"; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ drupol ]; + doc = ./honk.md; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix index 895f3a9f1b..20d9dcb7c2 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix @@ -160,7 +160,7 @@ in root * ${cfg.ui.package}/dist file_server } - handle_path /static/undefined/* { + handle_path /static/${cfg.ui.package.passthru.commit_sha}/* { root * ${cfg.ui.package}/dist file_server } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix index 21c587694c..c5fb037668 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix @@ -8,7 +8,12 @@ let cfg = config.services.mediawiki; fpm = config.services.phpfpm.pools.mediawiki; user = "mediawiki"; - group = if cfg.webserver == "apache" then config.services.httpd.group else "mediawiki"; + group = + if cfg.webserver == "apache" then + config.services.httpd.group + else if cfg.webserver == "nginx" then + config.services.nginx.group + else "mediawiki"; cacheDir = "/var/cache/mediawiki"; stateDir = "/var/lib/mediawiki"; @@ -71,7 +76,7 @@ let ## For more information on customizing the URLs ## (like /w/index.php/Page_title to /wiki/Page_title) please see: ## https://www.mediawiki.org/wiki/Manual:Short_URL - $wgScriptPath = ""; + $wgScriptPath = "${lib.optionalString (cfg.webserver == "nginx") "/w"}"; ## The protocol and server name to use in fully-qualified URLs $wgServer = "${cfg.url}"; @@ -79,6 +84,11 @@ let ## The URL path to static resources (images, scripts, etc.) $wgResourceBasePath = $wgScriptPath; + ${lib.optionalString (cfg.webserver == "nginx") '' + $wgArticlePath = "/wiki/$1"; + $wgUsePathInfo = true; + ''} + ## The URL path to the logo. Make sure you change this from the default, ## or else you'll overwrite your logo when you upgrade! $wgLogo = "$wgResourceBasePath/resources/assets/wiki.png"; @@ -175,6 +185,7 @@ let ${cfg.extraConfig} ''; + withTrailingSlash = str: if lib.hasSuffix "/" str then str else "${str}/"; in { # interface @@ -209,8 +220,14 @@ in url = mkOption { type = types.str; - default = if cfg.webserver == "apache" then + default = + if cfg.webserver == "apache" then "${if cfg.httpd.virtualHost.addSSL || cfg.httpd.virtualHost.forceSSL || cfg.httpd.virtualHost.onlySSL then "https" else "http"}://${cfg.httpd.virtualHost.hostName}" + else if cfg.webserver == "nginx" then + let + hasSSL = host: host.forceSSL || host.addSSL; + in + "${if hasSSL config.services.nginx.virtualHosts.${cfg.nginx.hostName} then "https" else "http"}://${cfg.nginx.hostName}" else "http://localhost"; defaultText = literalExpression '' @@ -286,7 +303,7 @@ in }; webserver = mkOption { - type = types.enum [ "apache" "none" ]; + type = types.enum [ "apache" "none" "nginx" ]; default = "apache"; description = lib.mdDoc "Webserver to use."; }; @@ -368,6 +385,16 @@ in }; }; + nginx.hostName = mkOption { + type = types.str; + example = literalExpression ''wiki.example.com''; + default = "localhost"; + description = lib.mdDoc '' + The hostname to use for the nginx virtual host. + This is used to generate the nginx configuration. + ''; + }; + httpd.virtualHost = mkOption { type = types.submodule (import ../web-servers/apache-httpd/vhost-options.nix); example = literalExpression '' @@ -469,6 +496,9 @@ in settings = (if (cfg.webserver == "apache") then { "listen.owner" = config.services.httpd.user; "listen.group" = config.services.httpd.group; + } else if (cfg.webserver == "nginx") then { + "listen.owner" = config.services.nginx.user; + "listen.group" = config.services.nginx.group; } else { "listen.owner" = user; "listen.group" = group; @@ -503,6 +533,62 @@ in } ]; }; + # inspired by https://www.mediawiki.org/wiki/Manual:Short_URL/Nginx + services.nginx = lib.mkIf (cfg.webserver == "nginx") { + enable = true; + virtualHosts.${config.services.mediawiki.nginx.hostName} = { + root = "${pkg}/share/mediawiki"; + locations = { + "~ ^/w/(index|load|api|thumb|opensearch_desc|rest|img_auth)\\.php$".extraConfig = '' + rewrite ^/w/(.*) /$1 break; + include ${config.services.nginx.package}/conf/fastcgi_params; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_pass unix:${config.services.phpfpm.pools.mediawiki.socket}; + ''; + "/w/images/".alias = withTrailingSlash cfg.uploadsDir; + # Deny access to deleted images folder + "/w/images/deleted".extraConfig = '' + deny all; + ''; + # MediaWiki assets (usually images) + "~ ^/w/resources/(assets|lib|src)" = { + tryFiles = "$uri =404"; + extraConfig = '' + add_header Cache-Control "public"; + expires 7d; + ''; + }; + # Assets, scripts and styles from skins and extensions + "~ ^/w/(skins|extensions)/.+\\.(css|js|gif|jpg|jpeg|png|svg|wasm|ttf|woff|woff2)$" = { + tryFiles = "$uri =404"; + extraConfig = '' + add_header Cache-Control "public"; + expires 7d; + ''; + }; + + # Handling for Mediawiki REST API, see [[mw:API:REST_API]] + "/w/rest.php".tryFiles = "$uri $uri/ /rest.php?$query_string"; + + # Handling for the article path (pretty URLs) + "/wiki/".extraConfig = '' + rewrite ^/wiki/(?.*)$ /w/index.php; + ''; + + # Explicit access to the root website, redirect to main page (adapt as needed) + "= /".extraConfig = '' + return 301 /wiki/Main_Page; + ''; + + # Every other entry point will be disallowed. + # Add specific rules for other entry points/images as needed above this + "/".extraConfig = '' + return 404; + ''; + }; + }; + }; systemd.tmpfiles.rules = [ "d '${stateDir}' 0750 ${user} ${group} - -" diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/meme-bingo-web.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/meme-bingo-web.nix new file mode 100644 index 0000000000..cb864321ef --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/meme-bingo-web.nix @@ -0,0 +1,93 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkEnableOption mkIf mkOption mdDoc types literalExpression; + + cfg = config.services.meme-bingo-web; +in { + options = { + services.meme-bingo-web = { + enable = mkEnableOption (mdDoc '' + A web app for the meme bingo, rendered entirely on the web server and made interactive with forms. + + Note: The application's author suppose to run meme-bingo-web behind a reverse proxy for SSL and HTTP/3. + ''); + + package = mkOption { + type = types.package; + default = pkgs.meme-bingo-web; + defaultText = literalExpression "pkgs.meme-bingo-web"; + description = mdDoc "meme-bingo-web package to use."; + }; + + baseUrl = mkOption { + description = mdDoc '' + URL to be used for the HTML element on all HTML routes. + ''; + type = types.str; + default = "http://localhost:41678/"; + example = "https://bingo.example.com/"; + }; + port = mkOption { + description = mdDoc '' + Port to be used for the web server. + ''; + type = types.port; + default = 41678; + example = 21035; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.meme-bingo-web = { + description = "A web app for playing meme bingos."; + wantedBy = [ "multi-user.target" ]; + + environment = { + MEME_BINGO_BASE = cfg.baseUrl; + MEME_BINGO_PORT = toString cfg.port; + }; + path = [ cfg.package ]; + + serviceConfig = { + User = "meme-bingo-web"; + Group = "meme-bingo-web"; + + DynamicUser = true; + + ExecStart = "${cfg.package}/bin/meme-bingo-web"; + + Restart = "always"; + RestartSec = 1; + + # Hardening + CapabilityBoundingSet = [ "" ]; + DeviceAllow = [ "/dev/random" ]; + LockPersonality = true; + PrivateDevices = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectSystem = "strict"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" "~@resources" ]; + UMask = "0077"; + RestrictSUIDSGID = true; + RemoveIPC = true; + NoNewPrivileges = true; + MemoryDenyWriteExecute = true; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mobilizon.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mobilizon.nix new file mode 100644 index 0000000000..e9264a38f0 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mobilizon.nix @@ -0,0 +1,442 @@ +{ pkgs, lib, config, ... }: + +with lib; + +let + cfg = config.services.mobilizon; + + user = "mobilizon"; + group = "mobilizon"; + + settingsFormat = pkgs.formats.elixirConf { elixir = pkgs.elixir_1_14; }; + + configFile = settingsFormat.generate "mobilizon-config.exs" cfg.settings; + + # Make a package containing launchers with the correct envirenment, instead of + # setting it with systemd services, so that the user can also use them without + # troubles + launchers = pkgs.stdenv.mkDerivation rec { + pname = "${cfg.package.pname}-launchers"; + inherit (cfg.package) version; + + src = cfg.package; + + nativeBuildInputs = with pkgs; [ makeWrapper ]; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/bin + + makeWrapper \ + $src/bin/mobilizon \ + $out/bin/mobilizon \ + --run '. ${secretEnvFile}' \ + --set MOBILIZON_CONFIG_PATH "${configFile}" \ + --set-default RELEASE_TMP "/tmp" + + makeWrapper \ + $src/bin/mobilizon_ctl \ + $out/bin/mobilizon_ctl \ + --run '. ${secretEnvFile}' \ + --set MOBILIZON_CONFIG_PATH "${configFile}" \ + --set-default RELEASE_TMP "/tmp" + ''; + }; + + repoSettings = cfg.settings.":mobilizon"."Mobilizon.Storage.Repo"; + instanceSettings = cfg.settings.":mobilizon".":instance"; + + isLocalPostgres = repoSettings.socket_dir != null; + + dbUser = if repoSettings.username != null then repoSettings.username else "mobilizon"; + + postgresql = config.services.postgresql.package; + postgresqlSocketDir = "/var/run/postgresql"; + + secretEnvFile = "/var/lib/mobilizon/secret-env.sh"; +in +{ + options = { + services.mobilizon = { + enable = mkEnableOption + (lib.mdDoc "Mobilizon federated organization and mobilization platform"); + + nginx.enable = lib.mkOption { + type = lib.types.bool; + default = true; + description = lib.mdDoc '' + Whether an Nginx virtual host should be + set up to serve Mobilizon. + ''; + }; + + package = mkPackageOptionMD pkgs "mobilizon" { }; + + settings = mkOption { + type = + let + elixirTypes = settingsFormat.lib.types; + in + types.submodule { + freeformType = settingsFormat.type; + + options = { + ":mobilizon" = { + + "Mobilizon.Web.Endpoint" = { + url.host = mkOption { + type = elixirTypes.str; + defaultText = lib.literalMD '' + ''${settings.":mobilizon".":instance".hostname} + ''; + description = lib.mdDoc '' + Your instance's hostname for generating URLs throughout the app + ''; + }; + + http = { + port = mkOption { + type = elixirTypes.port; + default = 4000; + description = lib.mdDoc '' + The port to run the server + ''; + }; + ip = mkOption { + type = elixirTypes.tuple; + default = settingsFormat.lib.mkTuple [ 0 0 0 0 0 0 0 1 ]; + description = lib.mdDoc '' + The IP address to listen on. Defaults to [::1] notated as a byte tuple. + ''; + }; + }; + + has_reverse_proxy = mkOption { + type = elixirTypes.bool; + default = true; + description = lib.mdDoc '' + Whether you use a reverse proxy + ''; + }; + }; + + ":instance" = { + name = mkOption { + type = elixirTypes.str; + description = lib.mdDoc '' + The fallback instance name if not configured into the admin UI + ''; + }; + + hostname = mkOption { + type = elixirTypes.str; + description = lib.mdDoc '' + Your instance's hostname + ''; + }; + + email_from = mkOption { + type = elixirTypes.str; + defaultText = literalExpression '' + noreply@''${settings.":mobilizon".":instance".hostname} + ''; + description = lib.mdDoc '' + The email for the From: header in emails + ''; + }; + + email_reply_to = mkOption { + type = elixirTypes.str; + defaultText = literalExpression '' + ''${email_from} + ''; + description = lib.mdDoc '' + The email for the Reply-To: header in emails + ''; + }; + }; + + "Mobilizon.Storage.Repo" = { + socket_dir = mkOption { + type = types.nullOr elixirTypes.str; + default = postgresqlSocketDir; + description = lib.mdDoc '' + Path to the postgres socket directory. + + Set this to null if you want to connect to a remote database. + + If non-null, the local PostgreSQL server will be configured with + the configured database, permissions, and required extensions. + + If connecting to a remote database, please follow the + instructions on how to setup your database: + + ''; + }; + + username = mkOption { + type = types.nullOr elixirTypes.str; + default = user; + description = lib.mdDoc '' + User used to connect to the database + ''; + }; + + database = mkOption { + type = types.nullOr elixirTypes.str; + default = "mobilizon_prod"; + description = lib.mdDoc '' + Name of the database + ''; + }; + }; + }; + }; + }; + default = { }; + + description = lib.mdDoc '' + Mobilizon Elixir documentation, see + + for supported values. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + assertions = [ + { + assertion = cfg.nginx.enable -> (cfg.settings.":mobilizon"."Mobilizon.Web.Endpoint".http.ip == settingsFormat.lib.mkTuple [ 0 0 0 0 0 0 0 1 ]); + message = "Setting the IP mobilizon listens on is only possible when the nginx config is not used, as it is hardcoded there."; + } + ]; + + services.mobilizon.settings = { + ":mobilizon" = { + "Mobilizon.Web.Endpoint" = { + server = true; + url.host = mkDefault instanceSettings.hostname; + secret_key_base = + settingsFormat.lib.mkGetEnv { envVariable = "MOBILIZON_INSTANCE_SECRET"; }; + }; + + "Mobilizon.Web.Auth.Guardian".secret_key = + settingsFormat.lib.mkGetEnv { envVariable = "MOBILIZON_AUTH_SECRET"; }; + + ":instance" = { + registrations_open = mkDefault false; + demo = mkDefault false; + email_from = mkDefault "noreply@${instanceSettings.hostname}"; + email_reply_to = mkDefault instanceSettings.email_from; + }; + + "Mobilizon.Storage.Repo" = { + # Forced by upstream since it uses PostgreSQL-specific extensions + adapter = settingsFormat.lib.mkAtom "Ecto.Adapters.Postgres"; + pool_size = mkDefault 10; + }; + }; + + ":tzdata".":data_dir" = "/var/lib/mobilizon/tzdata/"; + }; + + # This somewhat follows upstream's systemd service here: + # https://framagit.org/framasoft/mobilizon/-/blob/master/support/systemd/mobilizon.service + systemd.services.mobilizon = { + description = "Mobilizon federated organization and mobilization platform"; + + wantedBy = [ "multi-user.target" ]; + + path = with pkgs; [ + gawk + imagemagick + libwebp + file + + # Optional: + gifsicle + jpegoptim + optipng + pngquant + ]; + + serviceConfig = { + ExecStartPre = "${launchers}/bin/mobilizon_ctl migrate"; + ExecStart = "${launchers}/bin/mobilizon start"; + ExecStop = "${launchers}/bin/mobilizon stop"; + + User = user; + Group = group; + + StateDirectory = "mobilizon"; + + Restart = "on-failure"; + + PrivateTmp = true; + ProtectSystem = "full"; + NoNewPrivileges = true; + + ReadWritePaths = mkIf isLocalPostgres postgresqlSocketDir; + }; + }; + + # Create the needed secrets before running Mobilizon, so that they are not + # in the nix store + # + # Since some of these tasks are quite common for Elixir projects (COOKIE for + # every BEAM project, Phoenix and Guardian are also quite common), this + # service could be abstracted in the future, and used by other Elixir + # projects. + systemd.services.mobilizon-setup-secrets = { + description = "Mobilizon setup secrets"; + before = [ "mobilizon.service" ]; + wantedBy = [ "mobilizon.service" ]; + + script = + let + # Taken from here: + # https://framagit.org/framasoft/mobilizon/-/blob/1.0.7/lib/mix/tasks/mobilizon/instance.ex#L132-133 + genSecret = + "IO.puts(:crypto.strong_rand_bytes(64)" + + "|> Base.encode64()" + + "|> binary_part(0, 64))"; + + # Taken from here: + # https://github.com/elixir-lang/elixir/blob/v1.11.3/lib/mix/lib/mix/release.ex#L499 + genCookie = "IO.puts(Base.encode32(:crypto.strong_rand_bytes(32)))"; + + evalElixir = str: '' + ${pkgs.elixir_1_14}/bin/elixir --eval '${str}' + ''; + in + '' + set -euxo pipefail + + if [ ! -f "${secretEnvFile}" ]; then + install -m 600 /dev/null "${secretEnvFile}" + cat > "${secretEnvFile}" <= 1024; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + UMask = "0077"; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ quantenzitrone ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix index 3102e6a469..592ab253f7 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix @@ -595,47 +595,9 @@ let tt-rss = { description = "Tiny Tiny RSS feeds update daemon"; - preStart = let - callSql = e: - if cfg.database.type == "pgsql" then '' - ${optionalString (cfg.database.password != null) "PGPASSWORD=${cfg.database.password}"} \ - ${optionalString (cfg.database.passwordFile != null) "PGPASSWORD=$(cat ${cfg.database.passwordFile})"} \ - ${config.services.postgresql.package}/bin/psql \ - -U ${cfg.database.user} \ - ${optionalString (cfg.database.host != null) "-h ${cfg.database.host} --port ${toString dbPort}"} \ - -c '${e}' \ - ${cfg.database.name}'' - - else if cfg.database.type == "mysql" then '' - echo '${e}' | ${config.services.mysql.package}/bin/mysql \ - -u ${cfg.database.user} \ - ${optionalString (cfg.database.password != null) "-p${cfg.database.password}"} \ - ${optionalString (cfg.database.host != null) "-h ${cfg.database.host} -P ${toString dbPort}"} \ - ${cfg.database.name}'' - - else ""; - - in (optionalString (cfg.database.type == "pgsql") '' - exists=$(${callSql "select count(*) > 0 from pg_tables where tableowner = user"} \ - | tail -n+3 | head -n-2 | sed -e 's/[ \n\t]*//') - - if [ "$exists" == 'f' ]; then - ${callSql "\\i ${pkgs.tt-rss}/schema/ttrss_schema_${cfg.database.type}.sql"} - else - echo 'The database contains some data. Leaving it as it is.' - fi; - '') - - + (optionalString (cfg.database.type == "mysql") '' - exists=$(${callSql "select count(*) > 0 from information_schema.tables where table_schema = schema()"} \ - | tail -n+2 | sed -e 's/[ \n\t]*//') - - if [ "$exists" == '0' ]; then - ${callSql "\\. ${pkgs.tt-rss}/schema/ttrss_schema_${cfg.database.type}.sql"} - else - echo 'The database contains some data. Leaving it as it is.' - fi; - ''); + preStart = '' + ${pkgs.php81}/bin/php ${cfg.root}/www/update.php --update-schema + ''; serviceConfig = { User = "${cfg.user}"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/vikunja.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/vikunja.nix index 8bc8e8c292..6b1d4da532 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/vikunja.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/vikunja.nix @@ -147,5 +147,9 @@ in { }; environment.etc."vikunja/config.yaml".source = configFile; + + environment.systemPackages = [ + cfg.package-api # for admin `vikunja` CLI + ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix index d4c987da11..5d2e775d45 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix @@ -34,7 +34,7 @@ let # copy additional plugin(s), theme(s) and language(s) ${concatStringsSep "\n" (mapAttrsToList (name: theme: "cp -r ${theme} $out/share/wordpress/wp-content/themes/${name}") cfg.themes)} ${concatStringsSep "\n" (mapAttrsToList (name: plugin: "cp -r ${plugin} $out/share/wordpress/wp-content/plugins/${name}") cfg.plugins)} - ${concatMapStringsSep "\n" (language: "cp -r ${language} $out/share/wordpress/wp-content/languages/") cfg.languages} + ${concatMapStringsSep "\n" (language: "cp -r ${language}/* $out/share/wordpress/wp-content/languages/") cfg.languages} ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/zitadel.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/zitadel.nix new file mode 100644 index 0000000000..f225d138cc --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/zitadel.nix @@ -0,0 +1,223 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.services.zitadel; + + settingsFormat = pkgs.formats.yaml { }; +in +{ + options.services.zitadel = + let inherit (lib) mkEnableOption mkOption mkPackageOption types; + in { + enable = mkEnableOption "ZITADEL, a user and identity access management platform."; + + package = mkPackageOption pkgs "ZITADEL" { default = [ "zitadel" ]; }; + + user = mkOption { + type = types.str; + default = "zitadel"; + description = "The user to run ZITADEL under."; + }; + + group = mkOption { + type = types.str; + default = "zitadel"; + description = "The group to run ZITADEL under."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open the port specified in `listenPort` in the firewall. + ''; + }; + + masterKeyFile = mkOption { + type = types.path; + description = '' + Path to a file containing a master encryption key for ZITADEL. The + key must be 32 bytes. + ''; + }; + + tlsMode = mkOption { + type = types.enum [ "external" "enabled" "disabled" ]; + default = "external"; + example = "enabled"; + description = '' + The TLS mode to use. Options are: + + - enabled: ZITADEL accepts HTTPS connections directly. You must + configure TLS if this option is selected. + - external: ZITADEL forces HTTPS connections, with TLS terminated at a + reverse proxy. + - disabled: ZITADEL accepts HTTP connections only. Should only be used + for testing. + ''; + }; + + settings = mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options = { + Port = mkOption { + type = types.port; + default = 8080; + description = "The port that ZITADEL listens on."; + }; + + TLS = { + KeyPath = mkOption { + type = types.nullOr types.path; + default = null; + description = "Path to the TLS certificate private key."; + }; + Key = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The TLS certificate private key, as a base64-encoded string. + + Note that the contents of this option will be added to the Nix + store as world-readable plain text. Set + [KeyPath](#opt-services.zitadel.settings.TLS.KeyPath) instead + if this is undesired. + ''; + }; + CertPath = mkOption { + type = types.nullOr types.path; + default = null; + description = "Path to the TLS certificate."; + }; + Cert = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The TLS certificate, as a base64-encoded string. + + Note that the contents of this option will be added to the Nix + store as world-readable plain text. Set + [CertPath](#opt-services.zitadel.settings.TLS.CertPath) instead + if this is undesired. + ''; + }; + }; + }; + }; + default = { }; + example = lib.literalExpression '' + { + Port = 8123; + ExternalDomain = "example.com"; + TLS = { + CertPath = "/path/to/cert.pem"; + KeyPath = "/path/to/cert.key"; + }; + Database.cockroach.Host = "db.example.com"; + }; + ''; + description = '' + Contents of the runtime configuration file. See + https://zitadel.com/docs/self-hosting/manage/configure for more + details. + ''; + }; + + extraSettingsPaths = mkOption { + type = types.listOf types.path; + default = [ ]; + description = '' + A list of paths to extra settings files. These will override the + values set in [settings](#opt-services.zitadel.settings). Useful if + you want to keep sensitive secrets out of the Nix store. + ''; + }; + + steps = mkOption { + type = settingsFormat.type; + default = { }; + example = lib.literalExpression '' + { + FirstInstance = { + InstanceName = "Example"; + Org.Human = { + UserName = "foobar"; + FirstName = "Foo"; + LastName = "Bar"; + }; + }; + } + ''; + description = '' + Contents of the database initialization config file. See + https://zitadel.com/docs/self-hosting/manage/configure for more + details. + ''; + }; + + extraStepsPaths = mkOption { + type = types.listOf types.path; + default = [ ]; + description = '' + A list of paths to extra steps files. These will override the values + set in [steps](#opt-services.zitadel.steps). Useful if you want to + keep sensitive secrets out of the Nix store. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [{ + assertion = cfg.tlsMode == "enabled" + -> ((cfg.settings.TLS.Key != null || cfg.settings.TLS.KeyPath != null) + && (cfg.settings.TLS.Cert != null || cfg.settings.TLS.CertPath + != null)); + message = '' + A TLS certificate and key must be configured in + services.zitadel.settings.TLS if services.zitadel.tlsMode is enabled. + ''; + }]; + + networking.firewall.allowedTCPPorts = + lib.mkIf cfg.openFirewall [ cfg.settings.Port ]; + + systemd.services.zitadel = + let + configFile = settingsFormat.generate "config.yaml" cfg.settings; + stepsFile = settingsFormat.generate "steps.yaml" cfg.steps; + + args = lib.cli.toGNUCommandLineShell { } { + config = cfg.extraSettingsPaths ++ [ configFile ]; + steps = cfg.extraStepsPaths ++ [ stepsFile ]; + masterkeyFile = cfg.masterKeyFile; + inherit (cfg) tlsMode; + }; + in + { + description = "ZITADEL identity access management"; + path = [ cfg.package ]; + wantedBy = [ "multi-user.target" ]; + + script = '' + zitadel start-from-init ${args} + ''; + + serviceConfig = { + Type = "simple"; + User = cfg.user; + Group = cfg.group; + Restart = "on-failure"; + }; + }; + + users.users.zitadel = lib.mkIf (cfg.user == "zitadel") { + isSystemUser = true; + group = cfg.group; + }; + users.groups.zitadel = lib.mkIf (cfg.group == "zitadel") { }; + }; + + meta.maintainers = with lib.maintainers; [ Sorixelle ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix index 5cc9ef6dd6..ce74e243a1 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/caddy/default.nix @@ -24,21 +24,27 @@ let } ''; - configFile = - let - Caddyfile = pkgs.writeTextDir "Caddyfile" '' - { - ${cfg.globalConfig} - } - ${cfg.extraConfig} - ''; + settingsFormat = pkgs.formats.json { }; - Caddyfile-formatted = pkgs.runCommand "Caddyfile-formatted" { nativeBuildInputs = [ cfg.package ]; } '' - mkdir -p $out - cp --no-preserve=mode ${Caddyfile}/Caddyfile $out/Caddyfile - caddy fmt --overwrite $out/Caddyfile - ''; - in + configFile = + if cfg.settings != { } then + settingsFormat.generate "caddy.json" cfg.settings + else + let + Caddyfile = pkgs.writeTextDir "Caddyfile" '' + { + ${cfg.globalConfig} + } + ${cfg.extraConfig} + ${concatMapStringsSep "\n" mkVHostConf virtualHosts} + ''; + + Caddyfile-formatted = pkgs.runCommand "Caddyfile-formatted" { nativeBuildInputs = [ cfg.package ]; } '' + mkdir -p $out + cp --no-preserve=mode ${Caddyfile}/Caddyfile $out/Caddyfile + caddy fmt --overwrite $out/Caddyfile + ''; + in "${if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform then Caddyfile-formatted else Caddyfile}/Caddyfile"; etcConfigFile = "caddy/caddy_config"; @@ -299,6 +305,27 @@ in which could delay the reload essentially indefinitely. ''; }; + + settings = mkOption { + type = settingsFormat.type; + default = {}; + description = lib.mdDoc '' + Structured configuration for Caddy to generate a Caddy JSON configuration file. + See for available options. + + ::: {.warning} + Using a [Caddyfile](https://caddyserver.com/docs/caddyfile) instead of a JSON config is highly recommended by upstream. + There are only very few exception to this. + + Please use a Caddyfile via {option}`services.caddy.configFile`, {option}`services.caddy.virtualHosts` or + {option}`services.caddy.extraConfig` with {option}`services.caddy.globalConfig` instead. + ::: + + ::: {.note} + Takes presence over most `services.caddy.*` options, such as {option}`services.caddy.configFile` and {option}`services.caddy.virtualHosts`, if specified. + ::: + ''; + }; }; # implementation @@ -314,7 +341,6 @@ in groups = config.users.groups; }) acmeHosts; - services.caddy.extraConfig = concatMapStringsSep "\n" mkVHostConf virtualHosts; services.caddy.globalConfig = '' ${optionalString (cfg.email != null) "email ${cfg.email}"} ${optionalString (cfg.acmeCA != null) "acme_ca ${cfg.acmeCA}"} diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix index 8b5734b5a2..80fb24fe2c 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/garage.nix @@ -23,6 +23,12 @@ in example = { RUST_BACKTRACE="yes"; }; }; + environmentFile = mkOption { + type = types.nullOr types.path; + description = lib.mdDoc "File containing environment variables to be passed to the Garage server."; + default = null; + }; + logLevel = mkOption { type = types.enum (["info" "debug" "trace"]); default = "info"; @@ -80,7 +86,7 @@ in after = [ "network.target" "network-online.target" ]; wants = [ "network.target" "network-online.target" ]; wantedBy = [ "multi-user.target" ]; - restartTriggers = [ configFile ]; + restartTriggers = [ configFile ] ++ (lib.optional (cfg.environmentFile != null) cfg.environmentFile); serviceConfig = { ExecStart = "${cfg.package}/bin/garage server"; @@ -88,6 +94,7 @@ in DynamicUser = lib.mkDefault true; ProtectHome = true; NoNewPrivileges = true; + EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile; }; environment = { RUST_LOG = lib.mkDefault "garage=${cfg.logLevel}"; 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 fccc31b511..955d6e1906 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 @@ -146,6 +146,10 @@ let error_log ${cfg.logError}; daemon off; + ${optionalString cfg.enableQuicBPF '' + quic_bpf on; + ''} + ${cfg.config} ${optionalString (cfg.eventsConfig != "" || cfg.config == "") '' @@ -578,11 +582,13 @@ in }; }); default = []; - example = literalExpression ''[ - { addr = "10.0.0.12"; proxyProtocol = true; ssl = true; } - { addr = "0.0.0.0"; } - { addr = "[::0]"; } - ]''; + example = literalExpression '' + [ + { addr = "10.0.0.12"; proxyProtocol = true; ssl = true; } + { addr = "0.0.0.0"; } + { addr = "[::0]"; } + ] + ''; description = lib.mdDoc '' If vhosts do not specify listen, use these addresses by default. This option takes precedence over {option}`defaultListenAddresses` and @@ -781,6 +787,19 @@ in ''; }; + enableQuicBPF = mkOption { + default = false; + type = types.bool; + description = lib.mdDoc '' + Enables routing of QUIC packets using eBPF. When enabled, this allows + to support QUIC connection migration. The directive is only supported + on Linux 5.7+. + Note that enabling this option will make nginx run with extended + capabilities that are usually limited to processes running as root + namely `CAP_SYS_ADMIN` and `CAP_NET_ADMIN`. + ''; + }; + user = mkOption { type = types.str; default = "nginx"; @@ -1123,6 +1142,14 @@ in ''; } + { + assertion = cfg.package.pname != "nginxQuic" -> !(cfg.enableQuicBPF); + message = '' + services.nginx.enableQuicBPF requires using nginxQuic package, + which can be achieved by setting `services.nginx.package = pkgs.nginxQuic;`. + ''; + } + { assertion = cfg.package.pname != "nginxQuic" -> all (host: !host.quic) (attrValues virtualHosts); message = '' @@ -1222,8 +1249,8 @@ in # New file permissions UMask = "0027"; # 0640 / 0750 # Capabilities - AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SYS_RESOURCE" ]; - CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" "CAP_SYS_RESOURCE" ]; + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SYS_RESOURCE" ] ++ optionals cfg.enableQuicBPF [ "CAP_SYS_ADMIN" "CAP_NET_ADMIN" ]; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" "CAP_SYS_RESOURCE" ] ++ optionals cfg.enableQuicBPF [ "CAP_SYS_ADMIN" "CAP_NET_ADMIN" ]; # Security NoNewPrivileges = true; # Sandboxing (sorted by occurrence in https://www.freedesktop.org/software/systemd/man/systemd.exec.html) @@ -1248,6 +1275,7 @@ in # System Call Filtering SystemCallArchitectures = "native"; SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @setuid" ] + ++ optional cfg.enableQuicBPF [ "bpf" ] ++ optionals ((cfg.package != pkgs.tengine) && (cfg.package != pkgs.openresty) && (!lib.any (mod: (mod.disableIPC or false)) cfg.package.modules)) [ "~@ipc" ]; }; }; @@ -1312,6 +1340,11 @@ in nginx.gid = config.ids.gids.nginx; }; + # do not delete the default temp directories created upon nginx startup + systemd.tmpfiles.rules = [ + "X /tmp/systemd-private-%b-nginx.service-*/tmp/nginx_*" + ]; + services.logrotate.settings.nginx = mapAttrs (_: mkDefault) { files = "/var/log/nginx/*.log"; frequency = "weekly"; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/budgie.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/budgie.nix index bee627ec76..a4f8bd5051 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -134,6 +134,7 @@ in { # Update user directories. xdg-user-dirs ] + ++ lib.optional config.networking.networkmanager.enable pkgs.networkmanagerapplet ++ (utils.removePackagesByName [ cinnamon.nemo mate.eom @@ -192,7 +193,7 @@ in { # Required by Budgie Panel plugins and/or Budgie Control Center panels. networking.networkmanager.enable = mkDefault true; # for BCC's Network panel. programs.nm-applet.enable = config.networking.networkmanager.enable; # Budgie has no Network applet. - programs.nm-applet.indicator = false; # Budgie doesn't support AppIndicators. + programs.nm-applet.indicator = true; # Budgie uses AppIndicators. hardware.bluetooth.enable = mkDefault true; # for Budgie's Status Indicator and BCC's Bluetooth panel. hardware.pulseaudio.enable = mkDefault true; # for Budgie's Status Indicator and BCC's Sound panel. diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix index fecdd86deb..8b5daf83de 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -229,7 +229,7 @@ in panelModulePackages = mkOption { default = [ pkgs.gnome.gnome-applets ]; defaultText = literalExpression "[ pkgs.gnome.gnome-applets ]"; - type = types.listOf types.path; + type = types.listOf types.package; description = lib.mdDoc '' Packages containing modules that should be made available to `gnome-panel` (usually for applets). @@ -282,9 +282,6 @@ in # Override GSettings schemas environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; - - # If gnome is installed, build vim for gtk3 too. - nixpkgs.config.vim.gui = "gtk3"; }) (mkIf flashbackEnabled { @@ -297,8 +294,7 @@ in map (wm: pkgs.gnome.gnome-flashback.mkSessionForWm { - inherit (wm) wmName wmLabel wmCommand enableGnomePanel; - inherit (cfg.flashback) panelModulePackages; + inherit (wm) wmName wmLabel wmCommand; } ) flashbackWms; @@ -310,10 +306,16 @@ in gnome-flashback ] ++ map gnome-flashback.mkSystemdTargetForWm flashbackWms; - # gnome-panel needs these for menu applet - environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome.gnome-flashback}/share" ]; - # TODO: switch to sessionVariables (resolve conflict) - environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome.gnome-flashback}/etc/xdg" ]; + environment.systemPackages = with pkgs.gnome; [ + gnome-flashback + (gnome-panel-with-modules.override { + panelModulePackages = cfg.flashback.panelModulePackages; + }) + ] + # For /share/applications/${wmName}.desktop + ++ (map (wm: gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms) + # For /share/gnome-session/sessions/gnome-flashback-${wmName}.session + ++ (map (wm: gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms); }) (mkIf serviceCfg.core-os-services.enable { diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index 15a510fd8f..758a71b634 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -172,24 +172,19 @@ in (mkIf (cfg.enable || cfg.mobile.enable || cfg.bigscreen.enable) { security.wrappers = { - kscreenlocker_greet = { - setuid = true; - owner = "root"; - group = "root"; - source = "${getBin libsForQt5.kscreenlocker}/libexec/kscreenlocker_greet"; - }; - start_kdeinit = { - setuid = true; - owner = "root"; - group = "root"; - source = "${getBin libsForQt5.kinit}/libexec/kf5/start_kdeinit"; - }; kwin_wayland = { owner = "root"; group = "root"; capabilities = "cap_sys_nice+ep"; source = "${getBin plasma5.kwin}/bin/kwin_wayland"; }; + } // mkIf (!cfg.runUsingSystemd) { + start_kdeinit = { + setuid = true; + owner = "root"; + group = "root"; + source = "${getBin libsForQt5.kinit}/libexec/kf5/start_kdeinit"; + }; }; environment.systemPackages = @@ -384,7 +379,7 @@ in # Update the start menu for each user that is currently logged in system.userActivationScripts.plasmaSetup = activationScript; - nixpkgs.config.firefox.enablePlasmaBrowserIntegration = true; + programs.firefox.wrapperConfig.enablePlasmaBrowserIntegration = true; }) (mkIf (cfg.kwinrc != {}) { diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix index 676d08b93e..400e5601dc 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix @@ -97,6 +97,19 @@ in type = types.bool; }; + banner = mkOption { + type = types.nullOr types.lines; + default = null; + example = '' + foo + bar + baz + ''; + description = lib.mdDoc '' + Optional message to display on the login screen. + ''; + }; + settings = mkOption { type = settingsFormat.type; default = { }; @@ -231,40 +244,19 @@ in systemd.user.services.dbus.wantedBy = [ "default.target" ]; - programs.dconf.profiles.gdm = - let - customDconf = pkgs.writeTextFile { - name = "gdm-dconf"; - destination = "/dconf/gdm-custom"; - text = '' - ${optionalString (!cfg.gdm.autoSuspend) '' - [org/gnome/settings-daemon/plugins/power] - sleep-inactive-ac-type='nothing' - sleep-inactive-battery-type='nothing' - sleep-inactive-ac-timeout=0 - sleep-inactive-battery-timeout=0 - ''} - ''; + programs.dconf.profiles.gdm.databases = lib.optionals (!cfg.gdm.autoSuspend) [{ + settings."org/gnome/settings-daemon/plugins/power" = { + sleep-inactive-ac-type = "nothing"; + sleep-inactive-battery-type = "nothing"; + sleep-inactive-ac-timeout = lib.gvariant.mkInt32 0; + sleep-inactive-battery-timeout = lib.gvariant.mkInt32 0; }; - - customDconfDb = pkgs.stdenv.mkDerivation { - name = "gdm-dconf-db"; - buildCommand = '' - ${pkgs.dconf}/bin/dconf compile $out ${customDconf}/dconf - ''; + }] ++ lib.optionals (cfg.gdm.banner != null) [{ + settings."org/gnome/login-screen" = { + banner-message-enable = true; + banner-message-text = cfg.gdm.banner; }; - in pkgs.stdenv.mkDerivation { - name = "dconf-gdm-profile"; - buildCommand = '' - # Check that the GDM profile starts with what we expect. - if [ $(head -n 1 ${gdm}/share/dconf/profile/gdm) != "user-db:user" ]; then - echo "GDM dconf profile changed, please update gdm.nix" - exit 1 - fi - # Insert our custom DB behind it. - sed '2ifile-db:${customDconfDb}' ${gdm}/share/dconf/profile/gdm > $out - ''; - }; + }] ++ [ "${gdm}/share/gdm/greeter-dconf-defaults" ]; # Use AutomaticLogin if delay is zero, because it's immediate. # Otherwise with TimedLogin with zero seconds the prompt is still diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix index 8d6bfa98a7..dede7680ec 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix @@ -61,7 +61,7 @@ in services.xserver.displayManager.lightdm.greeters.gtk.enable = false; - nixpkgs.config.lightdm-tiny-greeter.conf = + services.xserver.displayManager.lightdm.greeter = let configHeader = '' #include @@ -69,13 +69,11 @@ in static const char *pass_text = "${cfg.label.pass}"; static const char *session = "${dmcfg.defaultSession}"; ''; + config = optionalString (cfg.extraConfig != "") (configHeader + cfg.extraConfig); + package = pkgs.lightdm-tiny-greeter.override { conf = config; }; in - optionalString (cfg.extraConfig != "") - (configHeader + cfg.extraConfig); - - services.xserver.displayManager.lightdm.greeter = mkDefault { - package = pkgs.lightdm-tiny-greeter.xgreeters; + package = package.xgreeters; name = "lightdm-tiny-greeter"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix index c04edd0d4b..25470e2d3c 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix @@ -33,6 +33,8 @@ let # Implementation is done via pkgs/applications/display-managers/sddm/sddm-default-session.patch DefaultSession = optionalString (dmcfg.defaultSession != null) "${dmcfg.defaultSession}.desktop"; + + DisplayServer = if cfg.wayland.enable then "wayland" else "x11"; }; Theme = { @@ -62,6 +64,7 @@ let Wayland = { EnableHiDPI = cfg.enableHidpi; SessionDir = "${dmcfg.sessionData.desktops}/share/wayland-sessions"; + CompositorCommand = lib.optionalString cfg.wayland.enable cfg.wayland.compositorCommand; }; } // lib.optionalAttrs dmcfg.autoLogin.enable { Autologin = { @@ -184,6 +187,32 @@ in ''; }; }; + + # Experimental Wayland support + wayland = { + enable = mkEnableOption "experimental Wayland support"; + + compositorCommand = mkOption { + type = types.str; + internal = true; + + # This is basically the upstream default, but with Weston referenced by full path + # and the configuration generated from NixOS options. + default = let westonIni = (pkgs.formats.ini {}).generate "weston.ini" { + libinput = { + enable-tap = xcfg.libinput.mouse.tapping; + left-handed = xcfg.libinput.mouse.leftHanded; + }; + keyboard = { + keymap_model = xcfg.xkbModel; + keymap_layout = xcfg.layout; + keymap_variant = xcfg.xkbVariant; + keymap_options = xcfg.xkbOptions; + }; + }; in "${pkgs.weston}/bin/weston --shell=fullscreen-shell.so -c ${westonIni}"; + description = lib.mdDoc "Command used to start the selected compositor"; + }; + }; }; }; @@ -267,6 +296,7 @@ in environment.systemPackages = [ sddm ]; services.dbus.packages = [ sddm ]; + systemd.tmpfiles.packages = [ sddm ]; # We're not using the upstream unit, so copy these: https://github.com/sddm/sddm/blob/develop/services/sddm.service.in systemd.services.display-manager.after = [ diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/default.nix index ce1d4115f2..e180f2693e 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/default.nix @@ -35,6 +35,7 @@ in ./openbox.nix ./pekwm.nix ./notion.nix + ./ragnarwm.nix ./ratpoison.nix ./sawfish.nix ./smallwm.nix diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/dwm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/dwm.nix index e114f2e26b..82900fd305 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/dwm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/dwm.nix @@ -45,6 +45,7 @@ in { name = "dwm"; start = '' + export _JAVA_AWT_WM_NONREPARENTING=1 dwm & waitPID=$! ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/oroborus.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/oroborus.nix deleted file mode 100644 index 654b8708e4..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/oroborus.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.xserver.windowManager.oroborus; -in -{ - ###### interface - options = { - services.xserver.windowManager.oroborus.enable = mkEnableOption (lib.mdDoc "oroborus"); - }; - - ###### implementation - config = mkIf cfg.enable { - services.xserver.windowManager.session = singleton { - name = "oroborus"; - start = '' - ${pkgs.oroborus}/bin/oroborus & - waitPID=$! - ''; - }; - environment.systemPackages = [ pkgs.oroborus ]; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/ragnarwm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/ragnarwm.nix new file mode 100644 index 0000000000..0843b872db --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/ragnarwm.nix @@ -0,0 +1,33 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.ragnarwm; +in +{ + ###### interface + + options = { + services.xserver.windowManager.ragnarwm = { + enable = mkEnableOption (lib.mdDoc "ragnarwm"); + package = mkOption { + type = types.package; + default = pkgs.ragnarwm; + defaultText = literalExpression "pkgs.ragnarwm"; + description = lib.mdDoc '' + The ragnar package to use. + ''; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + services.xserver.displayManager.sessionPackages = [ cfg.package ]; + environment.systemPackages = [ cfg.package ]; + }; + + meta.maintainers = with lib.maintainers; [ sigmanificient ]; +} diff --git a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl index 04d90968c4..e05f89bb0f 100755 --- a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl +++ b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl @@ -74,7 +74,7 @@ if ("@localeArchive@" ne "") { if (!defined($action) || ($action ne "switch" && $action ne "boot" && $action ne "test" && $action ne "dry-activate")) { print STDERR <<"EOF"; -Usage: $0 [switch|boot|test] +Usage: $0 [switch|boot|test|dry-activate] switch: make the configuration the boot default and activate now boot: make the configuration the boot default @@ -313,7 +313,8 @@ sub unrecord_unit { # needs to be restarted or reloaded. If the units differ, the service # is restarted unless the only difference is `X-Reload-Triggers` in the # `Unit` section. If this is the only modification, the unit is reloaded -# instead of restarted. +# instead of restarted. If the only difference is `Options` in the +# `[Mount]` section, the unit is reloaded rather than restarted. # Returns: # - 0 if the units are equal # - 1 if the units are different and a restart action is required @@ -390,6 +391,11 @@ sub compare_units { ## no critic(Subroutines::ProhibitExcessComplexity) next; } } + # If this is a mount unit, check if it was only `Options` + if ($section_name eq "Mount" and $ini_key eq "Options") { + $ret = 2; + next; + } return 1; } } @@ -440,10 +446,18 @@ sub handle_modified_unit { ## no critic(Subroutines::ProhibitManyArgs, Subroutin # properties (resource limits and inotify watches) # seem to get applied on daemon-reload. } elsif ($unit =~ /\.mount$/msx) { - # Reload the changed mount unit to force a remount. - # FIXME: only reload when Options= changed, restart otherwise - $units_to_reload->{$unit} = 1; - record_unit($reload_list_file, $unit); + # Just restart the unit. We wouldn't have gotten into this subroutine + # if only `Options` was changed, in which case the unit would be reloaded. + # The only exception is / and /nix because it's very unlikely we can safely + # unmount them so we reload them instead. This means that we may not get + # all changes into the running system but it's better than crashing it. + if ($unit eq "-.mount" or $unit eq "nix.mount") { + $units_to_reload->{$unit} = 1; + record_unit($reload_list_file, $unit); + } else { + $units_to_restart->{$unit} = 1; + record_unit($restart_list_file, $unit); + } } elsif ($unit =~ /\.socket$/msx) { # FIXME: do something? # Attempt to fix this: https://github.com/NixOS/nixpkgs/pull/141192 @@ -647,10 +661,20 @@ foreach my $mount_point (keys(%{$cur_fss})) { # Filesystem entry disappeared, so unmount it. $units_to_stop{$unit} = 1; } elsif ($cur->{fsType} ne $new->{fsType} || $cur->{device} ne $new->{device}) { - # Filesystem type or device changed, so unmount and mount it. - $units_to_stop{$unit} = 1; - $units_to_start{$unit} = 1; - record_unit($start_list_file, $unit); + if ($mount_point eq '/' or $mount_point eq '/nix') { + if ($cur->{options} ne $new->{options}) { + # Mount options changed, so remount it. + $units_to_reload{$unit} = 1; + record_unit($reload_list_file, $unit); + } else { + # Don't unmount / or /nix if the device changed + $units_to_skip{$unit} = 1; + } + } else { + # Filesystem type or device changed, so unmount and mount it. + $units_to_restart{$unit} = 1; + record_unit($restart_list_file, $unit); + } } elsif ($cur->{options} ne $new->{options}) { # Mount options changes, so remount it. $units_to_reload{$unit} = 1; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix index bf1688feb1..8c9483f01c 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix @@ -102,20 +102,28 @@ let mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\x00''; }; mips-linux = { - magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; + magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20''; }; mipsel-linux = { - magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00''; }; mips64-linux = { magicOrExtension = ''\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff''; }; mips64el-linux = { magicOrExtension = ''\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00''; - mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff''; + }; + mips64-linuxabin32 = { + magicOrExtension = ''\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20''; + }; + mips64el-linuxabin32 = { + magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00''; + mask = ''\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00''; }; riscv32-linux = { magicOrExtension = ''\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xf3\x00''; @@ -137,14 +145,8 @@ let magicOrExtension = ''\x00asm''; mask = ''\xff\xff\xff\xff''; }; - x86_64-windows = { - magicOrExtension = "exe"; - recognitionType = "extension"; - }; - i686-windows = { - magicOrExtension = "exe"; - recognitionType = "extension"; - }; + x86_64-windows.magicOrExtension = "MZ"; + i686-windows.magicOrExtension = "MZ"; }; in { @@ -277,7 +279,7 @@ in { support your new systems. Warning: the builder can execute all emulated systems within the same build, which introduces impurities in the case of cross compilation. ''; - type = types.listOf types.str; + type = types.listOf (types.enum (builtins.attrNames magics)); }; }; }; 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 1770f07594..d9a1535ffc 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 @@ -147,7 +147,7 @@ in { default = false; type = types.bool; description = lib.mdDoc '' - Make MemTest86+ available from the systemd-boot menu. MemTest86+ is a + Make Memtest86+ available from the systemd-boot menu. Memtest86+ is a program for testing memory. ''; }; @@ -191,7 +191,7 @@ in { default = {}; example = literalExpression '' { "memtest86.conf" = ''' - title MemTest86+ + title Memtest86+ efi /efi/memtest86/memtest.efi '''; } ''; @@ -285,7 +285,7 @@ in { boot.loader.systemd-boot.extraEntries = mkMerge [ (mkIf cfg.memtest86.enable { "${cfg.memtest86.entryFilename}" = '' - title MemTest86 + title Memtest86+ efi /efi/memtest86/memtest.efi ''; }) diff --git a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix index dc3fe16311..06c329e006 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix @@ -351,6 +351,12 @@ let new_response="$(ykchalresp -${toString dev.yubikey.slot} -x $new_challenge 2>/dev/null)" + if [ -z "$new_response" ]; then + echo "Warning: Unable to generate new challenge response, current challenge persists!" + umount /crypt-storage + return + fi + if [ ! -z "$k_user" ]; then new_k_luks="$(echo -n $k_user | pbkdf2-sha512 ${toString dev.yubikey.keyLength} $new_iterations $new_response | rbtohex)" else diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix index 6d0afcc57f..a5084260da 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix @@ -83,7 +83,7 @@ let (assertByteFormat "BitsPerSecond") (assertValueOneOf "Duplex" ["half" "full"]) (assertValueOneOf "AutoNegotiation" boolValues) - (assertValueOneOf "WakeOnLan" ["phy" "unicast" "multicast" "broadcast" "arp" "magic" "secureon" "off"]) + (assertValuesSomeOfOr "WakeOnLan" ["phy" "unicast" "multicast" "broadcast" "arp" "magic" "secureon"] "off") (assertValueOneOf "Port" ["tp" "aui" "bnc" "mii" "fibre"]) (assertValueOneOf "ReceiveChecksumOffload" boolValues) (assertValueOneOf "TransmitChecksumOffload" boolValues) @@ -517,17 +517,24 @@ let (assertValueOneOf "Unmanaged" boolValues) (assertInt "Group") (assertRange "Group" 0 2147483647) - (assertValueOneOf "RequiredForOnline" (boolValues ++ [ - "missing" - "off" - "no-carrier" - "dormant" - "degraded-carrier" - "carrier" - "degraded" - "enslaved" - "routable" - ])) + (assertValueOneOf "RequiredForOnline" (boolValues ++ ( + let + # https://freedesktop.org/software/systemd/man/networkctl.html#missing + operationalStates = [ + "missing" + "off" + "no-carrier" + "dormant" + "degraded-carrier" + "carrier" + "degraded" + "enslaved" + "routable" + ]; + operationalStateRanges = concatLists (imap0 (i: min: map (max: "${min}:${max}") (drop i operationalStates)) operationalStates); + in + operationalStates ++ operationalStateRanges + ))) (assertValueOneOf "RequiredFamilyForOnline" [ "ipv4" "ipv6" @@ -799,6 +806,8 @@ let "UseAddress" "UseDNS" "UseNTP" + "UseHostname" + "UseDomains" "RouteMetric" "RapidCommit" "MUDURL" @@ -813,16 +822,20 @@ let "DUIDRawData" "IAID" "UseDelegatedPrefix" + "SendRelease" ]) (assertValueOneOf "UseAddress" boolValues) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseNTP" boolValues) + (assertValueOneOf "UseHostname" boolValues) + (assertValueOneOf "UseDomains" (boolValues ++ ["route"])) (assertInt "RouteMetric") (assertValueOneOf "RapidCommit" boolValues) (assertValueOneOf "WithoutRA" ["no" "solicit" "information-request"]) (assertRange "SendOption" 1 65536) (assertInt "IAID") (assertValueOneOf "UseDelegatedPrefix" boolValues) + (assertValueOneOf "SendRelease" boolValues) ]; sectionDHCPPrefixDelegation = checkUnitConfig "DHCPPrefixDelegation" [ @@ -902,6 +915,9 @@ let "RelayTarget" "RelayAgentCircuitId" "RelayAgentRemoteId" + "BootServerAddress" + "BootServerName" + "BootFilename" ]) (assertInt "PoolOffset") (assertMinimum "PoolOffset" 0) @@ -945,10 +961,12 @@ let "Prefix" "PreferredLifetimeSec" "ValidLifetimeSec" + "Assign" "Token" ]) (assertValueOneOf "AddressAutoconfiguration" boolValues) (assertValueOneOf "OnLink" boolValues) + (assertValueOneOf "Assign" boolValues) ]; sectionIPv6RoutePrefix = checkUnitConfig "IPv6RoutePrefix" [ @@ -2706,9 +2724,12 @@ let description = lib.mdDoc '' Whether to consider the network online when any interface is online, as opposed to all of them. This is useful on portable machines with a wired and a wireless interface, for example. + + This is on by default if {option}`networking.useDHCP` is enabled. ''; type = types.bool; - default = false; + defaultText = "config.networking.useDHCP"; + default = config.networking.useDHCP; }; ignoredInterfaces = mkOption { @@ -2812,9 +2833,15 @@ let environment.etc."systemd/networkd.conf" = renderConfig cfg.config; - systemd.services.systemd-networkd = { + systemd.services.systemd-networkd = let + isReloadableUnitFileName = unitFileName: strings.hasSuffix ".network" unitFileName; + reloadableUnitFiles = attrsets.filterAttrs (k: v: isReloadableUnitFileName k) unitFiles; + nonReloadableUnitFiles = attrsets.filterAttrs (k: v: !isReloadableUnitFileName k) unitFiles; + unitFileSources = unitFiles: map (x: x.source) (attrValues unitFiles); + in { wantedBy = [ "multi-user.target" ]; - restartTriggers = map (x: x.source) (attrValues unitFiles) ++ [ + reloadTriggers = unitFileSources reloadableUnitFiles; + restartTriggers = unitFileSources nonReloadableUnitFiles ++ [ config.environment.etc."systemd/networkd.conf".source ]; aliases = [ "dbus-org.freedesktop.network1.service" ]; @@ -2834,6 +2861,17 @@ let }) ]; + stage1Options = { + options.boot.initrd.systemd.network.networks = mkOption { + type = with types; attrsOf (submodule { + # Default in initrd is dhcp-on-stop, which is correct if flushBeforeStage2 = false + config = mkIf config.boot.initrd.network.flushBeforeStage2 { + networkConfig.KeepConfiguration = mkDefault false; + }; + }); + }; + }; + stage1Config = let cfg = config.boot.initrd.systemd.network; in mkMerge [ @@ -2852,8 +2890,6 @@ let (mkIf cfg.enable { - systemd.package = mkDefault pkgs.systemdStage1Network; - # For networkctl systemd.dbus.enable = mkDefault true; @@ -2897,45 +2933,14 @@ let ]; kernelModules = [ "af_packet" ]; - systemd.services.nixos-flush-networkd = mkIf config.boot.initrd.network.flushBeforeStage2 { - description = "Flush Network Configuration"; - wantedBy = ["initrd.target"]; - after = ["systemd-networkd.service" "dbus.socket" "dbus.service"]; - before = ["shutdown.target" "initrd-switch-root.target"]; - conflicts = ["shutdown.target" "initrd-switch-root.target"]; - unitConfig.DefaultDependencies = false; - serviceConfig = { - # This service does nothing when starting, but brings down - # interfaces when switching root. This is the easiest way to - # ensure proper ordering while stopping. See systemd.unit(5) - # section on Before= and After=. The important part is that - # we are stopped before units we need, like dbus.service, - # and that we are stopped before starting units like - # initrd-switch-root.target - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "/bin/true"; - }; - # systemd-networkd doesn't bring down interfaces on its own - # when it exits (see: systemd-networkd(8)), so we have to do - # it ourselves. The networkctl command doesn't have a way to - # bring all interfaces down, so we have to iterate over the - # list and filter out unmanaged interfaces to bring them down - # individually. - preStop = '' - networkctl list --full --no-legend | while read _idx link _type _operational setup _; do - [ "$setup" = unmanaged ] && continue - networkctl down "$link" - done - ''; - }; - }) ]; in { + imports = [ stage1Options ]; + options = { systemd.network = commonOptions true; boot.initrd.systemd.network = commonOptions "shallow"; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix b/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix index 4e7201833d..b898a63179 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix @@ -66,7 +66,7 @@ in }; services.resolved.dnssec = mkOption { - default = "allow-downgrade"; + default = "false"; example = "true"; type = types.enum [ "true" "allow-downgrade" "false" ]; description = lib.mdDoc '' @@ -85,6 +85,12 @@ in synthesizing a DNS response that suggests DNSSEC was not supported. - `"false"`: DNS lookups are not DNSSEC validated. + + At the time of September 2023, systemd upstream advise + to disable DNSSEC by default as the current code + is not robust enough to deal with "in the wild" non-compliant + servers, which will usually give you a broken bad experience + in addition of insecure. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix index 7aaa3f85bf..a3551f68db 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -123,7 +123,7 @@ let # ZFS properties such as `setuid=off` and `exec=off` (unless manually # duplicated in `fileSystems.*.options`, defeating "zfsutil"'s purpose). copy_bin_and_libs ${lib.getOutput "mount" pkgs.util-linux}/bin/mount - copy_bin_and_libs ${pkgs.zfs}/bin/mount.zfs + copy_bin_and_libs ${config.boot.zfs.package}/bin/mount.zfs ''} # Copy some util-linux stuff. diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh b/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh index f9a2084ea9..5a2133f960 100755 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-2-init.sh @@ -104,7 +104,10 @@ fi # Required by the activation script -install -m 0755 -d /etc /etc/nixos +install -m 0755 -d /etc +if [ ! -h "/etc/nixos" ]; then + install -m 0755 -d /etc/nixos +fi install -m 01777 -d /tmp diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index ac55461107..8e38072b4c 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -48,6 +48,7 @@ let "rescue.service" # Udev. + "systemd-tmpfiles-setup-dev-early.service" "systemd-udevd-control.socket" "systemd-udevd-kernel.socket" "systemd-udevd.service" @@ -395,7 +396,9 @@ in description = lib.mdDoc '' The amount of time which can elapse after a reboot has been triggered before a watchdog hardware device will automatically reboot the system. - Valid time units include "ms", "s", "min", "h", "d", and "w". + Valid time units include "ms", "s", "min", "h", "d", and "w". If left + `null`, systemd will use its default of `10min`; see also {command}`man + 5 systemd-system.conf`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix index 3f40a5b2df..61af2768e2 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix @@ -57,7 +57,6 @@ let "systemd-ask-password-console.service" "systemd-fsck@.service" "systemd-halt.service" - "systemd-hibernate-resume@.service" "systemd-journald-audit.socket" "systemd-journald-dev-log.socket" "systemd-journald.service" @@ -136,8 +135,13 @@ in { ''; }; - package = mkPackageOptionMD pkgs "systemd" { - default = "systemdStage1"; + package = lib.mkOption { + type = lib.types.package; + default = config.systemd.package; + defaultText = lib.literalExpression "config.systemd.package"; + description = '' + The systemd package to use. + ''; }; extraConfig = mkOption { @@ -333,6 +337,14 @@ in { visible = "shallow"; description = lib.mdDoc "Definition of slice configurations."; }; + + enableTpm2 = mkOption { + default = true; + type = types.bool; + description = lib.mdDoc '' + Whether to enable TPM2 support in the initrd. + ''; + }; }; config = mkIf (config.boot.initrd.enable && cfg.enable) { @@ -342,8 +354,8 @@ in { # systemd needs this for some features "autofs4" # systemd-cryptenroll - "tpm-tis" - ] ++ lib.optional (pkgs.stdenv.hostPlatform.system != "riscv64-linux") "tpm-crb"; + ] ++ lib.optional cfg.enableTpm2 "tpm-tis" + ++ lib.optional (cfg.enableTpm2 && !(pkgs.stdenv.hostPlatform.isRiscV64 || pkgs.stdenv.hostPlatform.isArmv7)) "tpm-crb"; boot.initrd.systemd = { initrdBin = [pkgs.bash pkgs.coreutils cfg.package.kmod cfg.package] ++ config.system.fsPackages; @@ -421,11 +433,11 @@ in { # so NSS can look up usernames "${pkgs.glibc}/lib/libnss_files.so.2" - ] ++ optionals cfg.package.withCryptsetup [ + ] ++ optionals (cfg.package.withCryptsetup && cfg.enableTpm2) [ # tpm2 support "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-tpm2.so" pkgs.tpm2-tss - + ] ++ optionals cfg.package.withCryptsetup [ # fido2 support "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so" "${pkgs.libfido2}/lib/libfido2.so.1" diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix index 1b6398d2f9..64dc19633e 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix @@ -230,5 +230,9 @@ in { }); }) cfg.tmpfiles.users; + + system.userActivationScripts.tmpfiles = '' + ${config.systemd.package}/bin/systemd-tmpfiles --user --create --remove + ''; }; } diff --git a/third_party/nixpkgs/nixos/modules/tasks/bcache.nix b/third_party/nixpkgs/nixos/modules/tasks/bcache.nix index 35b922dc8a..68531a4d2f 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/bcache.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/bcache.nix @@ -1,6 +1,10 @@ -{ config, lib, pkgs, ... }: - -{ +{ config, lib, pkgs, ... }: let + cfg = config.boot.bcache; +in { + options.boot.bcache.enable = lib.mkEnableOption (lib.mdDoc "bcache mount support") // { + default = true; + example = false; + }; options.boot.initrd.services.bcache.enable = lib.mkEnableOption (lib.mdDoc "bcache support in the initrd") // { description = lib.mdDoc '' *This will only be used when systemd is used in stage 1.* @@ -9,7 +13,7 @@ ''; }; - config = { + config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.bcache-tools ]; diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix index 7cb2ca23fa..91e30aa4c0 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix @@ -187,9 +187,8 @@ let skipCheck = fs: fs.noCheck || fs.device == "none" || builtins.elem fs.fsType fsToSkipCheck || isBindMount fs; # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; - in fstabFileSystems: { rootPrefix ? "" }: concatMapStrings (fs: - (optionalString (isBindMount fs) (escape rootPrefix)) - + (if fs.device != null then escape fs.device + in fstabFileSystems: { }: concatMapStrings (fs: + (if fs.device != null then escape fs.device else if fs.label != null then "/dev/disk/by-label/${escape fs.label}" else throw "No device specified for mount point ‘${fs.mountPoint}’.") + " " + escape fs.mountPoint @@ -199,9 +198,7 @@ let + "\n" ) fstabFileSystems; - initrdFstab = pkgs.writeText "initrd-fstab" (makeFstabEntries (filter utils.fsNeededForBoot fileSystems) { - rootPrefix = "/sysroot"; - }); + initrdFstab = pkgs.writeText "initrd-fstab" (makeFstabEntries (filter utils.fsNeededForBoot fileSystems) { }); in diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix index 21d604bee6..5cf863c87f 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/zfs.nix @@ -662,6 +662,11 @@ in ]; }; + # ZFS already has its own scheduler. Without this my(@Artturin) computer froze for a second when I nix build something. + services.udev.extraRules = '' + ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ENV{ID_FS_TYPE}=="zfs_member", ATTR{../queue/scheduler}="none" + ''; + environment.etc = genAttrs (map (file: "zfs/zed.d/${file}") diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix index 24f0c37acf..67ef152c4b 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-scripted.nix @@ -62,7 +62,7 @@ let } // optionalAttrs (i.mtu != null) { MTUBytes = toString i.mtu; } // optionalAttrs (i.wakeOnLan.enable == true) { - WakeOnLan = "magic"; + WakeOnLan = concatStringsSep " " i.wakeOnLan.policy; }; }; in listToAttrs (map createNetworkLink interfaces); diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix index dfa883a2c3..53097e21c6 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces-systemd.nix @@ -28,7 +28,6 @@ let # TODO: warn the user that any address configured on those interfaces will be useless ++ concatMap (i: attrNames (filterAttrs (_: config: config.type != "internal") i.interfaces)) (attrValues cfg.vswitches); - domains = cfg.search ++ (optional (cfg.domain != null) cfg.domain); genericNetwork = override: let gateway = optional (cfg.defaultGateway != null && (cfg.defaultGateway.address or "") != "") cfg.defaultGateway.address ++ optional (cfg.defaultGateway6 != null && (cfg.defaultGateway6.address or "") != "") cfg.defaultGateway6.address; @@ -40,8 +39,6 @@ let }; in optionalAttrs (gateway != [ ]) { routes = override (map makeGateway gateway); - } // optionalAttrs (domains != [ ]) { - domains = override domains; }; genericDhcpNetworks = initrd: mkIf cfg.useDHCP { @@ -59,23 +56,14 @@ let # more likely to result in interfaces being configured to # use DHCP when they shouldn't. - # When wait-online.anyInterface is enabled, RequiredForOnline really - # means "sufficient for online", so we can enable it. - # Otherwise, don't block the network coming online because of default networks. matchConfig.Name = ["en*" "eth*"]; DHCP = "yes"; - linkConfig.RequiredForOnline = - lib.mkDefault (if initrd - then config.boot.initrd.systemd.network.wait-online.anyInterface - else config.systemd.network.wait-online.anyInterface); networkConfig.IPv6PrivacyExtensions = "kernel"; }; networks."99-wireless-client-dhcp" = { # Like above, but this is much more likely to be correct. matchConfig.WLANInterfaceType = "station"; DHCP = "yes"; - linkConfig.RequiredForOnline = - lib.mkDefault config.systemd.network.wait-online.anyInterface; networkConfig.IPv6PrivacyExtensions = "kernel"; # We also set the route metric to one more than the default # of 1024, so that Ethernet is preferred if both are @@ -173,6 +161,33 @@ let }]; })); + bridgeNetworks = mkMerge (flip mapAttrsToList cfg.bridges (name: bridge: { + netdevs."40-${name}" = { + netdevConfig = { + Name = name; + Kind = "bridge"; + }; + }; + networks = listToAttrs (forEach bridge.interfaces (bi: + nameValuePair "40-${bi}" (mkMerge [ (genericNetwork (mkOverride 999)) { + DHCP = mkOverride 0 (dhcpStr false); + networkConfig.Bridge = name; + } ]))); + })); + + vlanNetworks = mkMerge (flip mapAttrsToList cfg.vlans (name: vlan: { + netdevs."40-${name}" = { + netdevConfig = { + Name = name; + Kind = "vlan"; + }; + vlanConfig.Id = vlan.id; + }; + networks."40-${vlan.interface}" = (mkMerge [ (genericNetwork (mkOverride 999)) { + vlan = [ name ]; + } ]); + })); + in { @@ -182,7 +197,15 @@ in # Note this is if initrd.network.enable, not if # initrd.systemd.network.enable. By setting the latter and not the # former, the user retains full control over the configuration. - boot.initrd.systemd.network = mkMerge [(genericDhcpNetworks true) interfaceNetworks]; + boot.initrd.systemd.network = mkMerge [ + (genericDhcpNetworks true) + interfaceNetworks + bridgeNetworks + vlanNetworks + ]; + boot.initrd.availableKernelModules = + optional (cfg.bridges != {}) "bridge" ++ + optional (cfg.vlans != {}) "8021q"; }) (mkIf cfg.useNetworkd { @@ -212,19 +235,7 @@ in } (genericDhcpNetworks false) interfaceNetworks - (mkMerge (flip mapAttrsToList cfg.bridges (name: bridge: { - netdevs."40-${name}" = { - netdevConfig = { - Name = name; - Kind = "bridge"; - }; - }; - networks = listToAttrs (forEach bridge.interfaces (bi: - nameValuePair "40-${bi}" (mkMerge [ (genericNetwork (mkOverride 999)) { - DHCP = mkOverride 0 (dhcpStr false); - networkConfig.Bridge = name; - } ]))); - }))) + bridgeNetworks (mkMerge (flip mapAttrsToList cfg.bonds (name: bond: { netdevs."40-${name}" = { netdevConfig = { @@ -377,18 +388,7 @@ in } ]); }; }))) - (mkMerge (flip mapAttrsToList cfg.vlans (name: vlan: { - netdevs."40-${name}" = { - netdevConfig = { - Name = name; - Kind = "vlan"; - }; - vlanConfig.Id = vlan.id; - }; - networks."40-${vlan.interface}" = (mkMerge [ (genericNetwork (mkOverride 999)) { - vlan = [ name ]; - } ]); - }))) + vlanNetworks ]; # We need to prefill the slaved devices with networking options diff --git a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix index eb1c7512d9..fe77a44459 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/network-interfaces.nix @@ -327,6 +327,24 @@ let default = false; description = lib.mdDoc "Whether to enable wol on this interface."; }; + policy = mkOption { + type = with types; listOf ( + enum ["phy" "unicast" "multicast" "broadcast" "arp" "magic" "secureon"] + ); + default = ["magic"]; + description = lib.mdDoc '' + The [Wake-on-LAN policy](https://www.freedesktop.org/software/systemd/man/systemd.link.html#WakeOnLan=) + to set for the device. + + The options are + - `phy`: Wake on PHY activity + - `unicast`: Wake on unicast messages + - `multicast`: Wake on multicast messages + - `broadcast`: Wake on broadcast messages + - `arp`: Wake on ARP + - `magic`: Wake on receipt of a magic packet + ''; + }; }; }; @@ -1396,14 +1414,12 @@ in security.apparmor.policies."bin.ping".profile = lib.mkIf config.security.apparmor.policies."bin.ping".enable (lib.mkAfter '' /run/wrappers/bin/ping { include - include + include rpx /run/wrappers/wrappers.*/ping, } /run/wrappers/wrappers.*/ping { include - include - r /run/wrappers/wrappers.*/ping.real, - mrpx ${config.security.wrappers.ping.source}, + include capability net_raw, capability setpcap, } diff --git a/third_party/nixpkgs/nixos/modules/tasks/swraid.nix b/third_party/nixpkgs/nixos/modules/tasks/swraid.nix index f624294565..61b3682e0f 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/swraid.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/swraid.nix @@ -2,6 +2,13 @@ cfg = config.boot.swraid; + mdadm_conf = config.environment.etc."mdadm.conf"; + + enable_implicitly_for_old_state_versions = lib.versionOlder config.system.stateVersion "23.11"; + + minimum_config_is_set = config_text: + (builtins.match ".*(MAILADDR|PROGRAM).*" mdadm_conf.text) != null; + in { imports = [ (lib.mkRenamedOptionModule [ "boot" "initrd" "services" "swraid" "enable" ] [ "boot" "swraid" "enable" ]) @@ -24,7 +31,7 @@ in { should detect it correctly in the standard installation procedure. ''; - default = lib.versionOlder config.system.stateVersion "23.11"; + default = enable_implicitly_for_old_state_versions; defaultText = lib.mdDoc "`true` if stateVersion is older than 23.11"; }; @@ -36,8 +43,14 @@ in { }; config = lib.mkIf cfg.enable { + warnings = lib.mkIf + ( !enable_implicitly_for_old_state_versions && !minimum_config_is_set mdadm_conf) + [ "mdadm: Neither MAILADDR nor PROGRAM has been set. This will cause the `mdmon` service to crash." ]; + environment.systemPackages = [ pkgs.mdadm ]; + environment.etc."mdadm.conf".text = lib.mkAfter cfg.mdadmConf; + services.udev.packages = [ pkgs.mdadm ]; systemd.packages = [ pkgs.mdadm ]; @@ -59,12 +72,10 @@ in { $out/bin/mdadm --version ''; - extraFiles."/etc/mdadm.conf".source = pkgs.writeText "mdadm.conf" config.boot.swraid.mdadmConf; + extraFiles."/etc/mdadm.conf".source = pkgs.writeText "mdadm.conf" mdadm_conf.text; systemd = { - contents."/etc/mdadm.conf" = lib.mkIf (cfg.mdadmConf != "") { - text = cfg.mdadmConf; - }; + contents."/etc/mdadm.conf".text = mdadm_conf.text; packages = [ pkgs.mdadm ]; initrdBin = [ pkgs.mdadm ]; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix b/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix index c7e9e23c4c..523d9a9576 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.virtualisation.anbox; - kernelPackages = config.boot.kernelPackages; + addrOpts = v: addr: pref: name: { address = mkOption { default = addr; @@ -25,6 +25,28 @@ let }; }; + finalImage = if cfg.imageModifications == "" then cfg.image else ( pkgs.callPackage ( + { runCommandNoCC, squashfsTools }: + + runCommandNoCC "${cfg.image.name}-modified.img" { + nativeBuildInputs = [ + squashfsTools + ]; + } '' + echo "-> Extracting Anbox root image..." + unsquashfs -dest rootfs ${cfg.image} + + echo "-> Modifying Anbox root image..." + ( + cd rootfs + ${cfg.imageModifications} + ) + + echo "-> Packing modified Anbox root image..." + mksquashfs rootfs $out -comp xz -no-xattrs -all-root + '' + ) { }); + in { @@ -42,6 +64,18 @@ in ''; }; + imageModifications = mkOption { + default = ""; + type = types.lines; + description = lib.mdDoc '' + Commands to edit the image filesystem. + + This can be used to e.g. bundle a privileged F-Droid. + + Commands are ran with PWD being at the root of the filesystem. + ''; + }; + extraInit = mkOption { type = types.lines; default = ""; @@ -67,16 +101,19 @@ in config = mkIf cfg.enable { assertions = singleton { - assertion = versionAtLeast (getVersion config.boot.kernelPackages.kernel) "4.18"; - message = "Anbox needs user namespace support to work properly"; + assertion = with config.boot.kernelPackages; kernelAtLeast "5.5" && kernelOlder "5.18"; + message = "Anbox needs a kernel with binder and ashmem support"; }; environment.systemPackages = with pkgs; [ anbox ]; - services.udev.extraRules = '' - KERNEL=="ashmem", NAME="%k", MODE="0666" - KERNEL=="binder*", NAME="%k", MODE="0666" - ''; + systemd.mounts = singleton { + requiredBy = [ "anbox-container-manager.service" ]; + description = "Anbox Binder File System"; + what = "binder"; + where = "/dev/binderfs"; + type = "binder"; + }; virtualisation.lxc.enable = true; networking.bridges.anbox0.interfaces = []; @@ -87,6 +124,9 @@ in internalInterfaces = [ "anbox0" ]; }; + # Ensures NetworkManager doesn't touch anbox0 + networking.networkmanager.unmanaged = [ "anbox0" ]; + systemd.services.anbox-container-manager = let anboxloc = "/var/lib/anbox"; in { @@ -121,12 +161,13 @@ in ExecStart = '' ${pkgs.anbox}/bin/anbox container-manager \ --data-path=${anboxloc} \ - --android-image=${cfg.image} \ + --android-image=${finalImage} \ --container-network-address=${cfg.ipv4.container.address} \ --container-network-gateway=${cfg.ipv4.gateway.address} \ --container-network-dns-servers=${cfg.ipv4.dns} \ --use-rootfs-overlay \ - --privileged + --privileged \ + --daemon ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/azure-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/azure-image.nix index 17cfd39383..39c6cab598 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/azure-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/azure-image.nix @@ -16,6 +16,13 @@ in Size of disk image. Unit is MB. ''; }; + virtualisation.azureImage.contents = mkOption { + type = with types; listOf attrs; + default = [ ]; + description = lib.mdDoc '' + Extra contents to add to the image. + ''; + }; }; config = { system.build.azureImage = import ../../lib/make-disk-image.nix { @@ -26,7 +33,7 @@ in ''; configFile = ./azure-config-user.nix; format = "raw"; - inherit (cfg) diskSize; + inherit (cfg) diskSize contents; inherit config lib pkgs; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-config.nix b/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-config.nix index cf94ce0faf..3c503f027d 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-config.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/google-compute-config.nix @@ -39,7 +39,7 @@ in # Allow root logins only using SSH keys # and disable password authentication in general services.openssh.enable = true; - services.openssh.settings.PermitRootLogin = "prohibit-password"; + services.openssh.settings.PermitRootLogin = mkDefault "prohibit-password"; services.openssh.settings.PasswordAuthentication = mkDefault false; # enable OS Login. This also requires setting enable-oslogin=TRUE metadata on diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxc-container.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxc-container.nix index 55b285b691..9402d3bf37 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/lxc-container.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxc-container.nix @@ -1,96 +1,16 @@ { lib, config, pkgs, ... }: -with lib; - let - templateSubmodule = { ... }: { - options = { - enable = mkEnableOption (lib.mdDoc "this template"); - - target = mkOption { - description = lib.mdDoc "Path in the container"; - type = types.path; - }; - template = mkOption { - description = lib.mdDoc ".tpl file for rendering the target"; - type = types.path; - }; - when = mkOption { - description = lib.mdDoc "Events which trigger a rewrite (create, copy)"; - type = types.listOf (types.str); - }; - properties = mkOption { - description = lib.mdDoc "Additional properties"; - type = types.attrs; - default = {}; - }; - }; - }; - - toYAML = name: data: pkgs.writeText name (generators.toYAML {} data); - cfg = config.virtualisation.lxc; - templates = if cfg.templates != {} then let - list = mapAttrsToList (name: value: { inherit name; } // value) - (filterAttrs (name: value: value.enable) cfg.templates); - in - { - files = map (tpl: { - source = tpl.template; - target = "/templates/${tpl.name}.tpl"; - }) list; - properties = listToAttrs (map (tpl: nameValuePair tpl.target { - when = tpl.when; - template = "${tpl.name}.tpl"; - properties = tpl.properties; - }) list); - } - else { files = []; properties = {}; }; - -in -{ +in { imports = [ - ../installer/cd-dvd/channel.nix - ../profiles/clone-config.nix - ../profiles/minimal.nix + ./lxc-instance-common.nix ]; options = { virtualisation.lxc = { - templates = mkOption { - description = lib.mdDoc "Templates for LXD"; - type = types.attrsOf (types.submodule (templateSubmodule)); - default = {}; - example = literalExpression '' - { - # create /etc/hostname on container creation. also requires networking.hostName = "" to be set - "hostname" = { - enable = true; - target = "/etc/hostname"; - template = builtins.toFile "hostname.tpl" "{{ container.name }}"; - when = [ "create" ]; - }; - # create /etc/nixos/hostname.nix with a configuration for keeping the hostname applied - "hostname-nix" = { - enable = true; - target = "/etc/nixos/hostname.nix"; - template = builtins.toFile "hostname-nix.tpl" "{ ... }: { networking.hostName = \"{{ container.name }}\"; }"; - # copy keeps the file updated when the container is changed - when = [ "create" "copy" ]; - }; - # copy allow the user to specify a custom configuration.nix - "configuration-nix" = { - enable = true; - target = "/etc/nixos/configuration.nix"; - template = builtins.toFile "configuration-nix" "{{ config_get(\"user.user-data\", properties.default) }}"; - when = [ "create" ]; - }; - }; - ''; - }; - - privilegedContainer = mkOption { - type = types.bool; + privilegedContainer = lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc '' Whether this LXC container will be running as a privileged container or not. If set to `true` then @@ -116,24 +36,6 @@ in ${config.nix.package.out}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system ''; - system.build.metadata = pkgs.callPackage ../../lib/make-system-tarball.nix { - contents = [ - { - source = toYAML "metadata.yaml" { - architecture = builtins.elemAt (builtins.match "^([a-z0-9_]+).+" (toString pkgs.system)) 0; - creation_date = 1; - properties = { - description = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} ${pkgs.system}"; - os = "${config.system.nixos.distroId}"; - release = "${config.system.nixos.codeName}"; - }; - templates = templates.properties; - }; - target = "/metadata.yaml"; - } - ] ++ templates.files; - }; - # TODO: build rootfs as squashfs for faster unpack system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix { extraArgs = "--owner=0"; @@ -180,7 +82,7 @@ in ProtectKernelTunables=no NoNewPrivileges=no LoadCredential= - '' + optionalString cfg.privilegedContainer '' + '' + lib.optionalString cfg.privilegedContainer '' # Additional settings for privileged containers ProtectHome=no ProtectSystem=no @@ -193,28 +95,8 @@ in }) ]; - # Allow the user to login as root without password. - users.users.root.initialHashedPassword = mkOverride 150 ""; - - system.activationScripts.installInitScript = mkForce '' + system.activationScripts.installInitScript = lib.mkForce '' ln -fs $systemConfig/init /sbin/init ''; - - # Some more help text. - services.getty.helpLine = - '' - - Log in as "root" with an empty password. - ''; - - # Containers should be light-weight, so start sshd on demand. - services.openssh.enable = mkDefault true; - services.openssh.startWhenNeeded = mkDefault true; - - # As this is intended as a standalone image, undo some of the minimal profile stuff - environment.noXlibs = false; - documentation.enable = true; - documentation.nixos.enable = true; - services.logrotate.enable = true; }; } diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxc-image-metadata.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxc-image-metadata.nix new file mode 100644 index 0000000000..2c0568b4c4 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxc-image-metadata.nix @@ -0,0 +1,104 @@ +{ lib, config, pkgs, ... }: + +let + templateSubmodule = {...}: { + options = { + enable = lib.mkEnableOption "this template"; + + target = lib.mkOption { + description = "Path in the container"; + type = lib.types.path; + }; + template = lib.mkOption { + description = ".tpl file for rendering the target"; + type = lib.types.path; + }; + when = lib.mkOption { + description = "Events which trigger a rewrite (create, copy)"; + type = lib.types.listOf (lib.types.str); + }; + properties = lib.mkOption { + description = "Additional properties"; + type = lib.types.attrs; + default = {}; + }; + }; + }; + + toYAML = name: data: pkgs.writeText name (lib.generators.toYAML {} data); + + cfg = config.virtualisation.lxc; + templates = if cfg.templates != {} then let + list = lib.mapAttrsToList (name: value: { inherit name; } // value) + (lib.filterAttrs (name: value: value.enable) cfg.templates); + in + { + files = map (tpl: { + source = tpl.template; + target = "/templates/${tpl.name}.tpl"; + }) list; + properties = lib.listToAttrs (map (tpl: lib.nameValuePair tpl.target { + when = tpl.when; + template = "${tpl.name}.tpl"; + properties = tpl.properties; + }) list); + } + else { files = []; properties = {}; }; + +in { + options = { + virtualisation.lxc = { + templates = lib.mkOption { + description = "Templates for LXD"; + type = lib.types.attrsOf (lib.types.submodule templateSubmodule); + default = {}; + example = lib.literalExpression '' + { + # create /etc/hostname on container creation + "hostname" = { + enable = true; + target = "/etc/hostname"; + template = builtins.writeFile "hostname.tpl" "{{ container.name }}"; + when = [ "create" ]; + }; + # create /etc/nixos/hostname.nix with a configuration for keeping the hostname applied + "hostname-nix" = { + enable = true; + target = "/etc/nixos/hostname.nix"; + template = builtins.writeFile "hostname-nix.tpl" "{ ... }: { networking.hostName = "{{ container.name }}"; }"; + # copy keeps the file updated when the container is changed + when = [ "create" "copy" ]; + }; + # copy allow the user to specify a custom configuration.nix + "configuration-nix" = { + enable = true; + target = "/etc/nixos/configuration.nix"; + template = builtins.writeFile "configuration-nix" "{{ config_get(\"user.user-data\", properties.default) }}"; + when = [ "create" ]; + }; + }; + ''; + }; + }; + }; + + config = { + system.build.metadata = pkgs.callPackage ../../lib/make-system-tarball.nix { + contents = [ + { + source = toYAML "metadata.yaml" { + architecture = builtins.elemAt (builtins.match "^([a-z0-9_]+).+" (toString pkgs.system)) 0; + creation_date = 1; + properties = { + description = "${config.system.nixos.distroName} ${config.system.nixos.codeName} ${config.system.nixos.label} ${pkgs.system}"; + os = "${config.system.nixos.distroId}"; + release = "${config.system.nixos.codeName}"; + }; + templates = templates.properties; + }; + target = "/metadata.yaml"; + } + ] ++ templates.files; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxc-instance-common.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxc-instance-common.nix new file mode 100644 index 0000000000..d6a0e05fb1 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxc-instance-common.nix @@ -0,0 +1,30 @@ +{lib, ...}: + +{ + imports = [ + ./lxc-image-metadata.nix + + ../installer/cd-dvd/channel.nix + ../profiles/clone-config.nix + ../profiles/minimal.nix + ]; + + # Allow the user to login as root without password. + users.users.root.initialHashedPassword = lib.mkOverride 150 ""; + + # Some more help text. + services.getty.helpLine = '' + + Log in as "root" with an empty password. + ''; + + # Containers should be light-weight, so start sshd on demand. + services.openssh.enable = lib.mkDefault true; + services.openssh.startWhenNeeded = lib.mkDefault true; + + # As this is intended as a standalone image, undo some of the minimal profile stuff + environment.noXlibs = false; + documentation.enable = true; + documentation.nixos.enable = true; + services.logrotate.enable = true; +} diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxd-virtual-machine.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxd-virtual-machine.nix new file mode 100644 index 0000000000..ba729465ec --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxd-virtual-machine.nix @@ -0,0 +1,46 @@ +{ config, lib, pkgs, ... }: + +let + serialDevice = + if pkgs.stdenv.hostPlatform.isx86 + then "ttyS0" + else "ttyAMA0"; # aarch64 +in { + imports = [ + ./lxc-instance-common.nix + + ../profiles/qemu-guest.nix + ]; + + config = { + system.build.qemuImage = import ../../lib/make-disk-image.nix { + inherit pkgs lib config; + + partitionTableType = "efi"; + format = "qcow2-compressed"; + copyChannel = true; + }; + + fileSystems = { + "/" = { + device = "/dev/disk/by-label/nixos"; + autoResize = true; + fsType = "ext4"; + }; + "/boot" = { + device = "/dev/disk/by-label/ESP"; + fsType = "vfat"; + }; + }; + + boot.growPartition = true; + boot.loader.systemd-boot.enable = true; + + # image building needs to know what device to install bootloader on + boot.loader.grub.device = "/dev/vda"; + + boot.kernelParams = ["console=tty1" "console=${serialDevice}"]; + + virtualisation.lxd.agent.enable = lib.mkDefault true; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix index e22ba9a0ae..e30fbebb66 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix @@ -2,21 +2,20 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.virtualisation.lxd; + preseedFormat = pkgs.formats.yaml {}; in { imports = [ - (mkRemovedOptionModule [ "virtualisation" "lxd" "zfsPackage" ] "Override zfs in an overlay instead to override it globally") + (lib.mkRemovedOptionModule [ "virtualisation" "lxd" "zfsPackage" ] "Override zfs in an overlay instead to override it globally") ]; ###### interface options = { virtualisation.lxd = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc '' This option enables lxd, a daemon that manages @@ -32,28 +31,28 @@ in { ''; }; - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.lxd; - defaultText = literalExpression "pkgs.lxd"; + defaultText = lib.literalExpression "pkgs.lxd"; description = lib.mdDoc '' The LXD package to use. ''; }; - lxcPackage = mkOption { - type = types.package; + lxcPackage = lib.mkOption { + type = lib.types.package; default = pkgs.lxc; - defaultText = literalExpression "pkgs.lxc"; + defaultText = lib.literalExpression "pkgs.lxc"; description = lib.mdDoc '' The LXC package to use with LXD (required for AppArmor profiles). ''; }; - zfsSupport = mkOption { - type = types.bool; + zfsSupport = lib.mkOption { + type = lib.types.bool; default = config.boot.zfs.enabled; - defaultText = literalExpression "config.boot.zfs.enabled"; + defaultText = lib.literalExpression "config.boot.zfs.enabled"; description = lib.mdDoc '' Enables lxd to use zfs as a storage for containers. @@ -62,8 +61,8 @@ in { ''; }; - recommendedSysctlSettings = mkOption { - type = types.bool; + recommendedSysctlSettings = lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc '' Enables various settings to avoid common pitfalls when @@ -75,8 +74,67 @@ in { ''; }; - startTimeout = mkOption { - type = types.int; + preseed = lib.mkOption { + type = lib.types.nullOr (lib.types.submodule { + freeformType = preseedFormat.type; + }); + + default = null; + + description = lib.mdDoc '' + Configuration for LXD preseed, see + + for supported values. + + Changes to this will be re-applied to LXD which will overwrite existing entities or create missing ones, + but entities will *not* be removed by preseed. + ''; + + example = lib.literalExpression '' + { + networks = [ + { + name = "lxdbr0"; + type = "bridge"; + config = { + "ipv4.address" = "10.0.100.1/24"; + "ipv4.nat" = "true"; + }; + } + ]; + profiles = [ + { + name = "default"; + devices = { + eth0 = { + name = "eth0"; + network = "lxdbr0"; + type = "nic"; + }; + root = { + path = "/"; + pool = "default"; + size = "35GiB"; + type = "disk"; + }; + }; + } + ]; + storage_pools = [ + { + name = "default"; + driver = "dir"; + config = { + source = "/var/lib/lxd/storage-pools/default"; + }; + } + ]; + } + ''; + }; + + startTimeout = lib.mkOption { + type = lib.types.int; default = 600; apply = toString; description = lib.mdDoc '' @@ -91,13 +149,13 @@ in { Enables the (experimental) LXD UI. ''); - package = mkPackageOption pkgs.lxd-unwrapped "ui" { }; + package = lib.mkPackageOption pkgs.lxd-unwrapped "ui" { }; }; }; }; ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; # Note: the following options are also declared in virtualisation.lxc, but @@ -139,19 +197,19 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" - (mkIf config.virtualisation.lxc.lxcfs.enable "lxcfs.service") + (lib.mkIf config.virtualisation.lxc.lxcfs.enable "lxcfs.service") ]; requires = [ "network-online.target" "lxd.socket" - (mkIf config.virtualisation.lxc.lxcfs.enable "lxcfs.service") + (lib.mkIf config.virtualisation.lxc.lxcfs.enable "lxcfs.service") ]; documentation = [ "man:lxd(1)" ]; path = [ pkgs.util-linux ] - ++ optional cfg.zfsSupport config.boot.zfs.package; + ++ lib.optional cfg.zfsSupport config.boot.zfs.package; - environment = mkIf (cfg.ui.enable) { + environment = lib.mkIf (cfg.ui.enable) { "LXD_UI" = cfg.ui.package; }; @@ -173,11 +231,26 @@ in { # By default, `lxd` loads configuration files from hard-coded # `/usr/share/lxc/config` - since this is a no-go for us, we have to # explicitly tell it where the actual configuration files are - Environment = mkIf (config.virtualisation.lxc.lxcfs.enable) + Environment = lib.mkIf (config.virtualisation.lxc.lxcfs.enable) "LXD_LXC_TEMPLATE_CONFIG=${pkgs.lxcfs}/share/lxc/config"; }; }; + systemd.services.lxd-preseed = lib.mkIf (cfg.preseed != null) { + description = "LXD initialization with preseed file"; + wantedBy = ["multi-user.target"]; + requires = ["lxd.service"]; + after = ["lxd.service"]; + + script = '' + ${pkgs.coreutils}/bin/cat ${preseedFormat.generate "lxd-preseed.yaml" cfg.preseed} | ${cfg.package}/bin/lxd init --preseed + ''; + + serviceConfig = { + Type = "oneshot"; + }; + }; + users.groups.lxd = {}; users.users.root = { @@ -185,7 +258,7 @@ in { subGidRanges = [ { startGid = 1000000; count = 65536; } ]; }; - boot.kernel.sysctl = mkIf cfg.recommendedSysctlSettings { + boot.kernel.sysctl = lib.mkIf cfg.recommendedSysctlSettings { "fs.inotify.max_queued_events" = 1048576; "fs.inotify.max_user_instances" = 1048576; "fs.inotify.max_user_watches" = 1048576; @@ -196,7 +269,7 @@ in { "kernel.keys.maxkeys" = 2000; }; - boot.kernelModules = [ "veth" "xt_comment" "xt_CHECKSUM" "xt_MASQUERADE" ] - ++ optionals (!config.networking.nftables.enable) [ "iptable_mangle" ]; + boot.kernelModules = [ "veth" "xt_comment" "xt_CHECKSUM" "xt_MASQUERADE" "vhost_vsock" ] + ++ lib.optionals (!config.networking.nftables.enable) [ "iptable_mangle" ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/oci-common.nix b/third_party/nixpkgs/nixos/modules/virtualisation/oci-common.nix new file mode 100644 index 0000000000..a620df0631 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/virtualisation/oci-common.nix @@ -0,0 +1,60 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.oci; +in +{ + imports = [ ../profiles/qemu-guest.nix ]; + + # Taken from /proc/cmdline of Ubuntu 20.04.2 LTS on OCI + boot.kernelParams = [ + "nvme.shutdown_timeout=10" + "nvme_core.shutdown_timeout=10" + "libiscsi.debug_libiscsi_eh=1" + "crash_kexec_post_notifiers" + + # VNC console + "console=tty1" + + # x86_64-linux + "console=ttyS0" + + # aarch64-linux + "console=ttyAMA0,115200" + ]; + + boot.growPartition = true; + + fileSystems."/" = { + device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; + autoResize = true; + }; + + fileSystems."/boot" = lib.mkIf cfg.efi { + device = "/dev/disk/by-label/ESP"; + fsType = "vfat"; + }; + + boot.loader.efi.canTouchEfiVariables = false; + boot.loader.grub = { + device = if cfg.efi then "nodev" else "/dev/sda"; + splashImage = null; + extraConfig = '' + serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1 + terminal_input --append serial + terminal_output --append serial + ''; + efiInstallAsRemovable = cfg.efi; + efiSupport = cfg.efi; + }; + + # https://docs.oracle.com/en-us/iaas/Content/Compute/Tasks/configuringntpservice.htm#Configuring_the_Oracle_Cloud_Infrastructure_NTP_Service_for_an_Instance + networking.timeServers = [ "169.254.169.254" ]; + + services.openssh.enable = true; + + # Otherwise the instance may not have a working network-online.target, + # making the fetch-ssh-keys.service fail + networking.useNetworkd = lib.mkDefault true; +} diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/oci-config-user.nix b/third_party/nixpkgs/nixos/modules/virtualisation/oci-config-user.nix new file mode 100644 index 0000000000..70c0b34efe --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/virtualisation/oci-config-user.nix @@ -0,0 +1,12 @@ +{ modulesPath, ... }: + +{ + # To build the configuration or use nix-env, you need to run + # either nixos-rebuild --upgrade or nix-channel --update + # to fetch the nixos channel. + + # This configures everything but bootstrap services, + # which only need to be run once and have already finished + # if you are able to see this comment. + imports = [ "${modulesPath}/virtualisation/oci-common.nix" ]; +} diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix index a9f4ab77f8..71f5d7a752 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix @@ -66,6 +66,17 @@ let ''; }; + labels = mkOption { + type = with types; attrsOf str; + default = {}; + description = lib.mdDoc "Labels to attach to the container at runtime."; + example = literalExpression '' + { + "traefik.https.routers.example.rule" = "Host(`example.container`)"; + } + ''; + }; + entrypoint = mkOption { type = with types; nullOr str; description = lib.mdDoc "Override the default entrypoint of the image."; @@ -277,6 +288,7 @@ let ++ map (p: "-p ${escapeShellArg p}") container.ports ++ optional (container.user != null) "-u ${escapeShellArg container.user}" ++ map (v: "-v ${escapeShellArg v}") container.volumes + ++ (mapAttrsToList (k: v: "-l ${escapeShellArg k}=${escapeShellArg v}") container.labels) ++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}" ++ map escapeShellArg container.extraOptions ++ [container.image] diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/oci-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/oci-image.nix new file mode 100644 index 0000000000..d4af5016dd --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/virtualisation/oci-image.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.oci; +in +{ + imports = [ ./oci-common.nix ]; + + config = { + system.build.OCIImage = import ../../lib/make-disk-image.nix { + inherit config lib pkgs; + name = "oci-image"; + configFile = ./oci-config-user.nix; + format = "qcow2"; + diskSize = 8192; + partitionTableType = if cfg.efi then "efi" else "legacy"; + }; + + systemd.services.fetch-ssh-keys = { + description = "Fetch authorized_keys for root user"; + + wantedBy = [ "sshd.service" ]; + before = [ "sshd.service" ]; + + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + + path = [ pkgs.coreutils pkgs.curl ]; + script = '' + mkdir -m 0700 -p /root/.ssh + if [ -f /root/.ssh/authorized_keys ]; then + echo "Authorized keys have already been downloaded" + else + echo "Downloading authorized keys from Instance Metadata Service v2" + curl -s -S -L \ + -H "Authorization: Bearer Oracle" \ + -o /root/.ssh/authorized_keys \ + http://169.254.169.254/opc/v2/instance/metadata/ssh_authorized_keys + chmod 600 /root/.ssh/authorized_keys + fi + ''; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + StandardError = "journal+console"; + StandardOutput = "journal+console"; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/oci-options.nix b/third_party/nixpkgs/nixos/modules/virtualisation/oci-options.nix new file mode 100644 index 0000000000..0dfedc6a53 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/virtualisation/oci-options.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: +{ + options = { + oci = { + efi = lib.mkOption { + default = true; + internal = true; + description = '' + Whether the OCI instance is using EFI. + ''; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index d0a5ddd87c..e0004df6f6 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -647,7 +647,7 @@ in import pkgs.path { system = "x86_64-darwin"; } ''; description = lib.mdDoc '' - pkgs set to use for the host-specific packages of the vm runner. + Package set to use for the host-specific packages of the VM runner. Changing this to e.g. a Darwin package set allows running NixOS VMs on Darwin. ''; }; @@ -1121,11 +1121,12 @@ in }) cfg.emptyDiskImages) ]; - # Use mkVMOverride to enable building test VMs (e.g. via `nixos-rebuild - # build-vm`) of a system configuration, where the regular value for the - # `fileSystems' attribute should be disregarded (since those filesystems - # don't necessarily exist in the VM). - fileSystems = mkVMOverride cfg.fileSystems; + # By default, use mkVMOverride to enable building test VMs (e.g. via + # `nixos-rebuild build-vm`) of a system configuration, where the regular + # value for the `fileSystems' attribute should be disregarded (since those + # filesystems don't necessarily exist in the VM). You can disable this + # override by setting `virtualisation.fileSystems = lib.mkForce { };`. + fileSystems = lib.mkIf (cfg.fileSystems != { }) (mkVMOverride cfg.fileSystems); virtualisation.fileSystems = let mkSharedDir = tag: share: diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix index b1565a0968..9741ea090f 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix @@ -91,7 +91,7 @@ in }; config = mkIf cfg.enable (mkMerge [{ - warnings = mkIf (config.nixpkgs.config.virtualbox.enableExtensionPack or false) + warnings = mkIf (pkgs.config.virtualbox.enableExtensionPack or false) ["'nixpkgs.virtualbox.enableExtensionPack' has no effect, please use 'virtualisation.virtualbox.host.enableExtensionPack'"]; boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; boot.extraModulePackages = [ kernelModules ]; diff --git a/third_party/nixpkgs/nixos/release-combined.nix b/third_party/nixpkgs/nixos/release-combined.nix index 125086294d..29dcdab7d1 100644 --- a/third_party/nixpkgs/nixos/release-combined.nix +++ b/third_party/nixpkgs/nixos/release-combined.nix @@ -158,6 +158,11 @@ in rec { (onFullSupported "nixpkgs.emacs") (onFullSupported "nixpkgs.jdk") ["nixpkgs.tarball"] + + # Ensure that nixpkgs-check-by-name is available in all release channels and nixos-unstable, + # so that a pre-built version can be used in CI for PR's on the corresponding development branches. + # See ../pkgs/test/nixpkgs-check-by-name/README.md + (onSystems ["x86_64-linux"] "nixpkgs.tests.nixpkgs-check-by-name") ]; }; } diff --git a/third_party/nixpkgs/nixos/release.nix b/third_party/nixpkgs/nixos/release.nix index 6da6faab73..abaa7ef9a7 100644 --- a/third_party/nixpkgs/nixos/release.nix +++ b/third_party/nixpkgs/nixos/release.nix @@ -44,10 +44,13 @@ let pkgs = import ./.. { system = "x86_64-linux"; }; - versionModule = - { system.nixos.versionSuffix = versionSuffix; - system.nixos.revision = nixpkgs.rev or nixpkgs.shortRev; - }; + versionModule = { config, ... }: { + system.nixos.versionSuffix = versionSuffix; + system.nixos.revision = nixpkgs.rev or nixpkgs.shortRev; + + # At creation time we do not have state yet, so just default to latest. + system.stateVersion = config.system.nixos.version; + }; makeModules = module: rest: [ configuration versionModule module rest ]; @@ -310,7 +313,7 @@ in rec { ); # An image that can be imported into lxd and used for container creation - lxdImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + lxdContainerImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: with import ./.. { inherit system; }; @@ -319,14 +322,14 @@ in rec { modules = [ configuration versionModule - ./maintainers/scripts/lxd/lxd-image.nix + ./maintainers/scripts/lxd/lxd-container-image.nix ]; }).config.system.build.tarball) ); # Metadata for the lxd image - lxdMeta = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + lxdContainerMeta = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: with import ./.. { inherit system; }; @@ -335,7 +338,39 @@ in rec { modules = [ configuration versionModule - ./maintainers/scripts/lxd/lxd-image.nix + ./maintainers/scripts/lxd/lxd-container-image.nix + ]; + }).config.system.build.metadata) + + ); + + # An image that can be imported into lxd and used for container creation + lxdVirtualMachineImage = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + + with import ./.. { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = + [ configuration + versionModule + ./maintainers/scripts/lxd/lxd-virtual-machine-image.nix + ]; + }).config.system.build.qemuImage) + + ); + + # Metadata for the lxd image + lxdVirtualMachineImageMeta = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + + with import ./.. { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = + [ configuration + versionModule + ./maintainers/scripts/lxd/lxd-virtual-machine-image.nix ]; }).config.system.build.metadata) diff --git a/third_party/nixpkgs/nixos/tests/acme.nix b/third_party/nixpkgs/nixos/tests/acme.nix index 4d220b9747..e5f2d4c793 100644 --- a/third_party/nixpkgs/nixos/tests/acme.nix +++ b/third_party/nixpkgs/nixos/tests/acme.nix @@ -18,7 +18,7 @@ dnsConfig = nodes: { dnsProvider = "exec"; dnsPropagationCheck = false; - credentialsFile = pkgs.writeText "wildcard.env" '' + environmentFile = pkgs.writeText "wildcard.env" '' EXEC_PATH=${dnsScript nodes} EXEC_POLLING_INTERVAL=1 EXEC_PROPAGATION_TIMEOUT=1 @@ -266,6 +266,37 @@ in { } ]; + concurrency-limit.configuration = {pkgs, ...}: lib.mkMerge [ + webserverBasicConfig { + security.acme.maxConcurrentRenewals = 1; + + services.nginx.virtualHosts = { + "f.example.test" = vhostBase // { + enableACME = true; + }; + "g.example.test" = vhostBase // { + enableACME = true; + }; + "h.example.test" = vhostBase // { + enableACME = true; + }; + }; + + systemd.services = { + # check for mutual exclusion of starting renew services + "acme-f.example.test".serviceConfig.ExecPreStart = "+" + (pkgs.writeShellScript "test-f" '' + test "$(systemctl is-active acme-{g,h}.example.test.service | grep activating | wc -l)" -le 0 + ''); + "acme-g.example.test".serviceConfig.ExecPreStart = "+" + (pkgs.writeShellScript "test-g" '' + test "$(systemctl is-active acme-{f,h}.example.test.service | grep activating | wc -l)" -le 0 + ''); + "acme-h.example.test".serviceConfig.ExecPreStart = "+" + (pkgs.writeShellScript "test-h" '' + test "$(systemctl is-active acme-{g,f}.example.test.service | grep activating | wc -l)" -le 0 + ''); + }; + } + ]; + # Test lego internal server (listenHTTP option) # Also tests useRoot option lego-server.configuration = { ... }: { @@ -297,7 +328,7 @@ in { services.caddy = { enable = true; - virtualHosts."a.exmaple.test" = { + virtualHosts."a.example.test" = { useACMEHost = "example.test"; extraConfig = '' root * ${documentRoot} @@ -591,6 +622,15 @@ in { webserver.wait_for_unit("nginx.service") check_connection(client, "slow.example.test") + with subtest("Can limit concurrency of running renewals"): + switch_to(webserver, "concurrency-limit") + webserver.wait_for_unit("acme-finished-f.example.test.target") + webserver.wait_for_unit("acme-finished-g.example.test.target") + webserver.wait_for_unit("acme-finished-h.example.test.target") + check_connection(client, "f.example.test") + check_connection(client, "g.example.test") + check_connection(client, "h.example.test") + with subtest("Works with caddy"): switch_to(webserver, "caddy") webserver.wait_for_unit("acme-finished-example.test.target") diff --git a/third_party/nixpkgs/nixos/tests/adguardhome.nix b/third_party/nixpkgs/nixos/tests/adguardhome.nix index 9f8ddc33f5..a6f790b83f 100644 --- a/third_party/nixpkgs/nixos/tests/adguardhome.nix +++ b/third_party/nixpkgs/nixos/tests/adguardhome.nix @@ -7,7 +7,6 @@ emptyConf = { lib, ... }: { services.adguardhome = { enable = true; - settings = {}; }; }; diff --git a/third_party/nixpkgs/nixos/tests/akkoma.nix b/third_party/nixpkgs/nixos/tests/akkoma.nix index 7115c0beed..287e2d4859 100644 --- a/third_party/nixpkgs/nixos/tests/akkoma.nix +++ b/third_party/nixpkgs/nixos/tests/akkoma.nix @@ -33,7 +33,10 @@ let echo '${userPassword}' | ${pkgs.toot}/bin/toot login_cli -i "akkoma.nixos.test" -e "jamy@nixos.test" echo "y" | ${pkgs.toot}/bin/toot post "hello world Jamy here" - echo "y" | ${pkgs.toot}/bin/toot timeline | grep -F -q "hello world Jamy here" + + # Retrieving timeline with toot currently broken due to incompatible timestamp format + # cf. and + #echo "y" | ${pkgs.toot}/bin/toot timeline | grep -F -q "hello world Jamy here" # Test file upload echo "y" | ${pkgs.toot}/bin/toot upload <(dd if=/dev/zero bs=1024 count=1024 status=none) \ diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 23a4e41bb3..da788cc159 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -109,6 +109,8 @@ in { allTerminfo = handleTest ./all-terminfo.nix {}; alps = handleTest ./alps.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; + amd-sev = runTest ./amd-sev.nix; + anbox = runTest ./anbox.nix; anuko-time-tracker = handleTest ./anuko-time-tracker.nix {}; apcupsd = handleTest ./apcupsd.nix {}; apfs = runTest ./apfs.nix; @@ -117,6 +119,7 @@ in { atd = handleTest ./atd.nix {}; atop = handleTest ./atop.nix {}; atuin = handleTest ./atuin.nix {}; + audiobookshelf = handleTest ./audiobookshelf.nix {}; auth-mysql = handleTest ./auth-mysql.nix {}; authelia = handleTest ./authelia.nix {}; avahi = handleTest ./avahi.nix {}; @@ -156,6 +159,7 @@ in { cagebreak = handleTest ./cagebreak.nix {}; calibre-web = handleTest ./calibre-web.nix {}; calibre-server = handleTest ./calibre-server.nix {}; + castopod = handleTest ./castopod.nix {}; cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; }; cassandra_3_11 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_11; }; cassandra_4 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_4; }; @@ -210,6 +214,8 @@ in { custom-ca = handleTest ./custom-ca.nix {}; croc = handleTest ./croc.nix {}; darling = handleTest ./darling.nix {}; + dae = handleTest ./dae.nix {}; + dconf = handleTest ./dconf.nix {}; deepin = handleTest ./deepin.nix {}; deluge = handleTest ./deluge.nix {}; dendrite = handleTest ./matrix/dendrite.nix {}; @@ -272,7 +278,6 @@ in { firefox-beta = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-beta; }; firefox-devedition = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-devedition; }; firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job - firefox-esr-102 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-102; }; firefox-esr-115 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-115; }; firejail = handleTest ./firejail.nix {}; firewall = handleTest ./firewall.nix { nftables = false; }; @@ -282,12 +287,13 @@ in { fluentd = handleTest ./fluentd.nix {}; fluidd = handleTest ./fluidd.nix {}; fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {}; - forgejo = handleTest ./gitea.nix { giteaPackage = pkgs.forgejo; }; + forgejo = handleTest ./forgejo.nix { }; freenet = handleTest ./freenet.nix {}; freeswitch = handleTest ./freeswitch.nix {}; freshrss-sqlite = handleTest ./freshrss-sqlite.nix {}; freshrss-pgsql = handleTest ./freshrss-pgsql.nix {}; frigate = handleTest ./frigate.nix {}; + frp = handleTest ./frp.nix {}; frr = handleTest ./frr.nix {}; fsck = handleTest ./fsck.nix {}; fsck-systemd-stage-1 = handleTest ./fsck.nix { systemdStage1 = true; }; @@ -325,7 +331,6 @@ in { graylog = handleTest ./graylog.nix {}; grocy = handleTest ./grocy.nix {}; grub = handleTest ./grub.nix {}; - guacamole-client = handleTest ./guacamole-client.nix {}; guacamole-server = handleTest ./guacamole-server.nix {}; gvisor = handleTest ./gvisor.nix {}; hadoop = import ./hadoop { inherit handleTestOn; package=pkgs.hadoop; }; @@ -341,13 +346,16 @@ in { hbase2 = handleTest ./hbase.nix { package=pkgs.hbase2; }; hbase_2_4 = handleTest ./hbase.nix { package=pkgs.hbase_2_4; }; hbase3 = handleTest ./hbase.nix { package=pkgs.hbase3; }; + hddfancontrol = handleTest ./hddfancontrol.nix {}; hedgedoc = handleTest ./hedgedoc.nix {}; herbstluftwm = handleTest ./herbstluftwm.nix {}; homepage-dashboard = handleTest ./homepage-dashboard.nix {}; + honk = runTest ./honk.nix; installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests {}); invidious = handleTest ./invidious.nix {}; oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {}; odoo = handleTest ./odoo.nix {}; + odoo15 = handleTest ./odoo.nix { package = pkgs.odoo15; }; # 9pnet_virtio used to mount /nix partition doesn't support # hibernation. This test happens to work on x86_64-linux but # not on other platforms. @@ -391,7 +399,7 @@ in { jibri = handleTest ./jibri.nix {}; jirafeau = handleTest ./jirafeau.nix {}; jitsi-meet = handleTest ./jitsi-meet.nix {}; - jool = handleTest ./jool.nix {}; + jool = import ./jool.nix { inherit pkgs runTest; }; k3s = handleTest ./k3s {}; kafka = handleTest ./kafka.nix {}; kanidm = handleTest ./kanidm.nix {}; @@ -433,7 +441,7 @@ in { lightdm = handleTest ./lightdm.nix {}; lighttpd = handleTest ./lighttpd.nix {}; limesurvey = handleTest ./limesurvey.nix {}; - listmonk = handleTest ./listmonk.nix {}; + listmonk = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./listmonk.nix {}; litestream = handleTest ./litestream.nix {}; lldap = handleTest ./lldap.nix {}; locate = handleTest ./locate.nix {}; @@ -442,10 +450,8 @@ in { loki = handleTest ./loki.nix {}; luks = handleTest ./luks.nix {}; lvm2 = handleTest ./lvm2 {}; - lxd = handleTest ./lxd.nix {}; - lxd-nftables = handleTest ./lxd-nftables.nix {}; + lxd = pkgs.recurseIntoAttrs (handleTest ./lxd { inherit handleTestOn; }); lxd-image-server = handleTest ./lxd-image-server.nix {}; - lxd-ui = handleTest ./lxd-ui.nix {}; #logstash = handleTest ./logstash.nix {}; lorri = handleTest ./lorri/default.nix {}; maddy = discoverTests (import ./maddy { inherit handleTest; }); @@ -464,6 +470,7 @@ in { matrix-appservice-irc = handleTest ./matrix/appservice-irc.nix {}; matrix-conduit = handleTest ./matrix/conduit.nix {}; matrix-synapse = handleTest ./matrix/synapse.nix {}; + matrix-synapse-workers = handleTest ./matrix/synapse-workers.nix {}; mattermost = handleTest ./mattermost.nix {}; mediamtx = handleTest ./mediamtx.nix {}; mediatomb = handleTest ./mediatomb.nix {}; @@ -481,6 +488,7 @@ in { miriway = handleTest ./miriway.nix {}; misc = handleTest ./misc.nix {}; mjolnir = handleTest ./matrix/mjolnir.nix {}; + mobilizon = handleTest ./mobilizon.nix {}; mod_perl = handleTest ./mod_perl.nix {}; molly-brown = handleTest ./molly-brown.nix {}; monica = handleTest ./web-apps/monica.nix {}; @@ -523,8 +531,8 @@ in { netdata = handleTest ./netdata.nix {}; networking.networkd = handleTest ./networking.nix { networkd = true; }; networking.scripted = handleTest ./networking.nix { networkd = false; }; - netbox = handleTest ./web-apps/netbox.nix { inherit (pkgs) netbox; }; - netbox_3_3 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_3; }; + netbox_3_5 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_5; }; + netbox_3_6 = handleTest ./web-apps/netbox.nix { netbox = pkgs.netbox_3_6; }; netbox-upgrade = handleTest ./web-apps/netbox-upgrade.nix {}; # TODO: put in networking.nix after the test becomes more complete networkingProxy = handleTest ./networking-proxy.nix {}; @@ -546,6 +554,7 @@ in { nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {}; nginx-sso = handleTest ./nginx-sso.nix {}; nginx-status-page = handleTest ./nginx-status-page.nix {}; + nginx-tmpdir = handleTest ./nginx-tmpdir.nix {}; nginx-variants = handleTest ./nginx-variants.nix {}; nifi = handleTestOn ["x86_64-linux"] ./web-apps/nifi.nix {}; nitter = handleTest ./nitter.nix {}; @@ -667,12 +676,16 @@ in { qboot = handleTestOn ["x86_64-linux" "i686-linux"] ./qboot.nix {}; qemu-vm-restrictnetwork = handleTest ./qemu-vm-restrictnetwork.nix {}; qemu-vm-volatile-root = runTest ./qemu-vm-volatile-root.nix; - quorum = handleTest ./quorum.nix {}; - quake3 = handleTest ./quake3.nix {}; + qemu-vm-external-disk-image = runTest ./qemu-vm-external-disk-image.nix; + qgis = handleTest ./qgis.nix { qgisPackage = pkgs.qgis; }; + qgis-ltr = handleTest ./qgis.nix { qgisPackage = pkgs.qgis-ltr; }; qownnotes = handleTest ./qownnotes.nix {}; + quake3 = handleTest ./quake3.nix {}; + quorum = handleTest ./quorum.nix {}; rabbitmq = handleTest ./rabbitmq.nix {}; radarr = handleTest ./radarr.nix {}; radicale = handleTest ./radicale.nix {}; + ragnarwm = handleTest ./ragnarwm.nix {}; rasdaemon = handleTest ./rasdaemon.nix {}; readarr = handleTest ./readarr.nix {}; redis = handleTest ./redis.nix {}; @@ -701,7 +714,7 @@ in { service-runner = handleTest ./service-runner.nix {}; sftpgo = runTest ./sftpgo.nix; sfxr-qt = handleTest ./sfxr-qt.nix {}; - sgtpuzzles = handleTest ./sgtpuzzles.nix {}; + sgt-puzzles = handleTest ./sgt-puzzles.nix {}; shadow = handleTest ./shadow.nix {}; shadowsocks = handleTest ./shadowsocks {}; shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix {}; @@ -725,6 +738,7 @@ in { sslh = handleTest ./sslh.nix {}; sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {}; sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; + stalwart-mail = handleTest ./stalwart-mail.nix {}; stargazer = runTest ./web-servers/stargazer.nix; starship = handleTest ./starship.nix {}; static-web-server = handleTest ./web-servers/static-web-server.nix {}; @@ -733,6 +747,7 @@ in { strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; stunnel = handleTest ./stunnel.nix {}; sudo = handleTest ./sudo.nix {}; + sudo-rs = handleTest ./sudo-rs.nix {}; swap-file-btrfs = handleTest ./swap-file-btrfs.nix {}; swap-partition = handleTest ./swap-partition.nix {}; swap-random-encryption = handleTest ./swap-random-encryption.nix {}; @@ -753,6 +768,7 @@ in { systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {}; systemd-credentials-tpm2 = handleTest ./systemd-credentials-tpm2.nix {}; systemd-escaping = handleTest ./systemd-escaping.nix {}; + systemd-initrd-bridge = handleTest ./systemd-initrd-bridge.nix {}; systemd-initrd-btrfs-raid = handleTest ./systemd-initrd-btrfs-raid.nix {}; systemd-initrd-luks-fido2 = handleTest ./systemd-initrd-luks-fido2.nix {}; systemd-initrd-luks-keyfile = handleTest ./systemd-initrd-luks-keyfile.nix {}; @@ -767,6 +783,7 @@ in { systemd-initrd-networkd = handleTest ./systemd-initrd-networkd.nix {}; systemd-initrd-networkd-ssh = handleTest ./systemd-initrd-networkd-ssh.nix {}; systemd-initrd-networkd-openvpn = handleTest ./initrd-network-openvpn { systemdStage1 = true; }; + systemd-initrd-vlan = handleTest ./systemd-initrd-vlan.nix {}; systemd-journal = handleTest ./systemd-journal.nix {}; systemd-machinectl = handleTest ./systemd-machinectl.nix {}; systemd-networkd = handleTest ./systemd-networkd.nix {}; @@ -808,7 +825,8 @@ in { tor = handleTest ./tor.nix {}; traefik = handleTestOn ["aarch64-linux" "x86_64-linux"] ./traefik.nix {}; trafficserver = handleTest ./trafficserver.nix {}; - transmission = handleTest ./transmission.nix {}; + transmission = handleTest ./transmission.nix { transmission = pkgs.transmission; }; + transmission_4 = handleTest ./transmission.nix { transmission = pkgs.transmission_4; }; # tracee requires bpf tracee = handleTestOn ["x86_64-linux"] ./tracee.nix {}; trezord = handleTest ./trezord.nix {}; @@ -823,7 +841,7 @@ in { typesense = handleTest ./typesense.nix {}; ucarp = handleTest ./ucarp.nix {}; udisks2 = handleTest ./udisks2.nix {}; - ulogd = handleTest ./ulogd.nix {}; + ulogd = handleTest ./ulogd/ulogd.nix {}; unbound = handleTest ./unbound.nix {}; unifi = handleTest ./unifi.nix {}; unit-php = handleTest ./web-servers/unit-php.nix {}; @@ -832,6 +850,7 @@ in { uptime-kuma = handleTest ./uptime-kuma.nix {}; usbguard = handleTest ./usbguard.nix {}; user-activation-scripts = handleTest ./user-activation-scripts.nix {}; + user-expiry = runTest ./user-expiry.nix; user-home-mode = handleTest ./user-home-mode.nix {}; uwsgi = handleTest ./uwsgi.nix {}; v2ray = handleTest ./v2ray.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/amd-sev.nix b/third_party/nixpkgs/nixos/tests/amd-sev.nix new file mode 100644 index 0000000000..bf9a50c10d --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/amd-sev.nix @@ -0,0 +1,56 @@ +{ lib, ... }: { + name = "amd-sev"; + meta = { + maintainers = with lib.maintainers; [ trundle veehaitch ]; + }; + + nodes.machine = { lib, ... }: { + hardware.cpu.amd.sev.enable = true; + hardware.cpu.amd.sevGuest.enable = true; + + specialisation.sevCustomUserGroup.configuration = { + users.groups.sevtest = { }; + + hardware.cpu.amd.sev = { + enable = true; + group = "root"; + mode = "0600"; + }; + hardware.cpu.amd.sevGuest = { + enable = true; + group = "sevtest"; + }; + }; + }; + + testScript = { nodes, ... }: + let + specialisations = "${nodes.machine.system.build.toplevel}/specialisation"; + in + '' + machine.wait_for_unit("multi-user.target") + + with subtest("Check default settings"): + out = machine.succeed("cat /etc/udev/rules.d/99-local.rules") + assert 'KERNEL=="sev", OWNER="root", GROUP="sev", MODE="0660"' in out + assert 'KERNEL=="sev-guest", OWNER="root", GROUP="sev-guest", MODE="0660"' in out + + out = machine.succeed("cat /etc/group") + assert "sev:" in out + assert "sev-guest:" in out + assert "sevtest:" not in out + + with subtest("Activate configuration with custom user/group"): + machine.succeed('${specialisations}/sevCustomUserGroup/bin/switch-to-configuration test') + + with subtest("Check custom user and group"): + out = machine.succeed("cat /etc/udev/rules.d/99-local.rules") + assert 'KERNEL=="sev", OWNER="root", GROUP="root", MODE="0600"' in out + assert 'KERNEL=="sev-guest", OWNER="root", GROUP="sevtest", MODE="0660"' in out + + out = machine.succeed("cat /etc/group") + assert "sev:" not in out + assert "sev-guest:" not in out + assert "sevtest:" in out + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/anbox.nix b/third_party/nixpkgs/nixos/tests/anbox.nix new file mode 100644 index 0000000000..dfd6c13d93 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/anbox.nix @@ -0,0 +1,36 @@ +{ lib, pkgs, ... }: + +{ + name = "anbox"; + meta.maintainers = with lib.maintainers; [ mvnetbiz ]; + + nodes.machine = { pkgs, config, ... }: { + imports = [ + ./common/user-account.nix + ./common/x11.nix + ]; + + environment.systemPackages = with pkgs; [ android-tools ]; + + test-support.displayManager.auto.user = "alice"; + + virtualisation.anbox.enable = true; + boot.kernelPackages = pkgs.linuxPackages_5_15; + virtualisation.memorySize = 2500; + }; + + testScript = { nodes, ... }: let + user = nodes.machine.users.users.alice; + bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${toString user.uid}/bus"; + in '' + machine.wait_for_x() + + machine.wait_until_succeeds( + "sudo -iu alice ${bus} anbox wait-ready" + ) + + machine.wait_until_succeeds("adb shell true") + + print(machine.succeed("adb devices")) + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/audiobookshelf.nix b/third_party/nixpkgs/nixos/tests/audiobookshelf.nix new file mode 100644 index 0000000000..64bd415160 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/audiobookshelf.nix @@ -0,0 +1,23 @@ +import ./make-test-python.nix ({ lib, ... }: + +with lib; + +{ + name = "audiobookshelf"; + meta.maintainers = with maintainers; [ wietsedv ]; + + nodes.machine = + { pkgs, ... }: + { + services.audiobookshelf = { + enable = true; + port = 1234; + }; + }; + + testScript = '' + machine.wait_for_unit("audiobookshelf.service") + machine.wait_for_open_port(1234) + machine.succeed("curl --fail http://localhost:1234/") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/bcachefs.nix b/third_party/nixpkgs/nixos/tests/bcachefs.nix index 0385e09899..ec3c2427f3 100644 --- a/third_party/nixpkgs/nixos/tests/bcachefs.nix +++ b/third_party/nixpkgs/nixos/tests/bcachefs.nix @@ -20,9 +20,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { "parted --script /dev/vdb mklabel msdos", "parted --script /dev/vdb -- mkpart primary 1024M 50% mkpart primary 50% -1s", "udevadm settle", - "keyctl link @u @s", "echo password | bcachefs format --encrypted --metadata_replicas 2 --label vtest /dev/vdb1 /dev/vdb2", - "echo password | bcachefs unlock /dev/vdb1", + "echo password | bcachefs unlock -k session /dev/vdb1", "echo password | mount -t bcachefs /dev/vdb1:/dev/vdb2 /tmp/mnt", "udevadm settle", "bcachefs fs usage /tmp/mnt", diff --git a/third_party/nixpkgs/nixos/tests/caddy.nix b/third_party/nixpkgs/nixos/tests/caddy.nix index 238091ec60..5a0d353939 100644 --- a/third_party/nixpkgs/nixos/tests/caddy.nix +++ b/third_party/nixpkgs/nixos/tests/caddy.nix @@ -34,6 +34,20 @@ import ./make-test-python.nix ({ pkgs, ... }: { "http://localhost:8081" = { }; }; }; + specialisation.rfc42.configuration = { + services.caddy.settings = { + apps.http.servers.default = { + listen = [ ":80" ]; + routes = [{ + handle = [{ + body = "hello world"; + handler = "static_response"; + status_code = 200; + }]; + }]; + }; + }; + }; }; }; @@ -41,6 +55,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { let justReloadSystem = "${nodes.webserver.system.build.toplevel}/specialisation/config-reload"; multipleConfigs = "${nodes.webserver.system.build.toplevel}/specialisation/multiple-configs"; + rfc42Config = "${nodes.webserver.system.build.toplevel}/specialisation/rfc42"; in '' url = "http://localhost/example.html" @@ -62,5 +77,12 @@ import ./make-test-python.nix ({ pkgs, ... }: { ) webserver.wait_for_open_port(8080) webserver.wait_for_open_port(8081) + + with subtest("rfc42 settings config"): + webserver.succeed( + "${rfc42Config}/bin/switch-to-configuration test >&2" + ) + webserver.wait_for_open_port(80) + webserver.succeed("curl http://localhost | grep hello") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/castopod.nix b/third_party/nixpkgs/nixos/tests/castopod.nix new file mode 100644 index 0000000000..1d53c3e9a3 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/castopod.nix @@ -0,0 +1,87 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: +{ + name = "castopod"; + meta = with lib.maintainers; { + maintainers = [ alexoundos misuzu ]; + }; + nodes.castopod = { nodes, ... }: { + networking.firewall.allowedTCPPorts = [ 80 ]; + networking.extraHosts = '' + 127.0.0.1 castopod.example.com + ''; + services.castopod = { + enable = true; + database.createLocally = true; + localDomain = "castopod.example.com"; + }; + environment.systemPackages = + let + username = "admin"; + email = "admin@castood.example.com"; + password = "v82HmEp5"; + testRunner = pkgs.writers.writePython3Bin "test-runner" + { + libraries = [ pkgs.python3Packages.selenium ]; + flakeIgnore = [ + "E501" + ]; + } '' + from selenium.webdriver.common.by import By + from selenium.webdriver import Firefox + from selenium.webdriver.firefox.options import Options + from selenium.webdriver.support.ui import WebDriverWait + from selenium.webdriver.support import expected_conditions as EC + + options = Options() + options.add_argument('--headless') + driver = Firefox(options=options) + try: + driver.implicitly_wait(20) + driver.get('http://castopod.example.com/cp-install') + + wait = WebDriverWait(driver, 10) + + wait.until(EC.title_contains("installer")) + + driver.find_element(By.CSS_SELECTOR, '#username').send_keys( + '${username}' + ) + driver.find_element(By.CSS_SELECTOR, '#email').send_keys( + '${email}' + ) + driver.find_element(By.CSS_SELECTOR, '#password').send_keys( + '${password}' + ) + driver.find_element(By.XPATH, "//button[contains(., 'Finish install')]").click() + + wait.until(EC.title_contains("Auth")) + + driver.find_element(By.CSS_SELECTOR, '#email').send_keys( + '${email}' + ) + driver.find_element(By.CSS_SELECTOR, '#password').send_keys( + '${password}' + ) + driver.find_element(By.XPATH, "//button[contains(., 'Login')]").click() + + wait.until(EC.title_contains("Admin dashboard")) + finally: + driver.close() + driver.quit() + ''; + in + [ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ]; + }; + testScript = '' + start_all() + castopod.wait_for_unit("castopod-setup.service") + castopod.wait_for_file("/run/phpfpm/castopod.sock") + castopod.wait_for_unit("nginx.service") + castopod.wait_for_open_port(80) + castopod.wait_until_succeeds("curl -sS -f http://castopod.example.com") + castopod.succeed("curl -s http://localhost/cp-install | grep 'Create your Super Admin account' > /dev/null") + + with subtest("Create superadmin and log in"): + castopod.succeed("PYTHONUNBUFFERED=1 test-runner | systemd-cat -t test-runner") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/common/lxd/config.yaml b/third_party/nixpkgs/nixos/tests/common/lxd/config.yaml deleted file mode 100644 index 3bb667ed43..0000000000 --- a/third_party/nixpkgs/nixos/tests/common/lxd/config.yaml +++ /dev/null @@ -1,24 +0,0 @@ -storage_pools: - - name: default - driver: dir - config: - source: /var/lxd-pool - -networks: - - name: lxdbr0 - type: bridge - config: - ipv4.address: auto - ipv6.address: none - -profiles: - - name: default - devices: - eth0: - name: eth0 - network: lxdbr0 - type: nic - root: - path: / - pool: default - type: disk diff --git a/third_party/nixpkgs/nixos/tests/custom-ca.nix b/third_party/nixpkgs/nixos/tests/custom-ca.nix index 25a7b6fdea..0fcdf81022 100644 --- a/third_party/nixpkgs/nixos/tests/custom-ca.nix +++ b/third_party/nixpkgs/nixos/tests/custom-ca.nix @@ -131,8 +131,8 @@ let # chromium-based browsers refuse to run as root test-support.displayManager.auto.user = "alice"; - # browsers may hang with the default memory - virtualisation.memorySize = 600; + # machine often runs out of memory with less + virtualisation.memorySize = 1024; environment.systemPackages = [ pkgs.xdotool pkgs.${browser} ]; }; diff --git a/third_party/nixpkgs/nixos/tests/dae.nix b/third_party/nixpkgs/nixos/tests/dae.nix new file mode 100644 index 0000000000..b8c8ebce74 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/dae.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + + name = "dae"; + + meta = { + maintainers = with lib.maintainers; [ oluceps ]; + }; + + nodes.machine = { pkgs, ... }: { + environment.systemPackages = [ pkgs.curl ]; + services.nginx = { + enable = true; + statusPage = true; + }; + services.dae = { + enable = true; + }; + }; + + testScript = '' + machine.wait_for_unit("nginx.service") + machine.wait_for_unit("dae.service") + + machine.wait_for_open_port(80) + + machine.succeed("curl --fail --max-time 10 http://localhost") + ''; + +}) diff --git a/third_party/nixpkgs/nixos/tests/dconf.nix b/third_party/nixpkgs/nixos/tests/dconf.nix new file mode 100644 index 0000000000..192c075540 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/dconf.nix @@ -0,0 +1,34 @@ +import ./make-test-python.nix + ({ lib, ... }: + { + name = "dconf"; + + meta.maintainers = with lib.maintainers; [ + linsui + ]; + + nodes.machine = { config, pkgs, lib, ... }: { + users.extraUsers.alice = { isNormalUser = true; }; + programs.dconf = with lib.gvariant; { + enable = true; + profiles.user.databases = [ + { + settings = { + "test/not".locked = mkInt32 1; + "test/is".locked = "locked"; + }; + locks = [ + "/test/is/locked" + ]; + } + ]; + }; + }; + + testScript = '' + machine.succeed("test $(dconf read -d /test/not/locked) == 1") + machine.succeed("test $(dconf read -d /test/is/locked) == \"'locked'\"") + machine.fail("sudo -u alice dbus-run-session -- dconf write /test/is/locked \"@s 'unlocked'\"") + machine.succeed("sudo -u alice dbus-run-session -- dconf write /test/not/locked \"@i 2\"") + ''; + }) diff --git a/third_party/nixpkgs/nixos/tests/discourse.nix b/third_party/nixpkgs/nixos/tests/discourse.nix index c79ba41c2e..3e69a31490 100644 --- a/third_party/nixpkgs/nixos/tests/discourse.nix +++ b/third_party/nixpkgs/nixos/tests/discourse.nix @@ -166,7 +166,7 @@ import ./make-test-python.nix ( request = builtins.toJSON { title = "Private message"; raw = "This is a test message."; - target_usernames = admin.username; + target_recipients = admin.username; archetype = "private_message"; }; in '' diff --git a/third_party/nixpkgs/nixos/tests/docker-tools.nix b/third_party/nixpkgs/nixos/tests/docker-tools.nix index 44b583ebce..fcdfa586fd 100644 --- a/third_party/nixpkgs/nixos/tests/docker-tools.nix +++ b/third_party/nixpkgs/nixos/tests/docker-tools.nix @@ -55,7 +55,7 @@ in { nodes = { docker = { ... }: { virtualisation = { - diskSize = 2048; + diskSize = 3072; docker.enable = true; }; }; diff --git a/third_party/nixpkgs/nixos/tests/dolibarr.nix b/third_party/nixpkgs/nixos/tests/dolibarr.nix index 2f012a0c67..4fdee9e969 100644 --- a/third_party/nixpkgs/nixos/tests/dolibarr.nix +++ b/third_party/nixpkgs/nixos/tests/dolibarr.nix @@ -50,7 +50,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { # Now, we have installed the machine, let's verify we still have the right configuration. assert 'nixos' in machine.succeed("cat /var/lib/dolibarr/conf.php") # We do not want any redirect now as we have installed the machine. - machine.succeed('curl -f -X POST http://localhost') + machine.succeed('curl -f -X GET http://localhost') # Test authentication to the webservice. parser = TokenParser() parser.feed(machine.succeed('curl -f -X GET http://localhost/index.php?mainmenu=login&username=root')) diff --git a/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix b/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix index d8c6ea0f72..293dc43f91 100644 --- a/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix +++ b/third_party/nixpkgs/nixos/tests/fontconfig-default-fonts.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ lib, ... }: nodes.machine = { config, pkgs, ... }: { fonts.enableDefaultPackages = true; # Background fonts fonts.packages = with pkgs; [ - noto-fonts-emoji + noto-fonts-color-emoji cantarell-fonts twitter-color-emoji source-code-pro diff --git a/third_party/nixpkgs/nixos/tests/forgejo.nix b/third_party/nixpkgs/nixos/tests/forgejo.nix new file mode 100644 index 0000000000..b326819e31 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/forgejo.nix @@ -0,0 +1,157 @@ +{ system ? builtins.currentSystem +, config ? { } +, pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let + ## gpg --faked-system-time='20230301T010000!' --quick-generate-key snakeoil ed25519 sign + signingPrivateKey = '' + -----BEGIN PGP PRIVATE KEY BLOCK----- + + lFgEY/6jkBYJKwYBBAHaRw8BAQdADXiZRV8RJUyC9g0LH04wLMaJL9WTc+szbMi7 + 5fw4yP8AAQCl8EwGfzSLm/P6fCBfA3I9znFb3MEHGCCJhJ6VtKYyRw7ktAhzbmFr + ZW9pbIiUBBMWCgA8FiEE+wUM6VW/NLtAdSixTWQt6LZ4x50FAmP+o5ACGwMFCQPC + ZwAECwkIBwQVCgkIBRYCAwEAAh4FAheAAAoJEE1kLei2eMedFTgBAKQs1oGFZrCI + TZP42hmBTKxGAI1wg7VSdDEWTZxut/2JAQDGgo2sa4VHMfj0aqYGxrIwfP2B7JHO + GCqGCRf9O/hzBA== + =9Uy3 + -----END PGP PRIVATE KEY BLOCK----- + ''; + signingPrivateKeyId = "4D642DE8B678C79D"; + + supportedDbTypes = [ "mysql" "postgres" "sqlite3" ]; + makeGForgejoTest = type: nameValuePair type (makeTest { + name = "forgejo-${type}"; + meta.maintainers = with maintainers; [ bendlas emilylange ]; + + nodes = { + server = { config, pkgs, ... }: { + virtualisation.memorySize = 2047; + services.forgejo = { + enable = true; + database = { inherit type; }; + settings.service.DISABLE_REGISTRATION = true; + settings."repository.signing".SIGNING_KEY = signingPrivateKeyId; + settings.actions.ENABLED = true; + }; + environment.systemPackages = [ config.services.forgejo.package pkgs.gnupg pkgs.jq ]; + services.openssh.enable = true; + + specialisation.runner = { + inheritParentConfig = true; + configuration.services.gitea-actions-runner.instances."test" = { + enable = true; + name = "ci"; + url = "http://localhost:3000"; + labels = [ + # don't require docker/podman + "native:host" + ]; + tokenFile = "/var/lib/forgejo/runner_token"; + }; + }; + }; + client1 = { config, pkgs, ... }: { + environment.systemPackages = [ pkgs.git ]; + }; + client2 = { config, pkgs, ... }: { + environment.systemPackages = [ pkgs.git ]; + }; + }; + + testScript = { nodes, ... }: + let + inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; + serverSystem = nodes.server.system.build.toplevel; + in + '' + GIT_SSH_COMMAND = "ssh -i $HOME/.ssh/privk -o StrictHostKeyChecking=no" + REPO = "forgejo@server:test/repo" + PRIVK = "${snakeOilPrivateKey}" + + start_all() + + client1.succeed("mkdir /tmp/repo") + client1.succeed("mkdir -p $HOME/.ssh") + client1.succeed(f"cat {PRIVK} > $HOME/.ssh/privk") + client1.succeed("chmod 0400 $HOME/.ssh/privk") + client1.succeed("git -C /tmp/repo init") + client1.succeed("echo hello world > /tmp/repo/testfile") + client1.succeed("git -C /tmp/repo add .") + client1.succeed("git config --global user.email test@localhost") + client1.succeed("git config --global user.name test") + client1.succeed("git -C /tmp/repo commit -m 'Initial import'") + client1.succeed(f"git -C /tmp/repo remote add origin {REPO}") + + server.wait_for_unit("forgejo.service") + server.wait_for_open_port(3000) + server.wait_for_open_port(22) + server.succeed("curl --fail http://localhost:3000/") + + server.succeed( + "su -l forgejo -c 'gpg --homedir /var/lib/forgejo/data/home/.gnupg " + + "--import ${toString (pkgs.writeText "forgejo.key" signingPrivateKey)}'" + ) + + assert "BEGIN PGP PUBLIC KEY BLOCK" in server.succeed("curl http://localhost:3000/api/v1/signing-key.gpg") + + server.succeed( + "curl --fail http://localhost:3000/user/sign_up | grep 'Registration is disabled. " + + "Please contact your site administrator.'" + ) + server.succeed( + "su -l forgejo -c 'GITEA_WORK_DIR=/var/lib/forgejo gitea admin user create " + + "--username test --password totallysafe --email test@localhost'" + ) + + api_token = server.succeed( + "curl --fail -X POST http://test:totallysafe@localhost:3000/api/v1/users/test/tokens " + + "-H 'Accept: application/json' -H 'Content-Type: application/json' -d " + + "'{\"name\":\"token\",\"scopes\":[\"all\"]}' | jq '.sha1' | xargs echo -n" + ) + + server.succeed( + "curl --fail -X POST http://localhost:3000/api/v1/user/repos " + + "-H 'Accept: application/json' -H 'Content-Type: application/json' " + + f"-H 'Authorization: token {api_token}'" + + ' -d \'{"auto_init":false, "description":"string", "license":"mit", "name":"repo", "private":false}\''' + ) + + server.succeed( + "curl --fail -X POST http://localhost:3000/api/v1/user/keys " + + "-H 'Accept: application/json' -H 'Content-Type: application/json' " + + f"-H 'Authorization: token {api_token}'" + + ' -d \'{"key":"${snakeOilPublicKey}","read_only":true,"title":"SSH"}\''' + ) + + client1.succeed( + f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' git -C /tmp/repo push origin master" + ) + + client2.succeed("mkdir -p $HOME/.ssh") + client2.succeed(f"cat {PRIVK} > $HOME/.ssh/privk") + client2.succeed("chmod 0400 $HOME/.ssh/privk") + client2.succeed(f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' git clone {REPO}") + client2.succeed('test "$(cat repo/testfile | xargs echo -n)" = "hello world"') + + server.wait_until_succeeds( + 'test "$(curl http://localhost:3000/api/v1/repos/test/repo/commits ' + + '-H "Accept: application/json" | jq length)" = "1"', + timeout=10 + ) + + with subtest("Testing runner registration"): + server.succeed( + "su -l forgejo -c 'GITEA_WORK_DIR=/var/lib/forgejo gitea actions generate-runner-token' | sed 's/^/TOKEN=/' | tee /var/lib/forgejo/runner_token" + ) + server.succeed("${serverSystem}/specialisation/runner/bin/switch-to-configuration test") + server.wait_for_unit("gitea-runner-test.service") + server.succeed("journalctl -o cat -u gitea-runner-test.service | grep -q 'Runner registered successfully'") + ''; + }); +in + +listToAttrs (map makeGForgejoTest supportedDbTypes) diff --git a/third_party/nixpkgs/nixos/tests/frp.nix b/third_party/nixpkgs/nixos/tests/frp.nix new file mode 100644 index 0000000000..2f5c0f8ec9 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/frp.nix @@ -0,0 +1,86 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "frp"; + meta.maintainers = with lib.maintainers; [ zaldnoay janik ]; + nodes = { + frps = { + networking = { + useNetworkd = true; + useDHCP = false; + firewall.enable = false; + }; + + systemd.network.networks."01-eth1" = { + name = "eth1"; + networkConfig.Address = "10.0.0.1/24"; + }; + + services.frp = { + enable = true; + role = "server"; + settings = { + common = { + bind_port = 7000; + vhost_http_port = 80; + }; + }; + }; + }; + + + frpc = { + networking = { + useNetworkd = true; + useDHCP = false; + }; + + systemd.network.networks."01-eth1" = { + name = "eth1"; + networkConfig.Address = "10.0.0.2/24"; + }; + + services.httpd = { + enable = true; + adminAddr = "admin@example.com"; + virtualHosts."test-appication" = + let + testdir = pkgs.writeTextDir "web/index.php" " /test/hwmon1/pwm1 + echo 2 > /test/hwmon1/pwm1_enable + ''; + wantedBy = ["hddfancontrol.service"]; + before = ["hddfancontrol.service"]; + }; + + systemd.services.hddfancontrol.serviceConfig.ReadWritePaths = "/test"; + }; + + # hddfancontrol.service will fail to start because qemu /dev/vda doesn't have + # any thermal interfaces, but it should ensure that fans appear to be running + # before it aborts. + testScript = '' + start_all() + machine.wait_for_unit("multi-user.target") + machine.succeed("journalctl -eu hddfancontrol.service|grep 'Setting fan speed'") + machine.shutdown() + + ''; + +}) diff --git a/third_party/nixpkgs/nixos/tests/honk.nix b/third_party/nixpkgs/nixos/tests/honk.nix new file mode 100644 index 0000000000..71d86a5924 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/honk.nix @@ -0,0 +1,32 @@ +{ lib, ... }: + +{ + name = "honk-server"; + + nodes = { + machine = { pkgs, ... }: { + services.honk = { + enable = true; + host = "0.0.0.0"; + port = 8080; + username = "username"; + passwordFile = "${pkgs.writeText "honk-password" "secure"}"; + servername = "servername"; + }; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("honk.service") + machine.wait_for_open_port(8080) + + machine.stop_job("honk") + machine.wait_for_closed_port(8080) + + machine.start_job("honk") + machine.wait_for_open_port(8080) + ''; + + meta.maintainers = [ lib.maintainers.drupol ]; +} diff --git a/third_party/nixpkgs/nixos/tests/influxdb2.nix b/third_party/nixpkgs/nixos/tests/influxdb2.nix index c9c54b788c..1631ac1d94 100644 --- a/third_party/nixpkgs/nixos/tests/influxdb2.nix +++ b/third_party/nixpkgs/nixos/tests/influxdb2.nix @@ -6,6 +6,9 @@ import ./make-test-python.nix ({ pkgs, ...} : { nodes.machine = { lib, ... }: { environment.systemPackages = [ pkgs.influxdb2-cli ]; + # Make sure that the service is restarted immediately if tokens need to be rewritten + # without relying on any Restart=on-failure behavior + systemd.services.influxdb2.serviceConfig.RestartSec = 6000; services.influxdb2.enable = true; services.influxdb2.provision = { enable = true; @@ -15,22 +18,208 @@ import ./make-test-python.nix ({ pkgs, ...} : { passwordFile = pkgs.writeText "admin-pw" "ExAmPl3PA55W0rD"; tokenFile = pkgs.writeText "admin-token" "verysecureadmintoken"; }; + organizations.someorg = { + buckets.somebucket = {}; + auths.sometoken = { + description = "some auth token"; + readBuckets = ["somebucket"]; + writeBuckets = ["somebucket"]; + }; + }; + users.someuser.passwordFile = pkgs.writeText "tmp-pw" "abcgoiuhaoga"; + }; + + specialisation.withModifications.configuration = { ... }: { + services.influxdb2.provision = { + organizations.someorg.buckets.somebucket.present = false; + organizations.someorg.auths.sometoken.present = false; + users.someuser.present = false; + + organizations.myorg = { + description = "Myorg description"; + buckets.mybucket = { + description = "Mybucket description"; + }; + auths.mytoken = { + operator = true; + description = "operator token"; + tokenFile = pkgs.writeText "tmp-tok" "someusertoken"; + }; + }; + users.myuser.passwordFile = pkgs.writeText "tmp-pw" "abcgoiuhaoga"; + }; + }; + + specialisation.withParentDelete.configuration = { ... }: { + services.influxdb2.provision = { + organizations.someorg.present = false; + # Deleting the parent implies: + #organizations.someorg.buckets.somebucket.present = false; + #organizations.someorg.auths.sometoken.present = false; + }; + }; + + specialisation.withNewTokens.configuration = { ... }: { + services.influxdb2.provision = { + organizations.default = { + auths.operator = { + operator = true; + description = "new optoken"; + tokenFile = pkgs.writeText "tmp-tok" "newoptoken"; + }; + auths.allaccess = { + operator = true; + description = "new allaccess"; + tokenFile = pkgs.writeText "tmp-tok" "newallaccess"; + }; + auths.specifics = { + description = "new specifics"; + readPermissions = ["users" "tasks"]; + writePermissions = ["tasks"]; + tokenFile = pkgs.writeText "tmp-tok" "newspecificstoken"; + }; + }; + }; }; }; testScript = { nodes, ... }: let + specialisations = "${nodes.machine.system.build.toplevel}/specialisation"; tokenArg = "--token verysecureadmintoken"; in '' + def assert_contains(haystack, needle): + if needle not in haystack: + print("The haystack that will cause the following exception is:") + print("---") + print(haystack) + print("---") + raise Exception(f"Expected string '{needle}' was not found") + + def assert_lacks(haystack, needle): + if needle in haystack: + print("The haystack that will cause the following exception is:") + print("---") + print(haystack, end="") + print("---") + raise Exception(f"Unexpected string '{needle}' was found") + machine.wait_for_unit("influxdb2.service") machine.fail("curl --fail -X POST 'http://localhost:8086/api/v2/signin' -u admin:wrongpassword") machine.succeed("curl --fail -X POST 'http://localhost:8086/api/v2/signin' -u admin:ExAmPl3PA55W0rD") out = machine.succeed("influx org list ${tokenArg}") - assert "default" in out + assert_contains(out, "default") + assert_lacks(out, "myorg") + assert_contains(out, "someorg") out = machine.succeed("influx bucket list ${tokenArg} --org default") - assert "default" in out + assert_contains(out, "default") + + machine.fail("influx bucket list ${tokenArg} --org myorg") + + out = machine.succeed("influx bucket list ${tokenArg} --org someorg") + assert_contains(out, "somebucket") + + out = machine.succeed("influx user list ${tokenArg}") + assert_contains(out, "admin") + assert_lacks(out, "myuser") + assert_contains(out, "someuser") + + out = machine.succeed("influx auth list ${tokenArg}") + assert_lacks(out, "operator token") + assert_contains(out, "some auth token") + + with subtest("withModifications"): + machine.succeed('${specialisations}/withModifications/bin/switch-to-configuration test') + machine.wait_for_unit("influxdb2.service") + + out = machine.succeed("influx org list ${tokenArg}") + assert_contains(out, "default") + assert_contains(out, "myorg") + assert_contains(out, "someorg") + + out = machine.succeed("influx bucket list ${tokenArg} --org myorg") + assert_contains(out, "mybucket") + + out = machine.succeed("influx bucket list ${tokenArg} --org someorg") + assert_lacks(out, "somebucket") + + out = machine.succeed("influx user list ${tokenArg}") + assert_contains(out, "admin") + assert_contains(out, "myuser") + assert_lacks(out, "someuser") + + out = machine.succeed("influx auth list ${tokenArg}") + assert_contains(out, "operator token") + assert_lacks(out, "some auth token") + + # Make sure the user token is also usable + machine.succeed("influx auth list --token someusertoken") + + with subtest("keepsUnrelated"): + machine.succeed('${nodes.machine.system.build.toplevel}/bin/switch-to-configuration test') + machine.wait_for_unit("influxdb2.service") + + out = machine.succeed("influx org list ${tokenArg}") + assert_contains(out, "default") + assert_contains(out, "myorg") + assert_contains(out, "someorg") + + out = machine.succeed("influx bucket list ${tokenArg} --org default") + assert_contains(out, "default") + + out = machine.succeed("influx bucket list ${tokenArg} --org myorg") + assert_contains(out, "mybucket") + + out = machine.succeed("influx bucket list ${tokenArg} --org someorg") + assert_contains(out, "somebucket") + + out = machine.succeed("influx user list ${tokenArg}") + assert_contains(out, "admin") + assert_contains(out, "myuser") + assert_contains(out, "someuser") + + out = machine.succeed("influx auth list ${tokenArg}") + assert_contains(out, "operator token") + assert_contains(out, "some auth token") + + with subtest("withParentDelete"): + machine.succeed('${specialisations}/withParentDelete/bin/switch-to-configuration test') + machine.wait_for_unit("influxdb2.service") + + out = machine.succeed("influx org list ${tokenArg}") + assert_contains(out, "default") + assert_contains(out, "myorg") + assert_lacks(out, "someorg") + + out = machine.succeed("influx bucket list ${tokenArg} --org default") + assert_contains(out, "default") + + out = machine.succeed("influx bucket list ${tokenArg} --org myorg") + assert_contains(out, "mybucket") + + machine.fail("influx bucket list ${tokenArg} --org someorg") + + out = machine.succeed("influx user list ${tokenArg}") + assert_contains(out, "admin") + assert_contains(out, "myuser") + assert_contains(out, "someuser") + + out = machine.succeed("influx auth list ${tokenArg}") + assert_contains(out, "operator token") + assert_lacks(out, "some auth token") + + with subtest("withNewTokens"): + machine.succeed('${specialisations}/withNewTokens/bin/switch-to-configuration test') + machine.wait_for_unit("influxdb2.service") + + out = machine.succeed("influx auth list ${tokenArg}") + assert_contains(out, "operator token") + assert_contains(out, "some auth token") + assert_contains(out, "new optoken") + assert_contains(out, "new allaccess") + assert_contains(out, "new specifics") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/installer.nix b/third_party/nixpkgs/nixos/tests/installer.nix index 56ba85b76e..3268a16967 100644 --- a/third_party/nixpkgs/nixos/tests/installer.nix +++ b/third_party/nixpkgs/nixos/tests/installer.nix @@ -931,9 +931,8 @@ in { "udevadm settle", "mkswap /dev/vda2 -L swap", "swapon -L swap", - "keyctl link @u @s", "echo password | mkfs.bcachefs -L root --encrypted /dev/vda3", - "echo password | bcachefs unlock /dev/vda3", + "echo password | bcachefs unlock -k session /dev/vda3", "echo password | mount -t bcachefs /dev/vda3 /mnt", "mkfs.ext3 -L boot /dev/vda1", "mkdir -p /mnt/boot", diff --git a/third_party/nixpkgs/nixos/tests/jool.nix b/third_party/nixpkgs/nixos/tests/jool.nix index 6d5ded9b18..93575f07b1 100644 --- a/third_party/nixpkgs/nixos/tests/jool.nix +++ b/third_party/nixpkgs/nixos/tests/jool.nix @@ -1,9 +1,4 @@ -{ system ? builtins.currentSystem, - config ? {}, - pkgs ? import ../.. { inherit system config; } -}: - -with import ../lib/testing-python.nix { inherit system pkgs; }; +{ pkgs, runTest }: let inherit (pkgs) lib; @@ -23,7 +18,6 @@ let description = "Mock webserver"; wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.Restart = "always"; script = '' while true; do { @@ -40,7 +34,7 @@ let in { - siit = makeTest { + siit = runTest { # This test simulates the setup described in [1] with two IPv6 and # IPv4-only devices on different subnets communicating through a border # relay running Jool in SIIT mode. @@ -49,8 +43,7 @@ in meta.maintainers = with lib.maintainers; [ rnhmjoj ]; # Border relay - nodes.relay = { ... }: { - imports = [ ../modules/profiles/minimal.nix ]; + nodes.relay = { virtualisation.vlans = [ 1 2 ]; # Enable packet routing @@ -65,20 +58,13 @@ in eth2.ipv4.addresses = [ { address = "192.0.2.1"; prefixLength = 24; } ]; }; - networking.jool = { - enable = true; - siit.enable = true; - siit.config.global.pool6 = "fd::/96"; - }; + networking.jool.enable = true; + networking.jool.siit.default.global.pool6 = "fd::/96"; }; # IPv6 only node - nodes.alice = { ... }: { - imports = [ - ../modules/profiles/minimal.nix - ipv6Only - (webserver 6 "Hello, Bob!") - ]; + nodes.alice = { + imports = [ ipv6Only (webserver 6 "Hello, Bob!") ]; virtualisation.vlans = [ 1 ]; networking.interfaces.eth1.ipv6 = { @@ -89,12 +75,8 @@ in }; # IPv4 only node - nodes.bob = { ... }: { - imports = [ - ../modules/profiles/minimal.nix - ipv4Only - (webserver 4 "Hello, Alice!") - ]; + nodes.bob = { + imports = [ ipv4Only (webserver 4 "Hello, Alice!") ]; virtualisation.vlans = [ 2 ]; networking.interfaces.eth1.ipv4 = { @@ -107,17 +89,17 @@ in testScript = '' start_all() - relay.wait_for_unit("jool-siit.service") + relay.wait_for_unit("jool-siit-default.service") alice.wait_for_unit("network-addresses-eth1.service") bob.wait_for_unit("network-addresses-eth1.service") with subtest("Alice and Bob can't ping each other"): - relay.systemctl("stop jool-siit.service") + relay.systemctl("stop jool-siit-default.service") alice.fail("ping -c1 fd::192.0.2.16") bob.fail("ping -c1 198.51.100.8") with subtest("Alice and Bob can ping using the relay"): - relay.systemctl("start jool-siit.service") + relay.systemctl("start jool-siit-default.service") alice.wait_until_succeeds("ping -c1 fd::192.0.2.16") bob.wait_until_succeeds("ping -c1 198.51.100.8") @@ -132,7 +114,7 @@ in ''; }; - nat64 = makeTest { + nat64 = runTest { # This test simulates the setup described in [1] with two IPv6-only nodes # (a client and a homeserver) on the LAN subnet and an IPv4 node on the WAN. # The router runs Jool in stateful NAT64 mode, masquarading the LAN and @@ -142,8 +124,7 @@ in meta.maintainers = with lib.maintainers; [ rnhmjoj ]; # Router - nodes.router = { ... }: { - imports = [ ../modules/profiles/minimal.nix ]; + nodes.router = { virtualisation.vlans = [ 1 2 ]; # Enable packet routing @@ -158,32 +139,29 @@ in eth2.ipv4.addresses = [ { address = "203.0.113.1"; prefixLength = 24; } ]; }; - networking.jool = { - enable = true; - nat64.enable = true; - nat64.config = { - bib = [ - { # forward HTTP 203.0.113.1 (router) → 2001:db8::9 (homeserver) - "protocol" = "TCP"; - "ipv4 address" = "203.0.113.1#80"; - "ipv6 address" = "2001:db8::9#80"; - } - ]; - pool4 = [ - # Ports for dynamic translation - { protocol = "TCP"; prefix = "203.0.113.1/32"; "port range" = "40001-65535"; } - { protocol = "UDP"; prefix = "203.0.113.1/32"; "port range" = "40001-65535"; } - { protocol = "ICMP"; prefix = "203.0.113.1/32"; "port range" = "40001-65535"; } - # Ports for static BIB entries - { protocol = "TCP"; prefix = "203.0.113.1/32"; "port range" = "80"; } - ]; - }; + networking.jool.enable = true; + networking.jool.nat64.default = { + bib = [ + { # forward HTTP 203.0.113.1 (router) → 2001:db8::9 (homeserver) + "protocol" = "TCP"; + "ipv4 address" = "203.0.113.1#80"; + "ipv6 address" = "2001:db8::9#80"; + } + ]; + pool4 = [ + # Ports for dynamic translation + { protocol = "TCP"; prefix = "203.0.113.1/32"; "port range" = "40001-65535"; } + { protocol = "UDP"; prefix = "203.0.113.1/32"; "port range" = "40001-65535"; } + { protocol = "ICMP"; prefix = "203.0.113.1/32"; "port range" = "40001-65535"; } + # Ports for static BIB entries + { protocol = "TCP"; prefix = "203.0.113.1/32"; "port range" = "80"; } + ]; }; }; # LAN client (IPv6 only) - nodes.client = { ... }: { - imports = [ ../modules/profiles/minimal.nix ipv6Only ]; + nodes.client = { + imports = [ ipv6Only ]; virtualisation.vlans = [ 1 ]; networking.interfaces.eth1.ipv6 = { @@ -194,12 +172,8 @@ in }; # LAN server (IPv6 only) - nodes.homeserver = { ... }: { - imports = [ - ../modules/profiles/minimal.nix - ipv6Only - (webserver 6 "Hello from IPv6!") - ]; + nodes.homeserver = { + imports = [ ipv6Only (webserver 6 "Hello from IPv6!") ]; virtualisation.vlans = [ 1 ]; networking.interfaces.eth1.ipv6 = { @@ -210,12 +184,8 @@ in }; # WAN server (IPv4 only) - nodes.server = { ... }: { - imports = [ - ../modules/profiles/minimal.nix - ipv4Only - (webserver 4 "Hello from IPv4!") - ]; + nodes.server = { + imports = [ ipv4Only (webserver 4 "Hello from IPv4!") ]; virtualisation.vlans = [ 2 ]; networking.interfaces.eth1.ipv4.addresses = @@ -229,7 +199,7 @@ in node.wait_for_unit("network-addresses-eth1.service") with subtest("Client can ping the WAN server"): - router.wait_for_unit("jool-nat64.service") + router.wait_for_unit("jool-nat64-default.service") client.succeed("ping -c1 64:ff9b::203.0.113.16") with subtest("Client can connect to the WAN webserver"): diff --git a/third_party/nixpkgs/nixos/tests/kea.nix b/third_party/nixpkgs/nixos/tests/kea.nix index b4095893b4..c8ecf771fa 100644 --- a/third_party/nixpkgs/nixos/tests/kea.nix +++ b/third_party/nixpkgs/nixos/tests/kea.nix @@ -134,31 +134,32 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: { extraArgs = [ "-v" ]; - extraConfig = '' - server: - listen: 0.0.0.0@53 + settings = { + server.listen = [ + "0.0.0.0@53" + ]; - log: - - target: syslog - any: debug + log.syslog.any = "info"; - acl: - - id: dhcp_ddns - address: 10.0.0.1 - action: update + acl.dhcp_ddns = { + address = "10.0.0.1"; + action = "update"; + }; - template: - - id: default - storage: ${zonesDir} - zonefile-sync: -1 - zonefile-load: difference-no-serial - journal-content: all + template.default = { + storage = zonesDir; + zonefile-sync = "-1"; + zonefile-load = "difference-no-serial"; + journal-content = "all"; + }; - zone: - - domain: lan.nixos.test - file: lan.nixos.test.zone - acl: [dhcp_ddns] - ''; + zone."lan.nixos.test" = { + file = "lan.nixos.test.zone"; + acl = [ + "dhcp_ddns" + ]; + }; + }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/kernel-generic.nix b/third_party/nixpkgs/nixos/tests/kernel-generic.nix index e69dd55028..6d883df14c 100644 --- a/third_party/nixpkgs/nixos/tests/kernel-generic.nix +++ b/third_party/nixpkgs/nixos/tests/kernel-generic.nix @@ -31,7 +31,7 @@ let linux_5_10_hardened linux_5_15_hardened linux_6_1_hardened - linux_6_4_hardened + linux_6_5_hardened linux_rt_5_4 linux_rt_5_10 linux_rt_5_15 diff --git a/third_party/nixpkgs/nixos/tests/keyd.nix b/third_party/nixpkgs/nixos/tests/keyd.nix index 1ee08b4101..bfc4558b64 100644 --- a/third_party/nixpkgs/nixos/tests/keyd.nix +++ b/third_party/nixpkgs/nixos/tests/keyd.nix @@ -26,13 +26,13 @@ let ''; - mkKeyboardTest = name: { settings, test }: with pkgs.lib; makeTest { + mkKeyboardTest = name: { default, test }: with pkgs.lib; makeTest { inherit name; nodes.machine = { services.keyd = { enable = true; - keyboards.default = { inherit settings; }; + keyboards = { inherit default; }; }; }; @@ -70,13 +70,20 @@ let in pkgs.lib.mapAttrs mkKeyboardTest { swap-ab_and_ctrl-as-shift = { - test.press = [ "a" "ctrl-b" "c" ]; - test.expect = [ "b" "A" "c" ]; + test.press = [ "a" "ctrl-b" "c" "alt_r-h" ]; + test.expect = [ "b" "A" "c" "q" ]; - settings.main = { - "a" = "b"; - "b" = "a"; - "control" = "oneshot(shift)"; + default = { + settings.main = { + "a" = "b"; + "b" = "a"; + "control" = "oneshot(shift)"; + "rightalt" = "layer(rightalt)"; + }; + extraConfig = '' + [rightalt:G] + h = q + ''; }; }; } diff --git a/third_party/nixpkgs/nixos/tests/knot.nix b/third_party/nixpkgs/nixos/tests/knot.nix index 2ecbf69194..44efd93b6f 100644 --- a/third_party/nixpkgs/nixos/tests/knot.nix +++ b/third_party/nixpkgs/nixos/tests/knot.nix @@ -60,44 +60,43 @@ in { services.knot.enable = true; services.knot.extraArgs = [ "-v" ]; services.knot.keyFiles = [ tsigFile ]; - services.knot.extraConfig = '' - server: - listen: 0.0.0.0@53 - listen: ::@53 - automatic-acl: true + services.knot.settings = { + server = { + listen = [ + "0.0.0.0@53" + "::@53" + ]; + automatic-acl = true; + }; - remote: - - id: secondary - address: 192.168.0.2@53 - key: xfr_key + acl.secondary_acl = { + address = "192.168.0.2"; + key = "xfr_key"; + action = "transfer"; + }; - template: - - id: default - storage: ${knotZonesEnv} - notify: [secondary] - dnssec-signing: on - # Input-only zone files - # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-3 - # prevents modification of the zonefiles, since the zonefiles are immutable - zonefile-sync: -1 - zonefile-load: difference - journal-content: changes - # move databases below the state directory, because they need to be writable - journal-db: /var/lib/knot/journal - kasp-db: /var/lib/knot/kasp - timer-db: /var/lib/knot/timer + remote.secondary.address = "192.168.0.2@53"; - zone: - - domain: example.com - file: example.com.zone + template.default = { + storage = knotZonesEnv; + notify = [ "secondary" ]; + acl = [ "secondary_acl" ]; + dnssec-signing = true; + # Input-only zone files + # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-3 + # prevents modification of the zonefiles, since the zonefiles are immutable + zonefile-sync = -1; + zonefile-load = "difference"; + journal-content = "changes"; + }; - - domain: sub.example.com - file: sub.example.com.zone + zone = { + "example.com".file = "example.com.zone"; + "sub.example.com".file = "sub.example.com.zone"; + }; - log: - - target: syslog - any: info - ''; + log.syslog.any = "info"; + }; }; secondary = { lib, ... }: { @@ -113,41 +112,36 @@ in { services.knot.enable = true; services.knot.keyFiles = [ tsigFile ]; services.knot.extraArgs = [ "-v" ]; - services.knot.extraConfig = '' - server: - listen: 0.0.0.0@53 - listen: ::@53 - automatic-acl: true + services.knot.settings = { + server = { + listen = [ + "0.0.0.0@53" + "::@53" + ]; + automatic-acl = true; + }; - remote: - - id: primary - address: 192.168.0.1@53 - key: xfr_key + remote.primary = { + address = "192.168.0.1@53"; + key = "xfr_key"; + }; - template: - - id: default - master: primary - # zonefileless setup - # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-2 - zonefile-sync: -1 - zonefile-load: none - journal-content: all - # move databases below the state directory, because they need to be writable - journal-db: /var/lib/knot/journal - kasp-db: /var/lib/knot/kasp - timer-db: /var/lib/knot/timer + template.default = { + master = "primary"; + # zonefileless setup + # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-2 + zonefile-sync = "-1"; + zonefile-load = "none"; + journal-content = "all"; + }; - zone: - - domain: example.com - file: example.com.zone + zone = { + "example.com".file = "example.com.zone"; + "sub.example.com".file = "sub.example.com.zone"; + }; - - domain: sub.example.com - file: sub.example.com.zone - - log: - - target: syslog - any: info - ''; + log.syslog.any = "info"; + }; }; client = { lib, nodes, ... }: { imports = [ common ]; diff --git a/third_party/nixpkgs/nixos/tests/legit.nix b/third_party/nixpkgs/nixos/tests/legit.nix index 3eb3f50356..a71fb1743c 100644 --- a/third_party/nixpkgs/nixos/tests/legit.nix +++ b/third_party/nixpkgs/nixos/tests/legit.nix @@ -8,7 +8,7 @@ in meta.maintainers = [ lib.maintainers.ratsclub ]; nodes = { - server = { config, pkgs }: { + server = { config, pkgs, ... }: { services.legit = { enable = true; settings = { diff --git a/third_party/nixpkgs/nixos/tests/listmonk.nix b/third_party/nixpkgs/nixos/tests/listmonk.nix index 91003653c0..938c36026a 100644 --- a/third_party/nixpkgs/nixos/tests/listmonk.nix +++ b/third_party/nixpkgs/nixos/tests/listmonk.nix @@ -42,20 +42,27 @@ import ./make-test-python.nix ({ lib, ... }: { machine.wait_for_open_port(9000) machine.succeed("[[ -f /var/lib/listmonk/.db_settings_initialized ]]") + assert json.loads(machine.succeed(generate_listmonk_request("GET", 'health')))['data'], 'Health endpoint returned unexpected value' + + # A sample subscriber is guaranteed to exist at install-time + # A sample transactional template is guaranteed to exist at install-time + subscribers = json.loads(machine.succeed(generate_listmonk_request('GET', "subscribers")))['data']['results'] + templates = json.loads(machine.succeed(generate_listmonk_request('GET', "templates")))['data'] + tx_template = templates[2] + # Test transactional endpoint - # subscriber_id=1 is guaranteed to exist at install-time - # template_id=2 is guaranteed to exist at install-time and is a transactional template (1 is a campaign template). - machine.succeed( - generate_listmonk_request('POST', 'tx', data={'subscriber_id': 1, 'template_id': 2}) - ) - assert 'Welcome John Doe' in machine.succeed( + print(machine.succeed( + generate_listmonk_request('POST', 'tx', data={'subscriber_id': subscribers[0]['id'], 'template_id': tx_template['id']}) + )) + + assert 'Welcome Anon Doe' in machine.succeed( "curl --fail http://localhost:8025/api/v2/messages" - ) + ), "Failed to find Welcome John Doe inside the messages API endpoint" # Test campaign endpoint # Based on https://github.com/knadh/listmonk/blob/174a48f252a146d7e69dab42724e3329dbe25ebe/cmd/campaigns.go#L549 as docs do not exist. campaign_data = json.loads(machine.succeed( - generate_listmonk_request('POST', 'campaigns/1/test', data={'template_id': 1, 'subscribers': ['john@example.com'], 'name': 'Test', 'subject': 'NixOS is great', 'lists': [1], 'messenger': 'email'}) + generate_listmonk_request('POST', 'campaigns/1/test', data={'template_id': templates[0]['id'], 'subscribers': ['john@example.com'], 'name': 'Test', 'subject': 'NixOS is great', 'lists': [1], 'messenger': 'email'}) )) assert campaign_data['data'] # This is a boolean asserting if the test was successful or not: https://github.com/knadh/listmonk/blob/174a48f252a146d7e69dab42724e3329dbe25ebe/cmd/campaigns.go#L626 diff --git a/third_party/nixpkgs/nixos/tests/litestream.nix b/third_party/nixpkgs/nixos/tests/litestream.nix index f9d71c526e..a281d85386 100644 --- a/third_party/nixpkgs/nixos/tests/litestream.nix +++ b/third_party/nixpkgs/nixos/tests/litestream.nix @@ -44,14 +44,22 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; services.grafana = { enable = true; - security = { - adminUser = "admin"; - adminPassword = "admin"; - }; - addr = "localhost"; - port = 3000; - extraOptions = { - DATABASE_URL = "sqlite3:///var/lib/grafana/data/grafana.db?cache=private&mode=rwc&_journal_mode=WAL"; + settings = { + security = { + admin_user = "admin"; + admin_password = "admin"; + }; + + server = { + http_addr = "localhost"; + http_port = 3000; + }; + + database = { + type = "sqlite3"; + path = "/var/lib/grafana/data/grafana.db"; + wal = true; + }; }; }; users.users.foo = { diff --git a/third_party/nixpkgs/nixos/tests/lxd-image-server.nix b/third_party/nixpkgs/nixos/tests/lxd-image-server.nix index e5a292b61b..619542bdd9 100644 --- a/third_party/nixpkgs/nixos/tests/lxd-image-server.nix +++ b/third_party/nixpkgs/nixos/tests/lxd-image-server.nix @@ -8,8 +8,8 @@ let }; }; - lxd-image-metadata = lxd-image.lxdMeta.${pkgs.stdenv.hostPlatform.system}; - lxd-image-rootfs = lxd-image.lxdImage.${pkgs.stdenv.hostPlatform.system}; + lxd-image-metadata = lxd-image.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system}; + lxd-image-rootfs = lxd-image.lxdContainerImage.${pkgs.stdenv.hostPlatform.system}; in { name = "lxd-image-server"; @@ -61,14 +61,14 @@ in { machine.wait_for_unit("lxd.service") machine.wait_for_file("/var/lib/lxd/unix.socket") - # It takes additional second for lxd to settle - machine.sleep(1) + # Wait for lxd to settle + machine.succeed("lxd waitready") # lxd expects the pool's directory to already exist machine.succeed("mkdir /var/lxd-pool") machine.succeed( - "cat ${./common/lxd/config.yaml} | lxd init --preseed" + "lxd init --minimal" ) machine.succeed( diff --git a/third_party/nixpkgs/nixos/tests/lxd.nix b/third_party/nixpkgs/nixos/tests/lxd/container.nix similarity index 64% rename from third_party/nixpkgs/nixos/tests/lxd.nix rename to third_party/nixpkgs/nixos/tests/lxd/container.nix index 2c2c19e0ee..bdaaebfc00 100644 --- a/third_party/nixpkgs/nixos/tests/lxd.nix +++ b/third_party/nixpkgs/nixos/tests/lxd/container.nix @@ -1,7 +1,7 @@ -import ./make-test-python.nix ({ pkgs, lib, ... } : +import ../make-test-python.nix ({ pkgs, lib, ... } : let - lxd-image = import ../release.nix { + releases = import ../../release.nix { configuration = { # Building documentation makes the test unnecessarily take a longer time: documentation.enable = lib.mkForce false; @@ -11,14 +11,14 @@ let }; }; - lxd-image-metadata = lxd-image.lxdMeta.${pkgs.stdenv.hostPlatform.system}; - lxd-image-rootfs = lxd-image.lxdImage.${pkgs.stdenv.hostPlatform.system}; + lxd-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system}; + lxd-image-rootfs = releases.lxdContainerImage.${pkgs.stdenv.hostPlatform.system}; in { - name = "lxd"; + name = "lxd-container"; meta = with pkgs.lib.maintainers; { - maintainers = [ patryk27 ]; + maintainers = [ patryk27 adamcstephens ]; }; nodes.machine = { lib, ... }: { @@ -38,19 +38,21 @@ in { }; testScript = '' + def instance_is_up(_) -> bool: + status, _ = machine.execute("lxc exec container --disable-stdin --force-interactive /run/current-system/sw/bin/true") + return status == 0 + machine.wait_for_unit("sockets.target") machine.wait_for_unit("lxd.service") machine.wait_for_file("/var/lib/lxd/unix.socket") - # It takes additional second for lxd to settle - machine.sleep(1) + # Wait for lxd to settle + machine.succeed("lxd waitready") - # lxd expects the pool's directory to already exist - machine.succeed("mkdir /var/lxd-pool") + # no preseed should mean no service + machine.fail("systemctl status lxd-preseed.service") - machine.succeed( - "cat ${./common/lxd/config.yaml} | lxd init --preseed" - ) + machine.succeed("lxd init --minimal") machine.succeed( "lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-rootfs}/*/*.tar.xz --alias nixos" @@ -58,21 +60,23 @@ in { with subtest("Container can be managed"): machine.succeed("lxc launch nixos container") - machine.sleep(5) + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) machine.succeed("echo true | lxc exec container /run/current-system/sw/bin/bash -") - machine.succeed("lxc exec container true") machine.succeed("lxc delete -f container") with subtest("Container is mounted with lxcfs inside"): machine.succeed("lxc launch nixos container") - machine.sleep(5) + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) ## ---------- ## ## limits.cpu ## machine.succeed("lxc config set container limits.cpu 1") machine.succeed("lxc restart container") - machine.sleep(5) + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) assert ( "1" @@ -81,7 +85,8 @@ in { machine.succeed("lxc config set container limits.cpu 2") machine.succeed("lxc restart container") - machine.sleep(5) + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) assert ( "2" @@ -93,7 +98,8 @@ in { machine.succeed("lxc config set container limits.memory 64MB") machine.succeed("lxc restart container") - machine.sleep(5) + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) assert ( "MemTotal: 62500 kB" @@ -102,7 +108,8 @@ in { machine.succeed("lxc config set container limits.memory 128MB") machine.succeed("lxc restart container") - machine.sleep(5) + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) assert ( "MemTotal: 125000 kB" diff --git a/third_party/nixpkgs/nixos/tests/lxd/default.nix b/third_party/nixpkgs/nixos/tests/lxd/default.nix new file mode 100644 index 0000000000..20afdd5e48 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/lxd/default.nix @@ -0,0 +1,12 @@ +{ + system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../../.. {inherit system config;}, + handleTestOn, +}: { + container = import ./container.nix {inherit system pkgs;}; + nftables = import ./nftables.nix {inherit system pkgs;}; + preseed = import ./preseed.nix {inherit system pkgs;}; + ui = import ./ui.nix {inherit system pkgs;}; + virtual-machine = handleTestOn ["x86_64-linux"] ./virtual-machine.nix { inherit system pkgs; }; +} diff --git a/third_party/nixpkgs/nixos/tests/lxd-nftables.nix b/third_party/nixpkgs/nixos/tests/lxd/nftables.nix similarity index 89% rename from third_party/nixpkgs/nixos/tests/lxd-nftables.nix rename to third_party/nixpkgs/nixos/tests/lxd/nftables.nix index 2930650015..d98bd49529 100644 --- a/third_party/nixpkgs/nixos/tests/lxd-nftables.nix +++ b/third_party/nixpkgs/nixos/tests/lxd/nftables.nix @@ -5,7 +5,7 @@ # iptables to nftables requires a full reboot, which is a bit hard inside NixOS # tests. -import ./make-test-python.nix ({ pkgs, ...} : { +import ../make-test-python.nix ({ pkgs, ...} : { name = "lxd-nftables"; meta = with pkgs.lib.maintainers; { @@ -20,8 +20,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { networking = { firewall.enable = false; nftables.enable = true; - nftables.ruleset = '' - table inet filter { + nftables.tables."filter".family = "inet"; + nftables.tables."filter".content = '' chain incoming { type filter hook input priority 0; policy accept; @@ -36,7 +36,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { type filter hook output priority 0; policy accept; } - } ''; }; }; diff --git a/third_party/nixpkgs/nixos/tests/lxd/preseed.nix b/third_party/nixpkgs/nixos/tests/lxd/preseed.nix new file mode 100644 index 0000000000..7d89b9f56d --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/lxd/preseed.nix @@ -0,0 +1,71 @@ +import ../make-test-python.nix ({ pkgs, lib, ... } : + +{ + name = "lxd-preseed"; + + meta = { + maintainers = with lib.maintainers; [ adamcstephens ]; + }; + + nodes.machine = { lib, ... }: { + virtualisation = { + diskSize = 4096; + + lxc.lxcfs.enable = true; + lxd.enable = true; + + lxd.preseed = { + networks = [ + { + name = "nixostestbr0"; + type = "bridge"; + config = { + "ipv4.address" = "10.0.100.1/24"; + "ipv4.nat" = "true"; + }; + } + ]; + profiles = [ + { + name = "nixostest_default"; + devices = { + eth0 = { + name = "eth0"; + network = "nixostestbr0"; + type = "nic"; + }; + root = { + path = "/"; + pool = "default"; + size = "35GiB"; + type = "disk"; + }; + }; + } + ]; + storage_pools = [ + { + name = "nixostest_pool"; + driver = "dir"; + } + ]; + }; + }; + }; + + testScript = '' + def wait_for_preseed(_) -> bool: + _, output = machine.systemctl("is-active lxd-preseed.service") + return ("inactive" in output) + + machine.wait_for_unit("sockets.target") + machine.wait_for_unit("lxd.service") + with machine.nested("Waiting for preseed to complete"): + retry(wait_for_preseed) + + with subtest("Verify preseed resources created"): + machine.succeed("lxc profile show nixostest_default") + machine.succeed("lxc network info nixostestbr0") + machine.succeed("lxc storage show nixostest_pool") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/lxd-ui.nix b/third_party/nixpkgs/nixos/tests/lxd/ui.nix similarity index 94% rename from third_party/nixpkgs/nixos/tests/lxd-ui.nix rename to third_party/nixpkgs/nixos/tests/lxd/ui.nix index 19eaa226c0..86cb30d8c2 100644 --- a/third_party/nixpkgs/nixos/tests/lxd-ui.nix +++ b/third_party/nixpkgs/nixos/tests/lxd/ui.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: { +import ../make-test-python.nix ({ pkgs, lib, ... }: { name = "lxd-ui"; meta = with pkgs.lib.maintainers; { diff --git a/third_party/nixpkgs/nixos/tests/lxd/virtual-machine.nix b/third_party/nixpkgs/nixos/tests/lxd/virtual-machine.nix new file mode 100644 index 0000000000..93705e9350 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/lxd/virtual-machine.nix @@ -0,0 +1,64 @@ +import ../make-test-python.nix ({ pkgs, lib, ... }: + +let + releases = import ../../release.nix { + configuration = { + # Building documentation makes the test unnecessarily take a longer time: + documentation.enable = lib.mkForce false; + + # Our tests require `grep` & friends: + environment.systemPackages = with pkgs; [busybox]; + }; + }; + + lxd-image-metadata = releases.lxdVirtualMachineImageMeta.${pkgs.stdenv.hostPlatform.system}; + lxd-image-disk = releases.lxdVirtualMachineImage.${pkgs.stdenv.hostPlatform.system}; + + instance-name = "instance1"; +in { + name = "lxd-virtual-machine"; + + meta = with pkgs.lib.maintainers; { + maintainers = [adamcstephens]; + }; + + nodes.machine = {lib, ...}: { + virtualisation = { + diskSize = 4096; + + cores = 2; + + # Ensure we have enough memory for the nested virtual machine + memorySize = 1024; + + lxc.lxcfs.enable = true; + lxd.enable = true; + }; + }; + + testScript = '' + def instance_is_up(_) -> bool: + status, _ = machine.execute("lxc exec ${instance-name} --disable-stdin --force-interactive /run/current-system/sw/bin/true") + return status == 0 + + machine.wait_for_unit("sockets.target") + machine.wait_for_unit("lxd.service") + machine.wait_for_file("/var/lib/lxd/unix.socket") + + # Wait for lxd to settle + machine.succeed("lxd waitready") + + machine.succeed("lxd init --minimal") + + with subtest("virtual-machine image can be imported"): + machine.succeed("lxc image import ${lxd-image-metadata}/*/*.tar.xz ${lxd-image-disk}/nixos.qcow2 --alias nixos") + + with subtest("virtual-machine can be launched and become available"): + machine.succeed("lxc launch nixos ${instance-name} --vm --config limits.memory=512MB --config security.secureboot=false") + with machine.nested("Waiting for instance to start and be usable"): + retry(instance_is_up) + + with subtest("lxd-agent is started"): + machine.succeed("lxc exec ${instance-name} systemctl is-active lxd-agent") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/matrix/synapse-workers.nix b/third_party/nixpkgs/nixos/tests/matrix/synapse-workers.nix new file mode 100644 index 0000000000..e90301aeae --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/matrix/synapse-workers.nix @@ -0,0 +1,50 @@ +import ../make-test-python.nix ({ pkgs, ... }: { + name = "matrix-synapse-workers"; + meta = with pkgs.lib; { + maintainers = teams.matrix.members; + }; + + nodes = { + homeserver = + { pkgs + , nodes + , ... + }: { + services.postgresql = { + enable = true; + initialScript = pkgs.writeText "synapse-init.sql" '' + CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse'; + CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" + TEMPLATE template0 + LC_COLLATE = "C" + LC_CTYPE = "C"; + ''; + }; + + services.matrix-synapse = { + enable = true; + settings = { + database = { + name = "psycopg2"; + args.password = "synapse"; + }; + enable_registration = true; + enable_registration_without_verification = true; + + federation_sender_instances = [ "federation_sender" ]; + }; + configureRedisLocally = true; + workers = { + "federation_sender" = { }; + }; + }; + }; + }; + + testScript = '' + start_all() + + homeserver.wait_for_unit("matrix-synapse.service"); + homeserver.wait_for_unit("matrix-synapse-worker-federation_sender.service"); + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/mediawiki.nix b/third_party/nixpkgs/nixos/tests/mediawiki.nix index 52122755ad..e30cc55ff6 100644 --- a/third_party/nixpkgs/nixos/tests/mediawiki.nix +++ b/third_party/nixpkgs/nixos/tests/mediawiki.nix @@ -74,4 +74,20 @@ in assert "MediaWiki has been installed" in page, f"no 'MediaWiki has been installed' in:\n{page}" ''; }; + + nginx = testLib.makeTest { + name = "mediawiki-nginx"; + nodes.machine = { + services.mediawiki.webserver = "nginx"; + }; + testScript = '' + start_all() + + machine.wait_for_unit("phpfpm-mediawiki.service") + machine.wait_for_unit("nginx.service") + + page = machine.succeed("curl -fL http://localhost/") + assert "MediaWiki has been installed" in page + ''; + }; } diff --git a/third_party/nixpkgs/nixos/tests/mobilizon.nix b/third_party/nixpkgs/nixos/tests/mobilizon.nix new file mode 100644 index 0000000000..2b070ca9d9 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/mobilizon.nix @@ -0,0 +1,44 @@ +import ./make-test-python.nix ({ lib, ... }: + let + certs = import ./common/acme/server/snakeoil-certs.nix; + mobilizonDomain = certs.domain; + port = 41395; + in + + { + name = "mobilizon"; + meta.maintainers = with lib.maintainers; [ minijackson erictapen ]; + + nodes.server = + { ... }: + { + services.mobilizon = { + enable = true; + settings = { + ":mobilizon" = { + ":instance" = { + name = "Test Mobilizon"; + hostname = mobilizonDomain; + }; + "Mobilizon.Web.Endpoint".http.port = port; + }; + }; + }; + + security.pki.certificateFiles = [ certs.ca.cert ]; + + services.nginx.virtualHosts."${mobilizonDomain}" = { + enableACME = lib.mkForce false; + sslCertificate = certs.${mobilizonDomain}.cert; + sslCertificateKey = certs.${mobilizonDomain}.key; + }; + + networking.hosts."::1" = [ mobilizonDomain ]; + }; + + testScript = '' + server.wait_for_unit("mobilizon.service") + server.wait_for_open_port(${toString port}) + server.succeed("curl --fail https://${mobilizonDomain}/") + ''; + }) diff --git a/third_party/nixpkgs/nixos/tests/mongodb.nix b/third_party/nixpkgs/nixos/tests/mongodb.nix index 75b0c4c2ab..1afc891817 100644 --- a/third_party/nixpkgs/nixos/tests/mongodb.nix +++ b/third_party/nixpkgs/nixos/tests/mongodb.nix @@ -27,7 +27,7 @@ import ./make-test-python.nix ({ pkgs, ... }: in { name = "mongodb"; meta = with pkgs.lib.maintainers; { - maintainers = [ bluescreen303 offline cstrahan rvl phile314 ]; + maintainers = [ bluescreen303 offline rvl phile314 ]; }; nodes = { diff --git a/third_party/nixpkgs/nixos/tests/nginx-tmpdir.nix b/third_party/nixpkgs/nixos/tests/nginx-tmpdir.nix new file mode 100644 index 0000000000..f26f992ffe --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/nginx-tmpdir.nix @@ -0,0 +1,60 @@ +let + dst-dir = "/run/nginx-test-tmpdir-uploads"; +in + import ./make-test-python.nix { + name = "nginx-tmpdir"; + + nodes.machine = { pkgs, ... }: { + environment.etc."tmpfiles.d/nginx-uploads.conf".text = "d ${dst-dir} 0755 nginx nginx 1d"; + + # overwrite the tmp.conf with a short age, there will be a duplicate line info from systemd-tmpfiles in the log + systemd.tmpfiles.rules = [ + "q /tmp 1777 root root 1min" + ]; + + services.nginx.enable = true; + # simple upload service using the nginx client body temp path + services.nginx.virtualHosts = { + localhost = { + locations."~ ^/upload/([0-9a-zA-Z-.]*)$" = { + extraConfig = '' + alias ${dst-dir}/$1; + client_body_in_file_only clean; + dav_methods PUT; + create_full_put_path on; + dav_access group:rw all:r; + ''; + }; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("nginx") + machine.wait_for_open_port(80) + + with subtest("Needed prerequisite --http-client-body-temp-path=/tmp/nginx_client_body and private temp"): + machine.succeed("touch /tmp/systemd-private-*-nginx.service-*/tmp/nginx_client_body") + + with subtest("Working upload of test setup"): + machine.succeed("curl -X PUT http://localhost/upload/test1 --fail --data-raw 'Raw data 1'") + machine.succeed('test "$(cat ${dst-dir}/test1)" = "Raw data 1"') + + # let the tmpfiles clean service do its job + machine.succeed("touch /tmp/touched") + machine.wait_until_succeeds( + "sleep 15 && systemctl start systemd-tmpfiles-clean.service && [ ! -f /tmp/touched ]", + timeout=150 + ) + + with subtest("Working upload after cleaning"): + machine.succeed("curl -X PUT http://localhost/upload/test2 --fail --data-raw 'Raw data 2'") + machine.succeed('test "$(cat ${dst-dir}/test2)" = "Raw data 2"') + + # manually remove the nginx temp dir + machine.succeed("rm -r --interactive=never /tmp/systemd-private-*-nginx.service-*/tmp/nginx_client_body") + + with subtest("Broken upload after manual temp dir removal"): + machine.fail("curl -X PUT http://localhost/upload/test3 --fail --data-raw 'Raw data 3'") + ''; + } diff --git a/third_party/nixpkgs/nixos/tests/noto-fonts.nix b/third_party/nixpkgs/nixos/tests/noto-fonts.nix index edbb0db4cb..b871f5f517 100644 --- a/third_party/nixpkgs/nixos/tests/noto-fonts.nix +++ b/third_party/nixpkgs/nixos/tests/noto-fonts.nix @@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { noto-fonts noto-fonts-cjk-sans noto-fonts-cjk-serif - noto-fonts-emoji + noto-fonts-color-emoji ]; fontconfig.defaultFonts = { serif = [ "Noto Serif" "Noto Serif CJK SC" ]; diff --git a/third_party/nixpkgs/nixos/tests/odoo.nix b/third_party/nixpkgs/nixos/tests/odoo.nix index 7c2cf31370..00ae4a2137 100644 --- a/third_party/nixpkgs/nixos/tests/odoo.nix +++ b/third_party/nixpkgs/nixos/tests/odoo.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, lib, ...} : { +import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.odoo, ...} : { name = "odoo"; meta.maintainers = with lib.maintainers; [ mkg20001 ]; @@ -11,6 +11,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.odoo = { enable = true; + package = package; domain = "localhost"; }; }; diff --git a/third_party/nixpkgs/nixos/tests/openssh.nix b/third_party/nixpkgs/nixos/tests/openssh.nix index 4083f5906d..e88625678f 100644 --- a/third_party/nixpkgs/nixos/tests/openssh.nix +++ b/third_party/nixpkgs/nixos/tests/openssh.nix @@ -52,6 +52,36 @@ in { }; }; + server_match_rule = + { ... }: + + { + services.openssh = { + enable = true; listenAddresses = [ { addr = "127.0.0.1"; port = 22; } { addr = "[::]"; port = 22; } ]; + extraConfig = '' + # Combined test for two (predictable) Match criterias + Match LocalAddress 127.0.0.1 LocalPort 22 + PermitRootLogin yes + + # Separate tests for Match criterias + Match User root + PermitRootLogin yes + Match Group root + PermitRootLogin yes + Match Host nohost.example + PermitRootLogin yes + Match LocalAddress 127.0.0.1 + PermitRootLogin yes + Match LocalPort 22 + PermitRootLogin yes + Match RDomain nohost.example + PermitRootLogin yes + Match Address 127.0.0.1 + PermitRootLogin yes + ''; + }; + }; + client = { ... }: { }; @@ -114,5 +144,8 @@ in { with subtest("localhost-only"): server_localhost_only.succeed("ss -nlt | grep '127.0.0.1:22'") server_localhost_only_lazy.succeed("ss -nlt | grep '127.0.0.1:22'") + + with subtest("match-rules"): + server_match_rule.succeed("ss -nlt | grep '127.0.0.1:22'") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/os-prober.nix b/third_party/nixpkgs/nixos/tests/os-prober.nix index 22e720824c..dae1306bd6 100644 --- a/third_party/nixpkgs/nixos/tests/os-prober.nix +++ b/third_party/nixpkgs/nixos/tests/os-prober.nix @@ -76,6 +76,7 @@ in { # nixos-rebuild needs must be included in the VM. system.extraDependencies = with pkgs; [ + bintools brotli brotli.dev brotli.lib diff --git a/third_party/nixpkgs/nixos/tests/osquery.nix b/third_party/nixpkgs/nixos/tests/osquery.nix index 9aa9820e50..e98e7c1baf 100644 --- a/third_party/nixpkgs/nixos/tests/osquery.nix +++ b/third_party/nixpkgs/nixos/tests/osquery.nix @@ -36,7 +36,7 @@ in machine.succeed("echo 'SELECT address FROM etc_hosts LIMIT 1;' | osqueryi | tee /dev/console | grep -q '127.0.0.1'") # osquery binaries respect configuration from the Nix config option. - machine.succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"utc\";' | osqueryi | tee /dev/console | grep -q ${boolToString utc}") + machine.succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"utc\";' | osqueryi | tee /dev/console | grep -q ${lib.boolToString utc}") # osquery binaries respect configuration from the Nix flags option. machine.succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"config_refresh\";' | osqueryi | tee /dev/console | grep -q ${config_refresh}") diff --git a/third_party/nixpkgs/nixos/tests/pantheon.nix b/third_party/nixpkgs/nixos/tests/pantheon.nix index dee6964644..be1351283d 100644 --- a/third_party/nixpkgs/nixos/tests/pantheon.nix +++ b/third_party/nixpkgs/nixos/tests/pantheon.nix @@ -50,6 +50,20 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : machine.wait_for_window("io.elementary.wingpanel") machine.wait_until_succeeds("pgrep plank") machine.wait_for_window("plank") + machine.wait_until_succeeds("pgrep -f gsd-media-keys") + machine.wait_for_unit("bamfdaemon.service", "${user.name}") + machine.wait_for_unit("io.elementary.files.xdg-desktop-portal.service", "${user.name}") + + with subtest("Open elementary videos"): + machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.videos >&2 &'") + machine.sleep(2) + machine.wait_for_window("io.elementary.videos") + machine.wait_for_text("No Videos Open") + + with subtest("Open elementary calendar"): + machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.calendar >&2 &'") + machine.sleep(2) + machine.wait_for_window("io.elementary.calendar") with subtest("Open system settings"): machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.switchboard >&2 &'") @@ -63,7 +77,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with subtest("Check if gala has ever coredumped"): machine.fail("coredumpctl --json=short | grep gala") - machine.sleep(20) + # So you can see the dock in the below screenshot. + machine.succeed("su - ${user.name} -c 'DISPLAY=:0 xdotool mousemove 450 1000 >&2 &'") + machine.sleep(10) machine.screenshot("screen") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/plausible.nix b/third_party/nixpkgs/nixos/tests/plausible.nix index ab91e08beb..ef32bb3a80 100644 --- a/third_party/nixpkgs/nixos/tests/plausible.nix +++ b/third_party/nixpkgs/nixos/tests/plausible.nix @@ -30,6 +30,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { machine.succeed("curl -f localhost:8000 >&2") + machine.succeed("curl -f localhost:8000/js/script.js >&2") + csrf_token = machine.succeed( "curl -c /tmp/cookies localhost:8000/login | grep '_csrf_token' | sed -E 's,.*value=\"(.*)\".*,\\1,g'" ) diff --git a/third_party/nixpkgs/nixos/tests/postgis.nix b/third_party/nixpkgs/nixos/tests/postgis.nix index 9d81ebaad8..d0685abc51 100644 --- a/third_party/nixpkgs/nixos/tests/postgis.nix +++ b/third_party/nixpkgs/nixos/tests/postgis.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { { pkgs, ... }: { - services.postgresql = let mypg = pkgs.postgresql_11; in { + services.postgresql = let mypg = pkgs.postgresql; in { enable = true; package = mypg; extraPlugins = with mypg.pkgs; [ diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix index d86f8ac634..8369d6a497 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -716,6 +716,41 @@ let ''; }; + mysqld = { + exporterConfig = { + enable = true; + runAsLocalSuperUser = true; + configFile = pkgs.writeText "test-prometheus-exporter-mysqld-config.my-cnf" '' + [client] + user = exporter + password = snakeoilpassword + ''; + }; + metricProvider = { + services.mysql = { + enable = true; + package = pkgs.mariadb; + initialScript = pkgs.writeText "mysql-init-script.sql" '' + CREATE USER 'exporter'@'localhost' + IDENTIFIED BY 'snakeoilpassword' + WITH MAX_USER_CONNECTIONS 3; + GRANT PROCESS, REPLICATION CLIENT, SLAVE MONITOR, SELECT ON *.* TO 'exporter'@'localhost'; + ''; + }; + }; + exporterTest = '' + wait_for_unit("prometheus-mysqld-exporter.service") + wait_for_open_port(9104) + wait_for_unit("mysql.service") + succeed("curl -sSf http://localhost:9104/metrics | grep 'mysql_up 1'") + systemctl("stop mysql.service") + succeed("curl -sSf http://localhost:9104/metrics | grep 'mysql_up 0'") + systemctl("start mysql.service") + wait_for_unit("mysql.service") + succeed("curl -sSf http://localhost:9104/metrics | grep 'mysql_up 1'") + ''; + }; + nextcloud = { exporterConfig = { enable = true; @@ -931,6 +966,36 @@ let ''; }; + pgbouncer = { + exporterConfig = { + enable = true; + connectionString = "postgres://admin:@localhost:6432/pgbouncer?sslmode=disable"; + }; + + metricProvider = { + services.postgresql.enable = true; + services.pgbouncer = { + # https://github.com/prometheus-community/pgbouncer_exporter#pgbouncer-configuration + ignoreStartupParameters = "extra_float_digits"; + enable = true; + listenAddress = "*"; + databases = { postgres = "host=/run/postgresql/ port=5432 auth_user=postgres dbname=postgres"; }; + authType = "any"; + maxClientConn = 99; + }; + }; + exporterTest = '' + wait_for_unit("postgresql.service") + wait_for_unit("pgbouncer.service") + wait_for_unit("prometheus-pgbouncer-exporter.service") + wait_for_open_port(9127) + succeed("curl -sSf http://localhost:9127/metrics | grep 'pgbouncer_up 1'") + succeed( + "curl -sSf http://localhost:9127/metrics | grep 'pgbouncer_config_max_client_connections 99'" + ) + ''; + }; + php-fpm = { nodeName = "php_fpm"; exporterConfig = { @@ -1143,6 +1208,44 @@ let ''; }; + sabnzbd = { + exporterConfig = { + enable = true; + servers = [{ + baseUrl = "http://localhost:8080"; + apiKeyFile = "/var/sabnzbd-apikey"; + }]; + }; + + metricProvider = { + services.sabnzbd.enable = true; + + # unrar is required for sabnzbd + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) [ "unrar" ]; + + # extract the generated api key before starting + systemd.services.sabnzbd-apikey = { + requires = [ "sabnzbd.service" ]; + after = [ "sabnzbd.service" ]; + requiredBy = [ "prometheus-sabnzbd-exporter.service" ]; + before = [ "prometheus-sabnzbd-exporter.service" ]; + script = '' + grep -Po '^api_key = \K.+' /var/lib/sabnzbd/sabnzbd.ini > /var/sabnzbd-apikey + ''; + }; + }; + + exporterTest = '' + wait_for_unit("sabnzbd.service") + wait_for_unit("prometheus-sabnzbd-exporter.service") + wait_for_open_port(8080) + wait_for_open_port(9387) + wait_until_succeeds( + "curl -sSf 'localhost:9387/metrics' | grep 'sabnzbd_queue_size{sabnzbd_instance=\"http://localhost:8080\"} 0.0'" + ) + ''; + }; + scaphandre = { exporterConfig = { enable = true; @@ -1387,8 +1490,7 @@ let unbound = { exporterConfig = { enable = true; - fetchType = "uds"; - controlInterface = "/run/unbound/unbound.ctl"; + unbound.host = "unix:///run/unbound/unbound.ctl"; }; metricProvider = { services.unbound = { @@ -1403,7 +1505,7 @@ let wait_for_unit("unbound.service") wait_for_unit("prometheus-unbound-exporter.service") wait_for_open_port(9167) - succeed("curl -sSf localhost:9167/metrics | grep 'unbound_up 1'") + wait_until_succeeds("curl -sSf localhost:9167/metrics | grep 'unbound_up 1'") ''; }; diff --git a/third_party/nixpkgs/nixos/tests/qemu-vm-external-disk-image.nix b/third_party/nixpkgs/nixos/tests/qemu-vm-external-disk-image.nix new file mode 100644 index 0000000000..a229fc5e39 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/qemu-vm-external-disk-image.nix @@ -0,0 +1,73 @@ +# Tests that you can boot from an external disk image with the qemu-vm module. +# "External" here means that the image was not produced within the qemu-vm +# module and relies on the fileSystems option also set outside the qemu-vm +# module. Most notably, this tests that you can stop the qemu-vm module from +# overriding fileSystems with virtualisation.fileSystems so you don't have to +# replicate the previously set fileSystems in virtualisation.fileSystems. + +{ lib, ... }: + +let + rootFslabel = "external"; + rootFsDevice = "/dev/disk/by-label/${rootFslabel}"; + + externalModule = { config, lib, pkgs, ... }: { + boot.loader.systemd-boot.enable = true; + + fileSystems = { + "/".device = rootFsDevice; + }; + + system.build.diskImage = import ../lib/make-disk-image.nix { + inherit config lib pkgs; + label = rootFslabel; + partitionTableType = "efi"; + format = "qcow2"; + bootSize = "32M"; + additionalSpace = "0M"; + copyChannel = false; + }; + }; +in +{ + name = "qemu-vm-external-disk-image"; + + meta.maintainers = with lib.maintainers; [ nikstur ]; + + nodes.machine = { config, lib, pkgs, ... }: { + virtualisation.directBoot.enable = false; + virtualisation.mountHostNixStore = false; + virtualisation.useEFIBoot = true; + + # This stops the qemu-vm module from overriding the fileSystems option + # with virtualisation.fileSystems. + virtualisation.fileSystems = lib.mkForce { }; + + imports = [ externalModule ]; + }; + + testScript = { nodes, ... }: '' + import os + import subprocess + import tempfile + + tmp_disk_image = tempfile.NamedTemporaryFile() + + subprocess.run([ + "${nodes.machine.virtualisation.qemu.package}/bin/qemu-img", + "create", + "-f", + "qcow2", + "-b", + "${nodes.machine.system.build.diskImage}/nixos.qcow2", + "-F", + "qcow2", + tmp_disk_image.name, + ]) + + # Set NIX_DISK_IMAGE so that the qemu script finds the right disk image. + os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name + + machine.succeed("findmnt --kernel --source ${rootFsDevice} --target /") + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/qgis.nix b/third_party/nixpkgs/nixos/tests/qgis.nix new file mode 100644 index 0000000000..7706b8c077 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/qgis.nix @@ -0,0 +1,30 @@ +import ./make-test-python.nix ({ pkgs, lib, qgisPackage, ... }: + let + testScript = pkgs.writeTextFile { + name = "qgis-test.py"; + text = (builtins.readFile ../../pkgs/applications/gis/qgis/test.py); + }; + in + { + name = "qgis"; + meta = { + maintainers = with lib; [ teams.geospatial.members ]; + }; + + nodes = { + machine = { pkgs, ... }: { + virtualisation.diskSize = 2 * 1024; + + imports = [ ./common/x11.nix ]; + environment.systemPackages = [ qgisPackage ]; + + }; + }; + + testScript = '' + start_all() + + machine.succeed("${qgisPackage}/bin/qgis --version | grep 'QGIS ${qgisPackage.version}'") + machine.succeed("${qgisPackage}/bin/qgis --code ${testScript}") + ''; + }) diff --git a/third_party/nixpkgs/nixos/tests/ragnarwm.nix b/third_party/nixpkgs/nixos/tests/ragnarwm.nix new file mode 100644 index 0000000000..f7c588b920 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/ragnarwm.nix @@ -0,0 +1,32 @@ +import ./make-test-python.nix ({ lib, ...} : { + name = "ragnarwm"; + + meta = { + maintainers = with lib.maintainers; [ sigmanificient ]; + }; + + nodes.machine = { pkgs, lib, ... }: { + imports = [ ./common/x11.nix ./common/user-account.nix ]; + test-support.displayManager.auto.user = "alice"; + services.xserver.displayManager.defaultSession = lib.mkForce "ragnar"; + services.xserver.windowManager.ragnarwm.enable = true; + + # Setup the default terminal of Ragnar + environment.systemPackages = [ pkgs.alacritty ]; + }; + + testScript = '' + with subtest("ensure x starts"): + machine.wait_for_x() + machine.wait_for_file("/home/alice/.Xauthority") + machine.succeed("xauth merge ~alice/.Xauthority") + + with subtest("ensure we can open a new terminal"): + # Sleeping a bit before the test, as it may help for sending keys + machine.sleep(2) + machine.send_key("meta_l-ret") + machine.wait_for_window(r"alice.*?machine") + machine.sleep(2) + machine.screenshot("terminal") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/restic.nix b/third_party/nixpkgs/nixos/tests/restic.nix index 626049e733..3b9ea2f85b 100644 --- a/third_party/nixpkgs/nixos/tests/restic.nix +++ b/third_party/nixpkgs/nixos/tests/restic.nix @@ -97,9 +97,9 @@ import ./make-test-python.nix ( server.start() server.wait_for_unit("dbus.socket") server.fail( - "${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots", - '${pkgs.restic}/bin/restic -r ${remoteFromFileRepository} -p ${passwordFile} snapshots"', - "${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots", + "restic-remotebackup snapshots", + 'restic-remote-from-file-backup snapshots"', + "restic-rclonebackup snapshots", "grep 'backup.* /opt' /root/fake-restic.log", ) server.succeed( @@ -112,20 +112,20 @@ import ./make-test-python.nix ( "timedatectl set-time '2016-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /root/backupCleanupCommand", - '${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', + 'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', # test that restoring that snapshot produces the same directory "mkdir /tmp/restore-1", - "${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} restore latest -t /tmp/restore-1", + "restic-remotebackup restore latest -t /tmp/restore-1", "diff -ru ${testDir} /tmp/restore-1/opt", # test that remote-from-file-backup produces a snapshot "systemctl start restic-backups-remote-from-file-backup.service", - '${pkgs.restic}/bin/restic -r ${remoteFromFileRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', + 'restic-remote-from-file-backup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', # test that rclonebackup produces a snapshot "systemctl start restic-backups-rclonebackup.service", - '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', + 'restic-rclonebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', # test that custompackage runs both `restic backup` and `restic check` with reasonable commandlines "systemctl start restic-backups-custompackage.service", @@ -158,12 +158,12 @@ import ./make-test-python.nix ( "rm /root/backupCleanupCommand", "systemctl start restic-backups-rclonebackup.service", - '${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 4"', - '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 4"', + 'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 4"', + 'restic-rclonebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 4"', # test that remoteprune brings us back to 1 snapshot in remotebackup "systemctl start restic-backups-remoteprune.service", - '${pkgs.restic}/bin/restic -r ${remoteRepository} -p ${passwordFile} snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', + 'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"', ) ''; diff --git a/third_party/nixpkgs/nixos/tests/sftpgo.nix b/third_party/nixpkgs/nixos/tests/sftpgo.nix index 8cd5675c1d..db0098d2ac 100644 --- a/third_party/nixpkgs/nixos/tests/sftpgo.nix +++ b/third_party/nixpkgs/nixos/tests/sftpgo.nix @@ -17,7 +17,7 @@ let # Returns an attributeset of users who are not system users. normalUsers = config: - filterAttrs (name: user: user.isNormalUser) config.users.users; + lib.filterAttrs (name: user: user.isNormalUser) config.users.users; # Returns true if a user is a member of the given group isMemberOf = @@ -26,7 +26,7 @@ let groupName: # users.users attrset user: - any (x: x == user.name) config.users.groups.${groupName}.members; + lib.any (x: x == user.name) config.users.groups.${groupName}.members; # Generates a valid SFTPGo user configuration for a given user # Will be converted to JSON and loaded on application startup. @@ -52,7 +52,7 @@ let # inside the dataprovider they will be automatically created. # You have to create the folder on the filesystem yourself virtual_folders = - lib.optional (lib.isMemberOf config sharedFolderName user) { + lib.optional (isMemberOf config sharedFolderName user) { name = sharedFolderName; mapped_path = "${config.services.sftpgo.dataDir}/${sharedFolderName}"; virtual_path = "/${sharedFolderName}"; @@ -63,7 +63,7 @@ let lib.recursiveUpdate { "/" = [ "list" ]; # read-only top level directory "/private" = [ "*" ]; # private subdirectory, not shared with others - } (lib.optionalAttrs (lib.isMemberOf config "shared" user) { + } (lib.optionalAttrs (isMemberOf config "shared" user) { "/shared" = [ "*" ]; }); @@ -89,7 +89,7 @@ let # of users and folders to import to SFTPGo. loadDataJson = config: pkgs.writeText "users-and-folders.json" (builtins.toJSON { users = - lib.mapAttrsToList (name: user: lib.generateUserAttrSet config user) (normalUsers config); + lib.mapAttrsToList (name: user: generateUserAttrSet config user) (normalUsers config); folders = [ { @@ -144,7 +144,7 @@ in { name = "sftpgo"; - meta.maintainers = with maintainers; [ yayayayaka ]; + meta.maintainers = with lib.maintainers; [ yayayayaka ]; nodes = { server = { nodes, ... }: { @@ -228,7 +228,7 @@ in # Created shared folder directories "d ${statePath}/${sharedFolderName} 2770 ${sftpgoUser} ${sharedFolderName} -" ] - ++ mapAttrsToList (name: user: + ++ lib.mapAttrsToList (name: user: # Create private user directories '' d ${statePath}/users/${user.name} 0700 ${sftpgoUser} ${sftpgoGroup} - @@ -273,12 +273,12 @@ in networking.firewall.allowedTCPPorts = [ 22 80 ]; services.sftpgo = { settings = { - sftpd.bindings = mkForce [{ + sftpd.bindings = lib.mkForce [{ address = ""; port = 22; }]; - httpd.bindings = mkForce [{ + httpd.bindings = lib.mkForce [{ address = ""; port = 80; }]; diff --git a/third_party/nixpkgs/nixos/tests/sgtpuzzles.nix b/third_party/nixpkgs/nixos/tests/sgt-puzzles.nix similarity index 92% rename from third_party/nixpkgs/nixos/tests/sgtpuzzles.nix rename to third_party/nixpkgs/nixos/tests/sgt-puzzles.nix index b8d25d42d3..4c5210bfce 100644 --- a/third_party/nixpkgs/nixos/tests/sgtpuzzles.nix +++ b/third_party/nixpkgs/nixos/tests/sgt-puzzles.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { - name = "sgtpuzzles"; + name = "sgt-puzzles"; meta = with pkgs.lib.maintainers; { maintainers = [ tomfitzhenry ]; }; @@ -14,7 +14,7 @@ import ./make-test-python.nix ({ pkgs, ...} : services.xserver.enable = true; environment.systemPackages = with pkgs; [ - sgtpuzzles + sgt-puzzles ]; }; diff --git a/third_party/nixpkgs/nixos/tests/shadow.nix b/third_party/nixpkgs/nixos/tests/shadow.nix index c9a04088e8..a027af7e45 100644 --- a/third_party/nixpkgs/nixos/tests/shadow.nix +++ b/third_party/nixpkgs/nixos/tests/shadow.nix @@ -32,7 +32,7 @@ in import ./make-test-python.nix ({ pkgs, ... }: { }; users.berta = { isNormalUser = true; - hashedPassword = hashed_bcrypt; + hashedPasswordFile = (pkgs.writeText "hashed_bcrypt" hashed_bcrypt).outPath; shell = pkgs.bash; }; users.yesim = { diff --git a/third_party/nixpkgs/nixos/tests/stalwart-mail.nix b/third_party/nixpkgs/nixos/tests/stalwart-mail.nix new file mode 100644 index 0000000000..b5589966a1 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/stalwart-mail.nix @@ -0,0 +1,117 @@ +# Rudimentary test checking that the Stalwart email server can: +# - receive some message through SMTP submission, then +# - serve this message through IMAP. + +let + certs = import ./common/acme/server/snakeoil-certs.nix; + domain = certs.domain; + +in import ./make-test-python.nix ({ lib, ... }: { + name = "stalwart-mail"; + + nodes.main = { pkgs, ... }: { + security.pki.certificateFiles = [ certs.ca.cert ]; + + services.stalwart-mail = { + enable = true; + settings = { + server.hostname = domain; + + certificate."snakeoil" = { + cert = "file://${certs.${domain}.cert}"; + private-key = "file://${certs.${domain}.key}"; + }; + + server.tls = { + certificate = "snakeoil"; + enable = true; + implicit = false; + }; + + server.listener = { + "smtp-submission" = { + bind = [ "[::]:587" ]; + protocol = "smtp"; + }; + + "imap" = { + bind = [ "[::]:143" ]; + protocol = "imap"; + }; + }; + + session.auth.mechanisms = [ "PLAIN" ]; + session.auth.directory = "in-memory"; + jmap.directory = "in-memory"; # shared with imap + + session.rcpt.directory = "in-memory"; + queue.outbound.next-hop = [ "local" ]; + + directory."in-memory" = { + type = "memory"; + users = [ + { + name = "alice"; + secret = "foobar"; + email = [ "alice@${domain}" ]; + } + { + name = "bob"; + secret = "foobar"; + email = [ "bob@${domain}" ]; + } + ]; + }; + }; + }; + + environment.systemPackages = [ + (pkgs.writers.writePython3Bin "test-smtp-submission" { } '' + from smtplib import SMTP + + with SMTP('localhost', 587) as smtp: + smtp.starttls() + smtp.login('alice', 'foobar') + smtp.sendmail( + 'alice@${domain}', + 'bob@${domain}', + """ + From: alice@${domain} + To: bob@${domain} + Subject: Some test message + + This is a test message. + """.strip() + ) + '') + + (pkgs.writers.writePython3Bin "test-imap-read" { } '' + from imaplib import IMAP4 + + with IMAP4('localhost') as imap: + imap.starttls() + imap.login('bob', 'foobar') + imap.select('"All Mail"') + status, [ref] = imap.search(None, 'ALL') + assert status == 'OK' + [msgId] = ref.split() + status, msg = imap.fetch(msgId, 'BODY[TEXT]') + assert status == 'OK' + assert msg[0][1].strip() == b'This is a test message.' + '') + ]; + }; + + testScript = /* python */ '' + main.wait_for_unit("stalwart-mail.service") + main.wait_for_open_port(587) + main.wait_for_open_port(143) + + main.succeed("test-smtp-submission") + main.succeed("test-imap-read") + ''; + + meta = { + maintainers = with lib.maintainers; [ happysalada pacien ]; + }; +}) diff --git a/third_party/nixpkgs/nixos/tests/sudo-rs.nix b/third_party/nixpkgs/nixos/tests/sudo-rs.nix new file mode 100644 index 0000000000..6006863217 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/sudo-rs.nix @@ -0,0 +1,101 @@ +# Some tests to ensure sudo is working properly. +{ pkgs, ... }: +let + inherit (pkgs.lib) mkIf optionalString; + password = "helloworld"; +in + import ./make-test-python.nix ({ lib, pkgs, ...} : { + name = "sudo-rs"; + meta.maintainers = pkgs.sudo-rs.meta.maintainers; + + nodes.machine = + { lib, ... }: + { + environment.systemPackages = [ pkgs.faketty ]; + users.groups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; }; + users.users = { + test0 = { isNormalUser = true; extraGroups = [ "wheel" ]; }; + test1 = { isNormalUser = true; password = password; }; + test2 = { isNormalUser = true; extraGroups = [ "foobar" ]; password = password; }; + test3 = { isNormalUser = true; extraGroups = [ "barfoo" ]; }; + test4 = { isNormalUser = true; extraGroups = [ "baz" ]; }; + test5 = { isNormalUser = true; }; + }; + + security.sudo.enable = false; + + security.sudo-rs = { + enable = true; + package = pkgs.sudo-rs; + wheelNeedsPassword = false; + + extraRules = [ + # SUDOERS SYNTAX CHECK (Test whether the module produces a valid output; + # errors being detected by the visudo checks. + + # These should not create any entries + { users = [ "notest1" ]; commands = [ ]; } + { commands = [ { command = "ALL"; options = [ ]; } ]; } + + # Test defining commands with the options syntax, though not setting any options + { users = [ "notest2" ]; commands = [ { command = "ALL"; options = [ ]; } ]; } + + + # CONFIGURATION FOR TEST CASES + { users = [ "test1" ]; groups = [ "foobar" ]; commands = [ "ALL" ]; } + { groups = [ "barfoo" 1337 ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" ]; } ]; } + { users = [ "test5" ]; commands = [ { command = "ALL"; options = [ "NOPASSWD" ]; } ]; runAs = "test1:barfoo"; } + ]; + }; + }; + + nodes.strict = { ... }: { + environment.systemPackages = [ pkgs.faketty ]; + users.users = { + admin = { isNormalUser = true; extraGroups = [ "wheel" ]; }; + noadmin = { isNormalUser = true; }; + }; + + security.sudo.enable = false; + + security.sudo-rs = { + package = pkgs.sudo-rs; + enable = true; + wheelNeedsPassword = false; + execWheelOnly = true; + }; + }; + + testScript = + '' + with subtest("users in wheel group should have passwordless sudo"): + machine.succeed('faketty -- su - test0 -c "sudo -u root true"') + + with subtest("test1 user should have sudo with password"): + machine.succeed('faketty -- su - test1 -c "echo ${password} | sudo -S -u root true"') + + with subtest("test1 user should not be able to use sudo without password"): + machine.fail('faketty -- su - test1 -c "sudo -n -u root true"') + + with subtest("users in group 'foobar' should be able to use sudo with password"): + machine.succeed('faketty -- su - test2 -c "echo ${password} | sudo -S -u root true"') + + with subtest("users in group 'barfoo' should be able to use sudo without password"): + machine.succeed("sudo -u test3 sudo -n -u root true") + + with subtest("users in group 'baz' (GID 1337)"): + machine.succeed("sudo -u test4 sudo -n -u root echo true") + + with subtest("test5 user should be able to run commands under test1"): + machine.succeed("sudo -u test5 sudo -n -u test1 true") + + with subtest("test5 user should not be able to run commands under root"): + machine.fail("sudo -u test5 sudo -n -u root true 2>/dev/null") + + with subtest("users in wheel should be able to run sudo despite execWheelOnly"): + strict.succeed('faketty -- su - admin -c "sudo -u root true"') + + with subtest("non-wheel users should be unable to run sudo thanks to execWheelOnly"): + strict.fail('faketty -- su - noadmin -c "sudo --help"') + ''; + }) diff --git a/third_party/nixpkgs/nixos/tests/sudo.nix b/third_party/nixpkgs/nixos/tests/sudo.nix index 3b6028c6f0..1b17739148 100644 --- a/third_party/nixpkgs/nixos/tests/sudo.nix +++ b/third_party/nixpkgs/nixos/tests/sudo.nix @@ -5,7 +5,7 @@ let in import ./make-test-python.nix ({ lib, pkgs, ...} : { name = "sudo"; - meta.maintainers = with lib.maintainers; [ lschuermann ]; + meta.maintainers = pkgs.sudo.meta.maintainers; nodes.machine = { lib, ... }: diff --git a/third_party/nixpkgs/nixos/tests/switch-test.nix b/third_party/nixpkgs/nixos/tests/switch-test.nix index 53595ae7d3..5ffdf180d5 100644 --- a/third_party/nixpkgs/nixos/tests/switch-test.nix +++ b/third_party/nixpkgs/nixos/tests/switch-test.nix @@ -58,6 +58,37 @@ in { ''); specialisation = rec { + brokenInitInterface.configuration.config.system.extraSystemBuilderCmds = '' + echo "systemd 0" > $out/init-interface-version + ''; + + modifiedSystemConf.configuration.systemd.extraConfig = '' + # Hello world! + ''; + + addedMount.configuration.virtualisation.fileSystems."/test" = { + device = "tmpfs"; + fsType = "tmpfs"; + }; + + addedMountOptsModified.configuration = { + imports = [ addedMount.configuration ]; + virtualisation.fileSystems."/test".options = [ "x-test" ]; + }; + + addedMountDevModified.configuration = { + imports = [ addedMountOptsModified.configuration ]; + virtualisation.fileSystems."/test".device = lib.mkForce "ramfs"; + }; + + storeMountModified.configuration = { + virtualisation.fileSystems."/".device = lib.mkForce "auto"; + }; + + swap.configuration.swapDevices = lib.mkVMOverride [ + { device = "/swapfile"; size = 1; } + ]; + simpleService.configuration = { systemd.services.test = { wantedBy = [ "multi-user.target" ]; @@ -450,7 +481,7 @@ in { ]; }; - mountModified.configuration = { + mountOptionsModified.configuration = { systemd.mounts = [ { description = "Testmount"; @@ -463,6 +494,19 @@ in { ]; }; + mountModified.configuration = { + systemd.mounts = [ + { + description = "Testmount"; + what = "ramfs"; + type = "ramfs"; + where = "/testmount"; + options = "size=10M"; + wantedBy = [ "local-fs.target" ]; + } + ]; + }; + timer.configuration = { systemd.timers.test-timer = { wantedBy = [ "timers.target" ]; @@ -630,6 +674,97 @@ in { # test and dry-activate actions are tested further down below + # invalid action fails the script + switch_to_specialisation("${machine}", "", action="broken-action", fail=True) + # no action fails the script + assert "Usage:" in machine.fail("${machine}/bin/switch-to-configuration 2>&1") + + with subtest("init interface version"): + # Do not try to switch to an invalid init interface version + assert "incompatible" in switch_to_specialisation("${machine}", "brokenInitInterface", fail=True) + + with subtest("systemd restarts"): + # systemd is restarted when its system.conf changes + out = switch_to_specialisation("${machine}", "modifiedSystemConf") + assert_contains(out, "restarting systemd...") + + with subtest("continuing from an aborted switch"): + # An aborted switch will write into a file what it tried to start + # and a second switch should continue from this + machine.succeed("echo dbus.service > /run/nixos/start-list") + out = switch_to_specialisation("${machine}", "modifiedSystemConf") + assert_contains(out, "starting the following units: dbus.service\n") + + with subtest("fstab mounts"): + switch_to_specialisation("${machine}", "") + # add a mountpoint + out = switch_to_specialisation("${machine}", "addedMount") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: test.mount\n") + # modify the mountpoint's options + out = switch_to_specialisation("${machine}", "addedMountOptsModified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_contains(out, "reloading the following units: test.mount\n") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + # modify the device + out = switch_to_specialisation("${machine}", "addedMountDevModified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "\nrestarting the following units: test.mount\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + # modify both + out = switch_to_specialisation("${machine}", "addedMount") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "\nrestarting the following units: test.mount\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + # remove the mount + out = switch_to_specialisation("${machine}", "") + assert_contains(out, "stopping the following units: test.mount\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_contains(out, "reloading the following units: dbus.service\n") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + # change something about the / mount + out = switch_to_specialisation("${machine}", "storeMountModified") + assert_lacks(out, "stopping the following units:") + assert_contains(out, "NOT restarting the following changed units: -.mount") + assert_contains(out, "reloading the following units: dbus.service\n") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + + with subtest("swaps"): + switch_to_specialisation("${machine}", "") + # add a swap + out = switch_to_specialisation("${machine}", "swap") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_contains(out, "reloading the following units: dbus.service\n") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: swapfile.swap") + # remove it + out = switch_to_specialisation("${machine}", "") + assert_contains(out, "stopping swap device: /swapfile") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_contains(out, "reloading the following units: dbus.service\n") + assert_lacks(out, "\nrestarting the following units:") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + with subtest("services"): switch_to_specialisation("${machine}", "") # Nothing happens when nothing is changed @@ -1137,7 +1272,8 @@ in { switch_to_specialisation("${machine}", "mount") out = machine.succeed("mount | grep 'on /testmount'") assert_contains(out, "size=1024k") - out = switch_to_specialisation("${machine}", "mountModified") + # Changing options reloads the unit + out = switch_to_specialisation("${machine}", "mountOptionsModified") assert_lacks(out, "stopping the following units:") assert_lacks(out, "NOT restarting the following changed units:") assert_contains(out, "reloading the following units: testmount.mount\n") @@ -1147,6 +1283,17 @@ in { # It changed out = machine.succeed("mount | grep 'on /testmount'") assert_contains(out, "size=10240k") + # Changing anything but `Options=` restarts the unit + out = switch_to_specialisation("${machine}", "mountModified") + assert_lacks(out, "stopping the following units:") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "reloading the following units:") + assert_contains(out, "\nrestarting the following units: testmount.mount\n") + assert_lacks(out, "\nstarting the following units:") + assert_lacks(out, "the following new units were started:") + # It changed + out = machine.succeed("mount | grep 'on /testmount'") + assert_contains(out, "ramfs") with subtest("timers"): switch_to_specialisation("${machine}", "timer") diff --git a/third_party/nixpkgs/nixos/tests/syncthing-init.nix b/third_party/nixpkgs/nixos/tests/syncthing-init.nix index 195c157ffb..97fcf2ad28 100644 --- a/third_party/nixpkgs/nixos/tests/syncthing-init.nix +++ b/third_party/nixpkgs/nixos/tests/syncthing-init.nix @@ -1,7 +1,6 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: let testId = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU"; - testName = "testDevice foo'bar"; in { name = "syncthing-init"; diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-bridge.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-bridge.nix new file mode 100644 index 0000000000..f48a46ff2b --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-bridge.nix @@ -0,0 +1,63 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "systemd-initrd-bridge"; + meta.maintainers = [ lib.maintainers.majiir ]; + + # Tests bridge interface configuration in systemd-initrd. + # + # The 'a' and 'b' nodes are connected to a 'bridge' node through different + # links. The 'bridge' node configures a bridge across them. It waits forever + # in initrd (stage 1) with networking enabled. 'a' and 'b' ping 'bridge' to + # test connectivity with the bridge interface. Then, 'a' pings 'b' to test + # the bridge itself. + + nodes = { + bridge = { config, lib, ... }: { + boot.initrd.systemd.enable = true; + boot.initrd.network.enable = true; + boot.initrd.systemd.services.boot-blocker = { + before = [ "initrd.target" ]; + wantedBy = [ "initrd.target" ]; + script = "sleep infinity"; + serviceConfig.Type = "oneshot"; + }; + + networking.primaryIPAddress = "192.168.1.${toString config.virtualisation.test.nodeNumber}"; + + virtualisation.vlans = [ 1 2 ]; + networking.bridges.br0.interfaces = [ "eth1" "eth2" ]; + + networking.interfaces = { + eth1.ipv4.addresses = lib.mkForce []; + eth2.ipv4.addresses = lib.mkForce []; + br0.ipv4.addresses = [{ + address = config.networking.primaryIPAddress; + prefixLength = 24; + }]; + }; + }; + + a = { + virtualisation.vlans = [ 1 ]; + }; + + b = { config, ... }: { + virtualisation.vlans = [ 2 ]; + networking.primaryIPAddress = lib.mkForce "192.168.1.${toString config.virtualisation.test.nodeNumber}"; + networking.interfaces.eth1.ipv4.addresses = lib.mkForce [{ + address = config.networking.primaryIPAddress; + prefixLength = 24; + }]; + }; + }; + + testScript = '' + start_all() + a.wait_for_unit("network.target") + b.wait_for_unit("network.target") + + a.succeed("ping -n -w 10 -c 1 bridge >&2") + b.succeed("ping -n -w 10 -c 1 bridge >&2") + + a.succeed("ping -n -w 10 -c 1 b >&2") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-swraid.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-swraid.nix index d87170c925..d00e67b570 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-initrd-swraid.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-swraid.nix @@ -20,6 +20,9 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { ARRAY /dev/md0 devices=/dev/vdb,/dev/vdc ''; }; + environment.etc."mdadm.conf".text = '' + MAILADDR test@example.com + ''; boot.initrd = { systemd = { enable = true; @@ -29,11 +32,14 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { }; specialisation.boot-swraid.configuration.virtualisation.rootDevice = "/dev/disk/by-label/testraid"; + # This protects against a regression. We do not have to switch to it. + # It's sufficient to trigger its evaluation. + specialisation.build-old-initrd.configuration.boot.initrd.systemd.enable = lib.mkForce false; }; testScript = '' # Create RAID - machine.succeed("mdadm --create --force /dev/md0 -n 2 --level=raid0 /dev/vdb /dev/vdc") + machine.succeed("mdadm --create --force /dev/md0 -n 2 --level=raid1 /dev/vdb /dev/vdc --metadata=0.90") machine.succeed("mkfs.ext4 -L testraid /dev/md0") machine.succeed("mkdir -p /mnt && mount /dev/md0 /mnt && echo hello > /mnt/test && umount /mnt") @@ -48,5 +54,13 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: { assert "/dev/md0 on / type ext4" in machine.succeed("mount") assert "hello" in machine.succeed("cat /test") assert "md0" in machine.succeed("cat /proc/mdstat") + + expected_config = """MAILADDR test@example.com + + ARRAY /dev/md0 devices=/dev/vdb,/dev/vdc + """ + got_config = machine.execute("cat /etc/mdadm.conf")[1] + assert expected_config == got_config, repr((expected_config, got_config)) + machine.wait_for_unit("mdmonitor.service") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/systemd-initrd-vlan.nix b/third_party/nixpkgs/nixos/tests/systemd-initrd-vlan.nix new file mode 100644 index 0000000000..5060163a04 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/systemd-initrd-vlan.nix @@ -0,0 +1,59 @@ +import ./make-test-python.nix ({ lib, ... }: { + name = "systemd-initrd-vlan"; + meta.maintainers = [ lib.maintainers.majiir ]; + + # Tests VLAN interface configuration in systemd-initrd. + # + # Two nodes are configured for a tagged VLAN. (Note that they also still have + # their ordinary eth0 and eth1 interfaces, which are not VLAN-tagged.) + # + # The 'server' node waits forever in initrd (stage 1) with networking + # enabled. The 'client' node pings it to test network connectivity. + + nodes = let + network = id: { + networking = { + vlans."eth1.10" = { + id = 10; + interface = "eth1"; + }; + interfaces."eth1.10" = { + ipv4.addresses = [{ + address = "192.168.10.${id}"; + prefixLength = 24; + }]; + }; + }; + }; + in { + # Node that will use initrd networking. + server = network "1" // { + boot.initrd.systemd.enable = true; + boot.initrd.network.enable = true; + boot.initrd.systemd.services.boot-blocker = { + before = [ "initrd.target" ]; + wantedBy = [ "initrd.target" ]; + script = "sleep infinity"; + serviceConfig.Type = "oneshot"; + }; + }; + + # Node that will ping the server. + client = network "2"; + }; + + testScript = '' + start_all() + client.wait_for_unit("network.target") + + # Wait for the regular (untagged) interface to be up. + def server_is_up(_) -> bool: + status, _ = client.execute("ping -n -c 1 server >&2") + return status == 0 + with client.nested("waiting for server to come up"): + retry(server_is_up) + + # Try to ping the (tagged) VLAN interface. + client.succeed("ping -n -w 10 -c 1 192.168.10.1 >&2") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/tinywl.nix b/third_party/nixpkgs/nixos/tests/tinywl.nix index 411cdb1f64..9199866b57 100644 --- a/third_party/nixpkgs/nixos/tests/tinywl.nix +++ b/third_party/nixpkgs/nixos/tests/tinywl.nix @@ -16,6 +16,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: systemPackages = with pkgs; [ tinywl foot wayland-utils ]; }; + hardware.opengl.enable = true; + # Automatically start TinyWL when logging in on tty1: programs.bash.loginShellInit = '' if [ "$(tty)" = "/dev/tty1" ]; then diff --git a/third_party/nixpkgs/nixos/tests/tracee.nix b/third_party/nixpkgs/nixos/tests/tracee.nix index 8ec86ef091..3dadc0f9fd 100644 --- a/third_party/nixpkgs/nixos/tests/tracee.nix +++ b/third_party/nixpkgs/nixos/tests/tracee.nix @@ -43,6 +43,10 @@ import ./make-test-python.nix ({ pkgs, ... }: { mv $GOPATH/tracee-integration $out/bin/ ''; doInstallCheck = false; + + meta = oa.meta // { + outputsToInstall = []; + }; })) ]; }; diff --git a/third_party/nixpkgs/nixos/tests/transmission.nix b/third_party/nixpkgs/nixos/tests/transmission.nix index b69ddd84d0..03fc9a4215 100644 --- a/third_party/nixpkgs/nixos/tests/transmission.nix +++ b/third_party/nixpkgs/nixos/tests/transmission.nix @@ -1,4 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, transmission, ... }: { name = "transmission"; meta = with pkgs.lib.maintainers; { maintainers = [ coconnor ]; @@ -12,6 +12,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { security.apparmor.enable = true; services.transmission.enable = true; + services.transmission.package = transmission; }; testScript = diff --git a/third_party/nixpkgs/nixos/tests/ulogd.nix b/third_party/nixpkgs/nixos/tests/ulogd.nix deleted file mode 100644 index d351fdae79..0000000000 --- a/third_party/nixpkgs/nixos/tests/ulogd.nix +++ /dev/null @@ -1,82 +0,0 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: { - name = "ulogd"; - - meta.maintainers = with lib.maintainers; [ p-h ]; - - nodes.machine = { ... }: { - networking.firewall.enable = false; - networking.nftables.enable = true; - networking.nftables.ruleset = '' - table inet filter { - chain input { - type filter hook input priority 0; - log group 2 accept - } - - chain output { - type filter hook output priority 0; policy accept; - log group 2 accept - } - - chain forward { - type filter hook forward priority 0; policy drop; - log group 2 accept - } - - } - ''; - services.ulogd = { - enable = true; - settings = { - global = { - logfile = "/var/log/ulogd.log"; - stack = "log1:NFLOG,base1:BASE,pcap1:PCAP"; - }; - - log1.group = 2; - - pcap1 = { - file = "/var/log/ulogd.pcap"; - sync = 1; - }; - }; - }; - - environment.systemPackages = with pkgs; [ - tcpdump - ]; - }; - - testScript = '' - start_all() - machine.wait_for_unit("ulogd.service") - machine.wait_for_unit("network-online.target") - - with subtest("Ulogd is running"): - machine.succeed("pgrep ulogd >&2") - - # All packets show up twice in the logs - with subtest("Logs are collected"): - machine.succeed("ping -f 127.0.0.1 -c 5 >&2") - machine.succeed("sleep 2") - machine.wait_until_succeeds("du /var/log/ulogd.pcap >&2") - _, echo_request_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 8 and host 127.0.0.1") - expected, actual = 5*2, len(echo_request_packets.splitlines()) - assert expected == actual, f"Expected {expected} packets, got: {actual}" - _, echo_reply_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 0 and host 127.0.0.1") - expected, actual = 5*2, len(echo_reply_packets.splitlines()) - assert expected == actual, f"Expected {expected} packets, got: {actual}" - - with subtest("Reloading service reopens log file"): - machine.succeed("mv /var/log/ulogd.pcap /var/log/old_ulogd.pcap") - machine.succeed("systemctl reload ulogd.service") - machine.succeed("ping -f 127.0.0.1 -c 5 >&2") - machine.succeed("sleep 2") - _, echo_request_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 8 and host 127.0.0.1") - expected, actual = 5*2, len(echo_request_packets.splitlines()) - assert expected == actual, f"Expected {expected} packets, got: {actual}" - _, echo_reply_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 0 and host 127.0.0.1") - expected, actual = 5*2, len(echo_reply_packets.splitlines()) - assert expected == actual, f"Expected {expected} packets, got: {actual}" - ''; -}) diff --git a/third_party/nixpkgs/nixos/tests/ulogd/ulogd.nix b/third_party/nixpkgs/nixos/tests/ulogd/ulogd.nix new file mode 100644 index 0000000000..0fa92229a1 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/ulogd/ulogd.nix @@ -0,0 +1,56 @@ +import ../make-test-python.nix ({ pkgs, lib, ... }: { + name = "ulogd"; + + meta.maintainers = with lib.maintainers; [ p-h ]; + + nodes.machine = { ... }: { + networking.firewall.enable = false; + networking.nftables.enable = true; + networking.nftables.ruleset = '' + table inet filter { + chain input { + type filter hook input priority 0; + icmp type { echo-request, echo-reply } log group 2 accept + } + + chain output { + type filter hook output priority 0; policy accept; + icmp type { echo-request, echo-reply } log group 2 accept + } + + chain forward { + type filter hook forward priority 0; policy drop; + } + + } + ''; + services.ulogd = { + enable = true; + settings = { + global = { + logfile = "/var/log/ulogd.log"; + stack = [ + "log1:NFLOG,base1:BASE,ifi1:IFINDEX,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU" + "log1:NFLOG,base1:BASE,pcap1:PCAP" + ]; + }; + + log1.group = 2; + + pcap1 = { + sync = 1; + file = "/var/log/ulogd.pcap"; + }; + + emu1 = { + sync = 1; + file = "/var/log/ulogd_pkts.log"; + }; + }; + }; + + environment.systemPackages = with pkgs; [ tcpdump ]; + }; + + testScript = lib.readFile ./ulogd.py; +}) diff --git a/third_party/nixpkgs/nixos/tests/ulogd/ulogd.py b/third_party/nixpkgs/nixos/tests/ulogd/ulogd.py new file mode 100644 index 0000000000..d20daa4d73 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/ulogd/ulogd.py @@ -0,0 +1,48 @@ +start_all() +machine.wait_for_unit("ulogd.service") +machine.wait_for_unit("network-online.target") + +with subtest("Ulogd is running"): + machine.succeed("pgrep ulogd >&2") + +# All packets show up twice in the logs +with subtest("Logs are collected"): + machine.succeed("ping -f 127.0.0.1 -c 5 >&2") + machine.succeed("sleep 2") + machine.wait_until_succeeds("du /var/log/ulogd.pcap") + _, echo_request_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 8 and host 127.0.0.1") + expected, actual = 5 * 2, len(echo_request_packets.splitlines()) + assert expected == actual, f"Expected {expected} ICMP request packets from pcap, got: {actual}" + _, echo_reply_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 0 and host 127.0.0.1") + expected, actual = 5 * 2, len(echo_reply_packets.splitlines()) + assert expected == actual, f"Expected {expected} ICMP reply packets from pcap, got: {actual}" + + machine.wait_until_succeeds("du /var/log/ulogd_pkts.log") + _, echo_request_packets = machine.execute("grep TYPE=8 /var/log/ulogd_pkts.log") + expected, actual = 5 * 2, len(echo_request_packets.splitlines()) + assert expected == actual, f"Expected {expected} ICMP request packets from logfile, got: {actual}" + _, echo_reply_packets = machine.execute("grep TYPE=0 /var/log/ulogd_pkts.log") + expected, actual = 5 * 2, len(echo_reply_packets.splitlines()) + assert expected == actual, f"Expected {expected} ICMP reply packets from logfile, got: {actual}" + +with subtest("Reloading service reopens log file"): + machine.succeed("mv /var/log/ulogd.pcap /var/log/old_ulogd.pcap") + machine.succeed("mv /var/log/ulogd_pkts.log /var/log/old_ulogd_pkts.log") + machine.succeed("systemctl reload ulogd.service") + machine.succeed("ping -f 127.0.0.1 -c 5 >&2") + machine.succeed("sleep 2") + machine.wait_until_succeeds("du /var/log/ulogd.pcap") + _, echo_request_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 8 and host 127.0.0.1") + expected, actual = 5 * 2, len(echo_request_packets.splitlines()) + assert expected == actual, f"Expected {expected} packets, got: {actual}" + _, echo_reply_packets = machine.execute("tcpdump -r /var/log/ulogd.pcap icmp[0] == 0 and host 127.0.0.1") + expected, actual = 5 * 2, len(echo_reply_packets.splitlines()) + assert expected == actual, f"Expected {expected} packets, got: {actual}" + + machine.wait_until_succeeds("du /var/log/ulogd_pkts.log") + _, echo_request_packets = machine.execute("grep TYPE=8 /var/log/ulogd_pkts.log") + expected, actual = 5 * 2, len(echo_request_packets.splitlines()) + assert expected == actual, f"Expected {expected} ICMP request packets from logfile, got: {actual}" + _, echo_reply_packets = machine.execute("grep TYPE=0 /var/log/ulogd_pkts.log") + expected, actual = 5 * 2, len(echo_reply_packets.splitlines()) + assert expected == actual, f"Expected {expected} ICMP reply packets from logfile, got: {actual}" diff --git a/third_party/nixpkgs/nixos/tests/user-activation-scripts.nix b/third_party/nixpkgs/nixos/tests/user-activation-scripts.nix index 5df072ce05..ebd96b019e 100644 --- a/third_party/nixpkgs/nixos/tests/user-activation-scripts.nix +++ b/third_party/nixpkgs/nixos/tests/user-activation-scripts.nix @@ -8,6 +8,7 @@ import ./make-test-python.nix ({ lib, ... }: { initialPassword = "pass1"; isNormalUser = true; }; + systemd.user.tmpfiles.users.alice.rules = [ "r %h/file-to-remove" ]; }; testScript = '' @@ -27,7 +28,9 @@ import ./make-test-python.nix ({ lib, ... }: { machine.wait_for_file("/home/alice/login-ok") verify_user_activation_run_count(1) + machine.succeed("touch /home/alice/file-to-remove") machine.succeed("/run/current-system/bin/switch-to-configuration test") verify_user_activation_run_count(2) + machine.succeed("[[ ! -f /home/alice/file-to-remove ]] || false") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/user-expiry.nix b/third_party/nixpkgs/nixos/tests/user-expiry.nix new file mode 100644 index 0000000000..bcaed7a0cc --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/user-expiry.nix @@ -0,0 +1,70 @@ +let + alice = "alice"; + bob = "bob"; + eve = "eve"; + passwd = "pass1"; +in +{ + name = "user-expiry"; + + nodes = { + machine = { + users.users = { + ${alice} = { + initialPassword = passwd; + isNormalUser = true; + expires = "1990-01-01"; + }; + ${bob} = { + initialPassword = passwd; + isNormalUser = true; + expires = "2990-01-01"; + }; + ${eve} = { + initialPassword = passwd; + isNormalUser = true; + }; + }; + }; + }; + + testScript = '' + def switch_to_tty(tty_number): + machine.fail(f"pgrep -f 'agetty.*tty{tty_number}'") + machine.send_key(f"alt-f{tty_number}") + machine.wait_until_succeeds(f"[ $(fgconsole) = {tty_number} ]") + machine.wait_for_unit(f"getty@tty{tty_number}.service") + machine.wait_until_succeeds(f"pgrep -f 'agetty.*tty{tty_number}'") + + + machine.wait_for_unit("multi-user.target") + machine.wait_for_unit("getty@tty1.service") + + with subtest("${alice} cannot login"): + machine.wait_until_tty_matches("1", "login: ") + machine.send_chars("${alice}\n") + machine.wait_until_tty_matches("1", "Password: ") + machine.send_chars("${passwd}\n") + + machine.wait_until_succeeds("journalctl --grep='account ${alice} has expired \\(account expired\\)'") + machine.wait_until_tty_matches("1", "login: ") + + with subtest("${bob} can login"): + switch_to_tty(2) + machine.wait_until_tty_matches("2", "login: ") + machine.send_chars("${bob}\n") + machine.wait_until_tty_matches("2", "Password: ") + machine.send_chars("${passwd}\n") + + machine.wait_until_succeeds("pgrep -u ${bob} bash") + + with subtest("${eve} can login"): + switch_to_tty(3) + machine.wait_until_tty_matches("3", "login: ") + machine.send_chars("${eve}\n") + machine.wait_until_tty_matches("3", "Password: ") + machine.send_chars("${passwd}\n") + + machine.wait_until_succeeds("pgrep -u ${eve} bash") + ''; +} diff --git a/third_party/nixpkgs/nixos/tests/virtualbox.nix b/third_party/nixpkgs/nixos/tests/virtualbox.nix index 062b125eb6..e522d0679e 100644 --- a/third_party/nixpkgs/nixos/tests/virtualbox.nix +++ b/third_party/nixpkgs/nixos/tests/virtualbox.nix @@ -519,4 +519,4 @@ in mapAttrs (mkVBoxTest false vboxVMs) { destroy_vm_test1() destroy_vm_test2() ''; -} // (lib.optionalAttrs enableUnfree unfreeTests) +} // (optionalAttrs enableUnfree unfreeTests) diff --git a/third_party/nixpkgs/nixos/tests/web-apps/netbox-upgrade.nix b/third_party/nixpkgs/nixos/tests/web-apps/netbox-upgrade.nix index 602cf8d889..b5403eb678 100644 --- a/third_party/nixpkgs/nixos/tests/web-apps/netbox-upgrade.nix +++ b/third_party/nixpkgs/nixos/tests/web-apps/netbox-upgrade.nix @@ -1,13 +1,15 @@ import ../make-test-python.nix ({ lib, pkgs, ... }: let - oldNetbox = pkgs.netbox_3_3; + oldNetbox = pkgs.netbox_3_5; + newNetbox = pkgs.netbox_3_6; in { name = "netbox-upgrade"; meta = with lib.maintainers; { - maintainers = [ minijackson ]; + maintainers = [ minijackson raitobezarius ]; }; nodes.machine = { config, ... }: { + virtualisation.memorySize = 2048; services.netbox = { enable = true; package = oldNetbox; @@ -32,7 +34,7 @@ in { networking.firewall.allowedTCPPorts = [ 80 ]; - specialisation.upgrade.configuration.services.netbox.package = lib.mkForce pkgs.netbox; + specialisation.upgrade.configuration.services.netbox.package = lib.mkForce newNetbox; }; testScript = { nodes, ... }: @@ -43,7 +45,7 @@ in { (lib.concatStringsSep ".") ]; oldApiVersion = apiVersion oldNetbox.version; - newApiVersion = apiVersion pkgs.netbox.version; + newApiVersion = apiVersion newNetbox.version; in '' start_all() diff --git a/third_party/nixpkgs/nixos/tests/web-apps/netbox.nix b/third_party/nixpkgs/nixos/tests/web-apps/netbox.nix index 30de74f188..233f16a8fe 100644 --- a/third_party/nixpkgs/nixos/tests/web-apps/netbox.nix +++ b/third_party/nixpkgs/nixos/tests/web-apps/netbox.nix @@ -16,6 +16,7 @@ in import ../make-test-python.nix ({ lib, pkgs, netbox, ... }: { }; nodes.machine = { config, ... }: { + virtualisation.memorySize = 2048; services.netbox = { enable = true; package = netbox; diff --git a/third_party/nixpkgs/nixos/tests/wordpress.nix b/third_party/nixpkgs/nixos/tests/wordpress.nix index 4e322774fe..106bbff46c 100644 --- a/third_party/nixpkgs/nixos/tests/wordpress.nix +++ b/third_party/nixpkgs/nixos/tests/wordpress.nix @@ -67,7 +67,7 @@ rec { networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; }) {} [ - "6_1" "6_2" + "6_1" "6_2" "6_3" ]; testScript = '' diff --git a/third_party/nixpkgs/nixos/tests/wrappers.nix b/third_party/nixpkgs/nixos/tests/wrappers.nix index 391e9b42b4..1d4fa85d73 100644 --- a/third_party/nixpkgs/nixos/tests/wrappers.nix +++ b/third_party/nixpkgs/nixos/tests/wrappers.nix @@ -21,6 +21,8 @@ in }; }; + security.apparmor.enable = true; + security.wrappers = { suidRoot = { owner = "root"; @@ -84,17 +86,27 @@ in test_as_regular_in_userns_mapped_as_root('/run/wrappers/bin/sgid_root_busybox id -g', '0') test_as_regular_in_userns_mapped_as_root('/run/wrappers/bin/sgid_root_busybox id -rg', '0') + # Test that in nonewprivs environment the wrappers simply exec their target. + test_as_regular('${pkgs.util-linux}/bin/setpriv --no-new-privs /run/wrappers/bin/suid_root_busybox id -u', '${toString userUid}') + test_as_regular('${pkgs.util-linux}/bin/setpriv --no-new-privs /run/wrappers/bin/suid_root_busybox id -ru', '${toString userUid}') + test_as_regular('${pkgs.util-linux}/bin/setpriv --no-new-privs /run/wrappers/bin/suid_root_busybox id -g', '${toString usersGid}') + test_as_regular('${pkgs.util-linux}/bin/setpriv --no-new-privs /run/wrappers/bin/suid_root_busybox id -rg', '${toString usersGid}') + + test_as_regular('${pkgs.util-linux}/bin/setpriv --no-new-privs /run/wrappers/bin/sgid_root_busybox id -u', '${toString userUid}') + test_as_regular('${pkgs.util-linux}/bin/setpriv --no-new-privs /run/wrappers/bin/sgid_root_busybox id -ru', '${toString userUid}') + test_as_regular('${pkgs.util-linux}/bin/setpriv --no-new-privs /run/wrappers/bin/sgid_root_busybox id -g', '${toString usersGid}') + test_as_regular('${pkgs.util-linux}/bin/setpriv --no-new-privs /run/wrappers/bin/sgid_root_busybox id -rg', '${toString usersGid}') + # We are only testing the permitted set, because it's easiest to look at with capsh. machine.fail(cmd_as_regular('${pkgs.libcap}/bin/capsh --has-p=CAP_CHOWN')) machine.fail(cmd_as_regular('${pkgs.libcap}/bin/capsh --has-p=CAP_SYS_ADMIN')) machine.succeed(cmd_as_regular('/run/wrappers/bin/capsh_with_chown --has-p=CAP_CHOWN')) machine.fail(cmd_as_regular('/run/wrappers/bin/capsh_with_chown --has-p=CAP_SYS_ADMIN')) - # test a few "attacks" against which the wrapper protects itself - machine.succeed("cp /run/wrappers/bin/suid_root_busybox{,.real} /tmp/") - machine.fail(cmd_as_regular("/tmp/suid_root_busybox id -u")) - - machine.succeed("chmod u+s,a+w /run/wrappers/bin/suid_root_busybox") - machine.fail(cmd_as_regular("/run/wrappers/bin/suid_root_busybox id -u")) + # Test that the only user of apparmor policy includes generated by + # wrappers works. Ideally this'd be located in a test for the module that + # actually makes the apparmor policy for ping, but there's no convenient + # test for that one. + machine.succeed("ping -c 1 127.0.0.1") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/yggdrasil.nix b/third_party/nixpkgs/nixos/tests/yggdrasil.nix index eaf14e29ac..70d148380b 100644 --- a/third_party/nixpkgs/nixos/tests/yggdrasil.nix +++ b/third_party/nixpkgs/nixos/tests/yggdrasil.nix @@ -116,6 +116,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { networking.firewall.allowedTCPPorts = [ 43210 ]; services.yggdrasil = { enable = true; + extraArgs = [ "-loglevel" "error" ]; denyDhcpcdInterfaces = [ "ygg0" ]; settings = { IfTAPMode = true; diff --git a/third_party/nixpkgs/nixos/tests/zfs.nix b/third_party/nixpkgs/nixos/tests/zfs.nix index 8e52e00657..800f5e43cd 100644 --- a/third_party/nixpkgs/nixos/tests/zfs.nix +++ b/third_party/nixpkgs/nixos/tests/zfs.nix @@ -113,6 +113,8 @@ let }; testScript = '' + # TODO: Remove this when upgrading stable to zfs 2.2.0 + unstable = ${if enableUnstable then "True" else "False"}; machine.wait_for_unit("multi-user.target") machine.succeed( "zpool status", @@ -133,9 +135,10 @@ let ) machine.crash() machine.wait_for_unit("multi-user.target") + machine.succeed("zfs set sharesmb=on rpool/shared_smb") + if not unstable: + machine.succeed("zfs share rpool/shared_smb") machine.succeed( - "zfs set sharesmb=on rpool/shared_smb", - "zfs share rpool/shared_smb", "smbclient -gNL localhost | grep rpool_shared_smb", "umount /tmp/mnt", "zpool destroy rpool", diff --git a/third_party/nixpkgs/pkgs/README.md b/third_party/nixpkgs/pkgs/README.md index 4e0cc83ff9..5cc7024758 100644 --- a/third_party/nixpkgs/pkgs/README.md +++ b/third_party/nixpkgs/pkgs/README.md @@ -7,7 +7,7 @@ See the [CONTRIBUTING.md](../CONTRIBUTING.md) document for more general informat - [`top-level`](./top-level): Entrypoints, package set aggregations - [`impure.nix`](./top-level/impure.nix), [`default.nix`](./top-level/default.nix), [`config.nix`](./top-level/config.nix): Definitions for the evaluation entry point of `import ` - - [`stage.nix`](./top-level/stage.nix), [`all-packages.nix`](./top-level/all-packages.nix), [`splice.nix`](./top-level/splice.nix): Definitions for the top-level attribute set made available through `import {…}` + - [`stage.nix`](./top-level/stage.nix), [`all-packages.nix`](./top-level/all-packages.nix), [`by-name-overlay.nix`](./top-level/by-name-overlay.nix), [`splice.nix`](./top-level/splice.nix): Definitions for the top-level attribute set made available through `import {…}` - `*-packages.nix`, [`linux-kernels.nix`](./top-level/linux-kernels.nix), [`unixtools.nix`](./top-level/unixtools.nix): Aggregations of nested package sets defined in `development` - [`aliases.nix`](./top-level/aliases.nix), [`python-aliases.nix`](./top-level/python-aliases.nix): Aliases for package definitions that have been renamed or removed - `release*.nix`, [`make-tarball.nix`](./top-level/make-tarball.nix), [`packages-config.nix`](./top-level/packages-config.nix), [`metrics.nix`](./top-level/metrics.nix), [`nixpkgs-basic-release-checks.nix`](./top-level/nixpkgs-basic-release-checks.nix): Entry-points and utilities used by Hydra for continuous integration @@ -19,11 +19,29 @@ See the [CONTRIBUTING.md](../CONTRIBUTING.md) document for more general informat - [`stdenv`](./stdenv): [Standard environment](https://nixos.org/manual/nixpkgs/stable/#part-stdenv) - [`pkgs-lib`](./pkgs-lib): Definitions for utilities that need packages but are not needed for packages - [`test`](./test): Tests not directly associated with any specific packages +- [`by-name`](./by-name): Top-level packages organised by name ([docs](./by-name/README.md)) - All other directories loosely categorise top-level packages definitions, see [category hierarchy][categories] ## Quick Start to Adding a Package -To add a package to Nixpkgs: +We welcome new contributors of new packages to Nixpkgs, arguably the greatest software database known. However, each new package comes with a cost for the maintainers, Continuous Integration, caching servers and users downloading Nixpkgs. + +Before adding a new package, please consider the following questions: + +* Is the package ready for general use? We don't want to include projects that are too immature or are going to be abandoned immediately. In case of doubt, check with upstream. +* Does the project have a clear license statement? Remember that software is unfree by default (all rights reserved), and merely providing access to the source code does not imply its redistribution. In case of doubt, ask upstream. +* How realistic is it that it will be used by other people? It's good that nixpkgs caters to various niches, but if it's a niche of 5 people it's probably too small. +* Are you willing to maintain the package? You should care enough about the package to be willing to keep it up and running for at least one complete Nixpkgs' release life-cycle. + +If any of these questions' answer is no, then you should probably not add the package. + +This is section describes a general framework of understanding and exceptions might apply. + +Luckily it's pretty easy to maintain your own package set with Nix, which can then be added to the [Nix User Repository](https://github.com/nix-community/nur) project. + +--- + +Now that this is out of the way. To add a package to Nixpkgs: 1. Checkout the Nixpkgs source tree: @@ -32,22 +50,25 @@ To add a package to Nixpkgs: $ cd nixpkgs ``` -2. Find a good place in the Nixpkgs tree to add the Nix expression for your package. For instance, a library package typically goes into `pkgs/development/libraries/pkgname`, while a web browser goes into `pkgs/applications/networking/browsers/pkgname`. See the [category hierarchy section][categories] for some hints on the tree organisation. Create a directory for your package, e.g. +2. Create a package directory `pkgs/by-name/so/some-package` where `some-package` is the package name and `so` is the lowercased 2-letter prefix of the package name: ```ShellSession - $ mkdir pkgs/development/libraries/libfoo + $ mkdir -p pkgs/by-name/so/some-package ``` -3. In the package directory, create a Nix expression — a piece of code that describes how to build the package. In this case, it should be a _function_ that is called with the package dependencies as arguments, and returns a build of the package in the Nix store. The expression should usually be called `default.nix`. + For more detailed information, see [here](./by-name/README.md). + +3. Create a `package.nix` file in the package directory, containing a Nix expression — a piece of code that describes how to build the package. In this case, it should be a _function_ that is called with the package dependencies as arguments, and returns a build of the package in the Nix store. ```ShellSession - $ emacs pkgs/development/libraries/libfoo/default.nix - $ git add pkgs/development/libraries/libfoo/default.nix + $ emacs pkgs/by-name/so/some-package/package.nix + $ git add pkgs/by-name/so/some-package/package.nix ``` - You can have a look at the existing Nix expressions under `pkgs/` to see how it’s done. Here are some good ones: + You can have a look at the existing Nix expressions under `pkgs/` to see how it’s done, some of which are also using the [category hierarchy](#category-hierarchy). + Here are some good ones: - - GNU Hello: [`pkgs/applications/misc/hello/default.nix`](applications/misc/hello/default.nix). Trivial package, which specifies some `meta` attributes which is good practice. + - GNU Hello: [`pkgs/by-name/he/hello/package.nix`](./by-name/he/hello/package.nix). Trivial package, which specifies some `meta` attributes which is good practice. - GNU cpio: [`pkgs/tools/archivers/cpio/default.nix`](tools/archivers/cpio/default.nix). Also a simple package. The generic builder in `stdenv` does everything for you. It has no dependencies beyond `stdenv`. @@ -67,7 +88,9 @@ To add a package to Nixpkgs: Some notes: - - All [`meta`](https://nixos.org/manual/nixpkgs/stable/#chap-meta) attributes are optional, but it’s still a good idea to provide at least the `description`, `homepage` and [`license`](https://nixos.org/manual/nixpkgs/stable/#sec-meta-license). + - Add yourself as the maintainer of the package. + + - All other [`meta`](https://nixos.org/manual/nixpkgs/stable/#chap-meta) attributes are optional, but it’s still a good idea to provide at least the `description`, `homepage` and [`license`](https://nixos.org/manual/nixpkgs/stable/#sec-meta-license). - You can use `nix-prefetch-url url` to get the SHA-256 hash of source distributions. There are similar commands as `nix-prefetch-git` and `nix-prefetch-hg` available in `nix-prefetch-scripts` package. @@ -75,21 +98,13 @@ To add a package to Nixpkgs: The exact syntax and semantics of the Nix expression language, including the built-in function, are [described in the Nix manual](https://nixos.org/manual/nix/stable/language/). -4. Add a call to the function defined in the previous step to [`pkgs/top-level/all-packages.nix`](top-level/all-packages.nix) with some descriptive name for the variable, e.g. `libfoo`. - - ```ShellSession - $ emacs pkgs/top-level/all-packages.nix - ``` - - The attributes in that file are sorted by category (like “Development / Libraries”) that more-or-less correspond to the directory structure of Nixpkgs, and then by attribute name. - 5. To test whether the package builds, run the following command from the root of the nixpkgs source tree: ```ShellSession - $ nix-build -A libfoo + $ nix-build -A some-package ``` - where `libfoo` should be the variable name defined in the previous step. You may want to add the flag `-K` to keep the temporary build directory in case something fails. If the build succeeds, a symlink `./result` to the package in the Nix store is created. + where `some-package` should be the package name. You may want to add the flag `-K` to keep the temporary build directory in case something fails. If the build succeeds, a symlink `./result` to the package in the Nix store is created. 6. If you want to install the package into your profile (optional), do @@ -102,9 +117,19 @@ To add a package to Nixpkgs: ## Category Hierarchy [categories]: #category-hierarchy -Each package should be stored in its own directory somewhere in the `pkgs/` tree, i.e. in `pkgs/category/subcategory/.../pkgname`. Below are some rules for picking the right category for a package. Many packages fall under several categories; what matters is the _primary_ purpose of a package. For example, the `libxml2` package builds both a library and some tools; but it’s a library foremost, so it goes under `pkgs/development/libraries`. +Most top-level packages are organised in a loosely-categorised directory hierarchy in this directory. +See the [overview](#overview) for which directories are part of this. -When in doubt, consider refactoring the `pkgs/` tree, e.g. creating new categories or splitting up an existing category. +This category hierarchy is partially deprecated and will be migrated away over time. +The new `pkgs/by-name` directory ([docs](./by-name/README.md)) should be preferred instead. +The category hierarchy may still be used for packages that should be imported using an alternate `callPackage`, such as `python3Packages.callPackage` or `libsForQt5.callPackage`. + +If that is the case for a new package, here are some rules for picking the right category. +Many packages fall under several categories; what matters is the _primary_ purpose of a package. +For example, the `libxml2` package builds both a library and some tools; but it’s a library foremost, so it goes under `pkgs/development/libraries`. + +
+Categories **If it’s used to support _software development_:** @@ -280,6 +305,8 @@ A (typically large) program with a distinct user interface, primarily used inter - `misc` +
+ # Conventions ## Package naming @@ -329,14 +356,15 @@ All versions of a package _must_ be included in `all-packages.nix` to make sure * Not start with the package name. * More generally, it should not refer to the package name. * Not end with a period (or any punctuation for that matter). - * Aim to inform while avoiding subjective language. -* `meta.license` must be set and fit the upstream license. + * Provide factual information. + * Avoid subjective language. +* `meta.license` must be set and match the upstream license. * If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`. * If in doubt, try to contact the upstream developers for clarification. * `meta.mainProgram` must be set when appropriate. * `meta.maintainers` should be set. -See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes). +See the Nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes). ### Import From Derivation diff --git a/third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix b/third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix index c479ebe7ee..f46f3053a2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/airwindows-lv2/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, lv2 }: +{ lib, stdenv, fetchFromSourcehut, meson, ninja, pkg-config, lv2 }: stdenv.mkDerivation rec { pname = "airwindows-lv2"; - version = "20.0"; - src = fetchFromGitHub { - owner = "hannesbraun"; + version = "22.0"; + src = fetchFromSourcehut { + owner = "~hannes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uflvUmUzOtF3BwiLfnd+qhz+ZYyn8AKvODFs599phhU="; + sha256 = "sha256-u62wLRrJ45ap981Q8JmMnanc8AWQb1MJHK32PEr10I4="; }; nativeBuildInputs = [ meson ninja pkg-config ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Airwindows plugins (ported to LV2)"; - homepage = "https://github.com/hannesbraun/airwindows-lv2"; + homepage = "https://sr.ht/~hannes/airwindows-lv2"; license = licenses.mit; maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/audio/alsa-scarlett-gui/default.nix b/third_party/nixpkgs/pkgs/applications/audio/alsa-scarlett-gui/default.nix index 0ce5bd359e..4b40069eae 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/alsa-scarlett-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/alsa-scarlett-gui/default.nix @@ -2,6 +2,8 @@ , stdenv , fetchFromGitHub , pkg-config +, makeWrapper +, alsa-utils , alsa-lib , gtk4 , wrapGAppsHook4 @@ -22,9 +24,11 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=\${out}" "PREFIX=''" ]; sourceRoot = "${src.name}/src"; - nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook4 makeWrapper ]; buildInputs = [ gtk4 alsa-lib ]; postInstall = '' + wrapProgram $out/bin/alsa-scarlett-gui --prefix PATH : ${lib.makeBinPath [ alsa-utils ]} + substituteInPlace $out/share/applications/vu.b4.alsa-scarlett-gui.desktop \ --replace "Exec=/bin/alsa-scarlett-gui" "Exec=$out/bin/alsa-scarlett-gui" ''; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix index 2c8a44f621..ab9b2ebcd9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix @@ -58,14 +58,14 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "7.4"; + version = "7.5"; # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info. src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - hash = "sha256-CUGhJi3ji0F6v41Y08sQvo7oKITOJ96ojdJL+FyCxmw="; + hash = "sha256-cmYt6fGYuuVs6YhAXaO9AG6TrYLDVUaE1/iC67rt76I="; }; bundledContent = fetchzip { diff --git a/third_party/nixpkgs/pkgs/applications/audio/aucatctl/default.nix b/third_party/nixpkgs/pkgs/applications/audio/aucatctl/default.nix index 6670e06a21..cf53a20700 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/aucatctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/aucatctl/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, sndio, libbsd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "aucatctl"; version = "0.1"; src = fetchurl { - url = "http://www.sndio.org/${pname}-${version}.tar.gz"; + url = "http://www.sndio.org/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "524f2fae47db785234f166551520d9605b9a27551ca438bd807e3509ce246cf0"; }; @@ -27,11 +27,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = - "The aucatctl utility sends MIDI messages to control sndiod and/or aucat volumes"; + description = "The aucatctl utility sends MIDI messages to control sndiod and/or aucat volumes"; homepage = "http://www.sndio.org"; license = licenses.isc; maintainers = with maintainers; [ sna ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix index e805dd1f90..6c1bd006c7 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -17,14 +17,14 @@ assert lib.versionAtLeast qtbase.version "6.0" -> qt5compat != null; stdenv.mkDerivation (finalAttrs: { pname = "bambootracker"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-rn6PNxVsLEXz8q3nvMMhKV1/Woq2CxROf0qsQJykyUs="; + hash = "sha256-rMYs2jixzoMGem9lxAjDMbFOMrnK8BLFjZIagdZk/Ok="; }; postPatch = lib.optionalString (lib.versionAtLeast qtbase.version "6.0") '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/baudline/default.nix b/third_party/nixpkgs/pkgs/applications/audio/baudline/default.nix index 6e5c53091d..4856a0ed01 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/baudline/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/baudline/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "http://www.baudline.com/baudline_${version}_linux_x86_64.tar.gz"; + url = "https://www.baudline.com/baudline_${version}_linux_x86_64.tar.gz"; sha256 = "09fn0046i69in1jpizkzbaq5ggij0mpflcsparyskm3wh71mbzvr"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "http://www.baudline.com/baudline_${version}_linux_i686.tar.gz"; + url = "https://www.baudline.com/baudline_${version}_linux_i686.tar.gz"; sha256 = "1waip5pmcf5ffcfvn8lf1rvsaq2ab66imrbfqs777scz7k8fhhjb"; } else diff --git a/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix index e6aaeb1291..1d1afc0dd9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { pname = "bchoppr"; - version = "1.12.2"; + version = "1.12.6"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-P6sbxhgnlek1IJ4i9yTe/3g/2C8oLPKXI3zbLdswvl8="; + sha256 = "sha256-/aLoLUpWu66VKd9lwjli+FZZctblrZUPSEsdYH85HwQ="; + fetchSubmodules = true; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix index ad19192ce7..752088fcd8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bespokesynth/default.nix @@ -36,6 +36,7 @@ , CoreServices , CoreAudioKit , IOBluetooth +, MetalKit # It is not allowed to distribute binaries with the VST2 SDK plugin without a license # (the author of Bespoke has such a licence but not Nix). VST3 should work out of the box. # Read more in https://github.com/NixOS/nixpkgs/issues/145607 @@ -58,20 +59,16 @@ let in stdenv.mkDerivation rec { pname = "bespokesynth"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "BespokeSynth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PN0Q6/gI1PeMaF/8EZFGJdLR8JVHQZfWunAhOIQxkHw="; + hash = "sha256-vDvNm9sW9BfWloB0CA+JHTp/bfDWAP/T0hDXjoMZ3X4="; fetchSubmodules = true; }; - postPatch = '' - sed '1i#include ' -i Source/TitleBar.h # gcc12 - ''; - cmakeBuildType = "Release"; cmakeFlags = lib.optionals enableVST2 [ "-DBESPOKE_VST2_SDK_LOCATION=${vst-sdk}/VST2_SDK" ]; @@ -79,7 +76,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python3 makeWrapper cmake pkg-config ninja ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ - # List obtained in https://github.com/BespokeSynth/BespokeSynth/blob/main/azure-pipelines.yml + # List obtained from https://github.com/BespokeSynth/BespokeSynth/blob/main/azure-pipelines.yml libX11 libXrandr libXinerama @@ -110,6 +107,7 @@ stdenv.mkDerivation rec { CoreServices CoreAudioKit IOBluetooth + MetalKit ]; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin (toString [ @@ -133,23 +131,27 @@ stdenv.mkDerivation rec { --prefix PATH : '${lib.makeBinPath [ gnome.zenity (python3.withPackages (ps: with ps; [ jedi ])) - ]}' \ - --prefix LD_LIBRARY_PATH : '${lib.makeLibraryPath [ - libXrandr - libXinerama - libXcursor - libXScrnSaver ]}' ''; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux "-rpath ${lib.makeLibraryPath ([ + libX11 + libXrandr + libXinerama + libXext + libXcursor + libXScrnSaver + ])}"; + dontPatchELF = true; # needed or nix will try to optimize the binary by removing "useless" rpath + meta = with lib; { description = "Software modular synth with controllers support, scripting and VST"; - homepage = "https://github.com/awwbees/BespokeSynth"; + homepage = "https://www.bespokesynth.com/"; license = with licenses; [ gpl3Plus ] ++ lib.optional enableVST2 unfree; - maintainers = with maintainers; [ astro tobiasBora OPNA2608 ]; + maintainers = with maintainers; [ astro tobiasBora OPNA2608 PowerUser64 ]; mainProgram = "BespokeSynth"; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 5eb94f8445..5f750a885d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "3.3.7"; + version = "3.3.11"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "13jr45kzv0xjhhqk30qpq793349qyx8jpas4kl6i6bk3xfrd3fbz"; + sha256 = "sha256-cF8gVPjM0KUcKOW09uFccp4/lzbUmZcBkVOwr/A/8Yw="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; @@ -36,11 +36,8 @@ stdenv.mkDerivation rec { cp -r opt/bitwig-studio $out/libexec ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio cp -r usr/share $out/share - substitute usr/share/applications/bitwig-studio.desktop \ - $out/share/applications/bitwig-studio.desktop \ - --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio - runHook postInstall + runHook postInstall ''; postFixup = '' @@ -60,7 +57,6 @@ stdenv.mkDerivation rec { --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" \ --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}" done - ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix index 75aef2b279..ac58eed5fa 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "5.0.4"; + version = "5.0.7"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-IkhUkKO+Ay1WceZNekII6aHLOmgcgGfx0hGo5ldFE5Y="; + sha256 = "sha256-jsHGUAVRUiz9soffW1PvF6UUGzbGhltaKtEW5ynq/Xk="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix index d2a6214214..731cb63c4d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix @@ -1,5 +1,4 @@ -{ - stdenv +{ stdenv , fetchFromGitHub , fetchurl , cmake @@ -28,12 +27,11 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "23.02"; + version = "23.09"; src = fetchurl { - url = - "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal-${version}+deps.tar.xz"; - sha256 = "sha256-5vEWTkEXIMG/re7Ex+YKh+ETLDuc2nihTPpYSg5LdRo="; + url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; + hash = "sha256-q42ry47y4tTkUbejv6iN5jXcadXSSTPQ3omhMUevfqU="; }; prePatch = '' @@ -51,6 +49,7 @@ stdenv.mkDerivation rec { makeWrapper python3 ]; + buildInputs = [ dbus fftwFloat @@ -76,6 +75,9 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/Cardinal \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]} + wrapProgram $out/bin/CardinalMini \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]} + # this doesn't work and is mainly just a test tool for the developers anyway. rm -f $out/bin/CardinalNative ''; @@ -84,7 +86,7 @@ stdenv.mkDerivation rec { description = "Plugin wrapper around VCV Rack"; homepage = "https://github.com/DISTRHO/cardinal"; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.magnetophon ]; + maintainers = with lib.maintainers; [ magnetophon PowerUser64 ]; mainProgram = "Cardinal"; platforms = lib.platforms.all; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs diff --git a/third_party/nixpkgs/pkgs/applications/audio/castopod/default.nix b/third_party/nixpkgs/pkgs/applications/audio/castopod/default.nix new file mode 100644 index 0000000000..9d9f83e2ec --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/castopod/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchurl +, ffmpeg-headless +, lib +, nixosTests +, stateDirectory ? "/var/lib/castopod" +}: +stdenv.mkDerivation { + pname = "castopod"; + version = "1.6.4"; + + src = fetchurl { + url = "https://code.castopod.org/adaures/castopod/uploads/ce56d4f149242f12bedd20f9a2b0916d/castopod-1.6.4.tar.gz"; + sha256 = "080jj91yxbn3xsbs0sywzwa2f5in9bp9qi2zwqcfqpaxlq9ga62v"; + }; + + dontBuild = true; + dontFixup = true; + + postPatch = '' + # not configurable at runtime unfortunately: + substituteInPlace app/Config/Paths.php \ + --replace "__DIR__ . '/../../writable'" "'${stateDirectory}/writable'" + + # configuration file must be writable, place it to ${stateDirectory} + substituteInPlace modules/Install/Controllers/InstallController.php \ + --replace "ROOTPATH" "'${stateDirectory}/'" + substituteInPlace public/index.php spark \ + --replace "DotEnv(ROOTPATH)" "DotEnv('${stateDirectory}')" + + # ffmpeg is required for Video Clips feature + substituteInPlace modules/MediaClipper/VideoClipper.php \ + --replace "ffmpeg" "${ffmpeg-headless}/bin/ffmpeg" + substituteInPlace modules/Admin/Controllers/VideoClipsController.php \ + --replace "which ffmpeg" "echo ${ffmpeg-headless}/bin/ffmpeg" + ''; + + installPhase = '' + mkdir -p $out/share/castopod + cp -r . $out/share/castopod + ''; + + passthru.tests.castopod = nixosTests.castopod; + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "An open-source hosting platform made for podcasters who want to engage and interact with their audience"; + homepage = "https://castopod.org"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ alexoundos misuzu ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/castopod/update.sh b/third_party/nixpkgs/pkgs/applications/audio/castopod/update.sh new file mode 100755 index 0000000000..742788dc8d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/castopod/update.sh @@ -0,0 +1,89 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq +set -euo pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" +castopod_nix="$nixpkgs/pkgs/applications/audio/castopod/default.nix" + +# https://www.meetup.com/api/guide/#p02-querying-section +query=' +query allReleases($fullPath: ID!, $first: Int, $last: Int, $before: String, $after: String, $sort: ReleaseSort) { + project(fullPath: $fullPath) { + id + releases( + first: $first + last: $last + before: $before + after: $after + sort: $sort + ) { + nodes { + ...Release + __typename + } + __typename + } + __typename + } +} + +fragment Release on Release { + id + name + tagName + releasedAt + createdAt + upcomingRelease + historicalRelease + assets { + links { + nodes { + id + name + url + directAssetUrl + linkType + __typename + } + __typename + } + __typename + } + __typename +} +' +variables='{ + "fullPath": "adaures/castopod", + "first": 1, + "sort": "RELEASED_AT_DESC" +}' + +post=$(cat < pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.48"; + version = "0.49"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "sha256-89hBaWFwMPBqSWDmsXND0PEc1a9Fte+p1ho5tWuZFlY="; + sha256 = "sha256-rqIlQQ9RhFrhPwUd9dZmMZiqwFinNoV46VaJ3pbyUI8="; }; buildInputs = [ glib ncurses libmpdclient boost ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/noson/default.nix b/third_party/nixpkgs/pkgs/applications/audio/noson/default.nix index f1b932013a..fb37c93e10 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/noson/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/noson/default.nix @@ -8,22 +8,24 @@ , qtgraphicaleffects , qtquickcontrols2 , wrapQtAppsHook +, makeWrapper }: stdenv.mkDerivation (finalAttrs: { pname = "noson"; - version = "5.4.1"; + version = "5.6.0"; src = fetchFromGitHub { owner = "janbar"; repo = "noson-app"; rev = finalAttrs.version; - hash = "sha256-7RrBfkUCRVzUGl+OT3OuoMlu4D3Sa7RpBefFgmfX1Fs="; + hash = "sha256-ZOAnH7pdhlTbqHOM0kiCWcHYJvnskigWdz3N9WjtM0M="; }; nativeBuildInputs = [ cmake wrapQtAppsHook + makeWrapper ]; buildInputs = [ @@ -36,7 +38,9 @@ stdenv.mkDerivation (finalAttrs: { # wrapQtAppsHook doesn't automatically find noson-gui dontWrapQtApps = true; + preFixup = '' + wrapProgram "$out/bin/noson-app" --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio ]} wrapQtApp "$out/lib/noson/noson-gui" ''; diff --git a/third_party/nixpkgs/pkgs/applications/audio/nuclear/default.nix b/third_party/nixpkgs/pkgs/applications/audio/nuclear/default.nix index 6fd277a39a..605596563e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/nuclear/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/nuclear/default.nix @@ -1,33 +1,38 @@ -{ - appimageTools, - lib, - fetchurl, -}: let +{ appimageTools +, lib +, fetchurl +}: +let pname = "nuclear"; - version = "0.6.27"; + version = "0.6.30"; src = fetchurl { url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}.AppImage"; - hash = "sha256-vCtGuId2yMVIQrMZcjN1i2buV4sah2qKupbr4LhqMbA="; + hash = "sha256-he1uGC1M/nFcKpMM9JKY4oeexJcnzV0ZRxhTjtJz6xw="; }; - appimageContents = appimageTools.extract {inherit pname version src;}; + appimageContents = appimageTools.extract { inherit pname version src; }; in - appimageTools.wrapType2 { - inherit pname version src; +appimageTools.wrapType2 { + inherit pname version src; - extraInstallCommands = '' - install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - cp -r ${appimageContents}/usr/share/icons $out/share - ''; + extraInstallCommands = '' + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share - meta = with lib; { - description = "Streaming music player that finds free music for you"; - homepage = "https://nuclear.js.org/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [NotAShelf ivar]; - platforms = ["x86_64-linux"]; - }; - } + # unless linked, the binary is placed in $out/bin/nuclear-someVersion + # link it to $out/bin/nuclear + ln -s $out/bin/${pname}-${version} $out/bin/${pname} + ''; + + meta = with lib; { + description = "Streaming music player that finds free music for you"; + homepage = "https://nuclear.js.org/"; + license = licenses.agpl3Plus; + maintainers = [ maintainers.NotAShelf ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "nuclear"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix index b0be671d9c..5723a1fd10 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ocenaudio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.12.5"; + version = "3.12.7"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=${version}"; - sha256 = "sha256-+edswdSwuEiGpSNP7FW6xvZy/rH53KcSSGAFXSb0DIM="; + sha256 = "sha256-+D/JvC0emKdxzd0l2n1QZ0geosrMpdpaxru5z61kqxA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix b/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix index 5524c9a536..91e043a593 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix @@ -2,13 +2,13 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.25.2"; + version = "1.25.5"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-7D3C1W2Y7FJnLxbXKXFFPDf+EXhLgPEj0APc2ZFYUlM="; + hash = "sha256-N0bL/kgw5tIVcD4fGYrahdola/w9ouct0+AUqw+dUOg="; }; # Remove some Electron stuff from package.json @@ -16,7 +16,7 @@ buildNpmPackage rec { sed -i -e '/"electron"\|"electron-installer-debian"/d' package.json ''; - npmDepsHash = "sha256-M+6+zrxy8VpJQS0dG/xORMbflKEq8wO2DEOjGrA6OUw="; + npmDepsHash = "sha256-unjoBWVwmUqxAU3mDC37sXzoh7aEOdny4Asa70+sZnk="; nativeBuildInputs = [ copyDesktopItems diff --git a/third_party/nixpkgs/pkgs/applications/audio/parrot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/parrot/default.nix new file mode 100644 index 0000000000..04153c54d9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/parrot/default.nix @@ -0,0 +1,50 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, cmake +, ffmpeg +, libopus +, makeBinaryWrapper +, nix-update-script +, openssl +, pkg-config +, stdenv +, yt-dlp +, Security +}: +let + version = "1.6.0"; +in +rustPlatform.buildRustPackage { + pname = "parrot"; + inherit version; + + src = fetchFromGitHub { + owner = "aquelemiguel"; + repo = "parrot"; + rev = "v${version}"; + hash = "sha256-f6YAdsq2ecsOCvk+A8wsUu+ywQnW//gCAkVLF0HTn8c="; + }; + + cargoHash = "sha256-e4NHgwoNkZ0//rugHrP0gU3pntaMeBJsV/YSzJfD8r4="; + + nativeBuildInputs = [ cmake makeBinaryWrapper pkg-config ]; + + buildInputs = [ libopus openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; + + postInstall = '' + wrapProgram $out/bin/parrot \ + --prefix PATH : ${lib.makeBinPath [ ffmpeg yt-dlp ]} + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A hassle-free Discord music bot"; + homepage = "https://github.com/aquelemiguel/parrot"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gerg-l ]; + mainProgram = "parrot"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/patchance/default.nix b/third_party/nixpkgs/pkgs/applications/audio/patchance/default.nix index 99e622bcf7..7770065b3d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/patchance/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/patchance/default.nix @@ -1,22 +1,23 @@ -{ lib, fetchurl, buildPythonApplication, libjack2, pyqt5, qttools, which }: +{ lib, fetchurl, buildPythonApplication, libjack2, pyqt5, qt5, which, bash }: buildPythonApplication rec { pname = "patchance"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/Houston4444/Patchance/releases/download/v${version}/Patchance-${version}-source.tar.gz"; - sha256 = "sha256-8Zn6xcDv4hBFXnaXK9xslYEB8uHEfIP+1NKvcPAyHj0="; + sha256 = "sha256-wlkEKkPH2C/y7TQicIVycWbtLUdX2hICcUWi7nFN51w="; }; format = "other"; nativeBuildInputs = [ pyqt5 # pyuic5 and pyrcc5 to build resources. - qttools # lrelease to build translations. + qt5.qttools # lrelease to build translations. which # which to find lrelease. + qt5.wrapQtAppsHook ]; - buildInputs = [ libjack2 ]; + buildInputs = [ libjack2 bash ]; propagatedBuildInputs = [ pyqt5 ]; dontWrapQtApps = true; # The program is a python script. @@ -27,8 +28,15 @@ buildPythonApplication rec { "--prefix" "LD_LIBRARY_PATH" ":" (lib.makeLibraryPath [ libjack2 ]) ]; + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + postFixup = '' wrapPythonProgramsIn "$out/share/patchance/src" "$out $pythonPath" + for file in $out/bin/*; do + wrapQtApp "$file" + done ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix index f5f420aab0..1f811c2767 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix @@ -1,9 +1,11 @@ { lib , python3Packages , fetchFromGitHub -, gettext + , chromaprint +, gettext , qt5 + , enablePlayback ? true , gst_all_1 }: @@ -19,13 +21,14 @@ let in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.9.1"; + version = "2.9.2"; + format = "setuptools"; src = fetchFromGitHub { owner = "metabrainz"; repo = "picard"; rev = "refs/tags/release-${version}"; - hash = "sha256-KCLva8pc+hyz+3MkPsghXrDYGVqP0aeffG9hOYJzI+Q="; + hash = "sha256-Sk4QlwJqqgCWAgguhIVscJfpf/5imoHYN9yVWv5qYG8="; }; nativeBuildInputs = [ @@ -48,16 +51,18 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ chromaprint - python-dateutil discid fasteners - mutagen - pyqt5 markdown + mutagen pyjwt + pyqt5 + python-dateutil pyyaml ]; + setupPyGlobalFlags = [ "build" "--disable-autoupdate" ]; + preCheck = '' export HOME=$(mktemp -d) ''; @@ -65,14 +70,13 @@ pythonPackages.buildPythonApplication rec { # In order to spare double wrapping, we use: preFixup = '' makeWrapperArgs+=("''${qtWrapperArgs[@]}") - '' - + lib.optionalString (pyqt5.multimediaEnabled) '' + '' + lib.optionalString (pyqt5.multimediaEnabled) '' makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") ''; meta = with lib; { - homepage = "https://picard.musicbrainz.org/"; - changelog = "https://picard.musicbrainz.org/changelog/"; + homepage = "https://picard.musicbrainz.org"; + changelog = "https://picard.musicbrainz.org/changelog"; description = "The official MusicBrainz tagger"; maintainers = with maintainers; [ ehmry paveloom ]; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix index d39b0217dc..c3d36d3b38 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "4.8.2"; + version = "4.8.3"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "7NQmH42yzItReQ5WPdcbNPr/xed74H4UyDNlX5PGmoJRBpV1RdeuW1KRweIWfYNhw0KeqULVTjr/aCggoWp4WA=="; + hash = "sha512-CrSXmRVatVSkMyB1QaNSL/tK60rQvT9JraRtYYLl0Fau3M1LJXK9yqvt77AjwIwIvi2Dm5SROG+c4rA1XtI4Yg=="; }; appimageContents = appimageTools.extractType2 { @@ -33,7 +33,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; - changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/52"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/53"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix index 352a52e42f..8b2770ecd2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.3.14"; + version = "6.3.16"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-HN4w7n0nh7voL/QKhGQwCcGfzn+nyFOwluESlP3B6VM="; + hash = "sha256-0g16EblefuUU99RgcwtGrPWniGGlOt6GjVjyNdzN3GY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index 5373f6a127..940a281a1c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.61"; + version = "1.64"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-V3i6Bn2urd4l3O0GhOobDutnnXBTjYGYb0Bsa5URbxc="; + sha256 = "sha256-b/1YksgXKXi6Tyntd03yWKZAAjvmG4HxsVYLVXoiMaA="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/qmidiroute/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qmidiroute/default.nix deleted file mode 100644 index 35aea5bd08..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/qmidiroute/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, qt4, alsa-lib }: - -stdenv.mkDerivation rec { - version = "0.4.0"; - pname = "qmidiroute"; - - src = fetchurl { - url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${pname}-${version}.tar.gz"; - sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ qt4 alsa-lib ]; - - meta = with lib; { - description = "MIDI event processor and router"; - longDescription = '' - qmidiroute is a versatile MIDI event processor and router for the ALSA - sequencer. The graphical interface is based on the Qt4 toolkit. - qmidiroute permits setting up an unlimited number of MIDI maps in which - incoming events are selected, modified or even changed in type before - being directed to a dedicated ALSA output port. The maps work in - parallel, and they are organized in tabs. - ''; - - license = licenses.gpl2; - maintainers = [ maintainers.lebastr ]; - platforms = lib.platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix index a2eed4be20..01d35ba259 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-qcd19YI2RDoh+vjeelxNajWsUwVokLu0kh35a4oezKA="; + sha256 = "sha256-50KaVpNB5/CTLs2bRbXEinYM23AZxZO/ForrVPFDN8U="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/qtscrobbler/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qtscrobbler/default.nix deleted file mode 100644 index 081b0c9288..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/qtscrobbler/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkg-config, which, qt4, qmake4Hook }: - -stdenv.mkDerivation rec { - pname = "qtscrobbler"; - version = "0.11"; - - src = fetchurl { - url = "mirror://sourceforge/qtscrob/qtscrob/${version}/qtscrob-${version}.tar.bz2"; - sha256 = "01c8e48f616ed09504833d27d92fd62f455bd645ea2d1cc2a5f4c287d641daba"; - }; - - nativeBuildInputs = [ qmake4Hook ] ++ lib.optionals withMtp [ pkg-config which ]; - buildInputs = [ qt4 ] ++ lib.optional withMtp libmtp; - - enableParallelBuilding = true; - - postPatch = '' - cd src - sed -i -e "s,/usr/local,$out," -e "s,/usr,," common.pri - ''; - - meta = with lib; { - description = "Qt based last.fm scrobbler"; - longDescription = '' - QTScrobbler is a tool to upload information about the tracks you have played from your Digital Audio Player (DAP) to your last.fm account. - It is able to gather this information from Apple iPods or DAPs running the Rockbox replacement firmware. - ''; - - homepage = "https://qtscrob.sourceforge.net"; - license = licenses.gpl2; - maintainers = [ maintainers.vanzef ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix b/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix index f0dc71aa47..eacce636df 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/quodlibet/default.nix @@ -1,14 +1,13 @@ { lib , fetchFromGitHub -, fetchpatch , tag ? "" -# build time + # build time , gettext , gobject-introspection , wrapGAppsHook -# runtime + # runtime , adwaita-icon-theme , gdk-pixbuf , glib @@ -23,20 +22,22 @@ , libsoup , webkitgtk -# optional features + # optional features , withDbusPython ? false -, withPypresence ? false -, withPyInotify ? false , withMusicBrainzNgs ? false , withPahoMqtt ? false +, withPyInotify ? false +, withPypresence ? false , withSoco ? false -# backends -, withGstreamerBackend ? true, gst_all_1 + # backends , withGstPlugins ? withGstreamerBackend -, withXineBackend ? true, xine-lib +, withGstreamerBackend ? true +, gst_all_1 +, withXineBackend ? true +, xine-lib -# tests + # tests , dbus , glibcLocales , hicolor-icon-theme @@ -46,36 +47,25 @@ python3.pkgs.buildPythonApplication rec { pname = "quodlibet${tag}"; - version = "4.5.0"; + version = "4.6.0"; format = "pyproject"; + outputs = [ "out" "doc" ]; + src = fetchFromGitHub { owner = "quodlibet"; repo = "quodlibet"; rev = "refs/tags/release-${version}"; - hash = "sha256-G6zcdnHkevbVCrMoseWoSia5ajEor8nZhee6NeZIs8Q="; + hash = "sha256-dkO/CFN7Dk72xhtmcSDcwUciOPMeEjQS2mch+jSfiII="; }; - patches = [ - (fetchpatch { - # Fixes cover globbing under python 3.10.5+ - url = "https://github.com/quodlibet/quodlibet/commit/5eb7c30766e1dcb30663907664855ee94a3accc0.patch"; - hash = "sha256-bDyEOE7Vs4df4BeN4QMvt6niisVEpvc1onmX5rtoAWc="; - }) - ]; - - outputs = [ - "out" - "doc" - ]; - nativeBuildInputs = [ gettext gobject-introspection wrapGAppsHook ] ++ (with python3.pkgs; [ - sphinxHook sphinx-rtd-theme + sphinxHook ]); buildInputs = [ @@ -111,14 +101,12 @@ python3.pkgs.buildPythonApplication rec { pygobject3 ] ++ lib.optionals withDbusPython [ dbus-python ] - ++ lib.optionals withPypresence [ pypresence ] - ++ lib.optionals withPyInotify [ pyinotify ] ++ lib.optionals withMusicBrainzNgs [ musicbrainzngs ] ++ lib.optionals withPahoMqtt [ paho-mqtt ] + ++ lib.optionals withPyInotify [ pyinotify ] + ++ lib.optionals withPypresence [ pypresence ] ++ lib.optionals withSoco [ soco ]; - LC_ALL = "en_US.UTF-8"; - nativeCheckInputs = [ dbus gdk-pixbuf @@ -132,23 +120,23 @@ python3.pkgs.buildPythonApplication rec { ]); pytestFlags = [ - # requires networking - "--deselect=tests/test_browsers_iradio.py::TIRFile::test_download_tags" # missing translation strings in potfiles "--deselect=tests/test_po.py::TPOTFILESIN::test_missing" + # require networking + "--deselect=tests/plugin/test_covers.py::test_live_cover_download" + "--deselect=tests/test_browsers_iradio.py::TInternetRadio::test_click_add_station" # upstream does actually not enforce source code linting "--ignore=tests/quality" - # build failure on Arch Linux - # https://github.com/NixOS/nixpkgs/pull/77796#issuecomment-575841355 - "--ignore=tests/test_operon.py" ] ++ lib.optionals (withXineBackend || !withGstPlugins) [ "--ignore=tests/plugin/test_replaygain.py" ]; + env.LC_ALL = "en_US.UTF-8"; + preCheck = '' - export XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_ICON_DIRS:$XDG_DATA_DIRS" export GDK_PIXBUF_MODULE_FILE=${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache export HOME=$(mktemp -d) + export XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_ICON_DIRS:$XDG_DATA_DIRS" ''; checkPhase = '' @@ -167,8 +155,6 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "GTK-based audio player written in Python, using the Mutagen tagging library"; - license = licenses.gpl2Plus; - longDescription = '' Quod Libet is a GTK-based audio player written in Python, using the Mutagen tagging library. It's designed around the idea that @@ -182,8 +168,8 @@ python3.pkgs.buildPythonApplication rec { player, like Unicode support, tag editing, Replay Gain, podcasts & internet radio, and all major audio formats. ''; - - maintainers = with maintainers; [ coroa pbogdan ]; - homepage = "https://quodlibet.readthedocs.io/en/latest/"; + homepage = "https://quodlibet.readthedocs.io/en/latest"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ coroa paveloom pbogdan ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/raysession/default.nix b/third_party/nixpkgs/pkgs/applications/audio/raysession/default.nix index 279d0f85b2..f12fd7a15c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/raysession/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/raysession/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, qttools, which, bash }: +{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, which, bash, qt5 }: buildPythonApplication rec { pname = "raysession"; @@ -20,8 +20,9 @@ buildPythonApplication rec { nativeBuildInputs = [ pyqt5 # pyuic5 and pyrcc5 to build resources. - qttools # lrelease to build translations. + qt5.qttools # lrelease to build translations. which # which to find lrelease. + qt5.wrapQtAppsHook ]; buildInputs = [ libjack2 bash ]; propagatedBuildInputs = [ pydbus pyliblo pyqt5 ]; @@ -36,6 +37,9 @@ buildPythonApplication rec { postFixup = '' wrapPythonProgramsIn "$out/share/raysession/src" "$out $pythonPath" + for file in $out/bin/*; do + wrapQtApp "$file" + done ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix index 0ddebe704f..7c9e90fe9a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -25,13 +25,13 @@ let in stdenv.mkDerivation rec { pname = "reaper"; - version = "6.81"; + version = "6.82"; src = fetchurl { url = url_for_platform version stdenv.hostPlatform.qemuArch; hash = { - x86_64-linux = "sha256-Zzt/g96yAztE0NjVa4uaWXBckSvnGxP0K87Hmq82Mi0="; - aarch64-linux = "sha256-PNUUm7xNpPRyQaZm9YDXysJ1yo/IzxUz+kqI6/Z6fpo="; + x86_64-linux = "sha256-2vtkOodMj0JGLQQn4a+XHxodHQqpnSW1ea7v6aC9sHo="; + aarch64-linux = "sha256-FBNfXTnxqq22CnFrE2zvf6kDy/p/+SXOzqz7JS3IdG8="; }.${stdenv.hostPlatform.system}; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix b/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix index 44dbff6077..a67832d2d6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/renoise/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { } else releasePath - else throw "Platform is not supported. Use instalation native to your platform https://www.renoise.com/"; + else throw "Platform is not supported. Use installation native to your platform https://www.renoise.com/"; buildInputs = [ alsa-lib libjack2 libX11 libXcursor libXext libXrandr ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix index c491d8ef24..6e6110fe22 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/schismtracker/default.nix @@ -4,18 +4,20 @@ , autoreconfHook , alsa-lib , python3 -, SDL +, SDL2 +, libXext +, Cocoa }: stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20220506"; + version = "20230906"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-fK0FBn9e7l1Y/A7taFlaoas6ZPREFhEmskVBqjda6q0="; + sha256 = "sha256-eW1sqfcAR3lutSyQKj7j1elkFTa8jfZqgrJYYAzMlzo="; }; configureFlags = [ "--enable-dependency-tracking" ] @@ -23,10 +25,18 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook python3 ]; - buildInputs = [ SDL ] ++ lib.optional stdenv.isLinux alsa-lib; + buildInputs = [ SDL2 ] + ++ lib.optionals stdenv.isLinux [ alsa-lib libXext ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; enableParallelBuilding = true; + # Our Darwin SDL2 doesn't have a SDL2main to link against + preConfigure = lib.optionalString stdenv.isDarwin '' + substituteInPlace configure.ac \ + --replace '-lSDL2main' '-lSDL2' + ''; + meta = with lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; homepage = "http://schismtracker.org/"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/scream/default.nix b/third_party/nixpkgs/pkgs/applications/audio/scream/default.nix index 6d2eae52e5..3c0b83d46c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/scream/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/scream/default.nix @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/duncanthrax/scream"; license = licenses.mspl; platforms = platforms.linux; + mainProgram = "scream"; maintainers = with maintainers; [ arcnmx ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix index 05957bf38f..4f203a77dc 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sfizz/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { --replace '/usr/bin/zenity' '${gnome.zenity}/bin/zenity' ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DSFIZZ_TESTS=ON" ]; + cmakeFlags = [ "-DSFIZZ_TESTS=ON" ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix index 434b8942aa..8cf233c37f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "23.5"; + version = "23.6"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-ZbGrxy494BH6QIj2sYAUEiNBsbNJHXtAVRLPVFwAcQM="; + sha256 = "sha256-3oh2kFhCYe1sl4MN336Z6pEmpluiUnlcC5aAZxn0zIE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix index 03fc6299d5..86746cbc53 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sony-headphones-client/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config copyDesktopItems ]; buildInputs = [ bluez dbus glew glfw imgui ]; - sourceRoot = "./${src.name}/Client"; + sourceRoot = "${src.name}/Client"; cmakeFlags = [ "-Wno-dev" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix deleted file mode 100644 index 7a6399ff3c..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/soundscape-renderer/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, help2man -, pkg-config -, libsndfile -, fftwFloat -, libjack2 -, libxml2 -, qt4 -, boost -, ecasound -, glibcLocales -, libGLU -, libGL # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL -}: - -stdenv.mkDerivation { - pname = "soundscape-renderer"; - version = "unstable-2016-11-03"; - - src = fetchFromGitHub { - owner = "SoundScapeRenderer"; - repo = "ssr"; - rev = "0dd0136dd24e47b63d8a4e05de467f5c7b047ec9"; - sha256 = "sha256-9s+Elaxz9kX+Nle1CqBU/9r0hdI4dhsJ6GrNqvP5HIs="; - }; - - # Without it doesn't find all of the boost libraries. - BOOST_LIB_DIR = "${boost}/lib"; - # uses the deprecated get_generic_category() in boost_system - env.NIX_CFLAGS_COMPILE = "-DBOOST_SYSTEM_ENABLE_DEPRECATED=1"; - - LC_ALL = "en_US.UTF-8"; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ boost boost.dev ecasound libGLU libGL help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; - - # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53 - # 2) Make it find ecasound headers - # 3) Fix locale for help2man - prePatch = '' - substituteInPlace configure.ac --replace 'git describe ||' 'git describe 2> /dev/null ||'; - substituteInPlace configure.ac --replace '/{usr,opt}/{,local/}' '${ecasound}/' - substituteInPlace man/Makefile.am --replace '--locale=en' '--locale=en_US.UTF-8' - ''; - - meta = { - homepage = "http://spatialaudio.net/ssr/"; - description = "The SoundScape Renderer (SSR) is a tool for real-time spatial audio reproduction"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.fridh ]; - }; - -} diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix index 4c5417ab99..aa13693541 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-player/default.nix @@ -4,57 +4,99 @@ , pkg-config , openssl , cmake +# deps for audio backends , alsa-lib +, libpulseaudio +, portaudio +, libjack2 +, SDL2 +, gst_all_1 , dbus , fontconfig , libsixel + +# build options +, withStreaming ? true +, withDaemon ? true +, withAudioBackend ? "rodio" # alsa, pulseaudio, rodio, portaudio, jackaudio, rodiojack, sdl +, withMediaControl ? true +, withLyrics ? true +, withImage ? true +, withNotify ? true +, withSixel ? true +, stdenv +, darwin +, makeBinaryWrapper }: +assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaudio" "rodio" "portaudio" "jackaudio" "rodiojack" "sdl" "gstreamer" ]; + rustPlatform.buildRustPackage rec { pname = "spotify-player"; - version = "0.15.0"; + version = "0.15.2"; src = fetchFromGitHub { owner = "aome510"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5+YBlXHpAzGgw6MqgnMSggCASS++A/WWomftX8Jxe7g="; + hash = "sha256-yYn8xuJE0mILF7poiTbHCmFswP/xG+BbL+AASrLpbAs="; }; - cargoHash = "sha256-PIYaJC3rVbPjc2CASzMGWAzUdrBwFnKqhrZO6nywdN8="; + cargoHash = "sha256-/q7xrsuRym5oDCGJRpBTdBach2CAbhCCC3cPFzCT4PU="; nativeBuildInputs = [ pkg-config cmake + rustPlatform.bindgenHook + ] ++ lib.optionals stdenv.isDarwin [ + makeBinaryWrapper ]; buildInputs = [ openssl - alsa-lib dbus fontconfig - libsixel - ]; + ] + ++ lib.optionals withSixel [ libsixel ] + ++ lib.optionals (withAudioBackend == "alsa") [ alsa-lib ] + ++ lib.optionals (withAudioBackend == "pulseaudio") [ libpulseaudio ] + ++ lib.optionals (withAudioBackend == "rodio" && stdenv.isLinux) [ alsa-lib ] + ++ lib.optionals (withAudioBackend == "portaudio") [ portaudio ] + ++ lib.optionals (withAudioBackend == "jackaudio") [ libjack2 ] + ++ lib.optionals (withAudioBackend == "rodiojack") [ alsa-lib libjack2 ] + ++ lib.optionals (withAudioBackend == "sdl") [ SDL2 ] + ++ lib.optionals (withAudioBackend == "gstreamer") [ gst_all_1.gstreamer gst_all_1.gst-devtools gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ] + ++ lib.optionals (stdenv.isDarwin && withMediaControl) [ darwin.apple_sdk.frameworks.MediaPlayer ] + ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + AppKit + AudioUnit + Cocoa + ]); buildNoDefaultFeatures = true; - buildFeatures = [ - "rodio-backend" - "media-control" - "image" - "lyric-finder" - "daemon" - "notify" - "streaming" - "sixel" - ]; + buildFeatures = [ ] + ++ lib.optionals (withAudioBackend != "") [ "${withAudioBackend}-backend" ] + ++ lib.optionals withMediaControl [ "media-control" ] + ++ lib.optionals withImage [ "image" ] + ++ lib.optionals withLyrics [ "lyric-finder" ] + ++ lib.optionals withDaemon [ "daemon" ] + ++ lib.optionals withNotify [ "notify" ] + ++ lib.optionals withStreaming [ "streaming" ] + ++ lib.optionals withSixel [ "sixel" ]; - meta = with lib; { - description = "A command driven spotify player"; + # sixel-sys is dynamically linked to libsixel + postInstall = lib.optionals (stdenv.isDarwin && withSixel) '' + wrapProgram $out/bin/spotify_player \ + --prefix DYLD_LIBRARY_PATH : "${lib.makeLibraryPath [libsixel]}" + ''; + + meta = { + description = "A terminal spotify player that has feature parity with the official client"; homepage = "https://github.com/aome510/spotify-player"; changelog = "https://github.com/aome510/spotify-player/releases/tag/v${version}"; mainProgram = "spotify_player"; - license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dit7ya xyven1 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix index 65a921ed5b..d302643eb4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-qt/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_INSTALL_PREFIX=" ]; + cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX=" ]; installFlags = [ "DESTDIR=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix index 117d2325ce..239d032682 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify/linux.nix @@ -14,14 +14,14 @@ let # If an update breaks things, one of those might have valuable info: # https://aur.archlinux.org/packages/spotify/ # https://community.spotify.com/t5/Desktop-Linux - version = "1.2.11.916.geb595a67"; + version = "1.2.13.661.ga588f749"; # To get the latest stable revision: # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' # To get general information: # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' # More examples of api usage: # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py - rev = "67"; + rev = "68"; deps = [ alsa-lib @@ -84,7 +84,7 @@ stdenv.mkDerivation { # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; - sha512 = "3d5a9fda88a076a22bb6d0b6b586334865f03a4e852ca8e022468e3dd3520a81dea314721e26e54ba9309603e08f66588f005ee8970e73eccbf805ff70e89dca"; + hash = "sha512-THGSRx0sGOVEB6bOHWHiy1G0Acq0hUa94tG/v+i5DA+CluI58pqj8gYQ61k/ACLJXTUyM8SA92C8DK1Go18X8w=="; }; nativeBuildInputs = [ wrapGAppsHook makeShellWrapper squashfsTools ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix index d7426020d8..d0ceec6d67 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation { pname = binName; # versions are specified in `squeezelite.h` # see https://github.com/ralph-irving/squeezelite/issues/29 - version = "1.9.9.1430"; + version = "1.9.9.1449"; src = fetchFromGitHub { owner = "ralph-irving"; repo = "squeezelite"; - rev = "663db8f64d73dceca6a2a18cdb705ad846daa272"; - hash = "sha256-PROb6d5ixO7lk/7wsjh2vkPkPgAvd6x+orQOY078IAs="; + rev = "8581aba8b1b67af272b89b62a7a9b56082307ab6"; + hash = "sha256-/qyoc0/7Q8yiu5AhuLQFUiE88wf+/ejHjSucjpoN5bI="; }; buildInputs = [ flac libmad libvorbis mpg123 ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/update.sh b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/update.sh index 0a53ef9881..ac55144d15 100755 --- a/third_party/nixpkgs/pkgs/applications/audio/squeezelite/update.sh +++ b/third_party/nixpkgs/pkgs/applications/audio/squeezelite/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p common-updater-scripts coreutils curl gnused jq nix nix-prefetch-github ripgrep +#!nix-shell -I nixpkgs=./. -i bash -p common-updater-scripts coreutils curl gnused jq nix nix-prefetch-git nix-prefetch-github ripgrep set -euo pipefail diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix index 25193d1b78..7933c74571 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.0.18"; + version = "1.0.20"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-vOay9xPSwgSYurFgL9f4OdBPzGJkV4t+7lJgeCeT0c4="; + hash = "sha256-/utd2uYoxPHQ4kQwA0tZW5HwmN90vXL23EiNFh3wXoE="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead diff --git a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix index f93f763bc6..a2f6b17a87 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sublime-music/default.nix @@ -27,13 +27,24 @@ let hash = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w="; }; }); + + dataclasses-json = super.dataclasses-json.overridePythonAttrs (oldAttrs: rec { + version = "0.5.7"; + src = fetchFromGitHub { + owner = "lidatong"; + repo = "dataclasses-json"; + rev = "refs/tags/v${version}"; + hash = "sha256-0tw5Lz+c4ymO+AGpG6THbiALWGBrehC84+yWWk1eafc="; + }; + nativeBuildInputs = [ python3.pkgs.setuptools ]; + }); }; }; in python.pkgs.buildPythonApplication rec { pname = "sublime-music"; version = "0.12.0"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "sublime-music"; @@ -43,6 +54,7 @@ python.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ + python.pkgs.flit-core gobject-introspection wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix index c0cce2efe0..2d720955ba 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tageditor/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "tageditor"; - version = "3.8.1"; + version = "3.9.0"; src = fetchFromGitHub { owner = "martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-7YmjrVh8P3XfnNs2I8PoLigfVvzS0UnuAC67ZQp7WdA="; + hash = "sha256-caki8WVnu8ELE2mXwRvT9TTTXCtMZEa0E3KVpHl05jg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix index 18e0cfe257..52ddd53021 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tauon"; - version = "7.6.6"; + version = "7.6.7"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${finalAttrs.version}"; - hash = "sha256-yt5sMvYau43WwVerQlaOrvzJ4HnBOEVQqbql9UH8jnM="; + hash = "sha256-d25JM2LUQw6KYPojc+Pn40IwCYWLE9un0YAMIBC1NVg="; }; postUnpack = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix index 614375d675..557d436037 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "tidal-hifi"; - version = "5.6.0"; + version = "5.7.1"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-HKylyYhbMxYfRRP9irGMTtB497o75M+ryikQHMJWbtU="; + sha256 = "sha256-7wBQgoglLS67aiQsF9iUeFoJDDqq0fJgu5BSyH+HI7M="; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix b/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix index e70f952175..389580cf51 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/transcribe/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "transcribe"; - version = "9.25"; + version = "9.30.2"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { - url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.0.tar.gz"; - sha256 = "sha256-vgl3BCAC7gOYTviHJzMbgZfHTpP90XUvxpC1IhvEZ8I="; + url = "https://www.seventhstring.com/xscribe/downlo/xscsetup-${version}.tar.gz"; + sha256 = "sha256-EZyQsO3tSedMaZIhJWc7j3f7ikBf6XqXLUgdAiQdr14="; } else throw "Platform not supported"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix b/third_party/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix index 0f0d8f67c4..c0067779b7 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/vcv-rack/default.nix @@ -39,14 +39,14 @@ let pffft-source = fetchFromBitbucket { owner = "jpommier"; repo = "pffft"; - rev = "988259a41d1522047a9420e6265a6ba8289c1654"; - sha256 = "Oq5N02UNXsbhcPUfjMtD0cgqAZsGx9ke9A+ArrenzGE="; + rev = "38946c766c1afecfa4c5945af77913e38b3cec31"; + sha256 = "1w6g9v9fy7bavqacb6qw1nxhcik2w36cvl2d7b0bh68w0pd70j5q"; }; fuzzysearchdatabase-source = fetchFromBitbucket { owner = "j_norberg"; repo = "fuzzysearchdatabase"; - rev = "a3a1bf557b8e6ee58b55fa82ff77ff7a3d141949"; - sha256 = "13ib72acbxn1cnf66im0v4nlr1464v7j08ra2bprznjmy127xckm"; + rev = "23122d1ff60d936fd766361a30210c954e0c5449"; + sha256 = "1s88blx1rn2racmb8n5g0kh1ym7v21573l5m42c4nz266vmrvrvz"; }; nanovg-source = fetchFromGitHub { owner = "VCVRack"; @@ -57,14 +57,14 @@ let nanosvg-source = fetchFromGitHub { owner = "memononen"; repo = "nanosvg"; - rev = "ccdb1995134d340a93fb20e3a3d323ccb3838dd0"; - sha256 = "ymziU0NgGqxPOKHwGm0QyEdK/8jL/QYk5UdIQ3Tn8jw="; + rev = "9da543e8329fdd81b64eb48742d8ccb09377aed1"; + sha256 = "1pkzv75kavkhrbdd2kvq755jyr0vamgrfr7lc33dq3ipkzmqvs2l"; }; osdialog-source = fetchFromGitHub { owner = "AndrewBelt"; repo = "osdialog"; - rev = "21b9dcc2a1bbdacb9b46da477ffd82a4ce9204b9"; - sha256 = "+4VCBuQvfiuEUdjFu3IB2FwbHFrDJXTb4vcVg6ZFwSM="; + rev = "d0f64f0798c2e47f61d90a5505910ff2d63ca049"; + sha256 = "1d3058x6wgzw7b0wai792flk7s6ffw0z4n9sl016v91yjwv7ds3a"; }; oui-blendish-source = fetchFromGitHub { owner = "AndrewBelt"; @@ -75,20 +75,20 @@ let simde-source = fetchFromGitHub { owner = "simd-everywhere"; repo = "simde"; - rev = "dd0b662fd8cf4b1617dbbb4d08aa053e512b08e4"; - sha256 = "1kxwzdlh21scak7wsbb60vwfvndppidj5fgbi26mmh73zsj02mnv"; + rev = "b309d8951997201e493380a2fd09198c09ae1b4e"; + sha256 = "1hz8mfbhbiafvim4qrkyvh1yndlhydqkxwhls7cfqa48wkpxfip8"; }; tinyexpr-source = fetchFromGitHub { owner = "codeplea"; repo = "tinyexpr"; - rev = "4e8cc0067a1e2378faae23eb2dfdd21e9e9907c2"; - sha256 = "1yxkxsw3bc81cjm2knvyr1z9rlzwmjvq5zd125n34xwq568v904d"; + rev = "74804b8c5d296aad0866bbde6c27e2bc1d85e5f2"; + sha256 = "0z3r7wfw7p2wwl6wls2nxacirppr2147yz29whxmjaxy89ic1744"; }; fundamental-source = fetchFromGitHub { owner = "VCVRack"; repo = "Fundamental"; - rev = "v2.3.1"; # tip of branch v2 - sha256 = "1rd5yvdr6k03mc3r2y7wxhmiqd69jfvqmpqagxb83y1mn0zfv0pr"; + rev = "962547d7651260fb6a04f4d8aafd7c27f0221bee"; # tip of branch v2 + sha256 = "066gcjkni8ba98vv0di59x3f9piir0vyy5sb53cqrbrl51x853cg"; }; vcv-rtaudio = stdenv.mkDerivation rec { pname = "vcv-rtaudio"; @@ -115,7 +115,7 @@ let in stdenv.mkDerivation rec { pname = "VCV-Rack"; - version = "2.3.0"; + version = "2.4.0"; desktopItems = [ (makeDesktopItem { @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { owner = "VCVRack"; repo = "Rack"; rev = "v${version}"; - sha256 = "1aj7pcvks1da5ydagyxsdksp31rf8dn0bixw55kn34k0g4ky5jiw"; + sha256 = "0azrqyx5as4jmk9dxb7cj7x9dha81i0mm9pkvdv944qyccqwg55i"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/yoshimi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/yoshimi/default.nix index 63ecd18e46..459cbd6388 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/yoshimi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/yoshimi/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "yoshimi"; - version = "2.3.0.2"; + version = "2.3.0.3"; src = fetchFromGitHub { owner = "Yoshimi"; repo = pname; rev = version; - hash = "sha256-zFwfKy8CVecGhgr48T+eDNHfMdctfrNGenc/XJctyw8="; + hash = "sha256-IsmhLUGqoa4Le86LE9SHFiXeiIKgwNfLaPFYXxnC9BM="; }; sourceRoot = "${src.name}/src"; 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 91cf74e65d..d6313c6bd8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/youtube-music/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, appimageTools, }: +{ lib, fetchurl, appimageTools, makeWrapper }: let pname = "youtube-music"; @@ -11,13 +11,16 @@ let appimageContents = appimageTools.extract { inherit pname version src; }; in -appimageTools.wrapType2 rec { +(appimageTools.wrapType2 rec { inherit pname version src; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libappindicator ]; extraInstallCommands = '' mv $out/bin/{${pname}-${version},${pname}} + wrapProgram "$out/bin/${pname}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" + install -m 444 \ -D ${appimageContents}/youtube-music.desktop \ -t $out/share/applications @@ -36,4 +39,6 @@ appimageTools.wrapType2 rec { maintainers = [ maintainers.aacebedo ]; mainProgram = "youtube-music"; }; -} +}).overrideAttrs ({ nativeBuildInputs ? [ ], ... }: { + nativeBuildInputs = nativeBuildInputs ++ [ makeWrapper ]; +}) diff --git a/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix b/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix index efe99f8455..f6abbf346c 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/ludusavi/default.nix @@ -12,22 +12,23 @@ , libXcursor , libXrandr , libXi +, vulkan-loader , gnome , libsForQt5 }: rustPlatform.buildRustPackage rec { pname = "ludusavi"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "mtkennerly"; repo = pname; rev = "v${version}"; - hash = "sha256-6wwBXgR0jutkM3L7Ihi4qryuOeBRItQTyKn2lNcvfdQ="; + hash = "sha256-eEuaDMfFxWcNM9+5TvZZXLgbDuGbyIAIuzEMVWbvYbg="; }; - cargoSha256 = "sha256-9ksstWNqc2Rq5fdb4/LLHGMUXQgri9BAo2LlkFl3Irg="; + cargoSha256 = "sha256-ENo562Y6K238NNEtgYoPw6EXjbcuxPuXiftIp/bGYYU="; nativeBuildInputs = [ cmake @@ -67,6 +68,7 @@ rustPlatform.buildRustPackage rec { libXcursor libXrandr libXi + vulkan-loader ]; in '' diff --git a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix index 284a992d3c..dd4049daa1 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - hash = "sha256-7sgAp9/CKKxPr8rWbOot+FPAwaC8EPLa9pjVcC4TjW8="; + hash = "sha256-RTeRlfRmA/fXBcdzP41mbs88ArKlbU49AA0lnW3xRlg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Va7qLC6WvsLmG9JVmdT1FdIlWP4W/EFmsy7JOagQ+X8="; + hash = "sha256-2B0N/Yq9A4LqKh8EKWmzNzTelwGE3Y9FL9IAqAgFSV8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/aeon/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/aeon/default.nix index 13928c856b..7928a63b82 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/aeon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/aeon/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/atomic-swap/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/atomic-swap/default.nix index 496a67fa54..45909b6b46 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/atomic-swap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/atomic-swap/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub, nix-update-script, makeWrapper, monero-cli }: let pname = "atomic-swap"; - version = "0.4.1"; + version = "0.4.2"; in buildGoModule { inherit pname version; @@ -10,10 +10,10 @@ buildGoModule { owner = "AthanorLabs"; repo = "atomic-swap"; rev = "v${version}"; - hash = "sha256-CYqYRYLMfvPX8TqyFSRg4ookeIfYGc0HDzu/Ip9Ecsg="; + hash = "sha256-JnbKaGmpTDwQMSDR4Y8Q2JTtuQV5GGuovxeIYs0KgQI="; }; - vendorHash = "sha256-igHuklt76r7MDxz8TAaFgFdQS7L3DJkMYarAMNVYTC4="; + vendorHash = "sha256-acBnXGy1kVBwB+j8VqGyinabnI/boTtbFNyjE6EHVes="; subPackages = [ "cmd/swapcli" diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix index 1aeb8a1eec..3700799ce4 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/besu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "besu"; - version = "23.4.1"; + version = "23.7.2"; src = fetchurl { url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-SdOnoGnK4wdJcJPYNPhzzngEpG3VkgfV6DIUWVMtMY4="; + sha256 = "sha256-90sywaNDy62QqIqlkna0xe7+pGQ+5UKrorv4mPha4kI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix index c1ede1ea83..310c67d415 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -72,5 +72,6 @@ mkDerivation rec { license = licenses.mit; broken = stdenv.isDarwin; platforms = platforms.unix; + mainProgram = "bitcoin-cli"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix index 01a3f3e158..24f7d78e4f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix @@ -3,6 +3,7 @@ , fetchurl , autoreconfHook , pkg-config +, installShellFiles , util-linux , hexdump , autoSignDarwinBinariesHook @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ autoreconfHook pkg-config ] + [ autoreconfHook pkg-config installShellFiles ] ++ lib.optionals stdenv.isLinux [ util-linux ] ++ lib.optionals stdenv.isDarwin [ hexdump ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] @@ -53,7 +54,19 @@ stdenv.mkDerivation rec { ++ lib.optionals withWallet [ db48 sqlite ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; - postInstall = lib.optionalString withGui '' + postInstall = '' + installShellCompletion --cmd bitcoin-cli --bash contrib/completions/bash/bitcoin-cli.bash-completion + installShellCompletion --cmd bitcoind --bash contrib/completions/bash/bitcoind.bash-completion + installShellCompletion --cmd bitcoin-tx --bash contrib/completions/bash/bitcoin-tx.bash-completion + + installShellCompletion --fish contrib/completions/fish/bitcoin-cli.fish + installShellCompletion --fish contrib/completions/fish/bitcoind.fish + installShellCompletion --fish contrib/completions/fish/bitcoin-tx.fish + installShellCompletion --fish contrib/completions/fish/bitcoin-util.fish + installShellCompletion --fish contrib/completions/fish/bitcoin-wallet.fish + '' + lib.optionalString withGui '' + installShellCompletion --fish contrib/completions/fish/bitcoin-qt.fish + install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin" install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix index daa528e88d..abeea41cfd 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.11.2"; + version = "1.11.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-22JQ8GqMRNfBT2ynyGhJBeGgnyAVYVBa5tUGZsleDP0="; + sha256 = "sha256-PORzTbvB9HriilaBCsC6R323RFvsI55WgSojJJ6uoIs="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix index 54ef0abbe5..6cc22d122f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -8,15 +8,14 @@ (fetchNuGet { pname = "AWSSDK.S3"; version = "3.3.110.10"; sha256 = "1lf1hfbx792dpa1hxgn0a0jrrvldd16hgbxx229dk2qcz5qlnc38"; }) (fetchNuGet { pname = "BIP78.Sender"; version = "0.2.2"; sha256 = "12pm2s35c0qzc06099q2z1pxwq94rq85n74yz8fs8gwvm2ksgp4p"; }) (fetchNuGet { pname = "BTCPayServer.Hwi"; version = "2.0.2"; sha256 = "0lh3n1qncqs4kbrmx65xs271f0d9c7irrs9qnsa9q51cbbqbljh9"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.29"; sha256 = "1kd07n0l0h6cmfxb5mdkawjsbmjynz2dknnj8c22wvk1jchif956"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.All"; version = "1.4.31"; sha256 = "1yxg2651m649ha99rzjv7pnphx42bxzf5sc86czj6ng4rpp8rnkb"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Charge"; version = "1.3.20"; sha256 = "0nk82hkgs67mxfxkgbav8yxxd79m0xyqaan7vay00gg33pjqdjvj"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.CLightning"; version = "1.3.28"; sha256 = "05jkdds1g0xfvf8spakwbyndz8an2kadwybg6dwz6q5rlk0aj7m8"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.16"; sha256 = "1g37736b4k0ncpyy2qycbk4l85fqvgwac3k98nbdj0dvhfghp1dn"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Common"; version = "1.3.21"; sha256 = "042xwfsxd30zgwiz0w14ynb755w5sldkplxgw1fkw68lrz66x5s4"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.Eclair"; version = "1.3.20"; sha256 = "093w82mcxxxbvx66j0sp3lsfm2bkbi3igm80iz9zdghy85845kc9"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LNBank"; version = "1.3.26"; sha256 = "1kfl88psjbsh88l98kc6dyxqjghnzyffi070v2ifkdjcdgdbawfs"; }) (fetchNuGet { pname = "BTCPayServer.Lightning.LND"; version = "1.4.17"; sha256 = "1n6zbb7rfwp7lbmrzdnw338nwyb8m552fdnar2jp4fd5ffibyrd6"; }) - (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.20"; sha256 = "1rq8cd7hg8mmvci7fxx0hj1jw7afz6li7y73s3c07xjgiy68jgfl"; }) + (fetchNuGet { pname = "BTCPayServer.Lightning.LNDhub"; version = "1.0.21"; sha256 = "0dgca4d21f08ik4h9hv8cqgkmyqq0mqai6m9wids0dx0zzl7cbyx"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins"; version = "1.4.4"; sha256 = "0rk0prmb0539ji5fd33cqy3yvw51i5i8m5hb43admr5z8960dd6l"; }) (fetchNuGet { pname = "BTCPayServer.NETCore.Plugins.Mvc"; version = "1.4.4"; sha256 = "1kmmj5m7s41wc1akpqw1b1j7pp4c0vn6sqxb487980ibpj6hyisl"; }) (fetchNuGet { pname = "CsvHelper"; version = "15.0.5"; sha256 = "01y8bhsnxghn3flz0pr11vj6wjrpmia8rpdrsp7kjfc1zmhqlgma"; }) @@ -38,7 +37,7 @@ (fetchNuGet { pname = "HtmlSanitizer"; version = "5.0.372"; sha256 = "1gllp58vdbql2ybwf05i2178x7p4g8zyyk64317d1pyss5217g7r"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; }) (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) - (fetchNuGet { pname = "LNURL"; version = "0.0.29"; sha256 = "00d9n2lgn3paqm12c563rv8slxrbbxq6m58m098l30wsm96llj0r"; }) + (fetchNuGet { pname = "LNURL"; version = "0.0.34"; sha256 = "1sbkqsln7wq5fsbw63wdha8kqwxgd95j0iblv4kxa1shyg3c5d9x"; }) (fetchNuGet { pname = "MailKit"; version = "3.3.0"; sha256 = "18l0jkrc4d553kiw4vdjzzpafpvsgjs1n19kjbi8isnhzidmsl4j"; }) (fetchNuGet { pname = "Microsoft.AspNet.SignalR.Client"; version = "2.4.3"; sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; }) (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; }) @@ -164,6 +163,7 @@ (fetchNuGet { pname = "NBXplorer.Client"; version = "4.2.5"; sha256 = "0kycvnxgqrkxig8k6mp1897sqbq2xarc8429vnjh79644nakdas4"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) (fetchNuGet { pname = "NicolasDorier.CommandLine"; version = "2.0.0"; sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f"; }) diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix index 2f02d322f3..0efa0c0652 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix @@ -22,11 +22,11 @@ let in stdenv.mkDerivation rec { pname = "clightning"; - version = "23.05.2"; + version = "23.08.1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "sha256-Tj5ybVaxpk5wmOw85LkeU4pgM9NYl6SnmDG2gyXrTHw="; + sha256 = "sha256-Pongzgr+VMrp8nrpnR0QCarMWUBPPjTdoebvpWrSy6w="; }; # when building on darwin we need dawin.cctools to provide the correct libtool @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { tools/generate-wire.py \ tools/update-mocks.sh \ tools/mockup.sh \ - devtools/sql-rewrite.py + devtools/sql-rewrite.py \ + plugins/clnrest/clnrest.py '' else '' substituteInPlace external/libwally-core/tools/autogen.sh --replace gsed sed && \ substituteInPlace external/libwally-core/configure.ac --replace gsed sed diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/dcrctl/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/dcrctl/default.nix index 31e56254ee..97f9b7767d 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/dcrctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/dcrctl/default.nix @@ -19,6 +19,6 @@ buildGoModule rec { homepage = "https://decred.org"; description = "A secure Decred wallet daemon written in Go (golang)"; license = with lib.licenses; [ isc ]; - maintainers = with lib.maintainers; [ aaronjheng ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/dcrd/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/dcrd/default.nix index 8a4369482f..d62a901c99 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/dcrd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/dcrd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dcrd"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "decred"; repo = "dcrd"; rev = "refs/tags/release-v${version}"; - hash = "sha256-ZNBSIzx07zJrBxas7bHpZ8ZPDWJ4d7jumpKYj5Qmzlo="; + hash = "sha256-nSocqwXgJhvfbdElddbb1gGxoygmtVtK6DbiSuMxYew="; }; patches = [ @@ -19,7 +19,7 @@ buildGoModule rec { }) ]; - vendorHash = "sha256-++IPB2IadXd1LC5r6f1a0UqsTG/McAf7KQAw8WKKoaE="; + vendorHash = "sha256-Napcfj1+KjQ21Jb/qpIzg2W/grzun2Pz5FV5yIBXoTo="; subPackages = [ "." "cmd/promptsecret" ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/dcrwallet/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/dcrwallet/default.nix index d66147ca52..da1755f14b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/dcrwallet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/dcrwallet/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dcrwallet"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "decred"; repo = "dcrwallet"; rev = "release-v${version}"; - hash = "sha256-ffY5IvSGu4Q7EdJpfdsIKxxjkm6FD0DR9ItnaO90SBc="; + hash = "sha256-Pz25jExqbvy8fgiZy9vaYuVp8kuE6deGLlBEjxTnYGQ="; }; - vendorHash = "sha256-dduHuMa5UPf73lfirTHSrYnOUbc2IyULpstZPGUJzuc="; + vendorHash = "sha256-lvN7OcDoEzb9LyH9C5q8pd0BOnF2VKuh4O82U+tQ6fI="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix index a68e230c24..7fc27555bc 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.48.1"; + version = "2.50.0"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-ApVsrK1Di6d3WBj/VIUcYJBceFDTeNfsXYPRfbytvZg="; + hash = "sha256-gZ01nmxzXRK8YRwnl5qGkU6dqBYKPUkNZmbClwgsuL0="; fetchSubmodules = true; }; - vendorHash = "sha256-bsPeEAhvuT5GIpYMoyPyh0BHMDKyKjBiVnYLjtF4Mkc="; + vendorHash = "sha256-4s5dXTfYlgzYQ2h30F6kxEF626iKYFRoZlNXeFDbn8s="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix index 28a25d8d5c..68eaf2a1ad 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix @@ -1,11 +1,11 @@ -{ lib, fetchurl, appimageTools }: +{ lib, fetchurl, appimageTools, makeWrapper }: let pname = "framesh"; - version = "0.6.7"; + version = "0.6.8"; src = fetchurl { url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage"; - sha256 = "sha256-yPNgrC9ZQcl1gCStMXMbZvk15jZylM2NgKM9H3XcJVQ="; + hash = "sha256-qTbT1g+9hypBUxRMZ/Eat5OGb1y6yJlxQ6iJzfQH8G4="; }; appimageContents = appimageTools.extractType2 { @@ -20,6 +20,11 @@ appimageTools.wrapType2 { install -m 444 -D ${appimageContents}/frame.desktop $out/share/applications/frame.desktop install -m 444 -D ${appimageContents}/frame.png \ $out/share/icons/hicolor/512x512/apps/frame.png + + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram "$out/bin/${pname}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" + substituteInPlace $out/share/applications/frame.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix index c26efb5d4e..584d6927d7 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-guvOs/HsSuj5QOMTzmKxMaC8iUyTkVgEpp8pQ63aIIQ="; + sha256 = "sha256-iHVrJySNdbZ9RXP7QgsDy2o2U/EISAp1/9NFpcEOGeI="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix index 49817edd17..96e493131d 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.12.2"; + version = "1.13.0"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iCLOrf6/f0f7sD0YjmBtlcOcZRDIp9IZkBadTKj1Qjw="; + sha256 = "sha256-tomzF0jM1tcxnnBHLfNWcR1XGECxU8Q/SQAWQBRAFW8="; }; - vendorHash = "sha256-ChmQjhz4dQdwcY/269Hi5XAn8/+0z/AF7Kd9PJ8WqHg="; + vendorHash = "sha256-VX2S7yjdcconPd8wisV+Cl6FVuEUGU7smIBKfTxpUVY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix index 2bc3a683ef..066bbde363 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/haven-cli/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DUSE_DEVICE_TREZOR=ON" "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" 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 bf84ab1ba4..fffa95566b 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,14 +2,13 @@ let pname = "ledger-live-desktop"; - version = "2.64.2"; + version = "2.69.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-8cb5FA/Ogd6GI0AclxHicZGV3K5bVsZuIl/3A03r5qQ="; + hash = "sha256-9eELWlOzUd3xwAoob5XCj16JihOt6SHZe0Ybxb9dtQI="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; @@ -23,6 +22,7 @@ appimageTools.wrapType2 rec { install -m 444 -D ${appimageContents}/ledger-live-desktop.png $out/share/icons/hicolor/1024x1024/apps/ledger-live-desktop.png ${imagemagick}/bin/convert ${appimageContents}/ledger-live-desktop.png -resize 512x512 ledger-live-desktop_512.png install -m 444 -D ledger-live-desktop_512.png $out/share/icons/hicolor/512x512/apps/ledger-live-desktop.png + substituteInPlace $out/share/applications/ledger-live-desktop.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lightwalletd/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lightwalletd/default.nix index 5d540a16f1..040d08e752 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lightwalletd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lightwalletd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lightwalletd"; - version = "0.4.15"; + version = "0.4.16"; src = fetchFromGitHub { owner = "zcash"; repo = "lightwalletd"; rev = "v${version}"; - hash = "sha256-tkM9uTmobKXD7Il/uvmLLckPgdkmgwsNsjlARJQiY5A="; + hash = "sha256-M9xfV2T8L+nssrJj29QmPiErNMpfpT8BY/30Vj8wPjY="; }; vendorHash = "sha256-z5Hs+CkPswWhz+Ya5MyHKA3MZzQkvS7WOxNckElkg6U="; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix index e8b5be1919..e9f739b188 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lnd/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.16.3-beta"; + version = "0.17.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - hash = "sha256-/seSpWnlQmeU4vQtlHMOSedPXP9HJp1GyxcB1LqHayA="; + hash = "sha256-HndO7vp/sia352hs23xAgrpyJ/CfbRxYAAhLZ4q94Pc="; }; - vendorHash = "sha256-obrSVMqTwHe7231wa0OuoT6ANBqkQbkHIy93J2f68Zk="; + vendorHash = "sha256-4n81AZLKCTEV4+p4kRhZbzYsdRGIztzh6EKPin8W1Z0="; subPackages = [ "cmd/lncli" "cmd/lnd" ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lndinit/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lndinit/default.nix new file mode 100644 index 0000000000..4d982183a3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lndinit/default.nix @@ -0,0 +1,28 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "lndinit"; + version = "0.1.5-beta"; + + src = fetchFromGitHub { + owner = "lightninglabs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7ibjDIDKP1ASvCWiF03aLCR6RXqLxmdkR5UZoU3dneA="; + }; + + vendorHash = "sha256-2AHU5/XSDJAEvAg7LmGxCmrJ/oS84fNF3mXigKFDsb4="; + + subPackages = ["."]; + + meta = with lib; { + description = "Wallet initializer utility for lnd"; + homepage = "https://github.com/lightninglabs/lndinit"; + mainProgram = pname; + license = licenses.mit; + maintainers = with maintainers; [aldoborrero]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/monero-cli/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/monero-cli/default.nix index 8322a67dd5..0dc220ac66 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/monero-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/monero-cli/default.nix @@ -58,7 +58,6 @@ stdenv.mkDerivation rec { ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DUSE_DEVICE_TREZOR=ON" "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" @@ -73,5 +72,6 @@ stdenv.mkDerivation rec { license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ rnhmjoj ]; + mainProgram = "monero-wallet-cli"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix index a9d6303e48..4cf298c178 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix @@ -1,8 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, qt4, protobuf, qrencode, hexdump -, withGui }: +{ lib, stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkg-config, hexdump }: stdenv.mkDerivation rec { - pname = "namecoin" + lib.optionalString (!withGui) "d"; + pname = "namecoind"; version = "25.0"; src = fetchFromGitHub { @@ -25,10 +24,6 @@ stdenv.mkDerivation rec { db4 miniupnpc eject - ] ++ lib.optionals withGui [ - qt4 - protobuf - qrencode ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix index 6bd443e428..6de7cf7578 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.65"; + version = "2.3.66"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-7m9gf+enOtE5VWuBNLFf11ofLGBRAYWvmkrekUVQQaQ="; + sha256 = "sha256-DcSY2hnzJexsrRw4k57uOBfDkveEvXccN8GDUR/QmKw="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix index e9b1de7ed9..cd30980105 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -34,8 +34,8 @@ (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) - (fetchNuGet { pname = "NBitcoin"; version = "7.0.24"; sha256 = "0yc6cgwp2xr2dzjsrkawyh43whixv66nvvq6rh1pi6gi14iaqmfa"; }) - (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.18"; sha256 = "054i15qan5154iy8m13jmhnz1w5rs208i1xhlfnivwiq2v1c2qby"; }) + (fetchNuGet { pname = "NBitcoin"; version = "7.0.27"; sha256 = "0s2i6bjbiz5jlgydn4hja0b42s0yzw0cal0pv2a57hfcd948zc1f"; }) + (fetchNuGet { pname = "NBitcoin.Altcoins"; version = "3.0.19"; sha256 = "16bv3314flq6ildsjzxzw4ih2wbryvkjpkcwkvf2lh2smqhnvr11"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "10.0.3"; sha256 = "06vy67bkshclpz69kps4vgzc9h2cgg41c8vlqmdbwclfky7c4haq"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/optimism/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/optimism/default.nix index 60520c069b..5ff7f80e3c 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/optimism/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/optimism/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "optimism"; - version = "1.1.1"; + version = "1.1.4"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "optimism"; rev = "op-node/v${version}"; - hash = "sha256-COTpmjDH1u2dJA0nKPBG1Aocpyyo8NdtowwjHDTbEKI="; + hash = "sha256-UDNqD3gA27qqaJYbpgOWoL0AeLb7OZRCRJcGNKRq67g="; fetchSubmodules = true; }; subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ]; - vendorHash = "sha256-yAUeCX05dCVEvIzp0cXB/qYVtu3gQfgFi1CNZZKllOU="; + vendorHash = "sha256-OGOdU6X3dcAu4BDpG62bK8LaMo+NuzFOUSjdPNhRGZM="; buildInputs = [ libpcap diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/optimism/geth.nix b/third_party/nixpkgs/pkgs/applications/blockchains/optimism/geth.nix index ab854f64f7..0bc975e588 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/optimism/geth.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/optimism/geth.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "op-geth"; - version = "1.101106.0"; + version = "1.101200.1"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "op-geth"; rev = "v${version}"; - hash = "sha256-hLng9DMzRN43m0+GAc6Bn0c9heuekghn4ZdDKgQcSKY="; + hash = "sha256-xF/KaN/O0Hn3W2a11ivdgLVr5gR14dW5807r1snQ9xw="; fetchSubmodules = true; }; @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/utils" ]; - vendorHash = "sha256-bGEvBXG6q9m5go+4mAlOu424ReTbfwVhkohN+FikBMg="; + vendorHash = "sha256-5G0wPQaP2MofQQO1AiFa1BF8zarRnYyNYscbZ4Ku44o="; # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/oxen/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/oxen/default.nix index a8948d7df5..5c8cbbbbcd 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/oxen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/oxen/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { # Required for static linking, the only supported install path lbzmqsrc = fetchurl { url = "https://github.com/zeromq/libzmq/releases/download/v4.3.3/zeromq-4.3.3.tar.gz"; - sha512 = "4c18d784085179c5b1fcb753a93813095a12c8d34970f2e1bfca6499be6c9d67769c71c68b7ca54ff181b20390043170e89733c22f76ff1ea46494814f7095b1"; + hash = "sha512-TBjXhAhRecWx/LdTqTgTCVoSyNNJcPLhv8pkmb5snWd2nHHGi3ylT/GBsgOQBDFw6Jczwi92/x6kZJSBT3CVsQ=="; }; postPatch = '' @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals trezorSupport [ libusb1 protobuf python3 ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" # "-DUSE_DEVICE_TREZOR=ON" # "-DBUILD_GUI_DEPS=ON" "-DReadline_ROOT_DIR=${readline.dev}" diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock index 3930b50220..2ebbe1296f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/Cargo.lock @@ -18,7 +18,16 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" dependencies = [ - "gimli", + "gimli 0.27.3", +] + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli 0.28.0", ] [[package]] @@ -39,7 +48,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -48,10 +57,20 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", ] +[[package]] +name = "aead" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0" +dependencies = [ + "crypto-common", + "generic-array 0.14.7", +] + [[package]] name = "aes" version = "0.6.0" @@ -76,17 +95,14 @@ dependencies = [ ] [[package]] -name = "aes-gcm" -version = "0.8.0" +name = "aes" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ - "aead 0.3.2", - "aes 0.6.0", - "cipher 0.2.5", - "ctr 0.6.0", - "ghash 0.3.1", - "subtle", + "cfg-if", + "cipher 0.4.4", + "cpufeatures", ] [[package]] @@ -103,6 +119,20 @@ dependencies = [ "subtle", ] +[[package]] +name = "aes-gcm" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +dependencies = [ + "aead 0.5.2", + "aes 0.8.3", + "cipher 0.4.4", + "ctr 0.9.2", + "ghash 0.5.0", + "subtle", +] + [[package]] name = "aes-soft" version = "0.6.4" @@ -129,37 +159,58 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf6ccdb167abbf410dcb915cabd428929d7f6a04980b54a11f26a39f1c7f7107" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" dependencies = [ "cfg-if", - "getrandom 0.2.8", + "getrandom 0.2.10", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] [[package]] -name = "always-assert" -version = "0.1.2" +name = "allocator-api2" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf688625d06217d5b1bb0ea9d9c44a1635fd0ee3534466388d18203174f4d11" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "always-assert" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4436e0292ab1bb631b42973c61205e704475fe8126af845c8d923c0996328127" + +[[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 = "anes" @@ -178,30 +229,29 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] @@ -217,9 +267,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -227,24 +277,38 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "approx" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "072df7202e63b127ab55acfe16ce97013d5b97bf160489336d3f1840fd78e99e" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" dependencies = [ "num-traits", ] [[package]] -name = "arbitrary" -version = "1.2.0" +name = "aquamarine" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d47fbf90d5149a107494b15a7dc8d69b351be2db3bb9691740e88ec17fd880" +checksum = "df752953c49ce90719c7bf1fc587bc8227aed04732ea0c0f85e5397d7fdbd1a1" +dependencies = [ + "include_dir", + "itertools 0.10.5", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "arbitrary" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e" [[package]] name = "arc-swap" @@ -252,6 +316,261 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +[[package]] +name = "ark-algebra-test-templates" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "400bd3a79c741b1832f1416d4373ae077ef82ca14a8b4cee1248a2f11c8b9172" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "hex", + "num-bigint", + "num-integer", + "num-traits", + "serde", + "serde_derive", + "serde_json", + "sha2 0.10.7", +] + +[[package]] +name = "ark-bls12-377" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-bls12-381" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", +] + +[[package]] +name = "ark-bw6-761" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e0605daf0cc5aa2034b78d008aaf159f56901d92a52ee4f6ecdfdac4f426700" +dependencies = [ + "ark-bls12-377", + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ec" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" +dependencies = [ + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", + "itertools 0.10.5", + "num-traits", + "zeroize", +] + +[[package]] +name = "ark-ed-on-bls12-377" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b10d901b9ac4b38f9c32beacedfadcdd64e46f8d7f8e88c1ae1060022cf6f6c6" +dependencies = [ + "ark-bls12-377", + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ed-on-bls12-381-bandersnatch" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cde0f2aa063a2a5c28d39b47761aa102bda7c13c84fc118a61b87c7b2f785c" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ff" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" +dependencies = [ + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", + "derivative", + "digest 0.10.7", + "itertools 0.10.5", + "num-bigint", + "num-traits", + "paste", + "rustc_version 0.4.0", + "zeroize", +] + +[[package]] +name = "ark-ff-asm" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-ff-macros" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565" +dependencies = [ + "num-bigint", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-poly" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "hashbrown 0.13.2", +] + +[[package]] +name = "ark-r1cs-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de1d1472e5cb020cb3405ce2567c91c8d43f21b674aef37b0202f5c3304761db" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-relations", + "ark-std", + "derivative", + "num-bigint", + "num-integer", + "num-traits", + "tracing", +] + +[[package]] +name = "ark-relations" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00796b6efc05a3f48225e59cb6a2cda78881e7c390872d5786aaf112f31fb4f0" +dependencies = [ + "ark-ff", + "ark-std", + "tracing", + "tracing-subscriber 0.2.25", +] + +[[package]] +name = "ark-scale" +version = "0.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49b08346a3e38e2be792ef53ee168623c9244d968ff00cd70fb9932f6fe36393" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "parity-scale-codec", +] + +[[package]] +name = "ark-secret-scalar" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "ark-transcript", + "digest 0.10.7", + "rand_core 0.6.4", + "zeroize", +] + +[[package]] +name = "ark-serialize" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" +dependencies = [ + "ark-serialize-derive", + "ark-std", + "digest 0.10.7", + "num-bigint", +] + +[[package]] +name = "ark-serialize-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae3281bc6d0fd7e549af32b52511e1302185bd688fd3359fa36423346ff682ea" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ark-std" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + +[[package]] +name = "ark-transcript" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ff", + "ark-serialize", + "ark-std", + "digest 0.10.7", + "rand_core 0.6.4", + "sha3", +] + [[package]] name = "array-bytes" version = "6.1.0" @@ -260,9 +579,18 @@ checksum = "d9b1c5a481ec30a5abd8dfbd94ab5cf1bb4e9a66be7f1b3b322f2f1170c200fd" [[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" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" +dependencies = [ + "nodrop", +] [[package]] name = "arrayvec" @@ -272,9 +600,9 @@ checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asn1-rs" @@ -289,14 +617,14 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.27", ] [[package]] name = "asn1-rs" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf6690c370453db30743b373a60ba498fc0d6d83b11f4abfd87a84a075db5dd4" +checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ "asn1-rs-derive 0.4.0", "asn1-rs-impl", @@ -305,7 +633,7 @@ dependencies = [ "num-traits", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.27", ] [[package]] @@ -345,13 +673,14 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "2.0.4" +version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ae1ddd39efd67689deb1979d80bad3bf7f2b09c6e6117c8d1f2443b5e2f83e" +checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ + "anstyle", "bstr", "doc-comment", - "predicates", + "predicates 3.0.3", "predicates-core", "predicates-tree", "wait-timeout", @@ -364,44 +693,443 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" [[package]] -name = "async-channel" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +name = "asset-hub-kusama-integration-tests" +version = "1.0.0" dependencies = [ - "concurrent-queue 2.1.0", + "assert_matches", + "asset-hub-kusama-runtime", + "frame-support", + "frame-system", + "integration-tests-common", + "pallet-asset-conversion", + "pallet-assets", + "pallet-balances", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime", + "polkadot-runtime-parachains", + "sp-runtime", + "staging-xcm", + "xcm-emulator", +] + +[[package]] +name = "asset-hub-kusama-runtime" +version = "0.9.420" +dependencies = [ + "asset-test-utils", + "assets-common", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "kusama-runtime-constants", + "log", + "pallet-asset-conversion", + "pallet-asset-conversion-tx-payment", + "pallet-assets", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-multisig", + "pallet-nft-fractionalization", + "pallet-nfts", + "pallet-nfts-runtime-api", + "pallet-proxy", + "pallet-session", + "pallet-state-trie-migration", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-uniques", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "primitive-types", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "sp-weights", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "asset-hub-polkadot-integration-tests" +version = "1.0.0" +dependencies = [ + "asset-hub-kusama-runtime", + "frame-support", + "frame-system", + "integration-tests-common", + "pallet-asset-conversion", + "pallet-assets", + "pallet-balances", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime", + "polkadot-runtime-parachains", + "sp-runtime", + "staging-xcm", + "xcm-emulator", +] + +[[package]] +name = "asset-hub-polkadot-runtime" +version = "0.9.420" +dependencies = [ + "asset-test-utils", + "assets-common", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-multisig", + "pallet-nfts", + "pallet-nfts-runtime-api", + "pallet-proxy", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-uniques", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "polkadot-runtime-constants", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "sp-weights", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "asset-hub-westend-integration-tests" +version = "1.0.0" +dependencies = [ + "assert_matches", + "asset-hub-westend-runtime", + "frame-support", + "frame-system", + "integration-tests-common", + "pallet-asset-conversion", + "pallet-assets", + "pallet-balances", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime", + "polkadot-runtime-parachains", + "sp-runtime", + "staging-xcm", + "xcm-emulator", +] + +[[package]] +name = "asset-hub-westend-runtime" +version = "0.9.420" +dependencies = [ + "asset-test-utils", + "assets-common", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-asset-conversion", + "pallet-asset-conversion-tx-payment", + "pallet-assets", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-multisig", + "pallet-nft-fractionalization", + "pallet-nfts", + "pallet-nfts-runtime-api", + "pallet-proxy", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-uniques", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "primitive-types", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", + "westend-runtime-constants", +] + +[[package]] +name = "asset-test-utils" +version = "1.0.0" +dependencies = [ + "assets-common", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-test-relay-sproof-builder", + "frame-support", + "frame-system", + "hex-literal 0.4.1", + "pallet-assets", + "pallet-balances", + "pallet-collator-selection", + "pallet-session", + "pallet-xcm", + "parachain-info", + "parachains-common", + "parachains-runtimes-test-utils", + "parity-scale-codec", + "polkadot-parachain-primitives", + "sp-consensus-aura", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "staging-xcm", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "assets-common" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "frame-support", + "impl-trait-for-tuples", + "log", + "pallet-asset-conversion", + "pallet-asset-tx-payment", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-runtime", + "sp-std", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", "event-listener", "futures-core", ] [[package]] -name = "async-io" +name = "async-executor" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 1.9.0", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" +checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "concurrent-queue 1.2.2", + "async-lock", + "autocfg", + "blocking", + "futures-lite", +] + +[[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", - "libc", "log", - "once_cell", "parking", "polling", + "rustix 0.37.23", "slab", - "socket2", + "socket2 0.4.9", "waker-fn", - "winapi", ] [[package]] name = "async-lock" -version = "2.4.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] +[[package]] +name = "async-net" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f" +dependencies = [ + "async-io", + "autocfg", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-process" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +dependencies = [ + "async-io", + "async-lock", + "autocfg", + "blocking", + "cfg-if", + "event-listener", + "futures-lite", + "rustix 0.37.23", + "signal-hook", + "windows-sys 0.48.0", +] + [[package]] name = "async-recursion" version = "1.0.4" @@ -410,38 +1138,72 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] -name = "async-trait" -version = "0.1.68" +name = "async-stream" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite 0.2.12", +] + +[[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.16", + "syn 2.0.31", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "async-trait" +version = "0.1.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", ] [[package]] name = "asynchronous-codec" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06a0daa378f5fd10634e44b0a29b2a87b890657658e072a30d6f26e57ddee182" +checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" dependencies = [ "bytes", "futures-sink", "futures-util", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", ] [[package]] -name = "atomic-waker" -version = "1.0.0" +name = "atomic-take" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" +checksum = "a8ab6b55fe97976e46f91ddbed8d147d966475dc29b2032757ba47e02376fbc3" + +[[package]] +name = "atomic-waker" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] name = "atty" @@ -462,24 +1224,46 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ - "addr2line", + "addr2line 0.21.0", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", - "object", + "miniz_oxide", + "object 0.32.0", "rustc-demangle", ] +[[package]] +name = "bandersnatch_vrfs" +version = "0.0.1" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ff", + "ark-scale", + "ark-serialize", + "ark-std", + "dleq_vrf", + "fflonk", + "merlin 3.0.0", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "ring 0.1.0", + "sha2 0.10.7", + "zeroize", +] + [[package]] name = "base-x" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" [[package]] name = "base16ct" @@ -495,27 +1279,36 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[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 = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "base64ct" -version = "1.5.2" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2b2456fd614d856680dcd9fcc660a51a820fa09daef2e49772b56a193c8474" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + +[[package]] +name = "basic-toml" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bfc506e7a2370ec239e1d072507b2a80c833083699d3c6fa176fbb4de8448c6" +dependencies = [ + "serde", +] [[package]] name = "beef" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed554bd50246729a1ec158d08aa3235d1b69d94ad120ebe187e28894787e736" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" dependencies = [ "serde", ] @@ -523,10 +1316,13 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", + "env_logger 0.9.3", "hash-db", "log", + "sp-core", + "sp-runtime", ] [[package]] @@ -544,27 +1340,48 @@ version = "0.65.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", "lazycell", "peeking_take_while", - "prettyplease", + "prettyplease 0.2.12", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.16", + "syn 2.0.31", ] +[[package]] +name = "bip39" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" +dependencies = [ + "bitcoin_hashes", +] + +[[package]] +name = "bitcoin_hashes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" + [[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 = "bitvec" version = "1.0.1" @@ -583,7 +1400,17 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", +] + +[[package]] +name = "blake2-rfc" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" +dependencies = [ + "arrayvec 0.4.12", + "constant_time_eq 0.1.5", ] [[package]] @@ -593,33 +1420,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" dependencies = [ "arrayref", - "arrayvec 0.7.2", - "constant_time_eq 0.2.4", + "arrayvec 0.7.4", + "constant_time_eq 0.2.6", ] [[package]] name = "blake2s_simd" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db539cc2b5f6003621f1cd9ef92d7ded8ea5232c7de0f9faa2de251cd98730d4" +checksum = "6637f448b9e61dfadbdcbae9a885fadee1f3eaffb1f8d3c1965d3ade8bdfd44f" dependencies = [ "arrayref", - "arrayvec 0.7.2", - "constant_time_eq 0.1.5", + "arrayvec 0.7.4", + "constant_time_eq 0.2.6", ] [[package]] name = "blake3" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f" +checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" dependencies = [ "arrayref", - "arrayvec 0.7.2", + "arrayvec 0.7.4", "cc", "cfg-if", - "constant_time_eq 0.1.5", - "digest 0.10.6", + "constant_time_eq 0.3.0", + "digest 0.10.7", ] [[package]] @@ -640,16 +1467,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -677,6 +1504,21 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +[[package]] +name = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand 1.9.0", + "futures-lite", + "log", +] + [[package]] name = "bounded-collections" version = "0.1.8" @@ -698,6 +1540,588 @@ dependencies = [ "thiserror", ] +[[package]] +name = "bp-asset-hub-kusama" +version = "0.1.0" +dependencies = [ + "bp-xcm-bridge-hub-router", + "frame-support", + "parity-scale-codec", + "scale-info", +] + +[[package]] +name = "bp-asset-hub-polkadot" +version = "0.1.0" +dependencies = [ + "bp-xcm-bridge-hub-router", + "frame-support", + "parity-scale-codec", + "scale-info", + "sp-runtime", +] + +[[package]] +name = "bp-bridge-hub-cumulus" +version = "0.1.0" +dependencies = [ + "bp-messages", + "bp-polkadot-core", + "bp-runtime", + "frame-support", + "frame-system", + "polkadot-primitives", + "sp-api", + "sp-std", +] + +[[package]] +name = "bp-bridge-hub-kusama" +version = "0.1.0" +dependencies = [ + "bp-bridge-hub-cumulus", + "bp-messages", + "bp-runtime", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-bridge-hub-polkadot" +version = "0.1.0" +dependencies = [ + "bp-bridge-hub-cumulus", + "bp-messages", + "bp-runtime", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-bridge-hub-rococo" +version = "0.1.0" +dependencies = [ + "bp-bridge-hub-cumulus", + "bp-messages", + "bp-runtime", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-bridge-hub-wococo" +version = "0.1.0" +dependencies = [ + "bp-bridge-hub-cumulus", + "bp-messages", + "bp-runtime", + "frame-support", + "sp-api", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-header-chain" +version = "0.1.0" +dependencies = [ + "bp-runtime", + "bp-test-utils", + "finality-grandpa", + "frame-support", + "hex", + "hex-literal 0.4.1", + "parity-scale-codec", + "scale-info", + "serde", + "sp-consensus-grandpa", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-kusama" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-polkadot-core", + "bp-runtime", + "frame-support", + "sp-api", + "sp-std", +] + +[[package]] +name = "bp-messages" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-runtime", + "frame-support", + "hex", + "hex-literal 0.4.1", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-std", +] + +[[package]] +name = "bp-parachains" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-polkadot-core", + "bp-runtime", + "frame-support", + "impl-trait-for-tuples", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-polkadot" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-polkadot-core", + "bp-runtime", + "frame-support", + "sp-api", + "sp-std", +] + +[[package]] +name = "bp-polkadot-core" +version = "0.1.0" +dependencies = [ + "bp-messages", + "bp-runtime", + "frame-support", + "frame-system", + "hex", + "parity-scale-codec", + "parity-util-mem", + "scale-info", + "serde", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-relayers" +version = "0.1.0" +dependencies = [ + "bp-messages", + "bp-runtime", + "frame-support", + "hex", + "hex-literal 0.4.1", + "parity-scale-codec", + "scale-info", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "bp-rococo" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-polkadot-core", + "bp-runtime", + "frame-support", + "sp-api", + "sp-std", +] + +[[package]] +name = "bp-runtime" +version = "0.1.0" +dependencies = [ + "frame-support", + "frame-system", + "hash-db", + "hex-literal 0.4.1", + "impl-trait-for-tuples", + "log", + "num-traits", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", + "trie-db", +] + +[[package]] +name = "bp-test-utils" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-parachains", + "bp-polkadot-core", + "bp-runtime", + "ed25519-dalek 1.0.1", + "finality-grandpa", + "parity-scale-codec", + "sp-application-crypto", + "sp-consensus-grandpa", + "sp-core", + "sp-runtime", + "sp-std", + "sp-trie", +] + +[[package]] +name = "bp-wococo" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-polkadot-core", + "bp-rococo", + "bp-runtime", + "frame-support", + "sp-api", + "sp-std", +] + +[[package]] +name = "bp-xcm-bridge-hub-router" +version = "0.1.0" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-runtime", +] + +[[package]] +name = "bridge-hub-kusama-runtime" +version = "0.1.0" +dependencies = [ + "bridge-hub-test-utils", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "kusama-runtime-constants", + "log", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-multisig", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "scale-info", + "serde", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "bridge-hub-polkadot-runtime" +version = "0.1.0" +dependencies = [ + "bridge-hub-test-utils", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-multisig", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "polkadot-runtime-constants", + "scale-info", + "serde", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "bridge-hub-rococo-integration-tests" +version = "1.0.0" +dependencies = [ + "bp-messages", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-xcmp-queue", + "frame-support", + "integration-tests-common", + "pallet-bridge-messages", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime", + "polkadot-runtime-parachains", + "staging-xcm", + "xcm-emulator", +] + +[[package]] +name = "bridge-hub-rococo-runtime" +version = "0.1.0" +dependencies = [ + "bp-bridge-hub-rococo", + "bp-bridge-hub-wococo", + "bp-header-chain", + "bp-messages", + "bp-parachains", + "bp-polkadot-core", + "bp-relayers", + "bp-rococo", + "bp-runtime", + "bp-wococo", + "bridge-hub-test-utils", + "bridge-runtime-common", + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-bridge-relayers", + "pallet-collator-selection", + "pallet-multisig", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "rococo-runtime-constants", + "scale-info", + "serde", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "static_assertions", + "substrate-wasm-builder", +] + +[[package]] +name = "bridge-hub-test-utils" +version = "0.1.0" +dependencies = [ + "assert_matches", + "asset-test-utils", + "bp-bridge-hub-rococo", + "bp-bridge-hub-wococo", + "bp-header-chain", + "bp-messages", + "bp-parachains", + "bp-polkadot-core", + "bp-relayers", + "bp-runtime", + "bp-test-utils", + "bridge-runtime-common", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-bridge-relayers", + "pallet-collator-selection", + "pallet-session", + "pallet-utility", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parachain-info", + "parachains-common", + "parachains-runtimes-test-utils", + "parity-scale-codec", + "sp-core", + "sp-io", + "sp-keyring", + "sp-runtime", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "bridge-runtime-common" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-messages", + "bp-parachains", + "bp-polkadot-core", + "bp-relayers", + "bp-runtime", + "bp-test-utils", + "bp-xcm-bridge-hub-router", + "frame-support", + "frame-system", + "hash-db", + "log", + "pallet-balances", + "pallet-bridge-grandpa", + "pallet-bridge-messages", + "pallet-bridge-parachains", + "pallet-bridge-relayers", + "pallet-transaction-payment", + "pallet-utility", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-trie", + "staging-xcm", + "staging-xcm-builder", + "static_assertions", +] + [[package]] name = "bs58" version = "0.4.0" @@ -705,14 +2129,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" [[package]] -name = "bstr" -version = "0.2.17" +name = "bs58" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "f5353f36341f7451062466f0b755b96ac3a9547e4d7f6b70d603fc721a7d7896" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "bstr" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ - "lazy_static", "memchr", - "regex-automata", + "regex-automata 0.3.6", + "serde", ] [[package]] @@ -726,9 +2159,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byte-slice-cast" @@ -744,9 +2177,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" [[package]] name = "byteorder" @@ -771,26 +2204,20 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "cache-padded" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" - [[package]] name = "camino" -version = "1.1.2" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77df041dc383319cc661b428b6961a005db4d6808d5e12536931b1ca9556055" +checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" dependencies = [ "serde", ] [[package]] name = "cargo-platform" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" dependencies = [ "serde", ] @@ -803,7 +2230,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.16", + "semver 1.0.18", "serde", "serde_json", "thiserror", @@ -817,11 +2244,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -846,9 +2274,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.1" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", ] @@ -877,6 +2305,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "chacha20" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" +dependencies = [ + "cfg-if", + "cipher 0.4.4", + "cpufeatures", +] + [[package]] name = "chacha20poly1305" version = "0.9.1" @@ -884,30 +2323,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5" dependencies = [ "aead 0.4.3", - "chacha20", + "chacha20 0.8.2", "cipher 0.3.0", - "poly1305", + "poly1305 0.7.2", "zeroize", ] [[package]] -name = "chrono" -version = "0.4.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +name = "chain-spec-builder" +version = "2.0.0" dependencies = [ - "libc", - "num-integer", + "ansi_term", + "clap 4.4.2", + "node-cli", + "rand 0.8.5", + "sc-chain-spec", + "sc-keystore", + "sp-core", + "sp-keystore", +] + +[[package]] +name = "chrono" +version = "0.4.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f56b4c72906975ca04becb8a30e102dfecddd0c06181e3e95ddc444be28881f8" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", "num-traits", - "time 0.1.44", - "winapi", + "time 0.1.45", + "wasm-bindgen", + "windows-targets 0.48.5", ] [[package]] name = "ciborium" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" dependencies = [ "ciborium-io", "ciborium-ll", @@ -916,15 +2371,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" [[package]] name = "ciborium-ll" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" dependencies = [ "ciborium-io", "half", @@ -949,7 +2404,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] @@ -958,7 +2413,17 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", +] + +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", ] [[package]] @@ -972,9 +2437,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.3.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -983,15 +2448,15 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.23" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", - "bitflags", - "clap_derive 3.2.18", + "bitflags 1.3.2", + "clap_derive 3.2.25", "clap_lex 0.2.4", - "indexmap", + "indexmap 1.9.3", "once_cell", "strsim", "termcolor", @@ -1000,33 +2465,40 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.5" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819" +checksum = "6a13b88d2c62ff462f88e4a121f17a82c1af05693a2f192b5c38d14de73c19f6" dependencies = [ "clap_builder", - "clap_derive 4.2.0", - "once_cell", + "clap_derive 4.4.2", ] [[package]] name = "clap_builder" -version = "4.2.5" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab" +checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" dependencies = [ "anstream", "anstyle", - "bitflags", - "clap_lex 0.4.1", + "clap_lex 0.5.1", "strsim", ] [[package]] -name = "clap_derive" -version = "3.2.18" +name = "clap_complete" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" +dependencies = [ + "clap 4.4.2", +] + +[[package]] +name = "clap_derive" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" dependencies = [ "heck", "proc-macro-error", @@ -1037,14 +2509,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] @@ -1058,15 +2530,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "coarsetime" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "454038500439e141804c655b4cd1bc6a70bcb95cd2bc9463af5661b6956f0e46" +checksum = "a90d114103adbc625300f346d4d09dfb4ab1c4a8df6868435dd903392ecf4354" dependencies = [ "libc", "once_cell", @@ -1084,11 +2556,106 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "collectives-polkadot-integration-tests" +version = "0.1.0" +dependencies = [ + "collectives-polkadot-runtime", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", + "frame-support", + "integration-tests-common", + "pallet-assets", + "pallet-core-fellowship", + "pallet-salary", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime", + "polkadot-runtime-parachains", + "sp-core", + "sp-runtime", + "staging-xcm", + "xcm-emulator", +] + +[[package]] +name = "collectives-polkadot-runtime" +version = "1.0.0" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-alliance", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-collective", + "pallet-core-fellowship", + "pallet-multisig", + "pallet-preimage", + "pallet-proxy", + "pallet-ranked-collective", + "pallet-referenda", + "pallet-salary", + "pallet-scheduler", + "pallet-session", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-utility", + "pallet-xcm", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "polkadot-runtime-constants", + "scale-info", + "smallvec", + "sp-api", + "sp-arithmetic", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + [[package]] name = "color-eyre" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ebf286c900a6d5867aeff75cfee3192857bb7f24b547d4f0df2ed6baa812c90" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" dependencies = [ "backtrace", "eyre", @@ -1097,6 +2664,27 @@ dependencies = [ "owo-colors", ] +[[package]] +name = "color-print" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2a5e6504ed8648554968650feecea00557a3476bc040d0ffc33080e66b646d0" +dependencies = [ + "color-print-proc-macro", +] + +[[package]] +name = "color-print-proc-macro" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d51beaa537d73d2d1ff34ee70bc095f170420ab2ec5d687ecd3ec2b0d092514b" +dependencies = [ + "nom", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "colorchoice" version = "1.0.0" @@ -1105,15 +2693,29 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "comfy-table" -version = "7.0.0" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9e1f7e5d046697d34b593bdba8ee31f4649366e452a2ccabb3baf3511e503d1" +checksum = "9ab77dbd8adecaf3f0db40581631b995f312a8a5ae3aa9993188bb8f23d83a5b" dependencies = [ "strum", "strum_macros", "unicode-width", ] +[[package]] +name = "common" +version = "0.1.0" +source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "fflonk", + "merlin 3.0.0", +] + [[package]] name = "common-path" version = "1.0.0" @@ -1122,40 +2724,53 @@ checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" [[package]] name = "concurrent-queue" -version = "1.2.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" -dependencies = [ - "cache-padded", -] - -[[package]] -name = "concurrent-queue" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" dependencies = [ "crossbeam-utils", ] [[package]] name = "console" -version = "0.15.5" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" +checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "const-oid" -version = "0.9.2" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913" +checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" + +[[package]] +name = "const-random" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +dependencies = [ + "getrandom 0.2.10", + "once_cell", + "proc-macro-hack", + "tiny-keccak", +] [[package]] name = "constant_time_eq" @@ -1165,9 +2780,84 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "constant_time_eq" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" +checksum = "21a53c0a4d288377e7415b53dcfc3c04da5cdc2cc95c8d5ac178b58f0b861ad6" + +[[package]] +name = "constant_time_eq" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" + +[[package]] +name = "constcat" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f272d0c4cf831b4fa80ee529c7707f76585986e910e1fbce1d7921970bc1a241" + +[[package]] +name = "contracts-rococo-runtime" +version = "0.2.0" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "kusama-runtime-constants", + "log", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-contracts", + "pallet-contracts-primitives", + "pallet-insecure-randomness-collective-flip", + "pallet-multisig", + "pallet-session", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-utility", + "pallet-xcm", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] [[package]] name = "convert_case" @@ -1177,9 +2867,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", "libc", @@ -1187,9 +2877,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "core2" @@ -1202,9 +2892,18 @@ dependencies = [ [[package]] name = "cpp_demangle" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931ab2a3e6330a07900b8e7ca4e106cdcbb93f2b9a52df55e54ee53d8305b55d" +checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "cpp_demangle" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8227005286ec39567949b33df9896bcadfa6051bccca2488129f108ca23119" dependencies = [ "cfg-if", ] @@ -1221,19 +2920,13 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] -[[package]] -name = "cpuid-bool" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" - [[package]] name = "cranelift-bforest" version = "0.95.1" @@ -1255,7 +2948,7 @@ dependencies = [ "cranelift-codegen-shared", "cranelift-entity", "cranelift-isle", - "gimli", + "gimli 0.27.3", "hashbrown 0.13.2", "log", "regalloc2", @@ -1325,7 +3018,7 @@ dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools", + "itertools 0.10.5", "log", "smallvec", "wasmparser", @@ -1334,18 +3027,18 @@ dependencies = [ [[package]] name = "crc" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53757d12b596c16c78b83458d732a5d1a17ab3f53f2f7412f6fb57cc8a140ab3" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" dependencies = [ "crc-catalog", ] [[package]] name = "crc-catalog" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0165d2900ae6778e36e80bbc4da3b5eefccee9ba939761f9c2882a5d9af3ff" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" [[package]] name = "crc32fast" @@ -1366,17 +3059,49 @@ dependencies = [ "atty", "cast", "ciborium", - "clap 3.2.23", + "clap 3.2.25", "criterion-plot", - "itertools", + "futures", + "itertools 0.10.5", "lazy_static", "num-traits", "oorandom", + "plotters", + "rayon", "regex", "serde", "serde_derive", "serde_json", "tinytemplate", + "tokio", + "walkdir", +] + +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap 4.4.2", + "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", ] @@ -1387,14 +3112,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ "cast", - "itertools", + "itertools 0.10.5", ] [[package]] name = "crossbeam-channel" -version = "0.5.5" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1402,9 +3127,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -1413,22 +3138,22 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.5" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ + "autocfg", "cfg-if", "crossbeam-utils", - "lazy_static", - "memoffset 0.6.4", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1436,9 +3161,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -1455,7 +3180,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", "subtle", "zeroize", @@ -1467,7 +3192,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf4c2f4e1afd912bc40bfd6fed5d9dc1f288e0ba01bfcc835cc5bc3eb13efe15" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "rand_core 0.6.4", "subtle", "zeroize", @@ -1479,7 +3204,8 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", + "rand_core 0.6.4", "typenum", ] @@ -1489,17 +3215,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.6", - "subtle", -] - -[[package]] -name = "crypto-mac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" -dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] @@ -1509,29 +3225,10 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", "subtle", ] -[[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 = "ctr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" -dependencies = [ - "cipher 0.2.5", -] - [[package]] name = "ctr" version = "0.8.0" @@ -1541,6 +3238,784 @@ dependencies = [ "cipher 0.3.0", ] +[[package]] +name = "ctr" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" +dependencies = [ + "cipher 0.4.4", +] + +[[package]] +name = "cumulus-client-cli" +version = "0.1.0" +dependencies = [ + "clap 4.4.2", + "parity-scale-codec", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-service", + "sp-core", + "sp-runtime", + "url", +] + +[[package]] +name = "cumulus-client-collator" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-client-consensus-common", + "cumulus-client-network", + "cumulus-primitives-core", + "cumulus-test-client", + "cumulus-test-relay-sproof-builder", + "cumulus-test-runtime", + "futures", + "parity-scale-codec", + "parking_lot 0.12.1", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-test-helpers", + "polkadot-overseer", + "polkadot-primitives", + "sc-client-api", + "sp-api", + "sp-consensus", + "sp-core", + "sp-maybe-compressed-blob", + "sp-runtime", + "sp-state-machine", + "sp-tracing", + "tracing", +] + +[[package]] +name = "cumulus-client-consensus-aura" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-client-collator", + "cumulus-client-consensus-common", + "cumulus-client-consensus-proposer", + "cumulus-primitives-aura", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-interface", + "futures", + "parity-scale-codec", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-overseer", + "polkadot-primitives", + "sc-client-api", + "sc-consensus", + "sc-consensus-aura", + "sc-consensus-babe", + "sc-consensus-slots", + "sc-telemetry", + "schnellru", + "sp-api", + "sp-application-crypto", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "sp-timestamp", + "substrate-prometheus-endpoint", + "tracing", +] + +[[package]] +name = "cumulus-client-consensus-common" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-client-pov-recovery", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "cumulus-test-client", + "cumulus-test-relay-sproof-builder", + "dyn-clone", + "futures", + "futures-timer", + "log", + "parity-scale-codec", + "polkadot-primitives", + "sc-client-api", + "sc-consensus", + "sc-consensus-babe", + "schnellru", + "sp-blockchain", + "sp-consensus", + "sp-consensus-slots", + "sp-core", + "sp-runtime", + "sp-timestamp", + "sp-tracing", + "sp-trie", + "substrate-prometheus-endpoint", + "tracing", +] + +[[package]] +name = "cumulus-client-consensus-proposer" +version = "0.1.0" +dependencies = [ + "anyhow", + "async-trait", + "cumulus-primitives-parachain-inherent", + "sp-consensus", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "thiserror", +] + +[[package]] +name = "cumulus-client-consensus-relay-chain" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-client-consensus-common", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "futures", + "parking_lot 0.12.1", + "sc-consensus", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-inherents", + "sp-runtime", + "substrate-prometheus-endpoint", + "tracing", +] + +[[package]] +name = "cumulus-client-network" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-inprocess-interface", + "cumulus-relay-chain-interface", + "cumulus-test-service", + "futures", + "futures-timer", + "parity-scale-codec", + "parking_lot 0.12.1", + "polkadot-node-primitives", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-test-client", + "portpicker", + "sc-cli", + "sc-client-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-keyring", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "substrate-test-utils", + "tokio", + "tracing", + "url", +] + +[[package]] +name = "cumulus-client-pov-recovery" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "cumulus-test-service", + "futures", + "futures-timer", + "parity-scale-codec", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-overseer", + "polkadot-primitives", + "portpicker", + "rand 0.8.5", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sp-consensus", + "sp-maybe-compressed-blob", + "sp-runtime", + "substrate-test-utils", + "tokio", + "tracing", +] + +[[package]] +name = "cumulus-client-service" +version = "0.1.0" +dependencies = [ + "cumulus-client-cli", + "cumulus-client-collator", + "cumulus-client-consensus-common", + "cumulus-client-network", + "cumulus-client-pov-recovery", + "cumulus-primitives-core", + "cumulus-relay-chain-inprocess-interface", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-minimal-node", + "futures", + "polkadot-primitives", + "sc-client-api", + "sc-consensus", + "sc-network", + "sc-network-sync", + "sc-network-transactions", + "sc-rpc", + "sc-service", + "sc-sysinfo", + "sc-telemetry", + "sc-transaction-pool", + "sc-utils", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "sp-transaction-pool", +] + +[[package]] +name = "cumulus-pallet-aura-ext" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-parachain-system", + "frame-support", + "frame-system", + "pallet-aura", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-application-crypto", + "sp-consensus-aura", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "cumulus-pallet-dmp-queue" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-version", + "staging-xcm", +] + +[[package]] +name = "cumulus-pallet-parachain-system" +version = "0.1.0" +dependencies = [ + "assert_matches", + "bytes", + "cumulus-pallet-parachain-system-proc-macro", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-test-client", + "cumulus-test-relay-sproof-builder", + "environmental", + "frame-support", + "frame-system", + "hex-literal 0.4.1", + "impl-trait-for-tuples", + "lazy_static", + "log", + "parity-scale-codec", + "polkadot-parachain-primitives", + "sc-client-api", + "scale-info", + "sp-core", + "sp-externalities", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-trie", + "sp-version", + "staging-xcm", + "trie-db", +] + +[[package]] +name = "cumulus-pallet-parachain-system-proc-macro" +version = "0.1.0" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.31", +] + +[[package]] +name = "cumulus-pallet-session-benchmarking" +version = "3.0.0" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-session", + "parity-scale-codec", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "cumulus-pallet-solo-to-para" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-parachain-system", + "frame-support", + "frame-system", + "pallet-sudo", + "parity-scale-codec", + "polkadot-primitives", + "scale-info", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "cumulus-pallet-xcm" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-io", + "sp-runtime", + "sp-std", + "staging-xcm", +] + +[[package]] +name = "cumulus-pallet-xcmp-queue" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-parachain-system", + "cumulus-primitives-core", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "polkadot-runtime-common", + "rand_chacha 0.3.1", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "cumulus-ping" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-xcm", + "cumulus-primitives-core", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-runtime", + "sp-std", + "staging-xcm", +] + +[[package]] +name = "cumulus-primitives-aura" +version = "0.1.0" +dependencies = [ + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-primitives", + "sp-api", + "sp-consensus-aura", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "cumulus-primitives-core" +version = "0.1.0" +dependencies = [ + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-primitives", + "scale-info", + "sp-api", + "sp-runtime", + "sp-std", + "sp-trie", + "staging-xcm", +] + +[[package]] +name = "cumulus-primitives-parachain-inherent" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "cumulus-test-relay-sproof-builder", + "parity-scale-codec", + "sc-client-api", + "scale-info", + "sp-api", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-storage", + "sp-trie", + "tracing", +] + +[[package]] +name = "cumulus-primitives-timestamp" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "futures", + "parity-scale-codec", + "sp-inherents", + "sp-std", + "sp-timestamp", +] + +[[package]] +name = "cumulus-primitives-utility" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "frame-support", + "log", + "parity-scale-codec", + "polkadot-runtime-common", + "sp-io", + "sp-runtime", + "sp-std", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "cumulus-relay-chain-inprocess-interface" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "cumulus-test-service", + "futures", + "futures-timer", + "polkadot-cli", + "polkadot-primitives", + "polkadot-service", + "polkadot-test-client", + "prioritized-metered-channel", + "sc-cli", + "sc-client-api", + "sc-sysinfo", + "sc-telemetry", + "sc-tracing", + "sp-api", + "sp-consensus", + "sp-core", + "sp-keyring", + "sp-runtime", + "sp-state-machine", +] + +[[package]] +name = "cumulus-relay-chain-interface" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "futures", + "jsonrpsee-core", + "parity-scale-codec", + "polkadot-overseer", + "sc-client-api", + "sp-api", + "sp-blockchain", + "sp-state-machine", + "thiserror", +] + +[[package]] +name = "cumulus-relay-chain-minimal-node" +version = "0.1.0" +dependencies = [ + "array-bytes", + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-rpc-interface", + "futures", + "polkadot-availability-recovery", + "polkadot-collator-protocol", + "polkadot-core-primitives", + "polkadot-network-bridge", + "polkadot-node-collation-generation", + "polkadot-node-core-runtime-api", + "polkadot-node-network-protocol", + "polkadot-node-subsystem-util", + "polkadot-overseer", + "polkadot-primitives", + "sc-authority-discovery", + "sc-network", + "sc-network-common", + "sc-service", + "sc-tracing", + "sc-utils", + "schnellru", + "sp-api", + "sp-consensus", + "sp-consensus-babe", + "sp-runtime", + "tracing", +] + +[[package]] +name = "cumulus-relay-chain-rpc-interface" +version = "0.1.0" +dependencies = [ + "async-trait", + "cumulus-primitives-core", + "cumulus-relay-chain-interface", + "either", + "futures", + "futures-timer", + "jsonrpsee", + "parity-scale-codec", + "pin-project", + "polkadot-overseer", + "rand 0.8.5", + "sc-client-api", + "sc-rpc-api", + "sc-service", + "schnellru", + "serde", + "serde_json", + "smoldot", + "smoldot-light", + "sp-api", + "sp-authority-discovery", + "sp-consensus-babe", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "thiserror", + "tokio", + "tokio-util", + "tracing", + "url", +] + +[[package]] +name = "cumulus-test-client" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-test-relay-sproof-builder", + "cumulus-test-runtime", + "cumulus-test-service", + "frame-system", + "pallet-balances", + "pallet-transaction-payment", + "parity-scale-codec", + "polkadot-parachain-primitives", + "polkadot-primitives", + "sc-block-builder", + "sc-consensus", + "sc-executor", + "sc-executor-common", + "sc-service", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-timestamp", + "substrate-test-client", +] + +[[package]] +name = "cumulus-test-relay-sproof-builder" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "parity-scale-codec", + "polkadot-primitives", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-trie", +] + +[[package]] +name = "cumulus-test-relay-validation-worker-provider" +version = "0.1.0" +dependencies = [ + "polkadot-node-core-pvf", + "toml 0.7.6", +] + +[[package]] +name = "cumulus-test-runtime" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-parachain-system", + "cumulus-primitives-core", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", + "pallet-balances", + "pallet-glutton", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-block-builder", + "sp-core", + "sp-inherents", + "sp-io", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-version", + "substrate-wasm-builder", +] + +[[package]] +name = "cumulus-test-service" +version = "0.1.0" +dependencies = [ + "async-trait", + "clap 4.4.2", + "criterion 0.5.1", + "cumulus-client-cli", + "cumulus-client-consensus-common", + "cumulus-client-consensus-relay-chain", + "cumulus-client-pov-recovery", + "cumulus-client-service", + "cumulus-pallet-parachain-system", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-inprocess-interface", + "cumulus-relay-chain-interface", + "cumulus-relay-chain-minimal-node", + "cumulus-test-client", + "cumulus-test-relay-sproof-builder", + "cumulus-test-relay-validation-worker-provider", + "cumulus-test-runtime", + "frame-system", + "frame-system-rpc-runtime-api", + "futures", + "jsonrpsee", + "pallet-im-online", + "pallet-timestamp", + "pallet-transaction-payment", + "parachains-common", + "parity-scale-codec", + "polkadot-cli", + "polkadot-node-subsystem", + "polkadot-overseer", + "polkadot-primitives", + "polkadot-service", + "polkadot-test-service", + "portpicker", + "rand 0.8.5", + "rococo-parachain-runtime", + "sc-basic-authorship", + "sc-block-builder", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-executor", + "sc-executor-common", + "sc-executor-wasmtime", + "sc-network", + "sc-service", + "sc-telemetry", + "sc-tracing", + "sc-transaction-pool", + "sc-transaction-pool-api", + "serde", + "sp-api", + "sp-arithmetic", + "sp-authority-discovery", + "sp-blockchain", + "sp-consensus", + "sp-consensus-grandpa", + "sp-core", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-state-machine", + "sp-timestamp", + "sp-tracing", + "substrate-test-client", + "substrate-test-utils", + "tempfile", + "tokio", + "tracing", + "url", +] + [[package]] name = "curve25519-dalek" version = "2.1.3" @@ -1569,23 +4044,50 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.0.0-rc.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d4ba9852b42210c7538b75484f9daa0655e9a3ac04f693747bb0f02cf3cfe16" +checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2" dependencies = [ "cfg-if", + "cpufeatures", + "curve25519-dalek-derive", + "digest 0.10.7", "fiat-crypto", - "packed_simd_2", "platforms", + "rustc_version 0.4.0", "subtle", "zeroize", ] [[package]] -name = "cxx" -version = "1.0.80" +name = "curve25519-dalek-derive" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a" +checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", +] + +[[package]] +name = "curve25519-dalek-ng" +version = "4.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c359b7249347e46fb28804470d071c921156ad62b3eef5d34e2ba867533dec8" +dependencies = [ + "byteorder", + "digest 0.9.0", + "rand_core 0.6.4", + "subtle-ng", + "zeroize", +] + +[[package]] +name = "cxx" +version = "1.0.106" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28403c86fc49e3401fdf45499ba37fad6493d9329449d6449d7f0e10f4654d28" dependencies = [ "cc", "cxxbridge-flags", @@ -1595,9 +4097,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.80" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827" +checksum = "78da94fef01786dc3e0c76eafcd187abcaa9972c78e05ff4041e24fdf059c285" dependencies = [ "cc", "codespan-reporting", @@ -1605,31 +4107,31 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "cxxbridge-flags" -version = "1.0.80" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a" +checksum = "e2a6f5e1dfb4b34292ad4ea1facbfdaa1824705b231610087b00b17008641809" [[package]] name = "cxxbridge-macro" -version = "1.0.80" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7" +checksum = "50c49547d73ba8dcfd4ad7325d64c6d5391ff4224d498fc39a6f3f49825a530d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "darling" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ "darling_core", "darling_macro", @@ -1637,9 +4139,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", @@ -1651,9 +4153,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.14.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core", "quote", @@ -1661,16 +4163,29 @@ dependencies = [ ] [[package]] -name = "data-encoding" -version = "2.3.2" +name = "dashmap" +version = "5.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" +checksum = "edd72493923899c6f10c641bdbdeddc7183d6396641d99c1a0d1597f37f92e28" +dependencies = [ + "cfg-if", + "hashbrown 0.14.0", + "lock_api", + "once_cell", + "parking_lot_core 0.9.8", +] + +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" [[package]] name = "data-encoding-macro" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86927b7cd2fe88fa698b87404b287ab98d1a0063a34071d92e575b72d3029aca" +checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -1678,9 +4193,9 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5bbed42daaa95e780b60a50546aa345b8413a1e46f9a40a12907d3598f038db" +checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772" dependencies = [ "data-encoding", "syn 1.0.109", @@ -1697,9 +4212,9 @@ dependencies = [ [[package]] name = "der" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dd2ae565c0a381dde7fade45fce95984c568bdcb4700a4fdbe3175e0380b2f" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", "pem-rfc7468", @@ -1708,9 +4223,9 @@ dependencies = [ [[package]] name = "der" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ed52955ce76b1554f509074bb357d3fb8ac9b51288a65a3fd480d1dfba946" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" dependencies = [ "const-oid", "zeroize", @@ -1732,11 +4247,11 @@ dependencies = [ [[package]] name = "der-parser" -version = "8.1.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d4bc9b0db0a0df9ae64634ac5bdefb7afcb534e182275ca0beadbe486701c1" +checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ - "asn1-rs 0.5.1", + "asn1-rs 0.5.2", "displaydoc", "nom", "num-bigint", @@ -1744,6 +4259,12 @@ dependencies = [ "rusticata-macros", ] +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + [[package]] name = "derivative" version = "2.2.0" @@ -1806,15 +4327,15 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version", + "rustc_version 0.4.0", "syn 1.0.109", ] [[package]] name = "diff" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" [[package]] name = "difflib" @@ -1837,16 +4358,16 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", ] [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.3", + "block-buffer 0.10.4", "const-oid", "crypto-common", "subtle", @@ -1873,9 +4394,9 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" dependencies = [ "libc", "redox_users", @@ -1895,20 +4416,37 @@ dependencies = [ [[package]] name = "displaydoc" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bf95dc3f046b9da4f2d51833c0d3547d8564ef6910f5c1ed130306a75b92886" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "dissimilar" -version = "1.0.3" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ad93652f40969dead8d4bf897a41e9462095152eb21c56e5830537e41179dd" +checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" + +[[package]] +name = "dleq_vrf" +version = "0.0.2" +source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-scale", + "ark-secret-scalar", + "ark-serialize", + "ark-std", + "ark-transcript", + "arrayvec 0.7.4", + "rand_core 0.6.4", + "zeroize", +] [[package]] name = "dlmalloc" @@ -1927,28 +4465,28 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "docify" -version = "0.1.13" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18b972b74c30cbe838fc6a07665132ff94f257350e26fd01d80bc59ee7fcf129" +checksum = "029de870d175d11969524d91a3fb2cbf6d488b853bff99d41cf65e533ac7d9d2" dependencies = [ "docify_macros", ] [[package]] name = "docify_macros" -version = "0.1.13" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c93004d1011191c56df9e853dca42f2012e7488638bcd5078935f5ce43e06cf3" +checksum = "cac43324656a1b05eb0186deb51f27d2d891c704c37f34de281ef6297ba193e5" dependencies = [ "common-path", "derive-syn-parse", - "lazy_static", - "prettyplease", + "once_cell", "proc-macro2", "quote", "regex", - "syn 2.0.16", + "syn 2.0.31", "termcolor", + "toml 0.7.6", "walkdir", ] @@ -1959,10 +4497,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" [[package]] -name = "dtoa" -version = "1.0.2" +name = "downcast-rs" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5caaa75cbd2b960ff1e5392d2cfb1f44717fffe12fc1f32b7b5d1267f99732a6" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "dtoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653" [[package]] name = "dyn-clonable" @@ -1987,9 +4531,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.4" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2626afccd7561a06cf1367e2950c4718ea04565e20fb5029b6c7d8ad09abcf" +checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" [[package]] name = "ecdsa" @@ -1997,7 +4541,7 @@ version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ - "der 0.6.0", + "der 0.6.1", "elliptic-curve 0.12.3", "rfc6979 0.3.1", "signature 1.6.4", @@ -2005,12 +4549,12 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.16.7" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0997c976637b606099b9985693efa3581e84e41f5c11ba5255f88711058ad428" +checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" dependencies = [ - "der 0.7.7", - "digest 0.10.6", + "der 0.7.8", + "digest 0.10.7", "elliptic-curve 0.13.5", "rfc6979 0.4.0", "signature 2.1.0", @@ -2026,6 +4570,16 @@ dependencies = [ "signature 1.6.4", ] +[[package]] +name = "ed25519" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" +dependencies = [ + "pkcs8 0.10.2", + "signature 2.1.0", +] + [[package]] name = "ed25519-dalek" version = "1.0.1" @@ -2033,10 +4587,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" dependencies = [ "curve25519-dalek 3.2.0", - "ed25519", + "ed25519 1.5.3", "rand 0.7.3", "serde", - "sha2 0.9.8", + "sha2 0.9.9", + "zeroize", +] + +[[package]] +name = "ed25519-dalek" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +dependencies = [ + "curve25519-dalek 4.0.0", + "ed25519 2.2.2", + "rand_core 0.6.4", + "serde", + "sha2 0.10.7", "zeroize", ] @@ -2050,15 +4618,30 @@ dependencies = [ "hashbrown 0.12.3", "hex", "rand_core 0.6.4", - "sha2 0.9.8", + "sha2 0.9.9", + "zeroize", +] + +[[package]] +name = "ed25519-zebra" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e83e509bcd060ca4b54b72bde5bb306cb2088cb01e14797ebae90a24f70f5f7" +dependencies = [ + "curve25519-dalek 4.0.0", + "ed25519 2.2.2", + "hashbrown 0.14.0", + "hex", + "rand_core 0.6.4", + "sha2 0.10.7", "zeroize", ] [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" @@ -2068,10 +4651,10 @@ checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct 0.1.1", "crypto-bigint 0.4.9", - "der 0.6.0", - "digest 0.10.6", + "der 0.6.1", + "digest 0.10.7", "ff 0.12.1", - "generic-array 0.14.6", + "generic-array 0.14.7", "group 0.12.1", "hkdf", "pem-rfc7468", @@ -2090,13 +4673,13 @@ checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" dependencies = [ "base16ct 0.2.0", "crypto-bigint 0.5.2", - "digest 0.10.6", + "digest 0.10.7", "ff 0.13.0", - "generic-array 0.14.6", + "generic-array 0.14.7", "group 0.13.0", "pkcs8 0.10.2", "rand_core 0.6.4", - "sec1 0.7.1", + "sec1 0.7.3", "subtle", "zeroize", ] @@ -2109,9 +4692,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.30" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -2145,28 +4728,28 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "enumn" -version = "0.1.8" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48016319042fb7c87b78d2993084a831793a897a5cd1a2a67cab9d1eeb4b7d76" +checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "env_logger" -version = "0.7.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" dependencies = [ "atty", - "humantime 1.3.0", + "humantime", "log", "regex", "termcolor", @@ -2174,12 +4757,12 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", - "humantime 2.1.0", + "humantime", + "is-terminal", "log", "regex", "termcolor", @@ -2192,10 +4775,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" [[package]] -name = "erased-serde" -version = "0.3.20" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad132dd8d0d0b546348d7d86cb3191aad14b34e5f979781fc005c80d4ac67ffd" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "erased-serde" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "837c0466252947ada828b975e12daf82e18bb5444e4df87be6038d4469e2a3d2" dependencies = [ "serde", ] @@ -2212,20 +4801,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -2243,10 +4821,37 @@ dependencies = [ ] [[package]] -name = "event-listener" -version = "2.5.1" +name = "ethbloom" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" +checksum = "c22d4b5885b6aa2fe5e8b9329fb8d232bf739e434e6b87347c63bdd00c120f60" +dependencies = [ + "crunchy", + "fixed-hash", + "impl-rlp", + "impl-serde", + "tiny-keccak", +] + +[[package]] +name = "ethereum-types" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d215cbf040552efcbe99a38372fe80ab9d00268e20012b79fcd0f073edd8ee" +dependencies = [ + "ethbloom", + "fixed-hash", + "impl-rlp", + "impl-serde", + "primitive-types", + "uint", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "exit-future" @@ -2297,14 +4902,14 @@ dependencies = [ "fs-err", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "eyre" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221239d1d5ea86bf5d6f91c9d6bc3646ffe471b08ff9b0f91c44f115ac969d2b" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" dependencies = [ "indenter", "once_cell", @@ -2324,13 +4929,19 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + [[package]] name = "fatality" version = "0.0.6" @@ -2348,7 +4959,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd" dependencies = [ "expander 0.0.4", - "indexmap", + "indexmap 1.9.3", "proc-macro-crate", "proc-macro2", "quote", @@ -2401,6 +5012,19 @@ dependencies = [ "subtle", ] +[[package]] +name = "fflonk" +version = "0.1.0" +source = "git+https://github.com/w3f/fflonk#26a5045b24e169cffc1f9328ca83d71061145c40" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "merlin 3.0.0", +] + [[package]] name = "fiat-crypto" version = "0.1.20" @@ -2409,24 +5033,24 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "file-per-thread-logger" -version = "0.1.4" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fdbe0d94371f9ce939b555dd342d0686cc4c0cadbcd4b61d70af5ff97eb4126" +checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866" dependencies = [ - "env_logger 0.7.1", + "env_logger 0.10.0", "log", ] [[package]] name = "filetime" -version = "0.2.17" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.36.1", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", ] [[package]] @@ -2442,6 +5066,7 @@ dependencies = [ "num-traits", "parity-scale-codec", "parking_lot 0.12.1", + "rand 0.8.5", "scale-info", ] @@ -2471,21 +5096,19 @@ dependencies = [ [[package]] name = "fixedbitset" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ - "cfg-if", "crc32fast", - "libc", "libz-sys", - "miniz_oxide 0.4.4", + "miniz_oxide", ] [[package]] @@ -2506,20 +5129,29 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", ] [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] +[[package]] +name = "fraction" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" +dependencies = [ + "lazy_static", + "num", +] + [[package]] name = "fragile" version = "2.0.0" @@ -2529,8 +5161,8 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", "frame-support", "frame-support-procedural", "frame-system", @@ -2538,12 +5170,14 @@ dependencies = [ "log", "parity-scale-codec", "paste", + "rusty-fork", "scale-info", "serde", "sp-api", "sp-application-crypto", "sp-core", "sp-io", + "sp-keystore", "sp-runtime", "sp-runtime-interface", "sp-std", @@ -2554,19 +5188,18 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "Inflector", "array-bytes", "chrono", - "clap 4.2.5", + "clap 4.4.2", "comfy-table", "frame-benchmarking", "frame-support", "frame-system", "gethostname", "handlebars", - "itertools", + "itertools 0.10.5", "lazy_static", "linked-hash-map", "log", @@ -2599,49 +5232,91 @@ dependencies = [ "thousands", ] +[[package]] +name = "frame-benchmarking-pallet-pov" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "frame-election-provider-support", + "frame-support", + "parity-scale-codec", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "scale-info", + "sp-arithmetic", + "syn 2.0.31", + "trybuild", ] [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-election-provider-solution-type", "frame-support", "frame-system", "parity-scale-codec", + "rand 0.8.5", "scale-info", "sp-arithmetic", "sp-core", + "sp-io", "sp-npos-elections", "sp-runtime", "sp-std", ] +[[package]] +name = "frame-election-solution-type-fuzzer" +version = "2.0.0-alpha.5" +dependencies = [ + "clap 4.4.2", + "frame-election-provider-solution-type", + "frame-election-provider-support", + "frame-support", + "honggfuzz", + "parity-scale-codec", + "rand 0.8.5", + "scale-info", + "sp-arithmetic", + "sp-npos-elections", + "sp-runtime", +] + [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", "frame-support", "frame-system", "frame-try-runtime", + "log", + "pallet-balances", + "pallet-transaction-payment", "parity-scale-codec", "scale-info", "sp-core", + "sp-inherents", "sp-io", "sp-runtime", "sp-std", "sp-tracing", + "sp-version", ] [[package]] @@ -2659,7 +5334,6 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-recursion", "futures", @@ -2671,6 +5345,8 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", + "sp-state-machine", + "sp-tracing", "spinners", "substrate-rpc-client", "tokio", @@ -2680,84 +5356,90 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "bitflags", + "aquamarine", + "array-bytes", + "assert_matches", + "bitflags 1.3.2", + "docify", "environmental", "frame-metadata", "frame-support-procedural", + "frame-system", "impl-trait-for-tuples", "k256", "log", "macro_magic", "parity-scale-codec", "paste", + "pretty_assertions", "scale-info", "serde", + "serde_json", "smallvec", "sp-api", "sp-arithmetic", "sp-core", "sp-core-hashing-proc-macro", "sp-debug-derive", + "sp-genesis-builder", "sp-inherents", "sp-io", + "sp-metadata-ir", "sp-runtime", "sp-staking", "sp-state-machine", "sp-std", "sp-tracing", "sp-weights", + "static_assertions", "tt-call", ] [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "Inflector", "cfg-expr", "derive-syn-parse", "expander 2.0.0", "frame-support-procedural-tools", - "itertools", + "itertools 0.10.5", "macro_magic", "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-executive", + "frame-metadata", "frame-support", "frame-support-test-pallet", "frame-system", @@ -2770,6 +5452,7 @@ dependencies = [ "sp-arithmetic", "sp-core", "sp-io", + "sp-metadata-ir", "sp-runtime", "sp-state-machine", "sp-std", @@ -2778,41 +5461,55 @@ dependencies = [ "trybuild", ] +[[package]] +name = "frame-support-test-compile-pass" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-runtime", + "sp-version", +] + [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", "serde", + "sp-runtime", ] [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "cfg-if", + "criterion 0.4.0", "frame-support", "log", "parity-scale-codec", "scale-info", "serde", "sp-core", + "sp-externalities", "sp-io", "sp-runtime", "sp-std", "sp-version", "sp-weights", + "substrate-test-runtime-client", ] [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -2820,14 +5517,16 @@ dependencies = [ "parity-scale-codec", "scale-info", "sp-core", + "sp-externalities", + "sp-io", "sp-runtime", "sp-std", + "sp-version", ] [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "sp-api", @@ -2836,7 +5535,6 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "parity-scale-codec", @@ -2847,9 +5545,9 @@ dependencies = [ [[package]] name = "fs-err" -version = "2.6.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ebd3504ad6116843b8375ad70df74e7bfe83cac77a1f3fe73200c844d43bfe0" +checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" [[package]] name = "fs2" @@ -2863,13 +5561,12 @@ dependencies = [ [[package]] name = "fs4" -version = "0.6.3" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea55201cc351fdb478217c0fb641b59813da9b4efe4c414a9d8f989a657d149" +checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "libc", - "rustix 0.35.13", - "winapi", + "rustix 0.38.8", + "windows-sys 0.48.0", ] [[package]] @@ -2935,16 +5632,16 @@ checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", "parking", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "waker-fn", ] @@ -2956,7 +5653,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] @@ -2966,7 +5663,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", - "rustls 0.20.7", + "rustls 0.20.8", "webpki 0.22.0", ] @@ -3001,7 +5698,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "pin-utils", "slab", ] @@ -3018,7 +5715,6 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "chrono", "frame-election-provider-support", @@ -3040,9 +5736,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -3072,23 +5768,15 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "ghash" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" -dependencies = [ - "opaque-debug 0.3.0", - "polyval 0.4.5", + "wasm-bindgen", ] [[package]] @@ -3102,27 +5790,43 @@ dependencies = [ ] [[package]] -name = "gimli" -version = "0.27.0" +name = "ghash" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" +checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" +dependencies = [ + "opaque-debug 0.3.0", + "polyval 0.6.1", +] + +[[package]] +name = "gimli" +version = "0.27.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" dependencies = [ "fallible-iterator", - "indexmap", + "indexmap 1.9.3", "stable_deref_trait", ] [[package]] -name = "glob" -version = "0.3.0" +name = "gimli" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" + +[[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.8" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", "bstr", @@ -3131,6 +5835,43 @@ dependencies = [ "regex", ] +[[package]] +name = "glutton-runtime" +version = "1.0.0" +dependencies = [ + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcm", + "cumulus-primitives-core", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "pallet-glutton", + "pallet-sudo", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-block-builder", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + [[package]] name = "group" version = "0.12.1" @@ -3155,9 +5896,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.17" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b91535aa35fea1523ad1b86cb6b53c28e0ae566ba4a460f4457e936cad7c6f" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -3165,7 +5906,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -3180,16 +5921,16 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "handlebars" -version = "4.2.2" +version = "4.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d6a30320f094710245150395bc763ad23128d6a1ebbad7594dc4164b62c56b" +checksum = "83c3372087601b532857d332f5957cbae686da52bb7810bf038c3e3c3cc2fa0d" dependencies = [ "log", "pest", "pest_derive", - "quick-error 2.0.1", "serde", "serde_json", + "thiserror", ] [[package]] @@ -3222,14 +5963,25 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.2", + "ahash 0.8.3", +] + +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", + "serde", ] [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -3242,9 +5994,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -3283,16 +6035,6 @@ dependencies = [ "digest 0.9.0", ] -[[package]] -name = "hmac" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" -dependencies = [ - "crypto-mac 0.10.1", - "digest 0.9.0", -] - [[package]] name = "hmac" version = "0.11.0" @@ -3309,7 +6051,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3319,7 +6061,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" dependencies = [ "digest 0.9.0", - "generic-array 0.14.6", + "generic-array 0.14.7", "hmac 0.8.1", ] @@ -3332,7 +6074,7 @@ dependencies = [ "arbitrary", "lazy_static", "memmap2", - "rustc_version", + "rustc_version 0.4.0", ] [[package]] @@ -3348,9 +6090,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -3365,35 +6107,26 @@ checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", "http", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", ] [[package]] name = "http-range-header" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe8eed0a9285ef776bb792479ea3834e8b94e13d615c2f66d03dd50a435a29" +checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f" [[package]] name = "httparse" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" +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" - -[[package]] -name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error 1.2.3", -] +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -3403,9 +6136,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -3417,8 +6150,8 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.9", - "socket2", + "pin-project-lite 0.2.12", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -3427,33 +6160,42 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87c48c02e0dc5e3b849a2041db3029fd066650f8f717c07bf8ed78ccb895cac" +checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" dependencies = [ + "futures-util", "http", "hyper", "log", - "rustls 0.20.7", + "rustls 0.21.6", "rustls-native-certs", "tokio", - "tokio-rustls 0.23.2", - "webpki-roots", + "tokio-rustls", + "webpki-roots 0.23.1", ] [[package]] -name = "hyper-rustls" -version = "0.24.0" +name = "iana-time-zone" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ - "http", - "hyper", - "log", - "rustls 0.21.2", - "rustls-native-certs", - "tokio", - "tokio-rustls 0.24.1", + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows 0.48.0", +] + +[[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]] @@ -3475,9 +6217,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -3495,9 +6237,9 @@ dependencies = [ [[package]] name = "if-watch" -version = "3.0.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba7abdbb86e485125dad06c2691e1e393bf3b08c7b743b43aa162a00fd39062e" +checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f" dependencies = [ "async-io", "core-foundation", @@ -3509,7 +6251,7 @@ dependencies = [ "rtnetlink", "system-configuration", "tokio", - "windows", + "windows 0.34.0", ] [[package]] @@ -3521,6 +6263,26 @@ dependencies = [ "parity-scale-codec", ] +[[package]] +name = "impl-num-traits" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "951641f13f873bff03d4bf19ae8bec531935ac0ac2cc775f84d7edfdcfed3f17" +dependencies = [ + "integer-sqrt", + "num-traits", + "uint", +] + +[[package]] +name = "impl-rlp" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" +dependencies = [ + "rlp", +] + [[package]] name = "impl-serde" version = "0.4.0" @@ -3541,6 +6303,25 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "include_dir" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "indenter" version = "0.3.3" @@ -3549,9 +6330,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", @@ -3559,17 +6340,43 @@ dependencies = [ ] [[package]] -name = "indicatif" -version = "0.17.3" +name = "indexmap" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", +] + +[[package]] +name = "indexmap-nostd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" + +[[package]] +name = "indicatif" +version = "0.17.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" dependencies = [ "console", + "instant", "number_prefix", "portable-atomic", "unicode-width", ] +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array 0.14.7", +] + [[package]] name = "instant" version = "0.1.12" @@ -3581,9 +6388,9 @@ dependencies = [ [[package]] name = "integer-encoding" -version = "3.0.2" +version = "3.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90c11140ffea82edce8dcd74137ce9324ec24b3cf0175fc9d7e29164da9915b8" +checksum = "8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02" [[package]] name = "integer-sqrt" @@ -3594,6 +6401,57 @@ dependencies = [ "num-traits", ] +[[package]] +name = "integration-tests-common" +version = "1.0.0" +dependencies = [ + "asset-hub-kusama-runtime", + "asset-hub-polkadot-runtime", + "asset-hub-westend-runtime", + "bp-messages", + "bridge-hub-kusama-runtime", + "bridge-hub-polkadot-runtime", + "bridge-hub-rococo-runtime", + "bridge-runtime-common", + "collectives-polkadot-runtime", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "frame-support", + "kusama-runtime-constants", + "pallet-assets", + "pallet-bridge-messages", + "pallet-im-online", + "pallet-message-queue", + "pallet-staking", + "pallet-xcm", + "parachains-common", + "parity-scale-codec", + "paste", + "penpal-runtime", + "polkadot-core-primitives", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-runtime", + "polkadot-runtime-constants", + "polkadot-runtime-parachains", + "polkadot-service", + "rococo-runtime", + "rococo-runtime-constants", + "sc-consensus-grandpa", + "sp-authority-discovery", + "sp-consensus-babe", + "sp-consensus-beefy", + "sp-core", + "sp-runtime", + "staging-kusama-runtime", + "staging-xcm", + "westend-runtime", + "westend-runtime-constants", + "xcm-emulator", +] + [[package]] name = "interceptor" version = "0.8.2" @@ -3615,17 +6473,11 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "0.7.5" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ce5ef949d49ee85593fc4d3f3f95ad61657076395cbbce23e2121fc5542074" - -[[package]] -name = "io-lifetimes" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", "windows-sys 0.48.0", ] @@ -3638,48 +6490,65 @@ checksum = "aa2f047c0a98b2f299aa5d6d7088443570faae494e9ae1305e48be000c9e0eb1" [[package]] name = "ipconfig" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723519edce41262b05d4143ceb95050e4c614f483e78e9fd9e39a8275a84ad98" +checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2", + "socket2 0.5.3", "widestring", - "winapi", - "winreg 0.7.0", + "windows-sys 0.48.0", + "winreg", ] [[package]] name = "ipnet" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes 1.0.10", - "rustix 0.37.18", + "hermit-abi 0.3.2", + "rustix 0.38.8", "windows-sys 0.48.0", ] [[package]] -name = "itertools" -version = "0.10.3" +name = "is_executable" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8" +dependencies = [ + "winapi", +] + +[[package]] +name = "itertools" +version = "0.10.5" +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", ] [[package]] name = "itoa" -version = "1.0.4" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" @@ -3692,9 +6561,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.62" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -3706,10 +6575,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" [[package]] -name = "jsonrpsee" -version = "0.16.2" +name = "json-patch" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d291e3a5818a2384645fd9756362e6d89cf0541b0b916fa7702ea4a9833608e" +checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "jsonrpsee" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b" dependencies = [ "jsonrpsee-core", "jsonrpsee-http-client", @@ -3722,9 +6602,9 @@ dependencies = [ [[package]] name = "jsonrpsee-client-transport" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965de52763f2004bc91ac5bcec504192440f0b568a5d621c59d9dbd6f886c3fb" +checksum = "c8b3815d9f5d5de348e5f162b316dc9cdf4548305ebb15b4eb9328e66cf27d7a" dependencies = [ "futures-util", "http", @@ -3735,20 +6615,20 @@ dependencies = [ "soketto", "thiserror", "tokio", - "tokio-rustls 0.23.2", + "tokio-rustls", "tokio-util", "tracing", - "webpki-roots", + "webpki-roots 0.25.2", ] [[package]] name = "jsonrpsee-core" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e70b4439a751a5de7dd5ed55eacff78ebf4ffe0fc009cb1ebb11417f5b536b" +checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803" dependencies = [ "anyhow", - "arrayvec 0.7.2", + "arrayvec 0.7.4", "async-lock", "async-trait", "beef", @@ -3771,13 +6651,13 @@ dependencies = [ [[package]] name = "jsonrpsee-http-client" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc345b0a43c6bc49b947ebeb936e886a419ee3d894421790c969cc56040542ad" +checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43" dependencies = [ "async-trait", "hyper", - "hyper-rustls 0.23.0", + "hyper-rustls", "jsonrpsee-core", "jsonrpsee-types", "rustc-hash", @@ -3790,9 +6670,9 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa6da1e4199c10d7b1d0a6e5e8bd8e55f351163b6f4b3cbb044672a69bd4c1c" +checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" dependencies = [ "heck", "proc-macro-crate", @@ -3803,9 +6683,9 @@ dependencies = [ [[package]] name = "jsonrpsee-server" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb69dad85df79527c019659a992498d03f8495390496da2f07e6c24c2b356fc" +checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba" dependencies = [ "futures-channel", "futures-util", @@ -3825,9 +6705,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd522fe1ce3702fd94812965d7bb7a3364b1c9aba743944c5a00529aae80f8c" +checksum = "245ba8e5aa633dd1c1e4fae72bce06e71f42d34c14a2767c6b4d173b57bee5e5" dependencies = [ "anyhow", "beef", @@ -3839,9 +6719,9 @@ dependencies = [ [[package]] name = "jsonrpsee-ws-client" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b83daeecfc6517cfe210df24e570fb06213533dfb990318fae781f4c7119dd9" +checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e" dependencies = [ "http", "jsonrpsee-client-transport", @@ -3856,56 +6736,85 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" dependencies = [ "cfg-if", - "ecdsa 0.16.7", + "ecdsa 0.16.8", "elliptic-curve 0.13.5", "once_cell", - "sha2 0.10.2", + "sha2 0.10.7", ] [[package]] name = "keccak" -version = "0.1.0" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" +checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +dependencies = [ + "cpufeatures", +] [[package]] -name = "kusama-runtime" -version = "1.0.0" +name = "keccak-hasher" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ea4653859ca2266a86419d3f592d3f22e7a854b482f99180d2498507902048" +dependencies = [ + "hash-db", + "hash256-std-hasher", + "tiny-keccak", +] + +[[package]] +name = "kitchensink-runtime" +version = "3.0.0-dev" dependencies = [ - "bitvec", "frame-benchmarking", + "frame-benchmarking-pallet-pov", "frame-election-provider-support", "frame-executive", - "frame-remote-externalities", "frame-support", "frame-system", "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", - "hex-literal 0.4.1", - "kusama-runtime-constants", "log", + "node-primitives", + "pallet-alliance", + "pallet-asset-conversion", + "pallet-asset-conversion-tx-payment", + "pallet-asset-rate", + "pallet-asset-tx-payment", + "pallet-assets", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", "pallet-bags-list", "pallet-balances", "pallet-bounties", + "pallet-broker", "pallet-child-bounties", "pallet-collective", + "pallet-contracts", + "pallet-contracts-primitives", "pallet-conviction-voting", + "pallet-core-fellowship", "pallet-democracy", "pallet-election-provider-multi-phase", "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", "pallet-fast-unstake", + "pallet-glutton", "pallet-grandpa", "pallet-identity", "pallet-im-online", "pallet-indices", + "pallet-insecure-randomness-collective-flip", + "pallet-lottery", "pallet-membership", "pallet-message-queue", + "pallet-mmr", "pallet-multisig", + "pallet-nft-fractionalization", + "pallet-nfts", + "pallet-nfts-runtime-api", "pallet-nis", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", @@ -3917,62 +6826,53 @@ dependencies = [ "pallet-ranked-collective", "pallet-recovery", "pallet-referenda", + "pallet-remark", + "pallet-root-testing", + "pallet-safe-mode", + "pallet-salary", "pallet-scheduler", "pallet-session", "pallet-session-benchmarking", "pallet-society", "pallet-staking", + "pallet-staking-reward-curve", "pallet-staking-runtime-api", "pallet-state-trie-migration", + "pallet-statement", + "pallet-sudo", "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", + "pallet-transaction-storage", "pallet-treasury", + "pallet-tx-pause", + "pallet-uniques", "pallet-utility", "pallet-vesting", "pallet-whitelist", - "pallet-xcm", - "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-primitives", - "polkadot-runtime-common", - "polkadot-runtime-parachains", - "rustc-hex", + "primitive-types", "scale-info", - "separator", - "serde", - "serde_derive", - "serde_json", - "smallvec", "sp-api", - "sp-arithmetic", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", - "sp-consensus-beefy", + "sp-consensus-grandpa", "sp-core", "sp-inherents", "sp-io", - "sp-keyring", - "sp-mmr-primitives", - "sp-npos-elections", "sp-offchain", "sp-runtime", "sp-session", "sp-staking", + "sp-statement-store", "sp-std", - "sp-tracing", + "sp-storage", "sp-transaction-pool", - "sp-trie", "sp-version", "static_assertions", "substrate-wasm-builder", - "tiny-keccak", - "tokio", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -4054,16 +6954,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] -name = "libc" -version = "0.2.142" +name = "leb128" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libflate" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97822bf791bd4d5b403713886a5fbe8bf49520fe78e323b0dc480ca1a03e50b0" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" dependencies = [ "adler32", "crc32fast", @@ -4081,9 +6987,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", "winapi", @@ -4091,9 +6997,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.1.4" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" [[package]] name = "libp2p" @@ -4104,7 +7010,7 @@ dependencies = [ "bytes", "futures", "futures-timer", - "getrandom 0.2.8", + "getrandom 0.2.10", "instant", "libp2p-allow-block-list", "libp2p-connection-limits", @@ -4209,7 +7115,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm", "log", - "lru 0.10.0", + "lru 0.10.1", "quick-protobuf", "quick-protobuf-codec", "smallvec", @@ -4219,18 +7125,18 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e2d584751cecb2aabaa56106be6be91338a60a0f4e420cf2af639204f596fc1" +checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ - "bs58", - "ed25519-dalek", + "bs58 0.4.0", + "ed25519-dalek 2.0.0", "log", "multiaddr", "multihash", "quick-protobuf", "rand 0.8.5", - "sha2 0.10.2", + "sha2 0.10.7", "thiserror", "zeroize", ] @@ -4241,7 +7147,7 @@ version = "0.43.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", "asynchronous-codec", "bytes", "either", @@ -4255,7 +7161,7 @@ dependencies = [ "log", "quick-protobuf", "rand 0.8.5", - "sha2 0.10.2", + "sha2 0.10.7", "smallvec", "thiserror", "uint", @@ -4278,7 +7184,7 @@ dependencies = [ "log", "rand 0.8.5", "smallvec", - "socket2", + "socket2 0.4.9", "tokio", "trust-dns-proto", "void", @@ -4313,7 +7219,7 @@ dependencies = [ "once_cell", "quick-protobuf", "rand 0.8.5", - "sha2 0.10.2", + "sha2 0.10.7", "snow", "static_assertions", "thiserror", @@ -4355,7 +7261,7 @@ dependencies = [ "parking_lot 0.12.1", "quinn-proto", "rand 0.8.5", - "rustls 0.20.7", + "rustls 0.20.8", "thiserror", "tokio", ] @@ -4420,7 +7326,7 @@ dependencies = [ "libc", "libp2p-core", "log", - "socket2", + "socket2 0.4.9", "tokio", ] @@ -4435,8 +7341,8 @@ dependencies = [ "libp2p-core", "libp2p-identity", "rcgen 0.10.0", - "ring", - "rustls 0.20.7", + "ring 0.16.20", + "rustls 0.20.8", "thiserror", "webpki 0.22.0", "x509-parser 0.14.0", @@ -4504,7 +7410,7 @@ dependencies = [ "rw-stream-sink", "soketto", "url", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] @@ -4537,12 +7443,12 @@ dependencies = [ [[package]] name = "libsecp256k1" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0452aac8bab02242429380e9b2f94ea20cea2b37e2c1777a1358799bbe97f37" +checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1" dependencies = [ "arrayref", - "base64 0.13.0", + "base64 0.13.1", "digest 0.9.0", "hmac-drbg", "libsecp256k1-core", @@ -4550,7 +7456,7 @@ dependencies = [ "libsecp256k1-gen-genmult", "rand 0.8.5", "serde", - "sha2 0.9.8", + "sha2 0.9.9", "typenum", ] @@ -4585,9 +7491,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.3" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "pkg-config", @@ -4596,18 +7502,18 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" dependencies = [ "cc", ] [[package]] name = "linked-hash-map" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linked_hash_set" @@ -4620,19 +7526,13 @@ dependencies = [ [[package]] name = "linregress" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475015a7f8f017edb28d2e69813be23500ad4b32cfe3421c4148efc97324ee52" +checksum = "4de0b5f52a9f84544d268f5fabb71b38962d6aa3c6600b8bcd27d44ccf9c9c45" dependencies = [ "nalgebra", ] -[[package]] -name = "linux-raw-sys" -version = "0.0.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" - [[package]] name = "linux-raw-sys" version = "0.1.4" @@ -4641,15 +7541,39 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "linux-raw-sys" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" + +[[package]] +name = "lite-json" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd0e787ffe1153141a0f6f6d759fdf1cc34b1226e088444523812fd412a5cca2" +dependencies = [ + "lite-parser", +] + +[[package]] +name = "lite-parser" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d5f9dc37c52d889a21fd701983d02bb6a84f852c5140a6c80ef4557f7dc29e" +dependencies = [ + "paste", +] [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -4657,9 +7581,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ "serde", "value-bag", @@ -4667,21 +7591,27 @@ dependencies = [ [[package]] name = "lru" -version = "0.9.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" +checksum = "b6e8aaa3f231bb4bd57b84b2d5dc3ae7f350265df8aa96492e0bc394a1571909" +dependencies = [ + "hashbrown 0.12.3", +] + +[[package]] +name = "lru" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" dependencies = [ "hashbrown 0.13.2", ] [[package]] name = "lru" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03f1160296536f10c833a82dca22267d5486734230d47bf00bf435885814ba1e" -dependencies = [ - "hashbrown 0.13.2", -] +checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5" [[package]] name = "lru-cache" @@ -4723,49 +7653,50 @@ dependencies = [ [[package]] name = "macro_magic" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614b1304ab7877b499925b4dcc5223ff480f2646ad4db1ee7065badb8d530439" +checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9" dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "macro_magic_core" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d72c1b662d07b8e482c80d3a7fc4168e058b3bef4c573e94feb714b670f406" +checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00" dependencies = [ + "const-random", "derive-syn-parse", "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "macro_magic_core_macros" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93d7d9e6e234c040dafc745c7592738d56a03ad04b1fa04ab60821deb597466a" +checksum = "c12469fc165526520dff2807c2975310ab47cf7190a45b99b49a7dc8befab17b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "macro_magic_macros" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffd19f13cfd2bfbd83692adfef8c244fe5109b3eb822a1fb4e0a6253b406cd81" +checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] @@ -4786,7 +7717,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -4795,46 +7726,47 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] name = "matches" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matrixmultiply" -version = "0.3.2" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "add85d4dd35074e6fedc608f8c8f513a3548619a9024b751949ef0e8e45a4d84" +checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" dependencies = [ + "autocfg", "rawpointer", ] [[package]] name = "md-5" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b48670c893079d3c2ed79114e3644b7004df1c361a4e0ad52e2e6940d07c3d" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] name = "memchr" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memfd" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b20a59d985586e4a5aef64564ac77299f8586d8be6cf9106a5a40207e8908efb" +checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" dependencies = [ - "rustix 0.36.7", + "rustix 0.37.23", ] [[package]] @@ -4848,9 +7780,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ "autocfg", ] @@ -4873,6 +7805,15 @@ 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 = "memory-db" version = "0.32.0" @@ -4894,6 +7835,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "merlin" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" +dependencies = [ + "byteorder", + "keccak", + "rand_core 0.6.4", + "zeroize", +] + [[package]] name = "mick-jaeger" version = "0.1.8" @@ -4907,9 +7860,9 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minimal-lexical" @@ -4919,43 +7872,33 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "log", "parity-scale-codec", + "parking_lot 0.12.1", + "sc-block-builder", "sc-client-api", "sc-offchain", "sp-api", @@ -4965,17 +7908,20 @@ dependencies = [ "sp-core", "sp-mmr-primitives", "sp-runtime", + "sp-tracing", + "substrate-test-runtime-client", + "tokio", ] [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "anyhow", "jsonrpsee", "parity-scale-codec", "serde", + "serde_json", "sp-api", "sp-blockchain", "sp-core", @@ -4985,24 +7931,24 @@ dependencies = [ [[package]] name = "mockall" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4a1c770583dac7ab5e2f6c139153b783a53a1bbee9729613f193e59828326" +checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96" dependencies = [ "cfg-if", "downcast", "fragile", "lazy_static", "mockall_derive", - "predicates", + "predicates 2.1.5", "predicates-tree", ] [[package]] name = "mockall_derive" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832663583d5fa284ca8810bf7015e46c9fff9622d3cf34bd1eea5003fec06dd0" +checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" dependencies = [ "cfg-if", "proc-macro2", @@ -5050,9 +7996,9 @@ dependencies = [ "blake2s_simd", "blake3", "core2", - "digest 0.10.6", + "digest 0.10.7", "multihash-derive", - "sha2 0.10.2", + "sha2 0.10.7", "sha3", "unsigned-varint", ] @@ -5093,9 +8039,9 @@ dependencies = [ [[package]] name = "nalgebra" -version = "0.32.1" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6515c882ebfddccaa73ead7320ca28036c4bc84c9bcca3cc0cbba8efe89223a" +checksum = "307ed9b18cc2423f29e83f84fd23a8e73628727990181f18641a8b5dc2ab1caa" dependencies = [ "approx", "matrixmultiply", @@ -5109,9 +8055,9 @@ dependencies = [ [[package]] name = "nalgebra-macros" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d232c68884c0c99810a5a4d333ef7e47689cfd0edc85efc9e54e1e6bf5212766" +checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998" dependencies = [ "proc-macro2", "quote", @@ -5124,7 +8070,16 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7d66043b25d4a6cccb23619d10c19c25304b355a7dccd4a8e11423dd2382146" dependencies = [ - "clap 3.2.23", + "rand 0.8.5", +] + +[[package]] +name = "names" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" +dependencies = [ + "clap 3.2.25", "rand 0.8.5", ] @@ -5153,7 +8108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9ea4302b9759a7a88242299225ea3688e63c85ea136371bb6cf94fd674efaab" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", "byteorder", "libc", "netlink-packet-core", @@ -5162,9 +8117,9 @@ dependencies = [ [[package]] name = "netlink-packet-utils" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25af9cf0dc55498b7bd94a1508af7a78706aa0ab715a73c5169273e03c84845e" +checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" dependencies = [ "anyhow", "byteorder", @@ -5189,9 +8144,9 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" +checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ "bytes", "futures", @@ -5202,14 +8157,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.24.1" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f17df307904acd05aa8e32e97bb20f2a0df1728bbc2d771ae8f9a90463441e9" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.6.4", + "memoffset 0.6.5", ] [[package]] @@ -5218,7 +8173,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", @@ -5226,6 +8181,375 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "no-std-net" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" + +[[package]] +name = "node-bench" +version = "0.9.0-dev" +dependencies = [ + "array-bytes", + "clap 4.4.2", + "derive_more", + "fs_extra", + "futures", + "hash-db", + "kitchensink-runtime", + "kvdb", + "kvdb-rocksdb", + "lazy_static", + "log", + "node-primitives", + "node-testing", + "parity-db", + "rand 0.8.5", + "sc-basic-authorship", + "sc-client-api", + "sc-transaction-pool", + "sc-transaction-pool-api", + "serde", + "serde_json", + "sp-consensus", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "sp-timestamp", + "sp-tracing", + "sp-trie", + "tempfile", +] + +[[package]] +name = "node-cli" +version = "3.0.0-dev" +dependencies = [ + "array-bytes", + "assert_cmd", + "clap 4.4.2", + "clap_complete", + "criterion 0.4.0", + "frame-benchmarking-cli", + "frame-system", + "frame-system-rpc-runtime-api", + "futures", + "jsonrpsee", + "kitchensink-runtime", + "log", + "nix 0.26.2", + "node-executor", + "node-inspect", + "node-primitives", + "node-rpc", + "pallet-asset-conversion-tx-payment", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-balances", + "pallet-im-online", + "pallet-timestamp", + "parity-scale-codec", + "platforms", + "rand 0.8.5", + "regex", + "sc-authority-discovery", + "sc-basic-authorship", + "sc-block-builder", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-consensus-babe", + "sc-consensus-epochs", + "sc-consensus-grandpa", + "sc-consensus-slots", + "sc-executor", + "sc-keystore", + "sc-network", + "sc-network-common", + "sc-network-statement", + "sc-network-sync", + "sc-offchain", + "sc-rpc", + "sc-service", + "sc-service-test", + "sc-statement-store", + "sc-storage-monitor", + "sc-sync-state-rpc", + "sc-sysinfo", + "sc-telemetry", + "sc-transaction-pool", + "sc-transaction-pool-api", + "serde", + "serde_json", + "soketto", + "sp-api", + "sp-authority-discovery", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-consensus-grandpa", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-keystore", + "sp-runtime", + "sp-statement-store", + "sp-timestamp", + "sp-tracing", + "sp-transaction-storage-proof", + "substrate-build-script-utils", + "substrate-cli-test-utils", + "substrate-frame-cli", + "substrate-rpc-client", + "tempfile", + "tokio", + "tokio-util", + "try-runtime-cli", + "wait-timeout", +] + +[[package]] +name = "node-executor" +version = "3.0.0-dev" +dependencies = [ + "criterion 0.4.0", + "frame-benchmarking", + "frame-support", + "frame-system", + "futures", + "kitchensink-runtime", + "node-primitives", + "node-testing", + "pallet-balances", + "pallet-contracts", + "pallet-glutton", + "pallet-im-online", + "pallet-root-testing", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-treasury", + "parity-scale-codec", + "sc-executor", + "scale-info", + "sp-application-crypto", + "sp-consensus-babe", + "sp-core", + "sp-externalities", + "sp-keyring", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "sp-statement-store", + "sp-tracing", + "sp-trie", + "wat", +] + +[[package]] +name = "node-inspect" +version = "0.9.0-dev" +dependencies = [ + "clap 4.4.2", + "parity-scale-codec", + "sc-cli", + "sc-client-api", + "sc-service", + "sp-blockchain", + "sp-core", + "sp-runtime", + "thiserror", +] + +[[package]] +name = "node-primitives" +version = "2.0.0" +dependencies = [ + "sp-core", + "sp-runtime", +] + +[[package]] +name = "node-rpc" +version = "3.0.0-dev" +dependencies = [ + "jsonrpsee", + "mmr-rpc", + "node-primitives", + "pallet-transaction-payment-rpc", + "sc-chain-spec", + "sc-client-api", + "sc-consensus-babe", + "sc-consensus-babe-rpc", + "sc-consensus-grandpa", + "sc-consensus-grandpa-rpc", + "sc-rpc", + "sc-rpc-api", + "sc-rpc-spec-v2", + "sc-sync-state-rpc", + "sc-transaction-pool-api", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-babe", + "sp-keystore", + "sp-runtime", + "sp-statement-store", + "substrate-frame-rpc-system", + "substrate-state-trie-migration-rpc", +] + +[[package]] +name = "node-runtime-generate-bags" +version = "3.0.0" +dependencies = [ + "clap 4.4.2", + "generate-bags", + "kitchensink-runtime", +] + +[[package]] +name = "node-template" +version = "4.0.0-dev" +dependencies = [ + "clap 4.4.2", + "frame-benchmarking", + "frame-benchmarking-cli", + "frame-system", + "futures", + "jsonrpsee", + "node-template-runtime", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc", + "sc-basic-authorship", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-consensus-aura", + "sc-consensus-grandpa", + "sc-executor", + "sc-network", + "sc-offchain", + "sc-rpc-api", + "sc-service", + "sc-telemetry", + "sc-transaction-pool", + "sc-transaction-pool-api", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus-aura", + "sp-consensus-grandpa", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-timestamp", + "substrate-build-script-utils", + "substrate-frame-rpc-system", + "try-runtime-cli", +] + +[[package]] +name = "node-template-release" +version = "3.0.0" +dependencies = [ + "clap 4.4.2", + "flate2", + "fs_extra", + "glob", + "itertools 0.10.5", + "tar", + "tempfile", + "toml_edit", +] + +[[package]] +name = "node-template-runtime" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "pallet-aura", + "pallet-balances", + "pallet-grandpa", + "pallet-sudo", + "pallet-template", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-consensus-grandpa", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "substrate-wasm-builder", +] + +[[package]] +name = "node-testing" +version = "3.0.0-dev" +dependencies = [ + "frame-system", + "fs_extra", + "futures", + "kitchensink-runtime", + "log", + "node-executor", + "node-primitives", + "pallet-asset-conversion", + "pallet-asset-conversion-tx-payment", + "pallet-asset-tx-payment", + "pallet-assets", + "parity-scale-codec", + "sc-block-builder", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-executor", + "sc-service", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-runtime", + "sp-timestamp", + "substrate-test-client", + "tempfile", +] + +[[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" @@ -5234,13 +8558,12 @@ checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "nom" -version = "7.1.0" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d11e1ef389c76fe5b81bcaf2ea32cf88b62bc494e19f493d0b30e7a930109" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", - "version_check", ] [[package]] @@ -5250,10 +8573,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" [[package]] -name = "num-bigint" -version = "0.4.3" +name = "nu-ansi-term" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + +[[package]] +name = "num" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -5262,33 +8609,44 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26873667bbbb7c5182d4a37c1add32cdf09f841af72da53318fdb81543c15085" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] [[package]] name = "num-format" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b862ff8df690cf089058c98b183676a7ed0f974cc08b426800093227cbff3b" +checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", "itoa", ] [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +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" @@ -5303,20 +8661,21 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", + "libm", ] [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi 0.3.2", "libc", ] @@ -5328,13 +8687,22 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.30.3" +version = "0.30.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" dependencies = [ "crc32fast", "hashbrown 0.13.2", - "indexmap", + "indexmap 1.9.3", + "memchr", +] + +[[package]] +name = "object" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +dependencies = [ "memchr", ] @@ -5353,14 +8721,14 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ - "asn1-rs 0.5.1", + "asn1-rs 0.5.2", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "oorandom" @@ -5382,9 +8750,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl-probe" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "orchestra" @@ -5410,7 +8778,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2871aadd82a2c216ee68a69837a526dfe788ecbe74c4c5038a6acdbff6653066" dependencies = [ "expander 0.0.6", - "itertools", + "itertools 0.10.5", "petgraph", "proc-macro-crate", "proc-macro2", @@ -5429,24 +8797,21 @@ dependencies = [ [[package]] name = "os_str_bytes" -version = "6.0.0" +version = "6.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" [[package]] -name = "output_vt100" -version = "0.1.2" +name = "overload" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9" -dependencies = [ - "winapi", -] +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owo-colors" -version = "3.2.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "p256" @@ -5456,7 +8821,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.2", + "sha2 0.10.7", ] [[package]] @@ -5467,30 +8832,153 @@ checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.2", + "sha2 0.10.7", ] [[package]] -name = "packed_simd_2" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1914cd452d8fccd6f9db48147b29fd4ae05bea9dc5d9ad578509f72415de282" +name = "pallet-alliance" +version = "4.0.0-dev" dependencies = [ - "cfg-if", - "libm", + "array-bytes", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "pallet-collective", + "pallet-identity", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-core-hashing", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-asset-conversion" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-assets", + "pallet-balances", + "parity-scale-codec", + "primitive-types", + "scale-info", + "sp-api", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-asset-conversion-tx-payment" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "pallet-asset-conversion", + "pallet-assets", + "pallet-balances", + "pallet-transaction-payment", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-storage", +] + +[[package]] +name = "pallet-asset-rate" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-asset-tx-payment" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-assets", + "pallet-authorship", + "pallet-balances", + "pallet-transaction-payment", + "parity-scale-codec", + "scale-info", + "serde", + "serde_json", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-storage", ] [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", + "pallet-balances", "parity-scale-codec", "scale-info", "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-atomic-swap" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-aura" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "log", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-application-crypto", + "sp-consensus-aura", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -5498,7 +8986,6 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", @@ -5507,6 +8994,8 @@ dependencies = [ "scale-info", "sp-application-crypto", "sp-authority-discovery", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -5514,13 +9003,14 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -5528,14 +9018,18 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", + "frame-election-provider-support", "frame-support", "frame-system", "log", "pallet-authorship", + "pallet-balances", + "pallet-offences", "pallet-session", + "pallet-staking", + "pallet-staking-reward-curve", "pallet-timestamp", "parity-scale-codec", "scale-info", @@ -5552,8 +9046,9 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "aquamarine", + "docify", "frame-benchmarking", "frame-election-provider-support", "frame-support", @@ -5569,10 +9064,19 @@ dependencies = [ "sp-tracing", ] +[[package]] +name = "pallet-bags-list-fuzzer" +version = "4.0.0-dev" +dependencies = [ + "frame-election-provider-support", + "honggfuzz", + "pallet-bags-list", + "rand 0.8.5", +] + [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-election-provider-support", "frame-remote-externalities", @@ -5591,14 +9095,17 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-transaction-payment", "parity-scale-codec", + "paste", "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -5606,26 +9113,34 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "frame-election-provider-support", "frame-support", "frame-system", + "log", "pallet-authorship", + "pallet-balances", + "pallet-offences", "pallet-session", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", "parity-scale-codec", "scale-info", "serde", "sp-consensus-beefy", + "sp-core", + "sp-io", "sp-runtime", "sp-session", "sp-staking", + "sp-state-machine", "sp-std", ] [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "binary-merkle-tree", @@ -5643,18 +9158,20 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", + "sp-staking", + "sp-state-machine", "sp-std", ] [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", "pallet-treasury", "parity-scale-codec", "scale-info", @@ -5664,15 +9181,120 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-bridge-grandpa" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-runtime", + "bp-test-utils", + "finality-grandpa", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-consensus-grandpa", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-trie", +] + +[[package]] +name = "pallet-bridge-messages" +version = "0.1.0" +dependencies = [ + "bp-messages", + "bp-runtime", + "bp-test-utils", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "num-traits", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-bridge-parachains" +version = "0.1.0" +dependencies = [ + "bp-header-chain", + "bp-parachains", + "bp-polkadot-core", + "bp-runtime", + "bp-test-utils", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-bridge-grandpa", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-trie", +] + +[[package]] +name = "pallet-bridge-relayers" +version = "0.1.0" +dependencies = [ + "bp-messages", + "bp-relayers", + "bp-runtime", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "pallet-bridge-messages", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-broker" +version = "0.1.0" +dependencies = [ + "bitvec", + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", "pallet-bounties", "pallet-treasury", "parity-scale-codec", @@ -5683,10 +9305,34 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-collator-selection" +version = "3.0.0" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-session", + "pallet-timestamp", + "parity-scale-codec", + "rand 0.8.5", + "scale-info", + "sp-consensus-aura", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", + "sp-tracing", +] + [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5700,18 +9346,111 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-contracts" +version = "4.0.0-dev" +dependencies = [ + "array-bytes", + "assert_matches", + "bitflags 1.3.2", + "env_logger 0.9.3", + "environmental", + "frame-benchmarking", + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-balances", + "pallet-contracts-primitives", + "pallet-contracts-proc-macro", + "pallet-insecure-randomness-collective-flip", + "pallet-proxy", + "pallet-timestamp", + "pallet-utility", + "parity-scale-codec", + "pretty_assertions", + "rand 0.8.5", + "rand_pcg", + "scale-info", + "serde", + "smallvec", + "sp-api", + "sp-core", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-std", + "wasm-instrument 0.4.0", + "wasmi", + "wat", +] + +[[package]] +name = "pallet-contracts-primitives" +version = "24.0.0" +dependencies = [ + "bitflags 1.3.2", + "parity-scale-codec", + "scale-info", + "sp-runtime", + "sp-std", + "sp-weights", +] + +[[package]] +name = "pallet-contracts-proc-macro" +version = "4.0.0-dev" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", +] + [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "assert_matches", "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", + "pallet-scheduler", "parity-scale-codec", "scale-info", "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-core-fellowship" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-default-config-example" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", "sp-io", "sp-runtime", "sp-std", @@ -5720,12 +9459,14 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", + "pallet-preimage", + "pallet-scheduler", "parity-scale-codec", "scale-info", "serde", @@ -5735,18 +9476,61 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-dev-mode" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-election-provider-e2e-test" +version = "1.0.0" +dependencies = [ + "frame-election-provider-support", + "frame-support", + "frame-system", + "log", + "pallet-bags-list", + "pallet-balances", + "pallet-election-provider-multi-phase", + "pallet-session", + "pallet-staking", + "pallet-timestamp", + "parity-scale-codec", + "parking_lot 0.12.1", + "scale-info", + "sp-core", + "sp-io", + "sp-npos-elections", + "sp-runtime", + "sp-staking", + "sp-std", + "sp-tracing", +] + [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", "log", + "pallet-balances", "pallet-election-provider-support-benchmarking", "parity-scale-codec", + "parking_lot 0.12.1", "rand 0.8.5", "scale-info", "sp-arithmetic", @@ -5755,13 +9539,13 @@ dependencies = [ "sp-npos-elections", "sp-runtime", "sp-std", + "sp-tracing", "strum", ] [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5769,12 +9553,84 @@ dependencies = [ "parity-scale-codec", "sp-npos-elections", "sp-runtime", + "sp-std", ] [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-npos-elections", + "sp-runtime", + "sp-staking", + "sp-std", + "sp-tracing", + "substrate-test-utils", +] + +[[package]] +name = "pallet-example-basic" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-example-kitchensink" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-example-offchain-worker" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "lite-json", + "log", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-example-split" +version = "4.0.0-dev" dependencies = [ "frame-benchmarking", "frame-support", @@ -5784,16 +9640,24 @@ dependencies = [ "scale-info", "sp-core", "sp-io", - "sp-npos-elections", - "sp-runtime", - "sp-staking", "sp-std", ] +[[package]] +name = "pallet-examples" +version = "4.0.0-dev" +dependencies = [ + "pallet-default-config-example", + "pallet-dev-mode", + "pallet-example-basic", + "pallet-example-kitchensink", + "pallet-example-offchain-worker", + "pallet-example-split", +] + [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "docify", "frame-benchmarking", @@ -5801,31 +9665,63 @@ dependencies = [ "frame-support", "frame-system", "log", + "pallet-balances", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-staking", "sp-std", + "sp-tracing", + "substrate-test-utils", +] + +[[package]] +name = "pallet-glutton" +version = "4.0.0-dev" +dependencies = [ + "blake2", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "finality-grandpa", "frame-benchmarking", + "frame-election-provider-support", "frame-support", "frame-system", "log", "pallet-authorship", + "pallet-balances", + "pallet-offences", "pallet-session", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", "parity-scale-codec", "scale-info", "sp-application-crypto", "sp-consensus-grandpa", "sp-core", "sp-io", + "sp-keyring", "sp-runtime", "sp-session", "sp-staking", @@ -5835,14 +9731,15 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "enumflags2", "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -5851,13 +9748,13 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "pallet-authorship", + "pallet-session", "parity-scale-codec", "scale-info", "sp-application-crypto", @@ -5871,11 +9768,11 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", "parity-scale-codec", "scale-info", "sp-core", @@ -5885,10 +9782,41 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-insecure-randomness-collective-flip" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "safe-mix", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-lottery" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-support-test", + "frame-system", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -5905,30 +9833,36 @@ dependencies = [ [[package]] name = "pallet-message-queue" version = "7.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", "parity-scale-codec", + "rand 0.8.5", + "rand_distr", "scale-info", + "serde", "sp-arithmetic", "sp-core", "sp-io", "sp-runtime", "sp-std", + "sp-tracing", "sp-weights", ] [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", + "env_logger 0.9.3", "frame-benchmarking", "frame-support", "frame-system", + "itertools 0.10.5", + "log", "parity-scale-codec", "scale-info", "sp-core", @@ -5941,12 +9875,12 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", "parity-scale-codec", "scale-info", "sp-io", @@ -5954,26 +9888,88 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-nft-fractionalization" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-assets", + "pallet-balances", + "pallet-nfts", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-nfts" +version = "4.0.0-dev" +dependencies = [ + "enumflags2", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-nfts-runtime-api" +version = "4.0.0-dev" +dependencies = [ + "pallet-nfts", + "parity-scale-codec", + "sp-api", +] + +[[package]] +name = "pallet-nicks" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", "parity-scale-codec", "scale-info", "sp-arithmetic", "sp-core", + "sp-io", "sp-runtime", "sp-std", ] [[package]] -name = "pallet-nomination-pools" -version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" +name = "pallet-node-authorization" +version = "4.0.0-dev" dependencies = [ "frame-support", "frame-system", @@ -5983,34 +9979,69 @@ dependencies = [ "sp-core", "sp-io", "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-nomination-pools" +version = "1.0.0" +dependencies = [ + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", "sp-staking", "sp-std", + "sp-tracing", ] [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", "frame-support", "frame-system", "pallet-bags-list", + "pallet-balances", "pallet-nomination-pools", "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", "parity-scale-codec", "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-runtime-interface", "sp-staking", "sp-std", ] +[[package]] +name = "pallet-nomination-pools-fuzzer" +version = "2.0.0" +dependencies = [ + "frame-support", + "frame-system", + "honggfuzz", + "log", + "pallet-nomination-pools", + "rand 0.8.5", + "sp-io", + "sp-runtime", + "sp-tracing", +] + [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -6018,10 +10049,33 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-nomination-pools-test-staking" +version = "1.0.0" +dependencies = [ + "frame-election-provider-support", + "frame-support", + "frame-system", + "log", + "pallet-bags-list", + "pallet-balances", + "pallet-nomination-pools", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", + "sp-tracing", +] + [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", @@ -6030,6 +10084,8 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", + "sp-core", + "sp-io", "sp-runtime", "sp-staking", "sp-std", @@ -6038,7 +10094,6 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6052,22 +10107,69 @@ dependencies = [ "pallet-offences", "pallet-session", "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", "parity-scale-codec", "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-staking", "sp-std", ] +[[package]] +name = "pallet-paged-list" +version = "0.1.0" +dependencies = [ + "docify", + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-metadata-ir", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-paged-list-fuzzer" +version = "0.1.0" +dependencies = [ + "arbitrary", + "frame-support", + "honggfuzz", + "pallet-paged-list", + "sp-io", +] + +[[package]] +name = "pallet-parachain-template" +version = "0.1.0" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-io", + "sp-runtime", +] + [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", "parity-scale-codec", "scale-info", "sp-core", @@ -6079,13 +10181,15 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", + "pallet-utility", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -6094,7 +10198,6 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6112,13 +10215,14 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -6127,17 +10231,107 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "assert_matches", "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", + "pallet-preimage", + "pallet-scheduler", "parity-scale-codec", "scale-info", "serde", "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-remark" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-root-offences" +version = "1.0.0-dev" +dependencies = [ + "frame-election-provider-support", + "frame-support", + "frame-system", + "pallet-balances", + "pallet-session", + "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-staking", + "sp-std", +] + +[[package]] +name = "pallet-root-testing" +version = "1.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-safe-mode" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-balances", + "pallet-proxy", + "pallet-utility", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-salary" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -6146,24 +10340,41 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-preimage", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-std", "sp-weights", + "substrate-test-utils", +] + +[[package]] +name = "pallet-scored-pool" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", @@ -6177,6 +10388,7 @@ dependencies = [ "sp-runtime", "sp-session", "sp-staking", + "sp-state-machine", "sp-std", "sp-trie", ] @@ -6184,14 +10396,21 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", + "frame-election-provider-support", "frame-support", "frame-system", + "pallet-balances", "pallet-session", "pallet-staking", + "pallet-staking-reward-curve", + "pallet-timestamp", + "parity-scale-codec", "rand 0.8.5", + "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-session", "sp-std", @@ -6200,17 +10419,18 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", + "frame-support-test", "frame-system", - "hex-literal 0.3.4", "log", + "pallet-balances", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", "sp-arithmetic", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -6219,7 +10439,6 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6227,33 +10446,40 @@ dependencies = [ "frame-system", "log", "pallet-authorship", + "pallet-bags-list", + "pallet-balances", "pallet-session", + "pallet-staking-reward-curve", + "pallet-timestamp", "parity-scale-codec", "rand_chacha 0.2.2", "scale-info", "serde", "sp-application-crypto", + "sp-core", "sp-io", + "sp-npos-elections", "sp-runtime", "sp-staking", "sp-std", + "sp-tracing", + "substrate-test-utils", ] [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "sp-runtime", + "syn 2.0.31", ] [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "log", "sp-arithmetic", @@ -6262,7 +10488,6 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "sp-api", @@ -6271,12 +10496,53 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" +dependencies = [ + "frame-benchmarking", + "frame-remote-externalities", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "parking_lot 0.12.1", + "scale-info", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", + "substrate-state-trie-migration-rpc", + "thousands", + "tokio", + "zstd 0.12.4", +] + +[[package]] +name = "pallet-statement" +version = "4.0.0-dev" +dependencies = [ + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-core", + "sp-io", + "sp-runtime", + "sp-statement-store", + "sp-std", +] + +[[package]] +name = "pallet-sudo" +version = "4.0.0-dev" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", - "log", "parity-scale-codec", "scale-info", "sp-core", @@ -6286,15 +10552,15 @@ dependencies = [ ] [[package]] -name = "pallet-sudo" +name = "pallet-template" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "sp-core", "sp-io", "sp-runtime", "sp-std", @@ -6303,7 +10569,6 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", @@ -6311,22 +10576,24 @@ dependencies = [ "log", "parity-scale-codec", "scale-info", + "sp-core", "sp-inherents", "sp-io", "sp-runtime", "sp-std", + "sp-storage", "sp-timestamp", ] [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", "pallet-treasury", "parity-scale-codec", "scale-info", @@ -6335,18 +10602,20 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-storage", ] [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-support", "frame-system", + "pallet-balances", "parity-scale-codec", "scale-info", "serde", + "serde_json", "sp-core", "sp-io", "sp-runtime", @@ -6356,7 +10625,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6372,7 +10640,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6381,19 +10648,60 @@ dependencies = [ "sp-weights", ] +[[package]] +name = "pallet-transaction-storage" +version = "4.0.0-dev" +dependencies = [ + "array-bytes", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "pallet-balances", + "parity-scale-codec", + "scale-info", + "serde", + "sp-core", + "sp-inherents", + "sp-io", + "sp-runtime", + "sp-std", + "sp-transaction-storage-proof", +] + [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "impl-trait-for-tuples", "pallet-balances", + "pallet-utility", "parity-scale-codec", "scale-info", "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "pallet-tx-pause" +version = "4.0.0-dev" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "pallet-balances", + "pallet-proxy", + "pallet-utility", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -6401,14 +10709,16 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", "parity-scale-codec", "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -6416,11 +10726,14 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", + "pallet-collective", + "pallet-root-testing", + "pallet-timestamp", "parity-scale-codec", "scale-info", "sp-core", @@ -6432,14 +10745,16 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "log", + "pallet-balances", "parity-scale-codec", "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -6447,14 +10762,17 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "pallet-balances", + "pallet-preimage", "parity-scale-codec", "scale-info", "sp-api", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -6470,7 +10788,7 @@ dependencies = [ "log", "pallet-balances", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-parachains", "scale-info", "serde", @@ -6478,9 +10796,9 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -6503,16 +10821,229 @@ dependencies = [ "sp-runtime", "sp-std", "sp-tracing", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", +] + +[[package]] +name = "pallet-xcm-bridge-hub-router" +version = "0.1.0" +dependencies = [ + "bp-xcm-bridge-hub-router", + "frame-benchmarking", + "frame-support", + "frame-system", + "log", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "staging-xcm", + "staging-xcm-builder", +] + +[[package]] +name = "parachain-info" +version = "0.1.0" +dependencies = [ + "cumulus-primitives-core", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "parachain-template-node" +version = "0.1.0" +dependencies = [ + "clap 4.4.2", + "color-print", + "cumulus-client-cli", + "cumulus-client-collator", + "cumulus-client-consensus-aura", + "cumulus-client-consensus-common", + "cumulus-client-consensus-proposer", + "cumulus-client-service", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-interface", + "frame-benchmarking", + "frame-benchmarking-cli", + "futures", + "jsonrpsee", + "log", + "pallet-transaction-payment-rpc", + "parachain-template-runtime", + "parity-scale-codec", + "polkadot-cli", + "polkadot-primitives", + "sc-basic-authorship", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-executor", + "sc-network", + "sc-network-sync", + "sc-offchain", + "sc-rpc", + "sc-service", + "sc-sysinfo", + "sc-telemetry", + "sc-tracing", + "sc-transaction-pool", + "sc-transaction-pool-api", + "serde", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus-aura", + "sp-core", + "sp-io", + "sp-keystore", + "sp-runtime", + "sp-timestamp", + "staging-xcm", + "substrate-build-script-utils", + "substrate-frame-rpc-system", + "substrate-prometheus-endpoint", +] + +[[package]] +name = "parachain-template-runtime" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-parachain-template", + "pallet-session", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-xcm", + "parachain-info", + "parity-scale-codec", + "polkadot-parachain-primitives", + "polkadot-runtime-common", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + +[[package]] +name = "parachains-common" +version = "1.0.0" +dependencies = [ + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-support", + "frame-system", + "kusama-runtime-constants", + "log", + "num-traits", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "parity-scale-codec", + "polkadot-core-primitives", + "polkadot-primitives", + "polkadot-runtime-constants", + "rococo-runtime-constants", + "scale-info", + "smallvec", + "sp-consensus-aura", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", + "westend-runtime-constants", +] + +[[package]] +name = "parachains-runtimes-test-utils" +version = "1.0.0" +dependencies = [ + "assets-common", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-test-relay-sproof-builder", + "frame-support", + "frame-system", + "hex-literal 0.4.1", + "pallet-assets", + "pallet-balances", + "pallet-collator-selection", + "pallet-session", + "pallet-xcm", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-parachain-primitives", + "sp-consensus-aura", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-tracing", + "staging-xcm", + "staging-xcm-executor", + "substrate-wasm-builder", ] [[package]] name = "parity-db" -version = "0.4.8" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4890dcb9556136a4ec2b0c51fa4a08c8b733b829506af8fff2e853f3a065985b" +checksum = "78f19d20a0d2cc52327a88d131fa1c4ea81ea4a04714aedcfeca2dd410049cf8" dependencies = [ "blake2", "crc32fast", @@ -6530,11 +11061,11 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.1" +version = "3.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2287753623c76f953acd29d15d8100bcab84d29db78fb6f352adb3c53e83b967" +checksum = "dd8e946cc0cc711189c0b0249fb8b599cbeeab9784d83c415719368bb8d4ac64" dependencies = [ - "arrayvec 0.7.2", + "arrayvec 0.7.4", "bitvec", "byte-slice-cast", "bytes", @@ -6545,9 +11076,9 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.1" +version = "3.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b6937b5e67bfba3351b87b040d48352a2fcb6ad72f81855412ce97b45c8f110" +checksum = "2a296c3079b5fefbc499e1de58dc26c09b1b9a5952d26694ee89f04a43ebbb3e" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6561,6 +11092,35 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f" +[[package]] +name = "parity-util-mem" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d32c34f4f5ca7f9196001c0aba5a1f9a5a12382c8944b8b0f90233282d1e8f8" +dependencies = [ + "cfg-if", + "ethereum-types", + "hashbrown 0.12.3", + "impl-trait-for-tuples", + "lru 0.8.1", + "parity-util-mem-derive", + "parking_lot 0.12.1", + "primitive-types", + "smallvec", + "winapi", +] + +[[package]] +name = "parity-util-mem-derive" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" +dependencies = [ + "proc-macro2", + "syn 1.0.109", + "synstructure", +] + [[package]] name = "parity-wasm" version = "0.45.0" @@ -6569,9 +11129,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" [[package]] name = "parking" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" @@ -6581,7 +11141,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", ] [[package]] @@ -6591,34 +11151,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.6", + "parking_lot_core 0.9.8", ] [[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", "instant", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", "winapi", ] [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.3.5", "smallvec", - "windows-sys 0.42.0", + "windows-targets 0.48.5", ] [[package]] @@ -6629,9 +11189,9 @@ checksum = "7924d1d0ad836f665c9065e26d016c673ece3993f30d340068b16f282afc1156" [[package]] name = "paste" -version = "1.0.7" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbkdf2" @@ -6648,7 +11208,16 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", +] + +[[package]] +name = "pbkdf2" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" +dependencies = [ + "digest 0.10.7", ] [[package]] @@ -6659,11 +11228,11 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pem" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" +checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", ] [[package]] @@ -6675,26 +11244,86 @@ dependencies = [ "base64ct", ] +[[package]] +name = "penpal-runtime" +version = "0.9.27" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-session-benchmarking", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "log", + "pallet-asset-tx-payment", + "pallet-assets", + "pallet-aura", + "pallet-authorship", + "pallet-balances", + "pallet-collator-selection", + "pallet-session", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-xcm", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-runtime-common", + "scale-info", + "smallvec", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-storage", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.1.3" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" dependencies = [ + "thiserror", "ucd-trie", ] [[package]] name = "pest_derive" -version = "2.1.0" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" +checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853" dependencies = [ "pest", "pest_generator", @@ -6702,56 +11331,56 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.1.3" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" +checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "pest_meta" -version = "2.1.3" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" +checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48" dependencies = [ - "maplit", + "once_cell", "pest", - "sha-1 0.8.2", + "sha2 0.10.7", ] [[package]] name = "petgraph" -version = "0.6.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 2.0.0", ] [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] @@ -6762,9 +11391,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -6778,7 +11407,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ - "der 0.6.0", + "der 0.6.1", "spki 0.6.0", ] @@ -6788,15 +11417,15 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ - "der 0.7.7", + "der 0.7.8", "spki 0.7.2", ] [[package]] name = "pkg-config" -version = "0.3.22" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "platforms" @@ -6804,9 +11433,37 @@ version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630" +[[package]] +name = "plotters" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" + +[[package]] +name = "plotters-svg" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +dependencies = [ + "plotters-backend", +] + [[package]] name = "polkadot" -version = "1.0.0" +version = "1.1.0" dependencies = [ "assert_cmd", "color-eyre", @@ -6814,8 +11471,11 @@ dependencies = [ "polkadot-cli", "polkadot-core-primitives", "polkadot-node-core-pvf", + "polkadot-node-core-pvf-common", + "polkadot-node-core-pvf-execute-worker", "polkadot-node-core-pvf-prepare-worker", "polkadot-overseer", + "substrate-build-script-utils", "substrate-rpc-client", "tempfile", "tikv-jemallocator", @@ -6827,7 +11487,7 @@ name = "polkadot-approval-distribution" version = "1.0.0" dependencies = [ "assert_matches", - "env_logger 0.9.0", + "env_logger 0.9.3", "futures", "futures-timer", "log", @@ -6843,7 +11503,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_core 0.5.1", - "schnorrkel", + "schnorrkel 0.9.1", "sp-authority-discovery", "sp-core", "tracing-gum", @@ -6853,9 +11513,10 @@ dependencies = [ name = "polkadot-availability-bitfield-distribution" version = "1.0.0" dependencies = [ + "always-assert", "assert_matches", "bitvec", - "env_logger 0.9.0", + "env_logger 0.9.3", "futures", "futures-timer", "log", @@ -6884,7 +11545,6 @@ dependencies = [ "fatality", "futures", "futures-timer", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6896,6 +11556,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "rand 0.8.5", "sc-network", + "schnellru", "sp-core", "sp-keyring", "sp-keystore", @@ -6909,12 +11570,11 @@ name = "polkadot-availability-recovery" version = "1.0.0" dependencies = [ "assert_matches", - "env_logger 0.9.0", + "env_logger 0.9.3", "fatality", "futures", "futures-timer", "log", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -6926,6 +11586,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "rand 0.8.5", "sc-network", + "schnellru", "sp-application-crypto", "sp-core", "sp-keyring", @@ -6935,14 +11596,12 @@ dependencies = [ [[package]] name = "polkadot-cli" -version = "1.0.0" +version = "1.1.0" dependencies = [ - "clap 4.2.5", + "clap 4.4.2", "frame-benchmarking-cli", "futures", "log", - "polkadot-node-core-pvf-execute-worker", - "polkadot-node-core-pvf-prepare-worker", "polkadot-node-metrics", "polkadot-performance-test", "polkadot-service", @@ -6967,10 +11626,9 @@ dependencies = [ name = "polkadot-collator-protocol" version = "1.0.0" dependencies = [ - "always-assert", "assert_matches", "bitvec", - "env_logger 0.9.0", + "env_logger 0.9.3", "fatality", "futures", "futures-timer", @@ -6983,12 +11641,14 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "sc-keystore", "sc-network", "sp-core", "sp-keyring", "sp-keystore", "sp-runtime", "thiserror", + "tokio-util", "tracing-gum", ] @@ -7014,9 +11674,8 @@ dependencies = [ "fatality", "futures", "futures-timer", - "indexmap", + "indexmap 1.9.3", "lazy_static", - "lru 0.9.0", "parity-scale-codec", "polkadot-erasure-coding", "polkadot-node-network-protocol", @@ -7028,6 +11687,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "sc-keystore", "sc-network", + "schnellru", "sp-application-crypto", "sp-keyring", "sp-keystore", @@ -7040,7 +11700,7 @@ dependencies = [ name = "polkadot-erasure-coding" version = "1.0.0" dependencies = [ - "criterion", + "criterion 0.4.0", "parity-scale-codec", "polkadot-node-primitives", "polkadot-primitives", @@ -7067,6 +11727,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "sc-network", + "sc-network-common", "sp-application-crypto", "sp-authority-discovery", "sp-consensus-babe", @@ -7110,6 +11771,7 @@ dependencies = [ name = "polkadot-node-collation-generation" version = "1.0.0" dependencies = [ + "assert_matches", "futures", "parity-scale-codec", "polkadot-erasure-coding", @@ -7120,6 +11782,7 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "sp-core", + "sp-keyring", "sp-maybe-compressed-blob", "thiserror", "tracing-gum", @@ -7137,8 +11800,7 @@ dependencies = [ "futures-timer", "kvdb", "kvdb-memorydb", - "lru 0.9.0", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.12.1", "polkadot-node-jaeger", @@ -7151,7 +11813,8 @@ dependencies = [ "polkadot-primitives-test-helpers", "rand_core 0.5.1", "sc-keystore", - "schnorrkel", + "schnellru", + "schnorrkel 0.9.1", "sp-application-crypto", "sp-consensus", "sp-consensus-babe", @@ -7170,7 +11833,7 @@ version = "1.0.0" dependencies = [ "assert_matches", "bitvec", - "env_logger 0.9.0", + "env_logger 0.9.3", "futures", "futures-timer", "kvdb", @@ -7251,7 +11914,8 @@ dependencies = [ "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", "polkadot-node-subsystem-util", - "polkadot-parachain", + "polkadot-overseer", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-primitives-test-helpers", "sp-core", @@ -7310,7 +11974,6 @@ dependencies = [ "futures-timer", "kvdb", "kvdb-memorydb", - "lru 0.9.0", "parity-scale-codec", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7319,6 +11982,7 @@ dependencies = [ "polkadot-primitives", "polkadot-primitives-test-helpers", "sc-keystore", + "schnellru", "sp-application-crypto", "sp-core", "sp-keyring", @@ -7344,6 +12008,31 @@ dependencies = [ "tracing-gum", ] +[[package]] +name = "polkadot-node-core-prospective-parachains" +version = "1.0.0" +dependencies = [ + "assert_matches", + "bitvec", + "fatality", + "futures", + "parity-scale-codec", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-test-helpers", + "polkadot-node-subsystem-types", + "polkadot-node-subsystem-util", + "polkadot-primitives", + "polkadot-primitives-test-helpers", + "sc-keystore", + "sp-application-crypto", + "sp-core", + "sp-keyring", + "sp-keystore", + "thiserror", + "tracing-gum", +] + [[package]] name = "polkadot-node-core-provisioner" version = "1.0.0" @@ -7358,7 +12047,6 @@ dependencies = [ "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", - "rand 0.8.5", "sp-application-crypto", "sp-keystore", "thiserror", @@ -7378,12 +12066,13 @@ dependencies = [ "parity-scale-codec", "pin-project", "polkadot-core-primitives", + "polkadot-node-core-pvf", "polkadot-node-core-pvf-common", "polkadot-node-core-pvf-execute-worker", "polkadot-node-core-pvf-prepare-worker", "polkadot-node-metrics", "polkadot-node-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "rand 0.8.5", "slotmap", @@ -7432,7 +12121,7 @@ dependencies = [ "landlock", "libc", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "sc-executor", "sc-executor-common", @@ -7441,7 +12130,6 @@ dependencies = [ "sp-externalities", "sp-io", "sp-tracing", - "substrate-build-script-utils", "tempfile", "tokio", "tracing-gum", @@ -7455,13 +12143,12 @@ dependencies = [ "futures", "parity-scale-codec", "polkadot-node-core-pvf-common", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "rayon", "sp-core", "sp-maybe-compressed-blob", "sp-tracing", - "tikv-jemalloc-ctl", "tokio", "tracing-gum", ] @@ -7474,7 +12161,7 @@ dependencies = [ "libc", "parity-scale-codec", "polkadot-node-core-pvf-common", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "rayon", "sc-executor", @@ -7492,8 +12179,8 @@ dependencies = [ name = "polkadot-node-core-runtime-api" version = "1.0.0" dependencies = [ + "async-trait", "futures", - "lru 0.9.0", "polkadot-node-metrics", "polkadot-node-primitives", "polkadot-node-subsystem", @@ -7501,8 +12188,8 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-primitives", "polkadot-primitives-test-helpers", + "schnellru", "sp-api", - "sp-authority-discovery", "sp-consensus-babe", "sp-core", "sp-keyring", @@ -7531,7 +12218,7 @@ name = "polkadot-node-metrics" version = "1.0.0" dependencies = [ "assert_cmd", - "bs58", + "bs58 0.5.0", "futures", "futures-timer", "hyper", @@ -7542,7 +12229,6 @@ dependencies = [ "prioritized-metered-channel", "prometheus-parse", "sc-cli", - "sc-client-api", "sc-service", "sc-tracing", "sp-keyring", @@ -7559,6 +12245,7 @@ version = "1.0.0" dependencies = [ "async-channel", "async-trait", + "bitvec", "derive_more", "fatality", "futures", @@ -7584,9 +12271,9 @@ dependencies = [ "futures", "parity-scale-codec", "polkadot-erasure-coding", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", - "schnorrkel", + "schnorrkel 0.9.1", "serde", "sp-application-crypto", "sp-consensus-babe", @@ -7595,7 +12282,7 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-runtime", "thiserror", - "zstd 0.11.2+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] @@ -7639,6 +12326,7 @@ dependencies = [ "polkadot-primitives", "polkadot-statement-table", "sc-network", + "sc-transaction-pool-api", "smallvec", "sp-api", "sp-authority-discovery", @@ -7654,17 +12342,16 @@ dependencies = [ "assert_matches", "async-trait", "derive_more", - "env_logger 0.9.0", + "env_logger 0.9.3", "fatality", "futures", "futures-channel", - "itertools", + "itertools 0.10.5", "kvdb", "kvdb-memorydb", "kvdb-shared-tests", "lazy_static", "log", - "lru 0.9.0", "parity-db", "parity-scale-codec", "parking_lot 0.11.2", @@ -7680,6 +12367,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "prioritized-metered-channel", "rand 0.8.5", + "schnellru", "sp-application-crypto", "sp-core", "sp-keystore", @@ -7697,7 +12385,6 @@ dependencies = [ "femme", "futures", "futures-timer", - "lru 0.9.0", "orchestra", "parking_lot 0.12.1", "polkadot-node-metrics", @@ -7708,6 +12395,7 @@ dependencies = [ "polkadot-primitives-test-helpers", "prioritized-metered-channel", "sc-client-api", + "schnellru", "sp-api", "sp-core", "tikv-jemalloc-ctl", @@ -7715,7 +12403,90 @@ dependencies = [ ] [[package]] -name = "polkadot-parachain" +name = "polkadot-parachain-bin" +version = "1.0.0" +dependencies = [ + "assert_cmd", + "asset-hub-kusama-runtime", + "asset-hub-polkadot-runtime", + "asset-hub-westend-runtime", + "async-trait", + "bridge-hub-kusama-runtime", + "bridge-hub-polkadot-runtime", + "bridge-hub-rococo-runtime", + "clap 4.4.2", + "collectives-polkadot-runtime", + "color-print", + "contracts-rococo-runtime", + "cumulus-client-cli", + "cumulus-client-collator", + "cumulus-client-consensus-aura", + "cumulus-client-consensus-common", + "cumulus-client-consensus-proposer", + "cumulus-client-consensus-relay-chain", + "cumulus-client-service", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-relay-chain-interface", + "frame-benchmarking", + "frame-benchmarking-cli", + "futures", + "glutton-runtime", + "hex-literal 0.4.1", + "jsonrpsee", + "log", + "nix 0.26.2", + "pallet-transaction-payment-rpc", + "parachains-common", + "parity-scale-codec", + "penpal-runtime", + "polkadot-cli", + "polkadot-primitives", + "polkadot-service", + "rococo-parachain-runtime", + "sc-basic-authorship", + "sc-chain-spec", + "sc-cli", + "sc-client-api", + "sc-consensus", + "sc-executor", + "sc-network", + "sc-network-sync", + "sc-rpc", + "sc-service", + "sc-sysinfo", + "sc-telemetry", + "sc-tracing", + "sc-transaction-pool", + "sc-transaction-pool-api", + "seedling-runtime", + "serde", + "serde_json", + "shell-runtime", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus-aura", + "sp-core", + "sp-io", + "sp-keystore", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-timestamp", + "sp-transaction-pool", + "staging-xcm", + "substrate-build-script-utils", + "substrate-frame-rpc-system", + "substrate-prometheus-endpoint", + "substrate-state-trie-migration-rpc", + "tempfile", + "tokio", + "wait-timeout", +] + +[[package]] +name = "polkadot-parachain-primitives" version = "1.0.0" dependencies = [ "bounded-collections", @@ -7734,8 +12505,7 @@ dependencies = [ name = "polkadot-performance-test" version = "1.0.0" dependencies = [ - "env_logger 0.9.0", - "kusama-runtime", + "env_logger 0.9.3", "log", "polkadot-erasure-coding", "polkadot-node-core-pvf-prepare-worker", @@ -7744,6 +12514,7 @@ dependencies = [ "quote", "sc-executor-common", "sp-maybe-compressed-blob", + "staging-kusama-runtime", "thiserror", ] @@ -7755,7 +12526,7 @@ dependencies = [ "hex-literal 0.4.1", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "scale-info", "serde", "sp-api", @@ -7875,6 +12646,7 @@ dependencies = [ "pallet-vesting", "pallet-whitelist", "pallet-xcm", + "pallet-xcm-benchmarks", "parity-scale-codec", "polkadot-primitives", "polkadot-runtime-common", @@ -7904,17 +12676,18 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "sp-storage", "sp-tracing", "sp-transaction-pool", "sp-trie", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "static_assertions", "substrate-wasm-builder", "tiny-keccak", "tokio", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -7964,8 +12737,8 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "staging-xcm", "static_assertions", - "xcm", ] [[package]] @@ -7985,7 +12758,7 @@ dependencies = [ name = "polkadot-runtime-metrics" version = "1.0.0" dependencies = [ - "bs58", + "bs58 0.5.0", "frame-benchmarking", "parity-scale-codec", "polkadot-primitives", @@ -7998,7 +12771,7 @@ name = "polkadot-runtime-parachains" version = "1.0.0" dependencies = [ "assert_matches", - "bitflags", + "bitflags 1.3.2", "bitvec", "derive_more", "frame-benchmarking", @@ -8007,6 +12780,7 @@ dependencies = [ "frame-system", "futures", "hex-literal 0.4.1", + "impl-trait-for-tuples", "log", "pallet-authority-discovery", "pallet-authorship", @@ -8018,7 +12792,7 @@ dependencies = [ "pallet-timestamp", "pallet-vesting", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-primitives-test-helpers", "polkadot-runtime-metrics", @@ -8041,10 +12815,10 @@ dependencies = [ "sp-staking", "sp-std", "sp-tracing", + "staging-xcm", + "staging-xcm-executor", "static_assertions", "thousands", - "xcm", - "xcm-executor", ] [[package]] @@ -8053,7 +12827,7 @@ version = "1.0.0" dependencies = [ "assert_matches", "async-trait", - "env_logger 0.9.0", + "env_logger 0.9.3", "frame-benchmarking", "frame-benchmarking-cli", "frame-support", @@ -8061,12 +12835,11 @@ dependencies = [ "frame-system-rpc-runtime-api", "futures", "hex-literal 0.4.1", - "kusama-runtime", + "is_executable", "kusama-runtime-constants", "kvdb", "kvdb-rocksdb", "log", - "lru 0.9.0", "mmr-gadget", "pallet-babe", "pallet-im-online", @@ -8094,7 +12867,9 @@ dependencies = [ "polkadot-node-core-chain-selection", "polkadot-node-core-dispute-coordinator", "polkadot-node-core-parachains-inherent", + "polkadot-node-core-prospective-parachains", "polkadot-node-core-provisioner", + "polkadot-node-core-pvf", "polkadot-node-core-pvf-checker", "polkadot-node-core-runtime-api", "polkadot-node-network-protocol", @@ -8104,7 +12879,7 @@ dependencies = [ "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-overseer", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-rpc", "polkadot-runtime", @@ -8137,8 +12912,11 @@ dependencies = [ "sc-sysinfo", "sc-telemetry", "sc-transaction-pool", + "sc-transaction-pool-api", + "schnellru", "serde", "serde_json", + "serial_test", "sp-api", "sp-authority-discovery", "sp-block-builder", @@ -8160,9 +12938,9 @@ dependencies = [ "sp-storage", "sp-timestamp", "sp-transaction-pool", - "sp-trie", "sp-version", "sp-weights", + "staging-kusama-runtime", "substrate-prometheus-endpoint", "tempfile", "thiserror", @@ -8175,20 +12953,24 @@ dependencies = [ name = "polkadot-statement-distribution" version = "1.0.0" dependencies = [ - "arrayvec 0.5.2", + "arrayvec 0.7.4", "assert_matches", + "async-channel", + "bitvec", "fatality", "futures", "futures-timer", - "indexmap", + "indexmap 1.9.3", "parity-scale-codec", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-node-subsystem-test-helpers", + "polkadot-node-subsystem-types", "polkadot-node-subsystem-util", "polkadot-primitives", "polkadot-primitives-test-helpers", + "rand_chacha 0.3.1", "sc-keystore", "sc-network", "sp-application-crypto", @@ -8246,7 +13028,7 @@ version = "1.0.0" dependencies = [ "assert_matches", "async-trait", - "clap 4.2.5", + "clap 4.4.2", "color-eyre", "futures", "futures-timer", @@ -8255,6 +13037,7 @@ dependencies = [ "polkadot-node-core-backing", "polkadot-node-core-candidate-validation", "polkadot-node-core-dispute-coordinator", + "polkadot-node-core-pvf-common", "polkadot-node-core-pvf-execute-worker", "polkadot-node-core-pvf-prepare-worker", "polkadot-node-primitives", @@ -8266,6 +13049,7 @@ dependencies = [ "rand 0.8.5", "sp-core", "sp-keystore", + "substrate-build-script-utils", "tracing-gum", ] @@ -8298,7 +13082,7 @@ dependencies = [ "pallet-vesting", "pallet-xcm", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -8326,12 +13110,12 @@ dependencies = [ "sp-transaction-pool", "sp-trie", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", "test-runtime-constants", "tiny-keccak", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -8347,7 +13131,7 @@ dependencies = [ "polkadot-node-primitives", "polkadot-node-subsystem", "polkadot-overseer", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-rpc", "polkadot-runtime-common", @@ -8390,25 +13174,28 @@ dependencies = [ name = "polkadot-voter-bags" version = "1.0.0" dependencies = [ - "clap 4.2.5", + "clap 4.4.2", "generate-bags", - "kusama-runtime", "polkadot-runtime", "sp-io", + "staging-kusama-runtime", "westend-runtime", ] [[package]] name = "polling" -version = "2.2.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ + "autocfg", + "bitflags 1.3.2", "cfg-if", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "winapi", + "pin-project-lite 0.2.12", + "windows-sys 0.48.0", ] [[package]] @@ -8419,18 +13206,18 @@ checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede" dependencies = [ "cpufeatures", "opaque-debug 0.3.0", - "universal-hash", + "universal-hash 0.4.1", ] [[package]] -name = "polyval" -version = "0.4.5" +name = "poly1305" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" +checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ - "cpuid-bool", + "cpufeatures", "opaque-debug 0.3.0", - "universal-hash", + "universal-hash 0.5.1", ] [[package]] @@ -8442,27 +13229,48 @@ dependencies = [ "cfg-if", "cpufeatures", "opaque-debug 0.3.0", - "universal-hash", + "universal-hash 0.4.1", +] + +[[package]] +name = "polyval" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52cff9d1d4dee5fe6d03729099f4a310a41179e0a10dbf542039873f2e826fb" +dependencies = [ + "cfg-if", + "cpufeatures", + "opaque-debug 0.3.0", + "universal-hash 0.5.1", ] [[package]] name = "portable-atomic" -version = "0.3.19" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b" +checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e" + +[[package]] +name = "portpicker" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be97d76faf1bfab666e1375477b23fde79eccf0276e9b63b92a39d676a889ba9" +dependencies = [ + "rand 0.8.5", +] [[package]] name = "pprof" -version = "0.10.1" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6472bfed9475542ac46c518734a8d06d71b0f6cb2c17f904aa301711a57786f" +checksum = "978385d59daf9269189d052ca8a84c1acfd0715c0599a5d5188d4acc078ca46a" dependencies = [ "backtrace", "cfg-if", "findshlibs", "libc", "log", - "nix 0.24.1", + "nix 0.26.2", "once_cell", "parking_lot 0.12.1", "smallvec", @@ -8479,29 +13287,41 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" -version = "2.1.0" +version = "2.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95e5a7689e456ab905c22c2b48225bb921aba7c8dfa58440d68ba13f6222a715" +checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" dependencies = [ "difflib", "float-cmp", - "itertools", + "itertools 0.10.5", "normalize-line-endings", "predicates-core", "regex", ] [[package]] -name = "predicates-core" -version = "1.0.2" +name = "predicates" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e35a3326b75e49aa85f5dc6ec15b41108cf5aee58eabb1f274dd18b73c2451" +checksum = "09963355b9f467184c04017ced4a2ba2d75cbcb4e7462690d388233253d4b1a9" +dependencies = [ + "anstyle", + "difflib", + "itertools 0.10.5", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" [[package]] name = "predicates-tree" -version = "1.0.4" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338c7be2905b732ae3984a2f40032b5e94fd8f52505b186c7d4d68d193445df7" +checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" dependencies = [ "predicates-core", "termtree", @@ -8509,24 +13329,32 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor", "diff", - "output_vt100", "yansi", ] [[package]] name = "prettyplease" -version = "0.2.4" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ "proc-macro2", - "syn 2.0.16", + "syn 1.0.109", +] + +[[package]] +name = "prettyplease" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" +dependencies = [ + "proc-macro2", + "syn 2.0.31", ] [[package]] @@ -8537,6 +13365,8 @@ checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" dependencies = [ "fixed-hash", "impl-codec", + "impl-num-traits", + "impl-rlp", "impl-serde", "scale-info", "uint", @@ -8593,36 +13423,42 @@ dependencies = [ ] [[package]] -name = "proc-macro-warning" -version = "0.4.1" +name = "proc-macro-hack" +version = "0.5.20+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70550716265d1ec349c41f70dd4f964b4fd88394efe4405f0c1da679c4799a07" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro-warning" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "proc-macro2" -version = "1.0.60" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dec2b086b7a862cf4de201096214fa870344cf922b2b30c167badb3af3195406" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] [[package]] name = "prometheus" -version = "0.13.0" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f64969ffd5dd8f39bd57a68ac53c163a095ed9d0fb707146da1b27025a3504" +checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" dependencies = [ "cfg-if", "fnv", "lazy_static", "memchr", - "parking_lot 0.11.2", + "parking_lot 0.12.1", "thiserror", ] @@ -8640,87 +13476,67 @@ dependencies = [ [[package]] name = "prometheus-client-derive-encode" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b6a5217beb0ad503ee7fa752d451c905113d70721b937126158f3106a48cc1" +checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "prometheus-parse" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c996f3caea1c51aa034c0d2dfd8447a12c555f4567b02677ef8a865ac4cce712" +checksum = "0c2aa5feb83bf4b2c8919eaf563f51dbab41183de73ba2353c0e03cd7b6bd892" dependencies = [ "chrono", - "lazy_static", + "itertools 0.10.5", + "once_cell", "regex", ] [[package]] name = "prost" -version = "0.10.4" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71adf41db68aa0daaefc69bb30bcd68ded9b9abaad5d1fbb6304c4fb390e083e" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", - "prost-derive 0.10.1", -] - -[[package]] -name = "prost" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7" -dependencies = [ - "bytes", - "prost-derive 0.11.0", + "prost-derive", ] [[package]] name = "prost-build" -version = "0.11.1" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck", - "itertools", + "itertools 0.10.5", "lazy_static", "log", "multimap", "petgraph", - "prost 0.11.0", + "prettyplease 0.1.25", + "prost", "prost-types", "regex", + "syn 1.0.109", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.10.1" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b670f45da57fb8542ebdbb6105a925fe571b67f9e7ed9f47a06a84e72b4e7cc" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "prost-derive" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364" -dependencies = [ - "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -8728,35 +13544,34 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.11.1" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "bytes", - "prost 0.11.0", + "prost", ] [[package]] name = "psm" -version = "0.1.16" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69" +checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" dependencies = [ "cc", ] [[package]] name = "pyroscope" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6636d352280fb587c8716f10e1d61fe88cb002660e0a8b0d3e47de17f3b5aaed" +checksum = "ac8a53ce01af1087eaeee6ce7c4fbf50ea4040ab1825c0115c4bafa039644ba9" dependencies = [ "json", "libc", "libflate", "log", - "names", - "prost 0.10.4", + "names 0.14.0", + "prost", "reqwest", "thiserror", "url", @@ -8765,9 +13580,9 @@ dependencies = [ [[package]] name = "pyroscope_pprofrs" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e699bf3e7da41b3a7573d5944d77b1bd96a187aa72f5fa96afb4ed5609cc45" +checksum = "43f010b2a981a7f8449a650f25f309e520b5206ea2d89512dcb146aaa5518ff4" dependencies = [ "log", "pprof", @@ -8781,12 +13596,6 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - [[package]] name = "quick-protobuf" version = "0.8.1" @@ -8809,6 +13618,15 @@ dependencies = [ "unsigned-varint", ] +[[package]] +name = "quickcheck" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" +dependencies = [ + "rand 0.8.5", +] + [[package]] name = "quicksink" version = "0.1.2" @@ -8822,15 +13640,15 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4ced82a24bb281af338b9e8f94429b6eca01b4e66d899f40031f074e74c9" +checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" dependencies = [ "bytes", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", - "rustls 0.20.7", + "rustls 0.20.8", "slab", "thiserror", "tinyvec", @@ -8840,9 +13658,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.28" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -8912,7 +13730,17 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", +] + +[[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]] @@ -8941,26 +13769,23 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.5.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "lazy_static", "num_cpus", ] @@ -8971,8 +13796,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" dependencies = [ "pem", - "ring", - "time 0.3.17", + "ring 0.16.20", + "time 0.3.27", "x509-parser 0.13.2", "yasna", ] @@ -8984,8 +13809,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", - "time 0.3.17", + "ring 0.16.20", + "time 0.3.27", "yasna", ] @@ -8995,17 +13820,27 @@ 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.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.8", - "redox_syscall", + "getrandom 0.2.10", + "redox_syscall 0.2.16", + "thiserror", ] [[package]] @@ -9016,29 +13851,29 @@ checksum = "3bd8f48b2066e9f69ab192797d66da804d1935bf22763204ed3675740cb0f221" dependencies = [ "derive_more", "fs-err", - "itertools", + "itertools 0.10.5", "static_init 0.5.2", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.6" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300f2a835d808734ee295d45007adacb9ebb29dd3ae2424acfa17930cae541da" +checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.6" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" +checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] @@ -9055,13 +13890,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.6.0" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-automata 0.3.6", + "regex-syntax 0.7.4", ] [[package]] @@ -9070,22 +13906,38 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.29", +] + +[[package]] +name = "regex-automata" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.4", ] [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + +[[package]] +name = "regex-syntax" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "remote-ext-tests-bags-list" version = "1.0.0" dependencies = [ - "clap 4.2.5", + "clap 4.4.2", "frame-system", - "kusama-runtime", "kusama-runtime-constants", "log", "pallet-bags-list-remote-tests", @@ -9093,27 +13945,19 @@ dependencies = [ "polkadot-runtime-constants", "sp-core", "sp-tracing", + "staging-kusama-runtime", "tokio", "westend-runtime", "westend-runtime-constants", ] -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "reqwest" -version = "0.11.17" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "bytes", "encoding_rs", "futures-core", @@ -9122,28 +13966,28 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls 0.23.0", + "hyper-rustls", "ipnet", "js-sys", "log", "mime", "once_cell", "percent-encoding", - "pin-project-lite 0.2.9", - "rustls 0.20.7", - "rustls-pemfile 1.0.2", + "pin-project-lite 0.2.12", + "rustls 0.21.6", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls 0.23.2", + "tokio-rustls", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots", - "winreg 0.10.1", + "webpki-roots 0.25.2", + "winreg", ] [[package]] @@ -9153,7 +13997,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ "hostname", - "quick-error 1.2.3", + "quick-error", ] [[package]] @@ -9177,6 +14021,21 @@ dependencies = [ "subtle", ] +[[package]] +name = "ring" +version = "0.1.0" +source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-poly", + "ark-serialize", + "ark-std", + "common", + "fflonk", + "merlin 3.0.0", +] + [[package]] name = "ring" version = "0.16.20" @@ -9186,7 +14045,7 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", + "spin 0.5.2", "untrusted", "web-sys", "winapi", @@ -9198,6 +14057,16 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" +[[package]] +name = "rlp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" +dependencies = [ + "bytes", + "rustc-hex", +] + [[package]] name = "rocksdb" version = "0.21.0" @@ -9208,6 +14077,53 @@ dependencies = [ "librocksdb-sys", ] +[[package]] +name = "rococo-parachain-runtime" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-aura-ext", + "cumulus-pallet-dmp-queue", + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcm", + "cumulus-pallet-xcmp-queue", + "cumulus-ping", + "cumulus-primitives-core", + "cumulus-primitives-utility", + "frame-benchmarking", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", + "pallet-assets", + "pallet-aura", + "pallet-balances", + "pallet-sudo", + "pallet-timestamp", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-xcm", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "polkadot-parachain-primitives", + "scale-info", + "sp-api", + "sp-block-builder", + "sp-consensus-aura", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + [[package]] name = "rococo-runtime" version = "1.0.0" @@ -9263,7 +14179,7 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -9289,17 +14205,18 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "sp-storage", "sp-tracing", "sp-transaction-pool", "sp-trie", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "static_assertions", "substrate-wasm-builder", "tiny-keccak", "tokio", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -9317,11 +14234,12 @@ dependencies = [ [[package]] name = "rpassword" -version = "7.0.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b763cb66df1c928432cc35053f8bd4cec3335d8559fc16010017d16b3c1680" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" dependencies = [ "libc", + "rtoolbox", "winapi", ] @@ -9346,11 +14264,21 @@ dependencies = [ "log", "netlink-packet-route", "netlink-proto", - "nix 0.24.1", + "nix 0.24.3", "thiserror", "tokio", ] +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "rtp" version = "0.6.8" @@ -9367,9 +14295,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -9383,13 +14311,22 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.16", + "semver 1.0.18", ] [[package]] @@ -9403,43 +14340,42 @@ dependencies = [ [[package]] name = "rustix" -version = "0.35.13" +version = "0.36.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "727a1a6d65f786ec22df8a81ca3121107f235970dc1705ed681d3e6e8b9cd5f9" +checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" dependencies = [ - "bitflags", - "errno 0.2.8", - "io-lifetimes 0.7.5", - "libc", - "linux-raw-sys 0.0.46", - "windows-sys 0.42.0", -] - -[[package]] -name = "rustix" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03" -dependencies = [ - "bitflags", - "errno 0.2.8", - "io-lifetimes 1.0.10", + "bitflags 1.3.2", + "errno", + "io-lifetimes", "libc", "linux-raw-sys 0.1.4", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "rustix" -version = "0.37.18" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ - "bitflags", - "errno 0.3.1", - "io-lifetimes 1.0.10", + "bitflags 1.3.2", + "errno", + "io-lifetimes", "libc", - "linux-raw-sys 0.3.6", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustix" +version = "0.38.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.5", "windows-sys 0.48.0", ] @@ -9449,82 +14385,105 @@ version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "log", - "ring", + "ring 0.16.20", "sct 0.6.1", "webpki 0.21.4", ] [[package]] name = "rustls" -version = "0.20.7" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", - "ring", + "ring 0.16.20", "sct 0.7.0", "webpki 0.22.0", ] [[package]] name = "rustls" -version = "0.21.2" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", - "ring", - "rustls-webpki", + "ring 0.16.20", + "rustls-webpki 0.101.4", "sct 0.7.0", ] [[package]] name = "rustls-native-certs" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca9ebdfa27d3fc180e42879037b5338ab1c040c06affd00d8338598e7800943" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 0.2.1", + "rustls-pemfile", "schannel", "security-framework", ] [[package]] name = "rustls-pemfile" -version = "0.2.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.13.0", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" -dependencies = [ - "base64 0.21.0", + "base64 0.21.2", ] [[package]] name = "rustls-webpki" -version = "0.100.1" +version = "0.100.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" dependencies = [ - "ring", + "ring 0.16.20", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +dependencies = [ + "ring 0.16.20", "untrusted", ] [[package]] name = "rustversion" -version = "1.0.6" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", +] + +[[package]] +name = "ruzstd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" +dependencies = [ + "byteorder", + "thiserror-core", + "twox-hash", +] [[package]] name = "rw-stream-sink" @@ -9539,15 +14498,24 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.6" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" + +[[package]] +name = "safe-mix" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d3d055a2582e6b00ed7a31c1524040aa391092bf636328350813f3a0605215c" +dependencies = [ + "rustc_version 0.2.3", +] [[package]] name = "safe_arch" -version = "0.6.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794821e4ccb0d9f979512f9c1973480123f9bd62a90d74ab0f9426fcf8f4a529" +checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354" dependencies = [ "bytemuck", ] @@ -9564,7 +14532,6 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "log", "sp-core", @@ -9575,7 +14542,6 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", @@ -9585,8 +14551,9 @@ dependencies = [ "log", "multihash", "parity-scale-codec", - "prost 0.11.0", + "prost", "prost-build", + "quickcheck", "rand 0.8.5", "sc-client-api", "sc-network", @@ -9596,23 +14563,26 @@ dependencies = [ "sp-core", "sp-keystore", "sp-runtime", + "sp-tracing", "substrate-prometheus-endpoint", + "substrate-test-runtime-client", "thiserror", ] [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "futures-timer", "log", "parity-scale-codec", + "parking_lot 0.12.1", "sc-block-builder", "sc-client-api", "sc-proposer-metrics", "sc-telemetry", + "sc-transaction-pool", "sc-transaction-pool-api", "sp-api", "sp-blockchain", @@ -9621,12 +14591,12 @@ dependencies = [ "sp-inherents", "sp-runtime", "substrate-prometheus-endpoint", + "substrate-test-runtime-client", ] [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9636,12 +14606,13 @@ dependencies = [ "sp-core", "sp-inherents", "sp-runtime", + "sp-state-machine", + "substrate-test-runtime-client", ] [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -9660,27 +14631,26 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "chrono", - "clap 4.2.5", + "clap 4.4.2", "fdlimit", "futures", + "futures-timer", "libp2p-identity", "log", - "names", + "names 0.13.0", "parity-scale-codec", "rand 0.8.5", "regex", @@ -9701,7 +14671,9 @@ dependencies = [ "sp-keystore", "sp-panic-handler", "sp-runtime", + "sp-tracing", "sp-version", + "tempfile", "thiserror", "tiny-bip39", "tokio", @@ -9710,7 +14682,6 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "fnv", "futures", @@ -9726,20 +14697,24 @@ dependencies = [ "sp-core", "sp-database", "sp-externalities", - "sp-keystore", "sp-runtime", "sp-state-machine", "sp-statement-store", "sp-storage", + "sp-test-primitives", "substrate-prometheus-endpoint", + "substrate-test-runtime", + "thiserror", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", + "criterion 0.4.0", "hash-db", + "kitchensink-runtime", "kvdb", "kvdb-memorydb", "kvdb-rocksdb", @@ -9748,6 +14723,8 @@ dependencies = [ "parity-db", "parity-scale-codec", "parking_lot 0.12.1", + "quickcheck", + "rand 0.8.5", "sc-client-api", "sc-state-db", "schnellru", @@ -9757,13 +14734,15 @@ dependencies = [ "sp-database", "sp-runtime", "sp-state-machine", + "sp-tracing", "sp-trie", + "substrate-test-runtime-client", + "tempfile", ] [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", @@ -9781,14 +14760,52 @@ dependencies = [ "sp-core", "sp-runtime", "sp-state-machine", + "sp-test-primitives", "substrate-prometheus-endpoint", "thiserror", ] +[[package]] +name = "sc-consensus-aura" +version = "0.10.0-dev" +dependencies = [ + "async-trait", + "futures", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "sc-block-builder", + "sc-client-api", + "sc-consensus", + "sc-consensus-slots", + "sc-keystore", + "sc-network", + "sc-network-test", + "sc-telemetry", + "sp-api", + "sp-application-crypto", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-aura", + "sp-consensus-slots", + "sp-core", + "sp-inherents", + "sp-keyring", + "sp-keystore", + "sp-runtime", + "sp-timestamp", + "sp-tracing", + "substrate-prometheus-endpoint", + "substrate-test-runtime-client", + "tempfile", + "thiserror", + "tokio", +] + [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "fork-tree", @@ -9799,11 +14816,16 @@ dependencies = [ "num-traits", "parity-scale-codec", "parking_lot 0.12.1", + "rand_chacha 0.2.2", + "sc-block-builder", "sc-client-api", "sc-consensus", "sc-consensus-epochs", "sc-consensus-slots", + "sc-network", + "sc-network-test", "sc-telemetry", + "sc-transaction-pool-api", "scale-info", "sp-api", "sp-application-crypto", @@ -9814,38 +14836,48 @@ dependencies = [ "sp-consensus-slots", "sp-core", "sp-inherents", + "sp-keyring", "sp-keystore", "sp-runtime", + "sp-timestamp", + "sp-tracing", "substrate-prometheus-endpoint", + "substrate-test-runtime-client", "thiserror", + "tokio", ] [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "jsonrpsee", + "sc-consensus", "sc-consensus-babe", "sc-consensus-epochs", + "sc-keystore", "sc-rpc-api", + "sc-transaction-pool-api", "serde", + "serde_json", "sp-api", "sp-application-crypto", "sp-blockchain", "sp-consensus", "sp-consensus-babe", "sp-core", + "sp-keyring", "sp-keystore", "sp-runtime", + "substrate-test-runtime-client", "thiserror", + "tokio", ] [[package]] name = "sc-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "async-channel", @@ -9855,31 +14887,39 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.1", + "sc-block-builder", "sc-client-api", "sc-consensus", "sc-network", "sc-network-gossip", "sc-network-sync", + "sc-network-test", "sc-utils", + "serde", "sp-api", "sp-application-crypto", "sp-arithmetic", "sp-blockchain", "sp-consensus", "sp-consensus-beefy", + "sp-consensus-grandpa", "sp-core", + "sp-keyring", "sp-keystore", "sp-mmr-primitives", "sp-runtime", + "sp-tracing", "substrate-prometheus-endpoint", + "substrate-test-runtime-client", + "tempfile", "thiserror", + "tokio", "wasm-timer", ] [[package]] name = "sc-consensus-beefy-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "jsonrpsee", @@ -9889,16 +14929,18 @@ dependencies = [ "sc-consensus-beefy", "sc-rpc", "serde", + "serde_json", "sp-consensus-beefy", "sp-core", "sp-runtime", + "substrate-test-runtime-client", "thiserror", + "tokio", ] [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9911,10 +14953,10 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "ahash 0.8.2", + "ahash 0.8.3", "array-bytes", + "assert_matches", "async-trait", "dyn-clone", "finality-grandpa", @@ -9932,8 +14974,11 @@ dependencies = [ "sc-network", "sc-network-common", "sc-network-gossip", + "sc-network-test", "sc-telemetry", + "sc-transaction-pool-api", "sc-utils", + "serde", "serde_json", "sp-api", "sp-application-crypto", @@ -9942,36 +14987,105 @@ dependencies = [ "sp-consensus", "sp-consensus-grandpa", "sp-core", + "sp-keyring", "sp-keystore", "sp-runtime", + "sp-tracing", "substrate-prometheus-endpoint", + "substrate-test-runtime-client", "thiserror", + "tokio", ] [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "finality-grandpa", "futures", "jsonrpsee", "log", "parity-scale-codec", + "sc-block-builder", "sc-client-api", "sc-consensus-grandpa", "sc-rpc", "serde", "sp-blockchain", + "sp-consensus-grandpa", "sp-core", + "sp-keyring", "sp-runtime", + "substrate-test-runtime-client", + "thiserror", + "tokio", +] + +[[package]] +name = "sc-consensus-manual-seal" +version = "0.10.0-dev" +dependencies = [ + "assert_matches", + "async-trait", + "futures", + "futures-timer", + "jsonrpsee", + "log", + "parity-scale-codec", + "sc-basic-authorship", + "sc-client-api", + "sc-consensus", + "sc-consensus-aura", + "sc-consensus-babe", + "sc-consensus-epochs", + "sc-transaction-pool", + "sc-transaction-pool-api", + "serde", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-consensus-aura", + "sp-consensus-babe", + "sp-consensus-slots", + "sp-core", + "sp-inherents", + "sp-keystore", + "sp-runtime", + "sp-timestamp", + "substrate-prometheus-endpoint", + "substrate-test-runtime-client", + "substrate-test-runtime-transaction-pool", + "thiserror", + "tokio", +] + +[[package]] +name = "sc-consensus-pow" +version = "0.10.0-dev" +dependencies = [ + "async-trait", + "futures", + "futures-timer", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "sc-client-api", + "sc-consensus", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-pow", + "sp-core", + "sp-inherents", + "sp-runtime", + "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", @@ -9989,63 +15103,84 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", + "substrate-test-runtime-client", ] [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", + "assert_matches", + "criterion 0.4.0", + "env_logger 0.9.3", + "num_cpus", "parity-scale-codec", "parking_lot 0.12.1", + "paste", + "regex", "sc-executor-common", "sc-executor-wasmtime", + "sc-runtime-test", + "sc-tracing", "schnellru", "sp-api", "sp-core", "sp-externalities", "sp-io", + "sp-maybe-compressed-blob", "sp-panic-handler", + "sp-runtime", "sp-runtime-interface", + "sp-state-machine", + "sp-tracing", "sp-trie", "sp-version", "sp-wasm-interface", + "substrate-test-runtime", + "tempfile", "tracing", + "tracing-subscriber 0.2.25", + "wat", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", "sp-wasm-interface", "thiserror", - "wasm-instrument", + "wasm-instrument 0.3.0", ] [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "anyhow", + "cargo_metadata", "cfg-if", "libc", "log", - "rustix 0.36.7", + "parity-scale-codec", + "paste", + "rustix 0.36.15", "sc-allocator", "sc-executor-common", + "sc-runtime-test", + "sp-io", "sp-runtime-interface", "sp-wasm-interface", + "tempfile", "wasmtime", + "wat", ] [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "ansi_term", "futures", @@ -10061,7 +15196,6 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "parking_lot 0.12.1", @@ -10069,15 +15203,16 @@ dependencies = [ "sp-application-crypto", "sp-core", "sp-keystore", + "tempfile", "thiserror", ] [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", + "assert_matches", "async-channel", "async-trait", "asynchronous-codec", @@ -10091,6 +15226,7 @@ dependencies = [ "linked_hash_set", "log", "mockall", + "multistream-select", "parity-scale-codec", "parking_lot 0.12.1", "partial_sort", @@ -10098,6 +15234,8 @@ dependencies = [ "rand 0.8.5", "sc-client-api", "sc-network-common", + "sc-network-light", + "sc-network-sync", "sc-utils", "serde", "serde_json", @@ -10106,8 +15244,16 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-runtime", + "sp-test-primitives", + "sp-tracing", "substrate-prometheus-endpoint", + "substrate-test-runtime", + "substrate-test-runtime-client", + "tempfile", "thiserror", + "tokio", + "tokio-test", + "tokio-util", "unsigned-varint", "wasm-timer", "zeroize", @@ -10116,30 +15262,35 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-channel", "cid", "futures", "libp2p-identity", "log", - "prost 0.11.0", + "prost", "prost-build", + "sc-block-builder", "sc-client-api", + "sc-consensus", "sc-network", "sp-blockchain", + "sp-consensus", + "sp-core", "sp-runtime", + "substrate-test-runtime", + "substrate-test-runtime-client", "thiserror", + "tokio", "unsigned-varint", ] [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", - "bitflags", + "bitflags 1.3.2", "futures", "libp2p-identity", "parity-scale-codec", @@ -10148,30 +15299,32 @@ dependencies = [ "sp-consensus", "sp-consensus-grandpa", "sp-runtime", + "tempfile", ] [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "ahash 0.8.2", + "ahash 0.8.3", "futures", "futures-timer", "libp2p", "log", + "quickcheck", "sc-network", "sc-network-common", "schnellru", "sp-runtime", "substrate-prometheus-endpoint", + "substrate-test-runtime-client", + "tokio", "tracing", ] [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "async-channel", @@ -10179,7 +15332,7 @@ dependencies = [ "libp2p-identity", "log", "parity-scale-codec", - "prost 0.11.0", + "prost", "prost-build", "sc-client-api", "sc-network", @@ -10189,10 +15342,26 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sc-network-statement" +version = "0.10.0-dev" +dependencies = [ + "array-bytes", + "async-channel", + "futures", + "libp2p", + "log", + "parity-scale-codec", + "sc-network", + "sc-network-common", + "sp-consensus", + "sp-statement-store", + "substrate-prometheus-endpoint", +] + [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "async-channel", @@ -10204,8 +15373,10 @@ dependencies = [ "log", "mockall", "parity-scale-codec", - "prost 0.11.0", + "prost", "prost-build", + "quickcheck", + "sc-block-builder", "sc-client-api", "sc-consensus", "sc-network", @@ -10219,14 +15390,47 @@ dependencies = [ "sp-consensus-grandpa", "sp-core", "sp-runtime", + "sp-test-primitives", + "sp-tracing", "substrate-prometheus-endpoint", + "substrate-test-runtime-client", "thiserror", + "tokio", +] + +[[package]] +name = "sc-network-test" +version = "0.8.0" +dependencies = [ + "async-trait", + "futures", + "futures-timer", + "libp2p", + "log", + "parking_lot 0.12.1", + "rand 0.8.5", + "sc-block-builder", + "sc-client-api", + "sc-consensus", + "sc-network", + "sc-network-common", + "sc-network-light", + "sc-network-sync", + "sc-service", + "sc-utils", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "sp-tracing", + "substrate-test-runtime", + "substrate-test-runtime-client", + "tokio", ] [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "futures", @@ -10244,7 +15448,6 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "bytes", @@ -10252,28 +15455,40 @@ dependencies = [ "futures", "futures-timer", "hyper", - "hyper-rustls 0.24.0", + "hyper-rustls", + "lazy_static", "libp2p", + "log", "num_cpus", "once_cell", "parity-scale-codec", "parking_lot 0.12.1", "rand 0.8.5", + "sc-block-builder", "sc-client-api", + "sc-client-db", "sc-network", + "sc-network-common", + "sc-transaction-pool", + "sc-transaction-pool-api", "sc-utils", "sp-api", + "sp-consensus", "sp-core", + "sp-externalities", + "sp-keystore", "sp-offchain", "sp-runtime", + "sp-tracing", + "substrate-test-runtime-client", "threadpool", + "tokio", "tracing", ] [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -10282,24 +15497,31 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "assert_matches", + "env_logger 0.9.3", "futures", "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.1", + "pretty_assertions", "sc-block-builder", "sc-chain-spec", "sc-client-api", + "sc-network", + "sc-network-common", "sc-rpc-api", "sc-tracing", + "sc-transaction-pool", "sc-transaction-pool-api", "sc-utils", "serde_json", "sp-api", "sp-blockchain", + "sp-consensus", "sp-core", + "sp-io", "sp-keystore", "sp-offchain", "sp-rpc", @@ -10307,13 +15529,13 @@ dependencies = [ "sp-session", "sp-statement-store", "sp-version", + "substrate-test-runtime-client", "tokio", ] [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10332,7 +15554,6 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "http", "jsonrpsee", @@ -10347,9 +15568,9 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", + "assert_matches", "futures", "futures-util", "hex", @@ -10357,23 +15578,44 @@ dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.1", + "pretty_assertions", + "sc-block-builder", "sc-chain-spec", "sc-client-api", + "sc-service", "sc-transaction-pool-api", + "sc-utils", "serde", + "serde_json", "sp-api", "sp-blockchain", + "sp-consensus", "sp-core", + "sp-maybe-compressed-blob", "sp-runtime", "sp-version", + "substrate-test-runtime", + "substrate-test-runtime-client", "thiserror", + "tokio", "tokio-stream", ] +[[package]] +name = "sc-runtime-test" +version = "2.0.0" +dependencies = [ + "sp-core", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-std", + "substrate-wasm-builder", +] + [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "directories", @@ -10400,7 +15642,6 @@ dependencies = [ "sc-network-light", "sc-network-sync", "sc-network-transactions", - "sc-offchain", "sc-rpc", "sc-rpc-server", "sc-rpc-spec-v2", @@ -10428,6 +15669,8 @@ dependencies = [ "sp-version", "static_init 1.0.3", "substrate-prometheus-endpoint", + "substrate-test-runtime", + "substrate-test-runtime-client", "tempfile", "thiserror", "tokio", @@ -10435,10 +15678,45 @@ dependencies = [ "tracing-futures", ] +[[package]] +name = "sc-service-test" +version = "2.0.0" +dependencies = [ + "array-bytes", + "async-channel", + "fdlimit", + "futures", + "log", + "parity-scale-codec", + "parking_lot 0.12.1", + "sc-block-builder", + "sc-client-api", + "sc-client-db", + "sc-consensus", + "sc-executor", + "sc-network", + "sc-network-sync", + "sc-service", + "sc-transaction-pool-api", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-io", + "sp-runtime", + "sp-state-machine", + "sp-storage", + "sp-tracing", + "sp-trie", + "substrate-test-runtime", + "substrate-test-runtime-client", + "tempfile", + "tokio", +] + [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "log", "parity-scale-codec", @@ -10446,12 +15724,31 @@ dependencies = [ "sp-core", ] +[[package]] +name = "sc-statement-store" +version = "4.0.0-dev" +dependencies = [ + "env_logger 0.9.3", + "log", + "parity-db", + "parking_lot 0.12.1", + "sc-client-api", + "sc-keystore", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-runtime", + "sp-statement-store", + "substrate-prometheus-endpoint", + "tempfile", + "tokio", +] + [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "clap 4.2.5", + "clap 4.4.2", "fs4", "log", "sc-client-db", @@ -10463,7 +15760,6 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10482,7 +15778,6 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "libc", @@ -10495,13 +15790,13 @@ dependencies = [ "serde_json", "sp-core", "sp-io", + "sp-runtime", "sp-std", ] [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "chrono", "futures", @@ -10520,11 +15815,11 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "ansi_term", "atty", "chrono", + "criterion 0.4.0", "lazy_static", "libc", "log", @@ -10549,50 +15844,56 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", + "assert_matches", "async-trait", + "criterion 0.4.0", "futures", "futures-timer", "linked-hash-map", "log", "parity-scale-codec", "parking_lot 0.12.1", + "sc-block-builder", "sc-client-api", "sc-transaction-pool-api", "sc-utils", "serde", "sp-api", "sp-blockchain", + "sp-consensus", "sp-core", "sp-runtime", "sp-tracing", "sp-transaction-pool", "substrate-prometheus-endpoint", + "substrate-test-runtime", + "substrate-test-runtime-client", + "substrate-test-runtime-transaction-pool", "thiserror", ] [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", "log", "parity-scale-codec", "serde", + "serde_json", "sp-blockchain", "sp-core", "sp-runtime", @@ -10602,7 +15903,6 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-channel", "futures", @@ -10612,13 +15912,14 @@ dependencies = [ "parking_lot 0.12.1", "prometheus", "sp-arithmetic", + "tokio-test", ] [[package]] name = "scale-info" -version = "2.5.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cfdffd972d76b22f3d7f81c8be34b2296afd3a25e0a547bd9abe340a4dbbe97" +checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782" dependencies = [ "bitvec", "cfg-if", @@ -10630,9 +15931,9 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.5.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61fa974aea2d63dd18a4ec3a49d59af9f34178c73a4f56d2f18205628d00681e" +checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10642,12 +15943,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "lazy_static", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -10656,7 +15956,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" dependencies = [ - "ahash 0.8.2", + "ahash 0.8.3", "cfg-if", "hashbrown 0.13.2", ] @@ -10671,7 +15971,7 @@ dependencies = [ "arrayvec 0.5.2", "curve25519-dalek 2.1.3", "getrandom 0.1.16", - "merlin", + "merlin 2.0.1", "rand 0.7.3", "rand_core 0.5.1", "sha2 0.8.2", @@ -10680,16 +15980,32 @@ dependencies = [ ] [[package]] -name = "scopeguard" -version = "1.1.0" +name = "schnorrkel" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "844b7645371e6ecdf61ff246ba1958c29e802881a749ae3fb1993675d210d28d" +dependencies = [ + "arrayref", + "arrayvec 0.7.4", + "curve25519-dalek-ng", + "merlin 3.0.0", + "rand_core 0.6.4", + "sha2 0.9.9", + "subtle-ng", + "zeroize", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[package]] name = "sct" @@ -10697,7 +16013,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] @@ -10707,7 +16023,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] @@ -10730,8 +16046,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ "base16ct 0.1.1", - "der 0.6.0", - "generic-array 0.14.6", + "der 0.6.1", + "generic-array 0.14.7", "pkcs8 0.9.0", "subtle", "zeroize", @@ -10739,13 +16055,13 @@ dependencies = [ [[package]] name = "sec1" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" +checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc" dependencies = [ "base16ct 0.2.0", - "der 0.7.7", - "generic-array 0.14.6", + "der 0.7.8", + "generic-array 0.14.7", "pkcs8 0.10.2", "subtle", "zeroize", @@ -10753,18 +16069,18 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.24.2" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9512ffd81e3a3503ed401f79c33168b9148c75038956039166cd750eaa037c3" +checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7058dc8eaf3f2810d7828680320acda0b25a288f6d288e19278e249bbf74226b" +checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" dependencies = [ "cc", ] @@ -10780,11 +16096,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.4.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -10793,14 +16109,43 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.4.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", ] +[[package]] +name = "seedling-runtime" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-parachain-system", + "cumulus-pallet-solo-to-para", + "cumulus-primitives-core", + "frame-executive", + "frame-support", + "frame-system", + "pallet-balances", + "pallet-sudo", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-block-builder", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-version", + "substrate-wasm-builder", +] + [[package]] name = "semver" version = "0.6.0" @@ -10812,9 +16157,18 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.16" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" dependencies = [ "serde", ] @@ -10833,38 +16187,38 @@ checksum = "f97841a747eef040fcd2e7b3b9a220a7205926e60488e673d9e4926d27772ce5" [[package]] name = "serde" -version = "1.0.164" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.164" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "serde_fmt" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2963a69a2b3918c1dc75a45a18bd3fcd1120e31d3f59deb1b2f9b5d5ffb8baa4" +checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4" dependencies = [ "serde", ] [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -10873,9 +16227,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -10893,15 +16247,28 @@ dependencies = [ ] [[package]] -name = "sha-1" -version = "0.8.2" +name = "serial_test" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" +checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", + "dashmap", + "futures", + "lazy_static", + "log", + "parking_lot 0.12.1", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", ] [[package]] @@ -10919,13 +16286,24 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest 0.10.7", ] [[package]] @@ -10942,9 +16320,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if", @@ -10955,22 +16333,22 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.2" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] name = "sha3" -version = "0.10.0" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f935e31cf406e8c0e96c2815a5516181b7004ae8c5f296293221e9b1e356bd" +checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "keccak", ] @@ -10983,6 +16361,37 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shell-runtime" +version = "0.1.0" +dependencies = [ + "cumulus-pallet-parachain-system", + "cumulus-pallet-xcm", + "cumulus-primitives-core", + "frame-executive", + "frame-support", + "frame-system", + "frame-try-runtime", + "parachain-info", + "parachains-common", + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-block-builder", + "sp-core", + "sp-inherents", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-std", + "sp-transaction-pool", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "substrate-wasm-builder", +] + [[package]] name = "shlex" version = "1.1.0" @@ -10991,9 +16400,9 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "signal-hook" -version = "0.3.14" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -11001,9 +16410,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -11026,7 +16435,7 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "rand_core 0.6.4", ] @@ -11036,15 +16445,15 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "rand_core 0.6.4", ] [[package]] name = "simba" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50582927ed6f77e4ac020c057f37a268fc6aebc29225050365aacbb9deeeddc4" +checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" dependencies = [ "approx", "num-complex", @@ -11055,21 +16464,24 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" -version = "0.4.5" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] [[package]] name = "slice-group-by" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" +checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "slot-range-helper" @@ -11093,9 +16505,116 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "smol" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" +dependencies = [ + "async-channel", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-net", + "async-process", + "blocking", + "futures-lite", +] + +[[package]] +name = "smoldot" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0bb30cf57b7b5f6109ce17c3164445e2d6f270af2cb48f6e4d31c2967c9a9f5" +dependencies = [ + "arrayvec 0.7.4", + "async-lock", + "atomic-take", + "base64 0.21.2", + "bip39", + "blake2-rfc", + "bs58 0.5.0", + "chacha20 0.9.1", + "crossbeam-queue", + "derive_more", + "ed25519-zebra 4.0.2", + "either", + "event-listener", + "fnv", + "futures-lite", + "futures-util", + "hashbrown 0.14.0", + "hex", + "hmac 0.12.1", + "itertools 0.11.0", + "libsecp256k1", + "merlin 3.0.0", + "no-std-net", + "nom", + "num-bigint", + "num-rational", + "num-traits", + "pbkdf2 0.12.2", + "pin-project", + "poly1305 0.8.0", + "rand 0.8.5", + "rand_chacha 0.3.1", + "ruzstd", + "schnorrkel 0.10.2", + "serde", + "serde_json", + "sha2 0.10.7", + "sha3", + "siphasher", + "slab", + "smallvec", + "soketto", + "twox-hash", + "wasmi", + "x25519-dalek 2.0.0", + "zeroize", +] + +[[package]] +name = "smoldot-light" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "256b5bad1d6b49045e95fe87492ce73d5af81545d8b4d8318a872d2007024c33" +dependencies = [ + "async-channel", + "async-lock", + "base64 0.21.2", + "blake2-rfc", + "derive_more", + "either", + "event-listener", + "fnv", + "futures-channel", + "futures-lite", + "futures-util", + "hashbrown 0.14.0", + "hex", + "itertools 0.11.0", + "log", + "lru 0.11.0", + "no-std-net", + "parking_lot 0.12.1", + "pin-project", + "rand 0.8.5", + "rand_chacha 0.3.1", + "serde", + "serde_json", + "siphasher", + "slab", + "smol", + "smoldot", + "zeroize", +] [[package]] name = "snap" @@ -11105,18 +16624,18 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "snow" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ccba027ba85743e09d15c03296797cad56395089b832b48b5a5217880f57733" +checksum = "0c9d1425eb528a21de2755c75af4c9b5d57f50a0d4c3b7f1828a4cd03f8ba155" dependencies = [ "aes-gcm 0.9.4", "blake2", "chacha20poly1305", - "curve25519-dalek 4.0.0-rc.1", + "curve25519-dalek 4.0.0", "rand_core 0.6.4", - "ring", - "rustc_version", - "sha2 0.10.2", + "ring 0.16.20", + "rustc_version 0.4.0", + "sha2 0.10.7", "subtle", ] @@ -11130,13 +16649,23 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "soketto" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bytes", "flate2", "futures", @@ -11150,7 +16679,6 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "hash-db", "log", @@ -11158,10 +16686,12 @@ dependencies = [ "scale-info", "sp-api-proc-macro", "sp-core", + "sp-externalities", "sp-metadata-ir", "sp-runtime", "sp-state-machine", "sp-std", + "sp-test-primitives", "sp-trie", "sp-version", "thiserror", @@ -11170,21 +16700,43 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "Inflector", + "assert_matches", "blake2", "expander 2.0.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", +] + +[[package]] +name = "sp-api-test" +version = "2.0.1" +dependencies = [ + "criterion 0.4.0", + "futures", + "log", + "parity-scale-codec", + "rustversion", + "sc-block-builder", + "scale-info", + "sp-api", + "sp-consensus", + "sp-core", + "sp-runtime", + "sp-state-machine", + "sp-tracing", + "sp-version", + "static_assertions", + "substrate-test-runtime-client", + "trybuild", ] [[package]] name = "sp-application-crypto" version = "23.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", @@ -11194,24 +16746,142 @@ dependencies = [ "sp-std", ] +[[package]] +name = "sp-application-crypto-test" +version = "2.0.0" +dependencies = [ + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "substrate-test-runtime-client", +] + [[package]] name = "sp-arithmetic" version = "16.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "criterion 0.4.0", "integer-sqrt", "num-traits", "parity-scale-codec", + "primitive-types", + "rand 0.8.5", "scale-info", "serde", + "sp-core", "sp-std", "static_assertions", ] +[[package]] +name = "sp-arithmetic-fuzzer" +version = "2.0.0" +dependencies = [ + "arbitrary", + "fraction", + "honggfuzz", + "num-bigint", + "sp-arithmetic", +] + +[[package]] +name = "sp-ark-bls12-377" +version = "0.4.1-beta" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9b60ba7d8fbb82e21f5be499b02438c9a79365acb441a4dc3993179f09c4cc9" +dependencies = [ + "ark-bls12-377", + "ark-ff", + "ark-r1cs-std", + "ark-scale", + "ark-std", + "parity-scale-codec", + "sp-ark-models", +] + +[[package]] +name = "sp-ark-bls12-381" +version = "0.4.1-beta" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2cd101171d2e988a4e1b2320ad3f26f8746a263110c7153213fe86293e0552b" +dependencies = [ + "ark-bls12-381", + "ark-ff", + "ark-scale", + "ark-serialize", + "ark-std", + "parity-scale-codec", + "sp-ark-models", +] + +[[package]] +name = "sp-ark-bw6-761" +version = "0.4.1-beta" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d94d66ba98893cc42dfe81d5b5dee9142577176bdbdba80ec25a37d8cdffdbd5" +dependencies = [ + "ark-bw6-761", + "ark-ff", + "ark-scale", + "ark-std", + "parity-scale-codec", + "sp-ark-models", +] + +[[package]] +name = "sp-ark-ed-on-bls12-377" +version = "0.4.1-beta" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37f6ea96c9b1cd4cbd05d741225ff7f6328ab035bda16cf3fac105c87ad98959" +dependencies = [ + "ark-ed-on-bls12-377", + "ark-ff", + "ark-r1cs-std", + "ark-scale", + "ark-serialize", + "ark-std", + "parity-scale-codec", + "sp-ark-models", +] + +[[package]] +name = "sp-ark-ed-on-bls12-381-bandersnatch" +version = "0.4.1-beta" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4db7a801260397cd58077befcee87acfdde8c189f48718bba1bc3783c799b67b" +dependencies = [ + "ark-ec", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ff", + "ark-r1cs-std", + "ark-scale", + "ark-std", + "parity-scale-codec", + "sp-ark-bls12-381", + "sp-ark-models", +] + +[[package]] +name = "sp-ark-models" +version = "0.4.1-beta" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd77599e09f12893739e1ef822ae065f2f46c3be040ba1979bb786ae21059f44" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", + "getrandom 0.2.10", + "itertools 0.10.5", + "num-traits", + "zeroize", +] + [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", @@ -11224,7 +16894,6 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "sp-api", "sp-inherents", @@ -11235,7 +16904,6 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "futures", "log", @@ -11253,7 +16921,6 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "futures", @@ -11262,13 +16929,13 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", + "sp-test-primitives", "thiserror", ] [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "parity-scale-codec", @@ -11285,7 +16952,6 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "parity-scale-codec", @@ -11304,8 +16970,8 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", "lazy_static", "parity-scale-codec", "scale-info", @@ -11318,12 +16984,12 @@ dependencies = [ "sp-runtime", "sp-std", "strum", + "w3f-bls", ] [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "finality-grandpa", "log", @@ -11338,10 +17004,35 @@ dependencies = [ "sp-std", ] +[[package]] +name = "sp-consensus-pow" +version = "0.10.0-dev" +dependencies = [ + "parity-scale-codec", + "sp-api", + "sp-core", + "sp-runtime", + "sp-std", +] + +[[package]] +name = "sp-consensus-sassafras" +version = "0.3.4-dev" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-api", + "sp-application-crypto", + "sp-consensus-slots", + "sp-core", + "sp-runtime", + "sp-std", +] + [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", @@ -11353,15 +17044,17 @@ dependencies = [ [[package]] name = "sp-core" version = "21.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", - "bitflags", + "arrayvec 0.7.4", + "bandersnatch_vrfs", + "bitflags 1.3.2", "blake2", "bounded-collections", - "bs58", + "bs58 0.5.0", + "criterion 0.4.0", "dyn-clonable", - "ed25519-zebra", + "ed25519-zebra 3.1.0", "futures", "hash-db", "hash256-std-hasher", @@ -11369,7 +17062,7 @@ dependencies = [ "lazy_static", "libsecp256k1", "log", - "merlin", + "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.12.1", "paste", @@ -11377,11 +17070,13 @@ dependencies = [ "rand 0.8.5", "regex", "scale-info", - "schnorrkel", + "schnorrkel 0.9.1", "secp256k1", "secrecy", "serde", + "serde_json", "sp-core-hashing", + "sp-core-hashing-proc-macro", "sp-debug-derive", "sp-externalities", "sp-runtime-interface", @@ -11391,18 +17086,19 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", + "tracing", + "w3f-bls", "zeroize", ] [[package]] name = "sp-core-hashing" version = "9.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "blake2b_simd", "byteorder", - "digest 0.10.6", - "sha2 0.10.2", + "digest 0.10.7", + "sha2 0.10.7", "sha3", "twox-hash", ] @@ -11410,17 +17106,42 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "9.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "quote", "sp-core-hashing", - "syn 2.0.16", + "syn 2.0.31", +] + +[[package]] +name = "sp-crypto-ec-utils" +version = "0.4.0" +dependencies = [ + "ark-algebra-test-templates", + "ark-bls12-377", + "ark-bls12-381", + "ark-bw6-761", + "ark-ec", + "ark-ed-on-bls12-377", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ff", + "ark-scale", + "ark-serialize", + "ark-std", + "parity-scale-codec", + "sp-ark-bls12-377", + "sp-ark-bls12-381", + "sp-ark-bw6-761", + "sp-ark-ed-on-bls12-377", + "sp-ark-ed-on-bls12-381-bandersnatch", + "sp-ark-models", + "sp-io", + "sp-runtime-interface", + "sp-std", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -11429,17 +17150,15 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] name = "sp-externalities" version = "0.19.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "environmental", "parity-scale-codec", @@ -11447,12 +17166,22 @@ dependencies = [ "sp-storage", ] +[[package]] +name = "sp-genesis-builder" +version = "0.1.0" +dependencies = [ + "serde_json", + "sp-api", + "sp-runtime", + "sp-std", +] + [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", + "futures", "impl-trait-for-tuples", "parity-scale-codec", "scale-info", @@ -11464,11 +17193,9 @@ dependencies = [ [[package]] name = "sp-io" version = "23.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "bytes", - "ed25519", - "ed25519-dalek", + "ed25519-dalek 2.0.0", "libsecp256k1", "log", "parity-scale-codec", @@ -11489,7 +17216,6 @@ dependencies = [ [[package]] name = "sp-keyring" version = "24.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "lazy_static", "sp-core", @@ -11500,10 +17226,11 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.27.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", + "rand 0.7.3", + "rand_chacha 0.2.2", "sp-core", "sp-externalities", "thiserror", @@ -11512,16 +17239,14 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "thiserror", - "zstd 0.12.3+zstd.1.5.2", + "zstd 0.12.4", ] [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -11532,8 +17257,8 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", "ckb-merkle-mountain-range", "log", "parity-scale-codec", @@ -11550,21 +17275,32 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", + "rand 0.8.5", "scale-info", "serde", "sp-arithmetic", "sp-core", "sp-runtime", "sp-std", + "substrate-test-utils", +] + +[[package]] +name = "sp-npos-elections-fuzzer" +version = "2.0.0-alpha.5" +dependencies = [ + "clap 4.4.2", + "honggfuzz", + "rand 0.8.5", + "sp-npos-elections", + "sp-runtime", ] [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "sp-api", "sp-core", @@ -11574,7 +17310,6 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "backtrace", "lazy_static", @@ -11584,17 +17319,16 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "rustc-hash", "serde", + "serde_json", "sp-core", ] [[package]] name = "sp-runtime" version = "24.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "either", "hash256-std-hasher", @@ -11605,53 +17339,101 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", + "serde_json", + "sp-api", "sp-application-crypto", "sp-arithmetic", "sp-core", "sp-io", + "sp-state-machine", "sp-std", + "sp-tracing", "sp-weights", + "substrate-test-runtime-client", + "zstd 0.12.4", ] [[package]] name = "sp-runtime-interface" version = "17.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "bytes", "impl-trait-for-tuples", "parity-scale-codec", "primitive-types", + "rustversion", + "sp-core", "sp-externalities", + "sp-io", "sp-runtime-interface-proc-macro", + "sp-runtime-interface-test-wasm", + "sp-state-machine", "sp-std", "sp-storage", "sp-tracing", "sp-wasm-interface", "static_assertions", + "trybuild", ] [[package]] name = "sp-runtime-interface-proc-macro" version = "11.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "Inflector", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", +] + +[[package]] +name = "sp-runtime-interface-test" +version = "2.0.0" +dependencies = [ + "sc-executor", + "sc-executor-common", + "sp-io", + "sp-runtime", + "sp-runtime-interface", + "sp-runtime-interface-test-wasm", + "sp-runtime-interface-test-wasm-deprecated", + "sp-state-machine", + "tracing", + "tracing-core", +] + +[[package]] +name = "sp-runtime-interface-test-wasm" +version = "2.0.0" +dependencies = [ + "bytes", + "sp-core", + "sp-io", + "sp-runtime-interface", + "sp-std", + "substrate-wasm-builder", +] + +[[package]] +name = "sp-runtime-interface-test-wasm-deprecated" +version = "2.0.0" +dependencies = [ + "sp-core", + "sp-io", + "sp-runtime-interface", + "substrate-wasm-builder", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", "sp-api", "sp-core", + "sp-keystore", "sp-runtime", "sp-staking", "sp-std", @@ -11660,7 +17442,6 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11674,17 +17455,20 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.28.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "array-bytes", + "assert_matches", "hash-db", "log", "parity-scale-codec", "parking_lot 0.12.1", + "pretty_assertions", "rand 0.8.5", "smallvec", "sp-core", "sp-externalities", "sp-panic-handler", + "sp-runtime", "sp-std", "sp-trie", "thiserror", @@ -11695,10 +17479,15 @@ dependencies = [ [[package]] name = "sp-statement-store" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "aes-gcm 0.10.2", + "curve25519-dalek 4.0.0", + "ed25519-dalek 2.0.0", + "hkdf", "parity-scale-codec", + "rand 0.8.5", "scale-info", + "sha2 0.10.7", "sp-api", "sp-application-crypto", "sp-core", @@ -11707,17 +17496,16 @@ dependencies = [ "sp-runtime-interface", "sp-std", "thiserror", + "x25519-dalek 2.0.0", ] [[package]] name = "sp-std" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" [[package]] name = "sp-storage" version = "13.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11727,10 +17515,22 @@ dependencies = [ "sp-std", ] +[[package]] +name = "sp-test-primitives" +version = "2.0.0" +dependencies = [ + "parity-scale-codec", + "scale-info", + "serde", + "sp-application-crypto", + "sp-core", + "sp-runtime", + "sp-std", +] + [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "parity-scale-codec", @@ -11743,7 +17543,6 @@ dependencies = [ [[package]] name = "sp-tracing" version = "10.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "sp-std", @@ -11755,7 +17554,6 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "sp-api", "sp-runtime", @@ -11764,7 +17562,6 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "parity-scale-codec", @@ -11779,9 +17576,10 @@ dependencies = [ [[package]] name = "sp-trie" version = "22.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ - "ahash 0.8.2", + "ahash 0.8.3", + "array-bytes", + "criterion 0.4.0", "hash-db", "hashbrown 0.13.2", "lazy_static", @@ -11792,17 +17590,19 @@ dependencies = [ "scale-info", "schnellru", "sp-core", + "sp-runtime", "sp-std", "thiserror", "tracing", + "trie-bench", "trie-db", "trie-root", + "trie-standardmap", ] [[package]] name = "sp-version" version = "22.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11819,18 +17619,17 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.16", + "sp-version", + "syn 2.0.31", ] [[package]] name = "sp-wasm-interface" version = "14.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -11843,7 +17642,6 @@ dependencies = [ [[package]] name = "sp-weights" version = "20.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "parity-scale-codec", "scale-info", @@ -11861,6 +17659,12 @@ 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" + [[package]] name = "spinners" version = "4.1.0" @@ -11879,7 +17683,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", - "der 0.6.0", + "der 0.6.1", ] [[package]] @@ -11889,14 +17693,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" dependencies = [ "base64ct", - "der 0.7.7", + "der 0.7.8", ] [[package]] name = "ss58-registry" -version = "1.36.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d92659e7d18d82b803824a9ba5a6022cff101c3491d027c1c1d8d30e749284" +checksum = "5e6915280e2d0db8911e5032a5c275571af6bdded2916abd691a659be25d3439" dependencies = [ "Inflector", "num-format", @@ -11914,11 +17718,124 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] -name = "staking-miner" +name = "staging-kusama-runtime" +version = "1.0.0" +dependencies = [ + "binary-merkle-tree", + "bitvec", + "frame-benchmarking", + "frame-election-provider-support", + "frame-executive", + "frame-remote-externalities", + "frame-support", + "frame-system", + "frame-system-benchmarking", + "frame-system-rpc-runtime-api", + "frame-try-runtime", + "hex-literal 0.4.1", + "kusama-runtime-constants", + "log", + "pallet-authority-discovery", + "pallet-authorship", + "pallet-babe", + "pallet-bags-list", + "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", + "pallet-bounties", + "pallet-child-bounties", + "pallet-collective", + "pallet-conviction-voting", + "pallet-democracy", + "pallet-election-provider-multi-phase", + "pallet-election-provider-support-benchmarking", + "pallet-elections-phragmen", + "pallet-fast-unstake", + "pallet-grandpa", + "pallet-identity", + "pallet-im-online", + "pallet-indices", + "pallet-membership", + "pallet-message-queue", + "pallet-mmr", + "pallet-multisig", + "pallet-nis", + "pallet-nomination-pools", + "pallet-nomination-pools-benchmarking", + "pallet-nomination-pools-runtime-api", + "pallet-offences", + "pallet-offences-benchmarking", + "pallet-preimage", + "pallet-proxy", + "pallet-ranked-collective", + "pallet-recovery", + "pallet-referenda", + "pallet-scheduler", + "pallet-session", + "pallet-session-benchmarking", + "pallet-society", + "pallet-staking", + "pallet-staking-runtime-api", + "pallet-state-trie-migration", + "pallet-timestamp", + "pallet-tips", + "pallet-transaction-payment", + "pallet-transaction-payment-rpc-runtime-api", + "pallet-treasury", + "pallet-utility", + "pallet-vesting", + "pallet-whitelist", + "pallet-xcm", + "pallet-xcm-benchmarks", + "parity-scale-codec", + "polkadot-primitives", + "polkadot-runtime-common", + "polkadot-runtime-parachains", + "rustc-hex", + "scale-info", + "separator", + "serde", + "serde_derive", + "serde_json", + "smallvec", + "sp-api", + "sp-application-crypto", + "sp-arithmetic", + "sp-authority-discovery", + "sp-block-builder", + "sp-consensus-babe", + "sp-consensus-beefy", + "sp-core", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-mmr-primitives", + "sp-npos-elections", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-staking", + "sp-std", + "sp-storage", + "sp-tracing", + "sp-transaction-pool", + "sp-trie", + "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", + "static_assertions", + "substrate-wasm-builder", + "tiny-keccak", + "tokio", +] + +[[package]] +name = "staging-staking-miner" version = "1.0.0" dependencies = [ "assert_cmd", - "clap 4.2.5", + "clap 4.4.2", "exitcode", "frame-election-provider-support", "frame-remote-externalities", @@ -11926,7 +17843,6 @@ dependencies = [ "frame-system", "futures-util", "jsonrpsee", - "kusama-runtime", "log", "pallet-balances", "pallet-election-provider-multi-phase", @@ -11943,17 +17859,86 @@ dependencies = [ "signal-hook", "signal-hook-tokio", "sp-core", - "sp-io", "sp-npos-elections", "sp-runtime", + "sp-state-machine", "sp-version", + "staging-kusama-runtime", "sub-tokens", "thiserror", "tokio", - "tracing-subscriber 0.3.11", + "tracing-subscriber 0.3.17", "westend-runtime", ] +[[package]] +name = "staging-xcm" +version = "1.0.0" +dependencies = [ + "bounded-collections", + "derivative", + "environmental", + "hex", + "hex-literal 0.4.1", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-io", + "sp-weights", + "xcm-procedural", +] + +[[package]] +name = "staging-xcm-builder" +version = "1.0.0" +dependencies = [ + "assert_matches", + "frame-support", + "frame-system", + "impl-trait-for-tuples", + "log", + "pallet-assets", + "pallet-balances", + "pallet-salary", + "pallet-transaction-payment", + "pallet-xcm", + "parity-scale-codec", + "polkadot-parachain-primitives", + "polkadot-primitives", + "polkadot-runtime-parachains", + "polkadot-test-runtime", + "primitive-types", + "scale-info", + "sp-arithmetic", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", + "staging-xcm", + "staging-xcm-executor", +] + +[[package]] +name = "staging-xcm-executor" +version = "1.0.0" +dependencies = [ + "environmental", + "frame-benchmarking", + "frame-support", + "impl-trait-for-tuples", + "log", + "parity-scale-codec", + "sp-arithmetic", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-weights", + "staging-xcm", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -11978,11 +17963,11 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a2a1c578e98c1c16fc3b8ec1328f7659a500737d7a0c6d625e73e830ff9c1f6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg_aliases", "libc", "parking_lot 0.11.2", - "parking_lot_core 0.8.5", + "parking_lot_core 0.8.6", "static_init_macro 1.0.2", "winapi", ] @@ -12030,9 +18015,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.24.0" +version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" dependencies = [ "heck", "proc-macro2", @@ -12047,12 +18032,12 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "crc", "lazy_static", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "subtle", "thiserror", "tokio", @@ -12068,6 +18053,14 @@ dependencies = [ "separator", ] +[[package]] +name = "subkey" +version = "3.0.0" +dependencies = [ + "clap 4.4.2", + "sc-cli", +] + [[package]] name = "substrate-bip39" version = "0.4.4" @@ -12076,39 +18069,87 @@ checksum = "49eee6965196b32f882dd2ee85a92b1dbead41b04e53907f269de3b0dc04733c" dependencies = [ "hmac 0.11.0", "pbkdf2 0.8.0", - "schnorrkel", - "sha2 0.9.8", + "schnorrkel 0.9.1", + "sha2 0.9.9", "zeroize", ] [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" + +[[package]] +name = "substrate-cli-test-utils" +version = "0.1.0" +dependencies = [ + "assert_cmd", + "futures", + "nix 0.26.2", + "node-cli", + "node-primitives", + "regex", + "sc-cli", + "sc-service", + "sp-rpc", + "substrate-rpc-client", + "tokio", +] + +[[package]] +name = "substrate-frame-cli" +version = "4.0.0-dev" +dependencies = [ + "clap 4.4.2", + "frame-support", + "frame-system", + "sc-cli", + "sp-core", + "sp-runtime", +] + +[[package]] +name = "substrate-frame-rpc-support" +version = "3.0.0" +dependencies = [ + "frame-support", + "frame-system", + "jsonrpsee", + "parity-scale-codec", + "sc-rpc-api", + "scale-info", + "serde", + "sp-core", + "sp-runtime", + "sp-storage", + "tokio", +] [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "assert_matches", "frame-system-rpc-runtime-api", "futures", "jsonrpsee", "log", "parity-scale-codec", "sc-rpc-api", + "sc-transaction-pool", "sc-transaction-pool-api", "sp-api", "sp-block-builder", "sp-blockchain", "sp-core", "sp-runtime", + "sp-tracing", + "substrate-test-runtime-client", + "tokio", ] [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "hyper", "log", @@ -12120,26 +18161,27 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "async-trait", "jsonrpsee", "log", "sc-rpc-api", "serde", + "sp-core", "sp-runtime", + "tokio", ] [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "jsonrpsee", "parity-scale-codec", "sc-client-api", "sc-rpc-api", "serde", + "serde_json", "sp-core", "sp-runtime", "sp-state-machine", @@ -12150,7 +18192,6 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "array-bytes", "async-trait", @@ -12174,30 +18215,100 @@ dependencies = [ ] [[package]] -name = "substrate-test-utils" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" +name = "substrate-test-runtime" +version = "2.0.0" dependencies = [ + "array-bytes", + "frame-executive", + "frame-support", + "frame-system", + "frame-system-rpc-runtime-api", "futures", - "substrate-test-utils-derive", - "tokio", + "json-patch", + "log", + "pallet-babe", + "pallet-balances", + "pallet-timestamp", + "parity-scale-codec", + "sc-block-builder", + "sc-executor", + "sc-executor-common", + "sc-service", + "scale-info", + "serde", + "serde_json", + "sp-api", + "sp-application-crypto", + "sp-block-builder", + "sp-consensus", + "sp-consensus-aura", + "sp-consensus-babe", + "sp-consensus-grandpa", + "sp-core", + "sp-externalities", + "sp-genesis-builder", + "sp-inherents", + "sp-io", + "sp-keyring", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-state-machine", + "sp-std", + "sp-tracing", + "sp-transaction-pool", + "sp-trie", + "sp-version", + "substrate-test-runtime-client", + "substrate-wasm-builder", + "trie-db", ] [[package]] -name = "substrate-test-utils-derive" -version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" +name = "substrate-test-runtime-client" +version = "2.0.0" dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.16", + "futures", + "sc-block-builder", + "sc-client-api", + "sc-consensus", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "substrate-test-client", + "substrate-test-runtime", +] + +[[package]] +name = "substrate-test-runtime-transaction-pool" +version = "2.0.0" +dependencies = [ + "futures", + "parity-scale-codec", + "parking_lot 0.12.1", + "sc-transaction-pool", + "sc-transaction-pool-api", + "sp-blockchain", + "sp-runtime", + "substrate-test-runtime-client", + "thiserror", +] + +[[package]] +name = "substrate-test-utils" +version = "4.0.0-dev" +dependencies = [ + "futures", + "sc-service", + "tokio", + "trybuild", ] [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ "ansi_term", "build-helper", @@ -12207,7 +18318,7 @@ dependencies = [ "sp-maybe-compressed-blob", "strum", "tempfile", - "toml 0.7.3", + "toml 0.7.6", "walkdir", "wasm-opt", ] @@ -12227,6 +18338,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +[[package]] +name = "subtle-ng" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "734676eb262c623cec13c3155096e08d1f8f29adce39ba17948b18dad1e54142" + [[package]] name = "sval" version = "2.6.1" @@ -12297,9 +18414,9 @@ dependencies = [ [[package]] name = "symbolic-common" -version = "9.2.1" +version = "12.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "800963ba330b09a2ae4a4f7c6392b81fbc2784099a98c1eac68c3437aa9382b2" +checksum = "167a4ffd7c35c143fd1030aa3c2caf76ba42220bd5a6b5f4781896434723b8c3" dependencies = [ "debugid", "memmap2", @@ -12309,11 +18426,11 @@ dependencies = [ [[package]] name = "symbolic-demangle" -version = "9.2.1" +version = "12.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b940a1fdbc72bb3369e38714efe6cd332dbbe46d093cf03d668b9ac390d1ad0" +checksum = "e378c50e80686c1c5c205674e1f86a2858bec3d2a7dfdd690331a8a19330f293" dependencies = [ - "cpp_demangle", + "cpp_demangle 0.4.3", "rustc-demangle", "symbolic-common", ] @@ -12331,9 +18448,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" dependencies = [ "proc-macro2", "quote", @@ -12354,11 +18471,11 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "system-configuration-sys", ] @@ -12380,39 +18497,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] -name = "target-lexicon" -version = "0.12.5" +name = "tar" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9410d0f6853b1d94f0e519fb95df60f29d2c1eff2d921ffdf01a4c8a3b54f12d" +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 = "tempfile" -version = "3.3.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand", - "libc", - "redox_syscall", - "remove_dir_all", - "winapi", + "fastrand 2.0.0", + "redox_syscall 0.3.5", + "rustix 0.38.8", + "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.1.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "termtree" -version = "0.2.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "test-parachain-adder" @@ -12420,7 +18547,7 @@ version = "1.0.0" dependencies = [ "dlmalloc", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "sp-io", "sp-std", "substrate-wasm-builder", @@ -12431,7 +18558,7 @@ dependencies = [ name = "test-parachain-adder-collator" version = "1.0.0" dependencies = [ - "clap 4.2.5", + "clap 4.4.2", "futures", "futures-timer", "log", @@ -12440,7 +18567,7 @@ dependencies = [ "polkadot-node-core-pvf", "polkadot-node-primitives", "polkadot-node-subsystem", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-service", "polkadot-test-service", @@ -12450,6 +18577,7 @@ dependencies = [ "sp-keyring", "substrate-test-utils", "test-parachain-adder", + "test-parachain-adder-collator", "tokio", ] @@ -12468,7 +18596,7 @@ dependencies = [ "dlmalloc", "log", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "sp-io", "sp-std", "substrate-wasm-builder", @@ -12479,7 +18607,7 @@ dependencies = [ name = "test-parachain-undying-collator" version = "1.0.0" dependencies = [ - "clap 4.2.5", + "clap 4.4.2", "futures", "futures-timer", "log", @@ -12488,7 +18616,7 @@ dependencies = [ "polkadot-node-core-pvf", "polkadot-node-primitives", "polkadot-node-subsystem", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-service", "polkadot-test-service", @@ -12498,6 +18626,7 @@ dependencies = [ "sp-keyring", "substrate-test-utils", "test-parachain-undying", + "test-parachain-undying-collator", "tokio", ] @@ -12533,22 +18662,42 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" dependencies = [ "thiserror-impl", ] [[package]] -name = "thiserror-impl" -version = "1.0.40" +name = "thiserror-core" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497" +dependencies = [ + "thiserror-core-impl", +] + +[[package]] +name = "thiserror-core-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 1.0.109", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.31", ] [[package]] @@ -12559,10 +18708,11 @@ checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] @@ -12590,9 +18740,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-ctl" -version = "0.5.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37706572f4b151dff7a0146e040804e9c26fe3a3118591112f05cf12a4216c1" +checksum = "619bfed27d807b54f7f776b9430d4f8060e66ee138a28632ca898584d462c31c" dependencies = [ "libc", "paste", @@ -12601,20 +18751,19 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.5.2+5.3.0-patched" +version = "0.5.4+5.3.0-patched" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec45c14da997d0925c7835883e4d5c181f196fa142f8c19d7643d1e9af2592c3" +checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" dependencies = [ "cc", - "fs_extra", "libc", ] [[package]] name = "tikv-jemallocator" -version = "0.5.0" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20612db8a13a6c06d57ec83953694185a367e16945f66565e8028d2c0bd76979" +checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -12622,9 +18771,9 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", @@ -12633,10 +18782,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" dependencies = [ + "deranged", "itoa", "serde", "time-core", @@ -12645,15 +18795,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9" dependencies = [ "time-core", ] @@ -12670,7 +18820,7 @@ dependencies = [ "pbkdf2 0.11.0", "rand 0.8.5", "rustc-hash", - "sha2 0.10.2", + "sha2 0.10.7", "thiserror", "unicode-normalization", "wasm-bindgen", @@ -12698,34 +18848,34 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", "num_cpus", "parking_lot 0.12.1", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "signal-hook-registry", - "socket2", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] @@ -12738,7 +18888,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] @@ -12752,44 +18902,46 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" -dependencies = [ - "rustls 0.20.7", - "tokio", - "webpki 0.22.0", -] - [[package]] name = "tokio-rustls" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.2", + "rustls 0.21.6", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.9" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df54d54117d6fdc4e4fea40fe1e4e566b3505700e148a6827e59b34b0d2600d9" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "tokio", "tokio-util", ] [[package]] -name = "tokio-tungstenite" -version = "0.17.1" +name = "tokio-test" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae" +checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719" +dependencies = [ + "async-stream", + "bytes", + "futures-core", + "tokio", + "tokio-stream", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181" dependencies = [ "futures-util", "log", @@ -12799,15 +18951,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.1" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "tokio", "tracing", ] @@ -12823,9 +18975,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.3" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -12835,20 +18987,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", "serde_spanned", "toml_datetime", @@ -12868,18 +19020,18 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" +checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" dependencies = [ - "bitflags", + "bitflags 2.4.0", "bytes", "futures-core", "futures-util", "http", "http-body", "http-range-header", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "tower-layer", "tower-service", ] @@ -12892,9 +19044,9 @@ checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" @@ -12904,27 +19056,27 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "log", - "pin-project-lite 0.2.9", + "pin-project-lite 0.2.12", "tracing-attributes", "tracing-core", ] [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.31", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -12944,6 +19096,7 @@ dependencies = [ name = "tracing-gum" version = "1.0.0" dependencies = [ + "coarsetime", "polkadot-node-jaeger", "polkadot-primitives", "tracing", @@ -12959,7 +19112,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] @@ -12975,9 +19128,9 @@ dependencies = [ [[package]] name = "tracing-serde" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb65ea441fbb84f9f6748fd496cf7f63ec9af5bca94dd86456978d055e8eb28b" +checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" dependencies = [ "serde", "tracing-core", @@ -13008,13 +19161,13 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.11" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ - "ansi_term", - "lazy_static", "matchers 0.1.0", + "nu-ansi-term", + "once_cell", "regex", "sharded-slab", "smallvec", @@ -13024,6 +19177,22 @@ dependencies = [ "tracing-log", ] +[[package]] +name = "trie-bench" +version = "0.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f54b4f9d51d368e62cf7e0730c7c1e18fc658cc84333656bab5b328f44aa964" +dependencies = [ + "criterion 0.4.0", + "hash-db", + "keccak-hasher", + "memory-db", + "parity-scale-codec", + "trie-db", + "trie-root", + "trie-standardmap", +] + [[package]] name = "trie-db" version = "0.27.1" @@ -13046,6 +19215,16 @@ dependencies = [ "hash-db", ] +[[package]] +name = "trie-standardmap" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "684aafb332fae6f83d7fe10b3fbfdbe39a1b3234c4e2a618f030815838519516" +dependencies = [ + "hash-db", + "keccak-hasher", +] + [[package]] name = "trust-dns-proto" version = "0.22.0" @@ -13064,7 +19243,7 @@ dependencies = [ "lazy_static", "rand 0.8.5", "smallvec", - "socket2", + "socket2 0.4.9", "thiserror", "tinyvec", "tokio", @@ -13094,22 +19273,24 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=polkadot-v1.0.0#2b76b44e6f7e948c8dffb7ff72d349f0702f5acf" dependencies = [ + "assert_cmd", "async-trait", - "clap 4.2.5", + "clap 4.4.2", "frame-remote-externalities", "frame-try-runtime", "hex", "log", + "node-primitives", "parity-scale-codec", + "regex", "sc-cli", "sc-executor", "serde", @@ -13130,16 +19311,20 @@ dependencies = [ "sp-transaction-storage-proof", "sp-version", "sp-weights", + "substrate-cli-test-utils", "substrate-rpc-client", - "zstd 0.12.3+zstd.1.5.2", + "tempfile", + "tokio", + "zstd 0.12.4", ] [[package]] name = "trybuild" -version = "1.0.75" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1212c215a87a183687a7cc7065901b1a98da6b37277d51a1b5faedbb4efd4f3" +checksum = "6df60d81823ed9c520ee897489573da4b1d79ffbe006b8134f46de1a1aa03555" dependencies = [ + "basic-toml", "dissimilar", "glob", "once_cell", @@ -13147,29 +19332,28 @@ dependencies = [ "serde_derive", "serde_json", "termcolor", - "toml 0.5.11", ] [[package]] name = "tt-call" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e66dcbec4290c69dd03c57e76c2469ea5c7ce109c6dd4351c13055cf71ea055" +checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" [[package]] name = "tungstenite" -version = "0.17.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5" +checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "byteorder", "bytes", "http", "httparse", "log", "rand 0.8.5", - "sha-1 0.10.0", + "sha-1 0.10.1", "thiserror", "url", "utf-8", @@ -13182,12 +19366,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8" dependencies = [ "async-trait", - "base64 0.13.0", + "base64 0.13.1", "futures", "log", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "stun", "thiserror", "tokio", @@ -13201,7 +19385,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", - "digest 0.10.6", + "digest 0.10.7", "rand 0.8.5", "static_assertions", ] @@ -13214,15 +19398,15 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "ucd-trie" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "uint" -version = "0.9.1" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f" +checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" dependencies = [ "byteorder", "crunchy", @@ -13232,36 +19416,36 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "unicode-xid" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "universal-hash" @@ -13269,7 +19453,17 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" dependencies = [ - "generic-array 0.14.6", + "generic-array 0.14.7", + "subtle", +] + +[[package]] +name = "universal-hash" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" +dependencies = [ + "crypto-common", "subtle", ] @@ -13293,12 +19487,12 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", - "idna 0.3.0", + "idna 0.4.0", "percent-encoding", ] @@ -13316,11 +19510,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.2.2" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422ee0de9031b5b948b97a8fc04e3aa35230001a722ddd27943e0be31564ce4c" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ - "getrandom 0.2.8", + "getrandom 0.2.10", ] [[package]] @@ -13383,6 +19577,30 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "w3f-bls" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7335e4c132c28cc43caef6adb339789e599e39adbe78da0c4d547fad48cbc331" +dependencies = [ + "ark-bls12-377", + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-serialize-derive", + "arrayref", + "constcat", + "digest 0.10.7", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "sha2 0.10.7", + "sha3", + "thiserror", + "zeroize", +] + [[package]] name = "wait-timeout" version = "0.2.0" @@ -13409,22 +19627,20 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] [[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", ] @@ -13448,9 +19664,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "serde", @@ -13460,24 +19676,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.35" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -13487,9 +19703,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -13497,22 +19713,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.85" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + +[[package]] +name = "wasm-encoder" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41763f20eafed1399fff1afb466496d3a959f58241436cfdc17e3f5ca954de16" +dependencies = [ + "leb128", +] [[package]] name = "wasm-instrument" @@ -13524,10 +19749,19 @@ dependencies = [ ] [[package]] -name = "wasm-opt" -version = "0.112.0" +name = "wasm-instrument" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87fef6d0d508f08334e0ab0e6877feb4c0ecb3956bcf2cb950699b22fedf3e9c" +checksum = "2a47ecb37b9734d1085eaa5ae1a81e60801fd8c28d4cabdd8aedb982021918bc" +dependencies = [ + "parity-wasm", +] + +[[package]] +name = "wasm-opt" +version = "0.114.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d005a95f934878a1fb446a816d51c3601a0120ff929005ba3bab3c749cfd1c7" dependencies = [ "anyhow", "libc", @@ -13541,9 +19775,9 @@ dependencies = [ [[package]] name = "wasm-opt-cxx-sys" -version = "0.112.0" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc816bbc1596c8f2e8127e137a760c798023ef3d378f2ae51f0f1840e2dfa445" +checksum = "6d04e240598162810fad3b2e96fa0dec6dba1eb65a03f3bd99a9248ab8b56caa" dependencies = [ "anyhow", "cxx", @@ -13553,9 +19787,9 @@ dependencies = [ [[package]] name = "wasm-opt-sys" -version = "0.112.0" +version = "0.114.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40199e4f68ef1071b3c6d0bd8026a12b481865d4b9e49c156932ea9a6234dd14" +checksum = "2efd2aaca519d64098c4faefc8b7433a97ed511caf4c9e516384eb6aef1ff4f9" dependencies = [ "anyhow", "cc", @@ -13578,16 +19812,56 @@ dependencies = [ "web-sys", ] +[[package]] +name = "wasmi" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f341edb80021141d4ae6468cbeefc50798716a347d4085c3811900049ea8945" +dependencies = [ + "smallvec", + "spin 0.9.8", + "wasmi_arena", + "wasmi_core", + "wasmparser-nostd", +] + +[[package]] +name = "wasmi_arena" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468" + +[[package]] +name = "wasmi_core" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" +dependencies = [ + "downcast-rs", + "libm", + "num-traits", + "paste", +] + [[package]] name = "wasmparser" version = "0.102.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b" dependencies = [ - "indexmap", + "indexmap 1.9.3", "url", ] +[[package]] +name = "wasmparser-nostd" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" +dependencies = [ + "indexmap-nostd", +] + [[package]] name = "wasmtime" version = "8.0.1" @@ -13597,10 +19871,10 @@ dependencies = [ "anyhow", "bincode", "cfg-if", - "indexmap", + "indexmap 1.9.3", "libc", "log", - "object", + "object 0.30.4", "once_cell", "paste", "psm", @@ -13632,14 +19906,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c86437fa68626fe896e5afc69234bb2b5894949083586535f200385adfd71213" dependencies = [ "anyhow", - "base64 0.21.0", + "base64 0.21.2", "bincode", "directories-next", "file-per-thread-logger", "log", - "rustix 0.36.7", + "rustix 0.36.15", "serde", - "sha2 0.10.2", + "sha2 0.10.7", "toml 0.5.11", "windows-sys 0.45.0", "zstd 0.11.2+zstd.1.5.2", @@ -13657,9 +19931,9 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli", + "gimli 0.27.3", "log", - "object", + "object 0.30.4", "target-lexicon", "thiserror", "wasmparser", @@ -13676,8 +19950,8 @@ dependencies = [ "anyhow", "cranelift-codegen", "cranelift-native", - "gimli", - "object", + "gimli 0.27.3", + "object 0.30.4", "target-lexicon", "wasmtime-environ", ] @@ -13690,10 +19964,10 @@ checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949" dependencies = [ "anyhow", "cranelift-entity", - "gimli", - "indexmap", + "gimli 0.27.3", + "indexmap 1.9.3", "log", - "object", + "object 0.30.4", "serde", "target-lexicon", "thiserror", @@ -13707,14 +19981,14 @@ version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244" dependencies = [ - "addr2line", + "addr2line 0.19.0", "anyhow", "bincode", "cfg-if", - "cpp_demangle", - "gimli", + "cpp_demangle 0.3.5", + "gimli 0.27.3", "log", - "object", + "object 0.30.4", "rustc-demangle", "serde", "target-lexicon", @@ -13731,9 +20005,9 @@ version = "8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846" dependencies = [ - "object", + "object 0.30.4", "once_cell", - "rustix 0.36.7", + "rustix 0.36.15", ] [[package]] @@ -13756,7 +20030,7 @@ dependencies = [ "anyhow", "cc", "cfg-if", - "indexmap", + "indexmap 1.9.3", "libc", "log", "mach", @@ -13764,7 +20038,7 @@ dependencies = [ "memoffset 0.8.0", "paste", "rand 0.8.5", - "rustix 0.36.7", + "rustix 0.36.15", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", @@ -13784,10 +20058,31 @@ dependencies = [ ] [[package]] -name = "web-sys" -version = "0.3.55" +name = "wast" +version = "63.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +checksum = "2560471f60a48b77fccefaf40796fda61c97ce1e790b59dfcec9dc3995c9f63a" +dependencies = [ + "leb128", + "memchr", + "unicode-width", + "wasm-encoder", +] + +[[package]] +name = "wat" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bdc306c2c4c2f2bf2ba69e083731d0d2a77437fc6a350a19db139636e7e416c" +dependencies = [ + "wast", +] + +[[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", @@ -13799,7 +20094,7 @@ version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] @@ -13809,19 +20104,34 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" dependencies = [ - "ring", + "ring 0.16.20", "untrusted", ] [[package]] name = "webpki-roots" -version = "0.22.2" +version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449" +checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ "webpki 0.22.0", ] +[[package]] +name = "webpki-roots" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki 0.100.2", +] + +[[package]] +name = "webpki-roots" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" + [[package]] name = "webrtc" version = "0.6.0" @@ -13838,17 +20148,17 @@ dependencies = [ "rand 0.8.5", "rcgen 0.9.3", "regex", - "ring", + "ring 0.16.20", "rtcp", "rtp", "rustls 0.19.1", "sdp", "serde", "serde_json", - "sha2 0.10.2", + "sha2 0.10.7", "stun", "thiserror", - "time 0.3.17", + "time 0.3.27", "tokio", "turn", "url", @@ -13880,50 +20190,49 @@ dependencies = [ [[package]] name = "webrtc-dtls" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7021987ae0a2ed6c8cd33f68e98e49bb6e74ffe9543310267b48a1bbe3900e5f" +checksum = "c4a00f4242f2db33307347bd5be53263c52a0331c96c14292118c9a6bb48d267" dependencies = [ "aes 0.6.0", - "aes-gcm 0.8.0", + "aes-gcm 0.10.2", "async-trait", "bincode", "block-modes", "byteorder", "ccm", "curve25519-dalek 3.2.0", - "der-parser 8.1.0", + "der-parser 8.2.0", "elliptic-curve 0.12.3", "hkdf", - "hmac 0.10.1", + "hmac 0.12.1", "log", - "oid-registry 0.6.1", "p256", "p384", "rand 0.8.5", "rand_core 0.6.4", - "rcgen 0.9.3", - "ring", + "rcgen 0.10.0", + "ring 0.16.20", "rustls 0.19.1", "sec1 0.3.0", "serde", - "sha-1 0.9.8", - "sha2 0.9.8", + "sha1", + "sha2 0.10.7", "signature 1.6.4", "subtle", "thiserror", "tokio", "webpki 0.21.4", "webrtc-util", - "x25519-dalek 2.0.0-pre.1", + "x25519-dalek 2.0.0", "x509-parser 0.13.2", ] [[package]] name = "webrtc-ice" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "494483fbb2f5492620871fdc78b084aed8807377f6e3fe88b2e49f0a9c9c41d7" +checksum = "465a03cc11e9a7d7b4f9f99870558fe37a102b65b93f8045392fef7c67b39e80" dependencies = [ "arc-swap", "async-trait", @@ -13950,7 +20259,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106" dependencies = [ "log", - "socket2", + "socket2 0.4.9", "thiserror", "tokio", "webrtc-util", @@ -13958,18 +20267,15 @@ dependencies = [ [[package]] name = "webrtc-media" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a3c157a040324e5049bcbd644ffc9079e6738fa2cfab2bcff64e5cc4c00d7" +checksum = "f72e1650a8ae006017d1a5280efb49e2610c19ccc3c0905b03b648aee9554991" dependencies = [ "byteorder", "bytes", - "derive_builder", - "displaydoc", "rand 0.8.5", "rtp", "thiserror", - "webrtc-util", ] [[package]] @@ -14020,33 +20326,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" dependencies = [ "async-trait", - "bitflags", + "bitflags 1.3.2", "bytes", "cc", "ipnet", "lazy_static", "libc", "log", - "nix 0.24.1", + "nix 0.24.3", "rand 0.8.5", "thiserror", "tokio", "winapi", ] -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] - [[package]] name = "westend-runtime" version = "1.0.0" dependencies = [ + "binary-merkle-tree", "bitvec", "frame-benchmarking", "frame-election-provider-support", @@ -14064,6 +20362,8 @@ dependencies = [ "pallet-babe", "pallet-bags-list", "pallet-balances", + "pallet-beefy", + "pallet-beefy-mmr", "pallet-collective", "pallet-democracy", "pallet-election-provider-multi-phase", @@ -14076,6 +20376,7 @@ dependencies = [ "pallet-indices", "pallet-membership", "pallet-message-queue", + "pallet-mmr", "pallet-multisig", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", @@ -14103,7 +20404,7 @@ dependencies = [ "pallet-xcm", "pallet-xcm-benchmarks", "parity-scale-codec", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-primitives", "polkadot-runtime-common", "polkadot-runtime-parachains", @@ -14114,6 +20415,7 @@ dependencies = [ "serde_json", "smallvec", "sp-api", + "sp-application-crypto", "sp-authority-discovery", "sp-block-builder", "sp-consensus-babe", @@ -14129,16 +20431,17 @@ dependencies = [ "sp-session", "sp-staking", "sp-std", + "sp-storage", "sp-tracing", "sp-transaction-pool", "sp-version", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "substrate-wasm-builder", "tiny-keccak", "tokio", "westend-runtime-constants", - "xcm", - "xcm-builder", - "xcm-executor", ] [[package]] @@ -14156,20 +20459,20 @@ dependencies = [ [[package]] name = "which" -version = "4.2.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea187a8ef279bc014ec368c27a920da2024d2a711109bfbe3440585d5cf27ad9" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", - "lazy_static", "libc", + "once_cell", ] [[package]] name = "wide" -version = "0.7.6" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feff0a412894d67223777b6cc8d68c0dab06d52d95e9890d5f2d47f10dd9366c" +checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" dependencies = [ "bytemuck", "safe_arch", @@ -14177,9 +20480,9 @@ dependencies = [ [[package]] name = "widestring" -version = "0.5.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" [[package]] name = "winapi" @@ -14226,31 +20529,12 @@ dependencies = [ ] [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", -] - -[[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", + "windows-targets 0.48.5", ] [[package]] @@ -14268,7 +20552,7 @@ 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]] @@ -14288,17 +20572,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 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.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]] @@ -14309,9 +20593,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -14319,12 +20603,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -14333,9 +20611,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -14343,12 +20621,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -14357,9 +20629,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -14367,12 +20639,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -14381,9 +20647,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -14391,12 +20657,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -14405,9 +20665,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -14417,9 +20677,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -14427,12 +20687,6 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -14441,35 +20695,27 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.4.0" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deac0939bd6e4f24ab5919fbf751c97a8cfc8543bb083a305ed5c0c10bb241d1" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.7.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "winapi", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", + "cfg-if", + "windows-sys 0.48.0", ] [[package]] @@ -14494,12 +20740,13 @@ dependencies = [ [[package]] name = "x25519-dalek" -version = "2.0.0-pre.1" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5da623d8af10a62342bcbbb230e33e58a63255a58012f8653c578e54bab48df" +checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" dependencies = [ - "curve25519-dalek 3.2.0", + "curve25519-dalek 4.0.0", "rand_core 0.6.4", + "serde", "zeroize", ] @@ -14510,16 +20757,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" dependencies = [ "asn1-rs 0.3.1", - "base64 0.13.0", + "base64 0.13.1", "data-encoding", "der-parser 7.0.0", "lazy_static", "nom", "oid-registry 0.4.0", - "ring", + "ring 0.16.20", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.27", ] [[package]] @@ -14528,80 +20775,56 @@ version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" dependencies = [ - "asn1-rs 0.5.1", - "base64 0.13.0", + "asn1-rs 0.5.2", + "base64 0.13.1", "data-encoding", - "der-parser 8.1.0", + "der-parser 8.2.0", "lazy_static", "nom", "oid-registry 0.6.1", "rusticata-macros", "thiserror", - "time 0.3.17", + "time 0.3.27", ] [[package]] -name = "xcm" -version = "1.0.0" +name = "xattr" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ - "bounded-collections", - "derivative", - "hex", - "hex-literal 0.4.1", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "scale-info", - "serde", - "sp-io", - "sp-weights", - "xcm-procedural", + "libc", ] [[package]] -name = "xcm-builder" -version = "1.0.0" +name = "xcm-emulator" +version = "0.1.0" dependencies = [ - "assert_matches", + "cumulus-pallet-parachain-system", + "cumulus-primitives-core", + "cumulus-primitives-parachain-inherent", + "cumulus-test-relay-sproof-builder", "frame-support", "frame-system", "impl-trait-for-tuples", + "lazy_static", "log", "pallet-balances", - "pallet-transaction-payment", - "pallet-xcm", + "pallet-message-queue", + "parachains-common", "parity-scale-codec", - "polkadot-parachain", + "paste", + "polkadot-parachain-primitives", + "polkadot-primitives", "polkadot-runtime-parachains", - "polkadot-test-runtime", - "primitive-types", - "scale-info", - "sp-arithmetic", - "sp-io", - "sp-runtime", - "sp-std", - "sp-weights", - "xcm", - "xcm-executor", -] - -[[package]] -name = "xcm-executor" -version = "1.0.0" -dependencies = [ - "environmental", - "frame-benchmarking", - "frame-support", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", "sp-arithmetic", "sp-core", "sp-io", "sp-runtime", "sp-std", - "sp-weights", - "xcm", + "sp-tracing", + "staging-xcm", + "staging-xcm-executor", ] [[package]] @@ -14612,6 +20835,7 @@ dependencies = [ "frame-system", "futures", "pallet-xcm", + "parity-scale-codec", "polkadot-test-client", "polkadot-test-runtime", "polkadot-test-service", @@ -14620,8 +20844,8 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-tracing", - "xcm", - "xcm-executor", + "staging-xcm", + "staging-xcm-executor", ] [[package]] @@ -14631,7 +20855,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.31", ] [[package]] @@ -14642,13 +20866,13 @@ dependencies = [ "parity-scale-codec", "paste", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-parachains", "sp-io", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", ] [[package]] @@ -14664,7 +20888,7 @@ dependencies = [ "pallet-xcm", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-parachains", "scale-info", "sp-core", @@ -14672,9 +20896,9 @@ dependencies = [ "sp-runtime", "sp-std", "sp-tracing", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "xcm-simulator", ] @@ -14691,16 +20915,16 @@ dependencies = [ "pallet-xcm", "parity-scale-codec", "polkadot-core-primitives", - "polkadot-parachain", + "polkadot-parachain-primitives", "polkadot-runtime-parachains", "scale-info", "sp-core", "sp-io", "sp-runtime", "sp-std", - "xcm", - "xcm-builder", - "xcm-executor", + "staging-xcm", + "staging-xcm-builder", + "staging-xcm-executor", "xcm-simulator", ] @@ -14726,11 +20950,11 @@ checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] name = "yasna" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aed2e7a52e3744ab4d0c05c20aa065258e84c49fd4226f5191b2ed29712710b4" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ - "time 0.3.17", + "time 0.3.27", ] [[package]] @@ -14744,14 +20968,13 @@ dependencies = [ [[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 1.0.109", - "synstructure", + "syn 2.0.31", ] [[package]] @@ -14782,11 +21005,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.3+zstd.1.5.2" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" dependencies = [ - "zstd-safe 6.0.5+zstd.1.5.4", + "zstd-safe 6.0.6", ] [[package]] @@ -14801,9 +21024,9 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.5+zstd.1.5.4" +version = "6.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" dependencies = [ "libc", "zstd-sys", diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index 942d1755ac..1ed5d98191 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -3,19 +3,20 @@ , protobuf , rocksdb , rustPlatform +, rustc-wasm32 , stdenv , Security , SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "paritytech"; - repo = "polkadot"; - rev = "v${version}"; - hash = "sha256-izm0rpLzwlhpp3dciQ1zj1boWxhgGnNMG5ceZoZQGEE="; + repo = "polkadot-sdk"; + rev = "polkadot-v${version}"; + hash = "sha256-B9egLeXZ6xGJ5g5+A9KXYGdesN5Gkrr2qQJe/7hwB5I="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -31,48 +32,41 @@ rustPlatform.buildRustPackage rec { ''; }; + preBuild = '' + export SUBSTRATE_CLI_GIT_COMMIT_HASH=$(< .git_commit) + rm .git_commit + ''; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "binary-merkle-tree-4.0.0-dev" = "sha256-J09SHQVOLGStMGONdreI5QZlk+uNNKzWRZpGiNJ+lrk="; + "ark-secret-scalar-0.0.2" = "sha256-Nbf77KSsAjDKiFIP5kgzl23fRB+68x1EirNuZlS7jeM="; + "common-0.1.0" = "sha256-3OKBPpk0exdlV0N9rJRVIncSrkwdI8bkYL2QNsJl+sY="; + "fflonk-0.1.0" = "sha256-MNvlePHQdY8DiOq6w7Hc1pgn7G58GDTeghCKHJdUy7E="; "sub-tokens-0.1.0" = "sha256-GvhgZhOIX39zF+TbQWtTCgahDec4lQjH+NqamLFLUxM="; }; }; - # NOTE: the build process currently tries to read some files to generate - # documentation from hardcoded paths that aren't compatible with the cargo - # vendoring strategy, so we need to manually put them in their expected place. - # this should be fixed with the next polkadot release that includes - # https://github.com/paritytech/substrate/pull/14570. - postPatch = '' - FAST_UNSTAKE_DIR=$PWD/../cargo-vendor-dir/pallet-fast-unstake-4.0.0-dev - FAST_UNSTAKE_DOCIFY_DIR=$FAST_UNSTAKE_DIR/frame/fast-unstake + cargoBuildFlags = [ "-p" "polkadot" ]; - mkdir -p $FAST_UNSTAKE_DOCIFY_DIR - cp -r $FAST_UNSTAKE_DIR/src $FAST_UNSTAKE_DOCIFY_DIR - ''; + # NOTE: tests currently fail to compile due to an issue with cargo-auditable + # and resolution of features flags, potentially related to this: + # https://github.com/rust-secure-code/cargo-auditable/issues/66 + doCheck = false; + + nativeBuildInputs = [ + rustPlatform.bindgenHook + rustc-wasm32 + rustc-wasm32.llvmPackages.lld + ]; buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - nativeBuildInputs = [ rustPlatform.bindgenHook ]; - - preBuild = '' - export SUBSTRATE_CLI_GIT_COMMIT_HASH=$(cat .git_commit) - rm .git_commit - ''; - + # NOTE: we need to force lld otherwise rust-lld is not found for wasm32 target + CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER = "lld"; PROTOC = "${protobuf}/bin/protoc"; ROCKSDB_LIB_DIR = "${rocksdb}/lib"; - # NOTE: We don't build the WASM runtimes since this would require a more - # complicated rust environment setup and this is only needed for developer - # environments. The resulting binary is useful for end-users of live networks - # since those just use the WASM blob from the network chainspec. - SKIP_WASM_BUILD = 1; - - # We can't run the test suite since we didn't compile the WASM runtimes. - doCheck = false; - meta = with lib; { description = "Polkadot Node Implementation"; homepage = "https://polkadot.network"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/quorum/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/quorum/default.nix index 1424ddc951..b50d91a07e 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/quorum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/quorum/default.nix @@ -1,41 +1,35 @@ -{ lib, fetchFromGitHub, buildGoPackage, git, which, removeReferencesTo, go }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "quorum"; - version = "2.5.0"; - - goPackagePath = "github.com/jpmorganchase/quorum"; + version = "23.4.0"; src = fetchFromGitHub { - owner = "jpmorganchase"; + owner = "Consensys"; repo = pname; rev = "v${version}"; - sha256 = "0xfdaqp9bj5dkw12gy19lxj73zh7w80j051xclsvnd41sfah86ll"; + hash = "sha256-N8MlDHo6LQ/m9xFUeOCm6bqDtjnCc86i/s4ebFLjUT0="; }; - buildInputs = [ git which ]; + vendorHash = "sha256-dTYKGFqVaAnspvKhfBU10bpSzhtQHGTm6KxnNKUVAIg="; - buildPhase = '' - cd "go/src/$goPackagePath" - make geth bootnode swarm - ''; + patches = [ + # Add missing requirements + ./go.mod.patch + ]; - installPhase = '' - mkdir -pv $out/bin - cp -v build/bin/geth build/bin/bootnode build/bin/swarm $out/bin - ''; + subPackages = [ + "cmd/geth" + "cmd/bootnode" + ]; - # fails with `GOFLAGS=-trimpath` - allowGoReference = true; - preFixup = '' - find $out -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${go} '{}' + - ''; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A permissioned implementation of Ethereum supporting data privacy"; - homepage = "https://www.goquorum.com/"; + homepage = "https://consensys.net/quorum/"; license = licenses.lgpl3; maintainers = with maintainers; [ mmahut ]; - platforms = subtractLists ["aarch64-linux"] platforms.linux; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/quorum/go.mod.patch b/third_party/nixpkgs/pkgs/applications/blockchains/quorum/go.mod.patch new file mode 100644 index 0000000000..7161371ac6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/quorum/go.mod.patch @@ -0,0 +1,12 @@ +diff --git a/go.mod b/go.mod +index ace412f41..3336c1e08 100644 +--- a/go.mod ++++ b/go.mod +@@ -89,6 +89,7 @@ require ( + golang.org/x/text v0.3.7 + golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 + google.golang.org/grpc v1.46.0 ++ google.golang.org/protobuf v1.28.0 + gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c + gopkg.in/karalabe/cookiejar.v2 v2.0.0-20150724131613-8dcd6a7f4951 + gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/snarkos/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/snarkos/default.nix index 81fea464eb..080cc4b5c1 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/snarkos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/snarkos/default.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "snarkos"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "AleoHQ"; repo = "snarkOS"; rev = "v${version}"; - sha256 = "sha256-S79u9jAtYHsCFwvhNTRKrQL/CUBrzt8twx4mzwNtxhs="; + sha256 = "sha256-kW41SNbl2vckgUth+BZ6/aM03aT6MFeY4Hwi9OVWtTI="; }; - cargoHash = "sha256-cDyViA3TuUoQsU9OnEF3UDgwQhPhgg4mTcqDy2VIA9c="; + cargoHash = "sha256-znEAb4q9H0Doc+XYCf27hV/z2t74kjQUffl/aJzW6tI="; # buildAndTestSubdir = "cli"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/default.nix index 1733298ac1..be6b93407a 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/sparrow/default.nix @@ -21,11 +21,11 @@ let pname = "sparrow"; - version = "1.7.8"; + version = "1.7.9"; src = fetchurl { url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz"; - sha256 = "0nazqxffmai74x47dbkwryvx1pjm8k85rcfz5nr19h7fa1bj8rkc"; + sha256 = "0bz8mx6mszqadx7nlb4ini45r2r57grdgmrq6k9lxgrgcpd8gasy"; }; launcher = writeScript "sparrow" '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix index 53b0de40cb..6d3359cdcd 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stellar-core"; - version = "19.13.0"; + version = "19.14.0"; src = fetchFromGitHub { owner = "stellar"; repo = "stellar-core"; rev = "v${finalAttrs.version}"; - hash = "sha256-C775tL+x1IX4kfCM/7gOg/V8xunq/rkhIfdkwkhLENk="; + hash = "sha256-lxBn/T01Tsa7tid3mRJUigUwv9d3BAPZhV9Mp1lywBU="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix index 67c02e299e..c56e6da52f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/trezor-suite/default.nix @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; - sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' + hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' aarch64-linux = "sha512-+dcogzj0mENWSAVKqUG/xyF+TD/nKpA3UiNyI2M7iiCaW+tpwO5Y0uUmzb1rFRtDsKMflDPZNWe8qMJmrtaIrA=="; x86_64-linux = "sha512-8UyPa3hDmALiYGao451ZBQLxv9H9OLbzzHiANp4zgvjBLGNhZnPFBIYM6KGyKkgRJJiTcgd7VHCgEhPpfm0qzg=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix index 72865deb11..d6315d233b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -3,24 +3,18 @@ , makeWrapper , fetchurl , makeDesktopItem -, curl -, dotnetCorePackages , lttng-ust_2_12 , fontconfig -, krb5 , openssl , xorg , zlib }: let - dotnet-runtime = dotnetCorePackages.runtime_6_0; # These libraries are dynamically loaded by the application, # and need to be present in LD_LIBRARY_PATH runtimeLibs = [ - curl fontconfig.lib - krb5 openssl stdenv.cc.cc.lib xorg.libX11 @@ -31,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-RlWaeOK6XqxyCIQQp1/X6iG9t7f3ER5K+S3ZvPg6wBg="; + sha256 = "sha256-VYyf9rKBRPpnxuaeO6aAq7cQwDfBRLRbH4SlPS+bxFQ="; }; dontBuild = true; @@ -58,8 +52,10 @@ stdenv.mkDerivation rec { mkdir -p $out/opt/${pname} $out/bin $out/share/applications cp -Rv . $out/opt/${pname} - makeWrapper "${dotnet-runtime}/bin/dotnet" "$out/bin/${pname}" \ - --add-flags "$out/opt/${pname}/WalletWasabi.Fluent.Desktop.dll" \ + makeWrapper "$out/opt/${pname}/wassabee" "$out/bin/${pname}" \ + --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" + + makeWrapper "$out/opt/${pname}/wassabeed" "$out/bin/${pname}d" \ --suffix "LD_LIBRARY_PATH" : "${lib.makeLibraryPath runtimeLibs}" cp -v $desktopItem/share/applications/* $out/share/applications diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/gtkgreet.nix b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/gtkgreet.nix index 39beea377e..cc78e87584 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/gtkgreet.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/gtkgreet.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromSourcehut +, wrapGAppsHook , pkg-config , cmake , meson @@ -8,6 +9,7 @@ , gtk3 , gtk-layer-shell , json_c +, librsvg , scdoc }: @@ -27,6 +29,7 @@ stdenv.mkDerivation rec { meson ninja cmake + wrapGAppsHook ]; buildInputs = [ @@ -34,6 +37,7 @@ stdenv.mkDerivation rec { gtk-layer-shell json_c scdoc + librsvg ]; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lemurs/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lemurs/default.nix index 9973099b1f..a83b6c2714 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/lemurs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/lemurs/default.nix @@ -3,19 +3,21 @@ lib, linux-pam, rustPlatform, + testers, + lemurs, }: rustPlatform.buildRustPackage rec { pname = "lemurs"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "coastalwhite"; repo = "lemurs"; rev = "v${version}"; - hash = "sha256-6mNSLEWafw8yDGnemOhEiK8FTrBC+6+PuhlbOXTGmN0="; + hash = "sha256-YDopY+wdWlVL2X+/wc1tLSSqFclAkt++JXMK3VodD4s="; }; - cargoHash = "sha256-nfUBC1HSs7PcIbD7MViJFkfFAPda83XbAupNeShfwOs="; + cargoHash = "sha256-uuHPJe+1VsnLRGbHtgTMrib6Tk359cwTDVfvtHnDToo="; # Fixes a lock issue preConfigure = "cargo update --offline"; @@ -24,10 +26,15 @@ rustPlatform.buildRustPackage rec { linux-pam ]; + passthru.tests.version = testers.testVersion { + package = lemurs; + }; + meta = with lib; { description = "A customizable TUI display/login manager written in Rust"; homepage = "https://github.com/coastalwhite/lemurs"; license = with licenses; [asl20 mit]; maintainers = with maintainers; [jeremiahs]; + mainProgram = "lemurs"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix index 53f004c2a3..bb70fa299d 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, linkFarm, lightdm-tiny-greeter, fetchFromGitHub -, pkg-config, lightdm, gtk3, glib, wrapGAppsHook, conf ? "" }: +, pkg-config, lightdm, gtk3, glib, wrapGAppsHook, config, conf ? config.lightdm-tiny-greeter.conf or "" }: stdenv.mkDerivation rec { pname = "lightdm-tiny-greeter"; diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/sddm/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/sddm/default.nix index 04826274bb..94550f69d9 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/sddm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/sddm/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub +{ mkDerivation, lib, fetchFromGitHub, fetchpatch , cmake, extra-cmake-modules, pkg-config, qttools , libxcb, libXau, pam, qtbase, qtdeclarative, qtquickcontrols2, systemd, xkeyboardconfig }: @@ -16,6 +16,25 @@ mkDerivation rec { patches = [ ./sddm-ignore-config-mtime.patch ./sddm-default-session.patch + + # FIXME: all of the following are Wayland related backports, drop in next release + # Don't use Qt virtual keyboard on Wayland + (fetchpatch { + url = "https://github.com/sddm/sddm/commit/07631f2ef00a52d883d0fd47ff7d1e1a6bc6358f.patch"; + hash = "sha256-HTSw3YeT4z9ldr4sLmsnrPQ+LA8/a6XxrF+KUFqXUlM="; + }) + + # Fix running sddm-greeter manually in Wayland sessions + (fetchpatch { + url = "https://github.com/sddm/sddm/commit/e27b70957505dc7b986ab2fa68219af546c63344.patch"; + hash = "sha256-6hzrFeS2epL9vzLOA29ZA/dD3Jd4rPMBHhNp+FBq1bA="; + }) + + # Prefer GreeterEnvironment over PAM environment + (fetchpatch { + url = "https://github.com/sddm/sddm/commit/9e7791d5fb375933d20f590daba9947195515b26.patch"; + hash = "sha256-JNsVTJNZV6T+SPqPkaFf3wg8NDqXGx8NZ4qQfZWOli4="; + }) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix index e71677c130..ccabb6b119 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/default.nix @@ -10,16 +10,16 @@ let inherit tiling_wm; }; stableVersion = { - version = "2022.3.1.18"; # "Android Studio Giraffe (2022.3.1)" - sha256Hash = "sha256-JCFeEySmrJEYELLMGvstc1z3Rd+8BpGKQrjW+8a/dDM="; + version = "2022.3.1.19"; # "Android Studio Giraffe (2022.3.1)" + sha256Hash = "sha256-JQYl3KsYPgxo6/Eu+KUir3NpUn128e/HBPk8BbAv+p4="; }; betaVersion = { - version = "2022.3.1.17"; # "Android Studio Giraffe (2022.3.1) RC 1" - sha256Hash = "sha256-Bpur9ytiwa0udiyYVxlfLT4M+ZcO5atQUQg/ForATP4="; + version = "2023.1.1.17"; # "Android Studio Hedgehog (2023.3.1)" + sha256Hash = "sha256-0sN+B1RxxlbgxXrEs8gft4qjvIYtazJS6DllHZ2h768="; }; latestVersion = { - version = "2023.1.1.14"; # Android Studio Hedgehog (2023.1.1) Canary 14 - sha256Hash = "sha256-MgZDUpRyM0XDfgqfYjtJJyG2CBaNB06PgtoJltDwNwk="; + version = "2023.2.1.1"; # Android Studio Iguana (2023.2.1) Canary 1 + sha256Hash = "sha256-7ub9GkJd9J37nG2drXOuU7r4w/gI+m9nlWANqIk2ddk="; }; in { # Attributes are named by their corresponding release channels diff --git a/third_party/nixpkgs/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch b/third_party/nixpkgs/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch deleted file mode 100644 index 94c70da276..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/aseprite/allegro-glibc-2.30.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt -index 4909ff1..02fa145 100644 ---- a/src/she/CMakeLists.txt -+++ b/src/she/CMakeLists.txt -@@ -23,2 +23,3 @@ if(USE_ALLEG4_BACKEND) - add_definitions(-DUSE_MOUSE_POLLER) -+ add_definitions(-DALLEGRO_NO_FIX_ALIASES) - endif() diff --git a/third_party/nixpkgs/pkgs/applications/editors/aseprite/default.nix b/third_party/nixpkgs/pkgs/applications/editors/aseprite/default.nix index 58342ab139..36415d076d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/aseprite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/aseprite/default.nix @@ -1,8 +1,7 @@ -{ stdenv, lib, callPackage, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config +{ stdenv, lib, callPackage, fetchFromGitHub, cmake, ninja, pkg-config , curl, freetype, giflib, libjpeg, libpng, libwebp, pixman, tinyxml, zlib , harfbuzzFull, glib, fontconfig, pcre -, libX11, libXext, libXcursor, libXxf86vm, libGL -, unfree ? false +, libX11, libXext, libXcursor, libXxf86vm, libGL, libXi , cmark }: @@ -15,46 +14,35 @@ let in stdenv.mkDerivation rec { pname = "aseprite"; - version = if unfree then "1.2.16.3" else "1.1.7"; + version = "1.2.40"; src = fetchFromGitHub { owner = "aseprite"; repo = "aseprite"; rev = "v${version}"; fetchSubmodules = true; - sha256 = if unfree - then "16yn7y9xdc5jd50cq7bmsm320gv23pp71lr8hg2nmynzc8ibyda8" - else "0gd49lns2bpzbkwax5jf9x1xmg1j8ij997kcxr2596cwiswnw4di"; + hash = "sha256-KUdJA6HTAKrLT8xrwFikVDbc5RODysclcsEyQekMRZo="; }; nativeBuildInputs = [ - cmake pkg-config - ] ++ lib.optionals unfree [ ninja ]; + cmake pkg-config ninja + ]; buildInputs = [ curl freetype giflib libjpeg libpng libwebp pixman tinyxml zlib libX11 libXext libXcursor libXxf86vm - ] ++ lib.optionals unfree [ cmark harfbuzzFull glib fontconfig pcre - skia libGL + skia libGL libXi ]; - patches = if !unfree then [ - ./allegro-glibc-2.30.patch - ] else [ - (fetchpatch { - url = "https://github.com/lfont/aseprite/commit/f1ebc47012d3fed52306ed5922787b4b98cc0a7b.patch"; - sha256 = "03xg7x6b9iv7z18vzlqxhcfphmx4v3qhs9f5rgf38ppyklca5jyw"; - }) - (fetchpatch { - url = "https://github.com/orivej/aseprite/commit/ea87e65b357ad0bd65467af5529183b5a48a8c17.patch"; - sha256 = "1vwn8ivap1pzdh444sdvvkndp55iz146nhmd80xbm8cyzn3qmg91"; - }) + patches = [ + ./shared-libwebp.patch + ./shared-skia-deps.patch ]; postPatch = '' - sed -i src/config.h -e "s-\\(#define VERSION\\) .*-\\1 \"$version\"-" + sed -i src/ver/CMakeLists.txt -e "s-set(VERSION \".*\")-set(VERSION \"$version\")-" ''; cmakeFlags = [ @@ -68,20 +56,19 @@ stdenv.mkDerivation rec { "-DUSE_SHARED_PIXMAN=ON" "-DUSE_SHARED_TINYXML=ON" "-DUSE_SHARED_ZLIB=ON" - "-DWITH_DESKTOP_INTEGRATION=ON" - "-DWITH_WEBP_SUPPORT=ON" - ] ++ lib.optionals unfree [ "-DUSE_SHARED_CMARK=ON" "-DUSE_SHARED_HARFBUZZ=ON" - # Aseprite needs internal freetype headers. - "-DUSE_SHARED_FREETYPE=OFF" + "-DUSE_SHARED_WEBP=ON" # Disable libarchive programs. "-DENABLE_CAT=OFF" "-DENABLE_CPIO=OFF" "-DENABLE_TAR=OFF" # UI backend. + "-DLAF_WITH_EXAMPLES=OFF" "-DLAF_OS_BACKEND=skia" + "-DENABLE_DESKTOP_INTEGRATION=ON" "-DSKIA_DIR=${skia}" + "-DSKIA_LIBRARY_DIR=${skia}/out/Release" ]; postInstall = '' @@ -101,7 +88,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.aseprite.org/"; description = "Animated sprite editor & pixel art tool"; - license = if unfree then licenses.unfree else licenses.gpl2; + license = licenses.unfree; longDescription = ''Aseprite is a program to create animated sprites. Its main features are: @@ -115,8 +102,7 @@ stdenv.mkDerivation rec { - Multiple editors support. - Pixel-art specific tools like filled Contour, Polygon, Shading mode, etc. - Onion skinning. - '' + lib.optionalString unfree - '' + This version is not redistributable: https://dev.aseprite.org/2016/09/01/new-source-code-license/ Consider supporting the developer: https://aseprite.org/#buy ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/aseprite/shared-libwebp.patch b/third_party/nixpkgs/pkgs/applications/editors/aseprite/shared-libwebp.patch new file mode 100644 index 0000000000..20191f46b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/aseprite/shared-libwebp.patch @@ -0,0 +1,47 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index af077f6..fed17ff 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -58,6 +58,7 @@ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off) + option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) + option(USE_SHARED_FREETYPE "Use shared FreeType library" off) + option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off) ++option(USE_SHARED_WEBP "Use your installed copy of webp" off) + option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on) + option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off) + option(ENABLE_NEWS "Enable the news in Home tab" on) +@@ -328,14 +351,17 @@ add_subdirectory(laf) + # libwebp + if(ENABLE_WEBP) + # Use libwebp from Skia +- if(LAF_BACKEND STREQUAL "skia") ++ if(USE_SHARED_WEBP) ++ find_library(WEBP_LIBRARY NAMES webp) ++ find_library(WEBPDEMUX_LIBRARY NAMES webpdemux) ++ find_library(WEBPMUX_LIBRARY NAMES webpmux) ++ set(WEBP_LIBRARIES ${WEBP_LIBRARY} ${WEBPDEMUX_LIBRARY} ${WEBPMUX_LIBRARY}) ++ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp) ++ else() + find_library(WEBP_LIBRARIES webp + NAMES libwebp # required for Windows + PATHS "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) + set(WEBP_INCLUDE_DIR "${SKIA_DIR}/third_party/externals/libwebp/src") +- else() +- set(WEBP_LIBRARIES webp webpdemux libwebpmux) +- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) + endif() + include_directories(${WEBP_INCLUDE_DIR}) + endif() +diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt +index 4839d4097c..e8c3e83cbc 100644 +--- a/third_party/CMakeLists.txt ++++ b/third_party/CMakeLists.txt +@@ -32,7 +32,7 @@ if(NOT USE_SHARED_GIFLIB) + add_subdirectory(giflib) + endif() + +-if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia") ++if(ENABLE_WEBP AND NOT LAF_BACKEND STREQUAL "skia" AND NOT USE_SHARED_WEBP) + set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.") + add_subdirectory(libwebp) + endif() \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/editors/aseprite/shared-skia-deps.patch b/third_party/nixpkgs/pkgs/applications/editors/aseprite/shared-skia-deps.patch new file mode 100644 index 0000000000..a6ab472bbe --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/aseprite/shared-skia-deps.patch @@ -0,0 +1,21 @@ +--- src/laf/cmake/FindSkia.cmake.orig 2022-01-08 02:15:13.417619266 +0100 ++++ src/laf/cmake/FindSkia.cmake 2022-01-08 02:15:43.603960491 +0100 +@@ -32,14 +32,18 @@ + # SkShaper module + freetype + harfbuzz + find_library(SKSHAPER_LIBRARY skshaper PATH "${SKIA_LIBRARY_DIR}") + ++if(NOT USE_SHARED_FREETYPE) + set(FREETYPE_FOUND ON) + find_library(FREETYPE_LIBRARY freetype2 PATH "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) + set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY}) + set(FREETYPE_INCLUDE_DIRS "${SKIA_DIR}/third_party/externals/freetype/include") ++endif() + ++if(NOT USE_SHARED_HARFBUZZ) + find_library(HARFBUZZ_LIBRARY harfbuzz PATH "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) + set(HARFBUZZ_LIBRARIES ${HARFBUZZ_LIBRARY}) + set(HARFBUZZ_INCLUDE_DIRS "${SKIA_DIR}/third_party/externals/harfbuzz/src") ++endif() + + set(SKIA_LIBRARIES + ${SKIA_LIBRARY} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/editors/aseprite/skia-deps.nix b/third_party/nixpkgs/pkgs/applications/editors/aseprite/skia-deps.nix index e5655ca831..3c92c649be 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/aseprite/skia-deps.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/aseprite/skia-deps.nix @@ -2,13 +2,13 @@ { angle2 = fetchgit { url = "https://chromium.googlesource.com/angle/angle.git"; - rev = "956ab4d9fab36be9929e63829475d4d69b2c681c"; - sha256 = "0fcw04wwkn3ixr9l9k0d32n78r9g72p31ii9i5spsq2d0wlylr38"; + rev = "8718783526307a3fbb35d4c1ad4e8101262a0d73"; + sha256 = "0c90q8f4syvwcayw58743sa332dcpkmblwh3ffkjqn5ygym04xji"; }; dng_sdk = fetchgit { url = "https://android.googlesource.com/platform/external/dng_sdk.git"; - rev = "96443b262250c390b0caefbf3eed8463ba35ecae"; - sha256 = "1rsr7njhj7c5p87hfznj069fdc3qqhvvnq9sa2rb8c4q849rlzx6"; + rev = "c8d0c9b1d16bfda56f15165d39e0ffa360a11123"; + sha256 = "1nlq082aij7q197i5646bi4vd2il7fww6sdwhqisv2cs842nyfwm"; }; piex = fetchgit { url = "https://android.googlesource.com/platform/external/piex.git"; @@ -17,7 +17,7 @@ }; sfntly = fetchgit { url = "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git"; - rev = "b18b09b6114b9b7fe6fc2f96d8b15e8a72f66916"; - sha256 = "0zf1h0dibmm38ldypccg4faacvskmd42vsk6zbxlfcfwjlqm6pp4"; + rev = "b55ff303ea2f9e26702b514cf6a3196a2e3e2974"; + sha256 = "1qi5rfzmwfrji46x95g6dsb03i1v26700kifl2hpgm3pqhr7afpz"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/aseprite/skia-make-deps.sh b/third_party/nixpkgs/pkgs/applications/editors/aseprite/skia-make-deps.sh index 5e12c4f5c8..bee69cc40d 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/aseprite/skia-make-deps.sh +++ b/third_party/nixpkgs/pkgs/applications/editors/aseprite/skia-make-deps.sh @@ -2,7 +2,7 @@ FILTER=$1 OUT=skia-deps.nix -REVISION=89e4ca4352d05adc892f5983b108433f29b2c0c2 +REVISION=861e4743af6d9bf6077ae6dda7274e5a136ee4e2 DEPS=$(curl -s https://raw.githubusercontent.com/aseprite/skia/$REVISION/DEPS) THIRD_PARTY_DEPS=$(echo "$DEPS" | grep third_party | grep "#" -v | sed 's/"//g') diff --git a/third_party/nixpkgs/pkgs/applications/editors/aseprite/skia.nix b/third_party/nixpkgs/pkgs/applications/editors/aseprite/skia.nix index 2de61c7e20..71fa62157d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/aseprite/skia.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/aseprite/skia.nix @@ -1,37 +1,29 @@ -{ stdenv, lib, fetchFromGitHub, fetchgit, python2, gn, ninja +{ stdenv, lib, fetchFromGitHub, fetchgit, python3, gn, ninja , fontconfig, expat, icu58, libglvnd, libjpeg, libpng, libwebp, zlib -, mesa, libX11 +, mesa, libX11, harfbuzzFull }: let # skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly' depSrcs = import ./skia-deps.nix { inherit fetchgit; }; - gnOld = gn.overrideAttrs (oldAttrs: rec { - version = "20190403"; - src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "64b846c96daeb3eaf08e26d8a84d8451c6cb712b"; - sha256 = "1v2kzsshhxn0ck6gd5w16gi2m3higwd9vkyylmsczxfxnw8skgpy"; - }; - }); in stdenv.mkDerivation { pname = "skia"; - version = "aseprite-m71"; + version = "aseprite-m102"; src = fetchFromGitHub { owner = "aseprite"; repo = "skia"; - # latest commit from aseprite-m71 branch - rev = "89e4ca4352d05adc892f5983b108433f29b2c0c2"; # TODO: Remove the gnOld override - sha256 = "0n3vrkswvi6rib9zv2pzi18h3j5wm7flmgkgaikcm6q7iw4l2c7x"; + # latest commit from aseprite-m102 branch + rev = "861e4743af6d9bf6077ae6dda7274e5a136ee4e2"; + hash = "sha256-IlZbalmHl549uDUfPG8hlzub8TLWhG0EsV6HVAPdsl0="; }; - nativeBuildInputs = [ python2 gnOld ninja ]; + nativeBuildInputs = [ python3 gn ninja ]; buildInputs = [ fontconfig expat icu58 libglvnd libjpeg libpng libwebp zlib - mesa libX11 + mesa libX11 harfbuzzFull ]; preConfigure = with depSrcs; '' @@ -44,13 +36,13 @@ stdenv.mkDerivation { configurePhase = '' runHook preConfigure - gn gen out/Release --args="is_debug=false is_official_build=true" + gn gen out/Release --args="is_debug=false is_official_build=true extra_cflags=[\"-I${harfbuzzFull.dev}/include/harfbuzz\"]" runHook postConfigure ''; buildPhase = '' runHook preBuild - ninja -C out/Release skia + ninja -C out/Release skia modules runHook postBuild ''; @@ -69,8 +61,11 @@ stdenv.mkDerivation { include/gpu \ include/private \ include/utils \ + include/third_party/skcms/*.h \ out/Release/*.a \ src/gpu/**/*.h \ + src/core/*.h \ + modules/skshaper/include/*.h \ third_party/externals/angle2/include \ third_party/skcms/**/*.h ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/atom/default.nix b/third_party/nixpkgs/pkgs/applications/editors/atom/default.nix deleted file mode 100644 index 29c4bb6c88..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/atom/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ lib, stdenv, pkgs, fetchurl, wrapGAppsHook, glib, gtk3, atomEnv }: - -let - versions = { - atom = { - version = "1.60.0"; - sha256 = "sha256-XHwCWQYrnUkR0lN7/Or/Uxb53hEWmIQKkNfNSX34kaY="; - }; - - atom-beta = { - version = "1.61.0"; - beta = 0; - sha256 = "sha256-viY/is7Nh3tlIkHhUBWtgMAjD6HDiC0pyJpUjsP5pRY="; - broken = true; - }; - }; - - common = pname: {version, sha256, beta ? null, broken ? false}: - let fullVersion = version + lib.optionalString (beta != null) "-beta${toString beta}"; - name = "${pname}-${fullVersion}"; - in stdenv.mkDerivation { - inherit name; - version = fullVersion; - - src = fetchurl { - url = "https://github.com/atom/atom/releases/download/v${fullVersion}/atom-amd64.deb"; - name = "${name}.deb"; - inherit sha256; - }; - - nativeBuildInputs = [ - wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system - ]; - - buildInputs = [ - gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed - ]; - - dontBuild = true; - dontConfigure = true; - - unpackPhase = '' - ar p $src data.tar.xz | tar xJ ./usr/ - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - mv usr/bin usr/share $out - rm -rf $out/share/lintian - - runHook postInstall - ''; - - preFixup = '' - gappsWrapperArgs+=( - # needed for gio executable to be able to delete files - --prefix "PATH" : "${glib.bin}/bin" - ) - ''; - - postFixup = '' - share=$out/share/${pname} - - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:$share" \ - $share/atom - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}" \ - $share/resources/app/apm/bin/node - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $share/resources/app.asar.unpacked/node_modules/symbols-view/vendor/ctags-linux - - dugite=$share/resources/app.asar.unpacked/node_modules/dugite - rm -f $dugite/git/bin/git - ln -s ${pkgs.git}/bin/git $dugite/git/bin/git - rm -f $dugite/git/libexec/git-core/git - ln -s ${pkgs.git}/bin/git $dugite/git/libexec/git-core/git - - find $share -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$share" {} \; - - sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/share/applications/${pname}.desktop - ''; - - meta = with lib; { - description = "A hackable text editor for the 21st Century"; - homepage = "https://atom.io/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; - maintainers = with maintainers; [ offline ysndr ]; - platforms = platforms.x86_64; - inherit broken; - }; - }; -in lib.mapAttrs common versions diff --git a/third_party/nixpkgs/pkgs/applications/editors/atom/env.nix b/third_party/nixpkgs/pkgs/applications/editors/atom/env.nix deleted file mode 100644 index a5ca5775aa..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/atom/env.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, lib, zlib, glib, alsa-lib, dbus, gtk3, atk, pango, freetype, fontconfig -, gdk-pixbuf, cairo, cups, expat, libgpg-error, nspr -, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk -, at-spi2-core, libdbusmenu, libdrm, mesa -}: - -let - packages = [ - stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype - fontconfig gdk-pixbuf cairo cups expat libgpg-error alsa-lib nspr nss - xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst - xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr - xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify - xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu - libdrm - mesa # required for libgbm - ]; - - libPathNative = lib.makeLibraryPath packages; - libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; - libPath = "${libPathNative}:${libPath64}"; - -in { inherit packages libPath; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix index 008ff8196d..6a5d3cbd1f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/bluefish/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, intltool , wrapGAppsHook , pkg-config , gtk @@ -14,14 +13,14 @@ stdenv.mkDerivation rec { pname = "bluefish"; - version = "2.2.12"; + version = "2.2.14"; src = fetchurl { url = "mirror://sourceforge/bluefish/bluefish-${version}.tar.bz2"; - sha256 = "0slyjx4b4l612505q02crk00pjg9d5wi8gm5gxvcs0f6l9dr1y8d"; + sha256 = "sha256-IszfnOTlyWIQY+bPfXOr+wc2q3pyvOCG0Gxc9e4SXt4="; }; - nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gnome.adwaita-icon-theme gtk diff --git a/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix index 511928d143..a90cfba529 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/bluej/default.nix @@ -1,32 +1,20 @@ -{ lib, stdenv, fetchurl, openjdk, glib, wrapGAppsHook }: +{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "bluej"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder # to unpack than the deb. url = "https://www.bluej.org/download/files/BlueJ-linux-${builtins.replaceStrings ["."] [""] version}.deb"; - sha256 = "sha256-tOb15wU9OjUt0D8l/JkaGYj84L7HV4FUnQQB5cRAxG0="; + sha256 = "sha256-sOT86opMa9ytxJlfURIsD06HiP+j+oz3lQ0DqmLV1wE="; }; - nativeBuildInputs = [ wrapGAppsHook ]; + nativeBuildInputs = [ dpkg wrapGAppsHook ]; buildInputs = [ glib ]; - sourceRoot = "."; - - preUnpack = '' - unpackCmdHooks+=(_tryDebData) - _tryDebData() { - if ! [[ "$1" =~ \.deb$ ]]; then return 1; fi - ar xf "$1" - if ! [[ -e data.tar.xz ]]; then return 1; fi - unpackFile data.tar.xz - } - ''; - dontWrapGApps = true; installPhase = '' @@ -35,11 +23,15 @@ stdenv.mkDerivation rec { mkdir -p $out cp -r usr/* $out + rm -r $out/share/bluej/jdk + rm -r $out/share/bluej/javafx + rm -r $out/share/bluej/javafx-*.jar + makeWrapper ${openjdk}/bin/java $out/bin/bluej \ "''${gappsWrapperArgs[@]}" \ --add-flags "-Dawt.useSystemAAFontSettings=on -Xmx512M \ --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED \ - -jar $out/share/bluej/bluej.jar" + -cp $out/share/bluej/boot.jar bluej.Boot" runHook postInstall ''; @@ -49,6 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://www.bluej.org/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2ClasspathPlus; + mainProgram = pname; maintainers = with maintainers; [ chvp ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/bviplus/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bviplus/default.nix index f56fe637f8..1cffe049c7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/bviplus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/bviplus/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://bviplus.sourceforge.net"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/codux/default.nix b/third_party/nixpkgs/pkgs/applications/editors/codux/default.nix index ff068b2593..207c3cf0bb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/codux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/codux/default.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.6.1"; + version = "15.10.0"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-a8zv5pVtS80J2PTrUiW8AA3rJ+rPAAzaaT5DVBLK5JE="; + sha256 = "sha256-lz1dDbYq7aTGQoED07K8I9E0/XsnSlPL81/4W8Vix3E="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; @@ -30,6 +30,6 @@ appimageTools.wrapType2 rec { homepage = "https://www.codux.com"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ dit7ya ]; + maintainers = with maintainers; [ dit7ya kashw2 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix index 38c553d160..9eed461413 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.197.0"; + version = "1.200.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - hash = "sha256-960Ucp2iNDqK2n/sJSIyMWxgCCs0LVyafn8SRRhli4c="; + hash = "sha256-0+bjp9JOR06wLzA3CJqtGjCK1M0qPdzoLRt6+fV8tJ0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json index a76a1c80c4..52a333495e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2023.08.12", - "hash": "sha256-YBIuwiHE83mxxtl9PNrQN3LrEBFHvYY74zhV+UtAbZ4=" + "rev": "2023.10.02", + "hash": "sha256-9oV8xqkqpCfA7rk4UMxWFBIFQQ9slClFbaENRldFb8Q=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2023.08.12", - "hash": "sha256-hFDWb7gMQiTkItFC5KfSrpAW3FSkmAhxcc5GOdov3EE=" + "rev": "2023.10.03", + "hash": "sha256-dJYpsvJNwQg6/NeXT23cpWFXwcfIYnWkHYoDItiUeOo=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,18 +26,18 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2023.05.31", - "hash": "sha256-sejyNiPmTboP6HlXao+RaMaEf67tAv4mXDHVkkMErPE=" + "rev": "2023.08.18", + "hash": "sha256-X/KFQfLAnbcquLSsOk0ve0X5SzoEgEG0q0JY4TuQXpY=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2023.08.12", - "hash": "sha256-cEu8qkmcsNwrLR5t3bfMHI9fd3wmAq/dI/iRM4I4wmQ=" + "rev": "2023.10.02", + "hash": "sha256-mn+mTZZyDkc7P7w1PG/rDgp+rpXC3dahoiRk+DUDMHQ=" }, "Python-for-Lazarus": { "owner": "Alexey-T", - "rev": "2023.05.15", - "hash": "sha256-8dWitKZB4nLcJ3fIN40jfNnyAGcRPLfA0iKNZ0zWFWo=" + "rev": "2023.06.29", + "hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc=" }, "Emmet-Pascal": { "owner": "Alexey-T", @@ -51,7 +51,7 @@ }, "bgrabitmap": { "owner": "bgrabitmap", - "rev": "v11.5.5", - "hash": "sha256-M4ql+9zk5AJfmmHb9EG0PsJZGWcMm9/Y0lrPQqnKqcU=" + "rev": "v11.5.6", + "hash": "sha256-7TuHCCaH8/RxiVQmDILPW4T6op/XW6djwA5iSh/Yb5w=" } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/dit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/dit/default.nix index 170019d273..90502172fa 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/dit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/dit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dit"; - version = "0.7"; + version = "0.9"; src = fetchurl { url = "https://hisham.hm/dit/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "0cmbyzqfz2qa83cg8lpjifn34wmx34c5innw485zh4vk3c0k8wlj"; + hash = "sha256-p1uD0Q2kqB40fbAEk7/fdOVg9T7SW+2aACSn7hDAD+E="; }; buildInputs = [ ncurses lua ] diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix index 686ec36811..fb02345379 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix @@ -6,19 +6,18 @@ , callPackage }: -# https://download.eclipse.org/eclipse/downloads/ is the main place to -# find the downloads needed for new versions +# use ./update.sh to help with updating for each quarterly release # -# to test: +# then, to test: # for e in cpp modeling platform sdk java jee committers rcp; do for s in pkgs pkgsCross.aarch64-multiplatform; do echo; echo $s $e; nix build -f default.nix ${s}.eclipses.eclipse-${e} -o eclipse-${s}-${e}; done; done let platform_major = "4"; - platform_minor = "27"; + platform_minor = "28"; year = "2023"; - month = "03"; #release month - buildmonth = "03"; #sometimes differs from release month - timestamp = "${year}${buildmonth}020300"; + month = "06"; #release month + buildmonth = "06"; #sometimes differs from release month + timestamp = "${year}${buildmonth}050440"; gtk = gtk3; arch = if stdenv.hostPlatform.isx86_64 then "x86_64" @@ -44,8 +43,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-cpp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-MBng3ETarHMlUUPpVvMIZxVqpe9JW5xNHonnN6CHRcw="; - aarch64 = "sha256-7FgpPzp5MY/fB6Q/wvrvi+Lpcm3tmH7bUTLh7q2Rjek="; + x86_64 = "sha256-0VFg68+M84SEPbLv2f3hNTK1tvUjN3u0X3DYFCMAFX8="; + aarch64 = "sha256-K1e1Q//X+R4FfY60eE4nPgEaF0wUkUIO/AFzzjIrGRY="; }.${arch}; }; }; @@ -59,8 +58,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-modeling-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-BXofrKElgCG3+WUCanpX1sGLhirj2pLi+pi24Z+WjBk="; - aarch64 = "sha256-CdePRa6jmWlt3Wismt3RahGzYOm1ZDwQRt82kRVXSdM="; + x86_64 = "sha256-wdZninKynNQ5o2nxyOxA7GDQ75tWs1TB2jh21O0fEpg="; + aarch64 = "sha256-5iAoMyesBjmdAy/eSMkgtuYv5rnXAEjgLb0yNX02mdw="; }.${arch}; }; }; @@ -74,8 +73,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-platform-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-aprXjNv2NMoIDCNkFxwmMKcGUt2ssRonzTZ/hH57Mig="; - aarch64 = "sha256-Aq9PDVo/9zTeQ2j6q5bf1aIKjKM7oonIr1mEQ7rX48Y="; + x86_64 = "sha256-SYeCXWGSi8bPbqngGC+ZSBQaKyZrDTFeT+RLKC+ZsDk="; + aarch64 = "sha256-DN6fl7p+q96wsg9Mq6v3lTV0/7b87MFKTJSFuNrjLgs="; }.${arch}; }; }; @@ -106,8 +105,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops${platform_major}/R-${platform_major}.${platform_minor}-${timestamp}/eclipse-SDK-${platform_major}.${platform_minor}-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-39DXU7wIsdxkUpNKnYPT7+qPJ2DrF7G7UJqPfhEDGGs="; - aarch64 = "sha256-7GwKGNHWPZ3uOFyzQj1dftFFz/3oa2j8XWkRn0wnllY="; + x86_64 = "sha256-QY16KSNZj6rq7YL+gOajI80XVtSdCh7MJGPscRJuf1o="; + aarch64 = "sha256-oZXx87dlLZ61ezwDD0WnV48ZMjcK0FkSGl83LhkJvmc="; }.${arch}; }; }; @@ -121,8 +120,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-java-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-zNBzFHmNaxUutzMh/5pOglJiKh5NAvSVwvPYyA6RVr4="; - aarch64 = "sha256-RtLXB9kgpLERfhpvDTaJG84qVyN1Puud1PTZtk/WIO0="; + x86_64 = "sha256-FC4zgx+75S9TJVp0azWgON/wNmoEy0074tj+DOdvNOg="; + aarch64 = "sha256-wnRQKqg1V4hrD9VAg6sw8yypB97Wcivt4cH6MFP4KPs="; }.${arch}; }; }; @@ -136,8 +135,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-jee-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-vpvmKZKVl6ubfq8QMDr0xprXYMWl576hu+ovvREN4ak="; - aarch64 = "sha256-5Yqxgl4kkN3Bb7hsTnd9q5TsCpVBVkEVvqPbL5MYEyg="; + x86_64 = "sha256-eSYWuw6s3H1ht4zPDwjd4oZ49KhIn1OaywtwKHyS0wI="; + aarch64 = "sha256-9O0+S3G3vtjN1Vd4euf3gYRPPtrVxoBB+Uj7BlDAS5M="; }.${arch}; }; }; @@ -151,8 +150,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-committers-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-4SAiEZWSUaiK8QO2Hg39FBcj1aYRtbOJkeF1W1AMQBo="; - aarch64 = "sha256-+KGDlo6QK3o/n2vSiD0HpIkBwqwIiMXzdFUpfE48gps="; + x86_64 = "sha256-kJoXaSwsjArpe4tqeSkZiU4AcR5dLBvdsyU7tBTiTdc="; + aarch64 = "sha256-qydFxa0lQEwsxZQPlBXV/wiuXGuIcBHRasKZEmXJaOk="; }.${arch}; }; }; @@ -166,8 +165,8 @@ in rec { fetchurl { url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/${year}-${month}/R/eclipse-rcp-${year}-${month}-R-linux-gtk-${arch}.tar.gz"; hash = { - x86_64 = "sha256-bhcpzsS9cci3Y3Pk9DOrtPonKjRg/vzDqDr3Be/xfks="; - aarch64 = "sha256-YCb4leFWRtx4VPwK/5vgwwDH3/f0/0OWEy4ueAS7sUw="; + x86_64 = "sha256-BAEXN6sx4f+BJnKz0lkPoAmRXnlbl5s5ETAyfE/AZak="; + aarch64 = "sha256-xayvsFAglBxAB49j2tnt52d6KX6LxMBRfx0wR/p8K70="; }.${arch}; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix index a8a248804b..2eb87c8394 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix @@ -255,12 +255,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://github.com/eclipse-cdt/cdt/releases - version = "11.1.1"; + version = "11.2.0"; src = fetchzip { stripRoot = false; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip"; - hash = "sha256-k78QKPIb3Lr0Wcg2tTlX1abdpcvxspjaxJiP2Hrgb4A="; + hash = "sha256-YEmoAFzyGOyreg8FiL/gcwXROHT5VoLb1DfHhBp1tsQ="; }; meta = with lib; { @@ -355,7 +355,7 @@ rec { src = fetchzip { url = "https://download.jboss.org/drools/release/${version}/droolsjbpm-tools-distribution-${version}.zip"; - sha512 = "2qzc1iszqfrfnw8xip78n3kp6hlwrvrr708vlmdk7nv525xhs0ssjaxriqdhcr0s6jripmmazxivv3763rnk2bfkh31hmbnckpx4r3m"; + hash = "sha512-dWTS72R2VRgGnG6JafMwZ+wd+1e13pil0SAz2HDMXUmtgYa9iLLtma3SjcDJeWdOoblzWHRu7Ihblx3+Ogb2sQ=="; postFetch = '' # update site is a couple levels deep, alongside some other irrelevant stuff cd $out; diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/update.sh b/third_party/nixpkgs/pkgs/applications/editors/eclipse/update.sh new file mode 100755 index 0000000000..7e100ccfbc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/update.sh @@ -0,0 +1,72 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash --pure -p curl cacert libxml2 yq nix jq +#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/3c7487575d9445185249a159046cc02ff364bff8.tar.gz +# ^ +# | +# nixos-unstable ~ 2023-07-06 -----------------/ + +set -o errexit +set -o nounset + +# scrape the downloads page for release info + +curl -s -o eclipse-dl.html https://download.eclipse.org/eclipse/downloads/ +trap "rm eclipse-dl.html" EXIT + +dlquery() { + q=$1 + xmllint --html eclipse-dl.html --xmlout 2>/dev/null | xq -r ".html.body.main.div.table[3].tr[1].td[0].a${q}"; +} + +# extract release info from download page HTML + +platform_major=$(dlquery '."#text" | split(".") | .[0]' -r); +platform_minor=$(dlquery '."#text" | split(".") | .[1]' -r); + +year=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[0:4]') +buildmonth=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[4:6]') +builddaytime=$(dlquery '."@href" | split("/") | .[] | select(. | startswith("R")) | split("-") | .[2] | .[6:12]') +timestamp="${year}${buildmonth}${builddaytime}"; + +# account for possible release-month vs. build-month mismatches + +month=$buildmonth; +case "$buildmonth" in + '02'|'04') month='03' ;; + '05'|'07') month='06' ;; + '08'|'10') month='09' ;; + '11'|'01') month='12' ;; +esac + +cat <= 7.0. + # See https://github.com/NixOS/nixpkgs/issues/127902 + NIX_CFLAGS_COMPILE = "-include ${./macport_noescape_noop.h}"; + }; + enableParallelBuilding = true; installTargets = [ "tags" "install" ]; @@ -394,6 +405,6 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation { }; meta = meta // { - broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); + broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); }; -})) +}) diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/macport_noescape_noop.h b/third_party/nixpkgs/pkgs/applications/editors/emacs/macport_noescape_noop.h new file mode 100644 index 0000000000..64c65bd90f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/macport_noescape_noop.h @@ -0,0 +1,31 @@ +#ifndef NOESCAPE_NOOP_H_ +#define NOESCAPE_NOOP_H_ + +// First, do some work to get definitions for *_WIDTH. Normally, Emacs would +// have these defined by headers in-tree, but clang's headers clash with those. +// Due to how include paths work, we have to include clang headers if we want to +// mess with CoreFoundation definitions. +#pragma push_macro("__STDC_VERSION__") +// Make the preprocessor think that we're on C2x. The macros we want are gated +// on it. +#undef __STDC_VERSION__ +#define __STDC_VERSION__ 202000L +// Include limits.h first, as stdint.h includes it. +#include + +// XX: clang's stdint.h is shy and won't give us its defs unless it thinks it's +// in freestanding mode. +#undef __STDC_HOSTED__ +#include +#define __STDC_HOSTED__ 1 + +#pragma pop_macro("__STDC_VERSION__") + +// Now, pull in the header that defines CF_NOESCAPE. +#include + +// Redefine CF_NOESCAPE as empty. +#undef CF_NOESCAPE +#define CF_NOESCAPE + +#endif // NOESCAPE_NOOP_H_ diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/site-start.el b/third_party/nixpkgs/pkgs/applications/editors/emacs/site-start.el index acc6833b98..c844e703e3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/site-start.el +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/site-start.el @@ -8,8 +8,11 @@ least specific (the system profile)" ;;; Extend `load-path' to search for elisp files in subdirectories of all folders in `NIX_PROFILES'. ;;; Non-Nix distros have similar logic in /usr/share/emacs/site-lisp/subdirs.el. ;;; See https://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Search.html -(dolist (profile (nix--profile-paths)) - (let ((default-directory (expand-file-name "share/emacs/site-lisp/" profile))) +(dolist (profile (reverse (nix--profile-paths))) + ;; `directory-file-name' is important to add sub dirs to the right place of `load-path' + ;; see the source code of `normal-top-level-add-to-load-path' + (let ((default-directory (directory-file-name + (expand-file-name "share/emacs/site-lisp/" profile)))) (when (file-exists-p default-directory) (setq load-path (cons default-directory load-path)) (normal-top-level-add-subdirs-to-load-path)))) @@ -37,13 +40,19 @@ least specific (the system profile)" (mapconcat 'identity new-env-list ":")))))) ;;; Set up native-comp load path. -(when (featurep 'comp) +(when (featurep 'native-compile) ;; Append native-comp subdirectories from `NIX_PROFILES'. + ;; Emacs writes asynchronous native-compilation files to the first writable directory[1]. + ;; At this time, (car native-comp-eln-load-path) is a writable one in `user-emacs-directory'[2]. + ;; So we keep that one unchanged. + ;; [1]: info "(elisp) Native-Compilation Variables" + ;; [2]: https://git.savannah.gnu.org/cgit/emacs.git/tree/lisp/startup.el?id=3685387e609753293c4518be75e77c659c3b2d8d#n601 (setq native-comp-eln-load-path - (append (mapcar (lambda (profile-dir) + (append (list (car native-comp-eln-load-path)) + (mapcar (lambda (profile-dir) (concat profile-dir "/share/emacs/native-lisp/")) (nix--profile-paths)) - native-comp-eln-load-path))) + (cdr native-comp-eln-load-path)))) ;;; Make `woman' find the man pages (defvar woman-manpath) @@ -55,11 +64,13 @@ least specific (the system profile)" ;;; Make tramp work for remote NixOS machines (defvar tramp-remote-path) -(eval-after-load 'tramp-sh +(eval-after-load 'tramp ;; TODO: We should also add the other `NIX_PROFILES' to this path. ;; However, these are user-specific, so we would need to discover ;; them dynamically after connecting via `tramp' - '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) + '(progn + (add-to-list 'tramp-remote-path "/run/current-system/sw/bin") + (add-to-list 'tramp-remote-path "/run/wrappers/bin"))) ;;; C source directory ;;; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix index b9b18a98ac..318e633d6e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/sources.nix @@ -4,14 +4,29 @@ }: let - metaFor = variant: version: rev: { - homepage = { - "mainline" = "https://www.gnu.org/software/emacs/"; - "macport" = "https://bitbucket.org/mituharu/emacs-mac/"; + mkArgs = { pname, version, variant, rev, hash }: { + inherit pname version variant; + + src = { + "mainline" = (fetchFromSavannah { + repo = "emacs"; + inherit rev hash; + }); + "macport" = (fetchFromBitbucket { + owner = "mituharu"; + repo = "emacs-mac"; + inherit rev hash; + }); }.${variant}; - description = "The extensible, customizable GNU text editor" - + lib.optionalString (variant == "macport") " - macport variant"; - longDescription = '' + + meta = { + homepage = { + "mainline" = "https://www.gnu.org/software/emacs/"; + "macport" = "https://bitbucket.org/mituharu/emacs-mac/"; + }.${variant}; + description = "The extensible, customizable GNU text editor" + + lib.optionalString (variant == "macport") " - macport variant"; + longDescription = '' GNU Emacs is an extensible, customizable text editor—and more. At its core is an interpreter for Emacs Lisp, a dialect of the Lisp programming language with extensions to support text editing. @@ -30,79 +45,57 @@ let This release is built from Mitsuharu Yamamoto's patched source code tailored for macOS. ''; - changelog = { - "mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}"; - "macport" = "https://bitbucket.org/mituharu/emacs-mac/raw/${rev}/NEWS-mac"; - }.${variant}; - license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ - AndersonTorres - adisbladis - atemu - jwiegley - lovek323 - matthewbauer - ]; - platforms = { - "mainline" = lib.platforms.all; - "macport" = lib.platforms.darwin; - }.${variant}; - mainProgram = "emacs"; + changelog = { + "mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}"; + "macport" = "https://bitbucket.org/mituharu/emacs-mac/raw/${rev}/NEWS-mac"; + }.${variant}; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + AndersonTorres + adisbladis + atemu + jwiegley + lovek323 + matthewbauer + ]; + platforms = { + "mainline" = lib.platforms.all; + "macport" = lib.platforms.darwin; + }.${variant}; + mainProgram = "emacs"; + }; }; in { - emacs28 = import ./generic.nix { + emacs28 = import ./generic.nix (mkArgs { pname = "emacs"; version = "28.2"; variant = "mainline"; - src = fetchFromSavannah { - repo = "emacs"; - rev = "28.2"; - hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag="; - }; + rev = "28.2"; + hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag="; + }); - meta = metaFor "mainline" "28.2" "28.2"; - }; - - emacs29 = import ./generic.nix { + emacs29 = import ./generic.nix (mkArgs { pname = "emacs"; version = "29.1"; variant = "mainline"; - src = fetchFromSavannah { - repo = "emacs"; - rev = "29.1"; - hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg="; - }; + rev = "29.1"; + hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg="; + }); - meta = metaFor "mainline" "29.1" "29.1"; - }; - - emacs28-macport = import ./generic.nix { + emacs28-macport = import ./generic.nix (mkArgs { pname = "emacs-mac"; version = "28.2"; variant = "macport"; - src = fetchFromBitbucket { - owner = "mituharu"; - repo = "emacs-mac"; - rev = "emacs-28.2-mac-9.1"; - hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE="; - }; + rev = "emacs-28.2-mac-9.1"; + hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE="; + }); - meta = metaFor "macport" "28.2" "emacs-28.2-mac-9.1"; - }; - - emacs29-macport = import ./generic.nix { + emacs29-macport = import ./generic.nix (mkArgs { pname = "emacs-mac"; version = "29.1"; variant = "macport"; - - src = fetchFromBitbucket { - owner = "mituharu"; - repo = "emacs-mac"; - rev = "emacs-29.1-mac-10.0"; - hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU="; - }; - - meta = metaFor "macport" "29.1" "emacs-29.1-mac-10.0"; - }; + rev = "emacs-29.1-mac-10.0"; + hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU="; + }); } diff --git a/third_party/nixpkgs/pkgs/applications/editors/focuswriter/default.nix b/third_party/nixpkgs/pkgs/applications/editors/focuswriter/default.nix index d39c29dc6a..de008a5451 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/focuswriter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/focuswriter/default.nix @@ -1,24 +1,37 @@ -{ lib, fetchurl, pkg-config, qmake, qttools, hunspell, qtbase, qtmultimedia, mkDerivation }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, cmake +, hunspell +, qtbase +, qtmultimedia +, qttools +, qt5compat +, qtwayland +, wrapQtAppsHook +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "focuswriter"; - version = "1.7.6"; + version = "1.8.5"; - src = fetchurl { - url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "0h85f6cs9zbxv118mjfxqfv41j19zkx2xq36mpnlmrlzkjj7dx9l"; + src = fetchFromGitHub { + owner = "gottcode"; + repo = "focuswriter"; + rev = "v${version}"; + hash = "sha256-6wvTlC/NCCcN2jpwqtoOsCln3ViY/vj7NpMsbYHBGiI="; }; - nativeBuildInputs = [ pkg-config qmake qttools ]; - buildInputs = [ hunspell qtbase qtmultimedia ]; + nativeBuildInputs = [ pkg-config cmake qttools wrapQtAppsHook ]; + buildInputs = [ hunspell qtbase qtmultimedia qt5compat qtwayland ]; - qmakeFlags = [ "PREFIX=/" ]; installFlags = [ "INSTALL_ROOT=$(out)" ]; meta = with lib; { description = "Simple, distraction-free writing environment"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ madjar ]; + maintainers = with maintainers; [ madjar kashw2 ]; platforms = platforms.linux; homepage = "https://gottcode.org/focuswriter/"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix index 4352b74f96..a7f1fd135f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gedit/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , meson +, mesonEmulatorHook , fetchurl , python3 , pkg-config @@ -58,6 +59,8 @@ stdenv.mkDerivation rec { gtk-doc gobject-introspection docbook-xsl-nons + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix b/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix index cbd63c0ffc..79e871561c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix @@ -1,24 +1,43 @@ { lib , buildGoModule , fetchFromGitHub +, installShellFiles +, stdenv +, fetchpatch }: + buildGoModule rec { pname = "glow"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "glow"; rev = "v${version}"; - sha256 = "sha256-CI0S9XJtJQClpQvI6iSb5rcHafEUwr2V6+Fq560lRfM="; + hash = "sha256-12UziCf3BO1z+W02slNCCvXhIkvZuVgXk++BdHG3gDI="; }; - vendorHash = "sha256-2QrHBbhJ04r/vPK2m8J2KZSFrREDCc18tlKd7evghBc="; + vendorHash = "sha256-xxFC87t12bZKea9Snscul+xx8IGFAcoIr9Z8wxHL7nM="; + + # Remove whenever a release with it is available + patches = [(fetchpatch { + url = "https://github.com/charmbracelet/glow/commit/f0734709f0be19a34e648caaf63340938a50caa2.patch"; + name = "go-1-17-patch"; + hash = "sha256-vpMiVb/7SFT9xcSpVGQriEjkexh1F/ljpfpIswdBx2Y="; + })]; doCheck = false; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd glow \ + --bash <($out/bin/glow completion bash) \ + --fish <($out/bin/glow completion fish) \ + --zsh <($out/bin/glow completion zsh) + ''; + meta = with lib; { description = "Render markdown on the CLI, with pizzazz!"; homepage = "https://github.com/charmbracelet/glow"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/gophernotes/default.nix b/third_party/nixpkgs/pkgs/applications/editors/gophernotes/default.nix index 9efb2fd577..3ed0b67741 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/gophernotes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/gophernotes/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-cGlYgay/t6XIl0U9XvrHkqNxZ6BXtXi0TIANY1WdZ3Y="; }; - vendorSha256 = "sha256-iIBqx52fD12R+7MSjQNihMYYtZ9vPAdJndOG4YJVhy4="; + vendorHash = "sha256-iIBqx52fD12R+7MSjQNihMYYtZ9vPAdJndOG4YJVhy4="; meta = with lib; { description = "Go kernel for Jupyter notebooks"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix b/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix index f7dc988de1..52d52a0785 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix @@ -1,31 +1,41 @@ -{ lib, stdenv, fetchurl, makeWrapper, jdk }: +{ lib, stdenv, fetchurl, openjdk, glib, dpkg, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "greenfoot"; - version = "3.7.1"; + version = "3.8.0"; + src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder # to unpack than the deb. url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${builtins.replaceStrings ["."] [""] version}.deb"; - sha256 = "sha256-wGgKDsA/2luw+Nzs9dWb/HRHMx/0S0CFfoI53OCzxug="; + sha256 = "sha256-HDXmgLHS18VZVV+hCA0RgIrKRftOlV7t+fvE0pAHGjk="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ dpkg wrapGAppsHook ]; + buildInputs = [ glib ]; - unpackPhase = '' - ar xf $src - tar xf data.tar.xz - ''; + dontWrapGApps = true; installPhase = '' + runHook preInstall + mkdir -p $out cp -r usr/* $out - rm -r $out/share/greenfoot/jdk - rm -r $out/share/greenfoot/javafx - makeWrapper ${jdk}/bin/java $out/bin/greenfoot \ - --add-flags "-Djavafx.embed.singleThread=true -Dawt.useSystemAAFontSettings=on -Xmx512M -cp \"$out/share/greenfoot/bluej.jar\" bluej.Boot -greenfoot=true -bluej.compiler.showunchecked=false -greenfoot.scenarios=$out/share/doc/Greenfoot/scenarios -greenfoot.url.javadoc=file://$out/share/doc/Greenfoot/API" + rm -r $out/share/greenfoot/jdk + rm -r $out/share/greenfoot/javafx-*.jar + + makeWrapper ${openjdk}/bin/java $out/bin/greenfoot \ + "''${gappsWrapperArgs[@]}" \ + --add-flags "-Dawt.useSystemAAFontSettings=on -Xmx512M \ + --add-opens javafx.graphics/com.sun.glass.ui=ALL-UNNAMED \ + -cp $out/share/greenfoot/boot.jar bluej.Boot \ + -greenfoot=true -bluej.compiler.showunchecked=false \ + -greenfoot.scenarios=$out/share/doc/Greenfoot/scenarios \ + -greenfoot.url.javadoc=file://$out/share/doc/Greenfoot/API" + + runHook postInstall ''; meta = with lib; { @@ -33,7 +43,8 @@ stdenv.mkDerivation rec { homepage = "https://www.greenfoot.org/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2ClasspathPlus; + mainProgram = pname; maintainers = [ maintainers.chvp ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/hecate/default.nix b/third_party/nixpkgs/pkgs/applications/editors/hecate/default.nix index dd266c0bab..a2bb4e84c9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/hecate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/hecate/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-8L0ukzPF7aECCeZfwZYKcJAJLpPgotkVJ+OSdwQUjhw="; }; - vendorSha256 = "sha256-eyMrTrNarNCB3w8EOeJBmCbVxpMZy25sQ19icVARU1M="; + vendorHash = "sha256-eyMrTrNarNCB3w8EOeJBmCbVxpMZy25sQ19icVARU1M="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/hexcurse/default.nix b/third_party/nixpkgs/pkgs/applications/editors/hexcurse/default.nix index 715693770c..1c2e09695e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/hexcurse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/hexcurse/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/LonnyGomes/hexcurse"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/howl/default.nix b/third_party/nixpkgs/pkgs/applications/editors/howl/default.nix index ff9a300741..030c6666e1 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/howl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/howl/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1qc58l3rkr37cj6vhf8c7bnwbz93nscyraz7jxqwjq6k4gj0cjw3"; }; - sourceRoot = "./howl-${version}/src"; + sourceRoot = "howl-${version}/src"; # The Makefile uses "/usr/local" if not explicitly overridden installFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/ht/default.nix b/third_party/nixpkgs/pkgs/applications/editors/ht/default.nix index 42b3f1495a..c8a13738c9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/ht/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/ht/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://hte.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/darwin.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/darwin.nix index e5c4dd7e4f..747f03f55d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/darwin.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/darwin.nix @@ -22,11 +22,12 @@ stdenvNoCC.mkDerivation { inherit pname meta src version plugins; passthru.buildNumber = buildNumber; desktopName = product; + dontFixup = true; installPhase = '' runHook preInstall APP_DIR="$out/Applications/${product}.app" mkdir -p "$APP_DIR" - cp -Tr "${product}.app" "$APP_DIR" + cp -Tr *.app "$APP_DIR" mkdir -p "$out/bin" cat << EOF > "$out/bin/${loname}" open -na '$APP_DIR' --args "\$@" diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 91b803babd..a278a05fe3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -124,7 +124,7 @@ let server with your local machine, downloads necessary components on the backend, and opens your project in JetBrains Client. ''; - maintainers = with maintainers; [ kouyk ]; + maintainers = with maintainers; [ ]; }; }); @@ -291,6 +291,51 @@ let }; }); + buildRustRover = { pname, version, src, license, description, wmClass, buildNumber, ... }: + (mkJetBrainsProduct { + inherit pname version src wmClass jdk buildNumber; + product = "RustRover"; + meta = with lib; { + homepage = "https://www.jetbrains.com/rust/"; + inherit description license platforms; + longDescription = description; + }; + }).overrideAttrs (attrs: { + nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [ + autoPatchelfHook + ]; + buildInputs = (attrs.buildInputs or [ ]) ++ lib.optionals (stdenv.isLinux) [ + python3 + stdenv.cc.cc + libdbusmenu + openssl.out + libxcrypt-legacy + ]; + dontAutoPatchelf = true; + postFixup = (attrs.postFixup or "") + lib.optionalString (stdenv.isLinux) '' + ( + cd $out/rust-rover + + # Copied over from clion (gdb seems to have a couple of patches) + ls -d $PWD/bin/gdb/linux/x64/lib/python3.8/lib-dynload/* | + xargs patchelf \ + --replace-needed libssl.so.10 libssl.so \ + --replace-needed libcrypto.so.10 libcrypto.so + + ls -d $PWD/bin/lldb/linux/x64/lib/python3.8/lib-dynload/* | + xargs patchelf \ + --replace-needed libssl.so.10 libssl.so \ + --replace-needed libcrypto.so.10 libcrypto.so + + autoPatchelf $PWD/bin + + interp="$(cat $NIX_CC/nix-support/dynamic-linker)" + patchelf --set-interpreter $interp $PWD/plugins/intellij-rust/bin/linux/x86-64/intellij-rust-native-helper + chmod +x $PWD/plugins/intellij-rust/bin/linux/x86-64/intellij-rust-native-helper + ) + ''; + }); + buildWebStorm = { pname, version, src, license, description, wmClass, buildNumber, ... }: (mkJetBrainsProduct { inherit pname version src wmClass jdk buildNumber; @@ -500,6 +545,20 @@ in update-channel = products.ruby-mine.update-channel; }; + rust-rover = buildRustRover rec { + pname = "rust-rover"; + version = products.rust-rover.version; + buildNumber = products.rust-rover.build_number; + description = "Rust IDE"; + license = lib.licenses.unfree; + src = fetchurl { + url = products.rust-rover.url; + sha256 = products.rust-rover.sha256; + }; + wmClass = "jetbrains-rustrover"; + update-channel = products.rust-rover.update-channel; + }; + webstorm = buildWebStorm rec { pname = "webstorm"; version = products.webstorm.version; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix index efc939d032..2d6cbf5b87 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/linux.nix @@ -11,6 +11,7 @@ , unzip , libsecret , libnotify +, udev , e2fsprogs , python3 , vmopts ? null @@ -109,6 +110,9 @@ with stdenv; lib.makeOverridable mkDerivation (rec { # Some internals want libstdc++.so.6 stdenv.cc.cc.lib libsecret e2fsprogs libnotify + # Required for Help -> Collect Logs + # in at least rider and goland + udev ] ++ extraLdPath)}" \ ${lib.concatStringsSep " " extraWrapperArgs} \ --set-default JDK_HOME "$jdk" \ diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json index 3fa5d012ee..e3c39af090 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/plugins.json @@ -13,17 +13,20 @@ "pycharm-professional", "rider", "ruby-mine", + "rust-rover", "webstorm" ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip", - "232.8660.111": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", - "232.8660.143": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", - "232.8660.205": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip", - "232.8660.212": "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip" + "232.9559.28": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.9559.58": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.9559.61": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.9921.48": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.9921.53": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip" }, "name": "ideavim" }, @@ -32,17 +35,37 @@ "idea-ultimate" ], "builds": { - "232.8660.185": "https://plugins.jetbrains.com/files/631/368891/python-232.8660.185.zip" + "232.9921.47": "https://plugins.jetbrains.com/files/631/395438/python-232.9921.47.zip" }, "name": "python" }, "6954": { "compatible": [ + "clion", + "datagrip", + "goland", "idea-community", - "idea-ultimate" + "idea-ultimate", + "mps", + "phpstorm", + "pycharm-community", + "pycharm-professional", + "rider", + "ruby-mine", + "rust-rover", + "webstorm" ], "builds": { - "232.8660.185": null + "223.8836.1185": "https://plugins.jetbrains.com/files/6954/381727/kotlin-plugin-223-1.9.10-release-459-IJ8836.35.zip", + "232.9559.28": null, + "232.9559.58": null, + "232.9559.61": null, + "232.9921.42": null, + "232.9921.47": null, + "232.9921.48": null, + "232.9921.53": null, + "232.9921.55": null, + "232.9921.62": null }, "name": "kotlin" }, @@ -59,17 +82,20 @@ "pycharm-professional", "rider", "ruby-mine", + "rust-rover", "webstorm" ], "builds": { "223.8836.1185": null, - "232.8660.111": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip", - "232.8660.143": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip", - "232.8660.205": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip", - "232.8660.212": "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip" + "232.9559.28": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", + "232.9559.58": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", + "232.9559.61": "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip", + "232.9921.48": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip", + "232.9921.53": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip" }, "name": "ini" }, @@ -79,8 +105,8 @@ "phpstorm" ], "builds": { - "232.8660.185": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip", - "232.8660.205": "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip" + "232.9921.47": "https://plugins.jetbrains.com/files/7219/401047/Symfony_Plugin-2022.1.257.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/7219/401047/Symfony_Plugin-2022.1.257.zip" }, "name": "symfony-support" }, @@ -90,8 +116,8 @@ "phpstorm" ], "builds": { - "232.8660.185": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", - "232.8660.205": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" + "232.9921.47": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" }, "name": "php-annotations" }, @@ -100,12 +126,15 @@ "datagrip", "goland", "idea-community", - "rider" + "rider", + "rust-rover" ], "builds": { - "232.8660.111": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip", - "232.8660.212": "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip" + "232.9559.28": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip", + "232.9559.61": "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip", + "232.9921.53": "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip" }, "name": "python-community-edition" }, @@ -126,15 +155,16 @@ ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip", - "232.8660.111": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", - "232.8660.143": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", - "232.8660.205": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip", - "232.8660.212": "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip" + "232.9559.28": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.9559.58": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.9559.61": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.9921.48": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.9921.53": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip" }, - "name": "rust" + "name": "-deprecated-rust" }, "8182-beta": { "compatible": [ @@ -153,15 +183,16 @@ ], "builds": { "223.8836.1185": null, - "232.8660.111": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.8660.143": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.8660.205": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", - "232.8660.212": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip" + "232.9559.28": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.9559.58": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.9559.61": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.9921.48": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.9921.53": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip" }, - "name": "rust-beta" + "name": "-deprecated-rust-beta" }, "8554": { "compatible": [ @@ -174,10 +205,11 @@ "webstorm" ], "builds": { - "232.8660.143": "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip" + "232.9559.58": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", + "232.9921.48": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip", + "232.9921.53": "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip" }, "name": "ide-features-trainer" }, @@ -194,17 +226,20 @@ "pycharm-professional", "rider", "ruby-mine", + "rust-rover", "webstorm" ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.8660.111": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.8660.143": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.8660.205": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", - "232.8660.212": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip" + "232.9559.28": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.9559.58": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.9559.61": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.9921.48": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.9921.53": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip" }, "name": "nixidea" }, @@ -213,7 +248,7 @@ "idea-ultimate" ], "builds": { - "232.8660.185": "https://plugins.jetbrains.com/files/9568/366117/go-plugin-232.8660.142.zip" + "232.9921.47": "https://plugins.jetbrains.com/files/9568/390449/go-plugin-232.9921.28.zip" }, "name": "go" }, @@ -230,17 +265,20 @@ "pycharm-professional", "rider", "ruby-mine", + "rust-rover", "webstorm" ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip", - "232.8660.111": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.8660.143": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.8660.205": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", - "232.8660.212": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip" + "232.9559.28": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.9559.58": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.9559.61": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.9921.48": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.9921.53": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/10037/358813/CSVEditor-3.2.1-232.zip" }, "name": "csv-editor" }, @@ -257,17 +295,20 @@ "pycharm-professional", "rider", "ruby-mine", + "rust-rover", "webstorm" ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip", - "232.8660.111": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.8660.143": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.8660.205": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", - "232.8660.212": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip" + "232.9559.28": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.9559.58": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.9559.61": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.9921.48": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.9921.53": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip" }, "name": "vscode-keymap" }, @@ -284,17 +325,20 @@ "pycharm-professional", "rider", "ruby-mine", + "rust-rover", "webstorm" ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip", - "232.8660.111": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.8660.143": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.8660.205": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", - "232.8660.212": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip" + "232.9559.28": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.9559.58": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.9559.61": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.9921.48": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.9921.53": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip" }, "name": "eclipse-keymap" }, @@ -311,17 +355,20 @@ "pycharm-professional", "rider", "ruby-mine", + "rust-rover", "webstorm" ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip", - "232.8660.111": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.8660.143": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.8660.205": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", - "232.8660.212": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip" + "232.9559.28": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.9559.58": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.9559.61": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.9921.48": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.9921.53": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip" }, "name": "visual-studio-keymap" }, @@ -338,17 +385,20 @@ "pycharm-professional", "rider", "ruby-mine", + "rust-rover", "webstorm" ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.8660.111": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.8660.143": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.8660.185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.8660.186": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.8660.197": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.8660.205": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", - "232.8660.212": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" + "232.9559.28": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.9559.58": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.9559.61": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.9921.42": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.9921.47": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.9921.48": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.9921.53": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.9921.55": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", + "232.9921.62": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" }, "name": "darcula-pitch-black" }, @@ -365,17 +415,20 @@ "pycharm-professional", "rider", "ruby-mine", + "rust-rover", "webstorm" ], "builds": { - "223.8836.1185": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip", - "232.8660.111": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip", - "232.8660.143": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip", - "232.8660.205": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip", - "232.8660.212": "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip" + "223.8836.1185": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", + "232.9559.28": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", + "232.9559.58": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", + "232.9559.61": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", + "232.9921.48": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", + "232.9921.53": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip" }, "name": "github-copilot" }, @@ -392,19 +445,35 @@ "pycharm-professional", "rider", "ruby-mine", + "rust-rover", "webstorm" ], "builds": { "223.8836.1185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.8660.111": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.8660.143": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.8660.185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.8660.186": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.8660.197": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.8660.205": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", - "232.8660.212": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" + "232.9559.28": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.9559.58": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.9559.61": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.9921.42": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.9921.48": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.9921.53": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.9921.55": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" }, "name": "netbeans-6-5-keymap" + }, + "22407": { + "compatible": [ + "clion", + "idea-ultimate", + "rust-rover" + ], + "builds": { + "232.9921.42": "https://plugins.jetbrains.com/files/22407/397545/intellij-rust-232.9921.62.zip", + "232.9921.47": "https://plugins.jetbrains.com/files/22407/397545/intellij-rust-232.9921.62.zip", + "232.9921.62": "https://plugins.jetbrains.com/files/22407/397545/intellij-rust-232.9921.62.zip" + }, + "name": "rust" } }, "files": { @@ -418,19 +487,23 @@ "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip": "sha256-5S8u7w14fLkaTcjACfUSun9pMNtPk20/8+Dr5Sp9sDE=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip": "sha256-2dM/r79XT+1MHDeRAUnZw6WO3dmw7MZfx9alHmBqMk0=", - "https://plugins.jetbrains.com/files/164/369533/IdeaVim-2.4.1-signed.zip": "sha256-dI+Oh6Z+OuqiS8yJI/PbelZdg2YCmoGw9NGotvKc0no=", - "https://plugins.jetbrains.com/files/17718/373346/github-copilot-intellij-1.2.18.2908.zip": "sha256-pSbM2BkXrWdEVedLIh89sQ1FDnlgO+saXyZsfkI2qYA=", + "https://plugins.jetbrains.com/files/164/390591/IdeaVim-2.5.1-signed.zip": "sha256-eFKMFSkzQ0rJKuTUjFo8Yj5Z/mdGoF6REtpSqg/WkNc=", + "https://plugins.jetbrains.com/files/17718/391768/github-copilot-intellij-1.2.22.3129.zip": "sha256-SXzP1lg/FRroeaNQ4q5ePpDI+AiVF+dOE8tRWfm+sGk=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", - "https://plugins.jetbrains.com/files/631/368891/python-232.8660.185.zip": "sha256-SqHA6I+mJeBH/Gjos+OiTayClesl5YBLqHvXIVL5o9k=", - "https://plugins.jetbrains.com/files/6981/370741/ini-232.8660.205.zip": "sha256-qxTbWKdYSb4b6CRDKup7rL8EO2qZLM9bctMlTDHfrBk=", - "https://plugins.jetbrains.com/files/7219/355564/Symfony_Plugin-2022.1.253.zip": "sha256-vE+fobPbtWlaSHGTLlbDcC6NkaJiA4Qp50h8flXHaJc=", + "https://plugins.jetbrains.com/files/22407/397545/intellij-rust-232.9921.62.zip": "sha256-YTZZbObuUWxIZoU3vKnWve/nRtcDWLubx4Z43ljlCYI=", + "https://plugins.jetbrains.com/files/631/395438/python-232.9921.47.zip": "sha256-+2ow+tbZUipK92SKp0AegcRwUL1OSQuGE4FlZPOAGSk=", + "https://plugins.jetbrains.com/files/6954/381727/kotlin-plugin-223-1.9.10-release-459-IJ8836.35.zip": "sha256-gHkNQyWh6jtY1986aI7Qo6ZNrniPy+Yq4XLLA0pKJkA=", + "https://plugins.jetbrains.com/files/6981/383851/ini-232.9559.64.zip": "sha256-XJoRZ3ExKHkUZljuuMjMzMCcFw0A+vOyJAwtf+soHU4=", + "https://plugins.jetbrains.com/files/6981/398535/ini-232.9921.55.zip": "sha256-Jntjg8pXb2HfE8yojDcECM/Lbv4k7J2AoxQ2yD2R23s=", + "https://plugins.jetbrains.com/files/7219/401047/Symfony_Plugin-2022.1.257.zip": "sha256-H5ZfeMT93sGUrDh/7ba9zsW/eQz37Rl/iShY6ryNM3E=", "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=", - "https://plugins.jetbrains.com/files/7322/368904/python-ce-232.8660.185.zip": "sha256-MD2HNM9ltLK/0KKB6Ly1qu3J8B8QD/8t0FjWEcalIkE=", + "https://plugins.jetbrains.com/files/7322/381781/python-ce-232.9559.62.zip": "sha256-wyqNQO4fFU9fJVbHbde/NWtY/RVOF/71o+TgWfS7VuM=", + "https://plugins.jetbrains.com/files/7322/401058/python-ce-232.9921.77.zip": "sha256-cr4LxSz8xVzC+Zm+6LnWGLbF6aGBVLW56crCIQOawhc=", "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=", "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip": "sha256-ZlSfPvhPixEz5JxU9qyG0nL3jiSjr4gKaf/xYcQI1vQ=", - "https://plugins.jetbrains.com/files/8182/373256/intellij-rust-0.4.200.5421-232.zip": "sha256-NeAF3umfaSODjpd6J1dT8Ei5hF8g8OA+sgk7VjBodoU=", - "https://plugins.jetbrains.com/files/8554/365482/featuresTrainer-232.8660.129.zip": "sha256-SCxqar6a7Q6sOFuZWNXtLRiSd7/34ydhWpL8groKT0U=", + "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip": "sha256-pVwBEyUCx/DJET9uIm8vxFeChE8FskWyfLjDpfg2mAE=", + "https://plugins.jetbrains.com/files/8554/374977/featuresTrainer-232.9559.6.zip": "sha256-HpdQdWJLTWuoYnHFmDB8JIlcuiu+hVfvUsRwvMcQqzw=", "https://plugins.jetbrains.com/files/8607/370632/NixIDEA-0.4.0.10.zip": "sha256-pq9gFDjNmgZAXe11f6SNdN6g0xu18h/06J5L2lxUwgk=", - "https://plugins.jetbrains.com/files/9568/366117/go-plugin-232.8660.142.zip": "sha256-MPeTPoSUvfjwdWifKxlYHmmVNr+nOD22Hp4srRQbG/o=" + "https://plugins.jetbrains.com/files/9568/390449/go-plugin-232.9921.28.zip": "sha256-NgF2KFglAczb2Aw5NMlbzFBylGW9LDWpNvnZlX+Pt3o=" } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix index 5d04debc7b..e6e00962c9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/specialPlugins.nix @@ -13,7 +13,7 @@ buildInputs = [ stdenv.cc.cc.lib ]; }; "8182" = { - # Rust + # Rust (deprecated) nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ stdenv.cc.cc.lib ]; buildPhase = '' @@ -60,4 +60,14 @@ fix_offset PRELUDE_POSITION ''; }; + "22407" = { + # Rust + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc.lib ]; + buildPhase = '' + runHook preBuild + chmod +x -R bin + runHook postBuild + ''; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/tests.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/tests.nix index 6047d21f43..31c31ce3a7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/tests.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/tests.nix @@ -18,6 +18,7 @@ pycharm-professional rider ruby-mine + rust-rover webstorm ]; paths = builtins.concatStringsSep " " ides; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/update_plugins.py b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/update_plugins.py index cf02aa7215..dee1c9ad6b 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/update_plugins.py +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/plugins/update_plugins.py @@ -36,6 +36,7 @@ FRIENDLY_TO_PLUGIN = { "pycharm-professional": "PYCHARM", "rider": "RIDER", "ruby-mine": "RUBYMINE", + "rust-rover": "RUST", "webstorm": "WEBSTORM" } PLUGIN_TO_FRIENDLY = {j: i for i, j in FRIENDLY_TO_PLUGIN.items()} diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json index ee11932fbd..1a1f17c54e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json @@ -3,58 +3,58 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2023.2", - "sha256": "45671bb8cf7b18bd6da2b519b950f28d315ad49d230494a08785e78219e43819", - "url": "https://download.jetbrains.com/cpp/CLion-2023.2.tar.gz", - "build_number": "232.8660.186" + "version": "2023.2.2", + "sha256": "941036313c618dcfc62cc36b605ce680a36add52a7e37ee9b1981e52e35e52a3", + "url": "https://download.jetbrains.com/cpp/CLion-2023.2.2.tar.gz", + "build_number": "232.9921.42" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2023.2", - "sha256": "f8344dad4f502a215440fb7ccbc4c69acdd0b18f33d855f0d0d0d2bbe44a5f26", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.tar.gz", - "build_number": "232.8660.111" + "version": "2023.2.1", + "sha256": "0b20f0dc61d8fd9b42962d4931c64742dd17e3f008dfec2c8863a56b1bc4be9b", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.1.tar.gz", + "build_number": "232.9559.28" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", - "version": "2023.2", - "sha256": "f8c486cb2e7cc2ce78fff173785f75c8c7461da622f81d3abe7017434e2bb4e4", - "url": "https://download.jetbrains.com/python/dataspell-2023.2.tar.gz", - "build_number": "232.8660.202" + "version": "2023.2.2", + "sha256": "30a7b848d004c12e8a5ce668dea6939f49b2aaf0bcce443f02987b4ea38179ab", + "url": "https://download.jetbrains.com/python/dataspell-2023.2.2.tar.gz", + "build_number": "232.9921.48" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2023.2", - "sha256": "8b4064670f42d1812cf44068dd989d518b46fd04a8bd4b6b5e8f84e9a44f58b2", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.tar.gz", - "build_number": "232.8660.185" + "version": "2023.2.2", + "sha256": "685b3eb786134137be41beaca80a0edb9aaed9e24b98cef8006fe840972b990f", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.2.tar.gz", + "build_number": "232.9921.47" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2023.2", - "sha256": "17f1bbd9a46061fdd013d49a99859c1ca3ece1a3cc51cdcf2b46eae0432f2481", - "url": "https://download.jetbrains.com/go/goland-2023.2.tar.gz", - "build_number": "232.8660.185" + "version": "2023.2.2", + "sha256": "e2951dfcd80556f29378d55c8d4ebfbc6e599e14ada17a06386729221d71353b", + "url": "https://download.jetbrains.com/go/goland-2023.2.2.tar.gz", + "build_number": "232.9921.53" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2023.2", - "sha256": "b1a5c267ca86850764b0541bee0c27af7d2082e55516e95a0c8d30539571735c", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.tar.gz", - "build_number": "232.8660.185" + "version": "2023.2.2", + "sha256": "cf647137394e27b3011072e463dc2e4bcdd54dc6ea9406e487a47648fc77bd26", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.2.tar.gz", + "build_number": "232.9921.47" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", - "version": "2023.2", - "sha256": "d398599557cc732fd1f58f38104d7cda35e326e4cd394245a8358e02fb8878b3", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.tar.gz", - "build_number": "232.8660.185" + "version": "2023.2.2", + "sha256": "8a0dc4c495b8547fafa90eb81b6fdfc4a9fbbc7b5806d20ebb2f6538330cd3a5", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.2.tar.gz", + "build_number": "232.9921.47" }, "mps": { "update-channel": "MPS RELEASE", @@ -67,109 +67,117 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2023.2", - "sha256": "81345b7bf6f9bd844804a6d72f617dd9ced606508e5d34eba8cd83a8b115f556", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.tar.gz", - "build_number": "232.8660.205", + "version": "2023.2.2", + "sha256": "5e3dd021b82dcad0f51bded677aa87680dcc3f5d843951c48848a9191141bf1d", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2.tar.gz", + "build_number": "232.9921.55", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2023.2", - "sha256": "64472ee39d244fbc2cc8aeade204d02a767c7ce66b2edaa26a8499eeef44f3d7", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.tar.gz", - "build_number": "232.8660.197" + "version": "2023.2.1", + "sha256": "5956c6cb5a5bad1d9749e487b3bb69fcbf0170f52324e4ff009283b723838778", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.1.tar.gz", + "build_number": "232.9559.58" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2023.2", - "sha256": "95f1666c471a9d752c53ec0b776840552e023f6405a3b000ce6f1014125bfc83", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.tar.gz", - "build_number": "232.8660.197" + "version": "2023.2.1", + "sha256": "8f7c0aca8f2a832164426393e55d543b3b56867f2497d8844547fb03e217f160", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.1.tar.gz", + "build_number": "232.9559.58" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2023.2", - "sha256": "1aa3436edb94cba8ec0e51605e146ecd528affa96e0e26df572c2437e9b00d2f", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.tar.gz", - "build_number": "232.8660.212" + "version": "2023.2.1", + "sha256": "a44872d0fc330b1cc58bb7db5c8397f4ae7d972bc0c48a66defac10121ecc645", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.1.tar.gz", + "build_number": "232.9559.61" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2023.2", - "sha256": "9da529bbc2c65503f1e01c85b745f676140c2263b9541fb1c5bae0d3b9329787", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.tar.gz", - "build_number": "232.8660.186" + "version": "2023.2.2", + "sha256": "9f14f95ef1952d6b85e13a596d00e8b57ab35a4d07a96ee33d4ceebbd113a827", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.2.tar.gz", + "build_number": "232.9921.48" + }, + "rust-rover": { + "update-channel": "RustRover EAP", + "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", + "version": "2023.2 EAP", + "sha256": "1f67e1a82f5cbb7c84382c7f251ae06b1e2699fa7d2fa4129e23ec2e43251687", + "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.62.tar.gz", + "build_number": "232.9921.62" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2023.2", - "sha256": "cc97c8ba44560dea41de1c03fd6023a287c3dca6476c297f02a473af124c073f", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.tar.gz", - "build_number": "232.8660.143" + "version": "2023.2.2", + "sha256": "10c1203620258bf4b0c952d809f50ea954f80d1ed60098917a4c64fb2718b931", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.2.tar.gz", + "build_number": "232.9921.42" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2023.2", - "sha256": "2f97bc578e0eb21f4cde2291dc78f19dac5839d84319ba780cc8c98fd9694108", - "url": "https://download.jetbrains.com/cpp/CLion-2023.2.dmg", - "build_number": "232.8660.186" + "version": "2023.2.2", + "sha256": "a4049fd02a9ebe459634ceb47f389a6f8536fcdeb162587d6896991b94023c3f", + "url": "https://download.jetbrains.com/cpp/CLion-2023.2.2.dmg", + "build_number": "232.9921.42" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2023.2", - "sha256": "0457a7503d4a1f0824777f5e27416831070b109be93c9c7bc465065c76631009", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.dmg", - "build_number": "232.8660.111" + "version": "2023.2.1", + "sha256": "1ceabbebd391f5778ef495a780b0e9b54584342d6e55cc28834e8f708759b440", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.1.dmg", + "build_number": "232.9559.28" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", - "version": "2023.2", - "sha256": "3f46033d82f23d558c9b1d0eb0d05a3bd1bcc6c320412e0dbadecdb326e9492a", - "url": "https://download.jetbrains.com/python/dataspell-2023.2.dmg", - "build_number": "232.8660.202" + "version": "2023.2.2", + "sha256": "24fb47966c891bf3a2a827df38885d48509c6e2e68a7cc03145ad28493adb76b", + "url": "https://download.jetbrains.com/python/dataspell-2023.2.2.dmg", + "build_number": "232.9921.48" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2023.2", - "sha256": "b5b3cbc4f339ff9ae255196fb32b1db86964ea8ce48dfe61c3d5976a5d831359", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.dmg", - "build_number": "232.8660.185" + "version": "2023.2.2", + "sha256": "cfa68c2b1290f1d51aa37a918a79342e42b6a50b2563524757ec8bd700008fba", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.2.dmg", + "build_number": "232.9921.47" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2023.2", - "sha256": "8dfde9eb0344c0c049c2c327ee5c92dff612bf2ac2574a04987b7f99ed91b47e", - "url": "https://download.jetbrains.com/go/goland-2023.2.dmg", - "build_number": "232.8660.185" + "version": "2023.2.2", + "sha256": "d60e55ecd6208d2af871c154320f988622cd52ca4b202cd9a90c2de7750e8e23", + "url": "https://download.jetbrains.com/go/goland-2023.2.2.dmg", + "build_number": "232.9921.53" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2023.2", - "sha256": "ad46a72491b50a5bf5f4a3066e7fb969576dd5b4f4dc322b31f14f638d564e2e", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.dmg", - "build_number": "232.8660.185" + "version": "2023.2.2", + "sha256": "a59590af2bef95562f3b7a066016d22f347d59b71e136d3dd739d626f1594636", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.2.dmg", + "build_number": "232.9921.47" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2023.2", - "sha256": "5c60bbd9527b049777bf3ddd1de0f515688fff9e08d1eb09029082677f579151", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.dmg", - "build_number": "232.8660.185" + "version": "2023.2.2", + "sha256": "f420cc60d925415a7059b3283176b4aafef3555c06746b9617cf50edef62fe69", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.2.dmg", + "build_number": "232.9921.47" }, "mps": { "update-channel": "MPS RELEASE", @@ -182,109 +190,117 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2023.2", - "sha256": "c8a3287383190113c65ec3c11fe808096faf581ce71953a258992900d97c377f", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.dmg", - "build_number": "232.8660.205", + "version": "2023.2.2", + "sha256": "99a9bb313a5c141ecd1810306deaca3cf52d338edf206362b3f9d9337a27890e", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2.dmg", + "build_number": "232.9921.55", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2023.2", - "sha256": "2de31d04ad6f199bac193975b6cba6904b8f074c9bc14ac7f14a0eaa6089324e", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.dmg", - "build_number": "232.8660.197" + "version": "2023.2.1", + "sha256": "5bbbfd755d407e75a77900e3a5367dc7ec4f4ddde3311625341b3c35353b126b", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.1.dmg", + "build_number": "232.9559.58" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2023.2", - "sha256": "5db02ef2b9086e2bbbc5ba94b9729b8ae5e328364a7c000d1cf3f4e85b92f404", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.dmg", - "build_number": "232.8660.197" + "version": "2023.2.1", + "sha256": "56747a699b16387df1c0c8cb5bd2d52c8ce7fe670054e5f37352b381d7272dbe", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.1.dmg", + "build_number": "232.9559.58" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2023.2", - "sha256": "8041b79a64ac24578d8fe9c1ec02d91eb3b047164cf48713e988bc9a9c3d53d7", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.dmg", - "build_number": "232.8660.212" + "version": "2023.2.1", + "sha256": "e80c8939c9e9c5357e65e561175a37cfac745aa60e08505c6cf48ecf9eaa4ce3", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.1.dmg", + "build_number": "232.9559.61" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2023.2", - "sha256": "fc169ca55848e01ab6432babc358d93bf4e1dcc6f343e79fe27144912bed854c", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.dmg", - "build_number": "232.8660.186" + "version": "2023.2.2", + "sha256": "2b77f24770813c0cf55892effde8c0a6a5af1c9f4b08c1c8ae9163e503afc5d3", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.2.dmg", + "build_number": "232.9921.48" + }, + "rust-rover": { + "update-channel": "RustRover EAP", + "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", + "version": "2023.2 EAP", + "sha256": "dfde444bff011783cb4a5aa2aafae8ea989874c19535b01da8214df5eb3174fb", + "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.62.dmg", + "build_number": "232.9921.62" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2023.2", - "sha256": "daf4d9c0b27f305e063d128ed7a8a63cbfbe8ddfaadb4cb0b1484b9742235137", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.dmg", - "build_number": "232.8660.143" + "version": "2023.2.2", + "sha256": "3733f1968925681a693a09053e62ba4a800b51a062f5e9772658a5fba82d2fa8", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.2.dmg", + "build_number": "232.9921.42" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2023.2", - "sha256": "c2b5ea78b6859f1ef56f32e040e0f9d3d9793198cfa2a8f73d21df2731ddedfd", - "url": "https://download.jetbrains.com/cpp/CLion-2023.2-aarch64.dmg", - "build_number": "232.8660.186" + "version": "2023.2.2", + "sha256": "2820b59efbb028a861c3912b83a659fc22a136396a7199dd887f7dc28d6fba61", + "url": "https://download.jetbrains.com/cpp/CLion-2023.2.2-aarch64.dmg", + "build_number": "232.9921.42" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2023.2", - "sha256": "51a9ba6f4448ffc10474522df6b5264972286599ee8165f9b961cd99c1c08bdd", - "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2-aarch64.dmg", - "build_number": "232.8660.111" + "version": "2023.2.1", + "sha256": "bcca68af7d5b04d21a6a2a652c0d828ef450d117ab13af74bcf7ff71a803cfdd", + "url": "https://download.jetbrains.com/datagrip/datagrip-2023.2.1-aarch64.dmg", + "build_number": "232.9559.28" }, "dataspell": { "update-channel": "DataSpell RELEASE", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", - "version": "2023.2", - "sha256": "52e4e31b2dbc2ed29c547a01c025983b2c8af8b1d58ac8325694256e96fd2a21", - "url": "https://download.jetbrains.com/python/dataspell-2023.2-aarch64.dmg", - "build_number": "232.8660.202" + "version": "2023.2.2", + "sha256": "0baeeba5f8a2dd02304b42a54d633719df3242bfaedc5b62bec4dacd403eabf2", + "url": "https://download.jetbrains.com/python/dataspell-2023.2.2-aarch64.dmg", + "build_number": "232.9921.48" }, "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2023.2", - "sha256": "09b7e8a217ac69accf286dbbc46397b3a18e51775d1682c2eb2db255ed69d2dc", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2-aarch64.dmg", - "build_number": "232.8660.185" + "version": "2023.2.2", + "sha256": "b6ae26eaa6f7f4b77d1bf3d75658eb8ae70bccce4b7e8e62d18dada0810b382c", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.2.2-aarch64.dmg", + "build_number": "232.9921.47" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2023.2", - "sha256": "0b48b7b62972ff6ff81c3e16adfe3824043c989d693bbd2a5b03145a80c4f72e", - "url": "https://download.jetbrains.com/go/goland-2023.2-aarch64.dmg", - "build_number": "232.8660.185" + "version": "2023.2.2", + "sha256": "b8343e424f1c954ef2c8db7dabc4aaad63d055aa7a4b572773dbeeab43463007", + "url": "https://download.jetbrains.com/go/goland-2023.2.2-aarch64.dmg", + "build_number": "232.9921.53" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2023.2", - "sha256": "e7c52c2cf202841e729868f3cb73bf40b92cb3c3860e60d614a7daa63dd5ee25", - "url": "https://download.jetbrains.com/idea/ideaIC-2023.2-aarch64.dmg", - "build_number": "232.8660.185" + "version": "2023.2.2", + "sha256": "b3c126636d2096933672d1c1359fe32ad04d35057090363ad1812951f2ada7d9", + "url": "https://download.jetbrains.com/idea/ideaIC-2023.2.2-aarch64.dmg", + "build_number": "232.9921.47" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2023.2", - "sha256": "f6255dc42b1631a19fc02ec8879f70963c38273d7998a709b745cffcaf9c12c8", - "url": "https://download.jetbrains.com/idea/ideaIU-2023.2-aarch64.dmg", - "build_number": "232.8660.185" + "version": "2023.2.2", + "sha256": "b649cb8c82190ca8682bad9b37da93f10981d35850f501c196ad106edf96cd44", + "url": "https://download.jetbrains.com/idea/ideaIU-2023.2.2-aarch64.dmg", + "build_number": "232.9921.47" }, "mps": { "update-channel": "MPS RELEASE", @@ -297,51 +313,59 @@ "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2023.2", - "sha256": "365ed1ea1eb87f93abf581080c72866d693bfc60c4b8cd5682b5ec93f63ed4a9", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2-aarch64.dmg", - "build_number": "232.8660.205", + "version": "2023.2.2", + "sha256": "a31daeddae532324436b2d11acbd5fb657721883f17c7ef4457ac76a51bd4189", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.2.2-aarch64.dmg", + "build_number": "232.9921.55", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2023.2", - "sha256": "6c841fbe53bd4cfd97867757e02db496ac5a3f749f9c18b5afa20577ab62bab0", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.2-aarch64.dmg", - "build_number": "232.8660.197" + "version": "2023.2.1", + "sha256": "4bc1462299de2202c7171f34ad1b7c51f83f2227e0e891cf8a8098f8494e781d", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.2.1-aarch64.dmg", + "build_number": "232.9559.58" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2023.2", - "sha256": "8c022d282d409079abaf7b611a61041f6022140804587d10d49a150457e35e83", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2-aarch64.dmg", - "build_number": "232.8660.197" + "version": "2023.2.1", + "sha256": "82722d522176ca9aac0e919a38c3b88155e6e3cc104b64204755a9657a180b52", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.2.1-aarch64.dmg", + "build_number": "232.9559.58" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2023.2", - "sha256": "c5168f8ce698b5ddea7652f88b652239f87e87fa51438ac358aa8a44a3686272", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2-aarch64.dmg", - "build_number": "232.8660.212" + "version": "2023.2.1", + "sha256": "d12db1a3b5c62999efd18af179c420f5173b7820c2fe736b1d19bb157604c19b", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.2.1-aarch64.dmg", + "build_number": "232.9559.61" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2023.2", - "sha256": "b91405e6c187baea2ac2f1ee81b7fdf6c4e60f52629bf3afe5bbb679baa76af7", - "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2-aarch64.dmg", - "build_number": "232.8660.186" + "version": "2023.2.2", + "sha256": "53e551897d42d0986b2e01f171bd7b96fe790516fdf1578feabec0a44cf441e5", + "url": "https://download.jetbrains.com/ruby/RubyMine-2023.2.2-aarch64.dmg", + "build_number": "232.9921.48" + }, + "rust-rover": { + "update-channel": "RustRover EAP", + "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", + "version": "2023.2 EAP", + "sha256": "35d44a4f72c027283843aaa6409de701d14274cdc5a614c3fdc53121383f9389", + "url": "https://download.jetbrains.com/rustrover/RustRover-232.9921.62-aarch64.dmg", + "build_number": "232.9921.62" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2023.2", - "sha256": "aa98f5c6ae61f3571cdc4abbd277c770d0b4a790e7fe4d60e1095b192a00b5b0", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2-aarch64.dmg", - "build_number": "232.8660.143" + "version": "2023.2.2", + "sha256": "27ae504b6ee24df28d29f59602c893c2b9af9357e4cc1e20dab22753177508db", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.2.2-aarch64.dmg", + "build_number": "232.9921.42" } } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix index 504d417688..5acca288f9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix @@ -8,8 +8,11 @@ , imagemagick }: -# To test: -# $(nix-build --no-out-link -E 'with import {}; jupyter.override { definitions = { clojure = clojupyter.definition; }; }')/bin/jupyter-notebook +# Jupyter console: +# nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel clojupyter.definition' + +# Jupyter notebook: +# nix run --impure --expr 'with import {}; jupyter.override { definitions.clojure = clojupyter.definition; }' let cljdeps = import ./deps.nix { inherit pkgs; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile index c3f096edca..5a1f1d091a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile @@ -1,6 +1,2 @@ source 'https://rubygems.org' -gem 'sensu' -gem 'iruby' -gem 'cztop' -gem 'ffi-rzmq' -gem 'rbczmq' +gem 'iruby', "0.7.4" diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile.lock index 89f60a6dbd..5d59b8e03d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/Gemfile.lock @@ -1,119 +1,35 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) - amq-protocol (2.0.1) - amqp (1.6.0) - amq-protocol (>= 2.0.1) - eventmachine - bond (0.5.1) - childprocess (0.5.8) - ffi (~> 1.0, >= 1.0.11) - cookiejar (0.3.3) - czmq-ffi-gen (0.15.0) - ffi (~> 1.9.10) - cztop (0.13.1) - czmq-ffi-gen (~> 0.15.0) data_uri (0.1.0) - em-http-request (1.1.5) - addressable (>= 2.3.4) - cookiejar (!= 0.3.1) - em-socksify (>= 0.3) - eventmachine (>= 1.0.3) - http_parser.rb (>= 0.6.0) - em-http-server (0.1.8) - eventmachine - em-socksify (0.3.2) - eventmachine (>= 1.0.0.beta.4) - em-worker (0.0.2) - eventmachine - eventmachine (1.2.7) - ffi (1.9.21) + ffi (1.15.5) ffi-rzmq (2.0.7) ffi-rzmq-core (>= 1.0.7) ffi-rzmq-core (1.0.7) ffi - http_parser.rb (0.6.0) - iruby (0.3) - bond (~> 0.5) + io-console (0.6.0) + irb (1.7.4) + reline (>= 0.3.6) + iruby (0.7.4) data_uri (~> 0.1) - mimemagic (~> 0.3) + ffi-rzmq + irb + mime-types (>= 3.3.1) multi_json (~> 1.11) - mimemagic (0.3.3) - multi_json (1.13.1) - oj (2.18.1) - parse-cron (0.1.4) - public_suffix (3.0.3) - rbczmq (1.7.9) - sensu (1.6.2) - em-http-request (= 1.1.5) - em-http-server (= 0.1.8) - eventmachine (= 1.2.7) - parse-cron (= 0.1.4) - sensu-extension (= 1.5.2) - sensu-extensions (= 1.10.0) - sensu-json (= 2.1.1) - sensu-logger (= 1.2.2) - sensu-redis (= 2.4.0) - sensu-settings (= 10.14.0) - sensu-spawn (= 2.5.0) - sensu-transport (= 8.2.0) - sensu-extension (1.5.2) - eventmachine - sensu-extensions (1.10.0) - sensu-extension - sensu-extensions-check-dependencies (= 1.1.0) - sensu-extensions-debug (= 1.0.0) - sensu-extensions-json (= 1.0.0) - sensu-extensions-occurrences (= 1.2.0) - sensu-extensions-only-check-output (= 1.0.0) - sensu-extensions-ruby-hash (= 1.0.0) - sensu-json (>= 1.1.0) - sensu-logger - sensu-settings - sensu-extensions-check-dependencies (1.1.0) - sensu-extension - sensu-extensions-debug (1.0.0) - sensu-extension - sensu-extensions-json (1.0.0) - sensu-extension - sensu-extensions-occurrences (1.2.0) - sensu-extension - sensu-extensions-only-check-output (1.0.0) - sensu-extension - sensu-extensions-ruby-hash (1.0.0) - sensu-extension - sensu-json (2.1.1) - oj (= 2.18.1) - sensu-logger (1.2.2) - eventmachine - sensu-json - sensu-redis (2.4.0) - eventmachine - sensu-settings (10.14.0) - parse-cron - sensu-json (>= 1.1.0) - sensu-spawn (2.5.0) - childprocess (= 0.5.8) - em-worker (= 0.0.2) - eventmachine - ffi (= 1.9.21) - sensu-transport (8.2.0) - amq-protocol (= 2.0.1) - amqp (= 1.6.0) - eventmachine - sensu-redis (>= 1.0.0) + native-package-installer + mime-types (3.5.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2023.0808) + multi_json (1.15.0) + native-package-installer (1.1.8) + reline (0.3.8) + io-console (~> 0.5) PLATFORMS ruby DEPENDENCIES - cztop - ffi-rzmq - iruby - rbczmq - sensu + iruby (= 0.7.4) BUNDLED WITH - 1.17.2 + 2.4.19 diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/default.nix index 260a614fe5..f456d469ca 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/default.nix @@ -2,16 +2,41 @@ , bundlerApp }: -bundlerApp { - pname = "iruby"; - gemdir = ./.; - exes = [ "iruby" ]; +# Jupyter console: +# nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel iruby.definition' - meta = with lib; { - description = "Ruby kernel for Jupyter"; - homepage = "https://github.com/SciRuby/iruby"; - license = licenses.mit; - maintainers = [ maintainers.costrouc ]; - platforms = platforms.unix; +# Jupyter notebook: +# nix run --impure --expr 'with import {}; jupyter.override { definitions.iruby = iruby.definition; }' + +let + self = bundlerApp { + pname = "iruby"; + gemdir = ./.; + exes = [ "iruby" ]; + + passthru = { + definition = { + displayName = "IRuby"; + argv = [ + "${self}/bin/iruby" + "kernel" + "{connection_file}" + ]; + language = "ruby"; + logo32 = null; + logo64 = null; + }; + }; + + meta = { + description = "Ruby kernel for Jupyter"; + homepage = "https://github.com/SciRuby/iruby"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ costrouc thomasjm ]; + platforms = lib.platforms.unix; + }; }; -} + +in + +self diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix index 59630f0a53..314b78be4b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/gemset.nix @@ -1,89 +1,4 @@ { - addressable = { - dependencies = ["public_suffix"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; - type = "gem"; - }; - version = "2.6.0"; - }; - amq-protocol = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rpn9vgh7y037aqhhp04smihzr73vp5i5g6xlqlha10wy3q0wp7x"; - type = "gem"; - }; - version = "2.0.1"; - }; - amqp = { - dependencies = ["amq-protocol" "eventmachine"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0kbrqnpjgj9v0722p3n5rw589l4g26ry8mcghwc5yr20ggkpdaz9"; - type = "gem"; - }; - version = "1.6.0"; - }; - bond = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1r19ifc4skyl2gxnifrxa5jvbbay9fb2in79ppgv02b6n4bhsw90"; - type = "gem"; - }; - version = "0.5.1"; - }; - childprocess = { - dependencies = ["ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1lv7axi1fhascm9njxh3lx1rbrnsm8wgvib0g7j26v4h1fcphqg0"; - type = "gem"; - }; - version = "0.5.8"; - }; - cookiejar = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0q0kmbks9l3hl0wdq744hzy97ssq9dvlzywyqv9k9y1p3qc9va2a"; - type = "gem"; - }; - version = "0.3.3"; - }; - czmq-ffi-gen = { - dependencies = ["ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1ngsd1yxiayd50v402vwhmq7ma9ang6pcba5kqiwq7smpdvfmbmp"; - type = "gem"; - }; - version = "0.15.0"; - }; - cztop = { - dependencies = ["czmq-ffi-gen"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12xcz7g42dbp2ryhcwdm2ykj7bmwfhjhla296hy18g7a09zlfnz7"; - type = "gem"; - }; - version = "0.13.1"; - }; data_uri = { groups = ["default"]; platforms = []; @@ -94,69 +9,15 @@ }; version = "0.1.0"; }; - em-http-request = { - dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "13rxmbi0fv91n4sg300v3i9iiwd0jxv0i6xd0sp81dx3jlx7kasx"; - type = "gem"; - }; - version = "1.1.5"; - }; - em-http-server = { - dependencies = ["eventmachine"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0y8l4gymy9dzjjchjav90ck6has2i2zdjihlhcyrg3jgq6kjzyq5"; - type = "gem"; - }; - version = "0.1.8"; - }; - em-socksify = { - dependencies = ["eventmachine"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0rk43ywaanfrd8180d98287xv2pxyl7llj291cwy87g1s735d5nk"; - type = "gem"; - }; - version = "0.3.2"; - }; - em-worker = { - dependencies = ["eventmachine"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0z4jx9z2q5hxvdvik4yp0ahwfk69qsmdnyp72ln22p3qlkq2z5wk"; - type = "gem"; - }; - version = "0.0.2"; - }; - eventmachine = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r"; - type = "gem"; - }; - version = "1.2.7"; - }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2dl10pi6a30kcvx2s6p2v1wb4kbm48iv38kmz2ff600nirhpb8"; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; type = "gem"; }; - version = "1.9.21"; + version = "1.15.5"; }; ffi-rzmq = { dependencies = ["ffi-rzmq-core"]; @@ -180,250 +41,88 @@ }; version = "1.0.7"; }; - "http_parser.rb" = { + io-console = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff"; type = "gem"; }; version = "0.6.0"; }; - iruby = { - dependencies = ["bond" "data_uri" "mimemagic" "multi_json"]; + irb = { + dependencies = ["reline"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wdf2c0x8y6cya0n3y0p3p7b1sxkb2fdavdn2k58rf4rs37s7rzn"; + sha256 = "158ca10kj3qqnql5g8f1g2arsnhgdl79mg74manpf8ldkwjjn3n8"; type = "gem"; }; - version = "0.3"; + version = "1.7.4"; }; - mimemagic = { + iruby = { + dependencies = ["data_uri" "ffi-rzmq" "irb" "mime-types" "multi_json" "native-package-installer"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw"; + sha256 = "0856ncjk7akm55gxcnhfmv426xsl4ryywdxrqbwgphwpqwm9w8fc"; type = "gem"; }; - version = "0.3.3"; + version = "0.7.4"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; + type = "gem"; + }; + version = "3.5.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a"; + type = "gem"; + }; + version = "3.2023.0808"; }; multi_json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "1.13.1"; + version = "1.15.0"; }; - oj = { + native-package-installer = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "147whmq8h2n04chskl3v4a132xhz5i6kk6vhnz83jwng4vihin5f"; + sha256 = "004wx9xhcam92g1d4ybvrl1yqablm2svalyck9sq4igy9nwkz9nb"; type = "gem"; }; - version = "2.18.1"; + version = "1.1.8"; }; - parse-cron = { + reline = { + dependencies = ["io-console"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02fj9i21brm88nb91ikxwxbwv9y7mb7jsz6yydh82rifwq7357hg"; + sha256 = "0lv1nv7z63n4qmsm3h5h273m7daxngkcq8ynkk9j8lmn7jji98lb"; type = "gem"; }; - version = "0.1.4"; - }; - public_suffix = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l"; - type = "gem"; - }; - version = "3.0.3"; - }; - rbczmq = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1bqr44m2nb61smza6y5cahp09hk16lsn0z3wpq9g5zpr9nhp50fx"; - type = "gem"; - }; - version = "1.7.9"; - }; - sensu = { - dependencies = ["em-http-request" "em-http-server" "eventmachine" "parse-cron" "sensu-extension" "sensu-extensions" "sensu-json" "sensu-logger" "sensu-redis" "sensu-settings" "sensu-spawn" "sensu-transport"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1rxv6yj63nkxlzmmqk6qpfpcvrbar9s4sd4kgfb5zsv9bw7236cr"; - type = "gem"; - }; - version = "1.6.2"; - }; - sensu-extension = { - dependencies = ["eventmachine"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bpizp4n01rv72cryjjlrbfxxj3csish3mkxjzdy4inpi5j5h1dw"; - type = "gem"; - }; - version = "1.5.2"; - }; - sensu-extensions = { - dependencies = ["sensu-extension" "sensu-extensions-check-dependencies" "sensu-extensions-debug" "sensu-extensions-json" "sensu-extensions-occurrences" "sensu-extensions-only-check-output" "sensu-extensions-ruby-hash" "sensu-json" "sensu-logger" "sensu-settings"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "04v221qjv8qy3jci40i66p63ig5vrrh0dpgmf1l8229x5m7bxrsg"; - type = "gem"; - }; - version = "1.10.0"; - }; - sensu-extensions-check-dependencies = { - dependencies = ["sensu-extension"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hc4kz7k983f6fk27ikg5drvxm4a85qf1k07hqssfyk3k75jyj1r"; - type = "gem"; - }; - version = "1.1.0"; - }; - sensu-extensions-debug = { - dependencies = ["sensu-extension"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "11abdgn2kkkbvxq4692yg6a27qnxz4349gfiq7d35biy7vrw34lp"; - type = "gem"; - }; - version = "1.0.0"; - }; - sensu-extensions-json = { - dependencies = ["sensu-extension"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wnbn9sycdqdh9m0fhszaqkv0jijs3fkdbvcv8kdspx6irbv3m6g"; - type = "gem"; - }; - version = "1.0.0"; - }; - sensu-extensions-occurrences = { - dependencies = ["sensu-extension"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lx5wsbblfs0rvkxfg09bsz0g2mwmckrhga7idnarsnm8m565v1v"; - type = "gem"; - }; - version = "1.2.0"; - }; - sensu-extensions-only-check-output = { - dependencies = ["sensu-extension"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0ds2i8wd4ji9ifig2zzr4jpxinvk5dm7j10pvaqy4snykxa3rqh3"; - type = "gem"; - }; - version = "1.0.0"; - }; - sensu-extensions-ruby-hash = { - dependencies = ["sensu-extension"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1xyrj3gbmslbivcd5qcmyclgapn7qf7f5jwfvfpw53bxzib0h7s3"; - type = "gem"; - }; - version = "1.0.0"; - }; - sensu-json = { - dependencies = ["oj"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "08zlxg5j3bhs72cc7wcllp026jbif0xiw6ib1cgawndlpsfl9fgx"; - type = "gem"; - }; - version = "2.1.1"; - }; - sensu-logger = { - dependencies = ["eventmachine" "sensu-json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0jpw4kz36ilaknrzb3rbkhpbgv93w2d668z2cv395dq30d4d3iwm"; - type = "gem"; - }; - version = "1.2.2"; - }; - sensu-redis = { - dependencies = ["eventmachine"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0widfmmj1h9ca2kk14wy1sqmlkq40linp89a73s3ghngnzri0xyk"; - type = "gem"; - }; - version = "2.4.0"; - }; - sensu-settings = { - dependencies = ["parse-cron" "sensu-json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "152n4hazv2l4vbzrgd316rpj135jmz042fyh6k2yv2kw0x29pi0f"; - type = "gem"; - }; - version = "10.14.0"; - }; - sensu-spawn = { - dependencies = ["childprocess" "em-worker" "eventmachine" "ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "17yc8ivjpjbvig9r7yl6991d6ma0kcq75fbpz6i856ljvcr3lmd5"; - type = "gem"; - }; - version = "2.5.0"; - }; - sensu-transport = { - dependencies = ["amq-protocol" "amqp" "eventmachine" "sensu-redis"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0x6vyfmg1jm1srf7xa5aka73by7qwcmry2rx8kq8phwa4g0v4mzr"; - type = "gem"; - }; - version = "8.2.0"; + version = "0.3.8"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/update.sh b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/update.sh new file mode 100755 index 0000000000..11ae225a79 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/iruby/update.sh @@ -0,0 +1,18 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq bundler bundix ruby + +set -eu -o pipefail + +cd "$(dirname "$0")" + +# Update Gemfile with the latest iruby version +echo "source 'https://rubygems.org'" > Gemfile +echo -n "gem 'iruby', " >> Gemfile +curl https://rubygems.org/api/v1/gems/iruby.json | jq .version >> Gemfile + +# Regenerate Gemfile.lock +export BUNDLE_FORCE_RUBY_PLATFORM=1 +bundle lock + +# Regenerate gemset.nix +bundix -l diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/default.nix index a9770a5c1b..88bc1b2803 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -7,8 +7,11 @@ , python3 }: -# To test: -# $(nix-build -E 'with import {}; jupyter.override { definitions = { octave = octave-kernel.definition; }; }')/bin/jupyter-notebook +# Jupyter console: +# nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel octave-kernel.definition' + +# Jupyter notebook: +# nix run --impure --expr 'with import {}; jupyter.override { definitions.octave = octave-kernel.definition; }' let kernel = callPackage ./kernel.nix { diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix index 2d00d6e1fc..efa78f74bc 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix @@ -2,8 +2,12 @@ , wolfram-engine }: -# To test: -# $(nix-build -E 'with import ./. {}; jupyter.override { definitions = { wolfram = wolfram-for-jupyter-kernel.definition; }; }')/bin/jupyter-notebook +# Jupyter console: +# nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel wolfram-for-jupyter-kernel.definition' + +# Jupyter notebook: +# nix run --impure --expr 'with import {}; jupyter.override { definitions.wolfram = wolfram-for-jupyter-kernel.definition; }' + let kernel = callPackage ./kernel.nix {}; in { definition = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/jupyter/console.nix b/third_party/nixpkgs/pkgs/applications/editors/jupyter/console.nix new file mode 100644 index 0000000000..06bc82a178 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/jupyter/console.nix @@ -0,0 +1,37 @@ +{ python3 +, jupyter-kernel +, lib +}: + +let + mkConsole = { + definitions ? jupyter-kernel.default + , kernel ? null + }: + (python3.buildEnv.override { + extraLibs = [ python3.pkgs.jupyter-console ]; + makeWrapperArgs = [ + "--set JUPYTER_PATH ${jupyter-kernel.create { inherit definitions; }}" + ] ++ lib.optionals (kernel != null) [ + "--add-flags --kernel" + "--add-flags ${kernel}" + ]; + }).overrideAttrs (oldAttrs: { + # To facilitate running nix run .#jupyter-console + meta = oldAttrs.meta // { mainProgram = "jupyter-console"; }; + }); + +in + +{ + # Build a console derivation with an arbitrary set of definitions, and an optional kernel to use. + # If the kernel argument is not supplied, Jupyter console will pick a kernel to run from the ones + # available on the system. + inherit mkConsole; + + # An ergonomic way to start a console with a single kernel. + withSingleKernel = definition: mkConsole { + definitions = lib.listToAttrs [(lib.nameValuePair definition.language definition)]; + kernel = definition.language; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix index 77d75eb131..11ed703639 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "kakoune-unwrapped"; - version = "2022.10.31"; + version = "2023.08.05"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; rev = "v${version}"; - sha256 = "sha256-vmzGaGl0KSjseSD/s6DXxvMUTmAle+Iv/ZP9llaFnXk="; + sha256 = "sha256-RR3kw39vEjsg+6cIY6cK2i3ecGHlr1yzuBKaDtGlOGo="; }; makeFlags = [ "debug=no" "PREFIX=${placeholder "out"}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/ldtk/default.nix b/third_party/nixpkgs/pkgs/applications/editors/ldtk/default.nix index 144ad94d96..a9688241ab 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/ldtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/ldtk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ldtk"; - version = "1.3.3"; + version = "1.4.1"; src = fetchurl { url = "https://github.com/deepnight/ldtk/releases/download/v${finalAttrs.version}/ubuntu-distribution.zip"; - hash = "sha256-egvAe4nAzPDBeTaAzrqhlDsG60bGNnKXB5Vt16vIZrQ"; + hash = "sha256-Qt6ADyIbhuxFGh7IP1WwcsvMtjOUZoTd99GeWt5s4UM="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix b/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix index 066b2d13db..d029145934 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.7.3"; + version = "6.7.4"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "sha256-yzYcdKFhpvxmqzxXMpsdySMk3pLd+ve87W0y2epZoqQ="; + sha256 = "sha256-YKK46PeCMOTNOTpMrIgem+Au70Xj+tTHxOhC8alF3ms="; }; dontBuild = true; @@ -60,7 +60,7 @@ mkDerivation rec { description = "A powerful folding editor"; longDescription = "Leo is a PIM, IDE and outliner that accelerates the work flow of programmers, authors and web designers."; license = licenses.mit; - maintainers = with maintainers; [ leonardoce ]; + maintainers = with maintainers; [ leonardoce kashw2 ]; mainProgram = "leo"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/mg/default.nix b/third_party/nixpkgs/pkgs/applications/editors/mg/default.nix index 8545be13e3..c54cd01dbf 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/mg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/mg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mg"; - version = "7.0"; + version = "7.3"; src = fetchFromGitHub { owner = "ibara"; repo = "mg"; rev = "mg-${version}"; - sha256 = "sha256-qnb0yB/NNJV257dsLmP84brajoRG03U+Ja1ACYbBvbE="; + sha256 = "sha256-88FrXN7h5uRLY8YMKSzUjBF4n18DEiiiDyoYr+7qXdQ="; }; postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; homepage = "https://man.openbsd.org/OpenBSD-current/man1/mg.1"; license = licenses.publicDomain; + mainProgram = "mg"; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix b/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix index d4dbb4d97c..964c81a6c4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "micro"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3Rppi8UcAc4zdXOd81Y+sb5Psezx2TQsNw73WdPVMgE="; + hash = "sha256-L8yJE3rjNcx+1gawQ8urZcFfoQdO20E67mJQjWaVwVo="; }; + vendorHash = "sha256-h00s+xqepj+odKAgf54s35xMnnj3gtx5LWDOYFx5GY0="; + nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/micro" ]; - vendorSha256 = "sha256-/bWIn5joZOTOtuAbljOc0NgBfjrFkbFZih+cPNHnS9w="; - ldflags = let t = "github.com/zyedidia/micro/v2/internal"; in [ "-s" "-w" @@ -34,7 +34,7 @@ buildGoModule rec { install -Dm644 assets/micro-logo-mark.svg $out/share/icons/hicolor/scalable/apps/micro.svg ''; - passthru.tests.expect = callPackage ./test-with-expect.nix {}; + passthru.tests.expect = callPackage ./test-with-expect.nix { }; meta = with lib; { homepage = "https://micro-editor.github.io"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/molsketch/default.nix b/third_party/nixpkgs/pkgs/applications/editors/molsketch/default.nix index d688a50f28..55db4096ce 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/molsketch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/molsketch/default.nix @@ -3,11 +3,11 @@ , fetchurl , cmake , pkg-config +, qttools , wrapQtAppsHook , hicolor-icon-theme , openbabel , desktop-file-utils -, qttranslations }: mkDerivation rec { @@ -37,12 +37,11 @@ mkDerivation rec { mv $out/lib/molsketch/* $out/lib ''; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; + nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ hicolor-icon-theme openbabel desktop-file-utils - qttranslations ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix index 5b51f9563c..a8e24956fd 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/nano/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchFromGitHub, ncurses, texinfo, writeScript , common-updater-scripts, git, nix, nixfmt, coreutils, gnused, callPackage -, gettext ? null, enableNls ? true, enableTiny ? false }: +, file ? null, gettext ? null, enableNls ? true, enableTiny ? false }: assert enableNls -> (gettext != null); @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses ] ++ lib.optional (!enableTiny) file; outputs = [ "out" "info" ]; @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { (lib.enableFeature enableTiny "tiny") ]; - postInstall = '' + postInstall = if enableTiny then null else '' cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/ ''; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix index 15b9d0ba80..4b77b2b7c6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/default.nix @@ -7,6 +7,7 @@ , buildPackages , treesitter-parsers ? import ./treesitter-parsers.nix { inherit fetchurl; } , CoreServices +, fixDarwinDylibNames , glibcLocales ? null, procps ? null # now defaults to false because some tests can be flaky (clipboard etc), see @@ -16,8 +17,29 @@ }: let + nvim-lpeg-dylib = luapkgs: if stdenv.isDarwin + then (luapkgs.lpeg.overrideAttrs (oa: { + preConfigure = '' + # neovim wants clang .dylib + sed -i makefile -e "s/CC = gcc/CC = clang/" + sed -i makefile -e "s/-bundle/-dynamiclib/" + ''; + preBuild = '' + # there seems to be implicit calls to Makefile from luarocks, we need to + # add a stage to build our dylib + make macosx + mkdir -p $out/lib + mv lpeg.so $out/lib/lpeg.dylib + ''; + nativeBuildInputs = + oa.nativeBuildInputs + ++ ( + lib.optional stdenv.isDarwin fixDarwinDylibNames + ); + })) + else luapkgs.lpeg; requiredLuaPkgs = ps: (with ps; [ - lpeg + (nvim-lpeg-dylib ps) luabitop mpack ] ++ lib.optionals doCheck [ @@ -40,20 +62,21 @@ let deterministicStringIds = true; self = deterministicLuajit; }; - in deterministicLuajit.withPackages(ps: [ ps.mpack ps.lpeg ]) + in deterministicLuajit.withPackages(ps: [ ps.mpack (nvim-lpeg-dylib ps) ]) else lua.luaOnBuild; pyEnv = python3.withPackages(ps: with ps; [ pynvim msgpack ]); + in stdenv.mkDerivation rec { pname = "neovim-unwrapped"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "neovim"; repo = "neovim"; rev = "v${version}"; - hash = "sha256-G51qD7GklEn0JrneKSSqDDx0Odi7W2FjdQc0ZDE9ZK4="; + hash = "sha256-kKstlq1BzoBAy+gy9iL1auRViJ223cVpAt5X7pUWT1U="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix index 6fd9746566..ccd7d754e4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovide/default.nix @@ -25,16 +25,16 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { pname = "neovide"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "neovide"; repo = "neovide"; rev = version; - sha256 = "sha256-zvpeDaLQvFQn5VfG6lsula/20AF3Oitsq7bLn8TkUiE="; + sha256 = "sha256-JCSFG7W4I1uXsVM7J059tHYq/DB16AZfGjsG0UvfctE="; }; - cargoSha256 = "sha256-4PgwIdi511ScTLwrz89nf/YPJwEKMUgUKbKxLDzBViM="; + cargoSha256 = "sha256-rH4jjbd0C1MKu3RE0bLvLo4iqyUXr0DvCudvFs1F+AA="; SKIA_SOURCE_DIR = let diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix index 2352cdb82a..0fbb54df01 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix @@ -39,11 +39,9 @@ let wrapperArgsStr = if lib.isString wrapperArgs then wrapperArgs else lib.escapeShellArgs wrapperArgs; - # "--add-flags" (lib.escapeShellArgs flags) - # wrapper args used both when generating the manifest and in the final neovim executable - commonWrapperArgs = (lib.optionals (lib.isList wrapperArgs) wrapperArgs) + commonWrapperArgs = # vim accepts a limited number of commands so we join them all - ++ [ + [ "--add-flags" ''--cmd "lua ${providerLuaRc}"'' # (lib.intersperse "|" hostProviderViml) ] ++ lib.optionals (packpathDirs.myNeovimPackages.start != [] || packpathDirs.myNeovimPackages.opt != []) [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix index 42209ad09e..c2b1d62749 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "18"; + version = "19"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - hash = "sha256-CTWOW1vd200oZZYqDRT4wqr4v5I3AAgEcqA/qi9Ief8="; + hash = "sha256-jfcO3WMH0Ir1+VfpZhaRcykTIoTmxA5DK8ZO8orP1Jg="; }; buildCommand = '' @@ -68,7 +68,7 @@ stdenv.mkDerivation { binaryBytecode binaryNativeCode ]; - maintainers = with lib.maintainers; [ sander rszibele ]; + maintainers = with lib.maintainers; [ sander rszibele kashw2 ]; platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/orbiton/default.nix b/third_party/nixpkgs/pkgs/applications/editors/orbiton/default.nix index f3a3e8b023..b541f7a904 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/orbiton/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/orbiton/default.nix @@ -4,13 +4,13 @@ buildGoModule rec { pname = "orbiton"; - version = "2.63.1"; + version = "2.65.1"; src = fetchFromGitHub { owner = "xyproto"; repo = "orbiton"; rev = "v${version}"; - hash = "sha256-ZUbWptE5BckAm/14ZPGJqTbbACC9cDOUUmzzmvuNUSA="; + hash = "sha256-ebtzhir6nBnIawkJJq+BgXv/5CbXtbhujXkMBzQEsNY="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/editors/ox/default.nix b/third_party/nixpkgs/pkgs/applications/editors/ox/default.nix index 0888bc7cea..8822912640 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/ox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/ox/default.nix @@ -8,10 +8,10 @@ rustPlatform.buildRustPackage rec { owner = "curlpipe"; repo = pname; rev = version; - sha256 = "18iffnmvax6mbnhypf7yma98y5q2zlsyp9q18f92fdwz426r33p0"; + hash = "sha256-4I6RjSCfNyeSQwGn6zX9AhePkqr+uOuhXdV0tat1LqI="; }; - cargoSha256 = "0m5vglm58myf50vbb7m6gd3srk3n93afg70lz63i2kciqkkwsnjl"; + cargoHash = "sha256-VFrN58SRTRGH+RSc59RIdsysR3umnrU2KM5XVCp9u1Q="; meta = with lib; { description = "An independent Rust text editor that runs in your terminal"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/pixelorama/default.nix b/third_party/nixpkgs/pkgs/applications/editors/pixelorama/default.nix index dfa7a733e6..0ca79907f8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/pixelorama/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/pixelorama/default.nix @@ -26,13 +26,13 @@ let else throw "unsupported platform"; in stdenv.mkDerivation (finalAttrs: { pname = "pixelorama"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "Orama-Interactive"; repo = "Pixelorama"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-+gPkuVzQ86MzHQ0AjnPDdyk2p7eIxtggq+KJ43KVbk8="; + sha256 = "sha256-jSgSKxW7cxSoSwBytoaQtLwbkYm2udjmaZTHbN1jJwQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix b/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix index 0cdc2d81e7..d2162dc9c9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/pulsar/default.nix @@ -1,44 +1,76 @@ { lib , stdenv , git -, runtimeShell , fetchurl , wrapGAppsHook +, alsa-lib +, at-spi2-atk +, cairo +, cups +, dbus +, expat +, gdk-pixbuf , glib , gtk3 -, atomEnv +, mesa +, nss +, nspr , xorg +, libdrm +, libsecret , libxkbcommon -, hunspell +, pango +, systemd , hunspellDicts , useHunspell ? true , languages ? [ "en_US" ] , withNemoAction ? true , makeDesktopItem , copyDesktopItems -, makeWrapper -, nodePackages +, asar , python3 }: let pname = "pulsar"; - version = "1.107.1"; + version = "1.109.0"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-stY/sutbFVWQuN6C/tkT/G5MMVypgm3Um78jk8RHF6k="; + x86_64-linux.hash = "sha256-pIm3mI1YdfapxXgIciSHtI4LeqMw5RdYTnH+eHUQ4Yo="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-umL60+FJKT8ThnzxgzzVzsY0nhJwsNF4YvrKoruxz7U="; + aarch64-linux.hash = "sha256-KIY/qzfl7CU0YwIgQlNHoAMhLfrTbQe7ZZvzdkUVw+M="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - additionalLibs = lib.makeLibraryPath [ + newLibpath = lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libsecret + mesa + nss + nspr + libdrm + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr xorg.libxshmfence libxkbcommon xorg.libxkbfile + pango stdenv.cc.cc.lib + systemd ]; - newLibpath = "${atomEnv.libPath}:${additionalLibs}"; # Hunspell hunspellDirs = builtins.map (lang: "${hunspellDicts.${lang}}/share/hunspell") languages; @@ -60,7 +92,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook copyDesktopItems - nodePackages.asar + asar ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix index c2cc0fcca5..2ce482f356 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/default.nix @@ -16,13 +16,13 @@ , qtsensors , qtwebengine , qtwebchannel +, quarto , libuuid , hunspellDicts , unzip , ant , jdk , gnumake -, makeWrapper , pandoc , llvmPackages , yaml-cpp @@ -30,6 +30,7 @@ , postgresql , nodejs , mkYarnModules +, fetchYarnDeps , qmake , server ? false # build server version , sqlite @@ -39,36 +40,39 @@ let pname = "RStudio"; - version = "2022.07.1+554"; - RSTUDIO_VERSION_MAJOR = "2022"; - RSTUDIO_VERSION_MINOR = "07"; - RSTUDIO_VERSION_PATCH = "1"; - RSTUDIO_VERSION_SUFFIX = "+554"; + version = + "${RSTUDIO_VERSION_MAJOR}.${RSTUDIO_VERSION_MINOR}.${RSTUDIO_VERSION_PATCH}${RSTUDIO_VERSION_SUFFIX}"; + RSTUDIO_VERSION_MAJOR = "2023"; + RSTUDIO_VERSION_MINOR = "09"; + RSTUDIO_VERSION_PATCH = "0"; + RSTUDIO_VERSION_SUFFIX = "+463"; src = fetchFromGitHub { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "0rmdqxizxqg2vgr3lv066cjmlpjrxjlgi0m97wbh6iyhkfm2rrj1"; + hash = "sha256-FwNuU2rbE3GEhuwphvZISUMhvSZJ6FjjaZ1oQ9F8NWc="; }; mathJaxSrc = fetchurl { url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip"; - sha256 = "sha256-xWy6psTOA8H8uusrXqPDEtL7diajYCVHcMvLiPsgQXY="; + hash = "sha256-xWy6psTOA8H8uusrXqPDEtL7diajYCVHcMvLiPsgQXY="; }; rsconnectSrc = fetchFromGitHub { owner = "rstudio"; repo = "rsconnect"; - rev = "e287b586e7da03105de3faa8774c63f08984eb3c"; - sha256 = "sha256-ULyWdSgGPSAwMt0t4QPuzeUE6Bo6IJh+5BMgW1bFN+Y="; + rev = "5175a927a41acfd9a21d9fdecb705ea3292109f2"; + hash = "sha256-c1fFcN6KAfxXv8bv4WnIqQKg1wcNP2AywhEmIbyzaBA="; }; - panmirrorModules = mkYarnModules { - inherit pname version; - packageJSON = ./package.json; - yarnLock = ./yarn.lock; - yarnNix = ./yarndeps.nix; + # Ideally, rev should match the rstudio release name. + # e.g. release/rstudio-mountain-hydrangea + quartoSrc = fetchFromGitHub { + owner = "quarto-dev"; + repo = "quarto"; + rev = "bb264a572c6331d46abcf087748c021d815c55d7"; + hash = "sha256-lZnZvioztbBWWa6H177X6rRrrgACx2gMjVFDgNup93g="; }; description = "Set of integrated tools for the R language"; @@ -82,7 +86,6 @@ in unzip ant jdk - makeWrapper pandoc nodejs ] ++ lib.optionals (!server) [ @@ -98,6 +101,7 @@ in yaml-cpp soci postgresql + quarto ] ++ (if server then [ sqlite.dev pam @@ -111,11 +115,10 @@ in cmakeFlags = [ "-DRSTUDIO_TARGET=${if server then "Server" else "Desktop"}" - "-DCMAKE_BUILD_TYPE=Release" "-DRSTUDIO_USE_SYSTEM_SOCI=ON" "-DRSTUDIO_USE_SYSTEM_BOOST=ON" "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON" - "-DQUARTO_ENABLED=FALSE" + "-DQUARTO_ENABLED=TRUE" "-DPANDOC_VERSION=${pandoc.version}" "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio" ] ++ lib.optionals (!server) [ @@ -129,8 +132,7 @@ in ./use-system-node.patch ./fix-resources-path.patch ./pandoc-nix-path.patch - ./remove-quarto-from-generator.patch - ./do-not-install-pandoc.patch + ./use-system-quarto.patch ]; postPatch = '' @@ -140,16 +142,20 @@ in --replace 'SOCI_LIBRARY_DIR "/usr/lib"' 'SOCI_LIBRARY_DIR "${soci}/lib"' substituteInPlace src/gwt/build.xml \ - --replace '@node@' ${nodejs} + --replace '@node@' ${nodejs} \ + --replace './lib/quarto' ${quartoSrc} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ --replace '@libclang@' ${llvmPackages.libclang.lib} \ --replace '@libclang.so@' ${llvmPackages.libclang.lib}/lib/libclang.so - substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ - --replace '@pandoc@' ${pandoc}/bin/pandoc + substituteInPlace src/cpp/session/CMakeLists.txt \ + --replace '@pandoc@' ${pandoc} \ + --replace '@quarto@' ${quarto} - sed '1i#include ' -i src/cpp/core/include/core/Thread.hpp + substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \ + --replace '@pandoc@' ${pandoc}/bin \ + --replace '@quarto@' ${quarto} ''; hunspellDictionaries = with lib; filter isDerivation (unique (attrValues hunspellDicts)); @@ -177,8 +183,6 @@ in cp -r ${rsconnectSrc} dependencies/rsconnect ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect ) - - cp -r "${panmirrorModules}" src/gwt/panmirror/src/editor/node_modules ''; postInstall = '' @@ -202,14 +206,14 @@ in rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION} ''; - meta = with lib; { + meta = { broken = (stdenv.isLinux && stdenv.isAarch64); inherit description; homepage = "https://www.rstudio.com/"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ ciil cfhammill ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ ciil cfhammill ]; mainProgram = "rstudio" + lib.optionalString server "-server"; - platforms = platforms.linux; + platforms = lib.platforms.linux; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/do-not-install-pandoc.patch b/third_party/nixpkgs/pkgs/applications/editors/rstudio/do-not-install-pandoc.patch deleted file mode 100644 index 25bfb2b1e8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/do-not-install-pandoc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/cpp/session/CMakeLists.txt -+++ b/src/cpp/session/CMakeLists.txt -@@ -60,8 +60,7 @@ - - # validate our dependencies exist - foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR -- RSTUDIO_DEPENDENCIES_MATHJAX_DIR -- RSTUDIO_DEPENDENCIES_PANDOC_DIR) -+ RSTUDIO_DEPENDENCIES_MATHJAX_DIR) - - # validate existence - if(NOT EXISTS "${${VAR}}") - diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/package.json b/third_party/nixpkgs/pkgs/applications/editors/rstudio/package.json deleted file mode 100644 index 6677ca9e06..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/package.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "name": "panmirror", - "version": "0.1.0", - "private": true, - "license": "agpl-3.0", - "dependencies": { - "@types/ace": "^0.0.43", - "@types/clipboard": "^2.0.7", - "@types/diff-match-patch": "^1.0.32", - "@types/js-yaml": "^4.0.3", - "@types/lodash.debounce": "^4.0.6", - "@types/lodash.orderby": "^4.6.6", - "@types/lodash.uniqby": "^4.7.6", - "@types/orderedmap": "^1.0.0", - "@types/pinyin": "^2.10.0", - "@types/prosemirror-commands": "^1.0.4", - "@types/prosemirror-dropcursor": "^1.0.3", - "@types/prosemirror-gapcursor": "^1.0.4", - "@types/prosemirror-history": "^1.0.3", - "@types/prosemirror-inputrules": "^1.0.4", - "@types/prosemirror-keymap": "^1.0.4", - "@types/prosemirror-schema-list": "^1.0.3", - "@types/prosemirror-tables": "^0.9.1", - "@types/react": "^17.0.20", - "@types/react-dom": "^17.0.9", - "@types/react-window": "^1.8.5", - "@types/transliteration": "^1.6.6", - "@types/zenscroll": "^4.0.1", - "biblatex-csl-converter": "^2.0.2", - "clipboard": "^2.0.8", - "diff-match-patch": "^1.0.5", - "fuse.js": "^6.4.6", - "js-yaml": "^4.1.0", - "lodash.debounce": "^4.0.8", - "lodash.orderby": "^4.6.0", - "lodash.uniqby": "^4.7.0", - "orderedmap": "^1.0.0", - "pinyin": "^2.10.2", - "prosemirror-changeset": "^2.1.2", - "prosemirror-commands": "^1.1.10", - "prosemirror-dev-tools": "^2.1.1", - "prosemirror-dropcursor": "^1.3.5", - "prosemirror-gapcursor": "^1.1.5", - "prosemirror-history": "^1.2.0", - "prosemirror-inputrules": "^1.1.3", - "prosemirror-keymap": "^1.1.4", - "prosemirror-model": "^1.14.3", - "prosemirror-schema-list": "^1.1.5", - "prosemirror-state": "^1.3.4", - "prosemirror-tables": "^1.1.1", - "prosemirror-transform": "^1.3.2", - "prosemirror-utils": "^0.9.6", - "prosemirror-view": "^1.20.1", - "react": "^17.0.2", - "react-dom": "^17.0.2", - "react-window": "^1.8.6", - "sentence-splitter": "^3.2.2", - "thenby": "^1.3.3", - "tlite": "^0.1.9", - "transliteration": "^2.2.0", - "typescript": "3.8.3", - "zenscroll": "^4.0.2" - }, - "scripts": { - "format": "prettier --write \"src/**/*.ts\" \"src/**/*.tsx\"", - "lint": "tslint -c tslint.json 'src/**/*.{ts,tsx}'", - "watch": "tsc --watch --noEmit --project './tsconfig.json'", - "generate-symbols": "ts-node tools/generate-symbols.ts" - }, - "devDependencies": { - "@types/node": "^14.0.4", - "@types/unzip": "^0.1.1", - "fast-xml-parser": "^3.17.1", - "fuse-box": "^3.7.1", - "prettier": "^1.18.2", - "terser": "^4.6.2", - "ts-node": "^8.10.2", - "tslint": "^5.20.0", - "tslint-config-prettier": "^1.18.0", - "tslint-react": "^5.0.0", - "typescript-tslint-plugin": "^0.5.5", - "uglify-js": "^3.7.4", - "unzip": "^0.1.11" - } -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch b/third_party/nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch index a2b9bbd9f0..2782a5a0d7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/pandoc-nix-path.patch @@ -1,11 +1,18 @@ --- a/src/cpp/session/include/session/SessionConstants.hpp +++ b/src/cpp/session/include/session/SessionConstants.hpp -@@ -140,7 +140,7 @@ +@@ -142,13 +142,13 @@ + #define kSessionTmpDir "rstudio-rsession" + #ifdef QUARTO_ENABLED - # define kDefaultPandocPath "bin/quarto/bin" - #else --# define kDefaultPandocPath "bin/pandoc" +-# define kDefaultPandocPath "bin/quarto/bin/tools" +# define kDefaultPandocPath "@pandoc@" + #else + # define kDefaultPandocPath "bin/pandoc" #endif - #define kDefaultQuartoPath "bin/quarto" + #define kDefaultNodePath "bin/node" +-#define kDefaultQuartoPath "bin/quarto" ++#define kDefaultQuartoPath "@quarto@" + #define kDefaultRsclangPath "bin/rsclang" + + #ifdef _WIN32 diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/remove-quarto-from-generator.patch b/third_party/nixpkgs/pkgs/applications/editors/rstudio/remove-quarto-from-generator.patch deleted file mode 100644 index 1c28bbada6..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/remove-quarto-from-generator.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/src/cpp/session/CMakeLists.txt -+++ b/src/cpp/session/CMakeLists.txt -@@ -43,12 +43,6 @@ - set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27") - endif() - -- if(EXISTS "${RSTUDIO_TOOLS_ROOT}/quarto") -- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_TOOLS_ROOT}/quarto") -- else() -- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_DEPENDENCIES_DIR}/quarto") -- endif() -- - endif() - - -@@ -67,14 +61,7 @@ - # validate our dependencies exist - foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR - RSTUDIO_DEPENDENCIES_MATHJAX_DIR -- RSTUDIO_DEPENDENCIES_PANDOC_DIR -- RSTUDIO_DEPENDENCIES_QUARTO_DIR) -- -- -- # skip quarto if not enabled -- if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED) -- continue() -- endif() -+ RSTUDIO_DEPENDENCIES_PANDOC_DIR) - - # validate existence - if(NOT EXISTS "${${VAR}}") - diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/use-system-node.patch b/third_party/nixpkgs/pkgs/applications/editors/rstudio/use-system-node.patch index 248f4fe86e..8593490961 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/use-system-node.patch +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/use-system-node.patch @@ -1,29 +1,60 @@ +diff --git a/src/gwt/build.xml b/src/gwt/build.xml +index 83e9433..f1ee63d 100644 --- a/src/gwt/build.xml +++ b/src/gwt/build.xml -@@ -83,24 +83,7 @@ - Concatenated acesupport files to 'acesupport.js' - - -- -- -- -- -- +@@ -87,29 +87,7 @@ + + + +- +- - - - - -- +- +- - - -- -- +- - -+ +- property="yarn.bin" +- value="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/yarn" +- file="/opt/rstudio-tools/dependencies/common/node/${node.version}/bin/yarn"/> +- +- ++ - + - +@@ -126,21 +104,11 @@ + file="c:\rstudio-tools\src\gwt\lib\quarto\apps\panmirror"/> + + +- +- + +- +- +- +- +- +- +- +- ++ ++ ++ + +- +- +- + + + diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/use-system-quarto.patch b/third_party/nixpkgs/pkgs/applications/editors/rstudio/use-system-quarto.patch new file mode 100644 index 0000000000..89653219db --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/rstudio/use-system-quarto.patch @@ -0,0 +1,46 @@ +--- a/src/cpp/session/CMakeLists.txt ++++ b/src/cpp/session/CMakeLists.txt +@@ -36,18 +36,14 @@ + else() + set(RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR "${RSTUDIO_DEPENDENCIES_DIR}/dictionaries") + endif() +- ++ + if(EXISTS "${RSTUDIO_TOOLS_ROOT}/mathjax-27") + set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_TOOLS_ROOT}/mathjax-27") + else() + set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27") + endif() + +- if(EXISTS "${RSTUDIO_TOOLS_ROOT}/quarto") +- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_TOOLS_ROOT}/quarto") +- else() +- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_DEPENDENCIES_DIR}/quarto") +- endif() ++ set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "@quarto@") + + endif() + +@@ -56,7 +52,7 @@ + # - by default, we use quarto + quarto's bundled pandoc + # - if quarto is not enabled, use pandoc fallback + if(QUARTO_ENABLED) +- set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin/tools") ++ set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "@pandoc@/bin") + elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") + set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") + else() +@@ -66,11 +62,9 @@ + + # validate our dependencies exist + foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR +- RSTUDIO_DEPENDENCIES_MATHJAX_DIR +- RSTUDIO_DEPENDENCIES_PANDOC_DIR +- RSTUDIO_DEPENDENCIES_QUARTO_DIR) ++ RSTUDIO_DEPENDENCIES_MATHJAX_DIR) ++ + +- + # skip quarto if not enabled + if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED) + continue() diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/yarn.lock b/third_party/nixpkgs/pkgs/applications/editors/rstudio/yarn.lock deleted file mode 100644 index ce02ab6748..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/yarn.lock +++ /dev/null @@ -1,4200 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@babel/code-frame@^7.0.0": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" - integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== - dependencies: - "@babel/highlight" "^7.8.3" - -"@babel/helper-module-imports@^7.0.0": - version "7.15.4" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f" - integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA== - dependencies: - "@babel/types" "^7.15.4" - -"@babel/helper-validator-identifier@^7.14.9": - version "7.14.9" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" - integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== - -"@babel/highlight@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" - integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg== - dependencies: - chalk "^2.0.0" - esutils "^2.0.2" - js-tokens "^4.0.0" - -"@babel/runtime@^7.0.0": - version "7.9.6" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f" - integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308" - integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ== - dependencies: - regenerator-runtime "^0.13.2" - -"@babel/types@^7.15.4": - version "7.15.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f" - integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig== - dependencies: - "@babel/helper-validator-identifier" "^7.14.9" - to-fast-properties "^2.0.0" - -"@emotion/babel-utils@^0.6.4": - version "0.6.10" - resolved "https://registry.yarnpkg.com/@emotion/babel-utils/-/babel-utils-0.6.10.tgz#83dbf3dfa933fae9fc566e54fbb45f14674c6ccc" - integrity sha512-/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow== - dependencies: - "@emotion/hash" "^0.6.6" - "@emotion/memoize" "^0.6.6" - "@emotion/serialize" "^0.9.1" - convert-source-map "^1.5.1" - find-root "^1.1.0" - source-map "^0.7.2" - -"@emotion/hash@^0.6.2", "@emotion/hash@^0.6.6": - version "0.6.6" - resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz#62266c5f0eac6941fece302abad69f2ee7e25e44" - integrity sha512-ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ== - -"@emotion/is-prop-valid@^0.6.1": - version "0.6.8" - resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.6.8.tgz#68ad02831da41213a2089d2cab4e8ac8b30cbd85" - integrity sha512-IMSL7ekYhmFlILXcouA6ket3vV7u9BqStlXzbKOF9HBtpUPMMlHU+bBxrLOa2NvleVwNIxeq/zL8LafLbeUXcA== - dependencies: - "@emotion/memoize" "^0.6.6" - -"@emotion/memoize@^0.6.1", "@emotion/memoize@^0.6.6": - version "0.6.6" - resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.6.tgz#004b98298d04c7ca3b4f50ca2035d4f60d2eed1b" - integrity sha512-h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ== - -"@emotion/serialize@^0.9.1": - version "0.9.1" - resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.1.tgz#a494982a6920730dba6303eb018220a2b629c145" - integrity sha512-zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ== - dependencies: - "@emotion/hash" "^0.6.6" - "@emotion/memoize" "^0.6.6" - "@emotion/unitless" "^0.6.7" - "@emotion/utils" "^0.8.2" - -"@emotion/stylis@^0.7.0": - version "0.7.1" - resolved "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz#50f63225e712d99e2b2b39c19c70fff023793ca5" - integrity sha512-/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ== - -"@emotion/unitless@^0.6.2", "@emotion/unitless@^0.6.7": - version "0.6.7" - resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.7.tgz#53e9f1892f725b194d5e6a1684a7b394df592397" - integrity sha512-Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg== - -"@emotion/utils@^0.8.2": - version "0.8.2" - resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz#576ff7fb1230185b619a75d258cbc98f0867a8dc" - integrity sha512-rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw== - -"@mapbox/node-pre-gyp@^1.0.4": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.5.tgz#2a0b32fcb416fb3f2250fd24cb2a81421a4f5950" - integrity sha512-4srsKPXWlIxp5Vbqz5uLfBN+du2fJChBoYn/f2h991WLdk7jUvcSk/McVLSv/X+xQIPI8eGD5GjrnygdyHnhPA== - dependencies: - detect-libc "^1.0.3" - https-proxy-agent "^5.0.0" - make-dir "^3.1.0" - node-fetch "^2.6.1" - nopt "^5.0.0" - npmlog "^4.1.2" - rimraf "^3.0.2" - semver "^7.3.4" - tar "^6.1.0" - -"@textlint/ast-node-types@^4.4.2": - version "4.4.3" - resolved "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-4.4.3.tgz#fdba16e8126cddc50f45433ce7f6c55e7829566c" - integrity sha512-qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A== - -"@types/ace@^0.0.43": - version "0.0.43" - resolved "https://registry.yarnpkg.com/@types/ace/-/ace-0.0.43.tgz#9f0916174b6060dabbccd36ba4868ea769a1c633" - integrity sha512-eQdX8AQ7CfSHym07MZMBQ8FKUj9AZ2Wcc26W5Ct8J4KOMjFY6SFUaf2YA8YHBut0Fwl//2kZ+0GLZNp+NQNRIA== - -"@types/clipboard@^2.0.7": - version "2.0.7" - resolved "https://registry.yarnpkg.com/@types/clipboard/-/clipboard-2.0.7.tgz#db578ceec578947be2d603b003667ebdd5f274e1" - integrity sha512-VwVFUHlneOsWfv/GaaY7Kwk4XasDqkAlyFQtsHxnOw0yyBYWTrlEXtmb9RtC+VFBCdtuOeIXECmELNd5RrKp/g== - dependencies: - clipboard "*" - -"@types/diff-match-patch@^1.0.32": - version "1.0.32" - resolved "https://registry.yarnpkg.com/@types/diff-match-patch/-/diff-match-patch-1.0.32.tgz#d9c3b8c914aa8229485351db4865328337a3d09f" - integrity sha512-bPYT5ECFiblzsVzyURaNhljBH2Gh1t9LowgUwciMrNAhFewLkHT2H0Mto07Y4/3KCOGZHRQll3CTtQZ0X11D/A== - -"@types/js-yaml@^4.0.3": - version "4.0.3" - resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.3.tgz#9f33cd6fbf0d5ec575dc8c8fc69c7fec1b4eb200" - integrity sha512-5t9BhoORasuF5uCPr+d5/hdB++zRFUTMIZOzbNkr+jZh3yQht4HYbRDyj9fY8n2TZT30iW9huzav73x4NikqWg== - -"@types/lodash.debounce@^4.0.6": - version "4.0.6" - resolved "https://registry.yarnpkg.com/@types/lodash.debounce/-/lodash.debounce-4.0.6.tgz#c5a2326cd3efc46566c47e4c0aa248dc0ee57d60" - integrity sha512-4WTmnnhCfDvvuLMaF3KV4Qfki93KebocUF45msxhYyjMttZDQYzHkO639ohhk8+oco2cluAFL3t5+Jn4mleylQ== - dependencies: - "@types/lodash" "*" - -"@types/lodash.orderby@^4.6.6": - version "4.6.6" - resolved "https://registry.yarnpkg.com/@types/lodash.orderby/-/lodash.orderby-4.6.6.tgz#126543bb597477dc9b27d748b5822244f577915c" - integrity sha512-wQzu6xK+bSwhu45OeMI7fjywiIZiiaBzJB8W3fwnF1SJXHoOXRLutrSnVmq4yHPOM036qsy8lx9wHQcAbXNjJw== - dependencies: - "@types/lodash" "*" - -"@types/lodash.uniqby@^4.7.6": - version "4.7.6" - resolved "https://registry.yarnpkg.com/@types/lodash.uniqby/-/lodash.uniqby-4.7.6.tgz#672827a701403f07904fe37f0721ae92abfa80e8" - integrity sha512-9wBhrm1y6asW50Joj6tsySCNUgzK2tCqL7vtKIej0E9RyeBFdcte7fxUosmFuMoOU0eHqOMK76kCCrK99jxHgg== - dependencies: - "@types/lodash" "*" - -"@types/lodash@*": - version "4.14.154" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.154.tgz#069e3c703fdb264e67be9e03b20a640bc0198ecc" - integrity sha512-VoDZIJmg3P8vPEnTldLvgA+q7RkIbVkbYX4k0cAVFzGAOQwUehVgRHgIr2/wepwivDst/rVRqaiBSjCXRnoWwQ== - -"@types/node@*", "@types/node@^14.0.4": - version "14.0.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.4.tgz#43a63fc5edce226bed106b31b875165256271107" - integrity sha512-k3NqigXWRzQZVBDS5D1U70A5E8Qk4Kh+Ha/x4M8Bt9pF0X05eggfnC9+63Usc9Q928hRUIpIhTQaXsZwZBl4Ew== - -"@types/orderedmap@*", "@types/orderedmap@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/orderedmap/-/orderedmap-1.0.0.tgz#807455a192bba52cbbb4517044bc82bdbfa8c596" - integrity sha512-dxKo80TqYx3YtBipHwA/SdFmMMyLCnP+5mkEqN0eMjcTBzHkiiX0ES118DsjDBjvD+zeSsSU9jULTZ+frog+Gw== - -"@types/parse-json@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" - integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== - -"@types/pinyin@^2.10.0": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@types/pinyin/-/pinyin-2.10.0.tgz#074964ec2f777d632e221f927a975bb7d51ded9a" - integrity sha512-YLty6FPYiBgxNbQNaTRJquvflRdG026jjOpjNXR7HdGEJPGtmPBp1x9LkWePCNA/ClaTT0hYem080TbRCMLbew== - -"@types/prop-types@*": - version "15.7.3" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" - integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== - -"@types/prosemirror-commands@*": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@types/prosemirror-commands/-/prosemirror-commands-1.0.3.tgz#e9fa5653cffd1c75c260594cf3ec5244c9004dbf" - integrity sha512-AjFCJqBvAhQ4gOzXPgUcnEZwu4jd7se7ani3dYAv8p4L+cWEPD6Pshrpp5uJDI5/pzvNXLWQ/4c2Qk4h9IML1w== - dependencies: - "@types/prosemirror-model" "*" - "@types/prosemirror-state" "*" - "@types/prosemirror-view" "*" - -"@types/prosemirror-commands@^1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@types/prosemirror-commands/-/prosemirror-commands-1.0.4.tgz#d08551415127d93ae62e7239d30db0b5e7208e22" - integrity sha512-utDNYB3EXLjAfYIcRWJe6pn3kcQ5kG4RijbT/0Y/TFOm6yhvYS/D9eJVnijdg9LDjykapcezchxGRqFD5LcyaQ== - dependencies: - "@types/prosemirror-model" "*" - "@types/prosemirror-state" "*" - "@types/prosemirror-view" "*" - -"@types/prosemirror-dropcursor@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@types/prosemirror-dropcursor/-/prosemirror-dropcursor-1.0.3.tgz#49250849b8a0b86e8c29eb1ba70a463e53e46947" - integrity sha512-b0/8njnJ4lwyHKcGuCMf3x7r1KjxyugB1R/c2iMCjplsJHSC7UY9+OysqgJR5uUXRekUSGniiLgBtac/lvH6wg== - dependencies: - "@types/prosemirror-state" "*" - -"@types/prosemirror-gapcursor@^1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@types/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.4.tgz#7df7d373edb33ea8da12084bfd462cf84cd69761" - integrity sha512-9xKjFIG5947dzerFvkLWp6F53JwrUYoYwh3SgcTFEp8SbSfNNrez/PFYVZKPnoqPoaK5WtTdQTaMwpCV9rXQIg== - dependencies: - "@types/prosemirror-model" "*" - "@types/prosemirror-state" "*" - -"@types/prosemirror-history@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@types/prosemirror-history/-/prosemirror-history-1.0.3.tgz#f1110efbe758129b5475e466ff077f0a8d9b964f" - integrity sha512-5TloMDRavgLjOAKXp1Li8u0xcsspzbT1Cm9F2pwHOkgvQOz1jWQb2VIXO7RVNsFjLBZdIXlyfSLivro3DuMWXg== - dependencies: - "@types/prosemirror-model" "*" - "@types/prosemirror-state" "*" - -"@types/prosemirror-inputrules@^1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@types/prosemirror-inputrules/-/prosemirror-inputrules-1.0.4.tgz#4cb75054d954aa0f6f42099be05eb6c0e6958bae" - integrity sha512-lJIMpOjO47SYozQybUkpV6QmfuQt7GZKHtVrvS+mR5UekA8NMC5HRIVMyaIauJLWhKU6oaNjpVaXdw41kh165g== - dependencies: - "@types/prosemirror-model" "*" - "@types/prosemirror-state" "*" - -"@types/prosemirror-keymap@^1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@types/prosemirror-keymap/-/prosemirror-keymap-1.0.4.tgz#f73c79810e8d0e0a20d153d84f998f02e5afbc0c" - integrity sha512-ycevwkqUh+jEQtPwqO7sWGcm+Sybmhu8MpBsM8DlO3+YTKnXbKA6SDz/+q14q1wK3UA8lHJyfR+v+GPxfUSemg== - dependencies: - "@types/prosemirror-commands" "*" - "@types/prosemirror-model" "*" - "@types/prosemirror-state" "*" - "@types/prosemirror-view" "*" - -"@types/prosemirror-model@*": - version "1.7.2" - resolved "https://registry.yarnpkg.com/@types/prosemirror-model/-/prosemirror-model-1.7.2.tgz#9c7aff2fd62f0f56eb76e2e0eb27bf6996e6c28a" - integrity sha512-2l+yXvidg3AUHN07mO4Jd8Q84fo6ksFsy7LHUurLYrZ74uTahBp2fzcO49AKZMzww2EulXJ40Kl/OFaQ/7A1fw== - dependencies: - "@types/orderedmap" "*" - -"@types/prosemirror-schema-list@^1.0.3": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@types/prosemirror-schema-list/-/prosemirror-schema-list-1.0.3.tgz#bdf1893a7915fbdc5c49b3cac9368e96213d70de" - integrity sha512-uWybOf+M2Ea7rlbs0yLsS4YJYNGXYtn4N+w8HCw3Vvfl6wBAROzlMt0gV/D/VW/7J/LlAjwMezuGe8xi24HzXA== - dependencies: - "@types/orderedmap" "*" - "@types/prosemirror-model" "*" - "@types/prosemirror-state" "*" - -"@types/prosemirror-state@*": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.3.tgz#7f5f871acf7b8c22e1862ff0068f9bf7e9682c0e" - integrity sha512-6m433Hubix9bx+JgcLW7zzyiZuzwjq5mBdSMYY4Yi5c5ZpV2RiVmg7Cy6f9Thtts8vuztilw+PczJAgDm1Frfw== - dependencies: - "@types/prosemirror-model" "*" - "@types/prosemirror-transform" "*" - "@types/prosemirror-view" "*" - -"@types/prosemirror-tables@^0.9.1": - version "0.9.1" - resolved "https://registry.yarnpkg.com/@types/prosemirror-tables/-/prosemirror-tables-0.9.1.tgz#d2203330f0fa1161c04152bf02c39e152082d408" - integrity sha512-zoY1qcAC6kG4UjnaQQXuoyYQdDJMQmY9uzRKdyUppP8rWRR5/kXBHOd84CD9ZvrYUBo3uDmS20qQnc3knr2j9A== - dependencies: - prosemirror-tables "*" - -"@types/prosemirror-transform@*": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/prosemirror-transform/-/prosemirror-transform-1.1.1.tgz#5a0de16e8e0123b4c3d9559235e19f39cee85e5c" - integrity sha512-yYCYSoiRH+Wcbl8GJc0PFCzeyMzNQ1vL2xrHHSXZuNcIlH75VoiKrZFeZ6BS9cl8mYXjZrlmdBe8YOxYvyKM6A== - dependencies: - "@types/prosemirror-model" "*" - -"@types/prosemirror-view@*": - version "1.11.2" - resolved "https://registry.yarnpkg.com/@types/prosemirror-view/-/prosemirror-view-1.11.2.tgz#58af5dcb7de20b7de874de99147552d5627209a1" - integrity sha512-EKcQmR4KdkFZU13wS5pWrkSojRCPGqz/l/uzpZFfW5cgdr7fQsftf2/ttvIjpk1a94ISifEY4UZwflVJ+uL4Rg== - dependencies: - "@types/prosemirror-model" "*" - "@types/prosemirror-state" "*" - "@types/prosemirror-transform" "*" - -"@types/react-dom@^17.0.9": - version "17.0.9" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add" - integrity sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg== - dependencies: - "@types/react" "*" - -"@types/react-window@^1.8.5": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.5.tgz#285fcc5cea703eef78d90f499e1457e9b5c02fc1" - integrity sha512-V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw== - dependencies: - "@types/react" "*" - -"@types/react@*": - version "16.9.32" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz#f6368625b224604148d1ddf5920e4fefbd98d383" - integrity sha512-fmejdp0CTH00mOJmxUPPbWCEBWPvRIL4m8r0qD+BSDUqmutPyGQCHifzMpMzdvZwROdEdL78IuZItntFWgPXHQ== - dependencies: - "@types/prop-types" "*" - csstype "^2.2.0" - -"@types/react@^17.0.20": - version "17.0.20" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.20.tgz#a4284b184d47975c71658cd69e759b6bd37c3b8c" - integrity sha512-wWZrPlihslrPpcKyCSlmIlruakxr57/buQN1RjlIeaaTWDLtJkTtRW429MoQJergvVKc4IWBpRhWw7YNh/7GVA== - dependencies: - "@types/prop-types" "*" - "@types/scheduler" "*" - csstype "^3.0.2" - -"@types/scheduler@*": - version "0.16.2" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" - integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== - -"@types/transliteration@^1.6.6": - version "1.6.6" - resolved "https://registry.yarnpkg.com/@types/transliteration/-/transliteration-1.6.6.tgz#72b4f1742280d9341fbbe19c7efa5c2bc20a4726" - integrity sha512-drgWFeHgZt16bXKhsu4cP6TlunW3Pu9MS1l9w7Qnm+bcsqf4/pnjnO6/uMAziCV8rnmuU3iCSk7J2zio1nR1+A== - dependencies: - transliteration "*" - -"@types/unzip@^0.1.1": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@types/unzip/-/unzip-0.1.1.tgz#96e80dc5e2917a769c8be01aa49c4fe660e7bab3" - integrity sha512-skD6Um7Pk2l7y+tVOKSgOA9vXViyhk/qJYmr17Ek4Uw3Zgo/DWPScphTPztPbApTIngyYSJnkEW87xrHzRYaew== - dependencies: - "@types/node" "*" - -"@types/zenscroll@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/zenscroll/-/zenscroll-4.0.1.tgz#881e92d5cc44ef900d2919ca0295a0b8d9011858" - integrity sha512-r1h1/SPJQn8kL4rzyJvf4HJvqv20YrTV++qRGiPuA1mYbCSkMBaUOsCXLN780gI6BZfRzDbmjU0/sWq9yi1WgQ== - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - -accepts@~1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== - dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" - -acorn-jsx@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e" - integrity sha512-JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw== - dependencies: - acorn "^5.0.3" - -acorn@^5.0.3, acorn@^5.7.3: - version "5.7.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" - integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== - -agent-base@6: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - -ajax-request@^1.2.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/ajax-request/-/ajax-request-1.2.3.tgz#99fcbec1d6d2792f85fa949535332bd14f5f3790" - integrity sha1-mfy+wdbSeS+F+pSVNTMr0U9fN5A= - dependencies: - file-system "^2.1.1" - utils-extend "^1.0.7" - -ajv@^6.5.5: - version "6.12.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7" - integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw== - 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" - -ansi-escapes@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" - integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - -ansi-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -ansi@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" - integrity sha1-DELU+xcWDVqa8eSEus4cZpIsGyE= - -anymatch@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" - integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA== - dependencies: - micromatch "^2.1.5" - normalize-path "^2.0.0" - -app-root-path@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-1.4.0.tgz#6335d865c9640d0fad99004e5a79232238e92dfa" - integrity sha1-YzXYZclkDQ+tmQBOWnkjIjjpLfo= - -app-root-path@^2.0.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a" - integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA== - -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== - -are-we-there-yet@~1.1.2: - version "1.1.7" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" - integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -arg@^4.1.0: - version "4.1.3" - resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" - integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== - -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8= - dependencies: - arr-flatten "^1.0.1" - -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= - -arr-flatten@^1.0.1, arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= - -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= - -array-unique@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" - integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= - -asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= - -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= - -async-each@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" - integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= - -atob@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== - -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= - -aws4@^1.8.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" - integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== - -babel-plugin-emotion@^9.2.11: - version "9.2.11" - resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz#319c005a9ee1d15bb447f59fe504c35fd5807728" - integrity sha512-dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@emotion/babel-utils" "^0.6.4" - "@emotion/hash" "^0.6.2" - "@emotion/memoize" "^0.6.1" - "@emotion/stylis" "^0.7.0" - babel-plugin-macros "^2.0.0" - babel-plugin-syntax-jsx "^6.18.0" - convert-source-map "^1.5.0" - find-root "^1.1.0" - mkdirp "^0.5.1" - source-map "^0.5.7" - touch "^2.0.1" - -babel-plugin-macros@^2.0.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz#0f958a7cc6556b1e65344465d99111a1e5e10138" - integrity sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg== - dependencies: - "@babel/runtime" "^7.7.2" - cosmiconfig "^6.0.0" - resolve "^1.12.0" - -babel-plugin-syntax-jsx@^6.18.0: - version "6.18.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" - integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= - -babel-runtime@^6.6.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= - -base16@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz#e297f60d7ec1014a7a971a39ebc8a98c0b681e70" - integrity sha1-4pf2DX7BAUp6lxo568ipjAtoHnA= - -base64-img@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/base64-img/-/base64-img-1.0.4.tgz#3e22d55d6c74a24553d840d2b1bc12a7db078d35" - integrity sha1-PiLVXWx0okVT2EDSsbwSp9sHjTU= - dependencies: - ajax-request "^1.2.0" - file-system "^2.1.0" - -base64-js@^1.2.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1" - integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g== - -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= - dependencies: - tweetnacl "^0.14.3" - -biblatex-csl-converter@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/biblatex-csl-converter/-/biblatex-csl-converter-2.0.2.tgz#bfddc2cfb013296affb98c9f432634e3d5b90b53" - integrity sha512-od1JdAkQYh2T1Pzpq11eYtuNb3nNXQ0w+17CAnYqRsX+QFtoiK0XcvBE7N6rpDJyUo0acoaB6Of7EDhFQOcblA== - -binary-extensions@^1.0.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" - integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== - -"binary@>= 0.3.0 < 1": - version "0.3.0" - resolved "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz#9f60553bc5ce8c3386f3b553cff47462adecaa79" - integrity sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk= - dependencies: - buffers "~0.1.1" - chainsaw "~0.1.0" - -bindings@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" - integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== - dependencies: - file-uri-to-path "1.0.0" - -body-parser@1.19.0: - version "1.19.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" - integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== - dependencies: - bytes "3.1.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.7.2" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" - -boundary@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/boundary/-/boundary-1.0.1.tgz#4d67dc2602c0cc16dd9bce7ebf87e948290f5812" - integrity sha1-TWfcJgLAzBbdm85+v4fpSCkPWBI= - -bowser@^2.0.0-beta.3: - version "2.9.0" - resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.9.0.tgz#3bed854233b419b9a7422d9ee3e85504373821c9" - integrity sha512-2ld76tuLBNFekRgmJfT2+3j5MIrP6bFict8WAIT3beq+srz1gcKNAdNKMqHqauQt63NmAa88HfP1/Ypa9Er3HA== - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^1.8.2: - version "1.8.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc= - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - -braces@^2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - -buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== - -buffers@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" - integrity sha1-skV5w77U1tOWru5tmorn9Ugqt7s= - -builtin-modules@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= - -bytes@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== - -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= - -chain-able@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/chain-able/-/chain-able-1.0.1.tgz#b48ac9bdc18f2192ec730abc66609f90aab5605f" - integrity sha1-tIrJvcGPIZLscwq8ZmCfkKq1YF8= - -chain-able@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chain-able/-/chain-able-3.0.0.tgz#dcffe8b04f3da210941a23843bc1332bb288ca9f" - integrity sha512-26MoELhta86n7gCsE2T1hGRyncZvPjFXTkB/DEp4+i/EJVSxXQNwXMDZZb2+SWcbPuow18wQtztaW7GXOel9DA== - -chainsaw@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz#5eab50b28afe58074d0d58291388828b5e5fbc98" - integrity sha1-XqtQsor+WAdNDVgpE4iCi15fvJg= - dependencies: - traverse ">=0.3.0 <0.4" - -chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chardet@^0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" - integrity sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I= - -chokidar@^1.6.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg= - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents "^1.0.0" - -chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== - -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - -clean-css@^4.1.9: - version "4.2.3" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" - integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== - dependencies: - source-map "~0.6.0" - -cli-cursor@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" - integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= - dependencies: - restore-cursor "^2.0.0" - -cli-width@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" - integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= - -clipboard@*, clipboard@^2.0.8: - version "2.0.8" - resolved "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.8.tgz#ffc6c103dd2967a83005f3f61976aa4655a4cdba" - integrity sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ== - dependencies: - good-listener "^1.2.2" - select "^1.1.2" - tiny-emitter "^2.0.0" - -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -combined-stream@^1.0.6, combined-stream@~1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -commander@^2.12.1, commander@^2.20.0, commander@~2.20.3: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - -commander@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-1.1.1.tgz#50d1651868ae60eccff0a2d9f34595376bc6b041" - integrity sha1-UNFlGGiuYOzP8KLZ80WVN2vGsEE= - dependencies: - keypress "0.1.x" - -component-emitter@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -concat-stream@^1.4.7: - version "1.6.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" - integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - -concat-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1" - integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A== - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.0.2" - typedarray "^0.0.6" - -console-control-strings@^1.0.0, console-control-strings@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= - -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" - integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== - dependencies: - safe-buffer "5.1.2" - -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== - -convert-source-map@^1.5.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" - integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA== - dependencies: - safe-buffer "~5.1.1" - -convert-source-map@^1.5.1: - version "1.8.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" - integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== - dependencies: - safe-buffer "~5.1.1" - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= - -cookie@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" - integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== - -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= - -core-js@^2.4.0: - version "2.6.11" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" - integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== - -core-util-is@1.0.2, core-util-is@~1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - -cosmiconfig@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" - integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== - dependencies: - "@types/parse-json" "^4.0.0" - import-fresh "^3.1.0" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.7.2" - -create-emotion-styled@^9.2.8: - version "9.2.8" - resolved "https://registry.yarnpkg.com/create-emotion-styled/-/create-emotion-styled-9.2.8.tgz#c0050e768ba439609bec108600467adf2de67cc3" - integrity sha512-2LrNM5MREWzI5hZK+LyiBHglwE18WE3AEbBQgpHQ1+zmyLSm/dJsUZBeFAwuIMb+TjNZP0KsMZlV776ufOtFdg== - dependencies: - "@emotion/is-prop-valid" "^0.6.1" - -create-emotion@^9.2.12: - version "9.2.12" - resolved "https://registry.yarnpkg.com/create-emotion/-/create-emotion-9.2.12.tgz#0fc8e7f92c4f8bb924b0fef6781f66b1d07cb26f" - integrity sha512-P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA== - dependencies: - "@emotion/hash" "^0.6.2" - "@emotion/memoize" "^0.6.1" - "@emotion/stylis" "^0.7.0" - "@emotion/unitless" "^0.6.2" - csstype "^2.5.2" - stylis "^3.5.0" - stylis-rule-sheet "^0.0.10" - -create-react-context@^0.1.5: - version "0.1.6" - resolved "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.1.6.tgz#0f425931d907741127acc6e31acb4f9015dd9fdc" - integrity sha512-eCnYYEUEc5i32LHwpE/W7NlddOB9oHwsPaWtWzYtflNkkwa3IfindIcoXdVWs12zCbwaMCavKNu84EXogVIWHw== - -csstype@^2.2.0: - version "2.6.10" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz#e63af50e66d7c266edb6b32909cfd0aabe03928b" - integrity sha512-D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w== - -csstype@^2.5.2: - version "2.6.18" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.18.tgz#980a8b53085f34af313410af064f2bd241784218" - integrity sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ== - -csstype@^3.0.2: - version "3.0.9" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b" - integrity sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw== - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= - dependencies: - assert-plus "^1.0.0" - -debug@2.6.9, debug@^2.2.0, debug@^2.3.3: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@4: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== - dependencies: - ms "2.1.2" - -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= - -deep-is@~0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= - -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= - -delegate@^3.1.2: - version "3.2.0" - resolved "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166" - integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw== - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= - -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= - -detect-libc@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - -diff-match-patch@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz#6ac4b55237463761c4daf0dc603eb869124744b1" - integrity sha512-Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg== - -diff-match-patch@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz#abb584d5f10cd1196dfc55aa03701592ae3f7b37" - integrity sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw== - -diff@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" - integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== - -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -emotion@^9.2.5: - version "9.2.12" - resolved "https://registry.yarnpkg.com/emotion/-/emotion-9.2.12.tgz#53925aaa005614e65c6e43db8243c843574d1ea9" - integrity sha512-hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ== - dependencies: - babel-plugin-emotion "^9.2.11" - create-emotion "^9.2.12" - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= - -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -es6-object-assign@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c" - integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw= - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -escodegen@^1.8.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457" - integrity sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ== - dependencies: - esprima "^4.0.1" - estraverse "^4.2.0" - esutils "^2.0.2" - optionator "^0.8.1" - optionalDependencies: - source-map "~0.6.1" - -esprima@^4.0.0, esprima@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - -estraverse@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= - -exec-sh@^0.2.0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz#2a5e7ffcbd7d0ba2755bdecb16e5a427dfbdec36" - integrity sha512-FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw== - dependencies: - merge "^1.2.0" - -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s= - dependencies: - is-posix-bracket "^0.1.0" - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -expand-range@^1.8.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= - dependencies: - fill-range "^2.1.0" - -express@^4.14.0: - version "4.17.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" - integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== - dependencies: - accepts "~1.3.7" - array-flatten "1.1.1" - body-parser "1.19.0" - content-disposition "0.5.3" - content-type "~1.0.4" - cookie "0.4.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "~1.1.2" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.5" - qs "6.7.0" - range-parser "~1.2.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.1" - statuses "~1.5.0" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - -external-editor@^2.0.4: - version "2.2.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5" - integrity sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A== - dependencies: - chardet "^0.4.0" - iconv-lite "^0.4.17" - tmp "^0.0.33" - -extglob@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= - dependencies: - is-extglob "^1.0.0" - -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= - -fast-deep-equal@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" - integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== - -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fast-levenshtein@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= - -fast-xml-parser@^3.17.1: - version "3.17.1" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.17.1.tgz#579fa64346cc891ce240d378268c6216e74aab10" - integrity sha512-jZ0EVn1iBuZtx/sbQnfvhSaaUltz+0+yfR+6QRyzrlt5yMiU+8ZfGj9i3/hoXJxm+aFri7dycBWbncox7frCAQ== - -figures@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" - integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI= - dependencies: - escape-string-regexp "^1.0.5" - -file-match@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/file-match/-/file-match-1.0.2.tgz#c9cad265d2c8adf3a81475b0df475859069faef7" - integrity sha1-ycrSZdLIrfOoFHWw30dYWQafrvc= - dependencies: - utils-extend "^1.0.6" - -file-system@^2.1.0, file-system@^2.1.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/file-system/-/file-system-2.2.2.tgz#7d65833e3a2347dcd956a813c677153ed3edd987" - integrity sha1-fWWDPjojR9zZVqgTxncVPtPt2Yc= - dependencies: - file-match "^1.0.1" - utils-extend "^1.0.4" - -file-uri-to-path@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" - integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== - -filename-regex@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= - -fill-range@^2.1.0: - version "2.2.4" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" - integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q== - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^3.0.0" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - -finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" - unpipe "~1.0.0" - -find-root@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" - integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== - -fliplog@^0.3.13: - version "0.3.13" - resolved "https://registry.yarnpkg.com/fliplog/-/fliplog-0.3.13.tgz#dd0d786e821822aae272e0ddc84012596a96154c" - integrity sha512-R504CdX+mdhMYpmyrdiQ9PW6ncAyZnxyeA85fS1/P/Y9qmbMiQsqt6QzsYhq5kbqMb84PibVOcS1oz98GJl6EQ== - dependencies: - chain-able "^1.0.1" - -for-in@^1.0.1, for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= - -for-own@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" - integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= - dependencies: - for-in "^1.0.1" - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= - -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - -forwarded@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" - integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= - -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= - dependencies: - map-cache "^0.2.2" - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= - -fs-extra@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" - integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-minipass@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" - integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== - dependencies: - minipass "^3.0.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - -fsevents@^1.0.0: - version "1.2.11" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz#67bf57f4758f02ede88fb2a1712fef4d15358be3" - integrity sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw== - dependencies: - bindings "^1.5.0" - nan "^2.12.1" - -"fstream@>= 0.1.30 < 1": - version "0.1.31" - resolved "https://registry.yarnpkg.com/fstream/-/fstream-0.1.31.tgz#7337f058fbbbbefa8c9f561a28cab0849202c988" - integrity sha1-czfwWPu7vvqMn1YaKMqwhJICyYg= - dependencies: - graceful-fs "~3.0.2" - inherits "~2.0.0" - mkdirp "0.5" - rimraf "2" - -fuse-box@^3.7.1: - version "3.7.1" - resolved "https://registry.yarnpkg.com/fuse-box/-/fuse-box-3.7.1.tgz#d32879ceee4c8bcec9bbd8fcfe5b29e7142371cd" - integrity sha512-aM7t9bUcRpNNQu9M+YjXXzx9JSJQVPWeY+8iTyv7OhvJNWHrqqEWPzbn9OfcyFa2AfPwAUyC/uzWexBbjtTvsA== - dependencies: - acorn "^5.7.3" - acorn-jsx "^4.0.1" - ansi "^0.3.1" - app-root-path "^2.0.1" - base64-img "^1.0.3" - base64-js "^1.2.0" - bowser "^2.0.0-beta.3" - chokidar "^1.6.1" - clean-css "^4.1.9" - escodegen "^1.8.1" - express "^4.14.0" - fliplog "^0.3.13" - fs-extra "^7.0.0" - fuse-concat-with-sourcemaps "^1.0.5" - getopts "^2.1.1" - glob "^7.1.1" - ieee754 "^1.1.8" - inquirer "^3.0.6" - lego-api "^1.0.7" - mustache "^2.3.0" - postcss "^6.0.1" - pretty-time "^0.2.0" - prettysize "0.0.3" - realm-utils "^1.0.9" - regexpu-core "^4.1.3" - request "^2.79.0" - shorthash "0.0.2" - source-map "^0.7.1" - sourcemap-blender "1.0.5" - stream-browserify "^2.0.1" - tslib "^1.8.0" - watch "^1.0.1" - ws "^1.1.1" - -fuse-concat-with-sourcemaps@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/fuse-concat-with-sourcemaps/-/fuse-concat-with-sourcemaps-1.0.5.tgz#9c6a521f675cff5cdbb48db1ca9c181ae49a7b97" - integrity sha512-tKsRJIxn9tU3IH8JHMwFhGbObqkDKXhNKOvcM+QyflAlYb2EgOvIQe8D6WB/cocA3puldHatsp9SN5SKryasrw== - dependencies: - source-map "^0.6.1" - -fuse.js@^6.4.6: - version "6.4.6" - resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.4.6.tgz#62f216c110e5aa22486aff20be7896d19a059b79" - integrity sha512-/gYxR/0VpXmWSfZOIPS3rWwU8SHgsRTwWuXhyb2O6s7aRuVtHtxCkR33bNYu3wyLyNx/Wpv0vU7FZy8Vj53VNw== - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -get-caller-file@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" - integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= - -getopts@^2.1.1: - version "2.2.5" - resolved "https://registry.yarnpkg.com/getopts/-/getopts-2.2.5.tgz#67a0fe471cacb9c687d817cab6450b96dde8313b" - integrity sha512-9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA== - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= - dependencies: - assert-plus "^1.0.0" - -glob-base@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q= - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg= - dependencies: - is-glob "^2.0.0" - -glob@^7.1.1, glob@^7.1.3: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -good-listener@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50" - integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA= - dependencies: - delegate "^3.1.2" - -graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: - version "4.2.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" - integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== - -graceful-fs@~3.0.2: - version "3.0.12" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.12.tgz#0034947ce9ed695ec8ab0b854bc919e82b1ffaef" - integrity sha512-J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg== - dependencies: - natives "^1.1.3" - -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= - -har-validator@~5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" - integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== - dependencies: - ajv "^6.5.5" - har-schema "^2.0.0" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -html@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/html/-/html-1.0.0.tgz#a544fa9ea5492bfb3a2cca8210a10be7b5af1f61" - integrity sha1-pUT6nqVJK/s6LMqCEKEL57WvH2E= - dependencies: - concat-stream "^1.4.7" - -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== - dependencies: - agent-base "6" - debug "4" - -iconv-lite@0.4.24, iconv-lite@^0.4.17: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -ie-array-find-polyfill@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ie-array-find-polyfill/-/ie-array-find-polyfill-1.1.0.tgz#5078e533f026831da22bd7476513d9460d65a142" - integrity sha1-UHjlM/Amgx2iK9dHZRPZRg1loUI= - -ieee754@^1.1.8: - version "1.1.13" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" - integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== - -import-fresh@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" - integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - -inquirer@^3.0.6: - version "3.3.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9" - integrity sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ== - dependencies: - ansi-escapes "^3.0.0" - chalk "^2.0.0" - cli-cursor "^2.1.0" - cli-width "^2.0.0" - external-editor "^2.0.4" - figures "^2.0.0" - lodash "^4.3.0" - mute-stream "0.0.7" - run-async "^2.2.0" - rx-lite "^4.0.8" - rx-lite-aggregates "^4.0.8" - string-width "^2.1.0" - strip-ansi "^4.0.0" - through "^2.3.6" - -ipaddr.js@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== - -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== - dependencies: - kind-of "^6.0.0" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= - -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= - dependencies: - binary-extensions "^1.0.0" - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== - -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== - dependencies: - kind-of "^6.0.0" - -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-dotfile@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" - integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE= - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ= - dependencies: - is-primitive "^2.0.0" - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== - dependencies: - is-plain-object "^2.0.4" - -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= - dependencies: - is-extglob "^1.0.0" - -is-number@^2.0.2, is-number@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= - dependencies: - kind-of "^3.0.2" - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= - dependencies: - kind-of "^3.0.2" - -is-number@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" - integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ== - -is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q= - -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU= - -is-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= - -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - -is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - -isarray@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= - -isarray@1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= - -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-yaml@^3.13.1: - version "3.13.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" - integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -js-yaml@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= - -json-parse-better-errors@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - -jsondiffpatch@^0.3.11: - version "0.3.11" - resolved "https://registry.yarnpkg.com/jsondiffpatch/-/jsondiffpatch-0.3.11.tgz#43f9443a0d081b5f79d413fe20f302079e493201" - integrity sha512-Xi3Iygdt/BGhml6bdUFhgDki1TgOsp3hG3iiH3KtzP+CahtGcdPfKRLlnZbSw+3b1umZkhmKrqXUgUcKenyhtA== - dependencies: - chalk "^2.3.0" - diff-match-patch "^1.0.0" - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss= - optionalDependencies: - graceful-fs "^4.1.6" - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -keypress@0.1.x: - version "0.1.0" - resolved "https://registry.yarnpkg.com/keypress/-/keypress-0.1.0.tgz#4a3188d4291b66b4f65edb99f806aa9ae293592a" - integrity sha1-SjGI1CkbZrT2XtuZ+AaqmuKTWSo= - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== - -kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - -lego-api@^1.0.7: - version "1.0.8" - resolved "https://registry.yarnpkg.com/lego-api/-/lego-api-1.0.8.tgz#5e26be726c5e11d540f89e7c6b1abf8c5834bd01" - integrity sha512-pZD0mf32+RL1bUMJztRcXiNBB1gE8gd/h4MDLWdZp7vaMZyjPiYK/zNpNNGoJvmoa7D/wf9dll+5z7pDObdLFg== - dependencies: - chain-able "^3.0.0" - -levn@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= - dependencies: - prelude-ls "~1.1.2" - type-check "~0.3.2" - -lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= - -lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= - -lodash.curry@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170" - integrity sha1-JI42By7ekGUB11lmIAqG2riyMXA= - -lodash.debounce@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz#812211c378a94cc29d5aa4e3346cf0bfce3a7df5" - integrity sha1-gSIRw3ipTMKdWqTjNGzwv846ffU= - dependencies: - lodash._getnative "^3.0.0" - -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= - -lodash.flow@^3.3.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a" - integrity sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o= - -lodash.orderby@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.orderby/-/lodash.orderby-4.6.0.tgz#e697f04ce5d78522f54d9338b32b81a3393e4eb3" - integrity sha1-5pfwTOXXhSL1TZM4syuBozk+TrM= - -lodash.uniqby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302" - integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI= - -lodash@^4.3.0: - version "4.17.15" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" - integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== - -loose-envify@^1.1.0, loose-envify@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" - integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== - dependencies: - js-tokens "^3.0.0 || ^4.0.0" - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -make-dir@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - -make-error@^1.1.1: - version "1.3.6" - resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" - integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== - -map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= - dependencies: - object-visit "^1.0.0" - -"match-stream@>= 0.0.2 < 1": - version "0.0.2" - resolved "https://registry.yarnpkg.com/match-stream/-/match-stream-0.0.2.tgz#99eb050093b34dffade421b9ac0b410a9cfa17cf" - integrity sha1-mesFAJOzTf+t5CG5rAtBCpz6F88= - dependencies: - buffers "~0.1.1" - readable-stream "~1.0.0" - -math-random@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" - integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== - -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= - -"memoize-one@>=3.1.1 <6": - version "5.1.1" - resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0" - integrity sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA== - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= - -merge@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145" - integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ== - -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= - -micromatch@^2.1.5: - version "2.3.11" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -micromatch@^3.1.10: - version "3.1.10" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" - -mime-db@1.43.0: - version "1.43.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" - integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== - -mime-types@^2.1.12, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.26" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" - integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== - dependencies: - mime-db "1.43.0" - -mime@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - -mimic-fn@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" - integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== - -minimatch@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= - -minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - -minipass@^3.0.0: - version "3.1.5" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732" - integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw== - dependencies: - yallist "^4.0.0" - -minizlib@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" - integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== - dependencies: - minipass "^3.0.0" - yallist "^4.0.0" - -mixin-deep@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" - integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - -mkdirp@0.5: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" - -mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= - dependencies: - minimist "0.0.8" - -mkdirp@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - -mock-require@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946" - integrity sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg== - dependencies: - get-caller-file "^1.0.2" - normalize-path "^2.1.1" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -ms@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -mustache@^2.3.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz#a6d4d9c3f91d13359ab889a812954f9230a3d0c5" - integrity sha512-KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ== - -mute-stream@0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" - integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= - -nan@^2.12.1: - version "2.14.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" - integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg== - -nanomatch@^1.2.9: - version "1.2.13" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -nanoseconds@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/nanoseconds/-/nanoseconds-0.1.0.tgz#69ec39fcd00e77ab3a72de0a43342824cd79233a" - integrity sha1-aew5/NAOd6s6ct4KQzQoJM15Izo= - -natives@^1.1.3: - version "1.1.6" - resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz#a603b4a498ab77173612b9ea1acdec4d980f00bb" - integrity sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA== - -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - -node-addon-api@^3.0.2: - version "3.2.1" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" - integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== - -node-fetch@^2.6.1: - version "2.6.5" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz#42735537d7f080a7e5f78b6c549b7146be1742fd" - integrity sha512-mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ== - dependencies: - whatwg-url "^5.0.0" - -nodejieba@^2.2.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/nodejieba/-/nodejieba-2.5.2.tgz#fc929ee29f93c28c639696bac0319bac116a296a" - integrity sha512-ByskJvaBrQ2eV+5M0OeD80S5NKoGaHc9zi3Z/PTKl/95eac2YF8RmWduq9AknLpkQLrLAIcqurrtC6BzjpKwwg== - dependencies: - "@mapbox/node-pre-gyp" "^1.0.4" - node-addon-api "^3.0.2" - -nopt@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" - integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ== - dependencies: - abbrev "1" - -nopt@~1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" - integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4= - dependencies: - abbrev "1" - -normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= - dependencies: - remove-trailing-separator "^1.0.1" - -npmlog@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" - integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== - -object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= - dependencies: - isobject "^3.0.0" - -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo= - dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" - -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= - dependencies: - isobject "^3.0.1" - -object_values@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/object_values/-/object_values-0.1.2.tgz#f8fbc31d2e537170a4cbcfb28dd61501b3207334" - integrity sha512-tZgUiKLraVH+4OAedBYrr4/K6KmAQw2RPNd1AuNdhLsuz5WP3VB7WuiKBWbOcjeqqAjus2ChIIWC8dSfmg7ReA== - -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= - dependencies: - ee-first "1.1.1" - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -onetime@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4" - integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ= - dependencies: - mimic-fn "^1.0.0" - -optionator@^0.8.1: - version "0.8.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" - integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== - dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.6" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - word-wrap "~1.2.3" - -options@>=0.0.5: - version "0.0.6" - resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" - integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8= - -orderedmap@^1.0.0, orderedmap@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.1.1.tgz#c618e77611b3b21d0fe3edc92586265e0059c789" - integrity sha512-3Ux8um0zXbVacKUkcytc0u3HgC0b0bBLT+I60r2J/En72cI0nZffqrA7Xtf2Hqs27j1g82llR5Mhbd0Z1XW4AQ== - -os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - -"over@>= 0.0.5 < 1": - version "0.0.5" - resolved "https://registry.yarnpkg.com/over/-/over-0.0.5.tgz#f29852e70fd7e25f360e013a8ec44c82aedb5708" - integrity sha1-8phS5w/X4l82DgE6jsRMgq7bVwg= - -parent-module@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" - integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== - dependencies: - callsites "^3.0.0" - -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw= - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - -parse-json@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" - integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" - lines-and-columns "^1.1.6" - -parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= - -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= - -pinyin@^2.10.2: - version "2.10.2" - resolved "https://registry.yarnpkg.com/pinyin/-/pinyin-2.10.2.tgz#93e3b3cb4430009925163bad10c741778c85b013" - integrity sha512-qAcp7+2vnjm6sAd0B9pp5JpyvHbYoQO1v9zCeJQMEgyw2VeRi02l0gR22ZBgfjjvZ1c2EGoVjJHJ1h0rwr34Ug== - dependencies: - commander "~1.1.1" - object-assign "^4.0.1" - optionalDependencies: - nodejieba "^2.2.1" - -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= - -postcss@^6.0.1: - version "6.0.23" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" - integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== - dependencies: - chalk "^2.4.1" - source-map "^0.6.1" - supports-color "^5.4.0" - -prelude-ls@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= - -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= - -prettier@^1.18.2: - version "1.19.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" - integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== - -pretty-time@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/pretty-time/-/pretty-time-0.2.0.tgz#7a3bdec4049c620cd7c42b7f342b74d56e73d74e" - integrity sha1-ejvexAScYgzXxCt/NCt01W5z104= - dependencies: - is-number "^2.0.2" - nanoseconds "^0.1.0" - -prettysize@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/prettysize/-/prettysize-0.0.3.tgz#14afff6a645e591a4ddf1c72919c23b4146181a1" - integrity sha1-FK//amReWRpN3xxykZwjtBRhgaE= - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - -prop-types@^15.5.8, prop-types@^15.6.2: - version "15.7.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== - dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.8.1" - -prosemirror-changeset@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.1.2.tgz#91dee900eb4618b21ed0c38c8d41dc7539303864" - integrity sha512-/eeAM2XeOFmtiPsFVfVkM3Iq4xfNlFuDB6MlC8Hqch/ibq3YlH3YxDi8fqg78fT8fkrfvN6zRu9EE0HkSmH8PA== - dependencies: - prosemirror-transform "^1.0.0" - -prosemirror-commands@^1.1.10: - version "1.1.10" - resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.10.tgz#406a6589966e6cd80809cea2d801fb998639b37d" - integrity sha512-IWyBBXNAd44RM6NnBPljwq+/CM2oYCQJkF+YhKEAZNwzW0uFdGf4qComhjbKZzqFdu6Iub2ZhNsXgwPibA0lCQ== - dependencies: - prosemirror-model "^1.0.0" - prosemirror-state "^1.0.0" - prosemirror-transform "^1.0.0" - -prosemirror-dev-tools@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/prosemirror-dev-tools/-/prosemirror-dev-tools-2.1.1.tgz#0c4304b05b437608b3666b72fdb4b21e24fa29fc" - integrity sha512-d9MG4PF82meg5Ru64ox6WCKPkQNsiZEaG5xR5a+l88RJ0VRButMZq5JzPh28vUlTBq+TXnpdTJRlPQIgTOtpqg== - dependencies: - emotion "^9.2.5" - es6-object-assign "^1.1.0" - html "^1.0.0" - ie-array-find-polyfill "^1.1.0" - jsondiffpatch "^0.3.11" - prop-types "^15.6.2" - prosemirror-model ">=1.0.0" - prosemirror-state ">=1.0.0" - react-dock "^0.2.4" - react-emotion "^9.2.5" - react-json-tree "^0.11.0" - unstated "^2.1.1" - -prosemirror-dropcursor@^1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.5.tgz#d2808c17089df0e441ad66016aecc2b6457c8a1f" - integrity sha512-tNUwcF2lPAkwKBZPZRtbxpwljnODRNZ3eiYloN1DSUqDjMT1nBZm0nejaEMS1TvNQ+3amibUSAiV4hX+jpASFA== - dependencies: - prosemirror-state "^1.0.0" - prosemirror-transform "^1.1.0" - prosemirror-view "^1.1.0" - -prosemirror-gapcursor@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.1.5.tgz#0c37fd6cbb1d7c46358c2e7397f8da9a8b5c6246" - integrity sha512-SjbUZq5pgsBDuV3hu8GqgIpZR5eZvGLM+gPQTqjVVYSMUCfKW3EGXTEYaLHEl1bGduwqNC95O3bZflgtAb4L6w== - dependencies: - prosemirror-keymap "^1.0.0" - prosemirror-model "^1.0.0" - prosemirror-state "^1.0.0" - prosemirror-view "^1.0.0" - -prosemirror-history@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.2.0.tgz#04cc4df8d2f7b2a46651a2780de191ada6d465ea" - integrity sha512-B9v9xtf4fYbKxQwIr+3wtTDNLDZcmMMmGiI3TAPShnUzvo+Rmv1GiUrsQChY1meetHl7rhML2cppF3FTs7f7UQ== - dependencies: - prosemirror-state "^1.2.2" - prosemirror-transform "^1.0.0" - rope-sequence "^1.3.0" - -prosemirror-inputrules@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.3.tgz#93f9199ca02473259c30d7e352e4c14022d54638" - integrity sha512-ZaHCLyBtvbyIHv0f5p6boQTIJjlD6o2NPZiEaZWT2DA+j591zS29QQEMT4lBqwcLW3qRSf7ZvoKNbf05YrsStw== - dependencies: - prosemirror-state "^1.0.0" - prosemirror-transform "^1.0.0" - -prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.3.tgz#be22d6108df2521608e9216a87b1a810f0ed361e" - integrity sha512-PRA4NzkUMzV/NFf5pyQ6tmlIHiW/qjQ1kGWUlV2rF/dvlOxtpGpTEjIMhWgLuMf+HiDEFnUEP7uhYXu+t+491g== - dependencies: - prosemirror-state "^1.0.0" - w3c-keyname "^2.2.0" - -prosemirror-keymap@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.4.tgz#8b481bf8389a5ac40d38dbd67ec3da2c7eac6a6d" - integrity sha512-Al8cVUOnDFL4gcI5IDlG6xbZ0aOD/i3B17VT+1JbHWDguCgt/lBHVTHUBcKvvbSg6+q/W4Nj1Fu6bwZSca3xjg== - dependencies: - prosemirror-state "^1.0.0" - w3c-keyname "^2.2.0" - -prosemirror-model@>=1.0.0, prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.8.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.9.1.tgz#8c08cf556f593c5f015548d2c1a6825661df087f" - integrity sha512-Qblh8pm1c7Ll64sYLauwwzjimo/tFg1zW3Q3IWhKRhvfOEgRKqa6dC5pRrAa+XHOIjBFEYrqbi52J5bqA2dV8Q== - dependencies: - orderedmap "^1.1.0" - -prosemirror-model@^1.14.3: - version "1.14.3" - resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.14.3.tgz#a9c250d3c4023ddf10ecb41a0a7a130e9741d37e" - integrity sha512-yzZlBaSxfUPIIP6U5Edh5zKxJPZ5f7bwZRhiCuH3UYkWhj+P3d8swHsbuAMOu/iDatDc5J/Qs5Mb3++mZf+CvQ== - dependencies: - orderedmap "^1.1.0" - -prosemirror-schema-list@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.5.tgz#e7ad9e337ea3d77da6d6a4250f3d7bd51ae980a4" - integrity sha512-9gadhga/wySVfb/iZ2vOpndbG0XroeLw0HkkZN5demNbOea6U5oQtJmvyYWC7ZVf3WkhmVdVsOXrllM9JcC20A== - dependencies: - prosemirror-model "^1.0.0" - prosemirror-transform "^1.0.0" - -prosemirror-state@>=1.0.0, prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.2.tgz#1b910b0dc01c1f00926bb9ba1589f7b7ac0d658b" - integrity sha512-t/JqE3aR0SV9QrzFVkAXsQwsgrQBNs/BDbcFH20RssW0xauqNNdjTXxy/J/kM7F+0zYi6+BRmz7cMMQQFU3mwQ== - dependencies: - prosemirror-model "^1.0.0" - prosemirror-transform "^1.0.0" - -prosemirror-state@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.4.tgz#4c6b52628216e753fc901c6d2bfd84ce109e8952" - integrity sha512-Xkkrpd1y/TQ6HKzN3agsQIGRcLckUMA9u3j207L04mt8ToRgpGeyhbVv0HI7omDORIBHjR29b7AwlATFFf2GLA== - dependencies: - prosemirror-model "^1.0.0" - prosemirror-transform "^1.0.0" - -prosemirror-tables@*: - version "1.0.0" - resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.0.0.tgz#ec3d0b11e638c6a92dd14ae816d0a2efd1719b70" - integrity sha512-zFw5Us4G5Vdq0yIj8GiqZOGA6ud5UKpMKElux9O0HrfmhkuGa1jf1PCpz2R5pmIQJv+tIM24H1mox/ODBAX37Q== - dependencies: - prosemirror-keymap "^1.1.2" - prosemirror-model "^1.8.1" - prosemirror-state "^1.3.1" - prosemirror-transform "^1.2.1" - prosemirror-view "^1.13.3" - -prosemirror-tables@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.1.1.tgz#ad66300cc49500455cf1243bb129c9e7d883321e" - integrity sha512-LmCz4jrlqQZRsYRDzCRYf/pQ5CUcSOyqZlAj5kv67ZWBH1SVLP2U9WJEvQfimWgeRlIz0y0PQVqO1arRm1+woA== - dependencies: - prosemirror-keymap "^1.1.2" - prosemirror-model "^1.8.1" - prosemirror-state "^1.3.1" - prosemirror-transform "^1.2.1" - prosemirror-view "^1.13.3" - -prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1: - version "1.2.3" - resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.3.tgz#239d17591af24d39ef3f1999daa09e1f1c76b06a" - integrity sha512-PUfayeskQfuUBXktvL6207ZWRwHBFNPNPiek4fR+LgCPnBofuEb2+L0FfbNtrAwffHVs6M3DaFvJB1W2VQdV0A== - dependencies: - prosemirror-model "^1.0.0" - -prosemirror-transform@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.3.2.tgz#5620ebe7379e6fae4f34ecc881886cb22ce96579" - integrity sha512-/G6d/u9Mf6Bv3H1XR8VxhpjmUO75LYmnvj+s3ZfZpakU1hnQbsvCEybml1B3f2IWUAAQRFkbO1PnsbFhLZsYsw== - dependencies: - prosemirror-model "^1.0.0" - -prosemirror-utils@^0.9.6: - version "0.9.6" - resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.6.tgz#3d97bd85897e3b535555867dc95a51399116a973" - integrity sha512-UC+j9hQQ1POYfMc5p7UFxBTptRiGPR7Kkmbl3jVvU8VgQbkI89tR/GK+3QYC8n+VvBZrtAoCrJItNhWSxX3slA== - -prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3: - version "1.14.2" - resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.14.2.tgz#23eb89f6101e9671b5e0c19d82ee0ad9de5608de" - integrity sha512-9yPVH6OLyaEraHjWHbSk2DB0R/1TsEE6AA1LI+vmCypXXA+zTzNrktUFzBhSJHehXDoEJcQfnl1Wdp5GPSh2+g== - dependencies: - prosemirror-model "^1.1.0" - prosemirror-state "^1.0.0" - prosemirror-transform "^1.1.0" - -prosemirror-view@^1.20.1: - version "1.20.1" - resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.20.1.tgz#174ba8ca358c73cc05e9a92a3d252bcf181ea337" - integrity sha512-djWORhy3a706mUH4A2dgEEV0IPZqQd1tFyz/ZVHJNoqhSgq82FwG6dq7uqHeUB2KdVSNfI2yc3rwfqlC/ll2pA== - dependencies: - prosemirror-model "^1.14.3" - prosemirror-state "^1.0.0" - prosemirror-transform "^1.1.0" - -proxy-addr@~2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" - integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== - dependencies: - forwarded "~0.1.2" - ipaddr.js "1.9.1" - -psl@^1.1.28: - version "1.7.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c" - integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ== - -"pullstream@>= 0.4.1 < 1": - version "0.4.1" - resolved "https://registry.yarnpkg.com/pullstream/-/pullstream-0.4.1.tgz#d6fb3bf5aed697e831150eb1002c25a3f8ae1314" - integrity sha1-1vs79a7Wl+gxFQ6xACwlo/iuExQ= - dependencies: - over ">= 0.0.5 < 1" - readable-stream "~1.0.31" - setimmediate ">= 1.0.2 < 2" - slice-stream ">= 1.0.0 < 2" - -punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - -pure-color@^1.2.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz#1fe064fb0ac851f0de61320a8bf796836422f33e" - integrity sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4= - -qs@6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" - integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== - -qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== - -randomatic@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed" - integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw== - dependencies: - is-number "^4.0.0" - kind-of "^6.0.0" - math-random "^1.0.1" - -range-parser@~1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" - integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== - -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" - integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== - dependencies: - bytes "3.1.0" - http-errors "1.7.2" - iconv-lite "0.4.24" - unpipe "1.0.0" - -react-base16-styling@^0.5.1: - version "0.5.3" - resolved "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.5.3.tgz#3858f24e9c4dd8cbd3f702f3f74d581ca2917269" - integrity sha1-OFjyTpxN2MvT9wLz901YHKKRcmk= - dependencies: - base16 "^1.0.0" - lodash.curry "^4.0.1" - lodash.flow "^3.3.0" - pure-color "^1.2.0" - -react-dock@^0.2.4: - version "0.2.4" - resolved "https://registry.yarnpkg.com/react-dock/-/react-dock-0.2.4.tgz#e727dc7550b3b73116635dcb9c0e04d0b7afe17c" - integrity sha1-5yfcdVCztzEWY13LnA4E0Lev4Xw= - dependencies: - lodash.debounce "^3.1.1" - prop-types "^15.5.8" - -react-dom@^17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" - integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - scheduler "^0.20.2" - -react-emotion@^9.2.5: - version "9.2.12" - resolved "https://registry.yarnpkg.com/react-emotion/-/react-emotion-9.2.12.tgz#74d1494f89e22d0b9442e92a33ca052461955c83" - integrity sha512-qt7XbxnEKX5sZ73rERJ92JMbEOoyOwG3BuCRFRkXrsJhEe+rFBRTljRw7yOLHZUCQC4GBObZhjXIduQ8S0ZpYw== - dependencies: - babel-plugin-emotion "^9.2.11" - create-emotion-styled "^9.2.8" - -react-is@^16.8.1: - version "16.13.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527" - integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA== - -react-json-tree@^0.11.0: - version "0.11.2" - resolved "https://registry.yarnpkg.com/react-json-tree/-/react-json-tree-0.11.2.tgz#af70199fcbc265699ade2aec492465c51608f95e" - integrity sha512-aYhUPj1y5jR3ZQ+G3N7aL8FbTyO03iLwnVvvEikLcNFqNTyabdljo9xDftZndUBFyyyL0aK3qGO9+8EilILHUw== - dependencies: - babel-runtime "^6.6.1" - prop-types "^15.5.8" - react-base16-styling "^0.5.1" - -react-window@^1.8.6: - version "1.8.6" - resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.6.tgz#d011950ac643a994118632665aad0c6382e2a112" - integrity sha512-8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg== - dependencies: - "@babel/runtime" "^7.0.0" - memoize-one ">=3.1.1 <6" - -react@^17.0.2: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" - integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - -readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - 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" - -readable-stream@^3.0.2: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readable-stream@~1.0.0, readable-stream@~1.0.31: - version "1.0.34" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" - integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -readdirp@^2.0.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" - integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== - dependencies: - graceful-fs "^4.1.11" - micromatch "^3.1.10" - readable-stream "^2.0.2" - -realm-utils@^1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/realm-utils/-/realm-utils-1.0.9.tgz#5c76a5ff39e4816af2c133a161f4221d6628eff4" - integrity sha1-XHal/znkgWrywTOhYfQiHWYo7/Q= - dependencies: - app-root-path "^1.3.0" - mkdirp "^0.5.1" - -regenerate-unicode-properties@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e" - integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA== - dependencies: - regenerate "^1.4.0" - -regenerate@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" - integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== - -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== - -regenerator-runtime@^0.13.2: - version "0.13.3" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" - integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== - -regenerator-runtime@^0.13.4: - version "0.13.5" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" - integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== - -regex-cache@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" - integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ== - dependencies: - is-equal-shallow "^0.1.3" - -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - -regexpu-core@^4.1.3: - version "4.6.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz#2037c18b327cfce8a6fea2a4ec441f2432afb8b6" - integrity sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg== - dependencies: - regenerate "^1.4.0" - regenerate-unicode-properties "^8.1.0" - regjsgen "^0.5.0" - regjsparser "^0.6.0" - unicode-match-property-ecmascript "^1.0.4" - unicode-match-property-value-ecmascript "^1.1.0" - -regjsgen@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz#48f0bf1a5ea205196929c0d9798b42d1ed98443c" - integrity sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg== - -regjsparser@^0.6.0: - version "0.6.3" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz#74192c5805d35e9f5ebe3c1fb5b40d40a8a38460" - integrity sha512-8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA== - dependencies: - jsesc "~0.5.0" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= - -repeat-element@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" - integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== - -repeat-string@^1.5.2, repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= - -request@^2.79.0: - version "2.88.2" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.3" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.5.0" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= - -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" - integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== - -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= - -resolve@^1.12.0, resolve@^1.3.2: - version "1.15.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" - integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== - dependencies: - path-parse "^1.0.6" - -restore-cursor@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" - integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368= - dependencies: - onetime "^2.0.0" - signal-exit "^3.0.2" - -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== - -rimraf@2: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - -rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -rope-sequence@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.2.tgz#a19e02d72991ca71feb6b5f8a91154e48e3c098b" - integrity sha512-ku6MFrwEVSVmXLvy3dYph3LAMNS0890K7fabn+0YIRQ2T96T9F4gkFf0vf0WW0JUraNWwGRtInEpH7yO4tbQZg== - -run-async@^2.2.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8" - integrity sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg== - dependencies: - is-promise "^2.1.0" - -rx-lite-aggregates@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be" - integrity sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74= - dependencies: - rx-lite "*" - -rx-lite@*, rx-lite@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" - integrity sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ= - -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@^5.0.1, safe-buffer@^5.1.2: - version "5.2.0" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" - integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== - -safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= - dependencies: - ret "~0.1.10" - -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -scheduler@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" - integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - -select@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" - integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0= - -semver@^5.3.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.0.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.3.4: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== - dependencies: - lru-cache "^6.0.0" - -send@0.17.1: - version "0.17.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" - integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== - dependencies: - debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "~1.7.2" - mime "1.6.0" - ms "2.1.1" - on-finished "~2.3.0" - range-parser "~1.2.1" - statuses "~1.5.0" - -sentence-splitter@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/sentence-splitter/-/sentence-splitter-3.2.2.tgz#b02a28c08bbad4bd3b6ec6f619d50e3fd3596d07" - integrity sha512-hMvaodgK9Fay928uiQoTMEWjXpCERdKD2uKo7BbSyP+uWTo+wHiRjN+ZShyI99rW0VuoV4Cuw8FUmaRcnpN7Ug== - dependencies: - "@textlint/ast-node-types" "^4.4.2" - concat-stream "^2.0.0" - object_values "^0.1.2" - structured-source "^3.0.2" - -serve-static@1.14.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" - integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.17.1" - -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - -set-value@^2.0.0, set-value@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" - integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - -"setimmediate@>= 1.0.1 < 2", "setimmediate@>= 1.0.2 < 2": - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= - -setprototypeof@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" - integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== - -shorthash@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/shorthash/-/shorthash-0.0.2.tgz#59b268eecbde59038b30da202bcfbddeb2c4a4eb" - integrity sha1-WbJo7sveWQOLMNogK8+93rLEpOs= - -signal-exit@^3.0.0: - version "3.0.5" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" - integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== - -signal-exit@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= - -"slice-stream@>= 1.0.0 < 2": - version "1.0.0" - resolved "https://registry.yarnpkg.com/slice-stream/-/slice-stream-1.0.0.tgz#5b33bd66f013b1a7f86460b03d463dec39ad3ea0" - integrity sha1-WzO9ZvATsaf4ZGCwPUY97DmtPqA= - dependencies: - readable-stream "~1.0.31" - -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - -source-map-resolve@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" - integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - -source-map-support@^0.5.17: - version "0.5.19" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" - integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map-support@~0.5.12: - version "0.5.16" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042" - integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map-url@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= - -source-map@^0.5.6, source-map@^0.5.7: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -source-map@^0.7.1, source-map@^0.7.2, source-map@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== - -sourcemap-blender@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/sourcemap-blender/-/sourcemap-blender-1.0.5.tgz#d361f3d12381c4e477178113878fdf984a91bdbc" - integrity sha512-GPhjCmDtJ8YY6zt1L6kP6WtBg6WrdWt5hw2Wmgt9rwC3yiwLo9vEuabh/YYSZ5KmFV20hVkGdkTwpXtT2E65TA== - dependencies: - source-map "^0.7.3" - -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== - dependencies: - extend-shallow "^3.0.0" - -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - -sshpk@^1.7.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - -"statuses@>= 1.5.0 < 2", statuses@~1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= - -stream-browserify@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" - integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg== - dependencies: - inherits "~2.0.1" - readable-stream "^2.0.2" - -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2", string-width@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string-width@^4.1.0, string-width@^4.2.0: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -string_decoder@~0.10.x: - version "0.10.31" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" - integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= - dependencies: - ansi-regex "^3.0.0" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -structured-source@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/structured-source/-/structured-source-3.0.2.tgz#dd802425e0f53dc4a6e7aca3752901a1ccda7af5" - integrity sha1-3YAkJeD1PcSm56yjdSkBoczaevU= - dependencies: - boundary "^1.0.1" - -stylis-rule-sheet@^0.0.10: - version "0.0.10" - resolved "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz#44e64a2b076643f4b52e5ff71efc04d8c3c4a430" - integrity sha512-nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw== - -stylis@^3.5.0: - version "3.5.4" - resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe" - integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q== - -supports-color@^5.3.0, supports-color@^5.4.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -tar@^6.1.0: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^3.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - -terser@^4.6.2: - version "4.6.4" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.6.4.tgz#40a0b37afbe5b57e494536815efa68326840fc00" - integrity sha512-5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w== - dependencies: - commander "^2.20.0" - source-map "~0.6.1" - source-map-support "~0.5.12" - -thenby@^1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/thenby/-/thenby-1.3.3.tgz#016c3427772a284bbfef982d978f7574fd15ee9d" - integrity sha512-vCzp0TxrQ+2bfRJoWNhMwk6RNfboOUN2S+nbEfhJfj7RwJHD6PlgtXH/hXiSmv6UJs35IQDtVqiI45J+cAgLqg== - -through@^2.3.6: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - -tiny-emitter@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" - integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q== - -tlite@^0.1.9: - version "0.1.9" - resolved "https://registry.yarnpkg.com/tlite/-/tlite-0.1.9.tgz#e886e4a305b7522242e2453b7ca4fb84f2d9de0f" - integrity sha512-5QOBAvDxZZwW1i+2YXMgF6/PuV/KhA0LyE9PyVi8Ywr3bfIPziZcQD+RpdJaQurCU8zIGtBo/XuPCEHdvyeFuQ== - -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== - dependencies: - os-tmpdir "~1.0.2" - -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= - -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= - dependencies: - kind-of "^3.0.2" - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" - integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== - -touch@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/touch/-/touch-2.0.2.tgz#ca0b2a3ae3211246a61b16ba9e6cbf1596287164" - integrity sha512-qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A== - dependencies: - nopt "~1.0.10" - -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= - -transliteration@*, transliteration@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/transliteration/-/transliteration-2.2.0.tgz#e6333cc74b25ef4465bc27086ed8465c9a19211d" - integrity sha512-o29GDWtecNoK4TNfnJQesGluFPiza+U8NoiKrErU8eTNlVgma6w1LV/tTiGo+waFLkhtL9WxrW0lXhZKmm7msQ== - dependencies: - yargs "^16.1.0" - -"traverse@>=0.3.0 <0.4": - version "0.3.9" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz#717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9" - integrity sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk= - -ts-node@^8.10.2: - version "8.10.2" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d" - integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA== - dependencies: - arg "^4.1.0" - diff "^4.0.1" - make-error "^1.1.1" - source-map-support "^0.5.17" - yn "3.1.1" - -tslib@^1.8.0, tslib@^1.8.1: - version "1.11.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" - integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== - -tslint-config-prettier@^1.18.0: - version "1.18.0" - resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37" - integrity sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg== - -tslint-react@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/tslint-react/-/tslint-react-5.0.0.tgz#d0ae644e8163bdd3e134012e9353094904e8dd44" - integrity sha512-/IbcSmoBPlFic8kQaRfQ4knTY4mivwo5LVzvozvX6Dyu2ynEnrh1dIcR2ujjyp/IodXqY/H5GbxFxSMo/Kf2Hg== - dependencies: - tsutils "^3.17.1" - -tslint@^5.20.0: - version "5.20.1" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz#e401e8aeda0152bc44dd07e614034f3f80c67b7d" - integrity sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg== - dependencies: - "@babel/code-frame" "^7.0.0" - builtin-modules "^1.1.1" - chalk "^2.3.0" - commander "^2.12.1" - diff "^4.0.1" - glob "^7.1.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" - mkdirp "^0.5.1" - resolve "^1.3.2" - semver "^5.3.0" - tslib "^1.8.0" - tsutils "^2.29.0" - -tsutils@^2.29.0: - version "2.29.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" - integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== - dependencies: - tslib "^1.8.1" - -tsutils@^3.17.1: - version "3.17.1" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" - integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g== - dependencies: - tslib "^1.8.1" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= - -type-check@~0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= - dependencies: - prelude-ls "~1.1.2" - -type-is@~1.6.17, type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== - dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" - -typedarray@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - -typescript-tslint-plugin@^0.5.5: - version "0.5.5" - resolved "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.5.tgz#673875c43640251f1ab3d63745d7d49726ff961c" - integrity sha512-tR5igNQP+6FhxaPJYRlUBVsEl0n5cSuXRbg7L1y80mL4B1jUHb8uiIcbQBJ9zWyypJEdFYFUccpXxvMwZR8+AA== - dependencies: - minimatch "^3.0.4" - mock-require "^3.0.3" - vscode-languageserver "^5.2.1" - -typescript@3.8.3: - version "3.8.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061" - integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== - -uglify-js@^3.7.4: - version "3.8.0" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.8.0.tgz#f3541ae97b2f048d7e7e3aa4f39fd8a1f5d7a805" - integrity sha512-ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ== - dependencies: - commander "~2.20.3" - source-map "~0.6.1" - -ultron@1.0.x: - version "1.0.2" - resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa" - integrity sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po= - -unicode-canonical-property-names-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818" - integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ== - -unicode-match-property-ecmascript@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c" - integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg== - dependencies: - unicode-canonical-property-names-ecmascript "^1.0.4" - unicode-property-aliases-ecmascript "^1.0.4" - -unicode-match-property-value-ecmascript@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277" - integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g== - -unicode-property-aliases-ecmascript@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57" - integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw== - -union-value@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" - integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^2.0.1" - -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= - -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - -unstated@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/unstated/-/unstated-2.1.1.tgz#36b124dfb2e7a12d39d0bb9c46dfb6e51276e3a2" - integrity sha512-fORlTWMZxq7NuMJDxyIrrYIZKN7wEWYQ9SiaJfIRcSpsowr6Ph/JIfK2tgtXLW614JfPG/t5q9eEIhXRCf55xg== - dependencies: - create-react-context "^0.1.5" - -unzip@^0.1.11: - version "0.1.11" - resolved "https://registry.yarnpkg.com/unzip/-/unzip-0.1.11.tgz#89749c63b058d7d90d619f86b98aa1535d3b97f0" - integrity sha1-iXScY7BY19kNYZ+GuYqhU107l/A= - dependencies: - binary ">= 0.3.0 < 1" - fstream ">= 0.1.30 < 1" - match-stream ">= 0.0.2 < 1" - pullstream ">= 0.4.1 < 1" - readable-stream "~1.0.31" - setimmediate ">= 1.0.1 < 2" - -uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== - dependencies: - punycode "^2.1.0" - -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= - -use@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== - -util-deprecate@^1.0.1, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - -utils-extend@^1.0.4, utils-extend@^1.0.6, utils-extend@^1.0.7: - version "1.0.8" - resolved "https://registry.yarnpkg.com/utils-extend/-/utils-extend-1.0.8.tgz#ccfd7b64540f8e90ee21eec57769d0651cab8a5f" - integrity sha1-zP17ZFQPjpDuIe7Fd2nQZRyril8= - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= - -uuid@^3.3.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= - -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -vscode-jsonrpc@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz#a7bf74ef3254d0a0c272fab15c82128e378b3be9" - integrity sha512-perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg== - -vscode-languageserver-protocol@3.14.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz#b8aab6afae2849c84a8983d39a1cf742417afe2f" - integrity sha512-IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g== - dependencies: - vscode-jsonrpc "^4.0.0" - vscode-languageserver-types "3.14.0" - -vscode-languageserver-types@3.14.0: - version "3.14.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743" - integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A== - -vscode-languageserver@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz#0d2feddd33f92aadf5da32450df498d52f6f14eb" - integrity sha512-GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A== - dependencies: - vscode-languageserver-protocol "3.14.1" - vscode-uri "^1.0.6" - -vscode-uri@^1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz#9769aaececae4026fb6e22359cb38946580ded59" - integrity sha512-obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ== - -w3c-keyname@^2.2.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.2.tgz#7ea63170454bb19f1a3c6b628fc3dc8889276e91" - integrity sha512-8Vs/aVwcy0IJACaPm4tyzh1fzehZE70bGSjEl3dDms5UXtWnaBElrSHC8lDDeak0Gk5jxKOFstL64/65o7Ge2A== - -watch@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/watch/-/watch-1.0.2.tgz#340a717bde765726fa0aa07d721e0147a551df0c" - integrity sha1-NApxe952Vyb6CqB9ch4BR6VR3ww= - dependencies: - exec-sh "^0.2.0" - minimist "^1.2.0" - -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= - -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= - dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" - -wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== - dependencies: - string-width "^1.0.2 || 2" - -word-wrap@~1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" - integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -ws@^1.1.1: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz#cbd9e6e75e09fc5d2c90015f21f0c40875e0dd51" - integrity sha512-o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w== - dependencies: - options ">=0.0.5" - ultron "1.0.x" - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yaml@^1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz#f26aabf738590ab61efaca502358e48dc9f348b2" - integrity sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw== - dependencies: - "@babel/runtime" "^7.6.3" - -yargs-parser@^20.2.2: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yargs@^16.1.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - 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" - -yn@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" - integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== - -zenscroll@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/zenscroll/-/zenscroll-4.0.2.tgz#e8d5774d1c0738a47bcfa8729f3712e2deddeb25" - integrity sha1-6NV3TRwHOKR7z6hynzcS4t7d6yU= diff --git a/third_party/nixpkgs/pkgs/applications/editors/rstudio/yarndeps.nix b/third_party/nixpkgs/pkgs/applications/editors/rstudio/yarndeps.nix deleted file mode 100644 index 21d267f841..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/rstudio/yarndeps.nix +++ /dev/null @@ -1,4829 +0,0 @@ -{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { - offline_cache = linkFarm "offline" packages; - packages = [ - { - name = "_babel_code_frame___code_frame_7.8.3.tgz"; - path = fetchurl { - name = "_babel_code_frame___code_frame_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; - }; - } - { - name = "_babel_helper_module_imports___helper_module_imports_7.15.4.tgz"; - path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.15.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz"; - sha512 = "jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA=="; - }; - } - { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; - path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz"; - sha512 = "pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g=="; - }; - } - { - name = "_babel_highlight___highlight_7.8.3.tgz"; - path = fetchurl { - name = "_babel_highlight___highlight_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz"; - sha512 = "PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg=="; - }; - } - { - name = "_babel_runtime___runtime_7.9.6.tgz"; - path = fetchurl { - name = "_babel_runtime___runtime_7.9.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz"; - sha512 = "64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ=="; - }; - } - { - name = "_babel_runtime___runtime_7.8.4.tgz"; - path = fetchurl { - name = "_babel_runtime___runtime_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz"; - sha512 = "neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ=="; - }; - } - { - name = "_babel_types___types_7.15.6.tgz"; - path = fetchurl { - name = "_babel_types___types_7.15.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz"; - sha512 = "BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig=="; - }; - } - { - name = "_emotion_babel_utils___babel_utils_0.6.10.tgz"; - path = fetchurl { - name = "_emotion_babel_utils___babel_utils_0.6.10.tgz"; - url = "https://registry.yarnpkg.com/@emotion/babel-utils/-/babel-utils-0.6.10.tgz"; - sha512 = "/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow=="; - }; - } - { - name = "_emotion_hash___hash_0.6.6.tgz"; - path = fetchurl { - name = "_emotion_hash___hash_0.6.6.tgz"; - url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.6.6.tgz"; - sha512 = "ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ=="; - }; - } - { - name = "_emotion_is_prop_valid___is_prop_valid_0.6.8.tgz"; - path = fetchurl { - name = "_emotion_is_prop_valid___is_prop_valid_0.6.8.tgz"; - url = "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-0.6.8.tgz"; - sha512 = "IMSL7ekYhmFlILXcouA6ket3vV7u9BqStlXzbKOF9HBtpUPMMlHU+bBxrLOa2NvleVwNIxeq/zL8LafLbeUXcA=="; - }; - } - { - name = "_emotion_memoize___memoize_0.6.6.tgz"; - path = fetchurl { - name = "_emotion_memoize___memoize_0.6.6.tgz"; - url = "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.6.6.tgz"; - sha512 = "h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ=="; - }; - } - { - name = "_emotion_serialize___serialize_0.9.1.tgz"; - path = fetchurl { - name = "_emotion_serialize___serialize_0.9.1.tgz"; - url = "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-0.9.1.tgz"; - sha512 = "zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ=="; - }; - } - { - name = "_emotion_stylis___stylis_0.7.1.tgz"; - path = fetchurl { - name = "_emotion_stylis___stylis_0.7.1.tgz"; - url = "https://registry.yarnpkg.com/@emotion/stylis/-/stylis-0.7.1.tgz"; - sha512 = "/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ=="; - }; - } - { - name = "_emotion_unitless___unitless_0.6.7.tgz"; - path = fetchurl { - name = "_emotion_unitless___unitless_0.6.7.tgz"; - url = "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.6.7.tgz"; - sha512 = "Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg=="; - }; - } - { - name = "_emotion_utils___utils_0.8.2.tgz"; - path = fetchurl { - name = "_emotion_utils___utils_0.8.2.tgz"; - url = "https://registry.yarnpkg.com/@emotion/utils/-/utils-0.8.2.tgz"; - sha512 = "rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw=="; - }; - } - { - name = "_mapbox_node_pre_gyp___node_pre_gyp_1.0.5.tgz"; - path = fetchurl { - name = "_mapbox_node_pre_gyp___node_pre_gyp_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.5.tgz"; - sha512 = "4srsKPXWlIxp5Vbqz5uLfBN+du2fJChBoYn/f2h991WLdk7jUvcSk/McVLSv/X+xQIPI8eGD5GjrnygdyHnhPA=="; - }; - } - { - name = "_textlint_ast_node_types___ast_node_types_4.4.3.tgz"; - path = fetchurl { - name = "_textlint_ast_node_types___ast_node_types_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/@textlint/ast-node-types/-/ast-node-types-4.4.3.tgz"; - sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; - }; - } - { - name = "_types_ace___ace_0.0.43.tgz"; - path = fetchurl { - name = "_types_ace___ace_0.0.43.tgz"; - url = "https://registry.yarnpkg.com/@types/ace/-/ace-0.0.43.tgz"; - sha512 = "eQdX8AQ7CfSHym07MZMBQ8FKUj9AZ2Wcc26W5Ct8J4KOMjFY6SFUaf2YA8YHBut0Fwl//2kZ+0GLZNp+NQNRIA=="; - }; - } - { - name = "_types_clipboard___clipboard_2.0.7.tgz"; - path = fetchurl { - name = "_types_clipboard___clipboard_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/clipboard/-/clipboard-2.0.7.tgz"; - sha512 = "VwVFUHlneOsWfv/GaaY7Kwk4XasDqkAlyFQtsHxnOw0yyBYWTrlEXtmb9RtC+VFBCdtuOeIXECmELNd5RrKp/g=="; - }; - } - { - name = "_types_diff_match_patch___diff_match_patch_1.0.32.tgz"; - path = fetchurl { - name = "_types_diff_match_patch___diff_match_patch_1.0.32.tgz"; - url = "https://registry.yarnpkg.com/@types/diff-match-patch/-/diff-match-patch-1.0.32.tgz"; - sha512 = "bPYT5ECFiblzsVzyURaNhljBH2Gh1t9LowgUwciMrNAhFewLkHT2H0Mto07Y4/3KCOGZHRQll3CTtQZ0X11D/A=="; - }; - } - { - name = "_types_js_yaml___js_yaml_4.0.3.tgz"; - path = fetchurl { - name = "_types_js_yaml___js_yaml_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.3.tgz"; - sha512 = "5t9BhoORasuF5uCPr+d5/hdB++zRFUTMIZOzbNkr+jZh3yQht4HYbRDyj9fY8n2TZT30iW9huzav73x4NikqWg=="; - }; - } - { - name = "_types_lodash.debounce___lodash.debounce_4.0.6.tgz"; - path = fetchurl { - name = "_types_lodash.debounce___lodash.debounce_4.0.6.tgz"; - url = "https://registry.yarnpkg.com/@types/lodash.debounce/-/lodash.debounce-4.0.6.tgz"; - sha512 = "4WTmnnhCfDvvuLMaF3KV4Qfki93KebocUF45msxhYyjMttZDQYzHkO639ohhk8+oco2cluAFL3t5+Jn4mleylQ=="; - }; - } - { - name = "_types_lodash.orderby___lodash.orderby_4.6.6.tgz"; - path = fetchurl { - name = "_types_lodash.orderby___lodash.orderby_4.6.6.tgz"; - url = "https://registry.yarnpkg.com/@types/lodash.orderby/-/lodash.orderby-4.6.6.tgz"; - sha512 = "wQzu6xK+bSwhu45OeMI7fjywiIZiiaBzJB8W3fwnF1SJXHoOXRLutrSnVmq4yHPOM036qsy8lx9wHQcAbXNjJw=="; - }; - } - { - name = "_types_lodash.uniqby___lodash.uniqby_4.7.6.tgz"; - path = fetchurl { - name = "_types_lodash.uniqby___lodash.uniqby_4.7.6.tgz"; - url = "https://registry.yarnpkg.com/@types/lodash.uniqby/-/lodash.uniqby-4.7.6.tgz"; - sha512 = "9wBhrm1y6asW50Joj6tsySCNUgzK2tCqL7vtKIej0E9RyeBFdcte7fxUosmFuMoOU0eHqOMK76kCCrK99jxHgg=="; - }; - } - { - name = "_types_lodash___lodash_4.14.154.tgz"; - path = fetchurl { - name = "_types_lodash___lodash_4.14.154.tgz"; - url = "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.154.tgz"; - sha512 = "VoDZIJmg3P8vPEnTldLvgA+q7RkIbVkbYX4k0cAVFzGAOQwUehVgRHgIr2/wepwivDst/rVRqaiBSjCXRnoWwQ=="; - }; - } - { - name = "_types_node___node_14.0.4.tgz"; - path = fetchurl { - name = "_types_node___node_14.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-14.0.4.tgz"; - sha512 = "k3NqigXWRzQZVBDS5D1U70A5E8Qk4Kh+Ha/x4M8Bt9pF0X05eggfnC9+63Usc9Q928hRUIpIhTQaXsZwZBl4Ew=="; - }; - } - { - name = "_types_orderedmap___orderedmap_1.0.0.tgz"; - path = fetchurl { - name = "_types_orderedmap___orderedmap_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/orderedmap/-/orderedmap-1.0.0.tgz"; - sha512 = "dxKo80TqYx3YtBipHwA/SdFmMMyLCnP+5mkEqN0eMjcTBzHkiiX0ES118DsjDBjvD+zeSsSU9jULTZ+frog+Gw=="; - }; - } - { - name = "_types_parse_json___parse_json_4.0.0.tgz"; - path = fetchurl { - name = "_types_parse_json___parse_json_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; - }; - } - { - name = "_types_pinyin___pinyin_2.10.0.tgz"; - path = fetchurl { - name = "_types_pinyin___pinyin_2.10.0.tgz"; - url = "https://registry.yarnpkg.com/@types/pinyin/-/pinyin-2.10.0.tgz"; - sha512 = "YLty6FPYiBgxNbQNaTRJquvflRdG026jjOpjNXR7HdGEJPGtmPBp1x9LkWePCNA/ClaTT0hYem080TbRCMLbew=="; - }; - } - { - name = "_types_prop_types___prop_types_15.7.3.tgz"; - path = fetchurl { - name = "_types_prop_types___prop_types_15.7.3.tgz"; - url = "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz"; - sha512 = "KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw=="; - }; - } - { - name = "_types_prosemirror_commands___prosemirror_commands_1.0.3.tgz"; - path = fetchurl { - name = "_types_prosemirror_commands___prosemirror_commands_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-commands/-/prosemirror-commands-1.0.3.tgz"; - sha512 = "AjFCJqBvAhQ4gOzXPgUcnEZwu4jd7se7ani3dYAv8p4L+cWEPD6Pshrpp5uJDI5/pzvNXLWQ/4c2Qk4h9IML1w=="; - }; - } - { - name = "_types_prosemirror_commands___prosemirror_commands_1.0.4.tgz"; - path = fetchurl { - name = "_types_prosemirror_commands___prosemirror_commands_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-commands/-/prosemirror-commands-1.0.4.tgz"; - sha512 = "utDNYB3EXLjAfYIcRWJe6pn3kcQ5kG4RijbT/0Y/TFOm6yhvYS/D9eJVnijdg9LDjykapcezchxGRqFD5LcyaQ=="; - }; - } - { - name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.3.tgz"; - path = fetchurl { - name = "_types_prosemirror_dropcursor___prosemirror_dropcursor_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-dropcursor/-/prosemirror-dropcursor-1.0.3.tgz"; - sha512 = "b0/8njnJ4lwyHKcGuCMf3x7r1KjxyugB1R/c2iMCjplsJHSC7UY9+OysqgJR5uUXRekUSGniiLgBtac/lvH6wg=="; - }; - } - { - name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.4.tgz"; - path = fetchurl { - name = "_types_prosemirror_gapcursor___prosemirror_gapcursor_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-gapcursor/-/prosemirror-gapcursor-1.0.4.tgz"; - sha512 = "9xKjFIG5947dzerFvkLWp6F53JwrUYoYwh3SgcTFEp8SbSfNNrez/PFYVZKPnoqPoaK5WtTdQTaMwpCV9rXQIg=="; - }; - } - { - name = "_types_prosemirror_history___prosemirror_history_1.0.3.tgz"; - path = fetchurl { - name = "_types_prosemirror_history___prosemirror_history_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-history/-/prosemirror-history-1.0.3.tgz"; - sha512 = "5TloMDRavgLjOAKXp1Li8u0xcsspzbT1Cm9F2pwHOkgvQOz1jWQb2VIXO7RVNsFjLBZdIXlyfSLivro3DuMWXg=="; - }; - } - { - name = "_types_prosemirror_inputrules___prosemirror_inputrules_1.0.4.tgz"; - path = fetchurl { - name = "_types_prosemirror_inputrules___prosemirror_inputrules_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-inputrules/-/prosemirror-inputrules-1.0.4.tgz"; - sha512 = "lJIMpOjO47SYozQybUkpV6QmfuQt7GZKHtVrvS+mR5UekA8NMC5HRIVMyaIauJLWhKU6oaNjpVaXdw41kh165g=="; - }; - } - { - name = "_types_prosemirror_keymap___prosemirror_keymap_1.0.4.tgz"; - path = fetchurl { - name = "_types_prosemirror_keymap___prosemirror_keymap_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-keymap/-/prosemirror-keymap-1.0.4.tgz"; - sha512 = "ycevwkqUh+jEQtPwqO7sWGcm+Sybmhu8MpBsM8DlO3+YTKnXbKA6SDz/+q14q1wK3UA8lHJyfR+v+GPxfUSemg=="; - }; - } - { - name = "_types_prosemirror_model___prosemirror_model_1.7.2.tgz"; - path = fetchurl { - name = "_types_prosemirror_model___prosemirror_model_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-model/-/prosemirror-model-1.7.2.tgz"; - sha512 = "2l+yXvidg3AUHN07mO4Jd8Q84fo6ksFsy7LHUurLYrZ74uTahBp2fzcO49AKZMzww2EulXJ40Kl/OFaQ/7A1fw=="; - }; - } - { - name = "_types_prosemirror_schema_list___prosemirror_schema_list_1.0.3.tgz"; - path = fetchurl { - name = "_types_prosemirror_schema_list___prosemirror_schema_list_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-schema-list/-/prosemirror-schema-list-1.0.3.tgz"; - sha512 = "uWybOf+M2Ea7rlbs0yLsS4YJYNGXYtn4N+w8HCw3Vvfl6wBAROzlMt0gV/D/VW/7J/LlAjwMezuGe8xi24HzXA=="; - }; - } - { - name = "_types_prosemirror_state___prosemirror_state_1.2.3.tgz"; - path = fetchurl { - name = "_types_prosemirror_state___prosemirror_state_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-state/-/prosemirror-state-1.2.3.tgz"; - sha512 = "6m433Hubix9bx+JgcLW7zzyiZuzwjq5mBdSMYY4Yi5c5ZpV2RiVmg7Cy6f9Thtts8vuztilw+PczJAgDm1Frfw=="; - }; - } - { - name = "_types_prosemirror_tables___prosemirror_tables_0.9.1.tgz"; - path = fetchurl { - name = "_types_prosemirror_tables___prosemirror_tables_0.9.1.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-tables/-/prosemirror-tables-0.9.1.tgz"; - sha512 = "zoY1qcAC6kG4UjnaQQXuoyYQdDJMQmY9uzRKdyUppP8rWRR5/kXBHOd84CD9ZvrYUBo3uDmS20qQnc3knr2j9A=="; - }; - } - { - name = "_types_prosemirror_transform___prosemirror_transform_1.1.1.tgz"; - path = fetchurl { - name = "_types_prosemirror_transform___prosemirror_transform_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-transform/-/prosemirror-transform-1.1.1.tgz"; - sha512 = "yYCYSoiRH+Wcbl8GJc0PFCzeyMzNQ1vL2xrHHSXZuNcIlH75VoiKrZFeZ6BS9cl8mYXjZrlmdBe8YOxYvyKM6A=="; - }; - } - { - name = "_types_prosemirror_view___prosemirror_view_1.11.2.tgz"; - path = fetchurl { - name = "_types_prosemirror_view___prosemirror_view_1.11.2.tgz"; - url = "https://registry.yarnpkg.com/@types/prosemirror-view/-/prosemirror-view-1.11.2.tgz"; - sha512 = "EKcQmR4KdkFZU13wS5pWrkSojRCPGqz/l/uzpZFfW5cgdr7fQsftf2/ttvIjpk1a94ISifEY4UZwflVJ+uL4Rg=="; - }; - } - { - name = "_types_react_dom___react_dom_17.0.9.tgz"; - path = fetchurl { - name = "_types_react_dom___react_dom_17.0.9.tgz"; - url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.9.tgz"; - sha512 = "wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg=="; - }; - } - { - name = "_types_react_window___react_window_1.8.5.tgz"; - path = fetchurl { - name = "_types_react_window___react_window_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.5.tgz"; - sha512 = "V9q3CvhC9Jk9bWBOysPGaWy/Z0lxYcTXLtLipkt2cnRj1JOSFNF7wqGpkScSXMgBwC+fnVRg/7shwgddBG5ICw=="; - }; - } - { - name = "_types_react___react_16.9.32.tgz"; - path = fetchurl { - name = "_types_react___react_16.9.32.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.32.tgz"; - sha512 = "fmejdp0CTH00mOJmxUPPbWCEBWPvRIL4m8r0qD+BSDUqmutPyGQCHifzMpMzdvZwROdEdL78IuZItntFWgPXHQ=="; - }; - } - { - name = "_types_react___react_17.0.20.tgz"; - path = fetchurl { - name = "_types_react___react_17.0.20.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-17.0.20.tgz"; - sha512 = "wWZrPlihslrPpcKyCSlmIlruakxr57/buQN1RjlIeaaTWDLtJkTtRW429MoQJergvVKc4IWBpRhWw7YNh/7GVA=="; - }; - } - { - name = "_types_scheduler___scheduler_0.16.2.tgz"; - path = fetchurl { - name = "_types_scheduler___scheduler_0.16.2.tgz"; - url = "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz"; - sha512 = "hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="; - }; - } - { - name = "_types_transliteration___transliteration_1.6.6.tgz"; - path = fetchurl { - name = "_types_transliteration___transliteration_1.6.6.tgz"; - url = "https://registry.yarnpkg.com/@types/transliteration/-/transliteration-1.6.6.tgz"; - sha512 = "drgWFeHgZt16bXKhsu4cP6TlunW3Pu9MS1l9w7Qnm+bcsqf4/pnjnO6/uMAziCV8rnmuU3iCSk7J2zio1nR1+A=="; - }; - } - { - name = "_types_unzip___unzip_0.1.1.tgz"; - path = fetchurl { - name = "_types_unzip___unzip_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/unzip/-/unzip-0.1.1.tgz"; - sha512 = "skD6Um7Pk2l7y+tVOKSgOA9vXViyhk/qJYmr17Ek4Uw3Zgo/DWPScphTPztPbApTIngyYSJnkEW87xrHzRYaew=="; - }; - } - { - name = "_types_zenscroll___zenscroll_4.0.1.tgz"; - path = fetchurl { - name = "_types_zenscroll___zenscroll_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/zenscroll/-/zenscroll-4.0.1.tgz"; - sha512 = "r1h1/SPJQn8kL4rzyJvf4HJvqv20YrTV++qRGiPuA1mYbCSkMBaUOsCXLN780gI6BZfRzDbmjU0/sWq9yi1WgQ=="; - }; - } - { - name = "abbrev___abbrev_1.1.1.tgz"; - path = fetchurl { - name = "abbrev___abbrev_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; - }; - } - { - name = "accepts___accepts_1.3.7.tgz"; - path = fetchurl { - name = "accepts___accepts_1.3.7.tgz"; - url = "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz"; - sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; - }; - } - { - name = "acorn_jsx___acorn_jsx_4.1.1.tgz"; - path = fetchurl { - name = "acorn_jsx___acorn_jsx_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz"; - sha512 = "JY+iV6r+cO21KtntVvFkD+iqjtdpRUpGqKWgfkCdZq1R+kbreEl8EcdcJR4SmiIgsIQT33s6QzheQ9a275Q8xw=="; - }; - } - { - name = "acorn___acorn_5.7.3.tgz"; - path = fetchurl { - name = "acorn___acorn_5.7.3.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz"; - sha512 = "T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="; - }; - } - { - name = "agent_base___agent_base_6.0.2.tgz"; - path = fetchurl { - name = "agent_base___agent_base_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; - sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; - }; - } - { - name = "ajax_request___ajax_request_1.2.3.tgz"; - path = fetchurl { - name = "ajax_request___ajax_request_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/ajax-request/-/ajax-request-1.2.3.tgz"; - sha1 = "mfy+wdbSeS+F+pSVNTMr0U9fN5A="; - }; - } - { - name = "ajv___ajv_6.12.0.tgz"; - path = fetchurl { - name = "ajv___ajv_6.12.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz"; - sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; - }; - } - { - name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; - path = fetchurl { - name = "ansi_escapes___ansi_escapes_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz"; - sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; - }; - } - { - name = "ansi_regex___ansi_regex_2.1.1.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "w7M6te42DYbg5ijwRorn7yfWVN8="; - }; - } - { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "7QMXwyIGT3lGbAKWa922Bas32Zg="; - }; - } - { - name = "ansi_regex___ansi_regex_5.0.1.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; - }; - } - { - name = "ansi_styles___ansi_styles_3.2.1.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; - }; - } - { - name = "ansi_styles___ansi_styles_4.3.0.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; - }; - } - { - name = "ansi___ansi_0.3.1.tgz"; - path = fetchurl { - name = "ansi___ansi_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz"; - sha1 = "DELU+xcWDVqa8eSEus4cZpIsGyE="; - }; - } - { - name = "anymatch___anymatch_1.3.2.tgz"; - path = fetchurl { - name = "anymatch___anymatch_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz"; - sha512 = "0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA=="; - }; - } - { - name = "app_root_path___app_root_path_1.4.0.tgz"; - path = fetchurl { - name = "app_root_path___app_root_path_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/app-root-path/-/app-root-path-1.4.0.tgz"; - sha1 = "YzXYZclkDQ+tmQBOWnkjIjjpLfo="; - }; - } - { - name = "app_root_path___app_root_path_2.2.1.tgz"; - path = fetchurl { - name = "app_root_path___app_root_path_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz"; - sha512 = "91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA=="; - }; - } - { - name = "aproba___aproba_1.2.0.tgz"; - path = fetchurl { - name = "aproba___aproba_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; - sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; - }; - } - { - name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; - path = fetchurl { - name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; - sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; - }; - } - { - name = "arg___arg_4.1.3.tgz"; - path = fetchurl { - name = "arg___arg_4.1.3.tgz"; - url = "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz"; - sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="; - }; - } - { - name = "argparse___argparse_1.0.10.tgz"; - path = fetchurl { - name = "argparse___argparse_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; - sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; - }; - } - { - name = "argparse___argparse_2.0.1.tgz"; - path = fetchurl { - name = "argparse___argparse_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; - sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; - }; - } - { - name = "arr_diff___arr_diff_2.0.0.tgz"; - path = fetchurl { - name = "arr_diff___arr_diff_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz"; - sha1 = "jzuCf5Vai9ZpaX5KQlasPOrjVs8="; - }; - } - { - name = "arr_diff___arr_diff_4.0.0.tgz"; - path = fetchurl { - name = "arr_diff___arr_diff_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz"; - sha1 = "1kYQdP6/7HHn4VI1dhoyml3HxSA="; - }; - } - { - name = "arr_flatten___arr_flatten_1.1.0.tgz"; - path = fetchurl { - name = "arr_flatten___arr_flatten_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; - }; - } - { - name = "arr_union___arr_union_3.1.0.tgz"; - path = fetchurl { - name = "arr_union___arr_union_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz"; - sha1 = "45sJrqne+Gao8gbiiK9jkZuuOcQ="; - }; - } - { - name = "array_flatten___array_flatten_1.1.1.tgz"; - path = fetchurl { - name = "array_flatten___array_flatten_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz"; - sha1 = "ml9pkFGx5wczKPKgCJaLZOopVdI="; - }; - } - { - name = "array_unique___array_unique_0.2.1.tgz"; - path = fetchurl { - name = "array_unique___array_unique_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz"; - sha1 = "odl8yvy8JiXMcPrc6zalDFiwGlM="; - }; - } - { - name = "array_unique___array_unique_0.3.2.tgz"; - path = fetchurl { - name = "array_unique___array_unique_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz"; - sha1 = "qJS3XUvE9s1nnvMkSp/Y9Gri1Cg="; - }; - } - { - name = "asn1___asn1_0.2.4.tgz"; - path = fetchurl { - name = "asn1___asn1_0.2.4.tgz"; - url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz"; - sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; - }; - } - { - name = "assert_plus___assert_plus_1.0.0.tgz"; - path = fetchurl { - name = "assert_plus___assert_plus_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "8S4PPF13sLHN2RRpQuTpbB5N1SU="; - }; - } - { - name = "assign_symbols___assign_symbols_1.0.0.tgz"; - path = fetchurl { - name = "assign_symbols___assign_symbols_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz"; - sha1 = "WWZ/QfrdTyDMvCu5a41Pf3jsA2c="; - }; - } - { - name = "async_each___async_each_1.0.3.tgz"; - path = fetchurl { - name = "async_each___async_each_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz"; - sha512 = "z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="; - }; - } - { - name = "asynckit___asynckit_0.4.0.tgz"; - path = fetchurl { - name = "asynckit___asynckit_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "x57Zf380y48robyXkLzDZkdLS3k="; - }; - } - { - name = "atob___atob_2.1.2.tgz"; - path = fetchurl { - name = "atob___atob_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"; - sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; - }; - } - { - name = "aws_sign2___aws_sign2_0.7.0.tgz"; - path = fetchurl { - name = "aws_sign2___aws_sign2_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "tG6JCTSpWR8tL2+G1+ap8bP+dqg="; - }; - } - { - name = "aws4___aws4_1.9.1.tgz"; - path = fetchurl { - name = "aws4___aws4_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz"; - sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="; - }; - } - { - name = "babel_plugin_emotion___babel_plugin_emotion_9.2.11.tgz"; - path = fetchurl { - name = "babel_plugin_emotion___babel_plugin_emotion_9.2.11.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz"; - sha512 = "dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ=="; - }; - } - { - name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; - path = fetchurl { - name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; - sha512 = "SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg=="; - }; - } - { - name = "babel_plugin_syntax_jsx___babel_plugin_syntax_jsx_6.18.0.tgz"; - path = fetchurl { - name = "babel_plugin_syntax_jsx___babel_plugin_syntax_jsx_6.18.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; - sha1 = "CvMqmm4Tyno/1QaeYtew9Y0NiUY="; - }; - } - { - name = "babel_runtime___babel_runtime_6.26.0.tgz"; - path = fetchurl { - name = "babel_runtime___babel_runtime_6.26.0.tgz"; - url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz"; - sha1 = "llxwWGaOgrVde/4E/yM3vItWR/4="; - }; - } - { - name = "balanced_match___balanced_match_1.0.0.tgz"; - path = fetchurl { - name = "balanced_match___balanced_match_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "ibTRmasr7kneFk6gK4nORi1xt2c="; - }; - } - { - name = "base16___base16_1.0.0.tgz"; - path = fetchurl { - name = "base16___base16_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz"; - sha1 = "4pf2DX7BAUp6lxo568ipjAtoHnA="; - }; - } - { - name = "base64_img___base64_img_1.0.4.tgz"; - path = fetchurl { - name = "base64_img___base64_img_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/base64-img/-/base64-img-1.0.4.tgz"; - sha1 = "PiLVXWx0okVT2EDSsbwSp9sHjTU="; - }; - } - { - name = "base64_js___base64_js_1.3.1.tgz"; - path = fetchurl { - name = "base64_js___base64_js_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz"; - sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; - }; - } - { - name = "base___base_0.11.2.tgz"; - path = fetchurl { - name = "base___base_0.11.2.tgz"; - url = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"; - sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; - }; - } - { - name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; - path = fetchurl { - name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha1 = "pDAdOJtqQ/m2f/PKEaP2Y342Dp4="; - }; - } - { - name = "biblatex_csl_converter___biblatex_csl_converter_2.0.2.tgz"; - path = fetchurl { - name = "biblatex_csl_converter___biblatex_csl_converter_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/biblatex-csl-converter/-/biblatex-csl-converter-2.0.2.tgz"; - sha512 = "od1JdAkQYh2T1Pzpq11eYtuNb3nNXQ0w+17CAnYqRsX+QFtoiK0XcvBE7N6rpDJyUo0acoaB6Of7EDhFQOcblA=="; - }; - } - { - name = "binary_extensions___binary_extensions_1.13.1.tgz"; - path = fetchurl { - name = "binary_extensions___binary_extensions_1.13.1.tgz"; - url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz"; - sha512 = "Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw=="; - }; - } - { - name = "binary___binary_0.3.0.tgz"; - path = fetchurl { - name = "binary___binary_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/binary/-/binary-0.3.0.tgz"; - sha1 = "n2BVO8XOjDOG87VTz/R0Yq3sqnk="; - }; - } - { - name = "bindings___bindings_1.5.0.tgz"; - path = fetchurl { - name = "bindings___bindings_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; - sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ=="; - }; - } - { - name = "body_parser___body_parser_1.19.0.tgz"; - path = fetchurl { - name = "body_parser___body_parser_1.19.0.tgz"; - url = "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; - }; - } - { - name = "boundary___boundary_1.0.1.tgz"; - path = fetchurl { - name = "boundary___boundary_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/boundary/-/boundary-1.0.1.tgz"; - sha1 = "TWfcJgLAzBbdm85+v4fpSCkPWBI="; - }; - } - { - name = "bowser___bowser_2.9.0.tgz"; - path = fetchurl { - name = "bowser___bowser_2.9.0.tgz"; - url = "https://registry.yarnpkg.com/bowser/-/bowser-2.9.0.tgz"; - sha512 = "2ld76tuLBNFekRgmJfT2+3j5MIrP6bFict8WAIT3beq+srz1gcKNAdNKMqHqauQt63NmAa88HfP1/Ypa9Er3HA=="; - }; - } - { - name = "brace_expansion___brace_expansion_1.1.11.tgz"; - path = fetchurl { - name = "brace_expansion___brace_expansion_1.1.11.tgz"; - url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - } - { - name = "braces___braces_1.8.5.tgz"; - path = fetchurl { - name = "braces___braces_1.8.5.tgz"; - url = "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz"; - sha1 = "uneWLhLf+WnWt2cR6RS3N4V79qc="; - }; - } - { - name = "braces___braces_2.3.2.tgz"; - path = fetchurl { - name = "braces___braces_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"; - sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; - }; - } - { - name = "buffer_from___buffer_from_1.1.1.tgz"; - path = fetchurl { - name = "buffer_from___buffer_from_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; - }; - } - { - name = "buffers___buffers_0.1.1.tgz"; - path = fetchurl { - name = "buffers___buffers_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz"; - sha1 = "skV5w77U1tOWru5tmorn9Ugqt7s="; - }; - } - { - name = "builtin_modules___builtin_modules_1.1.1.tgz"; - path = fetchurl { - name = "builtin_modules___builtin_modules_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "Jw8HbFpywC9bZaR9+Uxf46J4iS8="; - }; - } - { - name = "bytes___bytes_3.1.0.tgz"; - path = fetchurl { - name = "bytes___bytes_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz"; - sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; - }; - } - { - name = "cache_base___cache_base_1.0.1.tgz"; - path = fetchurl { - name = "cache_base___cache_base_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz"; - sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; - }; - } - { - name = "callsites___callsites_3.1.0.tgz"; - path = fetchurl { - name = "callsites___callsites_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; - sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; - }; - } - { - name = "caseless___caseless_0.12.0.tgz"; - path = fetchurl { - name = "caseless___caseless_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; - sha1 = "G2gcIf+EAzyCZUMJBolCDRhxUdw="; - }; - } - { - name = "chain_able___chain_able_1.0.1.tgz"; - path = fetchurl { - name = "chain_able___chain_able_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/chain-able/-/chain-able-1.0.1.tgz"; - sha1 = "tIrJvcGPIZLscwq8ZmCfkKq1YF8="; - }; - } - { - name = "chain_able___chain_able_3.0.0.tgz"; - path = fetchurl { - name = "chain_able___chain_able_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/chain-able/-/chain-able-3.0.0.tgz"; - sha512 = "26MoELhta86n7gCsE2T1hGRyncZvPjFXTkB/DEp4+i/EJVSxXQNwXMDZZb2+SWcbPuow18wQtztaW7GXOel9DA=="; - }; - } - { - name = "chainsaw___chainsaw_0.1.0.tgz"; - path = fetchurl { - name = "chainsaw___chainsaw_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/chainsaw/-/chainsaw-0.1.0.tgz"; - sha1 = "XqtQsor+WAdNDVgpE4iCi15fvJg="; - }; - } - { - name = "chalk___chalk_2.4.2.tgz"; - path = fetchurl { - name = "chalk___chalk_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; - }; - } - { - name = "chardet___chardet_0.4.2.tgz"; - path = fetchurl { - name = "chardet___chardet_0.4.2.tgz"; - url = "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz"; - sha1 = "tUc7M9yXxCTl2Y3IfVXU2KKci/I="; - }; - } - { - name = "chokidar___chokidar_1.7.0.tgz"; - path = fetchurl { - name = "chokidar___chokidar_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz"; - sha1 = "eY5ol3gVHIB2tLNg5e3SjNortGg="; - }; - } - { - name = "chownr___chownr_2.0.0.tgz"; - path = fetchurl { - name = "chownr___chownr_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; - sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; - }; - } - { - name = "class_utils___class_utils_0.3.6.tgz"; - path = fetchurl { - name = "class_utils___class_utils_0.3.6.tgz"; - url = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz"; - sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; - }; - } - { - name = "clean_css___clean_css_4.2.3.tgz"; - path = fetchurl { - name = "clean_css___clean_css_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz"; - sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; - }; - } - { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; - path = fetchurl { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "s12sN2R5+sw+lHR9QdDQ9SOP/LU="; - }; - } - { - name = "cli_width___cli_width_2.2.0.tgz"; - path = fetchurl { - name = "cli_width___cli_width_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "/xnt6Kml5XkyQUewwR8PvLq+1jk="; - }; - } - { - name = "clipboard___clipboard_2.0.8.tgz"; - path = fetchurl { - name = "clipboard___clipboard_2.0.8.tgz"; - url = "https://registry.yarnpkg.com/clipboard/-/clipboard-2.0.8.tgz"; - sha512 = "Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ=="; - }; - } - { - name = "cliui___cliui_7.0.4.tgz"; - path = fetchurl { - name = "cliui___cliui_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz"; - sha512 = "OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ=="; - }; - } - { - name = "code_point_at___code_point_at_1.1.0.tgz"; - path = fetchurl { - name = "code_point_at___code_point_at_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "DQcLTQQ6W+ozovGkDi7bPZpMz3c="; - }; - } - { - name = "collection_visit___collection_visit_1.0.0.tgz"; - path = fetchurl { - name = "collection_visit___collection_visit_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz"; - sha1 = "S8A3PBZLwykbTTaMgpzxqApZ3KA="; - }; - } - { - name = "color_convert___color_convert_1.9.3.tgz"; - path = fetchurl { - name = "color_convert___color_convert_1.9.3.tgz"; - url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; - }; - } - { - name = "color_convert___color_convert_2.0.1.tgz"; - path = fetchurl { - name = "color_convert___color_convert_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; - sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; - }; - } - { - name = "color_name___color_name_1.1.3.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; - }; - } - { - name = "color_name___color_name_1.1.4.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; - }; - } - { - name = "combined_stream___combined_stream_1.0.8.tgz"; - path = fetchurl { - name = "combined_stream___combined_stream_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; - }; - } - { - name = "commander___commander_2.20.3.tgz"; - path = fetchurl { - name = "commander___commander_2.20.3.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; - sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; - }; - } - { - name = "commander___commander_1.1.1.tgz"; - path = fetchurl { - name = "commander___commander_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-1.1.1.tgz"; - sha1 = "UNFlGGiuYOzP8KLZ80WVN2vGsEE="; - }; - } - { - name = "component_emitter___component_emitter_1.3.0.tgz"; - path = fetchurl { - name = "component_emitter___component_emitter_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; - sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; - }; - } - { - name = "concat_map___concat_map_0.0.1.tgz"; - path = fetchurl { - name = "concat_map___concat_map_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; - }; - } - { - name = "concat_stream___concat_stream_1.6.2.tgz"; - path = fetchurl { - name = "concat_stream___concat_stream_1.6.2.tgz"; - url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; - }; - } - { - name = "concat_stream___concat_stream_2.0.0.tgz"; - path = fetchurl { - name = "concat_stream___concat_stream_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz"; - sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; - }; - } - { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - path = fetchurl { - name = "console_control_strings___console_control_strings_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "PXz0Rk22RG6mRL9LOVB/mFEAjo4="; - }; - } - { - name = "content_disposition___content_disposition_0.5.3.tgz"; - path = fetchurl { - name = "content_disposition___content_disposition_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz"; - sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; - }; - } - { - name = "content_type___content_type_1.0.4.tgz"; - path = fetchurl { - name = "content_type___content_type_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz"; - sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; - }; - } - { - name = "convert_source_map___convert_source_map_1.7.0.tgz"; - path = fetchurl { - name = "convert_source_map___convert_source_map_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; - sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; - }; - } - { - name = "convert_source_map___convert_source_map_1.8.0.tgz"; - path = fetchurl { - name = "convert_source_map___convert_source_map_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz"; - sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; - }; - } - { - name = "cookie_signature___cookie_signature_1.0.6.tgz"; - path = fetchurl { - name = "cookie_signature___cookie_signature_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha1 = "4wOogrNCzD7oylE6eZmXNNqzriw="; - }; - } - { - name = "cookie___cookie_0.4.0.tgz"; - path = fetchurl { - name = "cookie___cookie_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz"; - sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; - }; - } - { - name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; - path = fetchurl { - name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; - sha1 = "Z29us8OZl8LuGsOpJP1hJHSPV40="; - }; - } - { - name = "core_js___core_js_2.6.11.tgz"; - path = fetchurl { - name = "core_js___core_js_2.6.11.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz"; - sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; - }; - } - { - name = "core_util_is___core_util_is_1.0.2.tgz"; - path = fetchurl { - name = "core_util_is___core_util_is_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "tf1UIgqivFq1eqtxQMlAdUUDwac="; - }; - } - { - name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; - path = fetchurl { - name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; - sha512 = "xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg=="; - }; - } - { - name = "create_emotion_styled___create_emotion_styled_9.2.8.tgz"; - path = fetchurl { - name = "create_emotion_styled___create_emotion_styled_9.2.8.tgz"; - url = "https://registry.yarnpkg.com/create-emotion-styled/-/create-emotion-styled-9.2.8.tgz"; - sha512 = "2LrNM5MREWzI5hZK+LyiBHglwE18WE3AEbBQgpHQ1+zmyLSm/dJsUZBeFAwuIMb+TjNZP0KsMZlV776ufOtFdg=="; - }; - } - { - name = "create_emotion___create_emotion_9.2.12.tgz"; - path = fetchurl { - name = "create_emotion___create_emotion_9.2.12.tgz"; - url = "https://registry.yarnpkg.com/create-emotion/-/create-emotion-9.2.12.tgz"; - sha512 = "P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA=="; - }; - } - { - name = "create_react_context___create_react_context_0.1.6.tgz"; - path = fetchurl { - name = "create_react_context___create_react_context_0.1.6.tgz"; - url = "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.1.6.tgz"; - sha512 = "eCnYYEUEc5i32LHwpE/W7NlddOB9oHwsPaWtWzYtflNkkwa3IfindIcoXdVWs12zCbwaMCavKNu84EXogVIWHw=="; - }; - } - { - name = "csstype___csstype_2.6.10.tgz"; - path = fetchurl { - name = "csstype___csstype_2.6.10.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.10.tgz"; - sha512 = "D34BqZU4cIlMCY93rZHbrq9pjTAQJ3U8S8rfBqjwHxkGPThWFjzZDQpgMJY0QViLxth6ZKYiwFBo14RdN44U/w=="; - }; - } - { - name = "csstype___csstype_2.6.18.tgz"; - path = fetchurl { - name = "csstype___csstype_2.6.18.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.18.tgz"; - sha512 = "RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ=="; - }; - } - { - name = "csstype___csstype_3.0.9.tgz"; - path = fetchurl { - name = "csstype___csstype_3.0.9.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz"; - sha512 = "rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw=="; - }; - } - { - name = "dashdash___dashdash_1.14.1.tgz"; - path = fetchurl { - name = "dashdash___dashdash_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "hTz6D3y+L+1d4gMmuN1YEDX24vA="; - }; - } - { - name = "debug___debug_2.6.9.tgz"; - path = fetchurl { - name = "debug___debug_2.6.9.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; - }; - } - { - name = "debug___debug_4.3.2.tgz"; - path = fetchurl { - name = "debug___debug_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; - }; - } - { - name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; - path = fetchurl { - name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha1 = "6zkTMzRYd1y4TNGh+uBiEGu4dUU="; - }; - } - { - name = "deep_is___deep_is_0.1.3.tgz"; - path = fetchurl { - name = "deep_is___deep_is_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "s2nW+128E+7PUk+RsHD+7cNXzzQ="; - }; - } - { - name = "define_property___define_property_0.2.5.tgz"; - path = fetchurl { - name = "define_property___define_property_0.2.5.tgz"; - url = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz"; - sha1 = "w1se+RjsPJkPmlvFe+BKrOxcgRY="; - }; - } - { - name = "define_property___define_property_1.0.0.tgz"; - path = fetchurl { - name = "define_property___define_property_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz"; - sha1 = "dp66rz9KY6rTr56NMEybvnm/sOY="; - }; - } - { - name = "define_property___define_property_2.0.2.tgz"; - path = fetchurl { - name = "define_property___define_property_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz"; - sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; - }; - } - { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; - path = fetchurl { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "3zrhmayt+31ECqrgsp4icrJOxhk="; - }; - } - { - name = "delegate___delegate_3.2.0.tgz"; - path = fetchurl { - name = "delegate___delegate_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/delegate/-/delegate-3.2.0.tgz"; - sha512 = "IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="; - }; - } - { - name = "delegates___delegates_1.0.0.tgz"; - path = fetchurl { - name = "delegates___delegates_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; - sha1 = "hMbhWbgZBP3KWaDvRM2HDTElD5o="; - }; - } - { - name = "depd___depd_1.1.2.tgz"; - path = fetchurl { - name = "depd___depd_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; - sha1 = "m81S4UwJd2PnSbJ0xDRu0uVgtak="; - }; - } - { - name = "destroy___destroy_1.0.4.tgz"; - path = fetchurl { - name = "destroy___destroy_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz"; - sha1 = "l4hXRCxEdJ5CBmE+N5RiBYJqvYA="; - }; - } - { - name = "detect_libc___detect_libc_1.0.3.tgz"; - path = fetchurl { - name = "detect_libc___detect_libc_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "+hN8S9aY7fVc1c0CrFWfkaTEups="; - }; - } - { - name = "diff_match_patch___diff_match_patch_1.0.4.tgz"; - path = fetchurl { - name = "diff_match_patch___diff_match_patch_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.4.tgz"; - sha512 = "Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg=="; - }; - } - { - name = "diff_match_patch___diff_match_patch_1.0.5.tgz"; - path = fetchurl { - name = "diff_match_patch___diff_match_patch_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.5.tgz"; - sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; - }; - } - { - name = "diff___diff_4.0.2.tgz"; - path = fetchurl { - name = "diff___diff_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz"; - sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; - }; - } - { - name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; - path = fetchurl { - name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha1 = "OoOpBOVDUyh4dMVkt1SThoSamMk="; - }; - } - { - name = "ee_first___ee_first_1.1.1.tgz"; - path = fetchurl { - name = "ee_first___ee_first_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "WQxhFWsK4vTwJVcyoViyZrxWsh0="; - }; - } - { - name = "emoji_regex___emoji_regex_8.0.0.tgz"; - path = fetchurl { - name = "emoji_regex___emoji_regex_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; - }; - } - { - name = "emotion___emotion_9.2.12.tgz"; - path = fetchurl { - name = "emotion___emotion_9.2.12.tgz"; - url = "https://registry.yarnpkg.com/emotion/-/emotion-9.2.12.tgz"; - sha512 = "hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ=="; - }; - } - { - name = "encodeurl___encodeurl_1.0.2.tgz"; - path = fetchurl { - name = "encodeurl___encodeurl_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "rT/0yG7C0CkyL1oCw6mmBslbP1k="; - }; - } - { - name = "error_ex___error_ex_1.3.2.tgz"; - path = fetchurl { - name = "error_ex___error_ex_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; - sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; - }; - } - { - name = "es6_object_assign___es6_object_assign_1.1.0.tgz"; - path = fetchurl { - name = "es6_object_assign___es6_object_assign_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz"; - sha1 = "wsNYJlYkfDnqEHyx5mUrb58kUjw="; - }; - } - { - name = "escalade___escalade_3.1.1.tgz"; - path = fetchurl { - name = "escalade___escalade_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; - }; - } - { - name = "escape_html___escape_html_1.0.3.tgz"; - path = fetchurl { - name = "escape_html___escape_html_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "Aljq5NPQwJdN4cFpGI7wBR0dGYg="; - }; - } - { - name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; - path = fetchurl { - name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; - }; - } - { - name = "escodegen___escodegen_1.14.1.tgz"; - path = fetchurl { - name = "escodegen___escodegen_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz"; - sha512 = "Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ=="; - }; - } - { - name = "esprima___esprima_4.0.1.tgz"; - path = fetchurl { - name = "esprima___esprima_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; - sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; - }; - } - { - name = "estraverse___estraverse_4.3.0.tgz"; - path = fetchurl { - name = "estraverse___estraverse_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; - sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; - }; - } - { - name = "esutils___esutils_2.0.3.tgz"; - path = fetchurl { - name = "esutils___esutils_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - } - { - name = "etag___etag_1.8.1.tgz"; - path = fetchurl { - name = "etag___etag_1.8.1.tgz"; - url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; - sha1 = "Qa4u62XvpiJorr/qg6x9eSmbCIc="; - }; - } - { - name = "exec_sh___exec_sh_0.2.2.tgz"; - path = fetchurl { - name = "exec_sh___exec_sh_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.2.tgz"; - sha512 = "FIUCJz1RbuS0FKTdaAafAByGS0CPvU3R0MeHxgtl+djzCc//F8HakL8GzmVNZanasTbTAY/3DRFA0KpVqj/eAw=="; - }; - } - { - name = "expand_brackets___expand_brackets_0.1.5.tgz"; - path = fetchurl { - name = "expand_brackets___expand_brackets_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz"; - sha1 = "3wcoTjQqgHzXM6xa9yQR5YHRF3s="; - }; - } - { - name = "expand_brackets___expand_brackets_2.1.4.tgz"; - path = fetchurl { - name = "expand_brackets___expand_brackets_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz"; - sha1 = "t3c14xXOMPa27/D4OwQVGiJEliI="; - }; - } - { - name = "expand_range___expand_range_1.8.2.tgz"; - path = fetchurl { - name = "expand_range___expand_range_1.8.2.tgz"; - url = "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz"; - sha1 = "opnv/TNf4nIeuujiV+x5ZE/IUzc="; - }; - } - { - name = "express___express_4.17.1.tgz"; - path = fetchurl { - name = "express___express_4.17.1.tgz"; - url = "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz"; - sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; - }; - } - { - name = "extend_shallow___extend_shallow_2.0.1.tgz"; - path = fetchurl { - name = "extend_shallow___extend_shallow_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz"; - sha1 = "Ua99YUrZqfYQ6huvu5idaxxWiQ8="; - }; - } - { - name = "extend_shallow___extend_shallow_3.0.2.tgz"; - path = fetchurl { - name = "extend_shallow___extend_shallow_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz"; - sha1 = "Jqcarwc7OfshJxcnRhMcJwQCjbg="; - }; - } - { - name = "extend___extend_3.0.2.tgz"; - path = fetchurl { - name = "extend___extend_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; - sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; - }; - } - { - name = "external_editor___external_editor_2.2.0.tgz"; - path = fetchurl { - name = "external_editor___external_editor_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz"; - sha512 = "bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A=="; - }; - } - { - name = "extglob___extglob_0.3.2.tgz"; - path = fetchurl { - name = "extglob___extglob_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz"; - sha1 = "Lhj/PS9JqydlzskCPwEdqo2DSaE="; - }; - } - { - name = "extglob___extglob_2.0.4.tgz"; - path = fetchurl { - name = "extglob___extglob_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"; - sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; - }; - } - { - name = "extsprintf___extsprintf_1.3.0.tgz"; - path = fetchurl { - name = "extsprintf___extsprintf_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "lpGEQOMEGnpBT4xS48V06zw+HgU="; - }; - } - { - name = "extsprintf___extsprintf_1.4.0.tgz"; - path = fetchurl { - name = "extsprintf___extsprintf_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz"; - sha1 = "4mifjzVvrWLMplo6kcXfX5VRaS8="; - }; - } - { - name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; - path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="; - }; - } - { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; - path = fetchurl { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; - }; - } - { - name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; - path = fetchurl { - name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc="; - }; - } - { - name = "fast_xml_parser___fast_xml_parser_3.17.1.tgz"; - path = fetchurl { - name = "fast_xml_parser___fast_xml_parser_3.17.1.tgz"; - url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.17.1.tgz"; - sha512 = "jZ0EVn1iBuZtx/sbQnfvhSaaUltz+0+yfR+6QRyzrlt5yMiU+8ZfGj9i3/hoXJxm+aFri7dycBWbncox7frCAQ=="; - }; - } - { - name = "figures___figures_2.0.0.tgz"; - path = fetchurl { - name = "figures___figures_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; - sha1 = "OrGi0qYsi/tDGgyUy3l6L84nyWI="; - }; - } - { - name = "file_match___file_match_1.0.2.tgz"; - path = fetchurl { - name = "file_match___file_match_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/file-match/-/file-match-1.0.2.tgz"; - sha1 = "ycrSZdLIrfOoFHWw30dYWQafrvc="; - }; - } - { - name = "file_system___file_system_2.2.2.tgz"; - path = fetchurl { - name = "file_system___file_system_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/file-system/-/file-system-2.2.2.tgz"; - sha1 = "fWWDPjojR9zZVqgTxncVPtPt2Yc="; - }; - } - { - name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; - path = fetchurl { - name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; - sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; - }; - } - { - name = "filename_regex___filename_regex_2.0.1.tgz"; - path = fetchurl { - name = "filename_regex___filename_regex_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz"; - sha1 = "wcS5vuPglyXdsQa3XB4wH+LxiyY="; - }; - } - { - name = "fill_range___fill_range_2.2.4.tgz"; - path = fetchurl { - name = "fill_range___fill_range_2.2.4.tgz"; - url = "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz"; - sha512 = "cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q=="; - }; - } - { - name = "fill_range___fill_range_4.0.0.tgz"; - path = fetchurl { - name = "fill_range___fill_range_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz"; - sha1 = "1USBHUKPmOsGpj3EAtJAPDKMOPc="; - }; - } - { - name = "finalhandler___finalhandler_1.1.2.tgz"; - path = fetchurl { - name = "finalhandler___finalhandler_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; - sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; - }; - } - { - name = "find_root___find_root_1.1.0.tgz"; - path = fetchurl { - name = "find_root___find_root_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz"; - sha512 = "NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="; - }; - } - { - name = "fliplog___fliplog_0.3.13.tgz"; - path = fetchurl { - name = "fliplog___fliplog_0.3.13.tgz"; - url = "https://registry.yarnpkg.com/fliplog/-/fliplog-0.3.13.tgz"; - sha512 = "R504CdX+mdhMYpmyrdiQ9PW6ncAyZnxyeA85fS1/P/Y9qmbMiQsqt6QzsYhq5kbqMb84PibVOcS1oz98GJl6EQ=="; - }; - } - { - name = "for_in___for_in_1.0.2.tgz"; - path = fetchurl { - name = "for_in___for_in_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz"; - sha1 = "gQaNKVqBQuwKxybG4iAMMPttXoA="; - }; - } - { - name = "for_own___for_own_0.1.5.tgz"; - path = fetchurl { - name = "for_own___for_own_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz"; - sha1 = "UmXGgaTylNq78XyVCbZ2OqhFEM4="; - }; - } - { - name = "forever_agent___forever_agent_0.6.1.tgz"; - path = fetchurl { - name = "forever_agent___forever_agent_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "+8cfDEGt6zf5bFd60e1C2P2sypE="; - }; - } - { - name = "form_data___form_data_2.3.3.tgz"; - path = fetchurl { - name = "form_data___form_data_2.3.3.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; - sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; - }; - } - { - name = "forwarded___forwarded_0.1.2.tgz"; - path = fetchurl { - name = "forwarded___forwarded_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz"; - sha1 = "mMI9qxF1ZXuMBXPozszZGw/xjIQ="; - }; - } - { - name = "fragment_cache___fragment_cache_0.2.1.tgz"; - path = fetchurl { - name = "fragment_cache___fragment_cache_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz"; - sha1 = "QpD60n8T6Jvn8zeZxrxaCr//DRk="; - }; - } - { - name = "fresh___fresh_0.5.2.tgz"; - path = fetchurl { - name = "fresh___fresh_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz"; - sha1 = "PYyt2Q2XZWn6g1qx+OSyOhBWBac="; - }; - } - { - name = "fs_extra___fs_extra_7.0.1.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz"; - sha512 = "YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw=="; - }; - } - { - name = "fs_minipass___fs_minipass_2.1.0.tgz"; - path = fetchurl { - name = "fs_minipass___fs_minipass_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; - sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; - }; - } - { - name = "fs.realpath___fs.realpath_1.0.0.tgz"; - path = fetchurl { - name = "fs.realpath___fs.realpath_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; - }; - } - { - name = "fsevents___fsevents_1.2.11.tgz"; - path = fetchurl { - name = "fsevents___fsevents_1.2.11.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz"; - sha512 = "+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw=="; - }; - } - { - name = "fstream___fstream_0.1.31.tgz"; - path = fetchurl { - name = "fstream___fstream_0.1.31.tgz"; - url = "https://registry.yarnpkg.com/fstream/-/fstream-0.1.31.tgz"; - sha1 = "czfwWPu7vvqMn1YaKMqwhJICyYg="; - }; - } - { - name = "fuse_box___fuse_box_3.7.1.tgz"; - path = fetchurl { - name = "fuse_box___fuse_box_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/fuse-box/-/fuse-box-3.7.1.tgz"; - sha512 = "aM7t9bUcRpNNQu9M+YjXXzx9JSJQVPWeY+8iTyv7OhvJNWHrqqEWPzbn9OfcyFa2AfPwAUyC/uzWexBbjtTvsA=="; - }; - } - { - name = "fuse_concat_with_sourcemaps___fuse_concat_with_sourcemaps_1.0.5.tgz"; - path = fetchurl { - name = "fuse_concat_with_sourcemaps___fuse_concat_with_sourcemaps_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/fuse-concat-with-sourcemaps/-/fuse-concat-with-sourcemaps-1.0.5.tgz"; - sha512 = "tKsRJIxn9tU3IH8JHMwFhGbObqkDKXhNKOvcM+QyflAlYb2EgOvIQe8D6WB/cocA3puldHatsp9SN5SKryasrw=="; - }; - } - { - name = "fuse.js___fuse.js_6.4.6.tgz"; - path = fetchurl { - name = "fuse.js___fuse.js_6.4.6.tgz"; - url = "https://registry.yarnpkg.com/fuse.js/-/fuse.js-6.4.6.tgz"; - sha512 = "/gYxR/0VpXmWSfZOIPS3rWwU8SHgsRTwWuXhyb2O6s7aRuVtHtxCkR33bNYu3wyLyNx/Wpv0vU7FZy8Vj53VNw=="; - }; - } - { - name = "gauge___gauge_2.7.4.tgz"; - path = fetchurl { - name = "gauge___gauge_2.7.4.tgz"; - url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; - sha1 = "LANAXHU4w51+s3sxcCLjJfsBi/c="; - }; - } - { - name = "get_caller_file___get_caller_file_1.0.3.tgz"; - path = fetchurl { - name = "get_caller_file___get_caller_file_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; - sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; - }; - } - { - name = "get_caller_file___get_caller_file_2.0.5.tgz"; - path = fetchurl { - name = "get_caller_file___get_caller_file_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; - }; - } - { - name = "get_value___get_value_2.0.6.tgz"; - path = fetchurl { - name = "get_value___get_value_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"; - sha1 = "3BXKHGcjh8p2vTesCjlbogQqLCg="; - }; - } - { - name = "getopts___getopts_2.2.5.tgz"; - path = fetchurl { - name = "getopts___getopts_2.2.5.tgz"; - url = "https://registry.yarnpkg.com/getopts/-/getopts-2.2.5.tgz"; - sha512 = "9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA=="; - }; - } - { - name = "getpass___getpass_0.1.7.tgz"; - path = fetchurl { - name = "getpass___getpass_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; - sha1 = "Xv+OPmhNVprkyysSgmBOi6YhSfo="; - }; - } - { - name = "glob_base___glob_base_0.3.0.tgz"; - path = fetchurl { - name = "glob_base___glob_base_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz"; - sha1 = "27Fk9iIbHAscz4Kuoyi0l98Oo8Q="; - }; - } - { - name = "glob_parent___glob_parent_2.0.0.tgz"; - path = fetchurl { - name = "glob_parent___glob_parent_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz"; - sha1 = "gTg9ctsFT8zPUzbaqQLxgvbtuyg="; - }; - } - { - name = "glob___glob_7.1.6.tgz"; - path = fetchurl { - name = "glob___glob_7.1.6.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; - }; - } - { - name = "good_listener___good_listener_1.2.2.tgz"; - path = fetchurl { - name = "good_listener___good_listener_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz"; - sha1 = "1TswzfkxPf+33JoNR3CWqm0UXFA="; - }; - } - { - name = "graceful_fs___graceful_fs_4.2.3.tgz"; - path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="; - }; - } - { - name = "graceful_fs___graceful_fs_3.0.12.tgz"; - path = fetchurl { - name = "graceful_fs___graceful_fs_3.0.12.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.12.tgz"; - sha512 = "J55gaCS4iTTJfTXIxSVw3EMQckcqkpdRv3IR7gu6sq0+tbC363Zx6KH/SEwXASK9JRbhyZmVjJEVJIOxYsB3Qg=="; - }; - } - { - name = "har_schema___har_schema_2.0.0.tgz"; - path = fetchurl { - name = "har_schema___har_schema_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "qUwiJOvKwEeCoNkDVSHyRzW37JI="; - }; - } - { - name = "har_validator___har_validator_5.1.3.tgz"; - path = fetchurl { - name = "har_validator___har_validator_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; - }; - } - { - name = "has_flag___has_flag_3.0.0.tgz"; - path = fetchurl { - name = "has_flag___has_flag_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; - }; - } - { - name = "has_unicode___has_unicode_2.0.1.tgz"; - path = fetchurl { - name = "has_unicode___has_unicode_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "4Ob+aijPUROIVeCG0Wkedx3iqLk="; - }; - } - { - name = "has_value___has_value_0.3.1.tgz"; - path = fetchurl { - name = "has_value___has_value_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz"; - sha1 = "ex9YutpiyoJ+wKIHgCVlSEWZXh8="; - }; - } - { - name = "has_value___has_value_1.0.0.tgz"; - path = fetchurl { - name = "has_value___has_value_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz"; - sha1 = "GLKB2lhbHFxR3vJMkw7SmgvmsXc="; - }; - } - { - name = "has_values___has_values_0.1.4.tgz"; - path = fetchurl { - name = "has_values___has_values_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz"; - sha1 = "bWHeldkd/Km5oCCJrThL/49it3E="; - }; - } - { - name = "has_values___has_values_1.0.0.tgz"; - path = fetchurl { - name = "has_values___has_values_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz"; - sha1 = "lbC2P+whRmGab+V/51Yo1aOe/k8="; - }; - } - { - name = "html___html_1.0.0.tgz"; - path = fetchurl { - name = "html___html_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/html/-/html-1.0.0.tgz"; - sha1 = "pUT6nqVJK/s6LMqCEKEL57WvH2E="; - }; - } - { - name = "http_errors___http_errors_1.7.2.tgz"; - path = fetchurl { - name = "http_errors___http_errors_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz"; - sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; - }; - } - { - name = "http_errors___http_errors_1.7.3.tgz"; - path = fetchurl { - name = "http_errors___http_errors_1.7.3.tgz"; - url = "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz"; - sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; - }; - } - { - name = "http_signature___http_signature_1.2.0.tgz"; - path = fetchurl { - name = "http_signature___http_signature_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "muzZJRFHcvPZW2WmCruPfBj7rOE="; - }; - } - { - name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; - path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; - }; - } - { - name = "iconv_lite___iconv_lite_0.4.24.tgz"; - path = fetchurl { - name = "iconv_lite___iconv_lite_0.4.24.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; - }; - } - { - name = "ie_array_find_polyfill___ie_array_find_polyfill_1.1.0.tgz"; - path = fetchurl { - name = "ie_array_find_polyfill___ie_array_find_polyfill_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/ie-array-find-polyfill/-/ie-array-find-polyfill-1.1.0.tgz"; - sha1 = "UHjlM/Amgx2iK9dHZRPZRg1loUI="; - }; - } - { - name = "ieee754___ieee754_1.1.13.tgz"; - path = fetchurl { - name = "ieee754___ieee754_1.1.13.tgz"; - url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz"; - sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; - }; - } - { - name = "import_fresh___import_fresh_3.2.1.tgz"; - path = fetchurl { - name = "import_fresh___import_fresh_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; - sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; - }; - } - { - name = "inflight___inflight_1.0.6.tgz"; - path = fetchurl { - name = "inflight___inflight_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; - }; - } - { - name = "inherits___inherits_2.0.4.tgz"; - path = fetchurl { - name = "inherits___inherits_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - } - { - name = "inherits___inherits_2.0.3.tgz"; - path = fetchurl { - name = "inherits___inherits_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; - sha1 = "Yzwsg+PaQqUC9SRmAiSA9CCCYd4="; - }; - } - { - name = "inquirer___inquirer_3.3.0.tgz"; - path = fetchurl { - name = "inquirer___inquirer_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz"; - sha512 = "h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ=="; - }; - } - { - name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; - path = fetchurl { - name = "ipaddr.js___ipaddr.js_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; - sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; - }; - } - { - name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; - path = fetchurl { - name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; - url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha1 = "qeEss66Nh2cn7u84Q/igiXtcmNY="; - }; - } - { - name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; - path = fetchurl { - name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; - }; - } - { - name = "is_arrayish___is_arrayish_0.2.1.tgz"; - path = fetchurl { - name = "is_arrayish___is_arrayish_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "d8mYQFJ6qOyxqLppe4BkWnqSap0="; - }; - } - { - name = "is_binary_path___is_binary_path_1.0.1.tgz"; - path = fetchurl { - name = "is_binary_path___is_binary_path_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz"; - sha1 = "dfFmQrSA8YenEcgUFh/TpKdlWJg="; - }; - } - { - name = "is_buffer___is_buffer_1.1.6.tgz"; - path = fetchurl { - name = "is_buffer___is_buffer_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; - }; - } - { - name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; - path = fetchurl { - name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha1 = "C17mSDiOLIYCgueT8YVv7D8wG1Y="; - }; - } - { - name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; - path = fetchurl { - name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; - }; - } - { - name = "is_descriptor___is_descriptor_0.1.6.tgz"; - path = fetchurl { - name = "is_descriptor___is_descriptor_0.1.6.tgz"; - url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; - }; - } - { - name = "is_descriptor___is_descriptor_1.0.2.tgz"; - path = fetchurl { - name = "is_descriptor___is_descriptor_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; - }; - } - { - name = "is_dotfile___is_dotfile_1.0.3.tgz"; - path = fetchurl { - name = "is_dotfile___is_dotfile_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz"; - sha1 = "pqLzL/0t+wT1yiXs0Pa4PPeYoeE="; - }; - } - { - name = "is_equal_shallow___is_equal_shallow_0.1.3.tgz"; - path = fetchurl { - name = "is_equal_shallow___is_equal_shallow_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"; - sha1 = "IjgJj8Ih3gvPpdnqxMRdY4qhxTQ="; - }; - } - { - name = "is_extendable___is_extendable_0.1.1.tgz"; - path = fetchurl { - name = "is_extendable___is_extendable_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz"; - sha1 = "YrEQ4omkcUGOPsNqYX1HLjAd/Ik="; - }; - } - { - name = "is_extendable___is_extendable_1.0.1.tgz"; - path = fetchurl { - name = "is_extendable___is_extendable_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz"; - sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; - }; - } - { - name = "is_extglob___is_extglob_1.0.0.tgz"; - path = fetchurl { - name = "is_extglob___is_extglob_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz"; - sha1 = "rEaBd8SUNAWgkvyPKXYMb/xiBsA="; - }; - } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "754xOG8DGn8NZDr4L95QxFfvAMs="; - }; - } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "o7MKXE8ZkYMWeqq5O+764937ZU8="; - }; - } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; - }; - } - { - name = "is_glob___is_glob_2.0.1.tgz"; - path = fetchurl { - name = "is_glob___is_glob_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz"; - sha1 = "0Jb5JqPe1WAPP9/ZEZjLCIjC2GM="; - }; - } - { - name = "is_number___is_number_2.1.0.tgz"; - path = fetchurl { - name = "is_number___is_number_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz"; - sha1 = "Afy7s5NGOlSPL0ZszhbezknbkI8="; - }; - } - { - name = "is_number___is_number_3.0.0.tgz"; - path = fetchurl { - name = "is_number___is_number_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz"; - sha1 = "JP1iAaR4LPUFYcgQJ2r8fRLXEZU="; - }; - } - { - name = "is_number___is_number_4.0.0.tgz"; - path = fetchurl { - name = "is_number___is_number_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz"; - sha512 = "rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ=="; - }; - } - { - name = "is_plain_object___is_plain_object_2.0.4.tgz"; - path = fetchurl { - name = "is_plain_object___is_plain_object_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; - }; - } - { - name = "is_posix_bracket___is_posix_bracket_0.1.1.tgz"; - path = fetchurl { - name = "is_posix_bracket___is_posix_bracket_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"; - sha1 = "MzTceXdDaOkvAW5vvAqI9c1ua8Q="; - }; - } - { - name = "is_primitive___is_primitive_2.0.0.tgz"; - path = fetchurl { - name = "is_primitive___is_primitive_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz"; - sha1 = "IHurkWOEmcB7Kt8kCkGochADRXU="; - }; - } - { - name = "is_promise___is_promise_2.1.0.tgz"; - path = fetchurl { - name = "is_promise___is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "eaKp7OfwlugPNtKy87wWwf9L8/o="; - }; - } - { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - path = fetchurl { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "5HnICFjfDBsR3dppQPlgEfzaSpo="; - }; - } - { - name = "is_windows___is_windows_1.0.2.tgz"; - path = fetchurl { - name = "is_windows___is_windows_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"; - sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; - }; - } - { - name = "isarray___isarray_0.0.1.tgz"; - path = fetchurl { - name = "isarray___isarray_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; - sha1 = "ihis/Kmo9Bd+Cav8YDiTmwXR7t8="; - }; - } - { - name = "isarray___isarray_1.0.0.tgz"; - path = fetchurl { - name = "isarray___isarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; - }; - } - { - name = "isobject___isobject_2.1.0.tgz"; - path = fetchurl { - name = "isobject___isobject_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"; - sha1 = "8GVWEJaj8dou9GJy+BXIQNh+DIk="; - }; - } - { - name = "isobject___isobject_3.0.1.tgz"; - path = fetchurl { - name = "isobject___isobject_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; - sha1 = "TkMekrEalzFjaqH5yNHMvP2reN8="; - }; - } - { - name = "isstream___isstream_0.1.2.tgz"; - path = fetchurl { - name = "isstream___isstream_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; - sha1 = "R+Y/evVa+m+S4VAOaQ64uFKcCZo="; - }; - } - { - name = "js_tokens___js_tokens_4.0.0.tgz"; - path = fetchurl { - name = "js_tokens___js_tokens_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; - }; - } - { - name = "js_yaml___js_yaml_3.13.1.tgz"; - path = fetchurl { - name = "js_yaml___js_yaml_3.13.1.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; - sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; - }; - } - { - name = "js_yaml___js_yaml_4.1.0.tgz"; - path = fetchurl { - name = "js_yaml___js_yaml_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; - sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; - }; - } - { - name = "jsbn___jsbn_0.1.1.tgz"; - path = fetchurl { - name = "jsbn___jsbn_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "peZUwuWi3rXyAdls77yoDA7y9RM="; - }; - } - { - name = "jsesc___jsesc_0.5.0.tgz"; - path = fetchurl { - name = "jsesc___jsesc_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; - sha1 = "597mbjXW/Bb3EP6R1c9p9w8IkR0="; - }; - } - { - name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; - path = fetchurl { - name = "json_parse_better_errors___json_parse_better_errors_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; - sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; - }; - } - { - name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; - path = fetchurl { - name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; - }; - } - { - name = "json_schema___json_schema_0.2.3.tgz"; - path = fetchurl { - name = "json_schema___json_schema_0.2.3.tgz"; - url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "tIDIkuWaLwWVTOcnvT8qTogvnhM="; - }; - } - { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; - path = fetchurl { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "Epai1Y/UXxmg9s4B1lcB4sc1tus="; - }; - } - { - name = "jsondiffpatch___jsondiffpatch_0.3.11.tgz"; - path = fetchurl { - name = "jsondiffpatch___jsondiffpatch_0.3.11.tgz"; - url = "https://registry.yarnpkg.com/jsondiffpatch/-/jsondiffpatch-0.3.11.tgz"; - sha512 = "Xi3Iygdt/BGhml6bdUFhgDki1TgOsp3hG3iiH3KtzP+CahtGcdPfKRLlnZbSw+3b1umZkhmKrqXUgUcKenyhtA=="; - }; - } - { - name = "jsonfile___jsonfile_4.0.0.tgz"; - path = fetchurl { - name = "jsonfile___jsonfile_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "h3Gq4HmbZAdrdmQPygWPnBDjPss="; - }; - } - { - name = "jsprim___jsprim_1.4.1.tgz"; - path = fetchurl { - name = "jsprim___jsprim_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "MT5mvB5cwG5Di8G3SZwuXFastqI="; - }; - } - { - name = "keypress___keypress_0.1.0.tgz"; - path = fetchurl { - name = "keypress___keypress_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/keypress/-/keypress-0.1.0.tgz"; - sha1 = "SjGI1CkbZrT2XtuZ+AaqmuKTWSo="; - }; - } - { - name = "kind_of___kind_of_3.2.2.tgz"; - path = fetchurl { - name = "kind_of___kind_of_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "MeohpzS6ubuw8yRm2JOupR5KPGQ="; - }; - } - { - name = "kind_of___kind_of_4.0.0.tgz"; - path = fetchurl { - name = "kind_of___kind_of_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz"; - sha1 = "IIE989cSkosgc3hpGkUGb65y3Vc="; - }; - } - { - name = "kind_of___kind_of_5.1.0.tgz"; - path = fetchurl { - name = "kind_of___kind_of_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; - }; - } - { - name = "kind_of___kind_of_6.0.3.tgz"; - path = fetchurl { - name = "kind_of___kind_of_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; - sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; - }; - } - { - name = "lego_api___lego_api_1.0.8.tgz"; - path = fetchurl { - name = "lego_api___lego_api_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/lego-api/-/lego-api-1.0.8.tgz"; - sha512 = "pZD0mf32+RL1bUMJztRcXiNBB1gE8gd/h4MDLWdZp7vaMZyjPiYK/zNpNNGoJvmoa7D/wf9dll+5z7pDObdLFg=="; - }; - } - { - name = "levn___levn_0.3.0.tgz"; - path = fetchurl { - name = "levn___levn_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha1 = "OwmSTt+fCDwEkP3UwLxEIeBHZO4="; - }; - } - { - name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; - path = fetchurl { - name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; - sha1 = "HADHQ7QzzQpOgHWPe2SldEDZ/wA="; - }; - } - { - name = "lodash._getnative___lodash._getnative_3.9.1.tgz"; - path = fetchurl { - name = "lodash._getnative___lodash._getnative_3.9.1.tgz"; - url = "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; - sha1 = "VwvH3t5G1hzc3mh9ZdPuy6o6r/U="; - }; - } - { - name = "lodash.curry___lodash.curry_4.1.1.tgz"; - path = fetchurl { - name = "lodash.curry___lodash.curry_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz"; - sha1 = "JI42By7ekGUB11lmIAqG2riyMXA="; - }; - } - { - name = "lodash.debounce___lodash.debounce_3.1.1.tgz"; - path = fetchurl { - name = "lodash.debounce___lodash.debounce_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-3.1.1.tgz"; - sha1 = "gSIRw3ipTMKdWqTjNGzwv846ffU="; - }; - } - { - name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; - path = fetchurl { - name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha1 = "gteb/zCmfEAF/9XiUVMArZyk168="; - }; - } - { - name = "lodash.flow___lodash.flow_3.5.0.tgz"; - path = fetchurl { - name = "lodash.flow___lodash.flow_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz"; - sha1 = "h79AKSuM+D5OjOGjrkIJ4gBxZ1o="; - }; - } - { - name = "lodash.orderby___lodash.orderby_4.6.0.tgz"; - path = fetchurl { - name = "lodash.orderby___lodash.orderby_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.orderby/-/lodash.orderby-4.6.0.tgz"; - sha1 = "5pfwTOXXhSL1TZM4syuBozk+TrM="; - }; - } - { - name = "lodash.uniqby___lodash.uniqby_4.7.0.tgz"; - path = fetchurl { - name = "lodash.uniqby___lodash.uniqby_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz"; - sha1 = "2ZwHpmnp5tJOE2Lf4mbGdhavEwI="; - }; - } - { - name = "lodash___lodash_4.17.15.tgz"; - path = fetchurl { - name = "lodash___lodash_4.17.15.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; - sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; - }; - } - { - name = "loose_envify___loose_envify_1.4.0.tgz"; - path = fetchurl { - name = "loose_envify___loose_envify_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; - sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; - }; - } - { - name = "lru_cache___lru_cache_6.0.0.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - } - { - name = "make_dir___make_dir_3.1.0.tgz"; - path = fetchurl { - name = "make_dir___make_dir_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; - sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; - }; - } - { - name = "make_error___make_error_1.3.6.tgz"; - path = fetchurl { - name = "make_error___make_error_1.3.6.tgz"; - url = "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz"; - sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; - }; - } - { - name = "map_cache___map_cache_0.2.2.tgz"; - path = fetchurl { - name = "map_cache___map_cache_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz"; - sha1 = "wyq9C9ZSXZsFFkW7TyasXcmKDb8="; - }; - } - { - name = "map_visit___map_visit_1.0.0.tgz"; - path = fetchurl { - name = "map_visit___map_visit_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz"; - sha1 = "7Nyo8TFE5mDxtb1B8S80edmN+48="; - }; - } - { - name = "match_stream___match_stream_0.0.2.tgz"; - path = fetchurl { - name = "match_stream___match_stream_0.0.2.tgz"; - url = "https://registry.yarnpkg.com/match-stream/-/match-stream-0.0.2.tgz"; - sha1 = "mesFAJOzTf+t5CG5rAtBCpz6F88="; - }; - } - { - name = "math_random___math_random_1.0.4.tgz"; - path = fetchurl { - name = "math_random___math_random_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz"; - sha512 = "rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A=="; - }; - } - { - name = "media_typer___media_typer_0.3.0.tgz"; - path = fetchurl { - name = "media_typer___media_typer_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "hxDXrwqmJvj/+hzgAWhUUmMlV0g="; - }; - } - { - name = "memoize_one___memoize_one_5.1.1.tgz"; - path = fetchurl { - name = "memoize_one___memoize_one_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz"; - sha512 = "HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA=="; - }; - } - { - name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; - path = fetchurl { - name = "merge_descriptors___merge_descriptors_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha1 = "sAqqVW3YtEVoFQ7J0blT8/kMu2E="; - }; - } - { - name = "merge___merge_1.2.1.tgz"; - path = fetchurl { - name = "merge___merge_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz"; - sha512 = "VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ=="; - }; - } - { - name = "methods___methods_1.1.2.tgz"; - path = fetchurl { - name = "methods___methods_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz"; - sha1 = "VSmk1nZUE07cxSZmVoNbD4Ua/O4="; - }; - } - { - name = "micromatch___micromatch_2.3.11.tgz"; - path = fetchurl { - name = "micromatch___micromatch_2.3.11.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz"; - sha1 = "hmd8l9FyCzY0MdBNDRUpO9OMFWU="; - }; - } - { - name = "micromatch___micromatch_3.1.10.tgz"; - path = fetchurl { - name = "micromatch___micromatch_3.1.10.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz"; - sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; - }; - } - { - name = "mime_db___mime_db_1.43.0.tgz"; - path = fetchurl { - name = "mime_db___mime_db_1.43.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; - }; - } - { - name = "mime_types___mime_types_2.1.26.tgz"; - path = fetchurl { - name = "mime_types___mime_types_2.1.26.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; - }; - } - { - name = "mime___mime_1.6.0.tgz"; - path = fetchurl { - name = "mime___mime_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; - sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; - }; - } - { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; - path = fetchurl { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; - }; - } - { - name = "minimatch___minimatch_3.0.4.tgz"; - path = fetchurl { - name = "minimatch___minimatch_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; - }; - } - { - name = "minimist___minimist_0.0.8.tgz"; - path = fetchurl { - name = "minimist___minimist_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz"; - sha1 = "hX/Kv8M5fSYluCKCYuhqp6ARsF0="; - }; - } - { - name = "minimist___minimist_1.2.0.tgz"; - path = fetchurl { - name = "minimist___minimist_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; - sha1 = "o1AIsg9BOD7sH7kU9M1d95omQoQ="; - }; - } - { - name = "minimist___minimist_1.2.5.tgz"; - path = fetchurl { - name = "minimist___minimist_1.2.5.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; - }; - } - { - name = "minipass___minipass_3.1.5.tgz"; - path = fetchurl { - name = "minipass___minipass_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz"; - sha512 = "+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="; - }; - } - { - name = "minizlib___minizlib_2.1.2.tgz"; - path = fetchurl { - name = "minizlib___minizlib_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; - sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; - }; - } - { - name = "mixin_deep___mixin_deep_1.3.2.tgz"; - path = fetchurl { - name = "mixin_deep___mixin_deep_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; - sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; - }; - } - { - name = "mkdirp___mkdirp_0.5.5.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; - }; - } - { - name = "mkdirp___mkdirp_0.5.1.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "MAV0OOrGz3+MR2fzhkjWaX11yQM="; - }; - } - { - name = "mkdirp___mkdirp_1.0.4.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; - sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; - }; - } - { - name = "mock_require___mock_require_3.0.3.tgz"; - path = fetchurl { - name = "mock_require___mock_require_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz"; - sha512 = "lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg=="; - }; - } - { - name = "ms___ms_2.0.0.tgz"; - path = fetchurl { - name = "ms___ms_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; - }; - } - { - name = "ms___ms_2.1.1.tgz"; - path = fetchurl { - name = "ms___ms_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz"; - sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; - }; - } - { - name = "ms___ms_2.1.2.tgz"; - path = fetchurl { - name = "ms___ms_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - } - { - name = "mustache___mustache_2.3.2.tgz"; - path = fetchurl { - name = "mustache___mustache_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/mustache/-/mustache-2.3.2.tgz"; - sha512 = "KpMNwdQsYz3O/SBS1qJ/o3sqUJ5wSb8gb0pul8CO0S56b9Y2ALm8zCfsjPXsqGFfoNBkDwZuZIAjhsZI03gYVQ=="; - }; - } - { - name = "mute_stream___mute_stream_0.0.7.tgz"; - path = fetchurl { - name = "mute_stream___mute_stream_0.0.7.tgz"; - url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; - sha1 = "MHXOk7whuPq0PhvE2n6BFe0ee6s="; - }; - } - { - name = "nan___nan_2.14.0.tgz"; - path = fetchurl { - name = "nan___nan_2.14.0.tgz"; - url = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz"; - sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; - }; - } - { - name = "nanomatch___nanomatch_1.2.13.tgz"; - path = fetchurl { - name = "nanomatch___nanomatch_1.2.13.tgz"; - url = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"; - sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; - }; - } - { - name = "nanoseconds___nanoseconds_0.1.0.tgz"; - path = fetchurl { - name = "nanoseconds___nanoseconds_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/nanoseconds/-/nanoseconds-0.1.0.tgz"; - sha1 = "aew5/NAOd6s6ct4KQzQoJM15Izo="; - }; - } - { - name = "natives___natives_1.1.6.tgz"; - path = fetchurl { - name = "natives___natives_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/natives/-/natives-1.1.6.tgz"; - sha512 = "6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA=="; - }; - } - { - name = "negotiator___negotiator_0.6.2.tgz"; - path = fetchurl { - name = "negotiator___negotiator_0.6.2.tgz"; - url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; - }; - } - { - name = "node_addon_api___node_addon_api_3.2.1.tgz"; - path = fetchurl { - name = "node_addon_api___node_addon_api_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz"; - sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; - }; - } - { - name = "node_fetch___node_fetch_2.6.5.tgz"; - path = fetchurl { - name = "node_fetch___node_fetch_2.6.5.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.5.tgz"; - sha512 = "mmlIVHJEu5rnIxgEgez6b9GgWXbkZj5YZ7fx+2r94a2E+Uirsp6HsPTPlomfdHtpt/B0cdKviwkoaM6pyvUOpQ=="; - }; - } - { - name = "nodejieba___nodejieba_2.5.2.tgz"; - path = fetchurl { - name = "nodejieba___nodejieba_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/nodejieba/-/nodejieba-2.5.2.tgz"; - sha512 = "ByskJvaBrQ2eV+5M0OeD80S5NKoGaHc9zi3Z/PTKl/95eac2YF8RmWduq9AknLpkQLrLAIcqurrtC6BzjpKwwg=="; - }; - } - { - name = "nopt___nopt_5.0.0.tgz"; - path = fetchurl { - name = "nopt___nopt_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz"; - sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; - }; - } - { - name = "nopt___nopt_1.0.10.tgz"; - path = fetchurl { - name = "nopt___nopt_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz"; - sha1 = "bd0hvSoxQXuScn3Vhfim83YI6+4="; - }; - } - { - name = "normalize_path___normalize_path_2.1.1.tgz"; - path = fetchurl { - name = "normalize_path___normalize_path_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz"; - sha1 = "GrKLVW4Zg2Oowab35vogE3/mrtk="; - }; - } - { - name = "npmlog___npmlog_4.1.2.tgz"; - path = fetchurl { - name = "npmlog___npmlog_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; - }; - } - { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; - path = fetchurl { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "CXtgK1NCKlIsGvuHkDGDNpQaAR0="; - }; - } - { - name = "oauth_sign___oauth_sign_0.9.0.tgz"; - path = fetchurl { - name = "oauth_sign___oauth_sign_0.9.0.tgz"; - url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; - }; - } - { - name = "object_assign___object_assign_4.1.1.tgz"; - path = fetchurl { - name = "object_assign___object_assign_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "IQmtx5ZYh8/AXLvUQsrIv7s2CGM="; - }; - } - { - name = "object_copy___object_copy_0.1.0.tgz"; - path = fetchurl { - name = "object_copy___object_copy_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz"; - sha1 = "fn2Fi3gb18mRpBupde04EnVOmYw="; - }; - } - { - name = "object_visit___object_visit_1.0.1.tgz"; - path = fetchurl { - name = "object_visit___object_visit_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz"; - sha1 = "95xEk68MU3e1n+OdOV5BBC3QRbs="; - }; - } - { - name = "object.omit___object.omit_2.0.1.tgz"; - path = fetchurl { - name = "object.omit___object.omit_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz"; - sha1 = "Gpx0SCnznbuFjHbKNXmuKlTr0fo="; - }; - } - { - name = "object.pick___object.pick_1.3.0.tgz"; - path = fetchurl { - name = "object.pick___object.pick_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz"; - sha1 = "h6EKxMFpS9Lhy/U1kaZhQftd10c="; - }; - } - { - name = "object_values___object_values_0.1.2.tgz"; - path = fetchurl { - name = "object_values___object_values_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/object_values/-/object_values-0.1.2.tgz"; - sha512 = "tZgUiKLraVH+4OAedBYrr4/K6KmAQw2RPNd1AuNdhLsuz5WP3VB7WuiKBWbOcjeqqAjus2ChIIWC8dSfmg7ReA=="; - }; - } - { - name = "on_finished___on_finished_2.3.0.tgz"; - path = fetchurl { - name = "on_finished___on_finished_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "IPEzZIGwg811M3mSoWlxqi2QaUc="; - }; - } - { - name = "once___once_1.4.0.tgz"; - path = fetchurl { - name = "once___once_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; - }; - } - { - name = "onetime___onetime_2.0.1.tgz"; - path = fetchurl { - name = "onetime___onetime_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; - sha1 = "BnQoIw/WdEOyeUsiu6UotoZ5YtQ="; - }; - } - { - name = "optionator___optionator_0.8.3.tgz"; - path = fetchurl { - name = "optionator___optionator_0.8.3.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; - sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; - }; - } - { - name = "options___options_0.0.6.tgz"; - path = fetchurl { - name = "options___options_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz"; - sha1 = "7CLTEoBrtT5zF3Pnza788cZDEo8="; - }; - } - { - name = "orderedmap___orderedmap_1.1.1.tgz"; - path = fetchurl { - name = "orderedmap___orderedmap_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/orderedmap/-/orderedmap-1.1.1.tgz"; - sha512 = "3Ux8um0zXbVacKUkcytc0u3HgC0b0bBLT+I60r2J/En72cI0nZffqrA7Xtf2Hqs27j1g82llR5Mhbd0Z1XW4AQ=="; - }; - } - { - name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; - path = fetchurl { - name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "u+Z0BseaqFxc/sdm/lc0VV36EnQ="; - }; - } - { - name = "over___over_0.0.5.tgz"; - path = fetchurl { - name = "over___over_0.0.5.tgz"; - url = "https://registry.yarnpkg.com/over/-/over-0.0.5.tgz"; - sha1 = "8phS5w/X4l82DgE6jsRMgq7bVwg="; - }; - } - { - name = "parent_module___parent_module_1.0.1.tgz"; - path = fetchurl { - name = "parent_module___parent_module_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; - sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; - }; - } - { - name = "parse_glob___parse_glob_3.0.4.tgz"; - path = fetchurl { - name = "parse_glob___parse_glob_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz"; - sha1 = "ssN2z7EfNVE7rdFz7wu246OIORw="; - }; - } - { - name = "parse_json___parse_json_5.0.0.tgz"; - path = fetchurl { - name = "parse_json___parse_json_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz"; - sha512 = "OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw=="; - }; - } - { - name = "parseurl___parseurl_1.3.3.tgz"; - path = fetchurl { - name = "parseurl___parseurl_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; - }; - } - { - name = "pascalcase___pascalcase_0.1.1.tgz"; - path = fetchurl { - name = "pascalcase___pascalcase_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"; - sha1 = "s2PlXoAGym/iF4TS2yK9FdeRfxQ="; - }; - } - { - name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; - path = fetchurl { - name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; - }; - } - { - name = "path_parse___path_parse_1.0.6.tgz"; - path = fetchurl { - name = "path_parse___path_parse_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; - }; - } - { - name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; - path = fetchurl { - name = "path_to_regexp___path_to_regexp_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha1 = "32BBeABfUi8V60SQ5yR6G/qmf4w="; - }; - } - { - name = "path_type___path_type_4.0.0.tgz"; - path = fetchurl { - name = "path_type___path_type_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; - sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; - }; - } - { - name = "performance_now___performance_now_2.1.0.tgz"; - path = fetchurl { - name = "performance_now___performance_now_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "Ywn04OX6kT7BxpMHrjZLSzd8nns="; - }; - } - { - name = "pinyin___pinyin_2.10.2.tgz"; - path = fetchurl { - name = "pinyin___pinyin_2.10.2.tgz"; - url = "https://registry.yarnpkg.com/pinyin/-/pinyin-2.10.2.tgz"; - sha512 = "qAcp7+2vnjm6sAd0B9pp5JpyvHbYoQO1v9zCeJQMEgyw2VeRi02l0gR22ZBgfjjvZ1c2EGoVjJHJ1h0rwr34Ug=="; - }; - } - { - name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; - path = fetchurl { - name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; - sha1 = "AerA/jta9xoqbAL+q7jB/vfgDqs="; - }; - } - { - name = "postcss___postcss_6.0.23.tgz"; - path = fetchurl { - name = "postcss___postcss_6.0.23.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz"; - sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; - }; - } - { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - path = fetchurl { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha1 = "IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="; - }; - } - { - name = "preserve___preserve_0.2.0.tgz"; - path = fetchurl { - name = "preserve___preserve_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz"; - sha1 = "gV7R9uvGWSb4ZbMQwHE7yzMVzks="; - }; - } - { - name = "prettier___prettier_1.19.1.tgz"; - path = fetchurl { - name = "prettier___prettier_1.19.1.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz"; - sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="; - }; - } - { - name = "pretty_time___pretty_time_0.2.0.tgz"; - path = fetchurl { - name = "pretty_time___pretty_time_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/pretty-time/-/pretty-time-0.2.0.tgz"; - sha1 = "ejvexAScYgzXxCt/NCt01W5z104="; - }; - } - { - name = "prettysize___prettysize_0.0.3.tgz"; - path = fetchurl { - name = "prettysize___prettysize_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/prettysize/-/prettysize-0.0.3.tgz"; - sha1 = "FK//amReWRpN3xxykZwjtBRhgaE="; - }; - } - { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - path = fetchurl { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; - }; - } - { - name = "prop_types___prop_types_15.7.2.tgz"; - path = fetchurl { - name = "prop_types___prop_types_15.7.2.tgz"; - url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"; - sha512 = "8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ=="; - }; - } - { - name = "prosemirror_changeset___prosemirror_changeset_2.1.2.tgz"; - path = fetchurl { - name = "prosemirror_changeset___prosemirror_changeset_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.1.2.tgz"; - sha512 = "/eeAM2XeOFmtiPsFVfVkM3Iq4xfNlFuDB6MlC8Hqch/ibq3YlH3YxDi8fqg78fT8fkrfvN6zRu9EE0HkSmH8PA=="; - }; - } - { - name = "prosemirror_commands___prosemirror_commands_1.1.10.tgz"; - path = fetchurl { - name = "prosemirror_commands___prosemirror_commands_1.1.10.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.10.tgz"; - sha512 = "IWyBBXNAd44RM6NnBPljwq+/CM2oYCQJkF+YhKEAZNwzW0uFdGf4qComhjbKZzqFdu6Iub2ZhNsXgwPibA0lCQ=="; - }; - } - { - name = "prosemirror_dev_tools___prosemirror_dev_tools_2.1.1.tgz"; - path = fetchurl { - name = "prosemirror_dev_tools___prosemirror_dev_tools_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-dev-tools/-/prosemirror-dev-tools-2.1.1.tgz"; - sha512 = "d9MG4PF82meg5Ru64ox6WCKPkQNsiZEaG5xR5a+l88RJ0VRButMZq5JzPh28vUlTBq+TXnpdTJRlPQIgTOtpqg=="; - }; - } - { - name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.5.tgz"; - path = fetchurl { - name = "prosemirror_dropcursor___prosemirror_dropcursor_1.3.5.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.5.tgz"; - sha512 = "tNUwcF2lPAkwKBZPZRtbxpwljnODRNZ3eiYloN1DSUqDjMT1nBZm0nejaEMS1TvNQ+3amibUSAiV4hX+jpASFA=="; - }; - } - { - name = "prosemirror_gapcursor___prosemirror_gapcursor_1.1.5.tgz"; - path = fetchurl { - name = "prosemirror_gapcursor___prosemirror_gapcursor_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.1.5.tgz"; - sha512 = "SjbUZq5pgsBDuV3hu8GqgIpZR5eZvGLM+gPQTqjVVYSMUCfKW3EGXTEYaLHEl1bGduwqNC95O3bZflgtAb4L6w=="; - }; - } - { - name = "prosemirror_history___prosemirror_history_1.2.0.tgz"; - path = fetchurl { - name = "prosemirror_history___prosemirror_history_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.2.0.tgz"; - sha512 = "B9v9xtf4fYbKxQwIr+3wtTDNLDZcmMMmGiI3TAPShnUzvo+Rmv1GiUrsQChY1meetHl7rhML2cppF3FTs7f7UQ=="; - }; - } - { - name = "prosemirror_inputrules___prosemirror_inputrules_1.1.3.tgz"; - path = fetchurl { - name = "prosemirror_inputrules___prosemirror_inputrules_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.3.tgz"; - sha512 = "ZaHCLyBtvbyIHv0f5p6boQTIJjlD6o2NPZiEaZWT2DA+j591zS29QQEMT4lBqwcLW3qRSf7ZvoKNbf05YrsStw=="; - }; - } - { - name = "prosemirror_keymap___prosemirror_keymap_1.1.3.tgz"; - path = fetchurl { - name = "prosemirror_keymap___prosemirror_keymap_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.3.tgz"; - sha512 = "PRA4NzkUMzV/NFf5pyQ6tmlIHiW/qjQ1kGWUlV2rF/dvlOxtpGpTEjIMhWgLuMf+HiDEFnUEP7uhYXu+t+491g=="; - }; - } - { - name = "prosemirror_keymap___prosemirror_keymap_1.1.4.tgz"; - path = fetchurl { - name = "prosemirror_keymap___prosemirror_keymap_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.4.tgz"; - sha512 = "Al8cVUOnDFL4gcI5IDlG6xbZ0aOD/i3B17VT+1JbHWDguCgt/lBHVTHUBcKvvbSg6+q/W4Nj1Fu6bwZSca3xjg=="; - }; - } - { - name = "prosemirror_model___prosemirror_model_1.9.1.tgz"; - path = fetchurl { - name = "prosemirror_model___prosemirror_model_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.9.1.tgz"; - sha512 = "Qblh8pm1c7Ll64sYLauwwzjimo/tFg1zW3Q3IWhKRhvfOEgRKqa6dC5pRrAa+XHOIjBFEYrqbi52J5bqA2dV8Q=="; - }; - } - { - name = "prosemirror_model___prosemirror_model_1.14.3.tgz"; - path = fetchurl { - name = "prosemirror_model___prosemirror_model_1.14.3.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.14.3.tgz"; - sha512 = "yzZlBaSxfUPIIP6U5Edh5zKxJPZ5f7bwZRhiCuH3UYkWhj+P3d8swHsbuAMOu/iDatDc5J/Qs5Mb3++mZf+CvQ=="; - }; - } - { - name = "prosemirror_schema_list___prosemirror_schema_list_1.1.5.tgz"; - path = fetchurl { - name = "prosemirror_schema_list___prosemirror_schema_list_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.5.tgz"; - sha512 = "9gadhga/wySVfb/iZ2vOpndbG0XroeLw0HkkZN5demNbOea6U5oQtJmvyYWC7ZVf3WkhmVdVsOXrllM9JcC20A=="; - }; - } - { - name = "prosemirror_state___prosemirror_state_1.3.2.tgz"; - path = fetchurl { - name = "prosemirror_state___prosemirror_state_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.2.tgz"; - sha512 = "t/JqE3aR0SV9QrzFVkAXsQwsgrQBNs/BDbcFH20RssW0xauqNNdjTXxy/J/kM7F+0zYi6+BRmz7cMMQQFU3mwQ=="; - }; - } - { - name = "prosemirror_state___prosemirror_state_1.3.4.tgz"; - path = fetchurl { - name = "prosemirror_state___prosemirror_state_1.3.4.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.4.tgz"; - sha512 = "Xkkrpd1y/TQ6HKzN3agsQIGRcLckUMA9u3j207L04mt8ToRgpGeyhbVv0HI7omDORIBHjR29b7AwlATFFf2GLA=="; - }; - } - { - name = "prosemirror_tables___prosemirror_tables_1.0.0.tgz"; - path = fetchurl { - name = "prosemirror_tables___prosemirror_tables_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.0.0.tgz"; - sha512 = "zFw5Us4G5Vdq0yIj8GiqZOGA6ud5UKpMKElux9O0HrfmhkuGa1jf1PCpz2R5pmIQJv+tIM24H1mox/ODBAX37Q=="; - }; - } - { - name = "prosemirror_tables___prosemirror_tables_1.1.1.tgz"; - path = fetchurl { - name = "prosemirror_tables___prosemirror_tables_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.1.1.tgz"; - sha512 = "LmCz4jrlqQZRsYRDzCRYf/pQ5CUcSOyqZlAj5kv67ZWBH1SVLP2U9WJEvQfimWgeRlIz0y0PQVqO1arRm1+woA=="; - }; - } - { - name = "prosemirror_transform___prosemirror_transform_1.2.3.tgz"; - path = fetchurl { - name = "prosemirror_transform___prosemirror_transform_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.3.tgz"; - sha512 = "PUfayeskQfuUBXktvL6207ZWRwHBFNPNPiek4fR+LgCPnBofuEb2+L0FfbNtrAwffHVs6M3DaFvJB1W2VQdV0A=="; - }; - } - { - name = "prosemirror_transform___prosemirror_transform_1.3.2.tgz"; - path = fetchurl { - name = "prosemirror_transform___prosemirror_transform_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.3.2.tgz"; - sha512 = "/G6d/u9Mf6Bv3H1XR8VxhpjmUO75LYmnvj+s3ZfZpakU1hnQbsvCEybml1B3f2IWUAAQRFkbO1PnsbFhLZsYsw=="; - }; - } - { - name = "prosemirror_utils___prosemirror_utils_0.9.6.tgz"; - path = fetchurl { - name = "prosemirror_utils___prosemirror_utils_0.9.6.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.6.tgz"; - sha512 = "UC+j9hQQ1POYfMc5p7UFxBTptRiGPR7Kkmbl3jVvU8VgQbkI89tR/GK+3QYC8n+VvBZrtAoCrJItNhWSxX3slA=="; - }; - } - { - name = "prosemirror_view___prosemirror_view_1.14.2.tgz"; - path = fetchurl { - name = "prosemirror_view___prosemirror_view_1.14.2.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.14.2.tgz"; - sha512 = "9yPVH6OLyaEraHjWHbSk2DB0R/1TsEE6AA1LI+vmCypXXA+zTzNrktUFzBhSJHehXDoEJcQfnl1Wdp5GPSh2+g=="; - }; - } - { - name = "prosemirror_view___prosemirror_view_1.20.1.tgz"; - path = fetchurl { - name = "prosemirror_view___prosemirror_view_1.20.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.20.1.tgz"; - sha512 = "djWORhy3a706mUH4A2dgEEV0IPZqQd1tFyz/ZVHJNoqhSgq82FwG6dq7uqHeUB2KdVSNfI2yc3rwfqlC/ll2pA=="; - }; - } - { - name = "proxy_addr___proxy_addr_2.0.6.tgz"; - path = fetchurl { - name = "proxy_addr___proxy_addr_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz"; - sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; - }; - } - { - name = "psl___psl_1.7.0.tgz"; - path = fetchurl { - name = "psl___psl_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz"; - sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; - }; - } - { - name = "pullstream___pullstream_0.4.1.tgz"; - path = fetchurl { - name = "pullstream___pullstream_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/pullstream/-/pullstream-0.4.1.tgz"; - sha1 = "1vs79a7Wl+gxFQ6xACwlo/iuExQ="; - }; - } - { - name = "punycode___punycode_2.1.1.tgz"; - path = fetchurl { - name = "punycode___punycode_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; - }; - } - { - name = "pure_color___pure_color_1.3.0.tgz"; - path = fetchurl { - name = "pure_color___pure_color_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz"; - sha1 = "H+Bk+wrIUfDeYTIKi/eWg2Qi8z4="; - }; - } - { - name = "qs___qs_6.7.0.tgz"; - path = fetchurl { - name = "qs___qs_6.7.0.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"; - sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; - }; - } - { - name = "qs___qs_6.5.2.tgz"; - path = fetchurl { - name = "qs___qs_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz"; - sha512 = "N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="; - }; - } - { - name = "randomatic___randomatic_3.1.1.tgz"; - path = fetchurl { - name = "randomatic___randomatic_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz"; - sha512 = "TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw=="; - }; - } - { - name = "range_parser___range_parser_1.2.1.tgz"; - path = fetchurl { - name = "range_parser___range_parser_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz"; - sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; - }; - } - { - name = "raw_body___raw_body_2.4.0.tgz"; - path = fetchurl { - name = "raw_body___raw_body_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz"; - sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; - }; - } - { - name = "react_base16_styling___react_base16_styling_0.5.3.tgz"; - path = fetchurl { - name = "react_base16_styling___react_base16_styling_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.5.3.tgz"; - sha1 = "OFjyTpxN2MvT9wLz901YHKKRcmk="; - }; - } - { - name = "react_dock___react_dock_0.2.4.tgz"; - path = fetchurl { - name = "react_dock___react_dock_0.2.4.tgz"; - url = "https://registry.yarnpkg.com/react-dock/-/react-dock-0.2.4.tgz"; - sha1 = "5yfcdVCztzEWY13LnA4E0Lev4Xw="; - }; - } - { - name = "react_dom___react_dom_17.0.2.tgz"; - path = fetchurl { - name = "react_dom___react_dom_17.0.2.tgz"; - url = "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz"; - sha512 = "s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA=="; - }; - } - { - name = "react_emotion___react_emotion_9.2.12.tgz"; - path = fetchurl { - name = "react_emotion___react_emotion_9.2.12.tgz"; - url = "https://registry.yarnpkg.com/react-emotion/-/react-emotion-9.2.12.tgz"; - sha512 = "qt7XbxnEKX5sZ73rERJ92JMbEOoyOwG3BuCRFRkXrsJhEe+rFBRTljRw7yOLHZUCQC4GBObZhjXIduQ8S0ZpYw=="; - }; - } - { - name = "react_is___react_is_16.13.0.tgz"; - path = fetchurl { - name = "react_is___react_is_16.13.0.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz"; - sha512 = "GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA=="; - }; - } - { - name = "react_json_tree___react_json_tree_0.11.2.tgz"; - path = fetchurl { - name = "react_json_tree___react_json_tree_0.11.2.tgz"; - url = "https://registry.yarnpkg.com/react-json-tree/-/react-json-tree-0.11.2.tgz"; - sha512 = "aYhUPj1y5jR3ZQ+G3N7aL8FbTyO03iLwnVvvEikLcNFqNTyabdljo9xDftZndUBFyyyL0aK3qGO9+8EilILHUw=="; - }; - } - { - name = "react_window___react_window_1.8.6.tgz"; - path = fetchurl { - name = "react_window___react_window_1.8.6.tgz"; - url = "https://registry.yarnpkg.com/react-window/-/react-window-1.8.6.tgz"; - sha512 = "8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg=="; - }; - } - { - name = "react___react_17.0.2.tgz"; - path = fetchurl { - name = "react___react_17.0.2.tgz"; - url = "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz"; - sha512 = "gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA=="; - }; - } - { - name = "readable_stream___readable_stream_2.3.7.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_2.3.7.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; - }; - } - { - name = "readable_stream___readable_stream_3.6.0.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; - }; - } - { - name = "readable_stream___readable_stream_1.0.34.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_1.0.34.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz"; - sha1 = "Elgg40vIQtLyqq+v5MKRbuMsFXw="; - }; - } - { - name = "readdirp___readdirp_2.2.1.tgz"; - path = fetchurl { - name = "readdirp___readdirp_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz"; - sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; - }; - } - { - name = "realm_utils___realm_utils_1.0.9.tgz"; - path = fetchurl { - name = "realm_utils___realm_utils_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/realm-utils/-/realm-utils-1.0.9.tgz"; - sha1 = "XHal/znkgWrywTOhYfQiHWYo7/Q="; - }; - } - { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; - path = fetchurl { - name = "regenerate_unicode_properties___regenerate_unicode_properties_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz"; - sha512 = "LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA=="; - }; - } - { - name = "regenerate___regenerate_1.4.0.tgz"; - path = fetchurl { - name = "regenerate___regenerate_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz"; - sha512 = "1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg=="; - }; - } - { - name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"; - sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; - }; - } - { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; - sha512 = "naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="; - }; - } - { - name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; - }; - } - { - name = "regex_cache___regex_cache_0.4.4.tgz"; - path = fetchurl { - name = "regex_cache___regex_cache_0.4.4.tgz"; - url = "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz"; - sha512 = "nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ=="; - }; - } - { - name = "regex_not___regex_not_1.0.2.tgz"; - path = fetchurl { - name = "regex_not___regex_not_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz"; - sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; - }; - } - { - name = "regexpu_core___regexpu_core_4.6.0.tgz"; - path = fetchurl { - name = "regexpu_core___regexpu_core_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.6.0.tgz"; - sha512 = "YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg=="; - }; - } - { - name = "regjsgen___regjsgen_0.5.1.tgz"; - path = fetchurl { - name = "regjsgen___regjsgen_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz"; - sha512 = "5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg=="; - }; - } - { - name = "regjsparser___regjsparser_0.6.3.tgz"; - path = fetchurl { - name = "regjsparser___regjsparser_0.6.3.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz"; - sha512 = "8uZvYbnfAtEm9Ab8NTb3hdLwL4g/LQzEYP7Xs27T96abJCCE2d6r3cPZPQEsLKy0vRSGVNG+/zVGtLr86HQduA=="; - }; - } - { - name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; - path = fetchurl { - name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; - sha1 = "wkvOKig62tW8P1jg1IJJuSN52O8="; - }; - } - { - name = "repeat_element___repeat_element_1.1.3.tgz"; - path = fetchurl { - name = "repeat_element___repeat_element_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz"; - sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; - }; - } - { - name = "repeat_string___repeat_string_1.6.1.tgz"; - path = fetchurl { - name = "repeat_string___repeat_string_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "jcrkcOHIirwtYA//Sndihtp15jc="; - }; - } - { - name = "request___request_2.88.2.tgz"; - path = fetchurl { - name = "request___request_2.88.2.tgz"; - url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; - sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; - }; - } - { - name = "require_directory___require_directory_2.1.1.tgz"; - path = fetchurl { - name = "require_directory___require_directory_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "jGStX9MNqxyXbiNE/+f3kqam30I="; - }; - } - { - name = "resolve_from___resolve_from_4.0.0.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; - sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; - }; - } - { - name = "resolve_url___resolve_url_0.2.1.tgz"; - path = fetchurl { - name = "resolve_url___resolve_url_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz"; - sha1 = "LGN/53yJOv0qZj/iGqkIAGjiBSo="; - }; - } - { - name = "resolve___resolve_1.15.1.tgz"; - path = fetchurl { - name = "resolve___resolve_1.15.1.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz"; - sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; - }; - } - { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; - path = fetchurl { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "n37ih/gv0ybU/RYpI9YhKe7g368="; - }; - } - { - name = "ret___ret_0.1.15.tgz"; - path = fetchurl { - name = "ret___ret_0.1.15.tgz"; - url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; - sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; - }; - } - { - name = "rimraf___rimraf_2.7.1.tgz"; - path = fetchurl { - name = "rimraf___rimraf_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; - sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; - }; - } - { - name = "rimraf___rimraf_3.0.2.tgz"; - path = fetchurl { - name = "rimraf___rimraf_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; - sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; - }; - } - { - name = "rope_sequence___rope_sequence_1.3.2.tgz"; - path = fetchurl { - name = "rope_sequence___rope_sequence_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.2.tgz"; - sha512 = "ku6MFrwEVSVmXLvy3dYph3LAMNS0890K7fabn+0YIRQ2T96T9F4gkFf0vf0WW0JUraNWwGRtInEpH7yO4tbQZg=="; - }; - } - { - name = "run_async___run_async_2.4.0.tgz"; - path = fetchurl { - name = "run_async___run_async_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz"; - sha512 = "xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg=="; - }; - } - { - name = "rx_lite_aggregates___rx_lite_aggregates_4.0.8.tgz"; - path = fetchurl { - name = "rx_lite_aggregates___rx_lite_aggregates_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz"; - sha1 = "dTuHqJoRyVRnxKwWJsTvxOBcZ74="; - }; - } - { - name = "rx_lite___rx_lite_4.0.8.tgz"; - path = fetchurl { - name = "rx_lite___rx_lite_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz"; - sha1 = "Cx4Rr4vESDbwSmQH6S2kJGe3lEQ="; - }; - } - { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; - }; - } - { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha512 = "fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="; - }; - } - { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; - }; - } - { - name = "safe_regex___safe_regex_1.1.0.tgz"; - path = fetchurl { - name = "safe_regex___safe_regex_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz"; - sha1 = "QKNmnzsHfR6UPURinhV91IAjvy4="; - }; - } - { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - path = fetchurl { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - } - { - name = "scheduler___scheduler_0.20.2.tgz"; - path = fetchurl { - name = "scheduler___scheduler_0.20.2.tgz"; - url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz"; - sha512 = "2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ=="; - }; - } - { - name = "select___select_1.1.2.tgz"; - path = fetchurl { - name = "select___select_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz"; - sha1 = "DnNQrN7ICxEIUoeG7B1EGNEbOW0="; - }; - } - { - name = "semver___semver_5.7.1.tgz"; - path = fetchurl { - name = "semver___semver_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; - }; - } - { - name = "semver___semver_6.3.0.tgz"; - path = fetchurl { - name = "semver___semver_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; - }; - } - { - name = "semver___semver_7.3.5.tgz"; - path = fetchurl { - name = "semver___semver_7.3.5.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; - sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; - }; - } - { - name = "send___send_0.17.1.tgz"; - path = fetchurl { - name = "send___send_0.17.1.tgz"; - url = "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz"; - sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; - }; - } - { - name = "sentence_splitter___sentence_splitter_3.2.2.tgz"; - path = fetchurl { - name = "sentence_splitter___sentence_splitter_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/sentence-splitter/-/sentence-splitter-3.2.2.tgz"; - sha512 = "hMvaodgK9Fay928uiQoTMEWjXpCERdKD2uKo7BbSyP+uWTo+wHiRjN+ZShyI99rW0VuoV4Cuw8FUmaRcnpN7Ug=="; - }; - } - { - name = "serve_static___serve_static_1.14.1.tgz"; - path = fetchurl { - name = "serve_static___serve_static_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz"; - sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; - }; - } - { - name = "set_blocking___set_blocking_2.0.0.tgz"; - path = fetchurl { - name = "set_blocking___set_blocking_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "BF+XgtARrppoA93TgrJDkrPYkPc="; - }; - } - { - name = "set_value___set_value_2.0.1.tgz"; - path = fetchurl { - name = "set_value___set_value_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; - sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; - }; - } - { - name = "setimmediate___setimmediate_1.0.5.tgz"; - path = fetchurl { - name = "setimmediate___setimmediate_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz"; - sha1 = "KQy7Iy4waULX1+qbg3Mqt4VvgoU="; - }; - } - { - name = "setprototypeof___setprototypeof_1.1.1.tgz"; - path = fetchurl { - name = "setprototypeof___setprototypeof_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; - }; - } - { - name = "shorthash___shorthash_0.0.2.tgz"; - path = fetchurl { - name = "shorthash___shorthash_0.0.2.tgz"; - url = "https://registry.yarnpkg.com/shorthash/-/shorthash-0.0.2.tgz"; - sha1 = "WbJo7sveWQOLMNogK8+93rLEpOs="; - }; - } - { - name = "signal_exit___signal_exit_3.0.5.tgz"; - path = fetchurl { - name = "signal_exit___signal_exit_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz"; - sha512 = "KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ=="; - }; - } - { - name = "signal_exit___signal_exit_3.0.2.tgz"; - path = fetchurl { - name = "signal_exit___signal_exit_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "tf3AjxKH6hF4Yo5BXiUTK3NkbG0="; - }; - } - { - name = "slice_stream___slice_stream_1.0.0.tgz"; - path = fetchurl { - name = "slice_stream___slice_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-stream/-/slice-stream-1.0.0.tgz"; - sha1 = "WzO9ZvATsaf4ZGCwPUY97DmtPqA="; - }; - } - { - name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; - path = fetchurl { - name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; - sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; - }; - } - { - name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; - path = fetchurl { - name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; - sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; - }; - } - { - name = "snapdragon___snapdragon_0.8.2.tgz"; - path = fetchurl { - name = "snapdragon___snapdragon_0.8.2.tgz"; - url = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"; - sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; - }; - } - { - name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; - path = fetchurl { - name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; - sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; - }; - } - { - name = "source_map_support___source_map_support_0.5.19.tgz"; - path = fetchurl { - name = "source_map_support___source_map_support_0.5.19.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; - sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; - }; - } - { - name = "source_map_support___source_map_support_0.5.16.tgz"; - path = fetchurl { - name = "source_map_support___source_map_support_0.5.16.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz"; - sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; - }; - } - { - name = "source_map_url___source_map_url_0.4.0.tgz"; - path = fetchurl { - name = "source_map_url___source_map_url_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz"; - sha1 = "PpNdfd1zYxuXZZlW1VEo6HtQhKM="; - }; - } - { - name = "source_map___source_map_0.5.7.tgz"; - path = fetchurl { - name = "source_map___source_map_0.5.7.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; - sha1 = "igOdLRAh0i0eoUyA2OpGi6LvP8w="; - }; - } - { - name = "source_map___source_map_0.6.1.tgz"; - path = fetchurl { - name = "source_map___source_map_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; - }; - } - { - name = "source_map___source_map_0.7.3.tgz"; - path = fetchurl { - name = "source_map___source_map_0.7.3.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; - sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; - }; - } - { - name = "sourcemap_blender___sourcemap_blender_1.0.5.tgz"; - path = fetchurl { - name = "sourcemap_blender___sourcemap_blender_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/sourcemap-blender/-/sourcemap-blender-1.0.5.tgz"; - sha512 = "GPhjCmDtJ8YY6zt1L6kP6WtBg6WrdWt5hw2Wmgt9rwC3yiwLo9vEuabh/YYSZ5KmFV20hVkGdkTwpXtT2E65TA=="; - }; - } - { - name = "split_string___split_string_3.1.0.tgz"; - path = fetchurl { - name = "split_string___split_string_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"; - sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; - }; - } - { - name = "sprintf_js___sprintf_js_1.0.3.tgz"; - path = fetchurl { - name = "sprintf_js___sprintf_js_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "BOaSb2YolTVPPdAVIDYzuFcpfiw="; - }; - } - { - name = "sshpk___sshpk_1.16.1.tgz"; - path = fetchurl { - name = "sshpk___sshpk_1.16.1.tgz"; - url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz"; - sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="; - }; - } - { - name = "static_extend___static_extend_0.1.2.tgz"; - path = fetchurl { - name = "static_extend___static_extend_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz"; - sha1 = "YICcOcv/VTNyJv1eC1IPNB8ftcY="; - }; - } - { - name = "statuses___statuses_1.5.0.tgz"; - path = fetchurl { - name = "statuses___statuses_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; - sha1 = "Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="; - }; - } - { - name = "stream_browserify___stream_browserify_2.0.2.tgz"; - path = fetchurl { - name = "stream_browserify___stream_browserify_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz"; - sha512 = "nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg=="; - }; - } - { - name = "string_width___string_width_1.0.2.tgz"; - path = fetchurl { - name = "string_width___string_width_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; - sha1 = "EYvfW4zcUaKn5w0hHgfisLmxB9M="; - }; - } - { - name = "string_width___string_width_2.1.1.tgz"; - path = fetchurl { - name = "string_width___string_width_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; - sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; - }; - } - { - name = "string_width___string_width_4.2.3.tgz"; - path = fetchurl { - name = "string_width___string_width_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; - sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; - }; - } - { - name = "string_decoder___string_decoder_1.3.0.tgz"; - path = fetchurl { - name = "string_decoder___string_decoder_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; - sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; - }; - } - { - name = "string_decoder___string_decoder_0.10.31.tgz"; - path = fetchurl { - name = "string_decoder___string_decoder_0.10.31.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="; - }; - } - { - name = "string_decoder___string_decoder_1.1.1.tgz"; - path = fetchurl { - name = "string_decoder___string_decoder_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; - }; - } - { - name = "strip_ansi___strip_ansi_3.0.1.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "ajhfuIU9lS1f8F0Oiq+UJ43GPc8="; - }; - } - { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "qEeQIusaw2iocTibY1JixQXuNo8="; - }; - } - { - name = "strip_ansi___strip_ansi_6.0.1.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; - }; - } - { - name = "structured_source___structured_source_3.0.2.tgz"; - path = fetchurl { - name = "structured_source___structured_source_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/structured-source/-/structured-source-3.0.2.tgz"; - sha1 = "3YAkJeD1PcSm56yjdSkBoczaevU="; - }; - } - { - name = "stylis_rule_sheet___stylis_rule_sheet_0.0.10.tgz"; - path = fetchurl { - name = "stylis_rule_sheet___stylis_rule_sheet_0.0.10.tgz"; - url = "https://registry.yarnpkg.com/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz"; - sha512 = "nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw=="; - }; - } - { - name = "stylis___stylis_3.5.4.tgz"; - path = fetchurl { - name = "stylis___stylis_3.5.4.tgz"; - url = "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz"; - sha512 = "8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q=="; - }; - } - { - name = "supports_color___supports_color_5.5.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; - }; - } - { - name = "tar___tar_6.1.11.tgz"; - path = fetchurl { - name = "tar___tar_6.1.11.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz"; - sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; - }; - } - { - name = "terser___terser_4.6.4.tgz"; - path = fetchurl { - name = "terser___terser_4.6.4.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-4.6.4.tgz"; - sha512 = "5fqgBPLgVHZ/fVvqRhhUp9YUiGXhFJ9ZkrZWD9vQtFBR4QIGTnbsb+/kKqSqfgp3WnBwGWAFnedGTtmX1YTn0w=="; - }; - } - { - name = "thenby___thenby_1.3.3.tgz"; - path = fetchurl { - name = "thenby___thenby_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/thenby/-/thenby-1.3.3.tgz"; - sha512 = "vCzp0TxrQ+2bfRJoWNhMwk6RNfboOUN2S+nbEfhJfj7RwJHD6PlgtXH/hXiSmv6UJs35IQDtVqiI45J+cAgLqg=="; - }; - } - { - name = "through___through_2.3.8.tgz"; - path = fetchurl { - name = "through___through_2.3.8.tgz"; - url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU="; - }; - } - { - name = "tiny_emitter___tiny_emitter_2.1.0.tgz"; - path = fetchurl { - name = "tiny_emitter___tiny_emitter_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz"; - sha512 = "NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="; - }; - } - { - name = "tlite___tlite_0.1.9.tgz"; - path = fetchurl { - name = "tlite___tlite_0.1.9.tgz"; - url = "https://registry.yarnpkg.com/tlite/-/tlite-0.1.9.tgz"; - sha512 = "5QOBAvDxZZwW1i+2YXMgF6/PuV/KhA0LyE9PyVi8Ywr3bfIPziZcQD+RpdJaQurCU8zIGtBo/XuPCEHdvyeFuQ=="; - }; - } - { - name = "tmp___tmp_0.0.33.tgz"; - path = fetchurl { - name = "tmp___tmp_0.0.33.tgz"; - url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"; - sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; - }; - } - { - name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; - path = fetchurl { - name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha1 = "3F5pjL0HkmW8c+A3doGk5Og/YW4="; - }; - } - { - name = "to_object_path___to_object_path_0.3.0.tgz"; - path = fetchurl { - name = "to_object_path___to_object_path_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz"; - sha1 = "KXWIt7Dn4KwI4E5nL4XB9JmeF68="; - }; - } - { - name = "to_regex_range___to_regex_range_2.1.1.tgz"; - path = fetchurl { - name = "to_regex_range___to_regex_range_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz"; - sha1 = "fIDBe53+vlmeJzZ+DU3VWQFB2zg="; - }; - } - { - name = "to_regex___to_regex_3.0.2.tgz"; - path = fetchurl { - name = "to_regex___to_regex_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz"; - sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; - }; - } - { - name = "toidentifier___toidentifier_1.0.0.tgz"; - path = fetchurl { - name = "toidentifier___toidentifier_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz"; - sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; - }; - } - { - name = "touch___touch_2.0.2.tgz"; - path = fetchurl { - name = "touch___touch_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/touch/-/touch-2.0.2.tgz"; - sha512 = "qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A=="; - }; - } - { - name = "tough_cookie___tough_cookie_2.5.0.tgz"; - path = fetchurl { - name = "tough_cookie___tough_cookie_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; - }; - } - { - name = "tr46___tr46_0.0.3.tgz"; - path = fetchurl { - name = "tr46___tr46_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz"; - sha1 = "gYT9NH2snNwYWZLzpmIuFLnZq2o="; - }; - } - { - name = "transliteration___transliteration_2.2.0.tgz"; - path = fetchurl { - name = "transliteration___transliteration_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/transliteration/-/transliteration-2.2.0.tgz"; - sha512 = "o29GDWtecNoK4TNfnJQesGluFPiza+U8NoiKrErU8eTNlVgma6w1LV/tTiGo+waFLkhtL9WxrW0lXhZKmm7msQ=="; - }; - } - { - name = "traverse___traverse_0.3.9.tgz"; - path = fetchurl { - name = "traverse___traverse_0.3.9.tgz"; - url = "https://registry.yarnpkg.com/traverse/-/traverse-0.3.9.tgz"; - sha1 = "cXuPIgzAu3tE5AUUwisui7xw2Lk="; - }; - } - { - name = "ts_node___ts_node_8.10.2.tgz"; - path = fetchurl { - name = "ts_node___ts_node_8.10.2.tgz"; - url = "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz"; - sha512 = "ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA=="; - }; - } - { - name = "tslib___tslib_1.11.1.tgz"; - path = fetchurl { - name = "tslib___tslib_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz"; - sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="; - }; - } - { - name = "tslint_config_prettier___tslint_config_prettier_1.18.0.tgz"; - path = fetchurl { - name = "tslint_config_prettier___tslint_config_prettier_1.18.0.tgz"; - url = "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz"; - sha512 = "xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg=="; - }; - } - { - name = "tslint_react___tslint_react_5.0.0.tgz"; - path = fetchurl { - name = "tslint_react___tslint_react_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/tslint-react/-/tslint-react-5.0.0.tgz"; - sha512 = "/IbcSmoBPlFic8kQaRfQ4knTY4mivwo5LVzvozvX6Dyu2ynEnrh1dIcR2ujjyp/IodXqY/H5GbxFxSMo/Kf2Hg=="; - }; - } - { - name = "tslint___tslint_5.20.1.tgz"; - path = fetchurl { - name = "tslint___tslint_5.20.1.tgz"; - url = "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz"; - sha512 = "EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg=="; - }; - } - { - name = "tsutils___tsutils_2.29.0.tgz"; - path = fetchurl { - name = "tsutils___tsutils_2.29.0.tgz"; - url = "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz"; - sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA=="; - }; - } - { - name = "tsutils___tsutils_3.17.1.tgz"; - path = fetchurl { - name = "tsutils___tsutils_3.17.1.tgz"; - url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz"; - sha512 = "kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g=="; - }; - } - { - name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; - path = fetchurl { - name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "J6XeoGs2sEoKmWZ3SykIaPD8QP0="; - }; - } - { - name = "tweetnacl___tweetnacl_0.14.5.tgz"; - path = fetchurl { - name = "tweetnacl___tweetnacl_0.14.5.tgz"; - url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "WuaBd/GS1EViadEIr6k/+HQ/T2Q="; - }; - } - { - name = "type_check___type_check_0.3.2.tgz"; - path = fetchurl { - name = "type_check___type_check_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; - sha1 = "WITKtRLPHTVeP7eE8wgEsrUg23I="; - }; - } - { - name = "type_is___type_is_1.6.18.tgz"; - path = fetchurl { - name = "type_is___type_is_1.6.18.tgz"; - url = "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz"; - sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; - }; - } - { - name = "typedarray___typedarray_0.0.6.tgz"; - path = fetchurl { - name = "typedarray___typedarray_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "hnrHTjhkGHsdPUfZlqeOxciDB3c="; - }; - } - { - name = "typescript_tslint_plugin___typescript_tslint_plugin_0.5.5.tgz"; - path = fetchurl { - name = "typescript_tslint_plugin___typescript_tslint_plugin_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/typescript-tslint-plugin/-/typescript-tslint-plugin-0.5.5.tgz"; - sha512 = "tR5igNQP+6FhxaPJYRlUBVsEl0n5cSuXRbg7L1y80mL4B1jUHb8uiIcbQBJ9zWyypJEdFYFUccpXxvMwZR8+AA=="; - }; - } - { - name = "typescript___typescript_3.8.3.tgz"; - path = fetchurl { - name = "typescript___typescript_3.8.3.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; - sha512 = "MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w=="; - }; - } - { - name = "uglify_js___uglify_js_3.8.0.tgz"; - path = fetchurl { - name = "uglify_js___uglify_js_3.8.0.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.8.0.tgz"; - sha512 = "ugNSTT8ierCsDHso2jkBHXYrU8Y5/fY2ZUprfrJUiD7YpuFvV4jODLFmb3h4btQjqr5Nh4TX4XtgDfCU1WdioQ=="; - }; - } - { - name = "ultron___ultron_1.0.2.tgz"; - path = fetchurl { - name = "ultron___ultron_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz"; - sha1 = "rOEWq1V80Zc4ak6I9GhTeMiy5Po="; - }; - } - { - name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; - path = fetchurl { - name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; - sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="; - }; - } - { - name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; - path = fetchurl { - name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; - sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; - }; - } - { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; - path = fetchurl { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz"; - sha512 = "hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g=="; - }; - } - { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; - path = fetchurl { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz"; - sha512 = "L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw=="; - }; - } - { - name = "union_value___union_value_1.0.1.tgz"; - path = fetchurl { - name = "union_value___union_value_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; - sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; - }; - } - { - name = "universalify___universalify_0.1.2.tgz"; - path = fetchurl { - name = "universalify___universalify_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; - sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; - }; - } - { - name = "unpipe___unpipe_1.0.0.tgz"; - path = fetchurl { - name = "unpipe___unpipe_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "sr9O6FFKrmFltIF4KdIbLvSZBOw="; - }; - } - { - name = "unset_value___unset_value_1.0.0.tgz"; - path = fetchurl { - name = "unset_value___unset_value_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz"; - sha1 = "g3aHP30jNRef+x5vw6jtDfyKtVk="; - }; - } - { - name = "unstated___unstated_2.1.1.tgz"; - path = fetchurl { - name = "unstated___unstated_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/unstated/-/unstated-2.1.1.tgz"; - sha512 = "fORlTWMZxq7NuMJDxyIrrYIZKN7wEWYQ9SiaJfIRcSpsowr6Ph/JIfK2tgtXLW614JfPG/t5q9eEIhXRCf55xg=="; - }; - } - { - name = "unzip___unzip_0.1.11.tgz"; - path = fetchurl { - name = "unzip___unzip_0.1.11.tgz"; - url = "https://registry.yarnpkg.com/unzip/-/unzip-0.1.11.tgz"; - sha1 = "iXScY7BY19kNYZ+GuYqhU107l/A="; - }; - } - { - name = "uri_js___uri_js_4.2.2.tgz"; - path = fetchurl { - name = "uri_js___uri_js_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; - }; - } - { - name = "urix___urix_0.1.0.tgz"; - path = fetchurl { - name = "urix___urix_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"; - sha1 = "2pN/emLiH+wf0Y1Js1wpNQZ6bHI="; - }; - } - { - name = "use___use_3.1.1.tgz"; - path = fetchurl { - name = "use___use_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"; - sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; - }; - } - { - name = "util_deprecate___util_deprecate_1.0.2.tgz"; - path = fetchurl { - name = "util_deprecate___util_deprecate_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; - }; - } - { - name = "utils_extend___utils_extend_1.0.8.tgz"; - path = fetchurl { - name = "utils_extend___utils_extend_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/utils-extend/-/utils-extend-1.0.8.tgz"; - sha1 = "zP17ZFQPjpDuIe7Fd2nQZRyril8="; - }; - } - { - name = "utils_merge___utils_merge_1.0.1.tgz"; - path = fetchurl { - name = "utils_merge___utils_merge_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "n5VxD1CiZ5R7LMwSR0HBAoQn5xM="; - }; - } - { - name = "uuid___uuid_3.4.0.tgz"; - path = fetchurl { - name = "uuid___uuid_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; - sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; - }; - } - { - name = "vary___vary_1.1.2.tgz"; - path = fetchurl { - name = "vary___vary_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; - sha1 = "IpnwLG3tMNSllhsLn3RSShj2NPw="; - }; - } - { - name = "verror___verror_1.10.0.tgz"; - path = fetchurl { - name = "verror___verror_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; - sha1 = "OhBcoXBTr1XW4nDB+CiGguGNpAA="; - }; - } - { - name = "vscode_jsonrpc___vscode_jsonrpc_4.0.0.tgz"; - path = fetchurl { - name = "vscode_jsonrpc___vscode_jsonrpc_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-4.0.0.tgz"; - sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="; - }; - } - { - name = "vscode_languageserver_protocol___vscode_languageserver_protocol_3.14.1.tgz"; - path = fetchurl { - name = "vscode_languageserver_protocol___vscode_languageserver_protocol_3.14.1.tgz"; - url = "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.14.1.tgz"; - sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g=="; - }; - } - { - name = "vscode_languageserver_types___vscode_languageserver_types_3.14.0.tgz"; - path = fetchurl { - name = "vscode_languageserver_types___vscode_languageserver_types_3.14.0.tgz"; - url = "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz"; - sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A=="; - }; - } - { - name = "vscode_languageserver___vscode_languageserver_5.2.1.tgz"; - path = fetchurl { - name = "vscode_languageserver___vscode_languageserver_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-5.2.1.tgz"; - sha512 = "GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A=="; - }; - } - { - name = "vscode_uri___vscode_uri_1.0.8.tgz"; - path = fetchurl { - name = "vscode_uri___vscode_uri_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-1.0.8.tgz"; - sha512 = "obtSWTlbJ+a+TFRYGaUumtVwb+InIUVI0Lu0VBUAPmj2cU5JutEXg3xUE0c2J5Tcy7h2DEKVJBFi+Y9ZSFzzPQ=="; - }; - } - { - name = "w3c_keyname___w3c_keyname_2.2.2.tgz"; - path = fetchurl { - name = "w3c_keyname___w3c_keyname_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.2.tgz"; - sha512 = "8Vs/aVwcy0IJACaPm4tyzh1fzehZE70bGSjEl3dDms5UXtWnaBElrSHC8lDDeak0Gk5jxKOFstL64/65o7Ge2A=="; - }; - } - { - name = "watch___watch_1.0.2.tgz"; - path = fetchurl { - name = "watch___watch_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/watch/-/watch-1.0.2.tgz"; - sha1 = "NApxe952Vyb6CqB9ch4BR6VR3ww="; - }; - } - { - name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; - path = fetchurl { - name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha1 = "JFNCdeKnvGvnvIZhHMFq4KVlSHE="; - }; - } - { - name = "whatwg_url___whatwg_url_5.0.0.tgz"; - path = fetchurl { - name = "whatwg_url___whatwg_url_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha1 = "lmRU6HZUYuN2RNNib2dCzotwll0="; - }; - } - { - name = "wide_align___wide_align_1.1.3.tgz"; - path = fetchurl { - name = "wide_align___wide_align_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; - sha512 = "QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA=="; - }; - } - { - name = "word_wrap___word_wrap_1.2.3.tgz"; - path = fetchurl { - name = "word_wrap___word_wrap_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; - sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; - }; - } - { - name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; - }; - } - { - name = "wrappy___wrappy_1.0.2.tgz"; - path = fetchurl { - name = "wrappy___wrappy_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; - }; - } - { - name = "ws___ws_1.1.5.tgz"; - path = fetchurl { - name = "ws___ws_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-1.1.5.tgz"; - sha512 = "o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w=="; - }; - } - { - name = "y18n___y18n_5.0.8.tgz"; - path = fetchurl { - name = "y18n___y18n_5.0.8.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; - sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; - }; - } - { - name = "yallist___yallist_4.0.0.tgz"; - path = fetchurl { - name = "yallist___yallist_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; - sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; - }; - } - { - name = "yaml___yaml_1.7.2.tgz"; - path = fetchurl { - name = "yaml___yaml_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz"; - sha512 = "qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw=="; - }; - } - { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; - }; - } - { - name = "yargs___yargs_16.2.0.tgz"; - path = fetchurl { - name = "yargs___yargs_16.2.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz"; - sha512 = "D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw=="; - }; - } - { - name = "yn___yn_3.1.1.tgz"; - path = fetchurl { - name = "yn___yn_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz"; - sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; - }; - } - { - name = "zenscroll___zenscroll_4.0.2.tgz"; - path = fetchurl { - name = "zenscroll___zenscroll_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/zenscroll/-/zenscroll-4.0.2.tgz"; - sha1 = "6NV3TRwHOKR7z6hynzcS4t7d6yU="; - }; - } - ]; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix b/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix index 6a0156eedb..640a00eaaa 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/setzer/default.nix @@ -6,27 +6,27 @@ , gettext , appstream , appstream-glib -, wrapGAppsHook +, wrapGAppsHook4 , desktop-file-utils , gobject-introspection -, gtksourceview4 -, gspell -, libhandy -, poppler_gi -, webkitgtk_4_1 -, librsvg +, gtk4 +, gtksourceview5 +, libadwaita , libportal +, librsvg +, poppler_gi +, webkitgtk_6_0 }: python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "56"; + version = "60"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - hash = "sha256-YCJu8EU+8RD09QNVT/RYF2ZJZ7cp+oawXThqTzg8ENQ="; + hash = "sha256-SfMqGQKJtPTMSv4B70jOvTAIzNQc0AC16mum4fuNch4="; }; format = "other"; @@ -37,28 +37,30 @@ python3.pkgs.buildPythonApplication rec { gettext appstream # for appstreamcli appstream-glib - wrapGAppsHook + wrapGAppsHook4 desktop-file-utils gobject-introspection ]; buildInputs = [ - gtksourceview4 - gspell - libhandy - poppler_gi - webkitgtk_4_1 - librsvg + gtk4 + gtksourceview5 + libadwaita libportal + librsvg + poppler_gi + webkitgtk_6_0 ]; propagatedBuildInputs = with python3.pkgs; [ + bibtexparser + numpy + pdfminer-six + pexpect + pillow + pycairo pygobject3 pyxdg - pdfminer-six - pycairo - pexpect - bibtexparser ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix b/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix index 9f51d41428..1740d5a8e3 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/sigil/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "sigil"; - version = "1.9.30"; + version = "2.0.1"; src = fetchFromGitHub { repo = "Sigil"; owner = "Sigil-Ebook"; rev = version; - sha256 = "sha256-07JK3xHpNDs6CU8je8PNyTugNBi2mQ7G109R3JX4eyg="; + sha256 = "sha256-d54N6Kb+xLMxlRwqxqWXnFGQCvUmSy9z6j86aV+VioU="; }; pythonPath = with python3Packages; [ lxml ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json index ab59232d85..59c79721a6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json +++ b/third_party/nixpkgs/pkgs/applications/editors/standardnotes/src.json @@ -1,13 +1,13 @@ { - "version": "3.167.2", + "version": "3.173.4", "deb": { "x86_64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.167.2/standard-notes-3.167.2-linux-amd64.deb", - "hash": "sha512-xW08R1oZm8lw8Iap/TT29WJCagmcQNWXzdSDY8pArG9Fjv8nm+DcV6paVL35Hj35Dk9CJdf1KxeTRB9JW6u3dg==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.173.4/standard-notes-3.173.4-linux-amd64.deb", + "hash": "sha512-8GDzj7Xm61rF5xybLE74D4yMbT2HgEG0ez1gQio/qWtWSqY72+GSKWlCA+3wz8Mz2jThRDlka9s2fHBBUvG+fg==" }, "aarch64-linux": { - "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.167.2/standard-notes-3.167.2-linux-arm64.deb", - "hash": "sha512-ua0lg6aK++RDi4WyCYygHoQasYD4+I21ip5To9ImMN072vJSyAoz9gxs8HBF+uEl4/uUBdlMCQHEioYMeJCwbw==" + "url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.173.4/standard-notes-3.173.4-linux-arm64.deb", + "hash": "sha512-yJ8yZK+RkPUzkjbscCXT5yv9BxeHGQsZsCrKwOJRdd/XbcVPnKWQm00JVZmMuz17d8rhm8Km/EW81JufZByM0Q==" } } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/sublime/4/common.nix b/third_party/nixpkgs/pkgs/applications/editors/sublime/4/common.nix index 7a8cc75e54..e71185f3f0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/sublime/4/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/sublime/4/common.nix @@ -9,9 +9,10 @@ let pnameBase = "sublimetext4"; packageAttribute = "sublime4${lib.optionalString dev "-dev"}"; - binaries = [ "sublime_text" "plugin_host-3.3" "plugin_host-3.8" "crash_reporter" ]; + binaries = [ "sublime_text" "plugin_host-3.3" "plugin_host-3.8" crashHandlerBinary ]; primaryBinary = "sublime_text"; primaryBinaryAliases = [ "subl" "sublime" "sublime4" ]; + crashHandlerBinary = if lib.versionAtLeast buildVersion "4153" then "crash_handler" else "crash_reporter"; downloadUrl = arch: "https://download.sublimetext.com/sublime_text_build_${buildVersion}_${arch}.tar.xz"; versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}"; versionFile = builtins.toString ./packages.nix; diff --git a/third_party/nixpkgs/pkgs/applications/editors/sublime/4/packages.nix b/third_party/nixpkgs/pkgs/applications/editors/sublime/4/packages.nix index 2bdf52840c..ac64c8eac9 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/sublime/4/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/sublime/4/packages.nix @@ -5,15 +5,15 @@ let in { sublime4 = common { - buildVersion = "4143"; - x64sha256 = "fehiw40ZNnQUEXEQMo3e11SscJ/tVMjMXLBzfIlMBzw="; - aarch64sha256 = "4zpNHVEHO98vHcWTbqmwlrB4+HIwoQojeQvq7nAqSpM="; + buildVersion = "4152"; + x64sha256 = "bt48g1GZWYlwQcZQboUHU8GZYmA7cb2fc6Ylrh5NNVQ="; + aarch64sha256 = "nSH5a5KRYzqLMnLo2mFk3WpjL9p6Qh3zNy8oFPEHHoA="; } {}; sublime4-dev = common { - buildVersion = "4150"; + buildVersion = "4155"; dev = true; - x64sha256 = "6Kafp4MxmCn978SqjSY8qAT6Yc/7WC8U9jVkIUUmUHs="; - aarch64sha256 = "dPxe2RLoMJS+rVtcVZZpMPQ5gfTEnW/INcnzYYeFEIQ="; + x64sha256 = "owcux1/CjXQsJ8/6ex3CWV1/Wvh/ofZFH7yNQtxl9d4="; + aarch64sha256 = "YAcdpBDmaajQPvyp8ypJNom+XOKx2YKA2uylfxlKuZY="; } {}; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/teehee/default.nix b/third_party/nixpkgs/pkgs/applications/editors/teehee/default.nix new file mode 100644 index 0000000000..271609c446 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/teehee/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "teehee"; + version = "0.2.8"; + + src = fetchFromGitHub { + owner = "Gskartwii"; + repo = "teehee"; + rev = "v${version}"; + hash = "sha256-yTterXAev6eOnUe1/MJV8s8dUYJcXHDKVJ6T0G/JHzI="; + }; + + cargoHash = "sha256-hEc7MaqTXMrKiosYacPw/b1ANnfZKdlhThOp2h14fg4="; + + meta = with lib; { + description = "A modal terminal hex editor"; + homepage = "https://github.com/Gskartwii/teehee"; + changelog = "https://github.com/Gskartwii/teehee/releases/tag/${src.rev}"; + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "teehee"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix b/third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix deleted file mode 100644 index 8c74d8c5c8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, callPackage, fetchurl, - guile_1_8, qt4, zlib, freetype, CoreFoundation, Cocoa, gettext, libiconv, ghostscript, - tex ? null, - aspell ? null, - netpbm ? null, - imagemagick ? null, - extraFonts ? false, - chineseFonts ? false, - japaneseFonts ? false, - koreanFonts ? false }: -let - version = "1.99.4"; - common = callPackage ./common.nix { - inherit tex extraFonts chineseFonts japaneseFonts koreanFonts; - }; -in -stdenv.mkDerivation { - pname = "TeXmacs"; - inherit version; - - src= fetchurl { - url = "http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${version}-src.tar.gz"; - sha256 = "1z8sj0xd1ncbl7ipzfsib6lmc7ahgvmiw61ln5zxm2l88jf7qc1a"; - }; - - patches = [ ./darwin.patch ]; - - buildInputs = [ guile_1_8.dev qt4 freetype CoreFoundation Cocoa gettext libiconv ghostscript ]; - - GUILE_CPPFLAGS="-D_THREAD_SAFE -I${guile_1_8.dev}/include -I${guile_1_8.dev}/include/guile "; - - NIX_LDFLAGS="${zlib}/lib/libz.dylib"; - - buildPhase = '' - substituteInPlace Makefile \ - --replace 'find -d $(MACOS_PACKAGE_TEXMACS)' 'find $(MACOS_PACKAGE_TEXMACS) -depth' \ - --replace '$(MACOS_PACKAGE_SRC)/bundle-libs.sh' 'true' - make MACOS_BUNDLE - ''; - - installPhase = '' - mkdir -p $out/Applications - cp -R ../distr/TeXmacs-${version}.app $out/Applications - ''; - - inherit (common) postPatch; - - postInstall = "wrapProgram $out/Applications/TeXmacs-${version}/Contents/MacOS/TeXmacs --suffix PATH : " + - "${ghostscript}/bin:" + - (lib.optionalString (aspell != null) "${aspell}/bin:") + - (lib.optionalString (tex != null) "${tex}/bin:") + - (lib.optionalString (netpbm != null) "${lib.getBin netpbm}/bin:") + - (lib.optionalString (imagemagick != null) "${imagemagick}/bin:"); - - enableParallelBuilding = true; - - meta = common.meta // { - platforms = lib.platforms.darwin; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.patch b/third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.patch deleted file mode 100644 index 2cb33fbbef..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/texmacs/darwin.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/configure -+++ b/configure -@@ -7461,7 +7461,7 @@ $as_echo "final adjustments for cygwin host" >&6; } - CONFIG_QTPIPES="yes" - CONFIG_CXXFLAGS="-I${prefix}/include" - CONFIG_BSHARED="" -- CONFIG_BFLAGS="-framework Cocoa -framework IOKit" -+ CONFIG_BFLAGS="-framework Cocoa -framework IOKit -framework CoreFoundation" - CONFIG_BPATH="" - CONFIG_SO="dylib" - CONFIG_LIB_PATH="DYLD_LIBRARY_PATH" -@@ -8281,6 +8281,7 @@ _ASEOF - if $QMAKE ${additional_qmake_flags} ; then :; else - as_fn_error $? "Calling $QMAKE failed." "$LINENO" 5 - fi -+ echo "QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10" >> $pro_file - # Try to compile a simple Qt app. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can build a simple Qt app" >&5 - $as_echo_n "checking whether we can build a simple Qt app... " >&6; } ---- a/src/Plugins/Unix/unix_sys_utils.cpp -+++ b/src/Plugins/Unix/unix_sys_utils.cpp -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - // for thread safe strings - #include diff --git a/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix b/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix index 0ef9ac66ec..9b6c9a0298 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/thonny/default.nix @@ -4,13 +4,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "thonny"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-DlizSm5cDvYXQ8Gok+W/RTSaAWJTkdyTQ4uewOiDVXg="; + hash = "sha256-vVDTizU+WDWJ75Ln93TAFYn7PJq5qc3hxVJiNGtK24g="; }; nativeBuildInputs = [ copyDesktopItems ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix index 24e9ea914b..0179dabe39 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "9.0.1642"; + version = "9.0.1897"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-WWj8lZZtnGrv3pxu77otBKixS3ciLcznCyPk/iGryg4="; + hash = "sha256-ywxJ9evXWbqZ6o6EqDIQWK16J05McAdvPl0Y9cW5Zvc="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix index 8440d1fd6d..ce83128e98 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation { description = "Vim - the text editor - for macOS"; homepage = "https://github.com/macvim-dev/macvim"; license = licenses.vim; - maintainers = with maintainers; [ cstrahan lilyball ]; + maintainers = with maintainers; [ lilyball ]; platforms = platforms.darwin; hydraPlatforms = []; # hydra can't build this as long as we rely on Xcode and sandboxProfile }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/aliases.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/aliases.nix index 21850545ce..6915198f09 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/aliases.nix @@ -127,6 +127,7 @@ mapAliases (with prev; { tlib = tlib_vim; tmux-navigator = vim-tmux-navigator; tmuxNavigator = vim-tmux-navigator; # backwards compat, added 2014-10-18 + todo-nvim = throw "todo-nvim has been removed: abandoned by upstream"; # Added 2023-08-23 tslime = tslime-vim; unite = unite-vim; UltiSnips = ultisnips; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix index 2064190811..1611adc97e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix @@ -16,8 +16,8 @@ rec { , namePrefix ? "vimplugin-" , src , unpackPhase ? "" - , configurePhase ? "" - , buildPhase ? "" + , configurePhase ? ":" + , buildPhase ? ":" , preInstall ? "" , postInstall ? "" , path ? "." @@ -48,9 +48,4 @@ rec { in addRtp (toVimPlugin drv); - buildVimPluginFrom2Nix = attrs: buildVimPlugin ({ - # vim plugins may override this - buildPhase = ":"; - configurePhase = ":"; - } // attrs); } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/default.nix index cf35e31736..e557cd7eff 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/default.nix @@ -7,14 +7,14 @@ let inherit (vimUtils.override {inherit vim;}) - buildVimPluginFrom2Nix; + buildVimPlugin; inherit (lib) extends; initialPackages = self: { }; plugins = callPackage ./generated.nix { - inherit buildVimPluginFrom2Nix; + inherit buildVimPlugin; inherit (neovimUtils) buildNeovimPlugin; }; @@ -26,7 +26,7 @@ let # add to ./overrides.nix. overrides = callPackage ./overrides.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices; - inherit buildVimPluginFrom2Nix; + inherit buildVimPlugin; inherit llvmPackages luaPackages; }; 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 aeef983fe0..f529df1317 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -1,9 +1,9 @@ # GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit! -{ lib, buildVimPluginFrom2Nix, buildNeovimPlugin, fetchFromGitHub, fetchgit }: +{ lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub, fetchgit }: final: prev: { - BetterLua-vim = buildVimPluginFrom2Nix { + BetterLua-vim = buildVimPlugin { pname = "BetterLua.vim"; version = "2020-08-14"; src = fetchFromGitHub { @@ -15,7 +15,7 @@ final: prev: meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/"; }; - BufOnly-vim = buildVimPluginFrom2Nix { + BufOnly-vim = buildVimPlugin { pname = "BufOnly.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -27,19 +27,19 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/BufOnly.vim/"; }; - ChatGPT-nvim = buildVimPluginFrom2Nix { + ChatGPT-nvim = buildVimPlugin { pname = "ChatGPT.nvim"; - version = "2023-08-16"; + version = "2023-09-14"; src = fetchFromGitHub { owner = "jackMort"; repo = "ChatGPT.nvim"; - rev = "fba5423b3ddf0b67ada2bbb4d5f66d9cf76c996a"; - sha256 = "14vd07w73b6s8wnpzh8lpf75j752z2pmmslq5mjxzx23cdcp8fik"; + rev = "62443c9eb261e641d20af143357b157e3f542bb5"; + sha256 = "16mk5h1qgcr46w73dfq7lkh0428s0w4wbawplv94395wj92rmhnw"; }; meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/"; }; - CheckAttach = buildVimPluginFrom2Nix { + CheckAttach = buildVimPlugin { pname = "CheckAttach"; version = "2019-05-08"; src = fetchFromGitHub { @@ -51,7 +51,7 @@ final: prev: meta.homepage = "https://github.com/chrisbra/CheckAttach/"; }; - Colour-Sampler-Pack = buildVimPluginFrom2Nix { + Colour-Sampler-Pack = buildVimPlugin { pname = "Colour-Sampler-Pack"; version = "2012-11-30"; src = fetchFromGitHub { @@ -63,19 +63,19 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/Colour-Sampler-Pack/"; }; - Coqtail = buildVimPluginFrom2Nix { + Coqtail = buildVimPlugin { pname = "Coqtail"; - version = "2023-08-05"; + version = "2023-09-17"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "dfe3939c9caff69d9af76bfd74f1a40fb7dc5609"; - sha256 = "0av2m075n6z05ah9ndrgnp9s16yrz6n2lj0igd9fh3c5k41x5xks"; + rev = "6462fb4b41215fac4558608c4d944074075ceb17"; + sha256 = "06c8w36bvgnspn7frmldrvxl40108pbfrn0spzympyg03c693swr"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; - DoxygenToolkit-vim = buildVimPluginFrom2Nix { + DoxygenToolkit-vim = buildVimPlugin { pname = "DoxygenToolkit.vim"; version = "2010-11-06"; src = fetchFromGitHub { @@ -87,7 +87,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/DoxygenToolkit.vim/"; }; - FTerm-nvim = buildVimPluginFrom2Nix { + FTerm-nvim = buildVimPlugin { pname = "FTerm.nvim"; version = "2022-11-13"; src = fetchFromGitHub { @@ -99,7 +99,7 @@ final: prev: meta.homepage = "https://github.com/numToStr/FTerm.nvim/"; }; - FixCursorHold-nvim = buildVimPluginFrom2Nix { + FixCursorHold-nvim = buildVimPlugin { pname = "FixCursorHold.nvim"; version = "2023-02-13"; src = fetchFromGitHub { @@ -111,7 +111,7 @@ final: prev: meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/"; }; - Improved-AnsiEsc = buildVimPluginFrom2Nix { + Improved-AnsiEsc = buildVimPlugin { pname = "Improved-AnsiEsc"; version = "2015-08-26"; src = fetchFromGitHub { @@ -123,7 +123,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/Improved-AnsiEsc/"; }; - Ionide-vim = buildVimPluginFrom2Nix { + Ionide-vim = buildVimPlugin { pname = "Ionide-vim"; version = "2023-07-17"; src = fetchFromGitHub { @@ -135,7 +135,7 @@ final: prev: meta.homepage = "https://github.com/ionide/Ionide-vim/"; }; - Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { + Jenkinsfile-vim-syntax = buildVimPlugin { pname = "Jenkinsfile-vim-syntax"; version = "2021-01-26"; src = fetchFromGitHub { @@ -147,7 +147,7 @@ final: prev: meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/"; }; - LanguageClient-neovim = buildVimPluginFrom2Nix { + LanguageClient-neovim = buildVimPlugin { pname = "LanguageClient-neovim"; version = "2022-06-07"; src = fetchFromGitHub { @@ -159,7 +159,7 @@ final: prev: meta.homepage = "https://github.com/autozimu/LanguageClient-neovim/"; }; - LanguageTool-nvim = buildVimPluginFrom2Nix { + LanguageTool-nvim = buildVimPlugin { pname = "LanguageTool.nvim"; version = "2020-10-19"; src = fetchFromGitHub { @@ -171,31 +171,31 @@ final: prev: meta.homepage = "https://github.com/vigoux/LanguageTool.nvim/"; }; - LazyVim = buildVimPluginFrom2Nix { + LazyVim = buildVimPlugin { pname = "LazyVim"; - version = "2023-07-30"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "566049aa4a26a86219dd1ad1624f9a1bf18831b6"; - sha256 = "12y7fxwlcia92q12wj50k5bdlyhjm70hn3kkibn5a1xf4f9vkwkg"; + rev = "dd95de5dbe31ecb106305920cbd0e24e26c17afe"; + sha256 = "1vmh1b8mwpwvfyigxhc5pnda1ddyccqgjz3jmn2pm101bwgg6424"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; - LeaderF = buildVimPluginFrom2Nix { + LeaderF = buildVimPlugin { pname = "LeaderF"; - version = "2023-08-04"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "6a4e01d85337c781cf6fe37e19f87e41869adfad"; - sha256 = "02lpzjk5vdlxcbvgvmk8xap2hnq1wmqgb6j6mni58vxw061wqzi8"; + rev = "a77f45791edeaa82fa75c5959ca73a59d7549549"; + sha256 = "1pw6jk6qlgba87gcdr7iawmbyfa48qy5zf63ghrrddfh1850gxsj"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; - MatchTagAlways = buildVimPluginFrom2Nix { + MatchTagAlways = buildVimPlugin { pname = "MatchTagAlways"; version = "2017-05-20"; src = fetchFromGitHub { @@ -207,7 +207,7 @@ final: prev: meta.homepage = "https://github.com/Valloric/MatchTagAlways/"; }; - Navigator-nvim = buildVimPluginFrom2Nix { + Navigator-nvim = buildVimPlugin { pname = "Navigator.nvim"; version = "2023-02-02"; src = fetchFromGitHub { @@ -219,7 +219,7 @@ final: prev: meta.homepage = "https://github.com/numToStr/Navigator.nvim/"; }; - NeoSolarized = buildVimPluginFrom2Nix { + NeoSolarized = buildVimPlugin { pname = "NeoSolarized"; version = "2020-08-07"; src = fetchFromGitHub { @@ -231,7 +231,7 @@ final: prev: meta.homepage = "https://github.com/overcache/NeoSolarized/"; }; - NrrwRgn = buildVimPluginFrom2Nix { + NrrwRgn = buildVimPlugin { pname = "NrrwRgn"; version = "2022-02-13"; src = fetchFromGitHub { @@ -243,7 +243,7 @@ final: prev: meta.homepage = "https://github.com/chrisbra/NrrwRgn/"; }; - PreserveNoEOL = buildVimPluginFrom2Nix { + PreserveNoEOL = buildVimPlugin { pname = "PreserveNoEOL"; version = "2013-06-14"; src = fetchFromGitHub { @@ -255,7 +255,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/PreserveNoEOL/"; }; - QFEnter = buildVimPluginFrom2Nix { + QFEnter = buildVimPlugin { pname = "QFEnter"; version = "2022-10-15"; src = fetchFromGitHub { @@ -267,7 +267,7 @@ final: prev: meta.homepage = "https://github.com/yssl/QFEnter/"; }; - Recover-vim = buildVimPluginFrom2Nix { + Recover-vim = buildVimPlugin { pname = "Recover.vim"; version = "2022-09-07"; src = fetchFromGitHub { @@ -279,7 +279,7 @@ final: prev: meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; - Rename = buildVimPluginFrom2Nix { + Rename = buildVimPlugin { pname = "Rename"; version = "2011-08-31"; src = fetchFromGitHub { @@ -291,7 +291,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/Rename/"; }; - ReplaceWithRegister = buildVimPluginFrom2Nix { + ReplaceWithRegister = buildVimPlugin { pname = "ReplaceWithRegister"; version = "2014-10-31"; src = fetchFromGitHub { @@ -303,19 +303,19 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/ReplaceWithRegister/"; }; - SchemaStore-nvim = buildVimPluginFrom2Nix { + SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "2023-08-19"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "e71b32faec68f04a0f0a27fe8c15c96503039b1f"; - sha256 = "0pdr8ympcsdlhb0w4sq5w0gwgnl4k5g190q8cjx1pcm6q20a38hj"; + rev = "daf2f4397e97c0f12b89068eec35078c61069ceb"; + sha256 = "1yzg8qld4w4xzdb0v3vls47kf753d8d8lfcsz6fl40sprwdfj8px"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; - Shade-nvim = buildVimPluginFrom2Nix { + Shade-nvim = buildVimPlugin { pname = "Shade.nvim"; version = "2022-02-01"; src = fetchFromGitHub { @@ -327,7 +327,7 @@ final: prev: meta.homepage = "https://github.com/sunjon/Shade.nvim/"; }; - ShowMultiBase = buildVimPluginFrom2Nix { + ShowMultiBase = buildVimPlugin { pname = "ShowMultiBase"; version = "2010-10-18"; src = fetchFromGitHub { @@ -339,7 +339,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/ShowMultiBase/"; }; - SimpylFold = buildVimPluginFrom2Nix { + SimpylFold = buildVimPlugin { pname = "SimpylFold"; version = "2022-05-02"; src = fetchFromGitHub { @@ -351,7 +351,7 @@ final: prev: meta.homepage = "https://github.com/tmhedberg/SimpylFold/"; }; - SmartCase = buildVimPluginFrom2Nix { + SmartCase = buildVimPlugin { pname = "SmartCase"; version = "2010-10-18"; src = fetchFromGitHub { @@ -363,31 +363,31 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/SmartCase/"; }; - SpaceCamp = buildVimPluginFrom2Nix { + SpaceCamp = buildVimPlugin { pname = "SpaceCamp"; - version = "2023-06-22"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "3e37187e1e5731d7d36980db3f92e7332406813a"; - sha256 = "0akdf7zv9pywdnqf4zp345irsbdfhy2rqvx759n13d403hwwya6z"; + rev = "8945b4a2bfaaa16fbcee9f1d7c00cb9c1256b591"; + sha256 = "1c57cpdkhq15yzzfpk4pi2d5bjmb9j2gx1np3v23wgmfzhmkj6d1"; }; meta.homepage = "https://github.com/jaredgorski/SpaceCamp/"; }; - SpaceVim = buildVimPluginFrom2Nix { + SpaceVim = buildVimPlugin { pname = "SpaceVim"; - version = "2023-08-09"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "100aa31e52b13e69d61caeb1796581e4bbb3b9ca"; - sha256 = "1ygswc0l9q8m3h3b42ik5zkhf820xpzs1iiivf2x7wpqc8589j2v"; + rev = "f7151f55a9e9b96e332d7cc1e0febdcae6198356"; + sha256 = "155d7b0vgqcsdayry8gz7sz2l3wlabh1pp6jksanjbfcq3gydvxn"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; - SudoEdit-vim = buildVimPluginFrom2Nix { + SudoEdit-vim = buildVimPlugin { pname = "SudoEdit.vim"; version = "2023-04-25"; src = fetchFromGitHub { @@ -399,7 +399,7 @@ final: prev: meta.homepage = "https://github.com/chrisbra/SudoEdit.vim/"; }; - VimOrganizer = buildVimPluginFrom2Nix { + VimOrganizer = buildVimPlugin { pname = "VimOrganizer"; version = "2020-12-15"; src = fetchFromGitHub { @@ -411,7 +411,7 @@ final: prev: meta.homepage = "https://github.com/hsitz/VimOrganizer/"; }; - Vundle-vim = buildVimPluginFrom2Nix { + Vundle-vim = buildVimPlugin { pname = "Vundle.vim"; version = "2023-08-19"; src = fetchFromGitHub { @@ -423,7 +423,7 @@ final: prev: meta.homepage = "https://github.com/VundleVim/Vundle.vim/"; }; - YUNOcommit-vim = buildVimPluginFrom2Nix { + YUNOcommit-vim = buildVimPlugin { pname = "YUNOcommit.vim"; version = "2014-11-26"; src = fetchFromGitHub { @@ -435,7 +435,7 @@ final: prev: meta.homepage = "https://github.com/esneider/YUNOcommit.vim/"; }; - YankRing-vim = buildVimPluginFrom2Nix { + YankRing-vim = buildVimPlugin { pname = "YankRing.vim"; version = "2015-07-29"; src = fetchFromGitHub { @@ -447,20 +447,20 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/YankRing.vim/"; }; - YouCompleteMe = buildVimPluginFrom2Nix { + YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "2023-08-19"; + version = "2023-09-27"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "4f1dcf4f971517b5a41d420b3671259f917e3827"; - sha256 = "032bxbp4xpq13gcc4gm6svs57mj7i7z9mk3gybyhqmd9dxx5dy43"; + rev = "3367b9b4a921b673ffe88454ac838f272375e0b2"; + sha256 = "1mqzvnrjf8r9s1g5ah7mfxxl5hcj2jp0phak45h0vvb7g185951w"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; }; - a-vim = buildVimPluginFrom2Nix { + a-vim = buildVimPlugin { pname = "a.vim"; version = "2010-11-06"; src = fetchFromGitHub { @@ -472,7 +472,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/a.vim/"; }; - ack-vim = buildVimPluginFrom2Nix { + ack-vim = buildVimPlugin { pname = "ack.vim"; version = "2018-02-27"; src = fetchFromGitHub { @@ -484,7 +484,7 @@ final: prev: meta.homepage = "https://github.com/mileszs/ack.vim/"; }; - acp = buildVimPluginFrom2Nix { + acp = buildVimPlugin { pname = "acp"; version = "2013-02-05"; src = fetchFromGitHub { @@ -496,20 +496,44 @@ final: prev: meta.homepage = "https://github.com/eikenb/acp/"; }; - aerial-nvim = buildVimPluginFrom2Nix { + actions-preview-nvim = buildVimPlugin { + pname = "actions-preview.nvim"; + version = "2023-08-23"; + src = fetchFromGitHub { + owner = "aznhe21"; + repo = "actions-preview.nvim"; + rev = "5650c76abfb84d6498330dd045657ba630ecdbba"; + sha256 = "09i6fp5kjz2dxhhfznzlrq8gvn204byk4mw23cmxlkc6hnnz4z74"; + }; + meta.homepage = "https://github.com/aznhe21/actions-preview.nvim/"; + }; + + adwaita-nvim = buildVimPlugin { + pname = "adwaita.nvim"; + version = "2023-06-22"; + src = fetchFromGitHub { + owner = "Mofiqul"; + repo = "adwaita.nvim"; + rev = "bb421a3439a515862ecb57970f10722cdcc4d089"; + sha256 = "1fw7kbgzqif40vks3h3n5jgachnimcbv7gpv85z7mw07hc0g7h33"; + }; + meta.homepage = "https://github.com/Mofiqul/adwaita.nvim/"; + }; + + aerial-nvim = buildVimPlugin { pname = "aerial.nvim"; - version = "2023-08-13"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "ffb5fd0aa7fcd5c3f68df38f89af3aa007f76604"; - sha256 = "08r2y6rnv6ackwm1m5q4300q68fy1pb39synsiq0crzv5mg59fjc"; + rev = "551a2b679f265917990207e6d8de28018d55f437"; + sha256 = "07jaqdqdd46q2y4n5vbfkg6v7wxyhiy035fi1wrjyvb1rfil766b"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; - ag-nvim = buildVimPluginFrom2Nix { + ag-nvim = buildVimPlugin { pname = "ag.nvim"; version = "2021-07-15"; src = fetchFromGitHub { @@ -521,7 +545,7 @@ final: prev: meta.homepage = "https://github.com/Numkil/ag.nvim/"; }; - agda-vim = buildVimPluginFrom2Nix { + agda-vim = buildVimPlugin { pname = "agda-vim"; version = "2021-10-28"; src = fetchFromGitHub { @@ -533,7 +557,7 @@ final: prev: meta.homepage = "https://github.com/derekelkins/agda-vim/"; }; - ai-vim = buildVimPluginFrom2Nix { + ai-vim = buildVimPlugin { pname = "ai.vim"; version = "2023-04-05"; src = fetchFromGitHub { @@ -545,31 +569,31 @@ final: prev: meta.homepage = "https://github.com/aduros/ai.vim/"; }; - alchemist-vim = buildVimPluginFrom2Nix { + alchemist-vim = buildVimPlugin { pname = "alchemist.vim"; - version = "2020-04-27"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "slashmili"; repo = "alchemist.vim"; - rev = "3d370d163a48bdeccea4be541686cce67a52b996"; - sha256 = "0svciz70yccaaifq1ivb7f0cwfjssmrkm7fbpjlylslx6wjjfc1i"; + rev = "23092f2ffeec33f10eedff3665a500d1ec63f3d0"; + sha256 = "074gb9xf9mxrpzlz56krb0my5zxlk20bjv700bjhgjw4jrcraxxn"; }; meta.homepage = "https://github.com/slashmili/alchemist.vim/"; }; - ale = buildVimPluginFrom2Nix { + ale = buildVimPlugin { pname = "ale"; - version = "2023-08-15"; + version = "2023-09-17"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "fe38101db7253e450f67893583d1a5dfeefd9ee5"; - sha256 = "05njcamri4ql4xf48ms563g74x1aq4c9g1fvkmdpv8z99aybqwqw"; + rev = "53b01d6a546384a28f1ccbed41baae58d7341da4"; + sha256 = "1jqsxgys7285m99y553ydvf0cwdkm98s0mi6mnmghzv3q7d9ngik"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; - align = buildVimPluginFrom2Nix { + align = buildVimPlugin { pname = "align"; version = "2012-08-08"; src = fetchFromGitHub { @@ -581,19 +605,19 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/align/"; }; - alpha-nvim = buildVimPluginFrom2Nix { + alpha-nvim = buildVimPlugin { pname = "alpha-nvim"; - version = "2023-08-16"; + version = "2023-09-14"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "7a6b9487dba044a43fde534bf5036f0fda5b6b23"; - sha256 = "11yp7zncby1wmic5hji1vb6b62l2xvi30cycbds05y11xycgdcm0"; + rev = "234822140b265ec4ba3203e3e0be0e0bb826dff5"; + sha256 = "15iq6wkcij0sxngs3y221nffk3rk215frifklxzc2db5s9na4w5d"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; - aniseed = buildVimPluginFrom2Nix { + aniseed = buildVimPlugin { pname = "aniseed"; version = "2023-07-06"; src = fetchFromGitHub { @@ -605,7 +629,7 @@ final: prev: meta.homepage = "https://github.com/Olical/aniseed/"; }; - ansible-vim = buildVimPluginFrom2Nix { + ansible-vim = buildVimPlugin { pname = "ansible-vim"; version = "2022-02-11"; src = fetchFromGitHub { @@ -617,7 +641,7 @@ final: prev: meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; - antonys-macro-repeater = buildVimPluginFrom2Nix { + antonys-macro-repeater = buildVimPlugin { pname = "antonys-macro-repeater"; version = "2017-09-10"; src = fetchFromGitHub { @@ -629,7 +653,7 @@ final: prev: meta.homepage = "https://github.com/ckarnell/antonys-macro-repeater/"; }; - arcanist-vim = buildVimPluginFrom2Nix { + arcanist-vim = buildVimPlugin { pname = "arcanist.vim"; version = "2016-05-27"; src = fetchFromGitHub { @@ -641,7 +665,7 @@ final: prev: meta.homepage = "https://github.com/solarnz/arcanist.vim/"; }; - argtextobj-vim = buildVimPluginFrom2Nix { + argtextobj-vim = buildVimPlugin { pname = "argtextobj.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -653,7 +677,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; - async-vim = buildVimPluginFrom2Nix { + async-vim = buildVimPlugin { pname = "async.vim"; version = "2022-04-04"; src = fetchFromGitHub { @@ -665,7 +689,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/async.vim/"; }; - asyncomplete-buffer-vim = buildVimPluginFrom2Nix { + asyncomplete-buffer-vim = buildVimPlugin { pname = "asyncomplete-buffer.vim"; version = "2020-06-26"; src = fetchFromGitHub { @@ -677,7 +701,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-buffer.vim/"; }; - asyncomplete-file-vim = buildVimPluginFrom2Nix { + asyncomplete-file-vim = buildVimPlugin { pname = "asyncomplete-file.vim"; version = "2022-07-11"; src = fetchFromGitHub { @@ -689,7 +713,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-file.vim/"; }; - asyncomplete-lsp-vim = buildVimPluginFrom2Nix { + asyncomplete-lsp-vim = buildVimPlugin { pname = "asyncomplete-lsp.vim"; version = "2022-11-21"; src = fetchFromGitHub { @@ -701,7 +725,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-lsp.vim/"; }; - asyncomplete-omni-vim = buildVimPluginFrom2Nix { + asyncomplete-omni-vim = buildVimPlugin { pname = "asyncomplete-omni.vim"; version = "2018-04-04"; src = fetchFromGitHub { @@ -713,7 +737,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-omni.vim/"; }; - asyncomplete-tags-vim = buildVimPluginFrom2Nix { + asyncomplete-tags-vim = buildVimPlugin { pname = "asyncomplete-tags.vim"; version = "2021-04-29"; src = fetchFromGitHub { @@ -725,7 +749,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-tags.vim/"; }; - asyncomplete-ultisnips-vim = buildVimPluginFrom2Nix { + asyncomplete-ultisnips-vim = buildVimPlugin { pname = "asyncomplete-ultisnips.vim"; version = "2023-01-13"; src = fetchFromGitHub { @@ -737,7 +761,7 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete-ultisnips.vim/"; }; - asyncomplete-vim = buildVimPluginFrom2Nix { + asyncomplete-vim = buildVimPlugin { pname = "asyncomplete.vim"; version = "2023-04-11"; src = fetchFromGitHub { @@ -749,31 +773,31 @@ final: prev: meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; - asyncrun-vim = buildVimPluginFrom2Nix { + asyncrun-vim = buildVimPlugin { pname = "asyncrun.vim"; - version = "2023-08-04"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asyncrun.vim"; - rev = "0f99f96b1a408c37ea6f78e5990554328bc22dd1"; - sha256 = "0g60ibvdkyw7ybx45b7x8rkbrzy0lsi245g6n5vqd1fcfk6m7n4d"; + rev = "61cc3081963a12048e00e89f8cedc8bd1cb83b8c"; + sha256 = "1l86kk0ha6yw3i285xaizzrgxvnxf95q0ys44glz8mns1z2jq4zk"; }; meta.homepage = "https://github.com/skywind3000/asyncrun.vim/"; }; - asynctasks-vim = buildVimPluginFrom2Nix { + asynctasks-vim = buildVimPlugin { pname = "asynctasks.vim"; - version = "2023-08-17"; + version = "2023-09-21"; src = fetchFromGitHub { owner = "skywind3000"; repo = "asynctasks.vim"; - rev = "f47d55b4ce43bd80ad6e64cfc47e7dfa2cd2ad3e"; - sha256 = "0lkhzf03i3g20470afgqblj4vcwb8pwppr36lyaipfn9kaaqx4gy"; + rev = "7b77b195a4297d3e4c9dde01c20aa6be17e3fcf3"; + sha256 = "0bvchmk1pdfjmyidf393chmc17y0v6zq92p3ac7dpwyiz01c360l"; }; meta.homepage = "https://github.com/skywind3000/asynctasks.vim/"; }; - ats-vim = buildVimPluginFrom2Nix { + ats-vim = buildVimPlugin { pname = "ats-vim"; version = "2020-09-04"; src = fetchFromGitHub { @@ -785,19 +809,19 @@ final: prev: meta.homepage = "https://github.com/vmchale/ats-vim/"; }; - aurora = buildVimPluginFrom2Nix { + aurora = buildVimPlugin { pname = "aurora"; - version = "2023-03-23"; + version = "2023-09-09"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "7a3ea3e6747ddd1acbe898e0b4193213aba36b86"; - sha256 = "00piglfjix84bldyvqgcxrb1nvcgaajc5015g2svkbr0rn1zcyql"; + rev = "2ff7e8d4f7fcf8bfb4e05280049c390d71371869"; + sha256 = "0g7k0r1lfkw3km6drcv6zy29yjhc0szqlhjxrp5zdps186fx50hj"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; - auto-git-diff = buildVimPluginFrom2Nix { + auto-git-diff = buildVimPlugin { pname = "auto-git-diff"; version = "2022-10-29"; src = fetchFromGitHub { @@ -809,7 +833,7 @@ final: prev: meta.homepage = "https://github.com/hotwatermorning/auto-git-diff/"; }; - auto-hlsearch-nvim = buildVimPluginFrom2Nix { + auto-hlsearch-nvim = buildVimPlugin { pname = "auto-hlsearch.nvim"; version = "2023-03-04"; src = fetchFromGitHub { @@ -821,7 +845,7 @@ final: prev: meta.homepage = "https://github.com/asiryk/auto-hlsearch.nvim/"; }; - auto-pairs = buildVimPluginFrom2Nix { + auto-pairs = buildVimPlugin { pname = "auto-pairs"; version = "2019-02-27"; src = fetchFromGitHub { @@ -833,7 +857,7 @@ final: prev: meta.homepage = "https://github.com/jiangmiao/auto-pairs/"; }; - auto-save-nvim = buildVimPluginFrom2Nix { + auto-save-nvim = buildVimPlugin { pname = "auto-save.nvim"; version = "2022-11-01"; src = fetchFromGitHub { @@ -845,31 +869,31 @@ final: prev: meta.homepage = "https://github.com/pocco81/auto-save.nvim/"; }; - auto-session = buildVimPluginFrom2Nix { + auto-session = buildVimPlugin { pname = "auto-session"; - version = "2023-08-14"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "f6d111f3c7ff2fb89c8a39b6280c8f90234196d9"; - sha256 = "1f8kksvsv9pc1k9wrh7mj7bmh8r4n34rah9hj7hksn6y21lzx6cs"; + rev = "3eb26b949e1b90798e84926848551046e2eb0721"; + sha256 = "06lyapgg0fdz6p6bas9cjrsi6qx2b8rjn8ivc3yxhp2940bqqrlf"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; - autoclose-nvim = buildVimPluginFrom2Nix { + autoclose-nvim = buildVimPlugin { pname = "autoclose.nvim"; - version = "2023-08-07"; + version = "2023-09-16"; src = fetchFromGitHub { owner = "m4xshen"; repo = "autoclose.nvim"; - rev = "d8bebaaf8c48bd0cd0645d20592548eab279fea3"; - sha256 = "0j4265rghdsswzcghs8khh0bizgnyfz88n295gxqbgflxqblh68w"; + rev = "37e11589aac55b0e8810dc5865f898f9cb36fef6"; + sha256 = "15l5c9r8wa2i7amdl3b88gj9qhw81wxicm4zglvzcl1yb9ga0pwd"; }; meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; }; - autoload_cscope-vim = buildVimPluginFrom2Nix { + autoload_cscope-vim = buildVimPlugin { pname = "autoload_cscope.vim"; version = "2011-01-28"; src = fetchFromGitHub { @@ -881,7 +905,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/autoload_cscope.vim/"; }; - autosave-nvim = buildVimPluginFrom2Nix { + autosave-nvim = buildVimPlugin { pname = "autosave.nvim"; version = "2022-10-13"; src = fetchFromGitHub { @@ -893,7 +917,7 @@ final: prev: meta.homepage = "https://github.com/nullishamy/autosave.nvim/"; }; - awesome-vim-colorschemes = buildVimPluginFrom2Nix { + awesome-vim-colorschemes = buildVimPlugin { pname = "awesome-vim-colorschemes"; version = "2023-05-06"; src = fetchFromGitHub { @@ -905,7 +929,7 @@ final: prev: meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; - ayu-vim = buildVimPluginFrom2Nix { + ayu-vim = buildVimPlugin { pname = "ayu-vim"; version = "2020-05-29"; src = fetchFromGitHub { @@ -917,7 +941,7 @@ final: prev: meta.homepage = "https://github.com/ayu-theme/ayu-vim/"; }; - b64-nvim = buildVimPluginFrom2Nix { + b64-nvim = buildVimPlugin { pname = "b64.nvim"; version = "2023-04-12"; src = fetchFromGitHub { @@ -929,31 +953,31 @@ final: prev: meta.homepage = "https://github.com/taybart/b64.nvim/"; }; - barbar-nvim = buildVimPluginFrom2Nix { + barbar-nvim = buildVimPlugin { pname = "barbar.nvim"; - version = "2023-07-05"; + version = "2023-09-14"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "8cca17ea0ced3ba564e5da972a25600edafe7d7b"; - sha256 = "1fr0207nxmcdpc7whlmmryy4qs7nl5mp1p6h1qi0jv51r705xrpw"; + rev = "283bceab39f549c5e5228212661750704fcfcd9e"; + sha256 = "0l6gbszklfab0kgs90x2lld6mqvkyx4i439249qikx1dilyalx91"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; - barbecue-nvim = buildVimPluginFrom2Nix { + barbecue-nvim = buildVimPlugin { pname = "barbecue.nvim"; - version = "2023-04-28"; + version = "2023-09-13"; src = fetchFromGitHub { owner = "utilyre"; repo = "barbecue.nvim"; - rev = "cd7e7da622d68136e13721865b4d919efd6325ed"; - sha256 = "0splz9dnzl3cy2klgjw9miv9q87dk56zw3m9y934q0sagl1hv3ll"; + rev = "d38a2a023dfb1073dd0e8fee0c9be08855d3688f"; + sha256 = "0z1m3myl14g91nnamqa72yxq6pspaffn0zpfi78vy6y0ygzam51x"; }; meta.homepage = "https://github.com/utilyre/barbecue.nvim/"; }; - base16-vim = buildVimPluginFrom2Nix { + base16-vim = buildVimPlugin { pname = "base16-vim"; version = "2022-09-20"; src = fetchFromGitHub { @@ -965,19 +989,19 @@ final: prev: meta.homepage = "https://github.com/chriskempson/base16-vim/"; }; - base46 = buildVimPluginFrom2Nix { + base46 = buildVimPlugin { pname = "base46"; - version = "2023-08-16"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "673b13166dceb59f02123ade4765df877ada920c"; - sha256 = "0prhlx9qjyr6xy5j267wkxkm2ibdz2s08yzfkg7khjg6v9vqzvv4"; + rev = "104510cb339071f4350acdc30d1630ce15dca8b1"; + sha256 = "0bwgdvfvwikvlbb97n0iddpk3bw6nwl02596nb567s4xkijx91nk"; }; meta.homepage = "https://github.com/nvchad/base46/"; }; - bat-vim = buildVimPluginFrom2Nix { + bat-vim = buildVimPlugin { pname = "bat.vim"; version = "2022-11-14"; src = fetchFromGitHub { @@ -989,7 +1013,7 @@ final: prev: meta.homepage = "https://github.com/jamespwilliams/bat.vim/"; }; - bats-vim = buildVimPluginFrom2Nix { + bats-vim = buildVimPlugin { pname = "bats.vim"; version = "2013-07-03"; src = fetchFromGitHub { @@ -1001,7 +1025,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/bats.vim/"; }; - bclose-vim = buildVimPluginFrom2Nix { + bclose-vim = buildVimPlugin { pname = "bclose.vim"; version = "2018-10-10"; src = fetchFromGitHub { @@ -1013,7 +1037,7 @@ final: prev: meta.homepage = "https://github.com/rbgrouleff/bclose.vim/"; }; - better-escape-nvim = buildVimPluginFrom2Nix { + better-escape-nvim = buildVimPlugin { pname = "better-escape.nvim"; version = "2023-05-02"; src = fetchFromGitHub { @@ -1025,7 +1049,7 @@ final: prev: meta.homepage = "https://github.com/max397574/better-escape.nvim/"; }; - bigfile-nvim = buildVimPluginFrom2Nix { + bigfile-nvim = buildVimPlugin { pname = "bigfile.nvim"; version = "2023-06-28"; src = fetchFromGitHub { @@ -1037,19 +1061,19 @@ final: prev: meta.homepage = "https://github.com/LunarVim/bigfile.nvim/"; }; - blamer-nvim = buildVimPluginFrom2Nix { + blamer-nvim = buildVimPlugin { pname = "blamer.nvim"; - version = "2021-11-17"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "APZelos"; repo = "blamer.nvim"; - rev = "f4eb22a9013642c411725fdda945ae45f8d93181"; - sha256 = "1czjagkfjw57f2nvjjgbma1gcy1ylcd68dyfc5ivr2wc6fdw5lks"; + rev = "e0d43c11697300eb68f00d69df8b87deb0bf52dc"; + sha256 = "1r88z0320lsv1q0bhnf8hgzi2qp1a6s1fb198zypc5m0kf410n3v"; }; meta.homepage = "https://github.com/APZelos/blamer.nvim/"; }; - block-nvim = buildVimPluginFrom2Nix { + block-nvim = buildVimPlugin { pname = "block.nvim"; version = "2023-06-22"; src = fetchFromGitHub { @@ -1061,7 +1085,7 @@ final: prev: meta.homepage = "https://github.com/HampusHauffman/block.nvim/"; }; - blueballs-neovim = buildVimPluginFrom2Nix { + blueballs-neovim = buildVimPlugin { pname = "blueballs-neovim"; version = "2021-11-28"; src = fetchFromGitHub { @@ -1073,7 +1097,7 @@ final: prev: meta.homepage = "https://github.com/blueballs-theme/blueballs-neovim/"; }; - boole-nvim = buildVimPluginFrom2Nix { + boole-nvim = buildVimPlugin { pname = "boole.nvim"; version = "2023-07-08"; src = fetchFromGitHub { @@ -1085,7 +1109,7 @@ final: prev: meta.homepage = "https://github.com/nat-418/boole.nvim/"; }; - bracey-vim = buildVimPluginFrom2Nix { + bracey-vim = buildVimPlugin { pname = "bracey.vim"; version = "2021-08-20"; src = fetchFromGitHub { @@ -1097,7 +1121,7 @@ final: prev: meta.homepage = "https://github.com/turbio/bracey.vim/"; }; - brainfuck-vim = buildVimPluginFrom2Nix { + brainfuck-vim = buildVimPlugin { pname = "brainfuck-vim"; version = "2021-01-28"; src = fetchFromGitHub { @@ -1109,7 +1133,7 @@ final: prev: meta.homepage = "https://github.com/fruit-in/brainfuck-vim/"; }; - bufdelete-nvim = buildVimPluginFrom2Nix { + bufdelete-nvim = buildVimPlugin { pname = "bufdelete.nvim"; version = "2023-06-29"; src = fetchFromGitHub { @@ -1121,7 +1145,7 @@ final: prev: meta.homepage = "https://github.com/famiu/bufdelete.nvim/"; }; - bufexplorer = buildVimPluginFrom2Nix { + bufexplorer = buildVimPlugin { pname = "bufexplorer"; version = "2023-05-02"; src = fetchFromGitHub { @@ -1133,7 +1157,7 @@ final: prev: meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; - bufferize-vim = buildVimPluginFrom2Nix { + bufferize-vim = buildVimPlugin { pname = "bufferize.vim"; version = "2023-02-25"; src = fetchFromGitHub { @@ -1145,19 +1169,19 @@ final: prev: meta.homepage = "https://github.com/AndrewRadev/bufferize.vim/"; }; - bufferline-nvim = buildVimPluginFrom2Nix { + bufferline-nvim = buildVimPlugin { pname = "bufferline.nvim"; - version = "2023-08-11"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "417b303328118b6d836ae330142e88771c48a8a3"; - sha256 = "0cylncv3z34z76178whji62nsvrs55n8xrmz8bymdc0nlvkx7j4f"; + rev = "6ecd37e0fa8b156099daedd2191130e083fb1490"; + sha256 = "1b70xycm9ggqdqbqhkl2ch6k3r3qsww9zvnl2cs9198lr1f2j0ri"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; - bufjump-nvim = buildVimPluginFrom2Nix { + bufjump-nvim = buildVimPlugin { pname = "bufjump.nvim"; version = "2021-12-05"; src = fetchFromGitHub { @@ -1169,7 +1193,7 @@ final: prev: meta.homepage = "https://github.com/kwkarlwang/bufjump.nvim/"; }; - bullets-vim = buildVimPluginFrom2Nix { + bullets-vim = buildVimPlugin { pname = "bullets.vim"; version = "2022-10-10"; src = fetchFromGitHub { @@ -1181,7 +1205,7 @@ final: prev: meta.homepage = "https://github.com/dkarter/bullets.vim/"; }; - calendar-vim = buildVimPluginFrom2Nix { + calendar-vim = buildVimPlugin { pname = "calendar.vim"; version = "2023-03-02"; src = fetchFromGitHub { @@ -1193,7 +1217,7 @@ final: prev: meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; - camelcasemotion = buildVimPluginFrom2Nix { + camelcasemotion = buildVimPlugin { pname = "camelcasemotion"; version = "2019-12-02"; src = fetchFromGitHub { @@ -1205,7 +1229,7 @@ final: prev: meta.homepage = "https://github.com/bkad/camelcasemotion/"; }; - caw-vim = buildVimPluginFrom2Nix { + caw-vim = buildVimPlugin { pname = "caw.vim"; version = "2023-03-16"; src = fetchFromGitHub { @@ -1217,31 +1241,31 @@ final: prev: meta.homepage = "https://github.com/tyru/caw.vim/"; }; - ccc-nvim = buildVimPluginFrom2Nix { + ccc-nvim = buildVimPlugin { pname = "ccc.nvim"; - version = "2023-06-12"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "ccc.nvim"; - rev = "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6"; - sha256 = "1qm3dp7w2rqnyvgsrn0j7s14nw2a1z7dfhyawkvzslsv6z4z4njg"; + rev = "b7ae63e2f4fdf7540ce3f42dd1ec5a27b9930560"; + sha256 = "01l2rlrmcl72fb0i39wzny9216x8p11mi24g1pgd4ayipx057i68"; }; meta.homepage = "https://github.com/uga-rosa/ccc.nvim/"; }; - chadtree = buildVimPluginFrom2Nix { + chadtree = buildVimPlugin { pname = "chadtree"; - version = "2023-08-19"; + version = "2023-09-05"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "aada30b77949729de049a2ff5b5b3c189e3dae88"; - sha256 = "0c62hwb5z5ccga51sh33i6ldpra5h0fqdnam716xcpvkb0mn8kip"; + rev = "2bf3d1fc5b53da1ba681676c9cb3431f03f9f497"; + sha256 = "09623pff0h2zx5n2mg21jfdcl6c6f5jsdpv2gxg70mmrrhlrm9xx"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; - changeColorScheme-vim = buildVimPluginFrom2Nix { + changeColorScheme-vim = buildVimPlugin { pname = "changeColorScheme.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -1253,7 +1277,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/changeColorScheme.vim/"; }; - cheatsheet-nvim = buildVimPluginFrom2Nix { + cheatsheet-nvim = buildVimPlugin { pname = "cheatsheet.nvim"; version = "2021-12-23"; src = fetchFromGitHub { @@ -1265,7 +1289,7 @@ final: prev: meta.homepage = "https://github.com/sudormrfbin/cheatsheet.nvim/"; }; - ci_dark = buildVimPluginFrom2Nix { + ci_dark = buildVimPlugin { pname = "ci_dark"; version = "2022-03-27"; src = fetchFromGitHub { @@ -1277,7 +1301,7 @@ final: prev: meta.homepage = "https://github.com/yunlingz/ci_dark/"; }; - circles-nvim = buildVimPluginFrom2Nix { + circles-nvim = buildVimPlugin { pname = "circles.nvim"; version = "2023-04-08"; src = fetchFromGitHub { @@ -1289,7 +1313,7 @@ final: prev: meta.homepage = "https://github.com/projekt0n/circles.nvim/"; }; - clang_complete = buildVimPluginFrom2Nix { + clang_complete = buildVimPlugin { pname = "clang_complete"; version = "2022-11-30"; src = fetchFromGitHub { @@ -1301,19 +1325,19 @@ final: prev: meta.homepage = "https://github.com/xavierd/clang_complete/"; }; - clangd_extensions-nvim = buildVimPluginFrom2Nix { + clangd_extensions-nvim = buildVimPlugin { pname = "clangd_extensions.nvim"; - version = "2023-08-10"; + version = "2023-09-08"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "5c8a7d6311ae6b0ed1e1fc66569fe67278a418fc"; - sha256 = "0vxrkyymhmf29xdkfffxbp1z66in6cf2yajmrj0mssy6d1ag9cvj"; + rev = "bafed83f79b5779f5b43e8e015e13ca99dcd8b3a"; + sha256 = "0v703kl34a6cx863m1ah347bg3fk06mr0780cxnz547dpc8dddbm"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; - clever-f-vim = buildVimPluginFrom2Nix { + clever-f-vim = buildVimPlugin { pname = "clever-f.vim"; version = "2022-10-15"; src = fetchFromGitHub { @@ -1325,7 +1349,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/clever-f.vim/"; }; - clighter8 = buildVimPluginFrom2Nix { + clighter8 = buildVimPlugin { pname = "clighter8"; version = "2018-07-25"; src = fetchFromGitHub { @@ -1337,7 +1361,7 @@ final: prev: meta.homepage = "https://github.com/bbchung/clighter8/"; }; - clipboard-image-nvim = buildVimPluginFrom2Nix { + clipboard-image-nvim = buildVimPlugin { pname = "clipboard-image.nvim"; version = "2022-11-10"; src = fetchFromGitHub { @@ -1349,7 +1373,7 @@ final: prev: meta.homepage = "https://github.com/ekickx/clipboard-image.nvim/"; }; - close-buffers-vim = buildVimPluginFrom2Nix { + close-buffers-vim = buildVimPlugin { pname = "close-buffers.vim"; version = "2020-09-23"; src = fetchFromGitHub { @@ -1361,7 +1385,7 @@ final: prev: meta.homepage = "https://github.com/asheq/close-buffers.vim/"; }; - cmd-parser-nvim = buildVimPluginFrom2Nix { + cmd-parser-nvim = buildVimPlugin { pname = "cmd-parser.nvim"; version = "2022-02-23"; src = fetchFromGitHub { @@ -1373,7 +1397,7 @@ final: prev: meta.homepage = "https://github.com/winston0410/cmd-parser.nvim/"; }; - cmp-async-path = buildVimPluginFrom2Nix { + cmp-async-path = buildVimPlugin { pname = "cmp-async-path"; version = "2023-01-16"; src = fetchFromGitHub { @@ -1385,7 +1409,7 @@ final: prev: meta.homepage = "https://github.com/FelipeLema/cmp-async-path/"; }; - cmp-beancount = buildVimPluginFrom2Nix { + cmp-beancount = buildVimPlugin { pname = "cmp-beancount"; version = "2022-11-27"; src = fetchFromGitHub { @@ -1397,7 +1421,7 @@ final: prev: meta.homepage = "https://github.com/crispgm/cmp-beancount/"; }; - cmp-buffer = buildVimPluginFrom2Nix { + cmp-buffer = buildVimPlugin { pname = "cmp-buffer"; version = "2022-08-10"; src = fetchFromGitHub { @@ -1409,7 +1433,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-buffer/"; }; - cmp-calc = buildVimPluginFrom2Nix { + cmp-calc = buildVimPlugin { pname = "cmp-calc"; version = "2023-08-18"; src = fetchFromGitHub { @@ -1421,7 +1445,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; }; - cmp-clippy = buildVimPluginFrom2Nix { + cmp-clippy = buildVimPlugin { pname = "cmp-clippy"; version = "2023-02-08"; src = fetchFromGitHub { @@ -1433,7 +1457,7 @@ final: prev: meta.homepage = "https://github.com/vappolinario/cmp-clippy/"; }; - cmp-cmdline = buildVimPluginFrom2Nix { + cmp-cmdline = buildVimPlugin { pname = "cmp-cmdline"; version = "2023-06-08"; src = fetchFromGitHub { @@ -1445,7 +1469,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; - cmp-cmdline-history = buildVimPluginFrom2Nix { + cmp-cmdline-history = buildVimPlugin { pname = "cmp-cmdline-history"; version = "2022-05-04"; src = fetchFromGitHub { @@ -1457,7 +1481,7 @@ final: prev: meta.homepage = "https://github.com/dmitmel/cmp-cmdline-history/"; }; - cmp-conjure = buildVimPluginFrom2Nix { + cmp-conjure = buildVimPlugin { pname = "cmp-conjure"; version = "2023-06-22"; src = fetchFromGitHub { @@ -1469,7 +1493,7 @@ final: prev: meta.homepage = "https://github.com/PaterJason/cmp-conjure/"; }; - cmp-conventionalcommits = buildVimPluginFrom2Nix { + cmp-conventionalcommits = buildVimPlugin { pname = "cmp-conventionalcommits"; version = "2022-10-16"; src = fetchFromGitHub { @@ -1481,7 +1505,7 @@ final: prev: meta.homepage = "https://github.com/davidsierradz/cmp-conventionalcommits/"; }; - cmp-copilot = buildVimPluginFrom2Nix { + cmp-copilot = buildVimPlugin { pname = "cmp-copilot"; version = "2022-04-11"; src = fetchFromGitHub { @@ -1493,7 +1517,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-copilot/"; }; - cmp-dap = buildVimPluginFrom2Nix { + cmp-dap = buildVimPlugin { pname = "cmp-dap"; version = "2022-11-13"; src = fetchFromGitHub { @@ -1505,19 +1529,19 @@ final: prev: meta.homepage = "https://github.com/rcarriga/cmp-dap/"; }; - cmp-dictionary = buildVimPluginFrom2Nix { + cmp-dictionary = buildVimPlugin { pname = "cmp-dictionary"; - version = "2023-08-19"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "uga-rosa"; repo = "cmp-dictionary"; - rev = "f076c6b071e6117d2cbb26d53327ff21fc22fdb8"; - sha256 = "19rc7d2xlsxd7a7slrv4ajydgw7nv8q2qp1yc4bl74xg3cn1mks3"; + rev = "363ce91a198ea255d847a189c723c6d4e3bc4a91"; + sha256 = "033wa4sgg2hmn2wi7g7mwl0cpw4mlnr53x8b0diqlyv5v7wax302"; }; meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; - cmp-digraphs = buildVimPluginFrom2Nix { + cmp-digraphs = buildVimPlugin { pname = "cmp-digraphs"; version = "2021-12-13"; src = fetchFromGitHub { @@ -1529,7 +1553,7 @@ final: prev: meta.homepage = "https://github.com/dmitmel/cmp-digraphs/"; }; - cmp-emoji = buildVimPluginFrom2Nix { + cmp-emoji = buildVimPlugin { pname = "cmp-emoji"; version = "2021-09-28"; src = fetchFromGitHub { @@ -1541,7 +1565,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-emoji/"; }; - cmp-fish = buildVimPluginFrom2Nix { + cmp-fish = buildVimPlugin { pname = "cmp-fish"; version = "2022-09-01"; src = fetchFromGitHub { @@ -1553,7 +1577,7 @@ final: prev: meta.homepage = "https://github.com/mtoohey31/cmp-fish/"; }; - cmp-fuzzy-buffer = buildVimPluginFrom2Nix { + cmp-fuzzy-buffer = buildVimPlugin { pname = "cmp-fuzzy-buffer"; version = "2023-04-02"; src = fetchFromGitHub { @@ -1565,7 +1589,7 @@ final: prev: meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/"; }; - cmp-fuzzy-path = buildVimPluginFrom2Nix { + cmp-fuzzy-path = buildVimPlugin { pname = "cmp-fuzzy-path"; version = "2023-06-18"; src = fetchFromGitHub { @@ -1577,7 +1601,7 @@ final: prev: meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/"; }; - cmp-git = buildVimPluginFrom2Nix { + cmp-git = buildVimPlugin { pname = "cmp-git"; version = "2023-05-30"; src = fetchFromGitHub { @@ -1589,7 +1613,7 @@ final: prev: meta.homepage = "https://github.com/petertriho/cmp-git/"; }; - cmp-greek = buildVimPluginFrom2Nix { + cmp-greek = buildVimPlugin { pname = "cmp-greek"; version = "2022-01-10"; src = fetchFromGitHub { @@ -1601,7 +1625,7 @@ final: prev: meta.homepage = "https://github.com/max397574/cmp-greek/"; }; - cmp-latex-symbols = buildVimPluginFrom2Nix { + cmp-latex-symbols = buildVimPlugin { pname = "cmp-latex-symbols"; version = "2023-01-23"; src = fetchFromGitHub { @@ -1613,7 +1637,7 @@ final: prev: meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/"; }; - cmp-look = buildVimPluginFrom2Nix { + cmp-look = buildVimPlugin { pname = "cmp-look"; version = "2022-06-26"; src = fetchFromGitHub { @@ -1625,7 +1649,7 @@ final: prev: meta.homepage = "https://github.com/octaltree/cmp-look/"; }; - cmp-neosnippet = buildVimPluginFrom2Nix { + cmp-neosnippet = buildVimPlugin { pname = "cmp-neosnippet"; version = "2022-01-06"; src = fetchFromGitHub { @@ -1637,7 +1661,7 @@ final: prev: meta.homepage = "https://github.com/notomo/cmp-neosnippet/"; }; - cmp-npm = buildVimPluginFrom2Nix { + cmp-npm = buildVimPlugin { pname = "cmp-npm"; version = "2023-06-12"; src = fetchFromGitHub { @@ -1649,7 +1673,7 @@ final: prev: meta.homepage = "https://github.com/David-Kunz/cmp-npm/"; }; - cmp-nvim-lsp = buildVimPluginFrom2Nix { + cmp-nvim-lsp = buildVimPlugin { pname = "cmp-nvim-lsp"; version = "2023-06-23"; src = fetchFromGitHub { @@ -1661,7 +1685,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; - cmp-nvim-lsp-document-symbol = buildVimPluginFrom2Nix { + cmp-nvim-lsp-document-symbol = buildVimPlugin { pname = "cmp-nvim-lsp-document-symbol"; version = "2023-04-01"; src = fetchFromGitHub { @@ -1673,7 +1697,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/"; }; - cmp-nvim-lsp-signature-help = buildVimPluginFrom2Nix { + cmp-nvim-lsp-signature-help = buildVimPlugin { pname = "cmp-nvim-lsp-signature-help"; version = "2023-02-03"; src = fetchFromGitHub { @@ -1685,7 +1709,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/"; }; - cmp-nvim-lua = buildVimPluginFrom2Nix { + cmp-nvim-lua = buildVimPlugin { pname = "cmp-nvim-lua"; version = "2023-04-14"; src = fetchFromGitHub { @@ -1697,7 +1721,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; }; - cmp-nvim-tags = buildVimPluginFrom2Nix { + cmp-nvim-tags = buildVimPlugin { pname = "cmp-nvim-tags"; version = "2023-05-10"; src = fetchFromGitHub { @@ -1709,7 +1733,7 @@ final: prev: meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-tags/"; }; - cmp-nvim-ultisnips = buildVimPluginFrom2Nix { + cmp-nvim-ultisnips = buildVimPlugin { pname = "cmp-nvim-ultisnips"; version = "2023-07-05"; src = fetchFromGitHub { @@ -1721,19 +1745,19 @@ final: prev: meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips/"; }; - cmp-omni = buildVimPluginFrom2Nix { + cmp-omni = buildVimPlugin { pname = "cmp-omni"; - version = "2023-05-25"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-omni"; - rev = "9436e6cdd7c5dfa24a99a60d9280b24dbdea3649"; - sha256 = "0jypzs5y9pq55db5jkmvshlx4lzi82mxcfr53nsb0nd3xr38ywxd"; + rev = "4ef610bbd85a5ee4e97e09450c0daecbdc60de86"; + sha256 = "17963f45rly6p4jl47v7dsvqc02wj36mq7qx5mkmzqmrpwcrj81z"; }; meta.homepage = "https://github.com/hrsh7th/cmp-omni/"; }; - cmp-pandoc-references = buildVimPluginFrom2Nix { + cmp-pandoc-references = buildVimPlugin { pname = "cmp-pandoc-references"; version = "2022-04-20"; src = fetchFromGitHub { @@ -1745,7 +1769,7 @@ final: prev: meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/"; }; - cmp-pandoc-nvim = buildVimPluginFrom2Nix { + cmp-pandoc-nvim = buildVimPlugin { pname = "cmp-pandoc.nvim"; version = "2023-03-03"; src = fetchFromGitHub { @@ -1757,7 +1781,7 @@ final: prev: meta.homepage = "https://github.com/aspeddro/cmp-pandoc.nvim/"; }; - cmp-path = buildVimPluginFrom2Nix { + cmp-path = buildVimPlugin { pname = "cmp-path"; version = "2022-10-03"; src = fetchFromGitHub { @@ -1769,19 +1793,19 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; - cmp-rg = buildVimPluginFrom2Nix { + cmp-rg = buildVimPlugin { pname = "cmp-rg"; - version = "2022-09-05"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "cmp-rg"; - rev = "1cad8eb315643d0df13c37401c03d7986f891011"; - sha256 = "02ij7isp6hzcfkd5zw9inymmpgcmhiz0asjra45w8jkzqlxd322j"; + rev = "677a7874ee8f1afc648c2e7d63a97bc21a7663c5"; + sha256 = "0cahyz5i6iyjqb4cklrkimw5pjajfnlazpmky617ysl3m1b6pwk3"; }; meta.homepage = "https://github.com/lukas-reineke/cmp-rg/"; }; - cmp-snippy = buildVimPluginFrom2Nix { + cmp-snippy = buildVimPlugin { pname = "cmp-snippy"; version = "2023-06-15"; src = fetchFromGitHub { @@ -1793,19 +1817,19 @@ final: prev: meta.homepage = "https://github.com/dcampos/cmp-snippy/"; }; - cmp-spell = buildVimPluginFrom2Nix { + cmp-spell = buildVimPlugin { pname = "cmp-spell"; - version = "2022-10-10"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "f3fora"; repo = "cmp-spell"; - rev = "60584cb75e5e8bba5a0c9e4c3ab0791e0698bffa"; - sha256 = "1lzv8wbq1w45pbig7lcgyj46nmz4gkag7b37j72p04bixr7wgabv"; + rev = "32a0867efa59b43edbb2db67b0871cfad90c9b66"; + sha256 = "1yr2cq1b6di4k93pjlshkkf4phhd3lzmkm0s679j35crzgwhxnbd"; }; meta.homepage = "https://github.com/f3fora/cmp-spell/"; }; - cmp-tabnine = buildVimPluginFrom2Nix { + cmp-tabnine = buildVimPlugin { pname = "cmp-tabnine"; version = "2023-05-09"; src = fetchFromGitHub { @@ -1817,19 +1841,19 @@ final: prev: meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; - cmp-tmux = buildVimPluginFrom2Nix { + cmp-tmux = buildVimPlugin { pname = "cmp-tmux"; - version = "2022-10-05"; + version = "2023-09-02"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "cmp-tmux"; - rev = "984772716f66d8ee88535a6bf3f94c4b4e1301f5"; - sha256 = "1fy0rw9garhabbif6d7vvrv73c25lwv9fjh5b4y0m3kisvkbqfyr"; + rev = "97ec06b8030b8bf6d1fd83d49bdd16c98e04c845"; + sha256 = "0a9yryb1hwmkv3gmahx3barclllgbqhfp7q00i5zrc69ql0i63vf"; }; meta.homepage = "https://github.com/andersevenrud/cmp-tmux/"; }; - cmp-treesitter = buildVimPluginFrom2Nix { + cmp-treesitter = buildVimPlugin { pname = "cmp-treesitter"; version = "2023-04-06"; src = fetchFromGitHub { @@ -1841,7 +1865,7 @@ final: prev: meta.homepage = "https://github.com/ray-x/cmp-treesitter/"; }; - cmp-under-comparator = buildVimPluginFrom2Nix { + cmp-under-comparator = buildVimPlugin { pname = "cmp-under-comparator"; version = "2021-11-11"; src = fetchFromGitHub { @@ -1853,7 +1877,7 @@ final: prev: meta.homepage = "https://github.com/lukas-reineke/cmp-under-comparator/"; }; - cmp-vim-lsp = buildVimPluginFrom2Nix { + cmp-vim-lsp = buildVimPlugin { pname = "cmp-vim-lsp"; version = "2021-10-26"; src = fetchFromGitHub { @@ -1865,7 +1889,7 @@ final: prev: meta.homepage = "https://github.com/dmitmel/cmp-vim-lsp/"; }; - cmp-vimwiki-tags = buildVimPluginFrom2Nix { + cmp-vimwiki-tags = buildVimPlugin { pname = "cmp-vimwiki-tags"; version = "2022-04-25"; src = fetchFromGitHub { @@ -1877,7 +1901,7 @@ final: prev: meta.homepage = "https://github.com/pontusk/cmp-vimwiki-tags/"; }; - cmp-vsnip = buildVimPluginFrom2Nix { + cmp-vsnip = buildVimPlugin { pname = "cmp-vsnip"; version = "2022-11-22"; src = fetchFromGitHub { @@ -1889,7 +1913,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-vsnip/"; }; - cmp-zsh = buildVimPluginFrom2Nix { + cmp-zsh = buildVimPlugin { pname = "cmp-zsh"; version = "2022-10-03"; src = fetchFromGitHub { @@ -1901,7 +1925,7 @@ final: prev: meta.homepage = "https://github.com/tamago324/cmp-zsh/"; }; - cmp_luasnip = buildVimPluginFrom2Nix { + cmp_luasnip = buildVimPlugin { pname = "cmp_luasnip"; version = "2022-10-28"; src = fetchFromGitHub { @@ -1913,7 +1937,7 @@ final: prev: meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; - coc-clap = buildVimPluginFrom2Nix { + coc-clap = buildVimPlugin { pname = "coc-clap"; version = "2021-09-18"; src = fetchFromGitHub { @@ -1925,7 +1949,7 @@ final: prev: meta.homepage = "https://github.com/vn-ki/coc-clap/"; }; - coc-denite = buildVimPluginFrom2Nix { + coc-denite = buildVimPlugin { pname = "coc-denite"; version = "2021-02-24"; src = fetchFromGitHub { @@ -1937,7 +1961,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/coc-denite/"; }; - coc-fzf = buildVimPluginFrom2Nix { + coc-fzf = buildVimPlugin { pname = "coc-fzf"; version = "2023-01-30"; src = fetchFromGitHub { @@ -1949,7 +1973,7 @@ final: prev: meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; - coc-lua = buildVimPluginFrom2Nix { + coc-lua = buildVimPlugin { pname = "coc-lua"; version = "2023-02-22"; src = fetchFromGitHub { @@ -1961,7 +1985,7 @@ final: prev: meta.homepage = "https://github.com/josa42/coc-lua/"; }; - coc-neco = buildVimPluginFrom2Nix { + coc-neco = buildVimPlugin { pname = "coc-neco"; version = "2020-04-07"; src = fetchFromGitHub { @@ -1973,7 +1997,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/coc-neco/"; }; - coc-svelte = buildVimPluginFrom2Nix { + coc-svelte = buildVimPlugin { pname = "coc-svelte"; version = "2022-03-14"; src = fetchFromGitHub { @@ -1985,7 +2009,7 @@ final: prev: meta.homepage = "https://github.com/coc-extensions/coc-svelte/"; }; - coc-tailwindcss = buildVimPluginFrom2Nix { + coc-tailwindcss = buildVimPlugin { pname = "coc-tailwindcss"; version = "2020-08-19"; src = fetchFromGitHub { @@ -1997,19 +2021,19 @@ final: prev: meta.homepage = "https://github.com/iamcco/coc-tailwindcss/"; }; - coc-nvim = buildVimPluginFrom2Nix { + coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "2023-07-26"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "9332d2ab1154dedc9dbcd3e1c873886abaf061a6"; - sha256 = "1aq1bz2pl6wfhxawkdwkrcvc18dgs0x3p5fwivfmnhaqislkx4lf"; + rev = "7b9e1ef0a1399907c51d23b6080b94a5aba4a654"; + sha256 = "10gdqqz71gbna9wy3awbncbn7m0g6wfn1256bx7ga8b3bsl3nmch"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; - coconut-vim = buildVimPluginFrom2Nix { + coconut-vim = buildVimPlugin { pname = "coconut.vim"; version = "2017-10-10"; src = fetchFromGitHub { @@ -2021,31 +2045,31 @@ final: prev: meta.homepage = "https://github.com/manicmaniac/coconut.vim/"; }; - codeium-vim = buildVimPluginFrom2Nix { + codeium-vim = buildVimPlugin { pname = "codeium.vim"; - version = "2023-08-18"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "436a7aa6f15502b20d06c420ba6cd944cc65ea8a"; - sha256 = "0fdmqd6d7i4bp40q1xhxvjfzaj8llw94fkl7gc22pspl0vh9w1rd"; + rev = "bee5429aba9bc1df9cb15a2f10fea06ce87a47be"; + sha256 = "0lnrpxrggy9gds2968iwyyg3m0z07gi9x1fbc5z56girh44vs816"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; - codewindow-nvim = buildVimPluginFrom2Nix { + codewindow-nvim = buildVimPlugin { pname = "codewindow.nvim"; - version = "2023-07-23"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "gorbit99"; repo = "codewindow.nvim"; - rev = "11fb5520898d22a563fe6a124a61c0d2887f3d3f"; - sha256 = "1rnw5z3vwc183gvk3v3xciyzgqwfp0jsd5vckj5gpig1lg9l4yzf"; + rev = "8c8f5ff66e123491c946c04848d744fcdc7cac6c"; + sha256 = "18xlrphibm5f49l04wrjzaxb2xfdqmydrj2d4pi7z6vxny6rkvgy"; }; meta.homepage = "https://github.com/gorbit99/codewindow.nvim/"; }; - codi-vim = buildVimPluginFrom2Nix { + codi-vim = buildVimPlugin { pname = "codi.vim"; version = "2023-02-28"; src = fetchFromGitHub { @@ -2057,7 +2081,7 @@ final: prev: meta.homepage = "https://github.com/metakirby5/codi.vim/"; }; - colorbuddy-nvim = buildVimPluginFrom2Nix { + colorbuddy-nvim = buildVimPlugin { pname = "colorbuddy.nvim"; version = "2022-02-28"; src = fetchFromGitHub { @@ -2069,7 +2093,7 @@ final: prev: meta.homepage = "https://github.com/tjdevries/colorbuddy.nvim/"; }; - colorizer = buildVimPluginFrom2Nix { + colorizer = buildVimPlugin { pname = "colorizer"; version = "2022-01-03"; src = fetchFromGitHub { @@ -2081,19 +2105,19 @@ final: prev: meta.homepage = "https://github.com/lilydjwg/colorizer/"; }; - com-cloudedmountain-ide-neovim = buildVimPluginFrom2Nix { + com-cloudedmountain-ide-neovim = buildVimPlugin { pname = "com.cloudedmountain.ide.neovim"; - version = "2023-01-07"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "Domeee"; repo = "com.cloudedmountain.ide.neovim"; - rev = "d479b806f06cd6714e321cf88e94aae858e8274e"; - sha256 = "0nwp8drcy1bxd493gmi3bz41yw0avpvbfwx9dq03x9kxsjc81rsz"; + rev = "ade9b58e458049949dbd308a4d0554c3f20f5e4d"; + sha256 = "00sf0d5yd1xmfgzr6vf988qm10cdx2arxvvm4r4gy9pcqqfwgm18"; }; meta.homepage = "https://github.com/Domeee/com.cloudedmountain.ide.neovim/"; }; - command-t = buildVimPluginFrom2Nix { + command-t = buildVimPlugin { pname = "command-t"; version = "2023-08-07"; src = fetchFromGitHub { @@ -2105,7 +2129,7 @@ final: prev: meta.homepage = "https://github.com/wincent/command-t/"; }; - comment-nvim = buildVimPluginFrom2Nix { + comment-nvim = buildVimPlugin { pname = "comment.nvim"; version = "2023-08-07"; src = fetchFromGitHub { @@ -2117,7 +2141,7 @@ final: prev: meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; - committia-vim = buildVimPluginFrom2Nix { + committia-vim = buildVimPlugin { pname = "committia.vim"; version = "2021-11-24"; src = fetchFromGitHub { @@ -2129,7 +2153,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/committia.vim/"; }; - compe-conjure = buildVimPluginFrom2Nix { + compe-conjure = buildVimPlugin { pname = "compe-conjure"; version = "2020-12-06"; src = fetchFromGitHub { @@ -2141,7 +2165,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/compe-conjure/"; }; - compe-latex-symbols = buildVimPluginFrom2Nix { + compe-latex-symbols = buildVimPlugin { pname = "compe-latex-symbols"; version = "2021-05-14"; src = fetchFromGitHub { @@ -2153,7 +2177,7 @@ final: prev: meta.homepage = "https://github.com/GoldsteinE/compe-latex-symbols/"; }; - compe-tabnine = buildVimPluginFrom2Nix { + compe-tabnine = buildVimPlugin { pname = "compe-tabnine"; version = "2021-09-14"; src = fetchFromGitHub { @@ -2165,7 +2189,7 @@ final: prev: meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; - compe-zsh = buildVimPluginFrom2Nix { + compe-zsh = buildVimPlugin { pname = "compe-zsh"; version = "2021-04-03"; src = fetchFromGitHub { @@ -2177,7 +2201,7 @@ final: prev: meta.homepage = "https://github.com/tamago324/compe-zsh/"; }; - compiler-explorer-nvim = buildVimPluginFrom2Nix { + compiler-explorer-nvim = buildVimPlugin { pname = "compiler-explorer.nvim"; version = "2023-05-29"; src = fetchFromGitHub { @@ -2189,7 +2213,7 @@ final: prev: meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; - completion-buffers = buildVimPluginFrom2Nix { + completion-buffers = buildVimPlugin { pname = "completion-buffers"; version = "2021-01-17"; src = fetchFromGitHub { @@ -2201,7 +2225,7 @@ final: prev: meta.homepage = "https://github.com/steelsojka/completion-buffers/"; }; - completion-nvim = buildVimPluginFrom2Nix { + completion-nvim = buildVimPlugin { pname = "completion-nvim"; version = "2021-10-12"; src = fetchFromGitHub { @@ -2213,7 +2237,7 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; - completion-tabnine = buildVimPluginFrom2Nix { + completion-tabnine = buildVimPlugin { pname = "completion-tabnine"; version = "2021-09-27"; src = fetchFromGitHub { @@ -2225,7 +2249,7 @@ final: prev: meta.homepage = "https://github.com/aca/completion-tabnine/"; }; - completion-treesitter = buildVimPluginFrom2Nix { + completion-treesitter = buildVimPlugin { pname = "completion-treesitter"; version = "2020-06-26"; src = fetchFromGitHub { @@ -2237,7 +2261,7 @@ final: prev: meta.homepage = "https://github.com/nvim-treesitter/completion-treesitter/"; }; - concealedyank-vim = buildVimPluginFrom2Nix { + concealedyank-vim = buildVimPlugin { pname = "concealedyank.vim"; version = "2013-03-24"; src = fetchFromGitHub { @@ -2249,7 +2273,7 @@ final: prev: meta.homepage = "https://github.com/chikatoike/concealedyank.vim/"; }; - conflict-marker-vim = buildVimPluginFrom2Nix { + conflict-marker-vim = buildVimPlugin { pname = "conflict-marker.vim"; version = "2022-11-01"; src = fetchFromGitHub { @@ -2261,19 +2285,19 @@ final: prev: meta.homepage = "https://github.com/rhysd/conflict-marker.vim/"; }; - conjure = buildVimPluginFrom2Nix { + conjure = buildVimPlugin { pname = "conjure"; - version = "2023-08-04"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "0d9b823db06cc11e6115b54297f690dff10c0299"; - sha256 = "0s7pf2jq1rfyxwina555702ln52h4x9gjnfk2sjpdgk7515bk9s5"; + rev = "58c46d1f4999679659a5918284b574c266a7ac83"; + sha256 = "1pjjp2g9h98ghraky57iss5ls37k47iw8ii3q558nym4mknhx06d"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; - context-vim = buildVimPluginFrom2Nix { + context-vim = buildVimPlugin { pname = "context.vim"; version = "2023-06-13"; src = fetchFromGitHub { @@ -2285,7 +2309,7 @@ final: prev: meta.homepage = "https://github.com/wellle/context.vim/"; }; - context_filetype-vim = buildVimPluginFrom2Nix { + context_filetype-vim = buildVimPlugin { pname = "context_filetype.vim"; version = "2023-07-23"; src = fetchFromGitHub { @@ -2297,67 +2321,67 @@ final: prev: meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; - copilot-cmp = buildVimPluginFrom2Nix { + copilot-cmp = buildVimPlugin { pname = "copilot-cmp"; - version = "2023-08-10"; + version = "2023-09-09"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot-cmp"; - rev = "d631b3afbf26bb17d6cf2b3cd8f3d79e7d5eeca1"; - sha256 = "192s9fi9p4d21c361f0yp44axbkpyf78knrdw7vql0wakb09qi9r"; + rev = "72fbaa03695779f8349be3ac54fa8bd77eed3ee3"; + sha256 = "09j6jm77dw6g0d2yxxg954kbsf7vx4zgjyfjq1n9ls5z36i0vf5j"; }; meta.homepage = "https://github.com/zbirenbaum/copilot-cmp/"; }; - copilot-lua = buildVimPluginFrom2Nix { + copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2023-08-15"; + version = "2023-09-21"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - rev = "b3798d85322b1aaa56cad9d651d2d1aaec6298e9"; - sha256 = "1r5g9ps6s7by4ilv9qyp2q2dxwm4wmf08va5n0gj7amgzqlvj51g"; + rev = "1a8032ae496916ccc7a7a52ee79194fbef29f462"; + sha256 = "0a3k8nb39j0n14ylg84x8c6n8g4m7llx78vad2vz247wnyw4z9sj"; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; }; - copilot-vim = buildVimPluginFrom2Nix { + copilot-vim = buildVimPlugin { pname = "copilot.vim"; - version = "2023-08-17"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "github"; repo = "copilot.vim"; - rev = "f2a4acd62587c62910bda0b79405c585af43c002"; - sha256 = "07bdhssinhnd6ff3b2glq93nb0i6sfjwd6b1q3bsacxkvy686wwj"; + rev = "998cf5ab1b85e844c7e8edb864a997e590df7182"; + sha256 = "1sf566vwyj21h9vbs64j8458v4ncqpmfb5cr74pyl59qi33yq1zd"; }; meta.homepage = "https://github.com/github/copilot.vim/"; }; - coq-artifacts = buildVimPluginFrom2Nix { + coq-artifacts = buildVimPlugin { pname = "coq.artifacts"; - version = "2023-08-13"; + version = "2023-09-07"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "2068660517dc7a3e46d15ae1f349464d3120d3a4"; - sha256 = "01pr1q4qfnf1v6b3bchra67x6qwlbq53qfhdzmynw5zl6mwa4v4w"; + rev = "469c27eb84a91fe2721b6c0af57703ffa1e785e9"; + sha256 = "0v902lf7l0590nif3g45c5ad0s1wr9v7bz0g733aji9hh3fcxl8i"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; - coq-thirdparty = buildVimPluginFrom2Nix { + coq-thirdparty = buildVimPlugin { pname = "coq.thirdparty"; - version = "2023-08-13"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "61110d912431713240633322fe9bb57f5668c23d"; - sha256 = "1wj0pkqfgj90isq0s1iaxyrw7ybas7flkg1lj4ylimy2108lvqr6"; + rev = "47a748c18d6378df7aa033527d1b56d6dec94dc5"; + sha256 = "1jzxrkbynpr4nazjkw9b72liamzyb5ziqww51hc1lby72y4q0llc"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; - coq-vim = buildVimPluginFrom2Nix { + coq-vim = buildVimPlugin { pname = "coq.vim"; version = "2013-01-16"; src = fetchFromGitHub { @@ -2369,19 +2393,19 @@ final: prev: meta.homepage = "https://github.com/jvoorhis/coq.vim/"; }; - coq_nvim = buildVimPluginFrom2Nix { + coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "2023-08-19"; + version = "2023-09-05"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "8050a9baa964f71594f81358ce84d38cee1cd0ad"; - sha256 = "0qgwga52sw8kv8b38mkpy77b3irrnbpb3c5jsd35vkn4j0vsq319"; + rev = "e7304683400a65e3f85e6973fcc2ad2a1bc811e6"; + sha256 = "05jb2jarrw6amrpxalgxngdans89s18009vx4mx3l9imagn1rx5v"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; - cosco-vim = buildVimPluginFrom2Nix { + cosco-vim = buildVimPlugin { pname = "cosco.vim"; version = "2018-08-07"; src = fetchFromGitHub { @@ -2393,7 +2417,7 @@ final: prev: meta.homepage = "https://github.com/lfilho/cosco.vim/"; }; - cpsm = buildVimPluginFrom2Nix { + cpsm = buildVimPlugin { pname = "cpsm"; version = "2021-07-25"; src = fetchFromGitHub { @@ -2405,19 +2429,19 @@ final: prev: meta.homepage = "https://github.com/nixprime/cpsm/"; }; - crates-nvim = buildVimPluginFrom2Nix { + crates-nvim = buildVimPlugin { pname = "crates.nvim"; - version = "2023-08-08"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "d5caf28aba49e81ac4099426231f3cf3c151013a"; - sha256 = "166yinmn8fqmsgdbswn0vjcz3c3d7axckzwkrsz7v8vk9yhnmnyk"; + rev = "7e0e24b5c28c9fababf2b965f5840e6867c96848"; + sha256 = "0c1vykv382hbri0r86scxzh8665knam6nim2rh9nq8s4davxxjwn"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; - csapprox = buildVimPluginFrom2Nix { + csapprox = buildVimPlugin { pname = "csapprox"; version = "2013-07-27"; src = fetchFromGitHub { @@ -2429,7 +2453,7 @@ final: prev: meta.homepage = "https://github.com/godlygeek/csapprox/"; }; - csharpls-extended-lsp-nvim = buildVimPluginFrom2Nix { + csharpls-extended-lsp-nvim = buildVimPlugin { pname = "csharpls-extended-lsp.nvim"; version = "2022-07-15"; src = fetchFromGitHub { @@ -2441,19 +2465,19 @@ final: prev: meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; }; - csv-vim = buildVimPluginFrom2Nix { + csv-vim = buildVimPlugin { pname = "csv.vim"; - version = "2023-05-04"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "15ff93edf5b26c466affbb356e0696b7d6a3b499"; - sha256 = "0mjvy0lbcd3j5dnfq2575m29pbs8w3asdwmknhnk6by6aih3mdsj"; + rev = "4fd88346aed02123aa5daa1a363868a576c6fdcf"; + sha256 = "10c2hgzhnv1zr461hvp4cnxpfs0aja43whjimdsb5sjd4xk5x7cc"; }; meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; - ctrlp-cmatcher = buildVimPluginFrom2Nix { + ctrlp-cmatcher = buildVimPlugin { pname = "ctrlp-cmatcher"; version = "2015-10-15"; src = fetchFromGitHub { @@ -2465,7 +2489,7 @@ final: prev: meta.homepage = "https://github.com/JazzCore/ctrlp-cmatcher/"; }; - ctrlp-py-matcher = buildVimPluginFrom2Nix { + ctrlp-py-matcher = buildVimPlugin { pname = "ctrlp-py-matcher"; version = "2021-09-20"; src = fetchFromGitHub { @@ -2477,7 +2501,7 @@ final: prev: meta.homepage = "https://github.com/FelikZ/ctrlp-py-matcher/"; }; - ctrlp-z = buildVimPluginFrom2Nix { + ctrlp-z = buildVimPlugin { pname = "ctrlp-z"; version = "2015-10-17"; src = fetchFromGitHub { @@ -2489,7 +2513,7 @@ final: prev: meta.homepage = "https://github.com/amiorin/ctrlp-z/"; }; - ctrlp-vim = buildVimPluginFrom2Nix { + ctrlp-vim = buildVimPlugin { pname = "ctrlp.vim"; version = "2023-07-16"; src = fetchFromGitHub { @@ -2501,7 +2525,7 @@ final: prev: meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; - dart-vim-plugin = buildVimPluginFrom2Nix { + dart-vim-plugin = buildVimPlugin { pname = "dart-vim-plugin"; version = "2023-07-18"; src = fetchFromGitHub { @@ -2513,7 +2537,7 @@ final: prev: meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; - dash-vim = buildVimPluginFrom2Nix { + dash-vim = buildVimPlugin { pname = "dash.vim"; version = "2017-09-12"; src = fetchFromGitHub { @@ -2525,19 +2549,19 @@ final: prev: meta.homepage = "https://github.com/rizzatti/dash.vim/"; }; - dashboard-nvim = buildVimPluginFrom2Nix { + dashboard-nvim = buildVimPlugin { pname = "dashboard-nvim"; - version = "2023-07-26"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "nvimdev"; repo = "dashboard-nvim"; - rev = "c17d3210b3dec8798b4fc82a11c542989251f85d"; - sha256 = "1ay3jap0darihkwd71iszw939k8vpjb0chs58p75kxh07212wlv9"; + rev = "b2637e92a294068d79cde7929094f050981c5969"; + sha256 = "0y7s03in2y68c7n81q9a8mfba6s6dz2j8hp7a3kqldy8mhz4mqad"; }; meta.homepage = "https://github.com/nvimdev/dashboard-nvim/"; }; - defx-git = buildVimPluginFrom2Nix { + defx-git = buildVimPlugin { pname = "defx-git"; version = "2021-01-01"; src = fetchFromGitHub { @@ -2549,7 +2573,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/defx-git/"; }; - defx-icons = buildVimPluginFrom2Nix { + defx-icons = buildVimPlugin { pname = "defx-icons"; version = "2021-08-21"; src = fetchFromGitHub { @@ -2561,19 +2585,19 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/defx-icons/"; }; - defx-nvim = buildVimPluginFrom2Nix { + defx-nvim = buildVimPlugin { pname = "defx.nvim"; - version = "2023-04-25"; + version = "2023-09-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "eb66962f7b9f7a4d23a1e0be122b45a88331dffa"; - sha256 = "18v7fxw871sl11fsc6klsj1bxiyg2bjpv03qhc4z9b5hxb54sv3k"; + rev = "1049fc442e8c35b6eba45ba4be1e21b9acb07010"; + sha256 = "1p5hlq1pbayh4k7gwajl33nrl8186ms6nz77225ibwjilzn95f35"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; - delimitMate = buildVimPluginFrom2Nix { + delimitMate = buildVimPlugin { pname = "delimitMate"; version = "2020-12-14"; src = fetchFromGitHub { @@ -2585,7 +2609,7 @@ final: prev: meta.homepage = "https://github.com/Raimondi/delimitMate/"; }; - denite-extra = buildVimPluginFrom2Nix { + denite-extra = buildVimPlugin { pname = "denite-extra"; version = "2019-03-29"; src = fetchFromGitHub { @@ -2597,7 +2621,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/denite-extra/"; }; - denite-git = buildVimPluginFrom2Nix { + denite-git = buildVimPlugin { pname = "denite-git"; version = "2021-01-25"; src = fetchFromGitHub { @@ -2609,7 +2633,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/denite-git/"; }; - denite-nvim = buildVimPluginFrom2Nix { + denite-nvim = buildVimPlugin { pname = "denite.nvim"; version = "2023-04-22"; src = fetchFromGitHub { @@ -2621,31 +2645,31 @@ final: prev: meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; - denops-vim = buildVimPluginFrom2Nix { + denops-vim = buildVimPlugin { pname = "denops.vim"; - version = "2023-08-06"; + version = "2023-09-07"; src = fetchFromGitHub { owner = "vim-denops"; repo = "denops.vim"; - rev = "9f1b8cf0d516ee0a0e26f50bdbd935c29a8f4588"; - sha256 = "0a1q365cs3p90x0b8rdqja9ssgcl7ndqpb37pqldrmwccxik953c"; + rev = "68f607d93a9758d15c0d63d3268aa420ddd29edd"; + sha256 = "0k15zc28a8pmr34xxkfjfy5kbhi4n2h3h9iswrn7vslhh4pnx076"; }; meta.homepage = "https://github.com/vim-denops/denops.vim/"; }; - deol-nvim = buildVimPluginFrom2Nix { + deol-nvim = buildVimPlugin { pname = "deol.nvim"; - version = "2023-08-03"; + version = "2023-08-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "8b82f690c65450a391dc16e7567ab0627293701c"; - sha256 = "0xjq9k74k4vjk6ndsfh5sq69d6gnzdj06i3d2l53rd4qjr78f9mp"; + rev = "51d2367d3373457327e583819c00381387b8c51e"; + sha256 = "1pns3j5f4ls2hdcwydka3r9qp43rr4p392pkcxz807jyrzjzrbdi"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; - deoplete-clang = buildVimPluginFrom2Nix { + deoplete-clang = buildVimPlugin { pname = "deoplete-clang"; version = "2019-11-10"; src = fetchFromGitHub { @@ -2658,7 +2682,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-clang/"; }; - deoplete-dictionary = buildVimPluginFrom2Nix { + deoplete-dictionary = buildVimPlugin { pname = "deoplete-dictionary"; version = "2019-04-16"; src = fetchFromGitHub { @@ -2670,7 +2694,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-dictionary/"; }; - deoplete-fish = buildVimPluginFrom2Nix { + deoplete-fish = buildVimPlugin { pname = "deoplete-fish"; version = "2020-04-04"; src = fetchFromGitHub { @@ -2682,7 +2706,7 @@ final: prev: meta.homepage = "https://github.com/ponko2/deoplete-fish/"; }; - deoplete-github = buildVimPluginFrom2Nix { + deoplete-github = buildVimPlugin { pname = "deoplete-github"; version = "2018-03-04"; src = fetchFromGitHub { @@ -2694,7 +2718,7 @@ final: prev: meta.homepage = "https://github.com/SevereOverfl0w/deoplete-github/"; }; - deoplete-go = buildVimPluginFrom2Nix { + deoplete-go = buildVimPlugin { pname = "deoplete-go"; version = "2021-03-30"; src = fetchFromGitHub { @@ -2707,7 +2731,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-go/"; }; - deoplete-greek = buildVimPluginFrom2Nix { + deoplete-greek = buildVimPlugin { pname = "deoplete-greek"; version = "2019-12-23"; src = fetchFromGitHub { @@ -2719,7 +2743,7 @@ final: prev: meta.homepage = "https://github.com/Inazuma110/deoplete-greek/"; }; - deoplete-jedi = buildVimPluginFrom2Nix { + deoplete-jedi = buildVimPlugin { pname = "deoplete-jedi"; version = "2022-11-15"; src = fetchFromGitHub { @@ -2731,7 +2755,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-jedi/"; }; - deoplete-julia = buildVimPluginFrom2Nix { + deoplete-julia = buildVimPlugin { pname = "deoplete-julia"; version = "2018-06-11"; src = fetchFromGitHub { @@ -2743,7 +2767,7 @@ final: prev: meta.homepage = "https://github.com/JuliaEditorSupport/deoplete-julia/"; }; - deoplete-khard = buildVimPluginFrom2Nix { + deoplete-khard = buildVimPlugin { pname = "deoplete-khard"; version = "2020-09-18"; src = fetchFromGitHub { @@ -2755,7 +2779,7 @@ final: prev: meta.homepage = "https://github.com/nicoe/deoplete-khard/"; }; - deoplete-lsp = buildVimPluginFrom2Nix { + deoplete-lsp = buildVimPlugin { pname = "deoplete-lsp"; version = "2022-12-13"; src = fetchFromGitHub { @@ -2767,7 +2791,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-lsp/"; }; - deoplete-notmuch = buildVimPluginFrom2Nix { + deoplete-notmuch = buildVimPlugin { pname = "deoplete-notmuch"; version = "2018-12-11"; src = fetchFromGitHub { @@ -2779,7 +2803,7 @@ final: prev: meta.homepage = "https://github.com/Valodim/deoplete-notmuch/"; }; - deoplete-phpactor = buildVimPluginFrom2Nix { + deoplete-phpactor = buildVimPlugin { pname = "deoplete-phpactor"; version = "2020-09-12"; src = fetchFromGitHub { @@ -2791,7 +2815,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/deoplete-phpactor/"; }; - deoplete-rust = buildVimPluginFrom2Nix { + deoplete-rust = buildVimPlugin { pname = "deoplete-rust"; version = "2017-07-18"; src = fetchFromGitHub { @@ -2803,7 +2827,7 @@ final: prev: meta.homepage = "https://github.com/sebastianmarkow/deoplete-rust/"; }; - deoplete-tabnine = buildVimPluginFrom2Nix { + deoplete-tabnine = buildVimPlugin { pname = "deoplete-tabnine"; version = "2023-08-06"; src = fetchFromGitHub { @@ -2815,7 +2839,7 @@ final: prev: meta.homepage = "https://github.com/tbodt/deoplete-tabnine/"; }; - deoplete-ternjs = buildVimPluginFrom2Nix { + deoplete-ternjs = buildVimPlugin { pname = "deoplete-ternjs"; version = "2019-12-19"; src = fetchFromGitHub { @@ -2827,7 +2851,7 @@ final: prev: meta.homepage = "https://github.com/carlitux/deoplete-ternjs/"; }; - deoplete-vim-lsp = buildVimPluginFrom2Nix { + deoplete-vim-lsp = buildVimPlugin { pname = "deoplete-vim-lsp"; version = "2021-02-22"; src = fetchFromGitHub { @@ -2839,7 +2863,7 @@ final: prev: meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/"; }; - deoplete-zsh = buildVimPluginFrom2Nix { + deoplete-zsh = buildVimPlugin { pname = "deoplete-zsh"; version = "2019-11-10"; src = fetchFromGitHub { @@ -2851,7 +2875,7 @@ final: prev: meta.homepage = "https://github.com/deoplete-plugins/deoplete-zsh/"; }; - deoplete-nvim = buildVimPluginFrom2Nix { + deoplete-nvim = buildVimPlugin { pname = "deoplete.nvim"; version = "2023-08-06"; src = fetchFromGitHub { @@ -2863,7 +2887,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; - devdocs-vim = buildVimPluginFrom2Nix { + devdocs-vim = buildVimPlugin { pname = "devdocs.vim"; version = "2018-08-27"; src = fetchFromGitHub { @@ -2875,7 +2899,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/devdocs.vim/"; }; - dhall-vim = buildVimPluginFrom2Nix { + dhall-vim = buildVimPlugin { pname = "dhall-vim"; version = "2021-06-05"; src = fetchFromGitHub { @@ -2887,7 +2911,7 @@ final: prev: meta.homepage = "https://github.com/vmchale/dhall-vim/"; }; - diaglist-nvim = buildVimPluginFrom2Nix { + diaglist-nvim = buildVimPlugin { pname = "diaglist.nvim"; version = "2022-09-01"; src = fetchFromGitHub { @@ -2899,7 +2923,7 @@ final: prev: meta.homepage = "https://github.com/onsails/diaglist.nvim/"; }; - diagnostic-nvim = buildVimPluginFrom2Nix { + diagnostic-nvim = buildVimPlugin { pname = "diagnostic-nvim"; version = "2020-11-13"; src = fetchFromGitHub { @@ -2911,31 +2935,31 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/diagnostic-nvim/"; }; - dial-nvim = buildVimPluginFrom2Nix { + dial-nvim = buildVimPlugin { pname = "dial.nvim"; - version = "2023-07-10"; + version = "2023-09-09"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "c6657df5453a6cbe4e8356e1675e9652cadc332f"; - sha256 = "1gz5zg7rfx1j468ysa5b5nnlnsj22pkkkhq4z0n63hp2s09ys2c3"; + rev = "611cf5e84f655c96318b803785f89e3146d8e48f"; + sha256 = "1gv1qjm1paxgrcchxbkfn7v9ygq7nhpf8wcc304fc2s4q5awvjn3"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; - diffview-nvim = buildVimPluginFrom2Nix { + diffview-nvim = buildVimPlugin { pname = "diffview.nvim"; - version = "2023-08-16"; + version = "2023-09-17"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "db97e667e03294bfa9f15e544e78f3082247bf79"; - sha256 = "1nfyp8zbc6d2j3k4x16iblc3vvfdhvfqcqx7p576cjz61ll8ww34"; + rev = "a111d19ccceac6530448d329c63f998f77b5626e"; + sha256 = "18g71p8k2ksfzh3hpm27ry9fd8vi6wkl5czwv3sag8cix1lkm56d"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; - dirbuf-nvim = buildVimPluginFrom2Nix { + dirbuf-nvim = buildVimPlugin { pname = "dirbuf.nvim"; version = "2022-08-28"; src = fetchFromGitHub { @@ -2947,7 +2971,7 @@ final: prev: meta.homepage = "https://github.com/elihunter173/dirbuf.nvim/"; }; - direnv-vim = buildVimPluginFrom2Nix { + direnv-vim = buildVimPlugin { pname = "direnv.vim"; version = "2023-06-26"; src = fetchFromGitHub { @@ -2959,19 +2983,19 @@ final: prev: meta.homepage = "https://github.com/direnv/direnv.vim/"; }; - distant-nvim = buildVimPluginFrom2Nix { + distant-nvim = buildVimPlugin { pname = "distant.nvim"; - version = "2023-07-24"; + version = "2023-09-13"; src = fetchFromGitHub { owner = "chipsenkbeil"; repo = "distant.nvim"; - rev = "17bcd37f8d91dcb987456be456d8a95db1a772ba"; - sha256 = "0z6if0p7n8bi5gd4p3h7i7z3kq8q2yr864nfq0bvzy9ps131z9wl"; + rev = "998724f62386c8022a4e6c885f4509cf9477451a"; + sha256 = "1qzk86mqz6cfspzxslyckxsw964fk22n3f2nlwpm2vp4kdkqajmc"; }; meta.homepage = "https://github.com/chipsenkbeil/distant.nvim/"; }; - doki-theme-vim = buildVimPluginFrom2Nix { + doki-theme-vim = buildVimPlugin { pname = "doki-theme-vim"; version = "2023-01-07"; src = fetchFromGitHub { @@ -2983,7 +3007,7 @@ final: prev: meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; - dracula-nvim = buildVimPluginFrom2Nix { + dracula-nvim = buildVimPlugin { pname = "dracula.nvim"; version = "2023-07-29"; src = fetchFromGitHub { @@ -2995,31 +3019,31 @@ final: prev: meta.homepage = "https://github.com/Mofiqul/dracula.nvim/"; }; - dressing-nvim = buildVimPluginFrom2Nix { + dressing-nvim = buildVimPlugin { pname = "dressing.nvim"; - version = "2023-08-19"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "ee571505f3566f84fd252e76c4ce6df6eaf2fb94"; - sha256 = "0xahisrz7yz0838ijvg2s6wbskdb443fal72yxjr2h5z1dvzxswq"; + rev = "8f4d62b7817455896a3c73cab642002072c114bc"; + sha256 = "0cjn0w4v1n31qgxvwnd7ix1lxjdqhrbllb543lhdc1p48a00sqx1"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; - dropbar-nvim = buildVimPluginFrom2Nix { + dropbar-nvim = buildVimPlugin { pname = "dropbar.nvim"; - version = "2023-08-13"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "Bekaboo"; repo = "dropbar.nvim"; - rev = "c47d7644a8a4bb0acbd9178d197cd245b238d45d"; - sha256 = "0pp4jbg20cz7rbixzb0g8xn5hinr04lls2q62sa4h31r9p43lsrr"; + rev = "9c2bc34bf78bbbf1633b41358e9a203a58b7d19f"; + sha256 = "06l68i8zjgpmzq0yqxbmgl2ncswqpyxxfivjjsm1s1lx5jya97j1"; }; meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/"; }; - echodoc-vim = buildVimPluginFrom2Nix { + echodoc-vim = buildVimPlugin { pname = "echodoc.vim"; version = "2022-11-27"; src = fetchFromGitHub { @@ -3031,7 +3055,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; - edge = buildVimPluginFrom2Nix { + edge = buildVimPlugin { pname = "edge"; version = "2023-08-07"; src = fetchFromGitHub { @@ -3043,7 +3067,7 @@ final: prev: meta.homepage = "https://github.com/sainnhe/edge/"; }; - edgedb-vim = buildVimPluginFrom2Nix { + edgedb-vim = buildVimPlugin { pname = "edgedb-vim"; version = "2023-05-26"; src = fetchFromGitHub { @@ -3055,32 +3079,32 @@ final: prev: meta.homepage = "https://github.com/edgedb/edgedb-vim/"; }; - edgy-nvim = buildVimPluginFrom2Nix { + edgy-nvim = buildVimPlugin { pname = "edgy.nvim"; - version = "2023-07-25"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "folke"; repo = "edgy.nvim"; - rev = "4ccc1c67ae2b1a0c55f18c83d03b714e2bb1bae4"; - sha256 = "0s0h8s2wwg2niacp401j7l3c0knl44awf32clq15h1hcabqvvkn3"; + rev = "70e334c9cd7915aedde3255ade01ceeebe735b53"; + sha256 = "0zcm2p3qwiz2vkj4h4jy30dvphb6j6j8kyl3pzaxkiwlqlslsfma"; }; meta.homepage = "https://github.com/folke/edgy.nvim/"; }; - editorconfig-vim = buildVimPluginFrom2Nix { + editorconfig-vim = buildVimPlugin { pname = "editorconfig-vim"; - version = "2023-08-07"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "editorconfig"; repo = "editorconfig-vim"; - rev = "e014708e917b457e8f6c57f357d55dd3826880d4"; - sha256 = "04p9rqp7glgqfxajad32lrh96cwx2kfwf5v8qvy0bnqbrhc3yv5x"; + rev = "0d54ea863089fb13be423b4aed6cca35f3a5d778"; + sha256 = "1d5r480njjgvn5w5ldhrj5gi38lqhnlyi1f7fvpjgl0lbyyqwp9s"; fetchSubmodules = true; }; meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; }; - editorconfig-nvim = buildVimPluginFrom2Nix { + editorconfig-nvim = buildVimPlugin { pname = "editorconfig.nvim"; version = "2023-01-10"; src = fetchFromGitHub { @@ -3092,31 +3116,31 @@ final: prev: meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; }; - efmls-configs-nvim = buildVimPluginFrom2Nix { + efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "2023-08-17"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "cc0a737ccd69fcb85cb2dfd7f3133a8b4c7adc9c"; - sha256 = "0wxm588q5yqab6pbwz3acqychbzncdixv3clk7gb4knh44v59lp1"; + rev = "dcdb132451dfc2c0d7ec815e66e69ca5b8ae8577"; + sha256 = "1rrj7vvdzzzcacvbkl4pzfq7a19jc25bhk31g017az9q2mmap0mz"; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; }; - elixir-tools-nvim = buildVimPluginFrom2Nix { + elixir-tools-nvim = buildVimPlugin { pname = "elixir-tools.nvim"; - version = "2023-08-10"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "elixir-tools"; repo = "elixir-tools.nvim"; - rev = "25872cb8bdb840484933abc0c2a3444800716cc6"; - sha256 = "198jdgfdrs2rpbv8g4np15pj6iybwbjq7xg0v2xr1hdgvndc7nx1"; + rev = "3099bacca3745aa805b04eacad3d2721c9d477f4"; + sha256 = "0kpwvz1a1h958gr1mig547scg8wpxg4bkrdqmn52ayl27xj5iy1h"; }; meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/"; }; - elm-vim = buildVimPluginFrom2Nix { + elm-vim = buildVimPlugin { pname = "elm-vim"; version = "2020-09-23"; src = fetchFromGitHub { @@ -3128,7 +3152,7 @@ final: prev: meta.homepage = "https://github.com/elmcast/elm-vim/"; }; - elvish-vim = buildVimPluginFrom2Nix { + elvish-vim = buildVimPlugin { pname = "elvish.vim"; version = "2022-04-04"; src = fetchFromGitHub { @@ -3140,7 +3164,7 @@ final: prev: meta.homepage = "https://github.com/dmix/elvish.vim/"; }; - emmet-vim = buildVimPluginFrom2Nix { + emmet-vim = buildVimPlugin { pname = "emmet-vim"; version = "2021-12-04"; src = fetchFromGitHub { @@ -3153,7 +3177,7 @@ final: prev: meta.homepage = "https://github.com/mattn/emmet-vim/"; }; - emodeline = buildVimPluginFrom2Nix { + emodeline = buildVimPlugin { pname = "emodeline"; version = "2010-10-18"; src = fetchFromGitHub { @@ -3165,7 +3189,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/emodeline/"; }; - errormarker-vim = buildVimPluginFrom2Nix { + errormarker-vim = buildVimPlugin { pname = "errormarker.vim"; version = "2015-01-26"; src = fetchFromGitHub { @@ -3177,7 +3201,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/errormarker.vim/"; }; - everforest = buildVimPluginFrom2Nix { + everforest = buildVimPlugin { pname = "everforest"; version = "2023-08-07"; src = fetchFromGitHub { @@ -3189,31 +3213,31 @@ final: prev: meta.homepage = "https://github.com/sainnhe/everforest/"; }; - executor-nvim = buildVimPluginFrom2Nix { + executor-nvim = buildVimPlugin { pname = "executor.nvim"; - version = "2023-08-19"; + version = "2023-09-07"; src = fetchFromGitHub { owner = "google"; repo = "executor.nvim"; - rev = "60348d7644a5729d0bb0de7ee0a3641ae0c1b545"; - sha256 = "188gn67syidq8anajm5dgm1dqzjqmak954vvwp0n2gihr741pwk4"; + rev = "f98049ceabb0ada223dfad2b40bf06df30331e0a"; + sha256 = "0xzjfacbx3agrl481dnb8f4i3h2b36hcbwzdca1m17rd5i51zka3"; }; meta.homepage = "https://github.com/google/executor.nvim/"; }; - eyeliner-nvim = buildVimPluginFrom2Nix { + eyeliner-nvim = buildVimPlugin { pname = "eyeliner.nvim"; - version = "2023-07-21"; + version = "2023-09-16"; src = fetchFromGitHub { owner = "jinh0"; repo = "eyeliner.nvim"; - rev = "70e1fb4f68bfdad2b9e2b53fcaf367ac86fc693f"; - sha256 = "071n0dk0cn4gw12xsg6klzflp1ihl9di60xs8kljh4zjdnc6b7l9"; + rev = "c540d58bf52aa979d4cca639c60387ae0c0ccf88"; + sha256 = "1hd9ph3f56y01gd9ipbd5lw4ips6n9wcr4c9snc60c49z6xammlk"; }; meta.homepage = "https://github.com/jinh0/eyeliner.nvim/"; }; - falcon = buildVimPluginFrom2Nix { + falcon = buildVimPlugin { pname = "falcon"; version = "2023-03-12"; src = fetchFromGitHub { @@ -3225,7 +3249,7 @@ final: prev: meta.homepage = "https://github.com/fenetikm/falcon/"; }; - far-vim = buildVimPluginFrom2Nix { + far-vim = buildVimPlugin { pname = "far.vim"; version = "2022-08-25"; src = fetchFromGitHub { @@ -3237,7 +3261,7 @@ final: prev: meta.homepage = "https://github.com/brooth/far.vim/"; }; - fastfold = buildVimPluginFrom2Nix { + fastfold = buildVimPlugin { pname = "fastfold"; version = "2023-03-21"; src = fetchFromGitHub { @@ -3249,7 +3273,7 @@ final: prev: meta.homepage = "https://github.com/konfekt/fastfold/"; }; - fcitx-vim = buildVimPluginFrom2Nix { + fcitx-vim = buildVimPlugin { pname = "fcitx.vim"; version = "2023-08-03"; src = fetchFromGitHub { @@ -3261,19 +3285,19 @@ final: prev: meta.homepage = "https://github.com/lilydjwg/fcitx.vim/"; }; - feline-nvim = buildVimPluginFrom2Nix { + feline-nvim = buildVimPlugin { pname = "feline.nvim"; - version = "2023-06-19"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "freddiehaddad"; repo = "feline.nvim"; - rev = "c32c2ffcee38f14e157582552fa9ee41c24452d2"; - sha256 = "1mlwjxyb0w3pdg9ny7q6wjdhq1l35a1g4ylp28vfpnrvhfbbxzvy"; + rev = "ee9f8afdbe8654001b200530903f1dcbcc3394e6"; + sha256 = "1x7c6shkx5gxqv7lcby40gkx5f7sr4rgv23pxbzk0l2xy6nsvvmd"; }; meta.homepage = "https://github.com/freddiehaddad/feline.nvim/"; }; - fennel-vim = buildVimPluginFrom2Nix { + fennel-vim = buildVimPlugin { pname = "fennel.vim"; version = "2020-11-15"; src = fetchFromGitHub { @@ -3285,19 +3309,19 @@ final: prev: meta.homepage = "https://github.com/bakpakin/fennel.vim/"; }; - fern-vim = buildVimPluginFrom2Nix { + fern-vim = buildVimPlugin { pname = "fern.vim"; - version = "2023-05-27"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "cdec1327ec99f0155d0a53aee1beae4c58071558"; - sha256 = "1vkjr1cfj2313v3gcj8bf8iki13gxdqa9qb7szg6wjzfavx191k2"; + rev = "e295f0df5735a042f63b05218118646809ba9d27"; + sha256 = "1qldf9k9h5jjn5gyadpln6mc8qsw9f18qqmfrdbl88rr99kx9c32"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; - ferret = buildVimPluginFrom2Nix { + ferret = buildVimPlugin { pname = "ferret"; version = "2022-12-08"; src = fetchFromGitHub { @@ -3309,7 +3333,7 @@ final: prev: meta.homepage = "https://github.com/wincent/ferret/"; }; - fidget-nvim = buildVimPluginFrom2Nix { + fidget-nvim = buildVimPlugin { pname = "fidget.nvim"; version = "2023-06-10"; src = fetchFromGitHub { @@ -3321,7 +3345,7 @@ final: prev: meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; - file-line = buildVimPluginFrom2Nix { + file-line = buildVimPlugin { pname = "file-line"; version = "2016-10-21"; src = fetchFromGitHub { @@ -3333,7 +3357,7 @@ final: prev: meta.homepage = "https://github.com/bogado/file-line/"; }; - firenvim = buildVimPluginFrom2Nix { + firenvim = buildVimPlugin { pname = "firenvim"; version = "2023-08-18"; src = fetchFromGitHub { @@ -3345,7 +3369,7 @@ final: prev: meta.homepage = "https://github.com/glacambre/firenvim/"; }; - flake8-vim = buildVimPluginFrom2Nix { + flake8-vim = buildVimPlugin { pname = "flake8-vim"; version = "2020-10-20"; src = fetchFromGitHub { @@ -3358,31 +3382,31 @@ final: prev: meta.homepage = "https://github.com/andviro/flake8-vim/"; }; - flash-nvim = buildVimPluginFrom2Nix { + flash-nvim = buildVimPlugin { pname = "flash.nvim"; - version = "2023-07-22"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "967117690bd677cb7b6a87f0bc0077d2c0be3a27"; - sha256 = "1rl7lgiwkrjay2zsf97xbp964iqxvqrqc31az6n59pw720rsqn6m"; + rev = "eccef9f34ac332e0f1652d7559fe5cbeab614201"; + sha256 = "1s3vjrz4lcz7lqdxxizj1fdrjax1p5farvi4fr0058k18s8hqqmz"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; - flatten-nvim = buildVimPluginFrom2Nix { + flatten-nvim = buildVimPlugin { pname = "flatten.nvim"; - version = "2023-08-10"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "6813ad3c49b74fbeb5bc851c7d269b611fc86dd3"; - sha256 = "0xk7pyysmq1w1dicq2pml3ls08wwzxaa9fq7fyhziivy7a8qv2ps"; + rev = "67c70f0be3bc536850e1c224a39aef075d23344f"; + sha256 = "09dsal7a95z62f7nw8rjllm102z1112rfxbkj6fxvbw0y5gxmplk"; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; }; - flit-nvim = buildVimPluginFrom2Nix { + flit-nvim = buildVimPlugin { pname = "flit.nvim"; version = "2023-07-13"; src = fetchFromGitHub { @@ -3394,7 +3418,7 @@ final: prev: meta.homepage = "https://github.com/ggandor/flit.nvim/"; }; - float-preview-nvim = buildVimPluginFrom2Nix { + float-preview-nvim = buildVimPlugin { pname = "float-preview.nvim"; version = "2023-07-04"; src = fetchFromGitHub { @@ -3406,7 +3430,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/float-preview.nvim/"; }; - floating-input-nvim = buildVimPluginFrom2Nix { + floating-input-nvim = buildVimPlugin { pname = "floating-input.nvim"; version = "2023-05-26"; src = fetchFromGitHub { @@ -3418,7 +3442,7 @@ final: prev: meta.homepage = "https://github.com/liangxianzhe/floating-input.nvim/"; }; - floating-nvim = buildVimPluginFrom2Nix { + floating-nvim = buildVimPlugin { pname = "floating.nvim"; version = "2021-07-19"; src = fetchFromGitHub { @@ -3430,7 +3454,7 @@ final: prev: meta.homepage = "https://github.com/fhill2/floating.nvim/"; }; - floobits-neovim = buildVimPluginFrom2Nix { + floobits-neovim = buildVimPlugin { pname = "floobits-neovim"; version = "2021-10-18"; src = fetchFromGitHub { @@ -3442,19 +3466,19 @@ final: prev: meta.homepage = "https://github.com/floobits/floobits-neovim/"; }; - flutter-tools-nvim = buildVimPluginFrom2Nix { + flutter-tools-nvim = buildVimPlugin { pname = "flutter-tools.nvim"; - version = "2023-07-24"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "561d85b16d8ca2938820a9c26b2fe74096d89c81"; - sha256 = "0n13m2vdqh75kr0rjlz5m29hcr9jyqxw78isn0gd7vclla1kkjw7"; + rev = "1119125206075c4703f2147f964ed0a45f84c6ab"; + sha256 = "1nm24s024ahfgsgplj5gxan009kxdalwwzdvg1vbysavgxhfzwra"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; - fold-preview-nvim = buildVimPluginFrom2Nix { + fold-preview-nvim = buildVimPlugin { pname = "fold-preview.nvim"; version = "2023-01-27"; src = fetchFromGitHub { @@ -3466,19 +3490,19 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/fold-preview.nvim/"; }; - formatter-nvim = buildVimPluginFrom2Nix { + formatter-nvim = buildVimPlugin { pname = "formatter.nvim"; - version = "2023-08-14"; + version = "2023-09-21"; src = fetchFromGitHub { owner = "mhartington"; repo = "formatter.nvim"; - rev = "44c89f09dcc220dc2a9b056e93c3a87c86e79804"; - sha256 = "0x07bqrwqzw56rvwarxxf9ylx01fk5a7ds1zq1fvjxizyf1qya03"; + rev = "34dcdfa0c75df667743b2a50dd99c84a557376f0"; + sha256 = "09dks17yi1cbk4gviv7kw7r04rcn8ridq75slm3vxf3jkid095ns"; }; meta.homepage = "https://github.com/mhartington/formatter.nvim/"; }; - forms = buildVimPluginFrom2Nix { + forms = buildVimPlugin { pname = "forms"; version = "2012-11-28"; src = fetchFromGitHub { @@ -3490,19 +3514,19 @@ final: prev: meta.homepage = "https://github.com/megaannum/forms/"; }; - friendly-snippets = buildVimPluginFrom2Nix { + friendly-snippets = buildVimPlugin { pname = "friendly-snippets"; - version = "2023-08-14"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "377d45475b49e37460a902d6d569d2093d4037d0"; - sha256 = "0yk612n3ayn0kv1smv945hz8rl395ask4wp45iqymvzia6jp6k4a"; + rev = "43727c2ff84240e55d4069ec3e6158d74cb534b6"; + sha256 = "1sjk17gn919aa84dkjfagwwjsas9zfkbrk840bjf580k8m83d9m8"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; - fruzzy = buildVimPluginFrom2Nix { + fruzzy = buildVimPlugin { pname = "fruzzy"; version = "2020-08-31"; src = fetchFromGitHub { @@ -3514,7 +3538,7 @@ final: prev: meta.homepage = "https://github.com/raghur/fruzzy/"; }; - fugitive-gitlab-vim = buildVimPluginFrom2Nix { + fugitive-gitlab-vim = buildVimPlugin { pname = "fugitive-gitlab.vim"; version = "2023-05-22"; src = fetchFromGitHub { @@ -3526,7 +3550,7 @@ final: prev: meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; - futhark-vim = buildVimPluginFrom2Nix { + futhark-vim = buildVimPlugin { pname = "futhark-vim"; version = "2021-08-24"; src = fetchFromGitHub { @@ -3538,7 +3562,7 @@ final: prev: meta.homepage = "https://github.com/BeneCollyridam/futhark-vim/"; }; - fuzzy-nvim = buildVimPluginFrom2Nix { + fuzzy-nvim = buildVimPlugin { pname = "fuzzy.nvim"; version = "2023-05-15"; src = fetchFromGitHub { @@ -3550,7 +3574,7 @@ final: prev: meta.homepage = "https://github.com/tzachar/fuzzy.nvim/"; }; - fwatch-nvim = buildVimPluginFrom2Nix { + fwatch-nvim = buildVimPlugin { pname = "fwatch.nvim"; version = "2022-07-04"; src = fetchFromGitHub { @@ -3562,7 +3586,7 @@ final: prev: meta.homepage = "https://github.com/rktjmp/fwatch.nvim/"; }; - fzf-checkout-vim = buildVimPluginFrom2Nix { + fzf-checkout-vim = buildVimPlugin { pname = "fzf-checkout.vim"; version = "2022-12-27"; src = fetchFromGitHub { @@ -3574,7 +3598,7 @@ final: prev: meta.homepage = "https://github.com/stsewd/fzf-checkout.vim/"; }; - fzf-hoogle-vim = buildVimPluginFrom2Nix { + fzf-hoogle-vim = buildVimPlugin { pname = "fzf-hoogle.vim"; version = "2022-05-01"; src = fetchFromGitHub { @@ -3586,7 +3610,7 @@ final: prev: meta.homepage = "https://github.com/monkoose/fzf-hoogle.vim/"; }; - fzf-lsp-nvim = buildVimPluginFrom2Nix { + fzf-lsp-nvim = buildVimPlugin { pname = "fzf-lsp.nvim"; version = "2023-02-02"; src = fetchFromGitHub { @@ -3598,31 +3622,31 @@ final: prev: meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; - fzf-lua = buildVimPluginFrom2Nix { + fzf-lua = buildVimPlugin { pname = "fzf-lua"; - version = "2023-08-14"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "257aafb3c3a3475821db74d1a48ea5b097ac53a9"; - sha256 = "0d1pijv7x8ylapisq7i6bsznx8hd6syyfqakgj1pfykw8s474b1l"; + rev = "f4091b9fa05ae6c2eab2823c0b345be2a27208c6"; + sha256 = "1q48jk4cm9djkz1czf80f024fv6mdysc38x4r66m5gkqs4vky3ma"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; - fzf-vim = buildVimPluginFrom2Nix { + fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "2023-08-10"; + version = "2023-09-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "811f34b70b60b4df2997e3ba8cd109e7d06d683b"; - sha256 = "0lv1ipq1y6kzirv9dw8y3v0rdy5wrx91wc3d34a51whb57d3fq7p"; + rev = "678ee1a549bd873dde35f6146f288a3f2e29d983"; + sha256 = "0ls94bxj1awx1z0x4h9pmc08zh917gyyllalm562a0a51x6sr9sg"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; - galaxyline-nvim = buildVimPluginFrom2Nix { + galaxyline-nvim = buildVimPlugin { pname = "galaxyline.nvim"; version = "2022-01-21"; src = fetchFromGitHub { @@ -3634,7 +3658,7 @@ final: prev: meta.homepage = "https://github.com/NTBBloodbath/galaxyline.nvim/"; }; - gen_tags-vim = buildVimPluginFrom2Nix { + gen_tags-vim = buildVimPlugin { pname = "gen_tags.vim"; version = "2023-03-06"; src = fetchFromGitHub { @@ -3646,7 +3670,7 @@ final: prev: meta.homepage = "https://github.com/jsfaint/gen_tags.vim/"; }; - gentoo-syntax = buildVimPluginFrom2Nix { + gentoo-syntax = buildVimPlugin { pname = "gentoo-syntax"; version = "2023-06-14"; src = fetchFromGitHub { @@ -3658,7 +3682,7 @@ final: prev: meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; - ghcid = buildVimPluginFrom2Nix { + ghcid = buildVimPlugin { pname = "ghcid"; version = "2023-07-02"; src = fetchFromGitHub { @@ -3670,7 +3694,7 @@ final: prev: meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; - ghcmod-vim = buildVimPluginFrom2Nix { + ghcmod-vim = buildVimPlugin { pname = "ghcmod-vim"; version = "2016-06-19"; src = fetchFromGitHub { @@ -3682,7 +3706,7 @@ final: prev: meta.homepage = "https://github.com/eagletmt/ghcmod-vim/"; }; - gina-vim = buildVimPluginFrom2Nix { + gina-vim = buildVimPlugin { pname = "gina.vim"; version = "2022-03-30"; src = fetchFromGitHub { @@ -3694,31 +3718,31 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/gina.vim/"; }; - git-blame-nvim = buildVimPluginFrom2Nix { + git-blame-nvim = buildVimPlugin { pname = "git-blame.nvim"; - version = "2023-08-18"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "41e22dc843c6821a410db57be0b7025154f9d8ec"; - sha256 = "1ddzrd0l0rvy5h6lbx5qp3n066l6rzvl5m2plms329q3krqclw88"; + rev = "39df33dad2cbf4eb9d17264bcda0c12e670ef1c2"; + sha256 = "0faaqj4a0nz005gl1r3hp07zrckq00v9ik0g04wwzbr0phccka8q"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; - git-conflict-nvim = buildVimPluginFrom2Nix { + git-conflict-nvim = buildVimPlugin { pname = "git-conflict.nvim"; - version = "2023-08-14"; + version = "2023-09-18"; src = fetchFromGitHub { owner = "akinsho"; repo = "git-conflict.nvim"; - rev = "562e8fdf5a4a2c73c55640bcf660be33db669d2a"; - sha256 = "1jw28m6r7yvv2lsr4m7c7q7jrc46rpibz5kd4iziig0q9gsqk5s5"; + rev = "896261933afe2fddf6fb043d9cd4d88301b151a9"; + sha256 = "1pkvhl1bf76nvc9rdyn60dq619pkwr2a03gn2zkqlap28lhw2xn8"; }; meta.homepage = "https://github.com/akinsho/git-conflict.nvim/"; }; - git-messenger-vim = buildVimPluginFrom2Nix { + git-messenger-vim = buildVimPlugin { pname = "git-messenger.vim"; version = "2022-08-30"; src = fetchFromGitHub { @@ -3730,7 +3754,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/git-messenger.vim/"; }; - git-worktree-nvim = buildVimPluginFrom2Nix { + git-worktree-nvim = buildVimPlugin { pname = "git-worktree.nvim"; version = "2021-12-24"; src = fetchFromGitHub { @@ -3742,7 +3766,7 @@ final: prev: meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; - gitignore-vim = buildVimPluginFrom2Nix { + gitignore-vim = buildVimPlugin { pname = "gitignore.vim"; version = "2014-03-16"; src = fetchFromGitHub { @@ -3754,7 +3778,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/gitignore.vim/"; }; - gitlinker-nvim = buildVimPluginFrom2Nix { + gitlinker-nvim = buildVimPlugin { pname = "gitlinker.nvim"; version = "2023-02-03"; src = fetchFromGitHub { @@ -3768,17 +3792,17 @@ final: prev: gitsigns-nvim = buildNeovimPlugin { pname = "gitsigns.nvim"; - version = "2023-08-19"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "749267aaa863c30d721c9913699c5d94e0c07dd3"; - sha256 = "1ysc9igrzxin0s16bk71l72ql1jzilhps0pc6mbj9padk3xi3iy4"; + rev = "e2ca739be75447fb5ccc9bfeb64f7afbc2cee5e6"; + sha256 = "0x9mwarz61xggw4xdxllzgardi2qxp33bk24x59rqpkb8135bjrz"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; - gitv = buildVimPluginFrom2Nix { + gitv = buildVimPlugin { pname = "gitv"; version = "2019-08-22"; src = fetchFromGitHub { @@ -3790,19 +3814,19 @@ final: prev: meta.homepage = "https://github.com/gregsexton/gitv/"; }; - glance-nvim = buildVimPluginFrom2Nix { + glance-nvim = buildVimPlugin { pname = "glance.nvim"; - version = "2023-08-16"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "DNLHC"; repo = "glance.nvim"; - rev = "ec19dbdabd47fc2f094f7457a84ae78e7c9b5610"; - sha256 = "1iw5b6zdwrbi01k13zsmin8x0hs2i3jyfnpfl568lahkcjx4bdxz"; + rev = "8ed5cf3b3b1231ea696d88c9efd977027429d869"; + sha256 = "0r2n9q687dvsc5w06v4a90cjcpi0gvjigjf9j27b864m118xj9x3"; }; meta.homepage = "https://github.com/DNLHC/glance.nvim/"; }; - gleam-vim = buildVimPluginFrom2Nix { + gleam-vim = buildVimPlugin { pname = "gleam.vim"; version = "2020-06-24"; src = fetchFromGitHub { @@ -3814,43 +3838,43 @@ final: prev: meta.homepage = "https://github.com/gleam-lang/gleam.vim/"; }; - glow-nvim = buildVimPluginFrom2Nix { + glow-nvim = buildVimPlugin { pname = "glow.nvim"; - version = "2023-07-28"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "8942dfb05794f436af4fbc90a34393f1fd36f361"; - sha256 = "1lqfdfmmqygk2ljlp8gi647j1bij51i85hwl7adx1as749ym0fb4"; + rev = "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5"; + sha256 = "0fa2g6r3kf103jh5vx493bkkbxssizm8i4lri1pl24mnha871ndx"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; - go-nvim = buildVimPluginFrom2Nix { + go-nvim = buildVimPlugin { pname = "go.nvim"; - version = "2023-08-15"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "ray-x"; repo = "go.nvim"; - rev = "a370cb932749d071a6bca20211533044c262e66d"; - sha256 = "0k3rpy9kz9y9a56155fpj15pd200vldswhx43mfkmis23vv6r454"; + rev = "2f573a297bea3a483a3607ae7c607a8a08d27993"; + sha256 = "0knxirf1kimjck9f8mx26m8s9v2vbjmacnr29rm9la96fs5bg2n4"; }; meta.homepage = "https://github.com/ray-x/go.nvim/"; }; - godbolt-nvim = buildVimPluginFrom2Nix { + godbolt-nvim = buildVimPlugin { pname = "godbolt.nvim"; - version = "2023-07-09"; + version = "2023-09-07"; src = fetchFromGitHub { owner = "p00f"; repo = "godbolt.nvim"; - rev = "8b1eeb26697d4fffba217194fdd6545cbfe40598"; - sha256 = "1qb5kyx3gvfybjz8nlmp5yv08sqx8rnd1bi33n8l3xpsz48c5kmf"; + rev = "74c32eaa520987d195a2594a6efaab61cf9072c8"; + sha256 = "0n5mwyfsmifcfmgs49yc77zvndhkkki2dnka11pk1djvp53bs9ky"; }; meta.homepage = "https://github.com/p00f/godbolt.nvim/"; }; - golden-ratio = buildVimPluginFrom2Nix { + golden-ratio = buildVimPlugin { pname = "golden-ratio"; version = "2022-06-28"; src = fetchFromGitHub { @@ -3862,7 +3886,7 @@ final: prev: meta.homepage = "https://github.com/roman/golden-ratio/"; }; - gotests-vim = buildVimPluginFrom2Nix { + gotests-vim = buildVimPlugin { pname = "gotests-vim"; version = "2022-07-12"; src = fetchFromGitHub { @@ -3874,19 +3898,19 @@ final: prev: meta.homepage = "https://github.com/buoto/gotests-vim/"; }; - goto-preview = buildVimPluginFrom2Nix { + goto-preview = buildVimPlugin { pname = "goto-preview"; - version = "2023-07-19"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "84532db88f8ee272bcd1c07cda55884e23fd9087"; - sha256 = "0insrplfq6rwm9bgfj5adjk8c4mbvqhpzbd32lqq6bg4960m09vl"; + rev = "b428db4d2a5b7c06e149a020e31b2121fbf57a67"; + sha256 = "13lc0yjmwzwkdj92rlcwqpyic30z5vq3ss73bkzwl4vkqg413zla"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; - goyo-vim = buildVimPluginFrom2Nix { + goyo-vim = buildVimPlugin { pname = "goyo.vim"; version = "2023-03-04"; src = fetchFromGitHub { @@ -3898,7 +3922,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/goyo.vim/"; }; - grammar-guard-nvim = buildVimPluginFrom2Nix { + grammar-guard-nvim = buildVimPlugin { pname = "grammar-guard.nvim"; version = "2023-08-12"; src = fetchFromGitHub { @@ -3910,7 +3934,7 @@ final: prev: meta.homepage = "https://github.com/brymer-meneses/grammar-guard.nvim/"; }; - graphviz-vim = buildVimPluginFrom2Nix { + graphviz-vim = buildVimPlugin { pname = "graphviz.vim"; version = "2022-12-11"; src = fetchFromGitHub { @@ -3922,7 +3946,7 @@ final: prev: meta.homepage = "https://github.com/liuchengxu/graphviz.vim/"; }; - gruvbox = buildVimPluginFrom2Nix { + gruvbox = buildVimPlugin { pname = "gruvbox"; version = "2023-08-14"; src = fetchFromGitHub { @@ -3934,7 +3958,7 @@ final: prev: meta.homepage = "https://github.com/morhetz/gruvbox/"; }; - gruvbox-flat-nvim = buildVimPluginFrom2Nix { + gruvbox-flat-nvim = buildVimPlugin { pname = "gruvbox-flat.nvim"; version = "2023-05-27"; src = fetchFromGitHub { @@ -3946,7 +3970,7 @@ final: prev: meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; }; - gruvbox-material = buildVimPluginFrom2Nix { + gruvbox-material = buildVimPlugin { pname = "gruvbox-material"; version = "2023-08-07"; src = fetchFromGitHub { @@ -3958,19 +3982,19 @@ final: prev: meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; - gruvbox-nvim = buildVimPluginFrom2Nix { + gruvbox-nvim = buildVimPlugin { pname = "gruvbox.nvim"; - version = "2023-08-16"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "6d409ee8af4e84d2327b4b5856f843b97a85a567"; - sha256 = "15k67lc73r5dvv9a2wmpkaacngmxld7djq50g2qmgm6aqsqxxj0q"; + rev = "61b0b3be2f0cfd521667403a0367298144d6c165"; + sha256 = "1dphrf8bq088d47macxhx2ql9bq5s9axs9cqwqbp6vkmr4zcx072"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; - guess-indent-nvim = buildVimPluginFrom2Nix { + guess-indent-nvim = buildVimPlugin { pname = "guess-indent.nvim"; version = "2023-04-03"; src = fetchFromGitHub { @@ -3982,7 +4006,7 @@ final: prev: meta.homepage = "https://github.com/nmac427/guess-indent.nvim/"; }; - gundo-vim = buildVimPluginFrom2Nix { + gundo-vim = buildVimPlugin { pname = "gundo.vim"; version = "2021-02-21"; src = fetchFromGitHub { @@ -3994,7 +4018,7 @@ final: prev: meta.homepage = "https://github.com/sjl/gundo.vim/"; }; - gv-vim = buildVimPluginFrom2Nix { + gv-vim = buildVimPlugin { pname = "gv.vim"; version = "2022-10-25"; src = fetchFromGitHub { @@ -4006,30 +4030,30 @@ final: prev: meta.homepage = "https://github.com/junegunn/gv.vim/"; }; - hardtime-nvim = buildVimPluginFrom2Nix { + hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "2023-08-20"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "6826c1fe8bebc63a6886833ca4ffed2fc6ec3382"; - sha256 = "0xdyh7xd58jnh97p0vps5pzpfpzd2yifrfj4crgxhq8vm3bp2w6b"; + rev = "3d98663dbd2ed51a3be97e50dfe7df6c26d62d8d"; + sha256 = "07fv14zi1c55grzhzbri3rs4bv1lx5ywpkdgvmhgr1h7blm3d9g1"; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; }; - hare-vim = buildVimPluginFrom2Nix { + hare-vim = buildVimPlugin { pname = "hare.vim"; - version = "2023-08-07"; + version = "2023-09-09"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/hare.vim"; - rev = "78ad3aef2d9ba3371fde0978de27393930799847"; - sha256 = "14biq4v52pavpag87g2y8ygb74qril55lf7s4xbbr4wg37fbji7q"; + rev = "e24288327f88f459025a00632c7b1f543759906a"; + sha256 = "19xr3d4bbvn9s1ab9cnm3qw5lxs8jl5gs5hn62fagdl39a6bwn2d"; }; meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; }; - harpoon = buildVimPluginFrom2Nix { + harpoon = buildVimPlugin { pname = "harpoon"; version = "2023-05-28"; src = fetchFromGitHub { @@ -4043,17 +4067,17 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-08-06"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "a5481383f82a8f866552bc75b4295351ea3ad905"; - sha256 = "16a41a9b31x5hax5iqyj1lxc4fxhcrp4ig54f77s4czwfd08qj2j"; + rev = "8b472cf9abf5c2996843894d1231aed5f6653bc2"; + sha256 = "1msyfigc97vxsbinm404vzd68biy5hgj61ppz2lc96xbyq7r66xd"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; - haskell-vim = buildVimPluginFrom2Nix { + haskell-vim = buildVimPlugin { pname = "haskell-vim"; version = "2021-01-19"; src = fetchFromGitHub { @@ -4065,7 +4089,7 @@ final: prev: meta.homepage = "https://github.com/neovimhaskell/haskell-vim/"; }; - haskell-with-unicode-vim = buildVimPluginFrom2Nix { + haskell-with-unicode-vim = buildVimPlugin { pname = "haskell-with-unicode.vim"; version = "2022-09-11"; src = fetchFromGitHub { @@ -4077,7 +4101,7 @@ final: prev: meta.homepage = "https://github.com/wenzel-hoffman/haskell-with-unicode.vim/"; }; - hasksyn = buildVimPluginFrom2Nix { + hasksyn = buildVimPlugin { pname = "hasksyn"; version = "2014-09-04"; src = fetchFromGitHub { @@ -4089,7 +4113,7 @@ final: prev: meta.homepage = "https://github.com/travitch/hasksyn/"; }; - headlines-nvim = buildVimPluginFrom2Nix { + headlines-nvim = buildVimPlugin { pname = "headlines.nvim"; version = "2023-07-27"; src = fetchFromGitHub { @@ -4101,31 +4125,31 @@ final: prev: meta.homepage = "https://github.com/lukas-reineke/headlines.nvim/"; }; - heirline-nvim = buildVimPluginFrom2Nix { + heirline-nvim = buildVimPlugin { pname = "heirline.nvim"; - version = "2023-07-24"; + version = "2023-09-03"; src = fetchFromGitHub { owner = "rebelot"; repo = "heirline.nvim"; - rev = "1840fe27dbb38efa13c8af4614acafe6efa41988"; - sha256 = "1h4h4hkz9vkdh2hza1qp0xmiv1rkxzzq7aa4zrp82460z1ic3z1h"; + rev = "7f1e805dfc001d5dbb7d894105063f463f6c7dcc"; + sha256 = "1hy5a30pb0cv93dh796lh08p5k43b4b732sr4ka0pwj4n4a3q82r"; }; meta.homepage = "https://github.com/rebelot/heirline.nvim/"; }; - hex-nvim = buildVimPluginFrom2Nix { + hex-nvim = buildVimPlugin { pname = "hex.nvim"; - version = "2023-08-09"; + version = "2023-09-09"; src = fetchFromGitHub { owner = "RaafatTurki"; repo = "hex.nvim"; - rev = "63411ffe59fb8ecc3611367731cf13effc4d706f"; - sha256 = "0nffd7yqp1f3yq10k8xdk0w4k7lx6yvxaih99aql4a5s417zlqsd"; + rev = "dc51e5d67fc994380b7c7a518b6b625cde4b3062"; + sha256 = "13j27zc18chlgv9w7ml7j3lxbl7lkcqvvwys05hw0dbhik13bcyh"; }; meta.homepage = "https://github.com/RaafatTurki/hex.nvim/"; }; - hiPairs = buildVimPluginFrom2Nix { + hiPairs = buildVimPlugin { pname = "hiPairs"; version = "2020-12-10"; src = fetchFromGitHub { @@ -4137,30 +4161,30 @@ final: prev: meta.homepage = "https://github.com/Yggdroot/hiPairs/"; }; - highlight-undo-nvim = buildVimPluginFrom2Nix { + highlight-undo-nvim = buildVimPlugin { pname = "highlight-undo.nvim"; - version = "2023-08-17"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "tzachar"; repo = "highlight-undo.nvim"; - rev = "d9e674a2eb4d95ee16cd477d47eab7ddc586e336"; - sha256 = "02ic1ag8k28na6ia48bwkmg0ca961dliizjzsvhp28hkvvx6py9r"; + rev = "50a6884a8476be04ecce8f1c4ed692c5000ef0a1"; + sha256 = "09fmds9ibl6n4fgxmmypifnxpyc0slpinc2h5cvx0959i9ak0l13"; }; meta.homepage = "https://github.com/tzachar/highlight-undo.nvim/"; }; - himalaya-vim = buildVimPluginFrom2Nix { + himalaya-vim = buildVimPlugin { pname = "himalaya-vim"; - version = "2023-07-17"; + version = "2023-09-14"; src = fetchgit { url = "https://git.sr.ht/~soywod/himalaya-vim"; - rev = "479c49fd46899144d24b78dbd81d64cc0c05ffc7"; - sha256 = "0as0dxkf37pfqk878rq1d3dfdl2d724plabgs0cy3lkg20x389i4"; + rev = "950132d1bec1689476be2edc5913ba30bc13555a"; + sha256 = "116a34xy1ml0xrdcwy8jwqj4pw232449hx4v7crhj3cp68yq07n2"; }; meta.homepage = "https://git.sr.ht/~soywod/himalaya-vim"; }; - hlint-refactor-vim = buildVimPluginFrom2Nix { + hlint-refactor-vim = buildVimPlugin { pname = "hlint-refactor-vim"; version = "2015-12-05"; src = fetchFromGitHub { @@ -4172,7 +4196,19 @@ final: prev: meta.homepage = "https://github.com/mpickering/hlint-refactor-vim/"; }; - hologram-nvim = buildVimPluginFrom2Nix { + hmts-nvim = buildVimPlugin { + pname = "hmts.nvim"; + version = "2023-08-28"; + src = fetchFromGitHub { + owner = "calops"; + repo = "hmts.nvim"; + rev = "14fd941d7ec2bb98314a1aacaa2573d97f1629ab"; + sha256 = "09f403w6gglfycghjzx4dc5gv71wqb6ywnmcvm15n1ldxasb6jwd"; + }; + meta.homepage = "https://github.com/calops/hmts.nvim/"; + }; + + hologram-nvim = buildVimPlugin { pname = "hologram.nvim"; version = "2022-10-09"; src = fetchFromGitHub { @@ -4184,7 +4220,7 @@ final: prev: meta.homepage = "https://github.com/edluffy/hologram.nvim/"; }; - hoon-vim = buildVimPluginFrom2Nix { + hoon-vim = buildVimPlugin { pname = "hoon.vim"; version = "2023-05-04"; src = fetchFromGitHub { @@ -4196,43 +4232,43 @@ final: prev: meta.homepage = "https://github.com/urbit/hoon.vim/"; }; - hop-nvim = buildVimPluginFrom2Nix { + hop-nvim = buildVimPlugin { pname = "hop.nvim"; - version = "2023-05-17"; + version = "2023-09-19"; src = fetchFromGitHub { - owner = "phaazon"; + owner = "smoka7"; repo = "hop.nvim"; - rev = "03f0434869f1f38868618198b5f4f2ab6d39aef2"; - sha256 = "0f22abf4j3ncrs1ngp9p9m8wrhvpk9ckh76wapljvyblv9nwbn65"; + rev = "f2508f415b9fe34082696009574ca26f57a66531"; + sha256 = "0l8b2ag894chk8ljznmspr1ac53n3wf6iww37ksd2pdas51la344"; }; - meta.homepage = "https://github.com/phaazon/hop.nvim/"; + meta.homepage = "https://github.com/smoka7/hop.nvim/"; }; - hotpot-nvim = buildVimPluginFrom2Nix { + hotpot-nvim = buildVimPlugin { pname = "hotpot.nvim"; - version = "2023-08-14"; + version = "2023-09-14"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "cfe493572fd80678855c3fd3c4cba9f2fec840de"; - sha256 = "12sgnk6vxpxihwiw1pd89mrsmidrsrp1aaky0g8aw2pqj0d9r70h"; + rev = "1dc11eb47ca15828df8ed3c7a014eeca9c564e55"; + sha256 = "13siw00n3fa2s8lq7mz8pp4n2f2m7w3y5wd1kg6dsy4g3nvsiw0l"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; - hover-nvim = buildVimPluginFrom2Nix { + hover-nvim = buildVimPlugin { pname = "hover.nvim"; - version = "2023-07-10"; + version = "2023-09-10"; src = fetchFromGitHub { owner = "lewis6991"; repo = "hover.nvim"; - rev = "c366d1b0f9d6612d25681d3fea0f9ea46fa54f4d"; - sha256 = "0vhr5a9nsww4xhniv86j05isfv94fwa5sz2ikkn6fnl7d743m1xr"; + rev = "f74d2924564ba5fd8faa2d7e7cf6065de26f9820"; + sha256 = "15p8yv72zigy0rwb52mjj9fwa5l37xdq19czy96zbfxhvs93zvpf"; }; meta.homepage = "https://github.com/lewis6991/hover.nvim/"; }; - html5-vim = buildVimPluginFrom2Nix { + html5-vim = buildVimPlugin { pname = "html5.vim"; version = "2020-08-22"; src = fetchFromGitHub { @@ -4244,7 +4280,7 @@ final: prev: meta.homepage = "https://github.com/othree/html5.vim/"; }; - hydra-nvim = buildVimPluginFrom2Nix { + hydra-nvim = buildVimPlugin { pname = "hydra.nvim"; version = "2023-02-06"; src = fetchFromGitHub { @@ -4256,7 +4292,7 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/hydra.nvim/"; }; - i3config-vim = buildVimPluginFrom2Nix { + i3config-vim = buildVimPlugin { pname = "i3config.vim"; version = "2021-06-23"; src = fetchFromGitHub { @@ -4268,7 +4304,7 @@ final: prev: meta.homepage = "https://github.com/mboughaba/i3config.vim/"; }; - iceberg-vim = buildVimPluginFrom2Nix { + iceberg-vim = buildVimPlugin { pname = "iceberg.vim"; version = "2022-11-23"; src = fetchFromGitHub { @@ -4280,7 +4316,7 @@ final: prev: meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; - idris-vim = buildVimPluginFrom2Nix { + idris-vim = buildVimPlugin { pname = "idris-vim"; version = "2017-12-04"; src = fetchFromGitHub { @@ -4292,7 +4328,7 @@ final: prev: meta.homepage = "https://github.com/idris-hackers/idris-vim/"; }; - idris2-vim = buildVimPluginFrom2Nix { + idris2-vim = buildVimPlugin { pname = "idris2-vim"; version = "2020-11-26"; src = fetchFromGitHub { @@ -4304,19 +4340,19 @@ final: prev: meta.homepage = "https://github.com/edwinb/idris2-vim/"; }; - image-nvim = buildVimPluginFrom2Nix { + image-nvim = buildVimPlugin { pname = "image.nvim"; - version = "2023-07-22"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "3rd"; repo = "image.nvim"; - rev = "5d8b8b3acbe2ec6fcfe782cbda3a8ebdad9c1b51"; - sha256 = "0s7s803gg2b4wilfx973kf4c2gppsyr747wkwjlms3yjbx8iyb8k"; + rev = "961e5a68998dd76bf5e25ae2d96fcf3bb1ee22ae"; + sha256 = "0k1gj83w3lqx9dass0mff1yhzn9p0ln96sz0cds14kkgyzfq6dw4"; }; meta.homepage = "https://github.com/3rd/image.nvim/"; }; - impatient-nvim = buildVimPluginFrom2Nix { + impatient-nvim = buildVimPlugin { pname = "impatient.nvim"; version = "2023-05-05"; src = fetchFromGitHub { @@ -4328,7 +4364,7 @@ final: prev: meta.homepage = "https://github.com/lewis6991/impatient.nvim/"; }; - inc-rename-nvim = buildVimPluginFrom2Nix { + inc-rename-nvim = buildVimPlugin { pname = "inc-rename.nvim"; version = "2023-06-03"; src = fetchFromGitHub { @@ -4340,7 +4376,7 @@ final: prev: meta.homepage = "https://github.com/smjonas/inc-rename.nvim/"; }; - increment-activator = buildVimPluginFrom2Nix { + increment-activator = buildVimPlugin { pname = "increment-activator"; version = "2021-09-16"; src = fetchFromGitHub { @@ -4352,7 +4388,7 @@ final: prev: meta.homepage = "https://github.com/nishigori/increment-activator/"; }; - incsearch-easymotion-vim = buildVimPluginFrom2Nix { + incsearch-easymotion-vim = buildVimPlugin { pname = "incsearch-easymotion.vim"; version = "2016-01-18"; src = fetchFromGitHub { @@ -4364,7 +4400,7 @@ final: prev: meta.homepage = "https://github.com/haya14busa/incsearch-easymotion.vim/"; }; - incsearch-vim = buildVimPluginFrom2Nix { + incsearch-vim = buildVimPlugin { pname = "incsearch.vim"; version = "2022-05-13"; src = fetchFromGitHub { @@ -4376,19 +4412,19 @@ final: prev: meta.homepage = "https://github.com/haya14busa/incsearch.vim/"; }; - indent-blankline-nvim = buildVimPluginFrom2Nix { + indent-blankline-nvim = buildVimPlugin { pname = "indent-blankline.nvim"; - version = "2023-07-07"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "4541d690816cb99a7fc248f1486aa87f3abce91c"; - sha256 = "1f83fwbd97a26wsnfilv7fq2a3vb19yi5012j4xsmbyv329i3wvr"; + rev = "3d26bc7ab0e8dfddc0f40c840a8f925dddc2fef6"; + sha256 = "1p3bxdrj2xibyqw37b1247sz5nqx460d3lr4py3fn0cdgrf3420s"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; - indent-o-matic = buildVimPluginFrom2Nix { + indent-o-matic = buildVimPlugin { pname = "indent-o-matic"; version = "2023-06-03"; src = fetchFromGitHub { @@ -4400,7 +4436,7 @@ final: prev: meta.homepage = "https://github.com/Darazaki/indent-o-matic/"; }; - indentLine = buildVimPluginFrom2Nix { + indentLine = buildVimPlugin { pname = "indentLine"; version = "2023-07-14"; src = fetchFromGitHub { @@ -4412,7 +4448,7 @@ final: prev: meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; - inkpot = buildVimPluginFrom2Nix { + inkpot = buildVimPlugin { pname = "inkpot"; version = "2013-02-10"; src = fetchFromGitHub { @@ -4424,7 +4460,7 @@ final: prev: meta.homepage = "https://github.com/ciaranm/inkpot/"; }; - instant-nvim = buildVimPluginFrom2Nix { + instant-nvim = buildVimPlugin { pname = "instant.nvim"; version = "2022-06-25"; src = fetchFromGitHub { @@ -4436,7 +4472,7 @@ final: prev: meta.homepage = "https://github.com/jbyuki/instant.nvim/"; }; - intellitab-nvim = buildVimPluginFrom2Nix { + intellitab-nvim = buildVimPlugin { pname = "intellitab.nvim"; version = "2021-11-13"; src = fetchFromGitHub { @@ -4448,7 +4484,7 @@ final: prev: meta.homepage = "https://github.com/pta2002/intellitab.nvim/"; }; - intero-neovim = buildVimPluginFrom2Nix { + intero-neovim = buildVimPlugin { pname = "intero-neovim"; version = "2019-11-15"; src = fetchFromGitHub { @@ -4460,7 +4496,7 @@ final: prev: meta.homepage = "https://github.com/parsonsmatt/intero-neovim/"; }; - investigate-vim = buildVimPluginFrom2Nix { + investigate-vim = buildVimPlugin { pname = "investigate.vim"; version = "2020-02-29"; src = fetchFromGitHub { @@ -4472,7 +4508,7 @@ final: prev: meta.homepage = "https://github.com/keith/investigate.vim/"; }; - iosvkem = buildVimPluginFrom2Nix { + iosvkem = buildVimPlugin { pname = "iosvkem"; version = "2021-03-26"; src = fetchFromGitHub { @@ -4484,7 +4520,7 @@ final: prev: meta.homepage = "https://github.com/neutaaaaan/iosvkem/"; }; - ir_black = buildVimPluginFrom2Nix { + ir_black = buildVimPlugin { pname = "ir_black"; version = "2012-03-05"; src = fetchFromGitHub { @@ -4496,7 +4532,7 @@ final: prev: meta.homepage = "https://github.com/twerth/ir_black/"; }; - iron-nvim = buildVimPluginFrom2Nix { + iron-nvim = buildVimPlugin { pname = "iron.nvim"; version = "2023-07-13"; src = fetchFromGitHub { @@ -4508,7 +4544,7 @@ final: prev: meta.homepage = "https://github.com/Vigemus/iron.nvim/"; }; - is-vim = buildVimPluginFrom2Nix { + is-vim = buildVimPlugin { pname = "is.vim"; version = "2020-10-27"; src = fetchFromGitHub { @@ -4520,7 +4556,7 @@ final: prev: meta.homepage = "https://github.com/haya14busa/is.vim/"; }; - jdaddy-vim = buildVimPluginFrom2Nix { + jdaddy-vim = buildVimPlugin { pname = "jdaddy.vim"; version = "2014-02-22"; src = fetchFromGitHub { @@ -4532,7 +4568,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/jdaddy.vim/"; }; - jedi-vim = buildVimPluginFrom2Nix { + jedi-vim = buildVimPlugin { pname = "jedi-vim"; version = "2023-07-31"; src = fetchFromGitHub { @@ -4545,7 +4581,7 @@ final: prev: meta.homepage = "https://github.com/davidhalter/jedi-vim/"; }; - jellybeans-nvim = buildVimPluginFrom2Nix { + jellybeans-nvim = buildVimPlugin { pname = "jellybeans-nvim"; version = "2022-03-21"; src = fetchFromGitHub { @@ -4557,7 +4593,7 @@ final: prev: meta.homepage = "https://github.com/metalelf0/jellybeans-nvim/"; }; - jellybeans-vim = buildVimPluginFrom2Nix { + jellybeans-vim = buildVimPlugin { pname = "jellybeans.vim"; version = "2019-06-22"; src = fetchFromGitHub { @@ -4569,7 +4605,7 @@ final: prev: meta.homepage = "https://github.com/nanotech/jellybeans.vim/"; }; - jinja-vim = buildVimPluginFrom2Nix { + jinja-vim = buildVimPlugin { pname = "jinja.vim"; version = "2020-06-18"; src = fetchFromGitHub { @@ -4581,7 +4617,7 @@ final: prev: meta.homepage = "https://github.com/HiPhish/jinja.vim/"; }; - jq-vim = buildVimPluginFrom2Nix { + jq-vim = buildVimPlugin { pname = "jq.vim"; version = "2022-11-26"; src = fetchFromGitHub { @@ -4593,7 +4629,7 @@ final: prev: meta.homepage = "https://github.com/vito-c/jq.vim/"; }; - jsonc-vim = buildVimPluginFrom2Nix { + jsonc-vim = buildVimPlugin { pname = "jsonc.vim"; version = "2022-10-31"; src = fetchFromGitHub { @@ -4605,7 +4641,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/jsonc.vim/"; }; - julia-vim = buildVimPluginFrom2Nix { + julia-vim = buildVimPlugin { pname = "julia-vim"; version = "2023-07-05"; src = fetchFromGitHub { @@ -4617,19 +4653,19 @@ final: prev: meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; - kanagawa-nvim = buildVimPluginFrom2Nix { + kanagawa-nvim = buildVimPlugin { pname = "kanagawa.nvim"; - version = "2023-06-21"; + version = "2023-09-13"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "1749cea392acb7d1548a946fcee1e6f1304cd3cb"; - sha256 = "0ycypsagk3aq9rf5y234bwrj2fw9h1hd73phavjbazi3zhi8yb6y"; + rev = "a4e99f089110c6d00bc33f5497709200e914e763"; + sha256 = "0c8fqpxxgp7k5yvqf28fwxjfwqnyvl55hapw0vlmaak93qnfndxq"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; - keymap-layer-nvim = buildVimPluginFrom2Nix { + keymap-layer-nvim = buildVimPlugin { pname = "keymap-layer.nvim"; version = "2022-07-16"; src = fetchFromGitHub { @@ -4641,7 +4677,7 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/keymap-layer.nvim/"; }; - kmonad-vim = buildVimPluginFrom2Nix { + kmonad-vim = buildVimPlugin { pname = "kmonad-vim"; version = "2022-03-20"; src = fetchFromGitHub { @@ -4653,7 +4689,7 @@ final: prev: meta.homepage = "https://github.com/kmonad/kmonad-vim/"; }; - knap = buildVimPluginFrom2Nix { + knap = buildVimPlugin { pname = "knap"; version = "2023-07-25"; src = fetchFromGitHub { @@ -4665,7 +4701,7 @@ final: prev: meta.homepage = "https://github.com/frabjous/knap/"; }; - kommentary = buildVimPluginFrom2Nix { + kommentary = buildVimPlugin { pname = "kommentary"; version = "2023-01-06"; src = fetchFromGitHub { @@ -4677,7 +4713,7 @@ final: prev: meta.homepage = "https://github.com/b3nj5m1n/kommentary/"; }; - kotlin-vim = buildVimPluginFrom2Nix { + kotlin-vim = buildVimPlugin { pname = "kotlin-vim"; version = "2022-12-30"; src = fetchFromGitHub { @@ -4689,7 +4725,7 @@ final: prev: meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; - lalrpop-vim = buildVimPluginFrom2Nix { + lalrpop-vim = buildVimPlugin { pname = "lalrpop.vim"; version = "2017-11-22"; src = fetchFromGitHub { @@ -4701,7 +4737,7 @@ final: prev: meta.homepage = "https://github.com/qnighy/lalrpop.vim/"; }; - last256 = buildVimPluginFrom2Nix { + last256 = buildVimPlugin { pname = "last256"; version = "2020-12-09"; src = fetchFromGitHub { @@ -4713,7 +4749,7 @@ final: prev: meta.homepage = "https://github.com/sk1418/last256/"; }; - latex-box = buildVimPluginFrom2Nix { + latex-box = buildVimPlugin { pname = "latex-box"; version = "2015-06-01"; src = fetchFromGitHub { @@ -4725,55 +4761,55 @@ final: prev: meta.homepage = "https://github.com/latex-box-team/latex-box/"; }; - lazy-lsp-nvim = buildVimPluginFrom2Nix { + lazy-lsp-nvim = buildVimPlugin { pname = "lazy-lsp.nvim"; - version = "2023-08-11"; + version = "2023-09-13"; src = fetchFromGitHub { owner = "dundalek"; repo = "lazy-lsp.nvim"; - rev = "4b10237a7f9e5ab678eb384a4266e2e28e8472f7"; - sha256 = "1rblszvg8g7bvqlx8f6dhr3hrs7azki2sbh60r5kk3p8884sjfyd"; + rev = "287d190557fdec28e10eb1a4312422d09e261911"; + sha256 = "1mg4lzr1zscdwjngi6iw4pcl8awn1pbml8z680z6ga38m2xlz4q7"; }; meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/"; }; - lazy-nvim = buildVimPluginFrom2Nix { + lazy-nvim = buildVimPlugin { pname = "lazy.nvim"; - version = "2023-07-30"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "folke"; repo = "lazy.nvim"; - rev = "dac844ed617dda4f9ec85eb88e9629ad2add5e05"; - sha256 = "1sd7xg2ql1frr293x976phv6k1r9r01jn48ip60b6pmq80x7gvj6"; + rev = "59335c5b9d116f5d3948f833288a89e2a829a005"; + sha256 = "04x04mzs3cc736l4phsws981nsga8hws3ca46pniz5h3qhj8zfwa"; }; meta.homepage = "https://github.com/folke/lazy.nvim/"; }; - lazygit-nvim = buildVimPluginFrom2Nix { + lazygit-nvim = buildVimPlugin { pname = "lazygit.nvim"; - version = "2023-08-07"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "kdheepak"; repo = "lazygit.nvim"; - rev = "22e51e03268fabe068a77e2bd316ac25ff2084f9"; - sha256 = "1zp6mp79dl4af0pppyv8ik7klnf6ajrmlqzhn18him9ijzw8jb9n"; + rev = "de35012036d43bca03628d40d083f7c02a4cda3f"; + sha256 = "1wgcl487gijm0ydp8n79jc8pmh947vphhh67vk6p79fxaihc56bl"; }; meta.homepage = "https://github.com/kdheepak/lazygit.nvim/"; }; - lean-nvim = buildVimPluginFrom2Nix { + lean-nvim = buildVimPlugin { pname = "lean.nvim"; - version = "2023-08-11"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "67580fab5bed73920fa3fdd712fc8e805c389c3d"; - sha256 = "1wpklaiyk0hcipmrc1ampqn6x4qhag2srrb7cz22smh74bhw66cd"; + rev = "cd33d84e954ac15b42020889d1d0d6a9cc0e9e9c"; + sha256 = "11gkkc32ha1n6b7x88mvnw1afkp45mx8abpa1c4hkc2x7666sxc5"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; - lean-vim = buildVimPluginFrom2Nix { + lean-vim = buildVimPlugin { pname = "lean.vim"; version = "2021-09-29"; src = fetchFromGitHub { @@ -4785,7 +4821,7 @@ final: prev: meta.homepage = "https://github.com/leanprover/lean.vim/"; }; - leap-ast-nvim = buildVimPluginFrom2Nix { + leap-ast-nvim = buildVimPlugin { pname = "leap-ast.nvim"; version = "2022-10-10"; src = fetchFromGitHub { @@ -4797,7 +4833,7 @@ final: prev: meta.homepage = "https://github.com/ggandor/leap-ast.nvim/"; }; - leap-nvim = buildVimPluginFrom2Nix { + leap-nvim = buildVimPlugin { pname = "leap.nvim"; version = "2023-07-23"; src = fetchFromGitHub { @@ -4809,7 +4845,7 @@ final: prev: meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; - legendary-nvim = buildVimPluginFrom2Nix { + legendary-nvim = buildVimPlugin { pname = "legendary.nvim"; version = "2023-07-08"; src = fetchFromGitHub { @@ -4821,7 +4857,7 @@ final: prev: meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; - lens-vim = buildVimPluginFrom2Nix { + lens-vim = buildVimPlugin { pname = "lens.vim"; version = "2021-05-30"; src = fetchFromGitHub { @@ -4833,7 +4869,7 @@ final: prev: meta.homepage = "https://github.com/camspiers/lens.vim/"; }; - lessspace-vim = buildVimPluginFrom2Nix { + lessspace-vim = buildVimPlugin { pname = "lessspace.vim"; version = "2023-02-13"; src = fetchFromGitHub { @@ -4845,19 +4881,19 @@ final: prev: meta.homepage = "https://github.com/thirtythreeforty/lessspace.vim/"; }; - lexima-vim = buildVimPluginFrom2Nix { + lexima-vim = buildVimPlugin { pname = "lexima.vim"; - version = "2023-06-23"; + version = "2023-09-04"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "1f5dd656018f83ad03bddda216bd5c04d23ba57d"; - sha256 = "12q0pv1lax8xkmy54dlvd5c7ibq4gkbd1zlangsqc4xiq7nnq7jg"; + rev = "b1e1b1bde07c1efc97288c98c5912eaa644ee6e1"; + sha256 = "1dk32rjahn6grwq1gdxnxs6pavjzhkml7zb3pg1ky75pivs1rlgr"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; - lf-vim = buildVimPluginFrom2Nix { + lf-vim = buildVimPlugin { pname = "lf.vim"; version = "2022-08-24"; src = fetchFromGitHub { @@ -4869,7 +4905,7 @@ final: prev: meta.homepage = "https://github.com/ptzz/lf.vim/"; }; - lh-brackets = buildVimPluginFrom2Nix { + lh-brackets = buildVimPlugin { pname = "lh-brackets"; version = "2023-05-16"; src = fetchFromGitHub { @@ -4881,7 +4917,7 @@ final: prev: meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; - lh-vim-lib = buildVimPluginFrom2Nix { + lh-vim-lib = buildVimPlugin { pname = "lh-vim-lib"; version = "2023-05-16"; src = fetchFromGitHub { @@ -4893,7 +4929,7 @@ final: prev: meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; - lightline-ale = buildVimPluginFrom2Nix { + lightline-ale = buildVimPlugin { pname = "lightline-ale"; version = "2021-06-09"; src = fetchFromGitHub { @@ -4905,7 +4941,7 @@ final: prev: meta.homepage = "https://github.com/maximbaz/lightline-ale/"; }; - lightline-bufferline = buildVimPluginFrom2Nix { + lightline-bufferline = buildVimPlugin { pname = "lightline-bufferline"; version = "2023-06-06"; src = fetchFromGitHub { @@ -4917,7 +4953,7 @@ final: prev: meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; - lightline-gruvbox-vim = buildVimPluginFrom2Nix { + lightline-gruvbox-vim = buildVimPlugin { pname = "lightline-gruvbox.vim"; version = "2023-04-02"; src = fetchFromGitHub { @@ -4929,7 +4965,7 @@ final: prev: meta.homepage = "https://github.com/shinchu/lightline-gruvbox.vim/"; }; - lightline-lsp = buildVimPluginFrom2Nix { + lightline-lsp = buildVimPlugin { pname = "lightline-lsp"; version = "2023-03-15"; src = fetchFromGitHub { @@ -4941,19 +4977,19 @@ final: prev: meta.homepage = "https://github.com/spywhere/lightline-lsp/"; }; - lightline-vim = buildVimPluginFrom2Nix { + lightline-vim = buildVimPlugin { pname = "lightline.vim"; - version = "2022-10-05"; + version = "2023-09-03"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "b1e91b41f5028d65fa3d31a425ff21591d5d957f"; - sha256 = "0xb0hdjk4dww80s2ypvgz5rsvv41b07hskahz8r7xq6si5m5scrn"; + rev = "f11645cc6d37871244f2ea0ae972d3f6af9c8f73"; + sha256 = "0gqqbwsvdfigqk2c22i6hmyzqk42qwgqnnpbpivyam4m4f8rpka8"; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; - lightspeed-nvim = buildVimPluginFrom2Nix { + lightspeed-nvim = buildVimPlugin { pname = "lightspeed.nvim"; version = "2022-10-21"; src = fetchFromGitHub { @@ -4965,7 +5001,7 @@ final: prev: meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; - limelight-vim = buildVimPluginFrom2Nix { + limelight-vim = buildVimPlugin { pname = "limelight.vim"; version = "2022-08-03"; src = fetchFromGitHub { @@ -4977,7 +5013,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; - lingua-franca-vim = buildVimPluginFrom2Nix { + lingua-franca-vim = buildVimPlugin { pname = "lingua-franca.vim"; version = "2021-09-05"; src = fetchFromGitHub { @@ -4989,7 +5025,7 @@ final: prev: meta.homepage = "https://github.com/lf-lang/lingua-franca.vim/"; }; - lir-nvim = buildVimPluginFrom2Nix { + lir-nvim = buildVimPlugin { pname = "lir.nvim"; version = "2023-07-12"; src = fetchFromGitHub { @@ -5001,7 +5037,7 @@ final: prev: meta.homepage = "https://github.com/tamago324/lir.nvim/"; }; - lispdocs-nvim = buildVimPluginFrom2Nix { + lispdocs-nvim = buildVimPlugin { pname = "lispdocs.nvim"; version = "2022-07-05"; src = fetchFromGitHub { @@ -5013,7 +5049,7 @@ final: prev: meta.homepage = "https://github.com/kkharji/lispdocs.nvim/"; }; - litee-calltree-nvim = buildVimPluginFrom2Nix { + litee-calltree-nvim = buildVimPlugin { pname = "litee-calltree.nvim"; version = "2022-09-28"; src = fetchFromGitHub { @@ -5025,7 +5061,7 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; - litee-filetree-nvim = buildVimPluginFrom2Nix { + litee-filetree-nvim = buildVimPlugin { pname = "litee-filetree.nvim"; version = "2022-09-27"; src = fetchFromGitHub { @@ -5037,7 +5073,7 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; - litee-symboltree-nvim = buildVimPluginFrom2Nix { + litee-symboltree-nvim = buildVimPlugin { pname = "litee-symboltree.nvim"; version = "2022-09-28"; src = fetchFromGitHub { @@ -5049,7 +5085,7 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; }; - litee-nvim = buildVimPluginFrom2Nix { + litee-nvim = buildVimPlugin { pname = "litee.nvim"; version = "2022-12-11"; src = fetchFromGitHub { @@ -5061,7 +5097,7 @@ final: prev: meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; - live-command-nvim = buildVimPluginFrom2Nix { + live-command-nvim = buildVimPlugin { pname = "live-command.nvim"; version = "2023-06-05"; src = fetchFromGitHub { @@ -5073,7 +5109,7 @@ final: prev: meta.homepage = "https://github.com/smjonas/live-command.nvim/"; }; - lsp-colors-nvim = buildVimPluginFrom2Nix { + lsp-colors-nvim = buildVimPlugin { pname = "lsp-colors.nvim"; version = "2023-02-27"; src = fetchFromGitHub { @@ -5085,19 +5121,19 @@ final: prev: meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; }; - lsp-format-nvim = buildVimPluginFrom2Nix { + lsp-format-nvim = buildVimPlugin { pname = "lsp-format.nvim"; - version = "2022-11-25"; + version = "2023-09-13"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "lsp-format.nvim"; - rev = "ca0df5c8544e51517209ea7b86ecc522c98d4f0a"; - sha256 = "1c4hwd1v72scdwh5ydcqirx7m03ngsw3mxmjvd9cd3n3n7x8rrsi"; + rev = "e8782a5468a4849ae440a1531be559d85aebe142"; + sha256 = "04rpqhp66icj4l21wj6pk15mj2v78yhphccylgkjky8934rqpn6r"; }; meta.homepage = "https://github.com/lukas-reineke/lsp-format.nvim/"; }; - lsp-inlayhints-nvim = buildVimPluginFrom2Nix { + lsp-inlayhints-nvim = buildVimPlugin { pname = "lsp-inlayhints.nvim"; version = "2023-06-08"; src = fetchFromGitHub { @@ -5109,7 +5145,7 @@ final: prev: meta.homepage = "https://github.com/lvimuser/lsp-inlayhints.nvim/"; }; - lsp-overloads-nvim = buildVimPluginFrom2Nix { + lsp-overloads-nvim = buildVimPlugin { pname = "lsp-overloads.nvim"; version = "2023-08-13"; src = fetchFromGitHub { @@ -5121,7 +5157,7 @@ final: prev: meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/"; }; - lsp-rooter-nvim = buildVimPluginFrom2Nix { + lsp-rooter-nvim = buildVimPlugin { pname = "lsp-rooter.nvim"; version = "2021-08-13"; src = fetchFromGitHub { @@ -5133,7 +5169,7 @@ final: prev: meta.homepage = "https://github.com/ahmedkhalf/lsp-rooter.nvim/"; }; - lsp-status-nvim = buildVimPluginFrom2Nix { + lsp-status-nvim = buildVimPlugin { pname = "lsp-status.nvim"; version = "2022-08-03"; src = fetchFromGitHub { @@ -5145,19 +5181,19 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; - lsp-zero-nvim = buildVimPluginFrom2Nix { + lsp-zero-nvim = buildVimPlugin { pname = "lsp-zero.nvim"; - version = "2023-08-08"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "lsp-zero.nvim"; - rev = "fc3a15047a5b831c83143d90cd25d0b7bcfd0111"; - sha256 = "0rzipjbzb57hwgclbpjww9vgn3x2arp8a831lfc4a0ij8cr223cc"; + rev = "60b0e84f3793f7e8bcc9ec52f9c239fd497b2cd2"; + sha256 = "1dxlqn3zi0vwi8180gz4ang5hm0ds4faiii03kw88xsnzkzlrd6h"; }; meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/"; }; - lsp_extensions-nvim = buildVimPluginFrom2Nix { + lsp_extensions-nvim = buildVimPlugin { pname = "lsp_extensions.nvim"; version = "2022-07-07"; src = fetchFromGitHub { @@ -5169,30 +5205,30 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/lsp_extensions.nvim/"; }; - lsp_lines-nvim = buildVimPluginFrom2Nix { + lsp_lines-nvim = buildVimPlugin { pname = "lsp_lines.nvim"; - version = "2023-05-15"; + version = "2023-09-25"; src = fetchgit { url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - rev = "f53af96d4789eef39a082dbcce078d2bfc384ece"; - sha256 = "11nsp21n1lhjl6m4mgj1vdcvalik9dmvv8baflzd2njb5g3gc5v6"; + rev = "9e3f99fbbd28aaec80dc0158c43be8cca8dd5017"; + sha256 = "1rva0ykikkj8wssga5h0ccqarkvcvi9g2kgr3il889v3zsim7d2m"; }; meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; }; - lsp_signature-nvim = buildVimPluginFrom2Nix { + lsp_signature-nvim = buildVimPlugin { pname = "lsp_signature.nvim"; - version = "2023-07-25"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "58d4e810801da74c29313da86075d6aea537501f"; - sha256 = "14v8mkv3q7l0pv63i3sgiv81bg5yfq927n94nrfz7nwfmg82rxxa"; + rev = "bdf3dc7bb03edd25c2173e0e31c2fb122052ed23"; + sha256 = "16lca28qd9aik71lb9vkfg0ypsabx36j9aqaqjsihbhb2b2z8v4p"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; - lspcontainers-nvim = buildVimPluginFrom2Nix { + lspcontainers-nvim = buildVimPlugin { pname = "lspcontainers.nvim"; version = "2023-06-03"; src = fetchFromGitHub { @@ -5204,7 +5240,7 @@ final: prev: meta.homepage = "https://github.com/lspcontainers/lspcontainers.nvim/"; }; - lspkind-nvim = buildVimPluginFrom2Nix { + lspkind-nvim = buildVimPlugin { pname = "lspkind-nvim"; version = "2023-05-05"; src = fetchFromGitHub { @@ -5216,19 +5252,19 @@ final: prev: meta.homepage = "https://github.com/onsails/lspkind.nvim/"; }; - lspsaga-nvim = buildVimPluginFrom2Nix { + lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "2023-08-19"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "93a2ae4c03d1f1c138f5a38f1cbc3808479b434e"; - sha256 = "0pzpqlb5q253md220whnj7llchh7w174vn9f7d3d4n5cldninkmn"; + rev = "f8a6d7cfe185637616d7fdee676dd543ae5fde55"; + sha256 = "0vwk2nn8mm113lk6sywdgfp6k0887d14pys9w8b6k4hm8xw5zfzq"; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; }; - ltex_extra-nvim = buildVimPluginFrom2Nix { + ltex_extra-nvim = buildVimPlugin { pname = "ltex_extra.nvim"; version = "2023-07-28"; src = fetchFromGitHub { @@ -5240,7 +5276,7 @@ final: prev: meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/"; }; - lualine-lsp-progress = buildVimPluginFrom2Nix { + lualine-lsp-progress = buildVimPlugin { pname = "lualine-lsp-progress"; version = "2021-10-23"; src = fetchFromGitHub { @@ -5252,7 +5288,7 @@ final: prev: meta.homepage = "https://github.com/arkav/lualine-lsp-progress/"; }; - lualine-nvim = buildVimPluginFrom2Nix { + lualine-nvim = buildVimPlugin { pname = "lualine.nvim"; version = "2023-08-03"; src = fetchFromGitHub { @@ -5264,20 +5300,20 @@ final: prev: meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; - luasnip = buildVimPluginFrom2Nix { + luasnip = buildVimPlugin { pname = "luasnip"; - version = "2023-08-18"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "c4d6298347f7707e9757351b2ee03d0c00da5c20"; - sha256 = "0i6llbq26wpnx1za2mh37ja01zqjv8nv3npk6spadvv57yb0m38f"; + rev = "480b032f6708573334f4437d3f83307d143f1a72"; + sha256 = "0jb4aaspl3xcqafqych973qrgnnp5bqhvinf03id8494da8zf9z7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; - luatab-nvim = buildVimPluginFrom2Nix { + luatab-nvim = buildVimPlugin { pname = "luatab.nvim"; version = "2021-12-05"; src = fetchFromGitHub { @@ -5291,17 +5327,17 @@ final: prev: lush-nvim = buildNeovimPlugin { pname = "lush.nvim"; - version = "2023-08-03"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "a8f0f7b9f837887f13a61d67b40ae26188fe4d62"; - sha256 = "1zni7l5ldfv1inq30b7kqg1mv26558hif4nssawk5mjisjwdlwsp"; + rev = "966aad1accd47fa11fbe2539234f81f678fef2de"; + sha256 = "0g1xib2k42py9qqccjz11qk52ri0drgdk5rb0ls7wzx4v636k15h"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; - lushtags = buildVimPluginFrom2Nix { + lushtags = buildVimPlugin { pname = "lushtags"; version = "2017-04-19"; src = fetchFromGitHub { @@ -5313,7 +5349,7 @@ final: prev: meta.homepage = "https://github.com/mkasa/lushtags/"; }; - magma-nvim-goose = buildVimPluginFrom2Nix { + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-07-04"; src = fetchFromGitHub { @@ -5325,7 +5361,7 @@ final: prev: meta.homepage = "https://github.com/WhiteBlackGoose/magma-nvim-goose/"; }; - mark-radar-nvim = buildVimPluginFrom2Nix { + mark-radar-nvim = buildVimPlugin { pname = "mark-radar.nvim"; version = "2021-06-22"; src = fetchFromGitHub { @@ -5337,7 +5373,7 @@ final: prev: meta.homepage = "https://github.com/winston0410/mark-radar.nvim/"; }; - markdown-preview-nvim = buildVimPluginFrom2Nix { + markdown-preview-nvim = buildVimPlugin { pname = "markdown-preview.nvim"; version = "2022-05-13"; src = fetchFromGitHub { @@ -5349,7 +5385,7 @@ final: prev: meta.homepage = "https://github.com/iamcco/markdown-preview.nvim/"; }; - markid = buildVimPluginFrom2Nix { + markid = buildVimPlugin { pname = "markid"; version = "2023-07-01"; src = fetchFromGitHub { @@ -5361,7 +5397,7 @@ final: prev: meta.homepage = "https://github.com/David-Kunz/markid/"; }; - marks-nvim = buildVimPluginFrom2Nix { + marks-nvim = buildVimPlugin { pname = "marks.nvim"; version = "2023-02-25"; src = fetchFromGitHub { @@ -5373,43 +5409,43 @@ final: prev: meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; - mason-lspconfig-nvim = buildVimPluginFrom2Nix { + mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2023-08-19"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "7e8208a4d936f93303cc229af865a2cd226c807f"; - sha256 = "0g3jcssr9603i0khqyijgizb3427h67x2zqwrrcwsmm6c4n7c7mg"; + rev = "48025d62f45af52ba47e4193b854864839392e4c"; + sha256 = "1n3xlfjjjwng0rhlgvl0dj25fhlfk35vscwmz1kpdad627lzg83b"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; - mason-tool-installer-nvim = buildVimPluginFrom2Nix { + mason-tool-installer-nvim = buildVimPlugin { pname = "mason-tool-installer.nvim"; - version = "2023-07-13"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "WhoIsSethDaniel"; repo = "mason-tool-installer.nvim"; - rev = "031903fefbf59371502092ef9e22cab9161d90ba"; - sha256 = "1za6shsh5ykdv9ivf971b3ckfxk25p8lsd9qdgrmm5bag6vih8cl"; + rev = "83dcddb6477f9ba5db98971ef27bd18bdca921b4"; + sha256 = "1g04jj1z7ak74b8rccwhmg1yqlfxhhn3mblsqzxbz48xy4bjlsdp"; }; meta.homepage = "https://github.com/WhoIsSethDaniel/mason-tool-installer.nvim/"; }; - mason-nvim = buildVimPluginFrom2Nix { + mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2023-08-19"; + version = "2023-09-10"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "a51c2d063c5377ee9e58c5f9cda7c7436787be72"; - sha256 = "041fpyaxjgpd9aqy0afd16pg0ph9vxf5nr7247hgdzrlfs83kxyd"; + rev = "d66c60e17dd6fd8165194b1d14d21f7eb2c1697a"; + sha256 = "01k4xxfmhdip6vniwj4lai7fqp5dyh799cfyrjqmqqxx25q7m8aj"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; - matchit-zip = buildVimPluginFrom2Nix { + matchit-zip = buildVimPlugin { pname = "matchit.zip"; version = "2010-10-18"; src = fetchFromGitHub { @@ -5421,7 +5457,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/matchit.zip/"; }; - material-nvim = buildVimPluginFrom2Nix { + material-nvim = buildVimPlugin { pname = "material.nvim"; version = "2023-07-11"; src = fetchFromGitHub { @@ -5433,7 +5469,7 @@ final: prev: meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; - material-vim = buildVimPluginFrom2Nix { + material-vim = buildVimPlugin { pname = "material.vim"; version = "2023-02-09"; src = fetchFromGitHub { @@ -5445,7 +5481,7 @@ final: prev: meta.homepage = "https://github.com/kaicataldo/material.vim/"; }; - mayansmoke = buildVimPluginFrom2Nix { + mayansmoke = buildVimPlugin { pname = "mayansmoke"; version = "2010-10-18"; src = fetchFromGitHub { @@ -5457,7 +5493,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/mayansmoke/"; }; - mediawiki-vim = buildVimPluginFrom2Nix { + mediawiki-vim = buildVimPlugin { pname = "mediawiki.vim"; version = "2015-11-15"; src = fetchFromGitHub { @@ -5469,7 +5505,7 @@ final: prev: meta.homepage = "https://github.com/chikamichi/mediawiki.vim/"; }; - melange-nvim = buildVimPluginFrom2Nix { + melange-nvim = buildVimPlugin { pname = "melange-nvim"; version = "2023-08-11"; src = fetchFromGitHub { @@ -5481,7 +5517,7 @@ final: prev: meta.homepage = "https://github.com/savq/melange-nvim/"; }; - mind-nvim = buildVimPluginFrom2Nix { + mind-nvim = buildVimPlugin { pname = "mind.nvim"; version = "2023-03-22"; src = fetchFromGitHub { @@ -5493,19 +5529,19 @@ final: prev: meta.homepage = "https://github.com/phaazon/mind.nvim/"; }; - mini-nvim = buildVimPluginFrom2Nix { + mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "2023-08-19"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "ab94192dd36b35c6752aac7154c7130922c27af7"; - sha256 = "0pyrrfhhwcvbp9g729krjf0hf0a5qnjpggxqwmmbdarfkw5lwkv0"; + rev = "1fdbb864e2015eb6f501394d593630f825154385"; + sha256 = "1iivgd0hlsi6d3i9lzffy74ilra7rigmdq6z3wrdfv33iwgm1k12"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; - minimap-vim = buildVimPluginFrom2Nix { + minimap-vim = buildVimPlugin { pname = "minimap.vim"; version = "2023-07-25"; src = fetchFromGitHub { @@ -5517,7 +5553,7 @@ final: prev: meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; - mkdir-nvim = buildVimPluginFrom2Nix { + mkdir-nvim = buildVimPlugin { pname = "mkdir.nvim"; version = "2022-07-23"; src = fetchFromGitHub { @@ -5529,7 +5565,7 @@ final: prev: meta.homepage = "https://github.com/jghauser/mkdir.nvim/"; }; - mkdnflow-nvim = buildVimPluginFrom2Nix { + mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; version = "2023-07-05"; src = fetchFromGitHub { @@ -5541,31 +5577,31 @@ final: prev: meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; }; - mkdx = buildVimPluginFrom2Nix { + mkdx = buildVimPlugin { pname = "mkdx"; - version = "2023-08-01"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "d4202fea214267ed4e31ce9c8df3115600db28c7"; - sha256 = "0z5zmmyaph1h6aakdjxn2c7wi3hsshwvdafxbk8iijc31n37lf6n"; + rev = "4a8067468b4372d58f519eb55708b524a893d67d"; + sha256 = "19x472gv6x7pz3ln91s2n4r31b0s435g5rzwrdvzv5dmairgxxiq"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; - modicator-nvim = buildVimPluginFrom2Nix { + modicator-nvim = buildVimPlugin { pname = "modicator.nvim"; - version = "2023-06-29"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "mawkler"; repo = "modicator.nvim"; - rev = "2c19ec450532159fa4cf8f89a01d3de07d929c59"; - sha256 = "0k40hxc8vi745rpxnsrwlv437rfydgiad7nmzi44iskarm0la257"; + rev = "f0edf906a230a4ca37a32aa510d4cd346db46548"; + sha256 = "1gk97yr60s7i6kc7z4m2vxcqb6s5lb9ypgib6vy61g34vk6fld1d"; }; meta.homepage = "https://github.com/mawkler/modicator.nvim/"; }; - molokai = buildVimPluginFrom2Nix { + molokai = buildVimPlugin { pname = "molokai"; version = "2015-11-11"; src = fetchFromGitHub { @@ -5577,19 +5613,19 @@ final: prev: meta.homepage = "https://github.com/tomasr/molokai/"; }; - monokai-pro-nvim = buildVimPluginFrom2Nix { + monokai-pro-nvim = buildVimPlugin { pname = "monokai-pro.nvim"; - version = "2023-07-20"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "loctvl842"; repo = "monokai-pro.nvim"; - rev = "cdad962b234580715bb3da4bf913c723280f9e5d"; - sha256 = "1i05xil5nc3rr9x0vxr9pnqwbsbp01k9rl8rbhi6kv3cx8gs2q6y"; + rev = "6b3bf9a4e0c988471969f62b36486023b33dd963"; + sha256 = "1frrsxvvklq6lpwclqsknqwpca1bgb13ijwj17x2x69bnzd13vhi"; }; meta.homepage = "https://github.com/loctvl842/monokai-pro.nvim/"; }; - moonscript-vim = buildVimPluginFrom2Nix { + moonscript-vim = buildVimPlugin { pname = "moonscript-vim"; version = "2016-11-22"; src = fetchFromGitHub { @@ -5601,7 +5637,7 @@ final: prev: meta.homepage = "https://github.com/leafo/moonscript-vim/"; }; - mru = buildVimPluginFrom2Nix { + mru = buildVimPlugin { pname = "mru"; version = "2023-05-27"; src = fetchFromGitHub { @@ -5613,7 +5649,19 @@ final: prev: meta.homepage = "https://github.com/yegappan/mru/"; }; - nabla-nvim = buildVimPluginFrom2Nix { + multicursors-nvim = buildVimPlugin { + pname = "multicursors.nvim"; + version = "2023-09-16"; + src = fetchFromGitHub { + owner = "smoka7"; + repo = "multicursors.nvim"; + rev = "b7a837496da6f5b39b610a7cbd6c3f7d05526d6e"; + sha256 = "0mf282j3xq76h7jzgyy7wgbjw17vglx49ybrjxn08bix9vnvx1y4"; + }; + meta.homepage = "https://github.com/smoka7/multicursors.nvim/"; + }; + + nabla-nvim = buildVimPlugin { pname = "nabla.nvim"; version = "2023-04-22"; src = fetchFromGitHub { @@ -5625,7 +5673,7 @@ final: prev: meta.homepage = "https://github.com/jbyuki/nabla.nvim/"; }; - ncm2 = buildVimPluginFrom2Nix { + ncm2 = buildVimPlugin { pname = "ncm2"; version = "2022-03-17"; src = fetchFromGitHub { @@ -5637,7 +5685,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2/"; }; - ncm2-bufword = buildVimPluginFrom2Nix { + ncm2-bufword = buildVimPlugin { pname = "ncm2-bufword"; version = "2019-01-19"; src = fetchFromGitHub { @@ -5649,7 +5697,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-bufword/"; }; - ncm2-cssomni = buildVimPluginFrom2Nix { + ncm2-cssomni = buildVimPlugin { pname = "ncm2-cssomni"; version = "2018-07-09"; src = fetchFromGitHub { @@ -5661,7 +5709,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-cssomni/"; }; - ncm2-dictionary = buildVimPluginFrom2Nix { + ncm2-dictionary = buildVimPlugin { pname = "ncm2-dictionary"; version = "2018-11-15"; src = fetchFromGitHub { @@ -5673,7 +5721,7 @@ final: prev: meta.homepage = "https://github.com/yuki-yano/ncm2-dictionary/"; }; - ncm2-github = buildVimPluginFrom2Nix { + ncm2-github = buildVimPlugin { pname = "ncm2-github"; version = "2018-08-01"; src = fetchFromGitHub { @@ -5685,7 +5733,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-github/"; }; - ncm2-html-subscope = buildVimPluginFrom2Nix { + ncm2-html-subscope = buildVimPlugin { pname = "ncm2-html-subscope"; version = "2018-07-01"; src = fetchFromGitHub { @@ -5697,7 +5745,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-html-subscope/"; }; - ncm2-jedi = buildVimPluginFrom2Nix { + ncm2-jedi = buildVimPlugin { pname = "ncm2-jedi"; version = "2021-01-05"; src = fetchFromGitHub { @@ -5709,7 +5757,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-jedi/"; }; - ncm2-markdown-subscope = buildVimPluginFrom2Nix { + ncm2-markdown-subscope = buildVimPlugin { pname = "ncm2-markdown-subscope"; version = "2020-03-09"; src = fetchFromGitHub { @@ -5721,7 +5769,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-markdown-subscope/"; }; - ncm2-neoinclude = buildVimPluginFrom2Nix { + ncm2-neoinclude = buildVimPlugin { pname = "ncm2-neoinclude"; version = "2020-07-19"; src = fetchFromGitHub { @@ -5733,7 +5781,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-neoinclude/"; }; - ncm2-neosnippet = buildVimPluginFrom2Nix { + ncm2-neosnippet = buildVimPlugin { pname = "ncm2-neosnippet"; version = "2021-10-08"; src = fetchFromGitHub { @@ -5745,7 +5793,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-neosnippet/"; }; - ncm2-path = buildVimPluginFrom2Nix { + ncm2-path = buildVimPlugin { pname = "ncm2-path"; version = "2019-02-20"; src = fetchFromGitHub { @@ -5757,7 +5805,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-path/"; }; - ncm2-syntax = buildVimPluginFrom2Nix { + ncm2-syntax = buildVimPlugin { pname = "ncm2-syntax"; version = "2020-07-19"; src = fetchFromGitHub { @@ -5769,7 +5817,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-syntax/"; }; - ncm2-tagprefix = buildVimPluginFrom2Nix { + ncm2-tagprefix = buildVimPlugin { pname = "ncm2-tagprefix"; version = "2018-11-08"; src = fetchFromGitHub { @@ -5781,7 +5829,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-tagprefix/"; }; - ncm2-tmux = buildVimPluginFrom2Nix { + ncm2-tmux = buildVimPlugin { pname = "ncm2-tmux"; version = "2019-01-11"; src = fetchFromGitHub { @@ -5793,7 +5841,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-tmux/"; }; - ncm2-ultisnips = buildVimPluginFrom2Nix { + ncm2-ultisnips = buildVimPlugin { pname = "ncm2-ultisnips"; version = "2019-01-26"; src = fetchFromGitHub { @@ -5805,7 +5853,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-ultisnips/"; }; - ncm2-vim = buildVimPluginFrom2Nix { + ncm2-vim = buildVimPlugin { pname = "ncm2-vim"; version = "2020-07-19"; src = fetchFromGitHub { @@ -5817,7 +5865,7 @@ final: prev: meta.homepage = "https://github.com/ncm2/ncm2-vim/"; }; - neco-ghc = buildVimPluginFrom2Nix { + neco-ghc = buildVimPlugin { pname = "neco-ghc"; version = "2021-02-22"; src = fetchFromGitHub { @@ -5829,7 +5877,7 @@ final: prev: meta.homepage = "https://github.com/eagletmt/neco-ghc/"; }; - neco-look = buildVimPluginFrom2Nix { + neco-look = buildVimPlugin { pname = "neco-look"; version = "2021-07-26"; src = fetchFromGitHub { @@ -5841,7 +5889,7 @@ final: prev: meta.homepage = "https://github.com/ujihisa/neco-look/"; }; - neco-syntax = buildVimPluginFrom2Nix { + neco-syntax = buildVimPlugin { pname = "neco-syntax"; version = "2020-09-13"; src = fetchFromGitHub { @@ -5853,7 +5901,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neco-syntax/"; }; - neco-vim = buildVimPluginFrom2Nix { + neco-vim = buildVimPlugin { pname = "neco-vim"; version = "2023-08-15"; src = fetchFromGitHub { @@ -5865,19 +5913,19 @@ final: prev: meta.homepage = "https://github.com/Shougo/neco-vim/"; }; - neo-tree-nvim = buildVimPluginFrom2Nix { + neo-tree-nvim = buildVimPlugin { pname = "neo-tree.nvim"; - version = "2023-08-19"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "nvim-neo-tree"; repo = "neo-tree.nvim"; - rev = "71e36bb4e3e964de35121ec2c1c83f0992e429ec"; - sha256 = "17jd2p3y9gm69dli1180lcbhsw3ab5x6xvzcq9q3sas64bhn88al"; + rev = "7e2a3caf999e2028abb643eb0472f351b2777591"; + sha256 = "0mqrvk1aqs72vpwsy9ys9c3v3xbi1f7k4n692nm1v58v6d70gffk"; }; meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/"; }; - neocomplete-vim = buildVimPluginFrom2Nix { + neocomplete-vim = buildVimPlugin { pname = "neocomplete.vim"; version = "2023-05-18"; src = fetchFromGitHub { @@ -5889,19 +5937,19 @@ final: prev: meta.homepage = "https://github.com/Shougo/neocomplete.vim/"; }; - neoconf-nvim = buildVimPluginFrom2Nix { + neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "2023-06-29"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "08f146d53e075055500dca35e93281faff95716b"; - sha256 = "1qrb9pk2m0zfdm6qsdlhp2jjqbk8sg3h2s5lmvd0q14ixb26bxbv"; + rev = "466ba6f645f63f91ac84d3dd986acede5d107f39"; + sha256 = "0vqprdkbr8vgdfqhjwnqjfw76sfrr4akfn589kyzwpvncb6ygwv1"; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; }; - neodark-vim = buildVimPluginFrom2Nix { + neodark-vim = buildVimPlugin { pname = "neodark.vim"; version = "2023-07-15"; src = fetchFromGitHub { @@ -5913,55 +5961,55 @@ final: prev: meta.homepage = "https://github.com/KeitaNakamura/neodark.vim/"; }; - neodev-nvim = buildVimPluginFrom2Nix { + neodev-nvim = buildVimPlugin { pname = "neodev.nvim"; - version = "2023-08-18"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "47dacc6d8f74936f7719351b025421df740c789b"; - sha256 = "07g3jdigjk6mgwmmgmr1v97kfrb9iljgi4dbl62f6slcyq0jz6n1"; + rev = "41581561a0ffc6ea6a191ee90a23f8c1c7f470fb"; + sha256 = "1q0vfzbzdyc1cnfa2icgrs4zkjajxbqzqypa4q8sfh3cgq364l92"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; - neoformat = buildVimPluginFrom2Nix { + neoformat = buildVimPlugin { pname = "neoformat"; - version = "2023-08-12"; + version = "2023-09-22"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "159e3e24fc018e16a937286488be17602aff8e3c"; - sha256 = "1fyg3s8sqavmg5gqvpfdrywbyx8rfg2qrkc7qlhgs767k6dnp1vw"; + rev = "aedb6f9d3f53d5da229095f7d761d749f8c5c7e0"; + sha256 = "09lk5q7zfvjcfvijk3pr830zl602j3i06zil148fwhkghig0flkg"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; - neogen = buildVimPluginFrom2Nix { + neogen = buildVimPlugin { pname = "neogen"; - version = "2023-06-09"; + version = "2023-09-09"; src = fetchFromGitHub { owner = "danymat"; repo = "neogen"; - rev = "1dd0319ccf41b2498f45a3c7607f2ee325ffc6a0"; - sha256 = "0f464qplyscvpqmp28fi7207ih03ykamdz1ximp4dkj9gi3iiazf"; + rev = "70127baaff25611deaf1a29d801fc054ad9d2dc1"; + sha256 = "00za9qbc8jmf9asqqgr37dpm21xf8cq3pn529zgarmz1gbk106cp"; }; meta.homepage = "https://github.com/danymat/neogen/"; }; - neogit = buildVimPluginFrom2Nix { + neogit = buildVimPlugin { pname = "neogit"; - version = "2023-08-19"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "7cba95de79476d28c19e8ee34b303ad60fdef59f"; - sha256 = "18jixqv9mcvc873gs39g6fd84s0lpyglqk25gy00siznyjl2mcis"; + rev = "8b06f91ae973fd68fde074f15a887f9a3a3411cb"; + sha256 = "120h0n3md78hzddyd77b47k7dicnij8zb1rw624b9956612slg07"; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; }; - neoinclude-vim = buildVimPluginFrom2Nix { + neoinclude-vim = buildVimPlugin { pname = "neoinclude.vim"; version = "2020-09-13"; src = fetchFromGitHub { @@ -5973,7 +6021,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neoinclude.vim/"; }; - neomake = buildVimPluginFrom2Nix { + neomake = buildVimPlugin { pname = "neomake"; version = "2023-02-20"; src = fetchFromGitHub { @@ -5985,7 +6033,7 @@ final: prev: meta.homepage = "https://github.com/neomake/neomake/"; }; - neomru-vim = buildVimPluginFrom2Nix { + neomru-vim = buildVimPlugin { pname = "neomru.vim"; version = "2020-02-05"; src = fetchFromGitHub { @@ -5997,7 +6045,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neomru.vim/"; }; - neon = buildVimPluginFrom2Nix { + neon = buildVimPlugin { pname = "neon"; version = "2022-11-27"; src = fetchFromGitHub { @@ -6009,7 +6057,7 @@ final: prev: meta.homepage = "https://github.com/rafamadriz/neon/"; }; - neorepl-nvim = buildVimPluginFrom2Nix { + neorepl-nvim = buildVimPlugin { pname = "neorepl.nvim"; version = "2022-11-07"; src = fetchFromGitHub { @@ -6021,19 +6069,19 @@ final: prev: meta.homepage = "https://github.com/ii14/neorepl.nvim/"; }; - neorg = buildVimPluginFrom2Nix { + neorg = buildVimPlugin { pname = "neorg"; - version = "2023-08-14"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "f296a22864bbac0d94ad00fa18cc8231dbeaa1e3"; - sha256 = "1xd4h2vrm7b87y2islyz3iigzd6xy9ramq5ayxbd89xaywjj3lid"; + rev = "745715c873395840a5127413d1ef30a42735605e"; + sha256 = "0nm85zcai92wm4afhaswsmybhyxak7sfmga6dacv0z4v3gnghhav"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; - neorg-telescope = buildVimPluginFrom2Nix { + neorg-telescope = buildVimPlugin { pname = "neorg-telescope"; version = "2023-08-06"; src = fetchFromGitHub { @@ -6045,7 +6093,7 @@ final: prev: meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; }; - neoscroll-nvim = buildVimPluginFrom2Nix { + neoscroll-nvim = buildVimPlugin { pname = "neoscroll.nvim"; version = "2023-08-10"; src = fetchFromGitHub { @@ -6057,7 +6105,7 @@ final: prev: meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; - neosnippet-snippets = buildVimPluginFrom2Nix { + neosnippet-snippets = buildVimPlugin { pname = "neosnippet-snippets"; version = "2022-04-01"; src = fetchFromGitHub { @@ -6069,7 +6117,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; - neosnippet-vim = buildVimPluginFrom2Nix { + neosnippet-vim = buildVimPlugin { pname = "neosnippet.vim"; version = "2023-07-23"; src = fetchFromGitHub { @@ -6081,7 +6129,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; - neoterm = buildVimPluginFrom2Nix { + neoterm = buildVimPlugin { pname = "neoterm"; version = "2023-03-09"; src = fetchFromGitHub { @@ -6093,31 +6141,31 @@ final: prev: meta.homepage = "https://github.com/kassio/neoterm/"; }; - neotest = buildVimPluginFrom2Nix { + neotest = buildVimPlugin { pname = "neotest"; - version = "2023-07-24"; + version = "2023-09-10"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest"; - rev = "bec7be0f13ee19c85561943fc5f7b8daa4f4d465"; - sha256 = "04w1ifxrxsyzyw0l4kv2sqnxjzv46j5v39l4d354042q5xcriw9c"; + rev = "1e67a504d03def3a6a1125d934cb511680f72555"; + sha256 = "0pgqyvcjb233l2qw97c1gfn04fnl768djhji9y1p5fc4769znd1w"; }; meta.homepage = "https://github.com/nvim-neotest/neotest/"; }; - neotest-dart = buildVimPluginFrom2Nix { + neotest-dart = buildVimPlugin { pname = "neotest-dart"; - version = "2023-05-29"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "sidlatau"; repo = "neotest-dart"; - rev = "f404d558c0ef8a463bf2b9882b6116b6b2301030"; - sha256 = "1ybzva7qk9h58i5l114977lc6dd17w0zjy1dgfiz2rqckryhrmlv"; + rev = "178c62282d5fa82f3d564b3c256b4d316804da67"; + sha256 = "14305ynm3pf6lx0gym40wc1wcphyja1i21lvdnz5yh65x512z2nj"; }; meta.homepage = "https://github.com/sidlatau/neotest-dart/"; }; - neotest-deno = buildVimPluginFrom2Nix { + neotest-deno = buildVimPlugin { pname = "neotest-deno"; version = "2022-12-09"; src = fetchFromGitHub { @@ -6129,7 +6177,7 @@ final: prev: meta.homepage = "https://github.com/MarkEmmons/neotest-deno/"; }; - neotest-dotnet = buildVimPluginFrom2Nix { + neotest-dotnet = buildVimPlugin { pname = "neotest-dotnet"; version = "2023-08-13"; src = fetchFromGitHub { @@ -6141,55 +6189,56 @@ final: prev: meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/"; }; - neotest-elixir = buildVimPluginFrom2Nix { + neotest-elixir = buildVimPlugin { pname = "neotest-elixir"; - version = "2023-02-03"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "jfpedroza"; repo = "neotest-elixir"; - rev = "72ead0e41aa88582631ff7a14c13095b87c7ff75"; - sha256 = "1ys33qrgs5iw2f00k8d3da2dy49bxfp1yanzk9l6970q8mq9xfd3"; + rev = "7904f8c0fedbe615ee3d75beb810d3e1426b05c6"; + sha256 = "13lsns5wdkp9ay4a11pp6hvhd8isqd5vzag89alwlazsdnmirmvd"; + fetchSubmodules = true; }; meta.homepage = "https://github.com/jfpedroza/neotest-elixir/"; }; - neotest-go = buildVimPluginFrom2Nix { + neotest-go = buildVimPlugin { pname = "neotest-go"; - version = "2023-07-16"; + version = "2023-09-10"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-go"; - rev = "f2580cad67ef0181403cf65858ab638ffd3ede9f"; - sha256 = "0lvbqyqcz35964akcq5xmg69xw37jpf8202k27zy10f160swff8j"; + rev = "1a15e1136db43775214a3e7a598f8930c29c94b7"; + sha256 = "06j4d0ii46556hwx4ygjajr2mm2wdb3vgjrq4hldfjfb2033wnxg"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-go/"; }; - neotest-haskell = buildVimPluginFrom2Nix { + neotest-haskell = buildVimPlugin { pname = "neotest-haskell"; - version = "2023-08-16"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "neotest-haskell"; - rev = "c01757f54365208a63f54cea989206060f02b746"; - sha256 = "18marmxy907x9anxjjq9jddbbvmn4g3qcl2b37n9gl5lkfadfbjh"; + rev = "6f8f89cef7e5ed811e8e2f2031f8a214d5dd6c0a"; + sha256 = "0b27zr14y9cx9za3akzpmvgri8y0jw302i7xwkc89wbxxkyjszi2"; }; meta.homepage = "https://github.com/MrcJkb/neotest-haskell/"; }; - neotest-jest = buildVimPluginFrom2Nix { + neotest-jest = buildVimPlugin { pname = "neotest-jest"; - version = "2023-08-05"; + version = "2023-09-03"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-jest"; - rev = "66de78407b3650bf390c195a997b85d3be8cde06"; - sha256 = "0qmx9idcpqdhzbg679snd8x442lbbchxsvn4mslam677nprm913h"; + rev = "ae559fbd405084ee38dd711eede6d74f3dc1d463"; + sha256 = "032q6cm470y64y3crb7p35ap1r6p8dqh6wgwk5aq5xyfr8c07vbj"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-jest/"; }; - neotest-pest = buildVimPluginFrom2Nix { + neotest-pest = buildVimPlugin { pname = "neotest-pest"; version = "2022-11-24"; src = fetchFromGitHub { @@ -6201,7 +6250,7 @@ final: prev: meta.homepage = "https://github.com/theutz/neotest-pest/"; }; - neotest-phpunit = buildVimPluginFrom2Nix { + neotest-phpunit = buildVimPlugin { pname = "neotest-phpunit"; version = "2023-06-04"; src = fetchFromGitHub { @@ -6213,55 +6262,55 @@ final: prev: meta.homepage = "https://github.com/olimorris/neotest-phpunit/"; }; - neotest-plenary = buildVimPluginFrom2Nix { + neotest-plenary = buildVimPlugin { pname = "neotest-plenary"; - version = "2023-04-27"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-plenary"; - rev = "e0d9b1530307a03abcc52fc0ae28f054dea3f752"; - sha256 = "1d5ay6jbc8f10zp7nffx67d627389szr8zkvdx02pzq21m9dsv92"; + rev = "dcaf5ed67a9e28a246e9783319e5aa6c9ea1c584"; + sha256 = "01dg3n3bnhc1ppai24syq48n5xkm1a3vm731xrah2y0qi390q0l3"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-plenary/"; }; - neotest-python = buildVimPluginFrom2Nix { + neotest-python = buildVimPlugin { pname = "neotest-python"; - version = "2023-07-04"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-python"; - rev = "054f22129405e747adfc2cbeddfcc59537df50ba"; - sha256 = "163p8wqx81dsxj1vjgpkdk0sj8hgf725rfrhx70rfdrx8sn2cdv9"; + rev = "81d2265efac717bb567bc15cc652ae10801286b3"; + sha256 = "0ymi6rkb7qsqh1jvyvnpvnqix3c0p79kydww9va0cnj1ylfhqwp4"; }; meta.homepage = "https://github.com/nvim-neotest/neotest-python/"; }; - neotest-rspec = buildVimPluginFrom2Nix { + neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; - version = "2023-08-19"; + version = "2023-09-17"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "e3ca0279b721a704cf1fb9f3560fc2474256d3a4"; - sha256 = "0bp65cbkljnl7aa5s15va982w4xa7wabsa4h3bv32w9d7bc81ahz"; + rev = "51a3b866d85733d2df2c6b5a16d75ce6ed2fbade"; + sha256 = "028qqd0ywlf93ndy3vqp6pj9pbp3nsibdnkmg3b45g1phc49hbrw"; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; }; - neotest-rust = buildVimPluginFrom2Nix { + neotest-rust = buildVimPlugin { pname = "neotest-rust"; - version = "2023-08-13"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "rouge8"; repo = "neotest-rust"; - rev = "95161da0fbe0570395a938927b654931a82caecb"; - sha256 = "03mddmcyy89y0p7mlmlw34gck72ycg3fcis15i84wlkzrb4hhds5"; + rev = "139cff7c85598ec591b5ed7d71ce8ed3b5313b97"; + sha256 = "1p8c2mnvv131nn7id2panm68nvmmbn44phzzwa2gggdv1snz0xax"; }; meta.homepage = "https://github.com/rouge8/neotest-rust/"; }; - neotest-scala = buildVimPluginFrom2Nix { + neotest-scala = buildVimPlugin { pname = "neotest-scala"; version = "2022-10-15"; src = fetchFromGitHub { @@ -6273,7 +6322,7 @@ final: prev: meta.homepage = "https://github.com/stevanmilic/neotest-scala/"; }; - neotest-testthat = buildVimPluginFrom2Nix { + neotest-testthat = buildVimPlugin { pname = "neotest-testthat"; version = "2022-07-04"; src = fetchFromGitHub { @@ -6285,7 +6334,7 @@ final: prev: meta.homepage = "https://github.com/shunsambongi/neotest-testthat/"; }; - neotest-vitest = buildVimPluginFrom2Nix { + neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; version = "2023-06-23"; src = fetchFromGitHub { @@ -6297,7 +6346,7 @@ final: prev: meta.homepage = "https://github.com/marilari88/neotest-vitest/"; }; - neovim-ayu = buildVimPluginFrom2Nix { + neovim-ayu = buildVimPlugin { pname = "neovim-ayu"; version = "2023-06-29"; src = fetchFromGitHub { @@ -6309,7 +6358,7 @@ final: prev: meta.homepage = "https://github.com/Shatur/neovim-ayu/"; }; - neovim-fuzzy = buildVimPluginFrom2Nix { + neovim-fuzzy = buildVimPlugin { pname = "neovim-fuzzy"; version = "2023-01-25"; src = fetchFromGitHub { @@ -6321,7 +6370,7 @@ final: prev: meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; - neovim-sensible = buildVimPluginFrom2Nix { + neovim-sensible = buildVimPlugin { pname = "neovim-sensible"; version = "2017-09-20"; src = fetchFromGitHub { @@ -6333,7 +6382,7 @@ final: prev: meta.homepage = "https://github.com/jeffkreeftmeijer/neovim-sensible/"; }; - neoyank-vim = buildVimPluginFrom2Nix { + neoyank-vim = buildVimPlugin { pname = "neoyank.vim"; version = "2020-12-20"; src = fetchFromGitHub { @@ -6345,7 +6394,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/neoyank.vim/"; }; - nerdcommenter = buildVimPluginFrom2Nix { + nerdcommenter = buildVimPlugin { pname = "nerdcommenter"; version = "2023-08-12"; src = fetchFromGitHub { @@ -6357,19 +6406,19 @@ final: prev: meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; - nerdtree = buildVimPluginFrom2Nix { + nerdtree = buildVimPlugin { pname = "nerdtree"; - version = "2023-06-21"; + version = "2023-09-04"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "c46e12a886b4a6618a9e834c90f6245952567115"; - sha256 = "032sinxv3dq6wfk3rm1rya6fd4ygpl7xwglrn2q4qha0qm9avyvi"; + rev = "32168889bdbc1e7d1d313e3e41c1cc794b38eac5"; + sha256 = "1g24dr58df398lbm0j7y8nh7k3gvv49xc9fndh5385pfj2l91fv0"; }; meta.homepage = "https://github.com/preservim/nerdtree/"; }; - nerdtree-git-plugin = buildVimPluginFrom2Nix { + nerdtree-git-plugin = buildVimPlugin { pname = "nerdtree-git-plugin"; version = "2021-08-18"; src = fetchFromGitHub { @@ -6381,7 +6430,7 @@ final: prev: meta.homepage = "https://github.com/Xuyuanp/nerdtree-git-plugin/"; }; - netman-nvim = buildVimPluginFrom2Nix { + netman-nvim = buildVimPlugin { pname = "netman.nvim"; version = "2023-04-19"; src = fetchFromGitHub { @@ -6393,7 +6442,7 @@ final: prev: meta.homepage = "https://github.com/miversen33/netman.nvim/"; }; - neuron-nvim = buildVimPluginFrom2Nix { + neuron-nvim = buildVimPlugin { pname = "neuron.nvim"; version = "2022-02-27"; src = fetchFromGitHub { @@ -6405,7 +6454,7 @@ final: prev: meta.homepage = "https://github.com/oberblastmeister/neuron.nvim/"; }; - neuron-vim = buildVimPluginFrom2Nix { + neuron-vim = buildVimPlugin { pname = "neuron.vim"; version = "2023-07-06"; src = fetchFromGitHub { @@ -6417,7 +6466,7 @@ final: prev: meta.homepage = "https://github.com/fiatjaf/neuron.vim/"; }; - nginx-vim = buildVimPluginFrom2Nix { + nginx-vim = buildVimPlugin { pname = "nginx.vim"; version = "2023-01-25"; src = fetchFromGitHub { @@ -6429,19 +6478,19 @@ final: prev: meta.homepage = "https://github.com/chr4/nginx.vim/"; }; - nightfox-nvim = buildVimPluginFrom2Nix { + nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "2023-07-31"; + version = "2023-09-27"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "a48f6d9a0273101df76eb25d2f5477baa277f935"; - sha256 = "0ikl4cnm9xxkc0jzlmscpwl870d74hvjxsm9n9wwryiqf7i4d4ri"; + rev = "fe2fc7b93d66349eff2c5baa6cec922ee3958f56"; + sha256 = "1paipf7phkkr66xnfsi9hwxlqpj339nza8ni42hc5lg12c4h0p14"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; - nim-vim = buildVimPluginFrom2Nix { + nim-vim = buildVimPlugin { pname = "nim.vim"; version = "2021-11-11"; src = fetchFromGitHub { @@ -6453,7 +6502,7 @@ final: prev: meta.homepage = "https://github.com/zah/nim.vim/"; }; - nix-develop-nvim = buildVimPluginFrom2Nix { + nix-develop-nvim = buildVimPlugin { pname = "nix-develop.nvim"; version = "2023-07-23"; src = fetchFromGitHub { @@ -6465,19 +6514,19 @@ final: prev: meta.homepage = "https://github.com/figsoda/nix-develop.nvim/"; }; - nlsp-settings-nvim = buildVimPluginFrom2Nix { + nlsp-settings-nvim = buildVimPlugin { pname = "nlsp-settings.nvim"; - version = "2023-06-29"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "tamago324"; repo = "nlsp-settings.nvim"; - rev = "64976a5ac70a9a43f3b1b42c5b1564f7f0e4077e"; - sha256 = "0gvhazyc9cdzd1c6a2i740h1b50h947vbk3rz195sryi3zb7l2pb"; + rev = "2a52e793d4f293c0e1d61ee5794e3ff62bfbbb5d"; + sha256 = "0fnc2kbxi8bs939dqbjgggx8nhs9qjbvqvj3rbbxbab902pzhgi6"; }; meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/"; }; - nlua-nvim = buildVimPluginFrom2Nix { + nlua-nvim = buildVimPlugin { pname = "nlua.nvim"; version = "2022-12-20"; src = fetchFromGitHub { @@ -6489,7 +6538,7 @@ final: prev: meta.homepage = "https://github.com/tjdevries/nlua.nvim/"; }; - nnn-vim = buildVimPluginFrom2Nix { + nnn-vim = buildVimPlugin { pname = "nnn.vim"; version = "2023-05-23"; src = fetchFromGitHub { @@ -6501,43 +6550,43 @@ final: prev: meta.homepage = "https://github.com/mcchrish/nnn.vim/"; }; - no-neck-pain-nvim = buildVimPluginFrom2Nix { + no-neck-pain-nvim = buildVimPlugin { pname = "no-neck-pain.nvim"; - version = "2023-06-24"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "shortcuts"; repo = "no-neck-pain.nvim"; - rev = "fb27d3bff0834d9178250b439d46bfa04b4e1ae2"; - sha256 = "0ri8qwhx4fsrs3im01nr0v05pg3c17k7zfgdmps61s6f1n0rpjf4"; + rev = "a3a76540533909aa42b4f9430c5b1976a6508f81"; + sha256 = "1yrni32ailamah5rbf6haypvik2wm4ywxrlrk3d12wl2hd9g7yxq"; }; meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/"; }; - noice-nvim = buildVimPluginFrom2Nix { + noice-nvim = buildVimPlugin { pname = "noice.nvim"; - version = "2023-07-25"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "894db25ec726d32047799d4d0a982b701bec453b"; - sha256 = "1vpdl0905vxxbcc354v4g2m2nrpc7fmzpn2yjwgmwz34wacvmik5"; + rev = "396f9146529130904e07c45e90ecdbfa607534f3"; + sha256 = "0n7z491mg9wlr9vhpzanly9ywykbjavv04qk1f5msj5i5r613jh9"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; - nord-nvim = buildVimPluginFrom2Nix { + nord-nvim = buildVimPlugin { pname = "nord.nvim"; - version = "2023-03-26"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "fab04b2dd4b64f4b1763b9250a8824d0b5194b8f"; - sha256 = "01zbahh1q332lcksd7dmkw109i7x5xan9w9z3n13bwwpn01knf6h"; + rev = "15fbfc38a83980b93e169b32a1bf64757f1e2bf4"; + sha256 = "077mr9gz4bsk0fz7vmzc9b68kysdax5vrlwfh7rhdam8qqlpncm7"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; - nordic-nvim = buildVimPluginFrom2Nix { + nordic-nvim = buildVimPlugin { pname = "nordic.nvim"; version = "2022-12-08"; src = fetchFromGitHub { @@ -6549,7 +6598,7 @@ final: prev: meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; - notifier-nvim = buildVimPluginFrom2Nix { + notifier-nvim = buildVimPlugin { pname = "notifier.nvim"; version = "2023-06-09"; src = fetchFromGitHub { @@ -6561,7 +6610,7 @@ final: prev: meta.homepage = "https://github.com/vigoux/notifier.nvim/"; }; - nterm-nvim = buildVimPluginFrom2Nix { + nterm-nvim = buildVimPlugin { pname = "nterm.nvim"; version = "2022-05-10"; src = fetchFromGitHub { @@ -6573,19 +6622,19 @@ final: prev: meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; - nui-nvim = buildVimPluginFrom2Nix { + nui-nvim = buildVimPlugin { pname = "nui.nvim"; - version = "2023-07-20"; + version = "2023-09-06"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "9e3916e784660f55f47daa6f26053ad044db5d6a"; - sha256 = "14a73dwl56kah9h36b40ir6iylvfs261ysz17qvi9vhp63vjq9cx"; + rev = "c8de23342caf8d50b15d6b28368d36a56a69d76f"; + sha256 = "0na7mi192alj1pyskdyivn12a0nmcmzy79kmqxyz8r1cijgb33q2"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; - null-ls-nvim = buildVimPluginFrom2Nix { + null-ls-nvim = buildVimPlugin { pname = "null-ls.nvim"; version = "2023-08-12"; src = fetchFromGitHub { @@ -6597,31 +6646,31 @@ final: prev: meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; - numb-nvim = buildVimPluginFrom2Nix { + numb-nvim = buildVimPlugin { pname = "numb.nvim"; - version = "2023-03-04"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "nacro90"; repo = "numb.nvim"; - rev = "2c89245d1185e02fec1494c45bc765a38b6b40b3"; - sha256 = "1js9d16736dcrx1v1x4syxpb3g815mc0y4k09hd8mi97qcincwa9"; + rev = "3f7d4a74bd456e747a1278ea1672b26116e0824d"; + sha256 = "1h4ap13q85vy7mz44z1q8wzzvs7arbafkml9nwfx5vhyfyw4c8sn"; }; meta.homepage = "https://github.com/nacro90/numb.nvim/"; }; - nvchad = buildVimPluginFrom2Nix { + nvchad = buildVimPlugin { pname = "nvchad"; - version = "2023-08-10"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "d3d9aa251a9dd94881cdbc48c5852b3eaba969b8"; - sha256 = "0wcigy2xbffx45gzdj383y8y671x8hnj1fb123l22i8whb6vd69w"; + rev = "195fe4ae72365c75757c5d0df677f3b29d8697ce"; + sha256 = "01ycw6c0dlzyjpkp5kklp484ccygmrww65k5pcqgipvhzq0ldfm4"; }; meta.homepage = "https://github.com/nvchad/nvchad/"; }; - nvcode-color-schemes-vim = buildVimPluginFrom2Nix { + nvcode-color-schemes-vim = buildVimPlugin { pname = "nvcode-color-schemes.vim"; version = "2021-07-03"; src = fetchFromGitHub { @@ -6633,19 +6682,19 @@ final: prev: meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; - nvim-FeMaco-lua = buildVimPluginFrom2Nix { + nvim-FeMaco-lua = buildVimPlugin { pname = "nvim-FeMaco.lua"; - version = "2023-05-23"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-FeMaco.lua"; - rev = "c06f8befe4b9438aa4f4b763e70d77cabf5093f1"; - sha256 = "04wsbra1hmqv2sv566bn8b0v6ylkz1srzhg4f3017879gdsyipxr"; + rev = "c4e9c71c9ca595772a360435bdf91bee3f9d32b1"; + sha256 = "0ri3bx03vzl9m0q5dbkr85cax2vm1abk1hiiwxzbdmc759p6mxvq"; }; meta.homepage = "https://github.com/AckslD/nvim-FeMaco.lua/"; }; - nvim-ale-diagnostic = buildVimPluginFrom2Nix { + nvim-ale-diagnostic = buildVimPlugin { pname = "nvim-ale-diagnostic"; version = "2021-11-06"; src = fetchFromGitHub { @@ -6657,31 +6706,31 @@ final: prev: meta.homepage = "https://github.com/nathanmsmith/nvim-ale-diagnostic/"; }; - nvim-autopairs = buildVimPluginFrom2Nix { + nvim-autopairs = buildVimPlugin { pname = "nvim-autopairs"; - version = "2023-07-14"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "ae5b41ce880a6d850055e262d6dfebd362bb276e"; - sha256 = "0bka3gy9all6axkdpbp0q5adspl6vrdws9my9gllszjndsjrdvvf"; + rev = "de4f7138a68d5d5063170f2182fd27faf06b0b54"; + sha256 = "0ppip04x0z98aq7b0zpg1yyy2cgqr94jgf5dy2dr1wvgrjh9lxhd"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; - nvim-base16 = buildVimPluginFrom2Nix { + nvim-base16 = buildVimPlugin { pname = "nvim-base16"; - version = "2023-07-23"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-base16"; - rev = "6247ca9aa9f34644dfa290a6df3f6feefb73eb97"; - sha256 = "0bfkhc046wwgrf02snvbx1p43xqhkhcr9b4r8w2nws4hlbzkdd4f"; + rev = "88f209605b7857ce5911e8aaa503a210876e935d"; + sha256 = "1767iwhbgi7lrfwn4wsk96h8x8dyfgbp11wffm8c42yhjwwmp0kl"; }; meta.homepage = "https://github.com/RRethy/nvim-base16/"; }; - nvim-biscuits = buildVimPluginFrom2Nix { + nvim-biscuits = buildVimPlugin { pname = "nvim-biscuits"; version = "2023-03-28"; src = fetchFromGitHub { @@ -6693,19 +6742,19 @@ final: prev: meta.homepage = "https://github.com/code-biscuits/nvim-biscuits/"; }; - nvim-bqf = buildVimPluginFrom2Nix { + nvim-bqf = buildVimPlugin { pname = "nvim-bqf"; - version = "2023-08-06"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "c920a55c6153766bd909e474b7feffa9739f07e8"; - sha256 = "0m7zqi0crk7v4s7cb51x9g98ffbr6p3q1gssn5gpbgk4k89gxcf3"; + rev = "8784eebf34371049b641646d00232c2603215297"; + sha256 = "1vrp72kc1f1rkfdb9xnmd792l4h1j7vrnhf99l54pi700dnbjzcg"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; - nvim-bufdel = buildVimPluginFrom2Nix { + nvim-bufdel = buildVimPlugin { pname = "nvim-bufdel"; version = "2023-04-13"; src = fetchFromGitHub { @@ -6717,7 +6766,7 @@ final: prev: meta.homepage = "https://github.com/ojroques/nvim-bufdel/"; }; - nvim-cm-racer = buildVimPluginFrom2Nix { + nvim-cm-racer = buildVimPlugin { pname = "nvim-cm-racer"; version = "2017-07-27"; src = fetchFromGitHub { @@ -6731,17 +6780,17 @@ final: prev: nvim-cmp = buildNeovimPlugin { pname = "nvim-cmp"; - version = "2023-08-12"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "51f1e11a89ec701221877532ee1a23557d291dd5"; - sha256 = "11v940v6md7sj1digh7kwckb80zbxxp3shlszi44c43iw9viznxi"; + rev = "5dce1b778b85c717f6614e3f4da45e9f19f54435"; + sha256 = "1yl5b680p6vhk1741riiwjnw7a4wn0nimjvcab0ij6mx3kf28rsq"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; - nvim-code-action-menu = buildVimPluginFrom2Nix { + nvim-code-action-menu = buildVimPlugin { pname = "nvim-code-action-menu"; version = "2022-12-20"; src = fetchFromGitHub { @@ -6753,19 +6802,19 @@ final: prev: meta.homepage = "https://github.com/weilbith/nvim-code-action-menu/"; }; - nvim-cokeline = buildVimPluginFrom2Nix { + nvim-cokeline = buildVimPlugin { pname = "nvim-cokeline"; - version = "2023-08-15"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "48636776059b5fb6de4b91a21655b06d16150ce6"; - sha256 = "1qnrfaldb0ll2kzsyn7d3wmcpssj315r5v3xm632mag5dbg8q8a0"; + rev = "52e050a319f37a5f752fe8f461db209ab03a3188"; + sha256 = "0i8h1a7m4q3rsxbsxqbzlyyk4yv77kr56lvfs94d1xj8wq7nqgp7"; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; }; - nvim-colorizer-lua = buildVimPluginFrom2Nix { + nvim-colorizer-lua = buildVimPlugin { pname = "nvim-colorizer.lua"; version = "2023-02-27"; src = fetchFromGitHub { @@ -6777,7 +6826,7 @@ final: prev: meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/"; }; - nvim-comment = buildVimPluginFrom2Nix { + nvim-comment = buildVimPlugin { pname = "nvim-comment"; version = "2022-08-09"; src = fetchFromGitHub { @@ -6789,7 +6838,7 @@ final: prev: meta.homepage = "https://github.com/terrortylor/nvim-comment/"; }; - nvim-compe = buildVimPluginFrom2Nix { + nvim-compe = buildVimPlugin { pname = "nvim-compe"; version = "2021-10-02"; src = fetchFromGitHub { @@ -6801,7 +6850,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; - nvim-completion-manager = buildVimPluginFrom2Nix { + nvim-completion-manager = buildVimPlugin { pname = "nvim-completion-manager"; version = "2018-07-27"; src = fetchFromGitHub { @@ -6813,7 +6862,7 @@ final: prev: meta.homepage = "https://github.com/roxma/nvim-completion-manager/"; }; - nvim-config-local = buildVimPluginFrom2Nix { + nvim-config-local = buildVimPlugin { pname = "nvim-config-local"; version = "2023-06-15"; src = fetchFromGitHub { @@ -6825,7 +6874,7 @@ final: prev: meta.homepage = "https://github.com/klen/nvim-config-local/"; }; - nvim-coverage = buildVimPluginFrom2Nix { + nvim-coverage = buildVimPlugin { pname = "nvim-coverage"; version = "2023-07-20"; src = fetchFromGitHub { @@ -6837,7 +6886,7 @@ final: prev: meta.homepage = "https://github.com/andythigpen/nvim-coverage/"; }; - nvim-cursorline = buildVimPluginFrom2Nix { + nvim-cursorline = buildVimPlugin { pname = "nvim-cursorline"; version = "2022-04-15"; src = fetchFromGitHub { @@ -6849,31 +6898,31 @@ final: prev: meta.homepage = "https://github.com/yamatsum/nvim-cursorline/"; }; - nvim-dap = buildVimPluginFrom2Nix { + nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "2023-08-01"; + version = "2023-09-14"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "1c63f37f95cd4fb54512898168138d9a75d1516a"; - sha256 = "1z2l62byg7676m8kzg3539cf3r0wdm3rxlc0ibq45pl1pnx20wb9"; + rev = "b3d4408e29d924fe130c9397a7c3b3630b3ea671"; + sha256 = "082j57shp24i4rpg8j600picn3wlxsa1br99yfdrankfb2jbcwls"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; - nvim-dap-go = buildVimPluginFrom2Nix { + nvim-dap-go = buildVimPlugin { pname = "nvim-dap-go"; - version = "2023-08-18"; + version = "2023-08-23"; src = fetchFromGitHub { owner = "leoluz"; repo = "nvim-dap-go"; - rev = "9c0eb2b3c8ca63b54009a42a915be657fe7a8734"; - sha256 = "0dnlpad2qbd1k9343b4jn6f9iyl1a8jzarl3pjylch4scb6b5k9v"; + rev = "1b508e9db330108d3b5d62a6d9cc01fe6bbdd4e0"; + sha256 = "00dfcskbj25w4wilrpbq6g1l2zrxf1awplsfqp9nhnzs1ivbg9yb"; }; meta.homepage = "https://github.com/leoluz/nvim-dap-go/"; }; - nvim-dap-python = buildVimPluginFrom2Nix { + nvim-dap-python = buildVimPlugin { pname = "nvim-dap-python"; version = "2023-05-23"; src = fetchFromGitHub { @@ -6885,19 +6934,19 @@ final: prev: meta.homepage = "https://github.com/mfussenegger/nvim-dap-python/"; }; - nvim-dap-ui = buildVimPluginFrom2Nix { + nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; - version = "2023-07-14"; + version = "2023-09-10"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "85b16ac2309d85c88577cd8ee1733ce52be8227e"; - sha256 = "04ylr1jcj7bbcsrsx2z84savkf1yqaisymq7gsnhvzmbpxxwb96g"; + rev = "34160a7ce6072ef332f350ae1d4a6a501daf0159"; + sha256 = "18y9dmh525jzj31gqzqs8q3jgd93jdmsy2xip7j4f7sdpb68zm91"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; - nvim-dap-virtual-text = buildVimPluginFrom2Nix { + nvim-dap-virtual-text = buildVimPlugin { pname = "nvim-dap-virtual-text"; version = "2023-05-25"; src = fetchFromGitHub { @@ -6909,7 +6958,7 @@ final: prev: meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; - nvim-expand-expr = buildVimPluginFrom2Nix { + nvim-expand-expr = buildVimPlugin { pname = "nvim-expand-expr"; version = "2021-08-14"; src = fetchFromGitHub { @@ -6921,19 +6970,19 @@ final: prev: meta.homepage = "https://github.com/allendang/nvim-expand-expr/"; }; - nvim-fzf = buildVimPluginFrom2Nix { + nvim-fzf = buildVimPlugin { pname = "nvim-fzf"; - version = "2023-07-25"; + version = "2023-09-05"; src = fetchFromGitHub { owner = "vijaymarupudi"; repo = "nvim-fzf"; - rev = "45d14cd66c160b199b3c5cef0e7c81793dc2b1e0"; - sha256 = "1qv7k1nvh61sd24k0c1iayhv3xw9vx14ciqgdmfggl8d4cfvlg21"; + rev = "bd095495146a2a827774ad3ad1ef0cc843b5e257"; + sha256 = "0z7da3sfv5dng5aw259aj2r9ghi9hg8h58n9vrmw3jvf683jgzka"; }; meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf/"; }; - nvim-fzf-commands = buildVimPluginFrom2Nix { + nvim-fzf-commands = buildVimPlugin { pname = "nvim-fzf-commands"; version = "2022-12-20"; src = fetchFromGitHub { @@ -6945,7 +6994,7 @@ final: prev: meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf-commands/"; }; - nvim-gdb = buildVimPluginFrom2Nix { + nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; version = "2023-08-16"; src = fetchFromGitHub { @@ -6957,7 +7006,7 @@ final: prev: meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; - nvim-gps = buildVimPluginFrom2Nix { + nvim-gps = buildVimPlugin { pname = "nvim-gps"; version = "2022-07-05"; src = fetchFromGitHub { @@ -6969,7 +7018,7 @@ final: prev: meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; - nvim-highlight-colors = buildVimPluginFrom2Nix { + nvim-highlight-colors = buildVimPlugin { pname = "nvim-highlight-colors"; version = "2023-07-27"; src = fetchFromGitHub { @@ -6981,19 +7030,19 @@ final: prev: meta.homepage = "https://github.com/brenoprata10/nvim-highlight-colors/"; }; - nvim-highlite = buildVimPluginFrom2Nix { + nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "2023-08-17"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "ff22bcc0eccbccf5f7e1a1bc88293299977fc65f"; - sha256 = "1dganblpbfdr2nwbamam5r1fds8ryaqjfzbkh2m2ccdpp8jw2q5f"; + rev = "c1a83ce4f3e12250ffa30a9aab79dad8d9b9fb95"; + sha256 = "0n49zyifb0ljm88b52gpb9808gzpplgwc1cmbjy4f87zgn4smqkv"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; - nvim-hlslens = buildVimPluginFrom2Nix { + nvim-hlslens = buildVimPlugin { pname = "nvim-hlslens"; version = "2023-08-06"; src = fetchFromGitHub { @@ -7005,7 +7054,7 @@ final: prev: meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; - nvim-hs-vim = buildVimPluginFrom2Nix { + nvim-hs-vim = buildVimPlugin { pname = "nvim-hs.vim"; version = "2022-01-30"; src = fetchFromGitHub { @@ -7017,19 +7066,19 @@ final: prev: meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; - nvim-jdtls = buildVimPluginFrom2Nix { + nvim-jdtls = buildVimPlugin { pname = "nvim-jdtls"; - version = "2023-08-01"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "095dc490f362adc85be66dc14bd9665ddd94413b"; - sha256 = "02b1kqfmj03snmvjd1z1piklihxq2n0w7rpdchaf6ylqh0arka7h"; + rev = "3ca419c52a7c20a2565237db2c110ed68fc7e6f1"; + sha256 = "1jy5yklfc3fvajy5mqwfi4h6p5bxb71ar1hnck8k8hciggrijhrq"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; - nvim-jqx = buildVimPluginFrom2Nix { + nvim-jqx = buildVimPlugin { pname = "nvim-jqx"; version = "2023-02-28"; src = fetchFromGitHub { @@ -7041,7 +7090,7 @@ final: prev: meta.homepage = "https://github.com/gennaro-tedesco/nvim-jqx/"; }; - nvim-julia-autotest = buildVimPluginFrom2Nix { + nvim-julia-autotest = buildVimPlugin { pname = "nvim-julia-autotest"; version = "2022-10-31"; src = fetchgit { @@ -7052,7 +7101,7 @@ final: prev: meta.homepage = "https://gitlab.com/usmcamp0811/nvim-julia-autotest"; }; - nvim-lastplace = buildVimPluginFrom2Nix { + nvim-lastplace = buildVimPlugin { pname = "nvim-lastplace"; version = "2023-07-27"; src = fetchFromGitHub { @@ -7064,7 +7113,7 @@ final: prev: meta.homepage = "https://github.com/ethanholz/nvim-lastplace/"; }; - nvim-lightbulb = buildVimPluginFrom2Nix { + nvim-lightbulb = buildVimPlugin { pname = "nvim-lightbulb"; version = "2023-07-20"; src = fetchFromGitHub { @@ -7076,7 +7125,7 @@ final: prev: meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; - nvim-lightline-lsp = buildVimPluginFrom2Nix { + nvim-lightline-lsp = buildVimPlugin { pname = "nvim-lightline-lsp"; version = "2022-05-30"; src = fetchFromGitHub { @@ -7088,19 +7137,31 @@ final: prev: meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/"; }; - nvim-lint = buildVimPluginFrom2Nix { + nvim-lilypond-suite = buildVimPlugin { + pname = "nvim-lilypond-suite"; + version = "2023-09-27"; + src = fetchFromGitHub { + owner = "martineausimon"; + repo = "nvim-lilypond-suite"; + rev = "ac99483249bfa202395e3abcfce7bd39288d93e7"; + sha256 = "11l0bbbaxxinm17j9aqw7an1nfd77pgmkmh3acdx5ppnk8d9141z"; + }; + meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/"; + }; + + nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "2023-08-19"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "30325d8fc3ce985395f22598c8b4f0b092e644ba"; - sha256 = "1sa6z0dg65sx96vd35rqnv9jcxpnr83nsb6v79vr0nkxy26jambl"; + rev = "1065763f115a7765ef237347ad676ba348d7193a"; + sha256 = "0wlfq7xpi60nrqxx2v0h2pjv9jhx5alir8z9q1h7vcnf2hykj45c"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; - nvim-lsp-notify = buildVimPluginFrom2Nix { + nvim-lsp-notify = buildVimPlugin { pname = "nvim-lsp-notify"; version = "2023-03-19"; src = fetchFromGitHub { @@ -7112,7 +7173,7 @@ final: prev: meta.homepage = "https://github.com/mrded/nvim-lsp-notify/"; }; - nvim-lsp-ts-utils = buildVimPluginFrom2Nix { + nvim-lsp-ts-utils = buildVimPlugin { pname = "nvim-lsp-ts-utils"; version = "2022-07-17"; src = fetchFromGitHub { @@ -7124,19 +7185,19 @@ final: prev: meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; - nvim-lspconfig = buildVimPluginFrom2Nix { + nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; - version = "2023-08-19"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "67f151e84daddc86cc65f5d935e592f76b9f4496"; - sha256 = "1wxlk3ymrm53ippw203q43rqvbc27zjy1ncda1qyhrl00dzgvv0p"; + rev = "eb1b53162755888ff75e495797071644d983bff7"; + sha256 = "04kgsf3rhr0wk3vyx6lawlxj5icvaryx925flh72f234vkhigmq2"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; - nvim-lsputils = buildVimPluginFrom2Nix { + nvim-lsputils = buildVimPlugin { pname = "nvim-lsputils"; version = "2022-01-29"; src = fetchFromGitHub { @@ -7148,7 +7209,7 @@ final: prev: meta.homepage = "https://github.com/RishabhRD/nvim-lsputils/"; }; - nvim-lua-gf = buildVimPluginFrom2Nix { + nvim-lua-gf = buildVimPlugin { pname = "nvim-lua-gf"; version = "2022-07-31"; src = fetchFromGitHub { @@ -7160,7 +7221,7 @@ final: prev: meta.homepage = "https://github.com/sam4llis/nvim-lua-gf/"; }; - nvim-luadev = buildVimPluginFrom2Nix { + nvim-luadev = buildVimPlugin { pname = "nvim-luadev"; version = "2023-03-13"; src = fetchFromGitHub { @@ -7172,7 +7233,7 @@ final: prev: meta.homepage = "https://github.com/bfredl/nvim-luadev/"; }; - nvim-luapad = buildVimPluginFrom2Nix { + nvim-luapad = buildVimPlugin { pname = "nvim-luapad"; version = "2022-12-11"; src = fetchFromGitHub { @@ -7184,19 +7245,19 @@ final: prev: meta.homepage = "https://github.com/rafcamlet/nvim-luapad/"; }; - nvim-metals = buildVimPluginFrom2Nix { + nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "2023-08-17"; + version = "2023-09-18"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "57cff9a240f3337129188997887d8848fe6022ad"; - sha256 = "0ysrq30k3fblgd1hlvywrq1jrkcgdnm3habcaw13b2xfp4hqlps7"; + rev = "f41c14ae8500ceccb71e6695574b67881f0b5a93"; + sha256 = "177l4rl3in93qk0ncjalr0bj5jfiv5z5c1g6n0b7d8wvlc3j24cm"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; - nvim-moonwalk = buildVimPluginFrom2Nix { + nvim-moonwalk = buildVimPlugin { pname = "nvim-moonwalk"; version = "2022-04-12"; src = fetchFromGitHub { @@ -7208,31 +7269,31 @@ final: prev: meta.homepage = "https://github.com/gpanders/nvim-moonwalk/"; }; - nvim-navbuddy = buildVimPluginFrom2Nix { + nvim-navbuddy = buildVimPlugin { pname = "nvim-navbuddy"; - version = "2023-07-31"; + version = "2023-09-14"; src = fetchFromGitHub { owner = "SmiteshP"; repo = "nvim-navbuddy"; - rev = "15184582a786d6b32b2724a4799891d0d69f0cdd"; - sha256 = "0rfw1alah02ws569akhkq8rfkwy89p30mzh4pr4v8d70d42zy2kr"; + rev = "f137a3466a6cd1965cdcc5398daff54e66eebbe5"; + sha256 = "03wmxqp776dnckyn0bbrhsf4fnah39b98h0b0g6q8l1rqfmm6bfg"; }; meta.homepage = "https://github.com/SmiteshP/nvim-navbuddy/"; }; - nvim-navic = buildVimPluginFrom2Nix { + nvim-navic = buildVimPlugin { pname = "nvim-navic"; - version = "2023-07-21"; + version = "2023-09-18"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-navic"; - rev = "9c89730da6a05acfeb6a197e212dfadf5aa60ca0"; - sha256 = "1ginwysk4apjx2f045isidnzw863zrv272bdmzh247vi5za57c1k"; + rev = "0ffa7ffe6588f3417e680439872f5049e38a24db"; + sha256 = "04fd7gcs6hhc44pya1k8ds332hm1jpg44w3ri14g3r2850b8b02z"; }; meta.homepage = "https://github.com/smiteshp/nvim-navic/"; }; - nvim-neoclip-lua = buildVimPluginFrom2Nix { + nvim-neoclip-lua = buildVimPlugin { pname = "nvim-neoclip.lua"; version = "2023-05-16"; src = fetchFromGitHub { @@ -7244,7 +7305,7 @@ final: prev: meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; - nvim-nonicons = buildVimPluginFrom2Nix { + nvim-nonicons = buildVimPlugin { pname = "nvim-nonicons"; version = "2023-02-04"; src = fetchFromGitHub { @@ -7256,19 +7317,19 @@ final: prev: meta.homepage = "https://github.com/yamatsum/nvim-nonicons/"; }; - nvim-notify = buildVimPluginFrom2Nix { + nvim-notify = buildVimPlugin { pname = "nvim-notify"; - version = "2023-06-05"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "ea9c8ce7a37f2238f934e087c255758659948e0f"; - sha256 = "0lh49bln2s840x08f5a967569k597cnnrl5vclys7lrbw77avga6"; + rev = "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3"; + sha256 = "1a7s4y8xd1plcidnzs29rhqw7mfbj1q01bqffqjmimii9v6azmfn"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; - nvim-nu = buildVimPluginFrom2Nix { + nvim-nu = buildVimPlugin { pname = "nvim-nu"; version = "2023-03-07"; src = fetchFromGitHub { @@ -7280,7 +7341,7 @@ final: prev: meta.homepage = "https://github.com/LhKipp/nvim-nu/"; }; - nvim-osc52 = buildVimPluginFrom2Nix { + nvim-osc52 = buildVimPlugin { pname = "nvim-osc52"; version = "2023-05-15"; src = fetchFromGitHub { @@ -7292,7 +7353,7 @@ final: prev: meta.homepage = "https://github.com/ojroques/nvim-osc52/"; }; - nvim-peekup = buildVimPluginFrom2Nix { + nvim-peekup = buildVimPlugin { pname = "nvim-peekup"; version = "2023-02-23"; src = fetchFromGitHub { @@ -7304,7 +7365,7 @@ final: prev: meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; - nvim-pqf = buildVimPluginFrom2Nix { + nvim-pqf = buildVimPlugin { pname = "nvim-pqf"; version = "2023-07-24"; src = fetchFromGitHub { @@ -7316,7 +7377,19 @@ final: prev: meta.homepage = "https://github.com/yorickpeterse/nvim-pqf/"; }; - nvim-rename-state = buildVimPluginFrom2Nix { + nvim-remote-containers = buildVimPlugin { + pname = "nvim-remote-containers"; + version = "2023-08-01"; + src = fetchFromGitHub { + owner = "jamestthompson3"; + repo = "nvim-remote-containers"; + rev = "ac76b4b193962dfc0be872feeaf10756aea459e2"; + sha256 = "0ww40yw1fdlanl5wxisqn2c7qlagcn3nkxjafg3nbzd4spi5vg91"; + }; + meta.homepage = "https://github.com/jamestthompson3/nvim-remote-containers/"; + }; + + nvim-rename-state = buildVimPlugin { pname = "nvim-rename-state"; version = "2023-01-30"; src = fetchFromGitHub { @@ -7328,7 +7401,7 @@ final: prev: meta.homepage = "https://github.com/olrtg/nvim-rename-state/"; }; - nvim-scrollbar = buildVimPluginFrom2Nix { + nvim-scrollbar = buildVimPlugin { pname = "nvim-scrollbar"; version = "2023-05-23"; src = fetchFromGitHub { @@ -7340,19 +7413,19 @@ final: prev: meta.homepage = "https://github.com/petertriho/nvim-scrollbar/"; }; - nvim-scrollview = buildVimPluginFrom2Nix { + nvim-scrollview = buildVimPlugin { pname = "nvim-scrollview"; - version = "2023-08-17"; + version = "2023-09-03"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "f826e74d6c20f535a7fa6a94308eacb99c07aba8"; - sha256 = "1kais5iqm4s4i6mwl02rn2ji1c58ni25fq4w0jd9n9cf2w7n8bch"; + rev = "b0737d036cfbb39e066d144702197eda0a4b6cf1"; + sha256 = "1r89wdsv8g7dmd06a9zx99mb6r45ns5d7sn7rflax2n1wrfraaix"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; - nvim-search-and-replace = buildVimPluginFrom2Nix { + nvim-search-and-replace = buildVimPlugin { pname = "nvim-search-and-replace"; version = "2022-09-06"; src = fetchFromGitHub { @@ -7364,19 +7437,19 @@ final: prev: meta.homepage = "https://github.com/s1n7ax/nvim-search-and-replace/"; }; - nvim-snippy = buildVimPluginFrom2Nix { + nvim-snippy = buildVimPlugin { pname = "nvim-snippy"; - version = "2023-05-15"; + version = "2023-09-09"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "7b50933b44ebefc85bf1734eadc4fcfcbbc781c7"; - sha256 = "0pgwr8c3qkrg5zjyy0i99yclh7s2fbinr2nkwi3w2i9i6q04jmcx"; + rev = "5787f088c99c04309a8aa6363fd3ac9a5a26b780"; + sha256 = "0m68plmz4lb7ysxr5lx4kxx0g388z5bp8p3gnhiw5ybmhymc0v8f"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; - nvim-solarized-lua = buildVimPluginFrom2Nix { + nvim-solarized-lua = buildVimPlugin { pname = "nvim-solarized-lua"; version = "2022-11-19"; src = fetchFromGitHub { @@ -7388,31 +7461,31 @@ final: prev: meta.homepage = "https://github.com/ishan9299/nvim-solarized-lua/"; }; - nvim-spectre = buildVimPluginFrom2Nix { + nvim-spectre = buildVimPlugin { pname = "nvim-spectre"; - version = "2023-08-19"; + version = "2023-09-13"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "eb17a856a6f17e03d8d610cbc00cd9f2f39e3fd7"; - sha256 = "0lbdbcck08bca9pgm6kspwfpqpjlyv6295cfdjy1936yfiia5gpc"; + rev = "97cfd1b0f5a6ab35979ce1bee6c17f54745fd1e5"; + sha256 = "01j8xxjlj10ayfffhb5fav9r86599zqn17i9jd3kmc59m8yxdpr7"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; - nvim-spider = buildVimPluginFrom2Nix { + nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "2023-08-02"; + version = "2023-09-14"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "2762267825b575bcd27a50560e1098679f120007"; - sha256 = "1b1chjazr9ja5fq1bvg138a4h3hwcj2vgxfzkbbys3k9wpgzs4x1"; + rev = "be7273858d75673a0ae594552742eb8769f35d6a"; + sha256 = "1qr59fq94j1l5qj5xk0v9mnp65gjg2iqwsal9j7c7c6cxz76bg7s"; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; }; - nvim-surround = buildVimPluginFrom2Nix { + nvim-surround = buildVimPlugin { pname = "nvim-surround"; version = "2023-08-18"; src = fetchFromGitHub { @@ -7424,7 +7497,7 @@ final: prev: meta.homepage = "https://github.com/kylechui/nvim-surround/"; }; - nvim-teal-maker = buildVimPluginFrom2Nix { + nvim-teal-maker = buildVimPlugin { pname = "nvim-teal-maker"; version = "2022-04-09"; src = fetchFromGitHub { @@ -7436,7 +7509,7 @@ final: prev: meta.homepage = "https://github.com/svermeulen/nvim-teal-maker/"; }; - nvim-terminal-lua = buildVimPluginFrom2Nix { + nvim-terminal-lua = buildVimPlugin { pname = "nvim-terminal.lua"; version = "2019-10-17"; src = fetchFromGitHub { @@ -7448,7 +7521,7 @@ final: prev: meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/"; }; - nvim-test = buildVimPluginFrom2Nix { + nvim-test = buildVimPlugin { pname = "nvim-test"; version = "2023-05-02"; src = fetchFromGitHub { @@ -7460,55 +7533,55 @@ final: prev: meta.homepage = "https://github.com/klen/nvim-test/"; }; - nvim-tree-lua = buildVimPluginFrom2Nix { + nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "2023-08-18"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "dea82ae2071a8d6412ca31e8fc48da5accad1a1d"; - sha256 = "1qsm11mas5b0n13zlvq4w7xl250y9cqwwvxk2g47154y61bq2jpd"; + rev = "113e0950c88b81b01d253d8f3da17bbd0e6716bb"; + sha256 = "1nmx68gjc59cn6lapvml12x4yj9iqaqdb8q3ad5w3gfnmva03sjd"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; - nvim-treesitter = buildVimPluginFrom2Nix { + nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "2023-08-19"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "8fa7ce35afe88b8294e6ced757aa14ec98414568"; - sha256 = "1v1s75r9y9lxdi67xcrlqrgp1cjx607wjvvnk5abk7z6p9w0x6g4"; + rev = "776e4d341b5416c995e74c3abbf75f9cec26aa5e"; + sha256 = "02pk5di7lxvbwzi2ajq7kj6rfrxd46635jccw6xf5fbxcl84cqsb"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; - nvim-treesitter-context = buildVimPluginFrom2Nix { + nvim-treesitter-context = buildVimPlugin { pname = "nvim-treesitter-context"; - version = "2023-08-18"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "5dd8c2121170f806c3d0689d9e0dd24250e4f342"; - sha256 = "1fs0j613g9pz3k4xmang10qrdrlnc6lysy3my6z0ary8wqws45ax"; + rev = "bc19b78e9c705d67be98d56e9fab96470af45f33"; + sha256 = "1xfdiyz0a07zpmavyinq3mc3f81xw99n7847ijwb3rwpmiqs7hns"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; - nvim-treesitter-endwise = buildVimPluginFrom2Nix { + nvim-treesitter-endwise = buildVimPlugin { pname = "nvim-treesitter-endwise"; - version = "2023-06-28"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-endwise"; - rev = "9298b3ac8fd6d0d8f9e321194c6d3fd37e417cf9"; - sha256 = "1zkc892v347380awywfyfk0q8nsavi37zgz9yhizc4am6lphn391"; + rev = "4c344ffc8d54d7e1ba2cefaaa2c10ea93aa1cc2d"; + sha256 = "0320lz13zymw70wx7malkw4nkma3scz4kz35mq59f9p51dan6iky"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/"; }; - nvim-treesitter-pyfold = buildVimPluginFrom2Nix { + nvim-treesitter-pyfold = buildVimPlugin { pname = "nvim-treesitter-pyfold"; version = "2023-04-11"; src = fetchFromGitHub { @@ -7520,7 +7593,7 @@ final: prev: meta.homepage = "https://github.com/eddiebergman/nvim-treesitter-pyfold/"; }; - nvim-treesitter-refactor = buildVimPluginFrom2Nix { + nvim-treesitter-refactor = buildVimPlugin { pname = "nvim-treesitter-refactor"; version = "2023-04-04"; src = fetchFromGitHub { @@ -7532,31 +7605,31 @@ final: prev: meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-refactor/"; }; - nvim-treesitter-textobjects = buildVimPluginFrom2Nix { + nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "2023-08-17"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "56272167a6dead91c47c02dbdbfe1ae5643c59f5"; - sha256 = "0jxsmg1xw0jfy8i9y3anpbdr8c1smcab82kh22nz9www6pa4m2xs"; + rev = "bd103502252027434ec42f628d2dbf54821d4ce6"; + sha256 = "030z020v4g140a72mv1q7l6bshhrkgisbd6w3hiwlv9a1mgz4bbc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; - nvim-treesitter-textsubjects = buildVimPluginFrom2Nix { + nvim-treesitter-textsubjects = buildVimPlugin { pname = "nvim-treesitter-textsubjects"; - version = "2023-08-03"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-textsubjects"; - rev = "df75fcec548014f158cda6498ac38c4622c221e1"; - sha256 = "0fx8b9w03zn6v8db2w6h29y8hpbjckvm27nh49vvsis3icqyk7iv"; + rev = "48b3bf54e32f23e2299c59ff76fa3b0599565b39"; + sha256 = "11nmxnqr8dnn1l24gcrm4bpvpmy4ibsi6x46iz5y2vp7pzrj6cf9"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-textsubjects/"; }; - nvim-ts-autotag = buildVimPluginFrom2Nix { + nvim-ts-autotag = buildVimPlugin { pname = "nvim-ts-autotag"; version = "2023-06-16"; src = fetchFromGitHub { @@ -7568,19 +7641,19 @@ final: prev: meta.homepage = "https://github.com/windwp/nvim-ts-autotag/"; }; - nvim-ts-context-commentstring = buildVimPluginFrom2Nix { + nvim-ts-context-commentstring = buildVimPlugin { pname = "nvim-ts-context-commentstring"; - version = "2023-08-17"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "joosepalviste"; repo = "nvim-ts-context-commentstring"; - rev = "9bff161dfece6ecf3459e6e46ca42e49f9ed939f"; - sha256 = "0bc8m9pjialy850bjxnir8540cxsszpw791as7m5knmbmjj36kgr"; + rev = "0c136439fb93fd94db9106250ff6f6858101422b"; + sha256 = "0cmszvwxbis2m36zwb7bcq0yfw19ska31j1r7k7pn55skr605527"; }; meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/"; }; - nvim-ts-rainbow = buildVimPluginFrom2Nix { + nvim-ts-rainbow = buildVimPlugin { pname = "nvim-ts-rainbow"; version = "2023-06-07"; src = fetchFromGitHub { @@ -7592,7 +7665,7 @@ final: prev: meta.homepage = "https://github.com/mrjones2014/nvim-ts-rainbow/"; }; - nvim-ts-rainbow2 = buildVimPluginFrom2Nix { + nvim-ts-rainbow2 = buildVimPlugin { pname = "nvim-ts-rainbow2"; version = "2023-07-12"; src = fetchgit { @@ -7603,19 +7676,19 @@ final: prev: meta.homepage = "https://gitlab.com/HiPhish/nvim-ts-rainbow2"; }; - nvim-ufo = buildVimPluginFrom2Nix { + nvim-ufo = buildVimPlugin { pname = "nvim-ufo"; - version = "2023-08-14"; + version = "2023-09-22"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-ufo"; - rev = "aebd36bf5447862671356fcd5d4a8708ce6c9470"; - sha256 = "0bfsm0dvjd2i5qhs0j3kilsiw4bxdi33n0520yw6brlhr0k2v954"; + rev = "6f2ccdf2da390d62f8f9e15fc5ddbcbd312e1e66"; + sha256 = "05k9f2zxk1kkzp8xzsyc6j5szvvd8znjim10sj27jc0rmg5qldam"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/"; }; - nvim-unception = buildVimPluginFrom2Nix { + nvim-unception = buildVimPlugin { pname = "nvim-unception"; version = "2023-04-11"; src = fetchFromGitHub { @@ -7627,19 +7700,19 @@ final: prev: meta.homepage = "https://github.com/samjwill/nvim-unception/"; }; - nvim-web-devicons = buildVimPluginFrom2Nix { + nvim-web-devicons = buildVimPlugin { pname = "nvim-web-devicons"; - version = "2023-08-16"; + version = "2023-09-24"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-web-devicons"; - rev = "cfc8824cc1db316a276b36517f093baccb8e799a"; - sha256 = "0p9qwxh7syzr8fqn42bbcjrpawlgjqq8l302zyyhwc5v91nrjaza"; + rev = "45d0237c427baba8cd05e0ab26d30e2ee58c2c82"; + sha256 = "0cbp2xv6gnjd1plc8psj0qgwxfrfqw7qg8jn1cgr1la563jjlnlk"; }; meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/"; }; - nvim-whichkey-setup-lua = buildVimPluginFrom2Nix { + nvim-whichkey-setup-lua = buildVimPlugin { pname = "nvim-whichkey-setup.lua"; version = "2021-04-16"; src = fetchFromGitHub { @@ -7651,7 +7724,19 @@ final: prev: meta.homepage = "https://github.com/AckslD/nvim-whichkey-setup.lua/"; }; - nvim-yarp = buildVimPluginFrom2Nix { + nvim-window-picker = buildVimPlugin { + pname = "nvim-window-picker"; + version = "2023-09-24"; + src = fetchFromGitHub { + owner = "s1n7ax"; + repo = "nvim-window-picker"; + rev = "e7b6699fbd007bbe61dc444734b9bade445b2984"; + sha256 = "01l5d0bylgv1kg4wlq3n2rk656fzh0scy68l88nkbra7qqj9d5i2"; + }; + meta.homepage = "https://github.com/s1n7ax/nvim-window-picker/"; + }; + + nvim-yarp = buildVimPlugin { pname = "nvim-yarp"; version = "2022-06-08"; src = fetchFromGitHub { @@ -7663,43 +7748,43 @@ final: prev: meta.homepage = "https://github.com/roxma/nvim-yarp/"; }; - nvim_context_vt = buildVimPluginFrom2Nix { + nvim_context_vt = buildVimPlugin { pname = "nvim_context_vt"; - version = "2023-07-05"; + version = "2023-08-26"; src = fetchFromGitHub { - owner = "haringsrob"; + owner = "andersevenrud"; repo = "nvim_context_vt"; - rev = "f44f46ecad6e6983fd04dac84c5a5c03815d3427"; - sha256 = "0a8bdi6d58m5v851gkyph4qngxzsa5saizhsp1klpjnj57akz078"; + rev = "a14f9292b4bd68ceed433fc513f287641816dc6d"; + sha256 = "0rwnmifli01h5aakz440k3g136y3l5f3c16sdvd0k8q4xcdiibs1"; }; - meta.homepage = "https://github.com/haringsrob/nvim_context_vt/"; + meta.homepage = "https://github.com/andersevenrud/nvim_context_vt/"; }; - nvimdev-nvim = buildVimPluginFrom2Nix { + nvimdev-nvim = buildVimPlugin { pname = "nvimdev.nvim"; - version = "2023-08-13"; + version = "2023-09-05"; src = fetchFromGitHub { owner = "neovim"; repo = "nvimdev.nvim"; - rev = "3762a8cf682c175026083e3d1041dfbfb6dbbc40"; - sha256 = "1g2n32p96dmz9c5gqmfdyif1h2czlqnrv5khi6a3fhb679dq5i0n"; + rev = "3bd732f1a26042e8b355aaa5d489e39d93eaaf28"; + sha256 = "0dvbgvscn0jmf39ivaij9af6zkr012ns1vjmfrj165xw7gplvyac"; }; meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; - nvterm = buildVimPluginFrom2Nix { + nvterm = buildVimPlugin { pname = "nvterm"; - version = "2023-05-05"; + version = "2023-09-09"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvterm"; - rev = "5ae78fb332e92447121d2af58a6313189a7799fb"; - sha256 = "0rcj5njhkh1pwaa8d8d15nqqacx1h8j4ijygwhplvszi64kqb9r5"; + rev = "3e43be1d0ca60cc5e2dfc2d289b06577e7e57e98"; + sha256 = "10k9x2mg0pcrrf83ysxc0amldjnfgvxl8r74j42czdw5my8aqgcf"; }; meta.homepage = "https://github.com/nvchad/nvterm/"; }; - oceanic-material = buildVimPluginFrom2Nix { + oceanic-material = buildVimPlugin { pname = "oceanic-material"; version = "2023-06-22"; src = fetchFromGitHub { @@ -7711,7 +7796,7 @@ final: prev: meta.homepage = "https://github.com/nvimdev/oceanic-material/"; }; - oceanic-next = buildVimPluginFrom2Nix { + oceanic-next = buildVimPlugin { pname = "oceanic-next"; version = "2023-05-01"; src = fetchFromGitHub { @@ -7723,32 +7808,32 @@ final: prev: meta.homepage = "https://github.com/mhartington/oceanic-next/"; }; - octo-nvim = buildVimPluginFrom2Nix { + octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "2023-06-30"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "22328c578bc013fa4b0cef3d00af35efe0c0f256"; - sha256 = "08ik7v5gfpy52z09wbx1rbdhcz1v1c41i5l9kx4p25rxw8g9cl8v"; + rev = "04334f0602b351e4995f352b6fed3d6f91f64610"; + sha256 = "1sjig39rj9xli6nrf58xgvqbdnhrmz5zjdicn28pv7d67mydgvbw"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; - oil-nvim = buildVimPluginFrom2Nix { + oil-nvim = buildVimPlugin { pname = "oil.nvim"; - version = "2023-08-13"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "8f7807946a67b5f1a515946f82251e33651bae29"; - sha256 = "0sbbghvwyw0zxwpvasci8cz7waf5zbvncvajjc2mbv4d1lvr82vc"; + rev = "956d7fc89b0bd1f9ea6515ca10c1e2a293e4d8fd"; + sha256 = "0gbrnnji01pdz7x78cbdnvs6y4gpb298f239i5b41mr9vdc55ysl"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; }; - omnisharp-extended-lsp-nvim = buildVimPluginFrom2Nix { + omnisharp-extended-lsp-nvim = buildVimPlugin { pname = "omnisharp-extended-lsp.nvim"; version = "2023-04-14"; src = fetchFromGitHub { @@ -7760,7 +7845,7 @@ final: prev: meta.homepage = "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/"; }; - one-nvim = buildVimPluginFrom2Nix { + one-nvim = buildVimPlugin { pname = "one-nvim"; version = "2021-06-10"; src = fetchFromGitHub { @@ -7772,19 +7857,19 @@ final: prev: meta.homepage = "https://github.com/Th3Whit3Wolf/one-nvim/"; }; - onedark-nvim = buildVimPluginFrom2Nix { + onedark-nvim = buildVimPlugin { pname = "onedark.nvim"; - version = "2023-08-07"; + version = "2023-09-04"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "09b71d84bd2524438e48c0aa5b54d855cc72af32"; - sha256 = "1crlzkgdpxsvcvc1djc9ai3abm1szkrwrsknzxa7zdx4w1jlvpvs"; + rev = "dac8c39812dae025255c9069a260e1f69d967927"; + sha256 = "15cv4cxgxy5llhhdla2hjfvn7544m3dasysd6ci8h5ys8x75nva0"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; - onedark-vim = buildVimPluginFrom2Nix { + onedark-vim = buildVimPlugin { pname = "onedark.vim"; version = "2023-07-19"; src = fetchFromGitHub { @@ -7796,19 +7881,19 @@ final: prev: meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; - onedarkpro-nvim = buildVimPluginFrom2Nix { + onedarkpro-nvim = buildVimPlugin { pname = "onedarkpro.nvim"; - version = "2023-08-15"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "45d12deedc61a19f9e3ed0e8dcb0be91928f723b"; - sha256 = "1z6ih5ng29m8xsg11y3rl0211g202sppgdz674ls5z1fwk8kaf5y"; + rev = "7c02b4eeb310173ef6d741e60200d72b76923eae"; + sha256 = "1vmix76dr7sv199nwmvmxxgp7cqysi77m79p4bgsx2mynmkdx4p4"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; - onehalf = buildVimPluginFrom2Nix { + onehalf = buildVimPlugin { pname = "onehalf"; version = "2022-08-02"; src = fetchFromGitHub { @@ -7820,19 +7905,19 @@ final: prev: meta.homepage = "https://github.com/sonph/onehalf/"; }; - onenord-nvim = buildVimPluginFrom2Nix { + onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "2023-06-26"; + version = "2023-09-11"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "222839e392a79c48ce0f52d754cccbc79322c01f"; - sha256 = "1xxja94np57zikgfly9c4crrn300p67k2h6x6jj863adjj7q7wv2"; + rev = "5d4ea147564f6a5e5a2aea643c1fae15acb66b90"; + sha256 = "1r3kx8h17dsyda86amx4j8q29dpm8w4rqli7iwldww7bcp3skbg5"; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; }; - open-browser-github-vim = buildVimPluginFrom2Nix { + open-browser-github-vim = buildVimPlugin { pname = "open-browser-github.vim"; version = "2021-03-21"; src = fetchFromGitHub { @@ -7844,7 +7929,7 @@ final: prev: meta.homepage = "https://github.com/tyru/open-browser-github.vim/"; }; - open-browser-vim = buildVimPluginFrom2Nix { + open-browser-vim = buildVimPlugin { pname = "open-browser.vim"; version = "2022-10-08"; src = fetchFromGitHub { @@ -7856,19 +7941,19 @@ final: prev: meta.homepage = "https://github.com/tyru/open-browser.vim/"; }; - openingh-nvim = buildVimPluginFrom2Nix { + openingh-nvim = buildVimPlugin { pname = "openingh.nvim"; - version = "2023-06-19"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "Almo7aya"; repo = "openingh.nvim"; - rev = "2719e5759ecf4b9a2d492fbf52d03d2e6fc6126a"; - sha256 = "0646wmi4z0yrdrmy96zq5q7f2vl0030scwbh4ywrhwzfk6rjjmxa"; + rev = "cdca4f17dbc2ed85ea5e54c594eb57c4057d9290"; + sha256 = "04jx2pprk1072a06vanyml6bv4qh0hhfmjz145jjp69rn1pzqm8f"; }; meta.homepage = "https://github.com/Almo7aya/openingh.nvim/"; }; - openscad-nvim = buildVimPluginFrom2Nix { + openscad-nvim = buildVimPlugin { pname = "openscad.nvim"; version = "2023-06-19"; src = fetchFromGitHub { @@ -7880,19 +7965,19 @@ final: prev: meta.homepage = "https://github.com/salkin-mada/openscad.nvim/"; }; - orgmode = buildVimPluginFrom2Nix { + orgmode = buildVimPlugin { pname = "orgmode"; - version = "2023-07-25"; + version = "2023-09-27"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "6b6eb8eabbed4d95568fd1f5374a3dff7ed51a3b"; - sha256 = "1snqqrpck8wgkc67dzcy6y0y9n37sipkaq6fxxy1h71d8363vkwd"; + rev = "6e40eec330afdcec051a2fb6d85b92d3a04b6dac"; + sha256 = "03yxbwj3xcbnbi622gfnq4hn9w1isq0rqwrvhi84mxnmpg934win"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; - other-nvim = buildVimPluginFrom2Nix { + other-nvim = buildVimPlugin { pname = "other.nvim"; version = "2023-08-02"; src = fetchFromGitHub { @@ -7904,32 +7989,44 @@ final: prev: meta.homepage = "https://github.com/rgroli/other.nvim/"; }; - overseer-nvim = buildVimPluginFrom2Nix { + otter-nvim = buildVimPlugin { + pname = "otter.nvim"; + version = "2023-09-16"; + src = fetchFromGitHub { + owner = "jmbuhr"; + repo = "otter.nvim"; + rev = "2752dd199d73342f13a1bd599a99822505e2803f"; + sha256 = "00jmwd8la3cadhy2dzl3gzq8wbgn6xwjb9l35h1w1k161pl5p882"; + }; + meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; + }; + + overseer-nvim = buildVimPlugin { pname = "overseer.nvim"; - version = "2023-08-13"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "stevearc"; repo = "overseer.nvim"; - rev = "667dc5f0048d299fc41c13c8c3b5ef2cb2909a4d"; - sha256 = "1yh64phvxkra171a8948bfddx7jgrvw38z1apagkczczg06r8imm"; + rev = "8065976876cea89d0b99ffef4d997b930296f0e8"; + sha256 = "1sk0pf90hib69nyjr5vfr3kqgy0jh400nix6d8yp8qvdw5y1aw4a"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/overseer.nvim/"; }; - oxocarbon-nvim = buildVimPluginFrom2Nix { + oxocarbon-nvim = buildVimPlugin { pname = "oxocarbon.nvim"; - version = "2023-06-06"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "nyoom-engineering"; repo = "oxocarbon.nvim"; - rev = "12a7507f1cd5ac6edb890d12268e4444a35956f2"; - sha256 = "0l6akk6yx06yfz83y041qnxghgrhbgmvlvsfqqahknxsc2bakh1r"; + rev = "b47c0ecab3a4270815afb3b05e03423b04cca8f2"; + sha256 = "1hkjc7x5ma8pmz5vi93ygqmbdfammikpvjjxkw9axlh5wh8ys48y"; }; meta.homepage = "https://github.com/nyoom-engineering/oxocarbon.nvim/"; }; - package-info-nvim = buildVimPluginFrom2Nix { + package-info-nvim = buildVimPlugin { pname = "package-info.nvim"; version = "2023-03-28"; src = fetchFromGitHub { @@ -7941,19 +8038,19 @@ final: prev: meta.homepage = "https://github.com/vuki656/package-info.nvim/"; }; - packer-nvim = buildVimPluginFrom2Nix { + packer-nvim = buildVimPlugin { pname = "packer.nvim"; - version = "2023-08-18"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "90f794d01dd5f50404f8ef6e1d22377ba5180787"; - sha256 = "0mhg4z99ksbnf1hhcnyg7v9rsrzsmr81z3jry1jifflwcc9s7fcw"; + rev = "ea0cc3c59f67c440c5ff0bbe4fb9420f4350b9a3"; + sha256 = "0lvpflpm7mhv39dglxdvmilj72xgxx5j614ll06mcxycv2k3xcvw"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; - palenight-vim = buildVimPluginFrom2Nix { + palenight-vim = buildVimPlugin { pname = "palenight.vim"; version = "2023-04-27"; src = fetchFromGitHub { @@ -7965,7 +8062,7 @@ final: prev: meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/"; }; - papercolor-theme = buildVimPluginFrom2Nix { + papercolor-theme = buildVimPlugin { pname = "papercolor-theme"; version = "2022-06-08"; src = fetchFromGitHub { @@ -7977,7 +8074,7 @@ final: prev: meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; - pear-tree = buildVimPluginFrom2Nix { + pear-tree = buildVimPlugin { pname = "pear-tree"; version = "2019-12-08"; src = fetchFromGitHub { @@ -7989,7 +8086,7 @@ final: prev: meta.homepage = "https://github.com/tmsvg/pear-tree/"; }; - pears-nvim = buildVimPluginFrom2Nix { + pears-nvim = buildVimPlugin { pname = "pears.nvim"; version = "2021-05-27"; src = fetchFromGitHub { @@ -8001,7 +8098,7 @@ final: prev: meta.homepage = "https://github.com/steelsojka/pears.nvim/"; }; - persistence-nvim = buildVimPluginFrom2Nix { + persistence-nvim = buildVimPlugin { pname = "persistence.nvim"; version = "2023-05-22"; src = fetchFromGitHub { @@ -8013,7 +8110,7 @@ final: prev: meta.homepage = "https://github.com/folke/persistence.nvim/"; }; - peskcolor-vim = buildVimPluginFrom2Nix { + peskcolor-vim = buildVimPlugin { pname = "peskcolor.vim"; version = "2016-06-11"; src = fetchFromGitHub { @@ -8025,7 +8122,7 @@ final: prev: meta.homepage = "https://github.com/andsild/peskcolor.vim/"; }; - pest-vim = buildVimPluginFrom2Nix { + pest-vim = buildVimPlugin { pname = "pest.vim"; version = "2023-06-16"; src = fetchFromGitHub { @@ -8037,7 +8134,7 @@ final: prev: meta.homepage = "https://github.com/pest-parser/pest.vim/"; }; - pgsql-vim = buildVimPluginFrom2Nix { + pgsql-vim = buildVimPlugin { pname = "pgsql.vim"; version = "2021-12-08"; src = fetchFromGitHub { @@ -8049,7 +8146,7 @@ final: prev: meta.homepage = "https://github.com/lifepillar/pgsql.vim/"; }; - pig-vim = buildVimPluginFrom2Nix { + pig-vim = buildVimPlugin { pname = "pig.vim"; version = "2017-06-08"; src = fetchFromGitHub { @@ -8061,7 +8158,7 @@ final: prev: meta.homepage = "https://github.com/motus/pig.vim/"; }; - plantuml-previewer-vim = buildVimPluginFrom2Nix { + plantuml-previewer-vim = buildVimPlugin { pname = "plantuml-previewer.vim"; version = "2023-03-07"; src = fetchFromGitHub { @@ -8073,7 +8170,7 @@ final: prev: meta.homepage = "https://github.com/weirongxu/plantuml-previewer.vim/"; }; - plantuml-syntax = buildVimPluginFrom2Nix { + plantuml-syntax = buildVimPlugin { pname = "plantuml-syntax"; version = "2022-08-26"; src = fetchFromGitHub { @@ -8085,31 +8182,31 @@ final: prev: meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; - playground = buildVimPluginFrom2Nix { + playground = buildVimPlugin { pname = "playground"; - version = "2023-04-15"; + version = "2023-09-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "2b81a018a49f8e476341dfcb228b7b808baba68b"; - sha256 = "1b7h4sih8dc55w12f0v5knk9cxfpy0iffhbvmg0g84if55ar616v"; + rev = "ba48c6a62a280eefb7c85725b0915e021a1a0749"; + sha256 = "1vgj5vc32ly15ni62fk51yd8km2zp3fkzx0622x5cv9pavmjpr40"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildNeovimPlugin { pname = "plenary.nvim"; - version = "2023-07-17"; + version = "2023-09-12"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "267282a9ce242bbb0c5dc31445b6d353bed978bb"; - sha256 = "10pw38dfzjrwzwkby9jmghafwwcph3az5z3h9c8v5kjh8iqls6x1"; + rev = "9ce85b0f7dcfe5358c0be937ad23e456907d410b"; + sha256 = "0772bqmfkx27b6kfn8x28v8ll0qr2zvdclynansraprrzllsqymk"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; - poimandres-nvim = buildVimPluginFrom2Nix { + poimandres-nvim = buildVimPlugin { pname = "poimandres.nvim"; version = "2023-08-16"; src = fetchFromGitHub { @@ -8121,7 +8218,7 @@ final: prev: meta.homepage = "https://github.com/olivercederborg/poimandres.nvim/"; }; - pony-vim-syntax = buildVimPluginFrom2Nix { + pony-vim-syntax = buildVimPlugin { pname = "pony-vim-syntax"; version = "2017-09-26"; src = fetchFromGitHub { @@ -8133,7 +8230,7 @@ final: prev: meta.homepage = "https://github.com/dleonard0/pony-vim-syntax/"; }; - popfix = buildVimPluginFrom2Nix { + popfix = buildVimPlugin { pname = "popfix"; version = "2022-07-04"; src = fetchFromGitHub { @@ -8146,7 +8243,7 @@ final: prev: meta.homepage = "https://github.com/RishabhRD/popfix/"; }; - popup-nvim = buildVimPluginFrom2Nix { + popup-nvim = buildVimPlugin { pname = "popup.nvim"; version = "2021-11-18"; src = fetchFromGitHub { @@ -8158,7 +8255,7 @@ final: prev: meta.homepage = "https://github.com/nvim-lua/popup.nvim/"; }; - presence-nvim = buildVimPluginFrom2Nix { + presence-nvim = buildVimPlugin { pname = "presence.nvim"; version = "2023-01-29"; src = fetchFromGitHub { @@ -8170,7 +8267,7 @@ final: prev: meta.homepage = "https://github.com/andweeb/presence.nvim/"; }; - presenting-vim = buildVimPluginFrom2Nix { + presenting-vim = buildVimPlugin { pname = "presenting.vim"; version = "2022-03-27"; src = fetchFromGitHub { @@ -8182,7 +8279,7 @@ final: prev: meta.homepage = "https://github.com/sotte/presenting.vim/"; }; - preto = buildVimPluginFrom2Nix { + preto = buildVimPlugin { pname = "preto"; version = "2023-02-10"; src = fetchFromGitHub { @@ -8194,7 +8291,7 @@ final: prev: meta.homepage = "https://github.com/ewilazarus/preto/"; }; - pretty-fold-nvim = buildVimPluginFrom2Nix { + pretty-fold-nvim = buildVimPlugin { pname = "pretty-fold.nvim"; version = "2022-07-20"; src = fetchFromGitHub { @@ -8206,7 +8303,7 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/pretty-fold.nvim/"; }; - prev_indent = buildVimPluginFrom2Nix { + prev_indent = buildVimPlugin { pname = "prev_indent"; version = "2014-03-08"; src = fetchFromGitHub { @@ -8218,7 +8315,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/prev_indent/"; }; - project-nvim = buildVimPluginFrom2Nix { + project-nvim = buildVimPlugin { pname = "project.nvim"; version = "2023-04-04"; src = fetchFromGitHub { @@ -8230,7 +8327,7 @@ final: prev: meta.homepage = "https://github.com/ahmedkhalf/project.nvim/"; }; - promise-async = buildVimPluginFrom2Nix { + promise-async = buildVimPlugin { pname = "promise-async"; version = "2023-04-09"; src = fetchFromGitHub { @@ -8242,7 +8339,7 @@ final: prev: meta.homepage = "https://github.com/kevinhwang91/promise-async/"; }; - psc-ide-vim = buildVimPluginFrom2Nix { + psc-ide-vim = buildVimPlugin { pname = "psc-ide-vim"; version = "2021-05-31"; src = fetchFromGitHub { @@ -8254,7 +8351,7 @@ final: prev: meta.homepage = "https://github.com/frigoeu/psc-ide-vim/"; }; - purescript-vim = buildVimPluginFrom2Nix { + purescript-vim = buildVimPlugin { pname = "purescript-vim"; version = "2023-02-06"; src = fetchFromGitHub { @@ -8266,20 +8363,20 @@ final: prev: meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; - python-mode = buildVimPluginFrom2Nix { + python-mode = buildVimPlugin { pname = "python-mode"; - version = "2023-07-03"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "python-mode"; repo = "python-mode"; - rev = "57384b9f278ed1c2b402fe48aad05781882561f1"; - sha256 = "1y30inljvpjrq1yphfjv1x2f0m5bn6gbqg69f3b51fs53sqaswi8"; + rev = "e01c27e8c17b3af2b9df7f6fc5a8a44afc3ad020"; + sha256 = "0g2gcxax1h44rzyv0wfsz78w62cak9riynqh190gncqhzjzswdfp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/python-mode/python-mode/"; }; - python-syntax = buildVimPluginFrom2Nix { + python-syntax = buildVimPlugin { pname = "python-syntax"; version = "2020-12-14"; src = fetchFromGitHub { @@ -8291,7 +8388,7 @@ final: prev: meta.homepage = "https://github.com/vim-python/python-syntax/"; }; - pywal-nvim = buildVimPluginFrom2Nix { + pywal-nvim = buildVimPlugin { pname = "pywal.nvim"; version = "2022-11-03"; src = fetchFromGitHub { @@ -8303,7 +8400,19 @@ final: prev: meta.homepage = "https://github.com/AlphaTechnolog/pywal.nvim/"; }; - quick-scope = buildVimPluginFrom2Nix { + quarto-nvim = buildVimPlugin { + pname = "quarto-nvim"; + version = "2023-09-08"; + src = fetchFromGitHub { + owner = "quarto-dev"; + repo = "quarto-nvim"; + rev = "b349b7e54f5f5543b6104bfbad0e7d09d4f7c564"; + sha256 = "11q0x50ppyrna7bd7x9id3fpxz7rdj6zii3ysnkh7hfzm3hsg7pi"; + }; + meta.homepage = "https://github.com/quarto-dev/quarto-nvim/"; + }; + + quick-scope = buildVimPlugin { pname = "quick-scope"; version = "2023-08-08"; src = fetchFromGitHub { @@ -8315,7 +8424,7 @@ final: prev: meta.homepage = "https://github.com/unblevable/quick-scope/"; }; - quickfix-reflector-vim = buildVimPluginFrom2Nix { + quickfix-reflector-vim = buildVimPlugin { pname = "quickfix-reflector.vim"; version = "2022-02-02"; src = fetchFromGitHub { @@ -8327,7 +8436,7 @@ final: prev: meta.homepage = "https://github.com/stefandtw/quickfix-reflector.vim/"; }; - quickfixstatus = buildVimPluginFrom2Nix { + quickfixstatus = buildVimPlugin { pname = "quickfixstatus"; version = "2011-09-03"; src = fetchFromGitHub { @@ -8339,7 +8448,7 @@ final: prev: meta.homepage = "https://github.com/dannyob/quickfixstatus/"; }; - quickmath-nvim = buildVimPluginFrom2Nix { + quickmath-nvim = buildVimPlugin { pname = "quickmath.nvim"; version = "2023-03-12"; src = fetchFromGitHub { @@ -8351,7 +8460,7 @@ final: prev: meta.homepage = "https://github.com/jbyuki/quickmath.nvim/"; }; - rainbow = buildVimPluginFrom2Nix { + rainbow = buildVimPlugin { pname = "rainbow"; version = "2022-10-08"; src = fetchFromGitHub { @@ -8363,7 +8472,18 @@ final: prev: meta.homepage = "https://github.com/luochen1990/rainbow/"; }; - rainbow_parentheses-vim = buildVimPluginFrom2Nix { + rainbow-delimiters-nvim = buildVimPlugin { + pname = "rainbow-delimiters.nvim"; + version = "2023-09-28"; + src = fetchgit { + url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; + rev = "ece052dbcb2b3d2980f0f9881e41277929813644"; + sha256 = "05rc0mgn3jbp1aiac7531cidpc1s79qi1zhj2l7cz9353cfq0j47"; + }; + meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim"; + }; + + rainbow_parentheses-vim = buildVimPlugin { pname = "rainbow_parentheses.vim"; version = "2013-03-05"; src = fetchFromGitHub { @@ -8375,7 +8495,7 @@ final: prev: meta.homepage = "https://github.com/kien/rainbow_parentheses.vim/"; }; - random-vim = buildVimPluginFrom2Nix { + random-vim = buildVimPlugin { pname = "random.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -8387,7 +8507,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/random.vim/"; }; - range-highlight-nvim = buildVimPluginFrom2Nix { + range-highlight-nvim = buildVimPlugin { pname = "range-highlight.nvim"; version = "2021-08-03"; src = fetchFromGitHub { @@ -8399,7 +8519,7 @@ final: prev: meta.homepage = "https://github.com/winston0410/range-highlight.nvim/"; }; - ranger-vim = buildVimPluginFrom2Nix { + ranger-vim = buildVimPlugin { pname = "ranger.vim"; version = "2021-12-13"; src = fetchFromGitHub { @@ -8411,7 +8531,7 @@ final: prev: meta.homepage = "https://github.com/rafaqz/ranger.vim/"; }; - rcshell-vim = buildVimPluginFrom2Nix { + rcshell-vim = buildVimPlugin { pname = "rcshell.vim"; version = "2014-12-29"; src = fetchFromGitHub { @@ -8423,7 +8543,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/rcshell.vim/"; }; - readline-vim = buildVimPluginFrom2Nix { + readline-vim = buildVimPlugin { pname = "readline.vim"; version = "2023-03-09"; src = fetchFromGitHub { @@ -8435,31 +8555,31 @@ final: prev: meta.homepage = "https://github.com/ryvnf/readline.vim/"; }; - refactoring-nvim = buildVimPluginFrom2Nix { + refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "2023-08-18"; + version = "2023-09-18"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "b1cc851bcb4e3c624abbe2a725237eef6bea765c"; - sha256 = "1y13ayb48hnz7fpw3ani56pbibkbq99fdaf3llbh0gs4m1j23923"; + rev = "be6505be8bdd306646bb81399312c02927a60a51"; + sha256 = "1h4hbg5x80anr4imfnlvvmcyqr0jg3s0jkpgzhpzq1783b89sj9s"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; - registers-nvim = buildVimPluginFrom2Nix { + registers-nvim = buildVimPlugin { pname = "registers.nvim"; - version = "2023-04-04"; + version = "2023-09-05"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "2ab8372bb837f05fae6b43091f10a0b725d113ca"; - sha256 = "1z79z8qvwhi3wzya6mh1rp0v37fipvhn47wahjdlwbjbbrq6bq1i"; + rev = "f7f7b8a55de10293e2af6002d4da98cbeffc6333"; + sha256 = "12khn5113sijszgmihcblczg4afk34n6wwf0pf3sjj5286ypv2a9"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; - remember-nvim = buildVimPluginFrom2Nix { + remember-nvim = buildVimPlugin { pname = "remember.nvim"; version = "2023-06-12"; src = fetchFromGitHub { @@ -8471,7 +8591,7 @@ final: prev: meta.homepage = "https://github.com/vladdoster/remember.nvim/"; }; - renamer-nvim = buildVimPluginFrom2Nix { + renamer-nvim = buildVimPlugin { pname = "renamer.nvim"; version = "2022-08-29"; src = fetchFromGitHub { @@ -8483,7 +8603,7 @@ final: prev: meta.homepage = "https://github.com/filipdutescu/renamer.nvim/"; }; - replacer-nvim = buildVimPluginFrom2Nix { + replacer-nvim = buildVimPlugin { pname = "replacer.nvim"; version = "2023-07-29"; src = fetchFromGitHub { @@ -8497,17 +8617,17 @@ final: prev: rest-nvim = buildNeovimPlugin { pname = "rest.nvim"; - version = "2023-07-16"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "rest-nvim"; repo = "rest.nvim"; - rev = "22673c848768ff25517154a5aebfebc0c77d0b4f"; - sha256 = "1arfcrq4vh3hp4g8s6qib25cykn7v9ywfb8nv9mh8nivqryvmwvq"; + rev = "35d949df1928b44b6d941fd9015eb3f973845b1f"; + sha256 = "13lcd7wgdfd1hy1jkqbwvkcpyz9caxj9gdrn03ckba5lcbbnf08k"; }; meta.homepage = "https://github.com/rest-nvim/rest.nvim/"; }; - riv-vim = buildVimPluginFrom2Nix { + riv-vim = buildVimPlugin { pname = "riv.vim"; version = "2021-08-09"; src = fetchFromGitHub { @@ -8519,7 +8639,7 @@ final: prev: meta.homepage = "https://github.com/gu-fan/riv.vim/"; }; - rnvimr = buildVimPluginFrom2Nix { + rnvimr = buildVimPlugin { pname = "rnvimr"; version = "2023-08-06"; src = fetchFromGitHub { @@ -8531,7 +8651,7 @@ final: prev: meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; - robotframework-vim = buildVimPluginFrom2Nix { + robotframework-vim = buildVimPlugin { pname = "robotframework-vim"; version = "2017-04-14"; src = fetchFromGitHub { @@ -8543,7 +8663,7 @@ final: prev: meta.homepage = "https://github.com/mfukar/robotframework-vim/"; }; - ron-vim = buildVimPluginFrom2Nix { + ron-vim = buildVimPlugin { pname = "ron.vim"; version = "2022-08-19"; src = fetchFromGitHub { @@ -8555,7 +8675,7 @@ final: prev: meta.homepage = "https://github.com/ron-rs/ron.vim/"; }; - rspec-vim = buildVimPluginFrom2Nix { + rspec-vim = buildVimPlugin { pname = "rspec.vim"; version = "2020-08-20"; src = fetchFromGitHub { @@ -8567,7 +8687,7 @@ final: prev: meta.homepage = "https://github.com/keith/rspec.vim/"; }; - rtorrent-syntax-file = buildVimPluginFrom2Nix { + rtorrent-syntax-file = buildVimPlugin { pname = "rtorrent-syntax-file"; version = "2016-03-19"; src = fetchFromGitHub { @@ -8579,7 +8699,7 @@ final: prev: meta.homepage = "https://github.com/ccarpita/rtorrent-syntax-file/"; }; - rust-tools-nvim = buildVimPluginFrom2Nix { + rust-tools-nvim = buildVimPlugin { pname = "rust-tools.nvim"; version = "2023-07-10"; src = fetchFromGitHub { @@ -8591,7 +8711,7 @@ final: prev: meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; - rust-vim = buildVimPluginFrom2Nix { + rust-vim = buildVimPlugin { pname = "rust.vim"; version = "2022-11-27"; src = fetchFromGitHub { @@ -8603,7 +8723,7 @@ final: prev: meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; - sad-vim = buildVimPluginFrom2Nix { + sad-vim = buildVimPlugin { pname = "sad.vim"; version = "2019-02-18"; src = fetchFromGitHub { @@ -8615,7 +8735,7 @@ final: prev: meta.homepage = "https://github.com/hauleth/sad.vim/"; }; - salt-vim = buildVimPluginFrom2Nix { + salt-vim = buildVimPlugin { pname = "salt-vim"; version = "2017-07-01"; src = fetchFromGitHub { @@ -8627,7 +8747,7 @@ final: prev: meta.homepage = "https://github.com/vmware-archive/salt-vim/"; }; - satellite-nvim = buildVimPluginFrom2Nix { + satellite-nvim = buildVimPlugin { pname = "satellite.nvim"; version = "2023-07-31"; src = fetchFromGitHub { @@ -8639,31 +8759,31 @@ final: prev: meta.homepage = "https://github.com/lewis6991/satellite.nvim/"; }; - scnvim = buildVimPluginFrom2Nix { + scnvim = buildVimPlugin { pname = "scnvim"; - version = "2023-06-27"; + version = "2023-09-11"; src = fetchFromGitHub { owner = "davidgranstrom"; repo = "scnvim"; - rev = "c44d57aeadc4b01888bc10a249f8867df8d1a461"; - sha256 = "0pbji2c5rs3d6kqixm7xz5ararix2iq7rh58hap9ssgr88rzqjng"; + rev = "f9e75bf21c77882625f89baa745d9bc4992742dc"; + sha256 = "1yavx67b3zqz65z1wg4a0cdp64s2bgqh12jzg31rh02a8hb08ipw"; }; meta.homepage = "https://github.com/davidgranstrom/scnvim/"; }; - scope-nvim = buildVimPluginFrom2Nix { + scope-nvim = buildVimPlugin { pname = "scope.nvim"; - version = "2023-08-16"; + version = "2023-09-10"; src = fetchFromGitHub { owner = "tiagovla"; repo = "scope.nvim"; - rev = "48c88376a9dbed96aaf33268b369c14850836fad"; - sha256 = "0s6ai8hnsm4wy5x61ylf0fxn6cxv00shmddwbjy5f3hbdp9rxsd6"; + rev = "01ce40fe7434fba9a122c01b4734479b3860609a"; + sha256 = "10bc32imz72crnzd2fak5n571x0wq7vh9jqpy4q9f9kin2lw497b"; }; meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; - scrollbar-nvim = buildVimPluginFrom2Nix { + scrollbar-nvim = buildVimPlugin { pname = "scrollbar.nvim"; version = "2022-06-16"; src = fetchFromGitHub { @@ -8675,7 +8795,7 @@ final: prev: meta.homepage = "https://github.com/Xuyuanp/scrollbar.nvim/"; }; - scss-syntax-vim = buildVimPluginFrom2Nix { + scss-syntax-vim = buildVimPlugin { pname = "scss-syntax.vim"; version = "2019-06-30"; src = fetchFromGitHub { @@ -8687,7 +8807,7 @@ final: prev: meta.homepage = "https://github.com/cakebaker/scss-syntax.vim/"; }; - searchbox-nvim = buildVimPluginFrom2Nix { + searchbox-nvim = buildVimPlugin { pname = "searchbox.nvim"; version = "2022-10-31"; src = fetchFromGitHub { @@ -8699,7 +8819,7 @@ final: prev: meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/"; }; - securemodelines = buildVimPluginFrom2Nix { + securemodelines = buildVimPlugin { pname = "securemodelines"; version = "2019-02-09"; src = fetchFromGitHub { @@ -8711,7 +8831,7 @@ final: prev: meta.homepage = "https://github.com/RobertAudi/securemodelines/"; }; - self = buildVimPluginFrom2Nix { + self = buildVimPlugin { pname = "self"; version = "2014-05-28"; src = fetchFromGitHub { @@ -8723,7 +8843,7 @@ final: prev: meta.homepage = "https://github.com/megaannum/self/"; }; - semantic-highlight-vim = buildVimPluginFrom2Nix { + semantic-highlight-vim = buildVimPlugin { pname = "semantic-highlight.vim"; version = "2020-09-11"; src = fetchFromGitHub { @@ -8735,7 +8855,7 @@ final: prev: meta.homepage = "https://github.com/jaxbot/semantic-highlight.vim/"; }; - semshi = buildVimPluginFrom2Nix { + semshi = buildVimPlugin { pname = "semshi"; version = "2021-07-24"; src = fetchFromGitHub { @@ -8747,7 +8867,7 @@ final: prev: meta.homepage = "https://github.com/numirias/semshi/"; }; - seoul256-vim = buildVimPluginFrom2Nix { + seoul256-vim = buildVimPlugin { pname = "seoul256.vim"; version = "2023-05-03"; src = fetchFromGitHub { @@ -8759,19 +8879,19 @@ final: prev: meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; - sg-nvim = buildVimPluginFrom2Nix { + sg-nvim = buildVimPlugin { pname = "sg.nvim"; - version = "2023-08-16"; + version = "2023-09-27"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "6fc56ef3b488531243f071645ebf3caa5d93e7f0"; - sha256 = "1991bpipndjnn2gc6igcw2q65675nm49mcdxmdp33ingrjlkny6v"; + rev = "b0b543285dfefd47eeae93f3f5c812c1dce26ff4"; + sha256 = "09sldl3858nlhm10xzbrd3nigf05ia34n2ml4mqrzmb0zkkzidn6"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; - shabadou-vim = buildVimPluginFrom2Nix { + shabadou-vim = buildVimPlugin { pname = "shabadou.vim"; version = "2016-07-19"; src = fetchFromGitHub { @@ -8783,7 +8903,7 @@ final: prev: meta.homepage = "https://github.com/osyo-manga/shabadou.vim/"; }; - sideways-vim = buildVimPluginFrom2Nix { + sideways-vim = buildVimPlugin { pname = "sideways.vim"; version = "2023-02-25"; src = fetchFromGitHub { @@ -8796,7 +8916,7 @@ final: prev: meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; - skim-vim = buildVimPluginFrom2Nix { + skim-vim = buildVimPlugin { pname = "skim.vim"; version = "2023-05-25"; src = fetchFromGitHub { @@ -8808,7 +8928,7 @@ final: prev: meta.homepage = "https://github.com/lotabout/skim.vim/"; }; - sky-color-clock-vim = buildVimPluginFrom2Nix { + sky-color-clock-vim = buildVimPlugin { pname = "sky-color-clock.vim"; version = "2018-11-03"; src = fetchFromGitHub { @@ -8820,7 +8940,7 @@ final: prev: meta.homepage = "https://github.com/mopp/sky-color-clock.vim/"; }; - slimv = buildVimPluginFrom2Nix { + slimv = buildVimPlugin { pname = "slimv"; version = "2023-07-01"; src = fetchFromGitHub { @@ -8832,19 +8952,31 @@ final: prev: meta.homepage = "https://github.com/kovisoft/slimv/"; }; - smart-splits-nvim = buildVimPluginFrom2Nix { + smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2023-06-26"; + version = "2023-09-12"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "7aad6019dee974a01333523a5b8e122b7e7da454"; - sha256 = "1vrwj0pz0gcyw0nkfjiq6bz4cx481dsryc6j0ffkxr1anzrf3clq"; + rev = "0beb14427dcf2a5d5d63e0064b45032a7bd3e763"; + sha256 = "1jzai9sbq1jhs27gf67ppp4czj21rc18q9dlyb9whjrkiz61dv64"; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; }; - smartpairs-vim = buildVimPluginFrom2Nix { + smartcolumn-nvim = buildVimPlugin { + pname = "smartcolumn.nvim"; + version = "2023-09-12"; + src = fetchFromGitHub { + owner = "m4xshen"; + repo = "smartcolumn.nvim"; + rev = "c6abf3917fcec487c7475e208ae37f5788af5b04"; + sha256 = "1imdzqq997n8jwcxf8dyh0647hx58z9imm95nky23dlmhp3lzn9v"; + }; + meta.homepage = "https://github.com/m4xshen/smartcolumn.nvim/"; + }; + + smartpairs-vim = buildVimPlugin { pname = "smartpairs.vim"; version = "2018-01-01"; src = fetchFromGitHub { @@ -8856,7 +8988,7 @@ final: prev: meta.homepage = "https://github.com/gorkunov/smartpairs.vim/"; }; - smartyank-nvim = buildVimPluginFrom2Nix { + smartyank-nvim = buildVimPlugin { pname = "smartyank.nvim"; version = "2023-02-25"; src = fetchFromGitHub { @@ -8868,7 +9000,7 @@ final: prev: meta.homepage = "https://github.com/ibhagwan/smartyank.nvim/"; }; - snap = buildVimPluginFrom2Nix { + snap = buildVimPlugin { pname = "snap"; version = "2022-08-03"; src = fetchFromGitHub { @@ -8880,7 +9012,7 @@ final: prev: meta.homepage = "https://github.com/camspiers/snap/"; }; - snippets-nvim = buildVimPluginFrom2Nix { + snippets-nvim = buildVimPlugin { pname = "snippets.nvim"; version = "2020-09-09"; src = fetchFromGitHub { @@ -8892,7 +9024,7 @@ final: prev: meta.homepage = "https://github.com/norcalli/snippets.nvim/"; }; - solarized-nvim = buildVimPluginFrom2Nix { + solarized-nvim = buildVimPlugin { pname = "solarized.nvim"; version = "2023-02-09"; src = fetchFromGitHub { @@ -8904,7 +9036,7 @@ final: prev: meta.homepage = "https://github.com/shaunsingh/solarized.nvim/"; }; - sonokai = buildVimPluginFrom2Nix { + sonokai = buildVimPlugin { pname = "sonokai"; version = "2023-08-07"; src = fetchFromGitHub { @@ -8916,7 +9048,7 @@ final: prev: meta.homepage = "https://github.com/sainnhe/sonokai/"; }; - sort-nvim = buildVimPluginFrom2Nix { + sort-nvim = buildVimPlugin { pname = "sort.nvim"; version = "2023-04-12"; src = fetchFromGitHub { @@ -8928,7 +9060,7 @@ final: prev: meta.homepage = "https://github.com/sQVe/sort.nvim/"; }; - sourcemap-vim = buildVimPluginFrom2Nix { + sourcemap-vim = buildVimPlugin { pname = "sourcemap.vim"; version = "2012-09-19"; src = fetchFromGitHub { @@ -8940,7 +9072,7 @@ final: prev: meta.homepage = "https://github.com/chikatoike/sourcemap.vim/"; }; - space-vim = buildVimPluginFrom2Nix { + space-vim = buildVimPlugin { pname = "space-vim"; version = "2023-04-17"; src = fetchFromGitHub { @@ -8952,7 +9084,7 @@ final: prev: meta.homepage = "https://github.com/liuchengxu/space-vim/"; }; - spacevim = buildVimPluginFrom2Nix { + spacevim = buildVimPlugin { pname = "spacevim"; version = "2018-03-29"; src = fetchFromGitHub { @@ -8964,7 +9096,7 @@ final: prev: meta.homepage = "https://github.com/ctjhoa/spacevim/"; }; - sparkup = buildVimPluginFrom2Nix { + sparkup = buildVimPlugin { pname = "sparkup"; version = "2012-06-11"; src = fetchFromGitHub { @@ -8976,7 +9108,7 @@ final: prev: meta.homepage = "https://github.com/chrisgeo/sparkup/"; }; - specs-nvim = buildVimPluginFrom2Nix { + specs-nvim = buildVimPlugin { pname = "specs.nvim"; version = "2022-09-20"; src = fetchFromGitHub { @@ -8988,7 +9120,7 @@ final: prev: meta.homepage = "https://github.com/edluffy/specs.nvim/"; }; - spellsitter-nvim = buildVimPluginFrom2Nix { + spellsitter-nvim = buildVimPlugin { pname = "spellsitter.nvim"; version = "2022-09-06"; src = fetchFromGitHub { @@ -9000,19 +9132,19 @@ final: prev: meta.homepage = "https://github.com/lewis6991/spellsitter.nvim/"; }; - sphinx-nvim = buildVimPluginFrom2Nix { + sphinx-nvim = buildVimPlugin { pname = "sphinx.nvim"; - version = "2022-10-27"; + version = "2023-08-25"; src = fetchFromGitHub { owner = "stsewd"; repo = "sphinx.nvim"; - rev = "ec53a6e7104c6bef75982fce15bcab546c590f7e"; - sha256 = "15pxzq74sx9zwwpcfy478mq558s2kwv78pgzqz4jw03hd0ms2c1k"; + rev = "d4eceb35975d379c6b380111627c5d4531f77d08"; + sha256 = "0j4v1ckc7p5bsh81yhcc35yv1lqkn2kicy84pbk556ksx60pgvgs"; }; meta.homepage = "https://github.com/stsewd/sphinx.nvim/"; }; - splice-vim = buildVimPluginFrom2Nix { + splice-vim = buildVimPlugin { pname = "splice.vim"; version = "2020-01-15"; src = fetchFromGitHub { @@ -9024,7 +9156,7 @@ final: prev: meta.homepage = "https://github.com/sjl/splice.vim/"; }; - split-term-vim = buildVimPluginFrom2Nix { + split-term-vim = buildVimPlugin { pname = "split-term.vim"; version = "2018-09-30"; src = fetchFromGitHub { @@ -9036,20 +9168,20 @@ final: prev: meta.homepage = "https://github.com/vimlab/split-term.vim/"; }; - splitjoin-vim = buildVimPluginFrom2Nix { + splitjoin-vim = buildVimPlugin { pname = "splitjoin.vim"; - version = "2023-08-11"; + version = "2023-09-02"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "0e208e01e7981d59914f045144f5dee709abf891"; - sha256 = "09pp75byrqscp21sv9bvkbcfilqiqrfg7zrb8c0af6k9s7hsbz30"; + rev = "53962443e4dc557e4d4c02b501adfcb5cd1368c3"; + sha256 = "048ybbfgsb7gz6jx7nkkzq30giqv93bnzicbhsa2g9r1hr9yphx4"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; }; - sqlite-lua = buildVimPluginFrom2Nix { + sqlite-lua = buildVimPlugin { pname = "sqlite.lua"; version = "2023-04-19"; src = fetchFromGitHub { @@ -9061,19 +9193,19 @@ final: prev: meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; - srcery-vim = buildVimPluginFrom2Nix { + srcery-vim = buildVimPlugin { pname = "srcery-vim"; - version = "2023-07-26"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "srcery-colors"; repo = "srcery-vim"; - rev = "cf2c61ff3448be41b264ee850eeac16cacd7e5a9"; - sha256 = "0gpdsnzwk9hvr2302rc62nxsvv895525q6iy7pzracjqlh29ljbq"; + rev = "8ea4c4f5caf61ac4ab887fc53eabc916985db881"; + sha256 = "0z6i35gcf4qcy9cgsrg2bg2alh0sk6zxqvid8lgkmds4qgrvhxp3"; }; meta.homepage = "https://github.com/srcery-colors/srcery-vim/"; }; - sslsecure-vim = buildVimPluginFrom2Nix { + sslsecure-vim = buildVimPlugin { pname = "sslsecure.vim"; version = "2017-07-27"; src = fetchFromGitHub { @@ -9085,19 +9217,19 @@ final: prev: meta.homepage = "https://github.com/chr4/sslsecure.vim/"; }; - ssr-nvim = buildVimPluginFrom2Nix { + ssr-nvim = buildVimPlugin { pname = "ssr.nvim"; - version = "2023-08-11"; + version = "2023-08-20"; src = fetchFromGitHub { owner = "cshuaimin"; repo = "ssr.nvim"; - rev = "027a89f84283a9051427d4f319720336535c2e82"; - sha256 = "1b8nllqvi12kg1ixzipwdxnc68qr034s9r4wqnydwccdi1cw6pdd"; + rev = "b2f35df231c6b090f6eb023ddf2ad0cb88d90eb4"; + sha256 = "1zkpzf82ln9ymwrrm3zyy763idmm3bqg6vswbgh2sac8xsdfnj56"; }; meta.homepage = "https://github.com/cshuaimin/ssr.nvim/"; }; - stabilize-nvim = buildVimPluginFrom2Nix { + stabilize-nvim = buildVimPlugin { pname = "stabilize.nvim"; version = "2023-04-14"; src = fetchFromGitHub { @@ -9109,7 +9241,7 @@ final: prev: meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; - stan-vim = buildVimPluginFrom2Nix { + stan-vim = buildVimPlugin { pname = "stan-vim"; version = "2021-05-28"; src = fetchFromGitHub { @@ -9121,7 +9253,7 @@ final: prev: meta.homepage = "https://github.com/eigenfoo/stan-vim/"; }; - starrynight = buildVimPluginFrom2Nix { + starrynight = buildVimPlugin { pname = "starrynight"; version = "2021-09-09"; src = fetchFromGitHub { @@ -9133,7 +9265,7 @@ final: prev: meta.homepage = "https://github.com/josegamez82/starrynight/"; }; - starsearch-vim = buildVimPluginFrom2Nix { + starsearch-vim = buildVimPlugin { pname = "starsearch.vim"; version = "2014-09-21"; src = fetchFromGitHub { @@ -9145,19 +9277,19 @@ final: prev: meta.homepage = "https://github.com/darfink/starsearch.vim/"; }; - statuscol-nvim = buildVimPluginFrom2Nix { + statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "2023-06-20"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "9f1ff2dcf614544c5022e876d83b4894c1944e87"; - sha256 = "1gw8c2aw3s99xxjyh0j62z91g68258gjbz172jh7vkfvqxpbxy3d"; + rev = "0944234914438695050eec6f83b4669864680c1a"; + sha256 = "0ia4s68xwjsr9zrn8h48d5bhpcj3qqvcdwak6pwjvg4hxrq7183p"; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; }; - stylish-nvim = buildVimPluginFrom2Nix { + stylish-nvim = buildVimPlugin { pname = "stylish.nvim"; version = "2022-02-01"; src = fetchFromGitHub { @@ -9169,7 +9301,7 @@ final: prev: meta.homepage = "https://github.com/teto/stylish.nvim/"; }; - substitute-nvim = buildVimPluginFrom2Nix { + substitute-nvim = buildVimPlugin { pname = "substitute.nvim"; version = "2023-07-20"; src = fetchFromGitHub { @@ -9181,7 +9313,7 @@ final: prev: meta.homepage = "https://github.com/gbprod/substitute.nvim/"; }; - substrata-nvim = buildVimPluginFrom2Nix { + substrata-nvim = buildVimPlugin { pname = "substrata.nvim"; version = "2022-10-07"; src = fetchFromGitHub { @@ -9193,7 +9325,7 @@ final: prev: meta.homepage = "https://github.com/kvrohit/substrata.nvim/"; }; - suda-vim = buildVimPluginFrom2Nix { + suda-vim = buildVimPlugin { pname = "suda.vim"; version = "2023-06-27"; src = fetchFromGitHub { @@ -9205,7 +9337,7 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/suda.vim/"; }; - supertab = buildVimPluginFrom2Nix { + supertab = buildVimPlugin { pname = "supertab"; version = "2021-04-30"; src = fetchFromGitHub { @@ -9217,7 +9349,7 @@ final: prev: meta.homepage = "https://github.com/ervandew/supertab/"; }; - surround-nvim = buildVimPluginFrom2Nix { + surround-nvim = buildVimPlugin { pname = "surround.nvim"; version = "2022-10-10"; src = fetchFromGitHub { @@ -9229,7 +9361,7 @@ final: prev: meta.homepage = "https://github.com/ur4ltz/surround.nvim/"; }; - sved = buildVimPluginFrom2Nix { + sved = buildVimPlugin { pname = "sved"; version = "2022-08-11"; src = fetchFromGitHub { @@ -9241,19 +9373,19 @@ final: prev: meta.homepage = "https://github.com/peterbjorgensen/sved/"; }; - swayconfig-vim = buildVimPluginFrom2Nix { + swayconfig-vim = buildVimPlugin { pname = "swayconfig.vim"; - version = "2023-01-28"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "jamespeapen"; repo = "swayconfig.vim"; - rev = "ce04a8e8c494590382d1b32a20ed3b451d608623"; - sha256 = "0lirihvrx0qn59nbg5s3sh1jgv0v3q4ag7kgvc3r7q9a2fbjg46y"; + rev = "29a5e74bdd4d2958818e15b2926e408c6cd85c75"; + sha256 = "1gqvrrx8lz0pzfkc2rkz2ifpfif278cpklnrn3xvnhfzwbg6j27y"; }; meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/"; }; - swift-vim = buildVimPluginFrom2Nix { + swift-vim = buildVimPlugin { pname = "swift.vim"; version = "2023-08-02"; src = fetchFromGitHub { @@ -9265,20 +9397,20 @@ final: prev: meta.homepage = "https://github.com/keith/swift.vim/"; }; - switch-vim = buildVimPluginFrom2Nix { + switch-vim = buildVimPlugin { pname = "switch.vim"; - version = "2023-04-25"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "switch.vim"; - rev = "6b6cfda7ba751617599fcf3a96c1694e7924255d"; - sha256 = "1filijmx87g6yiv9bfgf89yiffqwq2qmvw5f73zfq0sh3pyxk6ja"; + rev = "68d269301181835788dcdcb6d5bca337fb954395"; + sha256 = "0llpr59wgagr1mvaml80pqbci025phgdfn84zn82s1mmgaa4xjl3"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/switch.vim/"; }; - symbols-outline-nvim = buildVimPluginFrom2Nix { + symbols-outline-nvim = buildVimPlugin { pname = "symbols-outline.nvim"; version = "2023-01-25"; src = fetchFromGitHub { @@ -9290,7 +9422,7 @@ final: prev: meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; - syntastic = buildVimPluginFrom2Nix { + syntastic = buildVimPlugin { pname = "syntastic"; version = "2022-07-10"; src = fetchFromGitHub { @@ -9302,19 +9434,19 @@ final: prev: meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; - tabby-nvim = buildVimPluginFrom2Nix { + tabby-nvim = buildVimPlugin { pname = "tabby.nvim"; - version = "2023-08-16"; + version = "2023-09-21"; src = fetchFromGitHub { owner = "nanozuki"; repo = "tabby.nvim"; - rev = "c7a7819af7016d5afb741e425ee65626c36f90d6"; - sha256 = "01a37a0v7n3yq2lpv47mnxr0v8ywvgrz1vs6ckw9qs37awv9fing"; + rev = "9e537762cbb7647357eab22c61c7c5dda00138dd"; + sha256 = "0wznkhpd3wax8jqw6wa2802x649jv8ph89plz1qwc08ia47lwcfb"; }; meta.homepage = "https://github.com/nanozuki/tabby.nvim/"; }; - tabline-nvim = buildVimPluginFrom2Nix { + tabline-nvim = buildVimPlugin { pname = "tabline.nvim"; version = "2023-07-24"; src = fetchFromGitHub { @@ -9326,7 +9458,7 @@ final: prev: meta.homepage = "https://github.com/kdheepak/tabline.nvim/"; }; - tabmerge = buildVimPluginFrom2Nix { + tabmerge = buildVimPlugin { pname = "tabmerge"; version = "2010-10-18"; src = fetchFromGitHub { @@ -9338,7 +9470,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/tabmerge/"; }; - tabnine-vim = buildVimPluginFrom2Nix { + tabnine-vim = buildVimPlugin { pname = "tabnine-vim"; version = "2023-01-01"; src = fetchFromGitHub { @@ -9351,7 +9483,7 @@ final: prev: meta.homepage = "https://github.com/codota/tabnine-vim/"; }; - taboo-vim = buildVimPluginFrom2Nix { + taboo-vim = buildVimPlugin { pname = "taboo.vim"; version = "2019-08-27"; src = fetchFromGitHub { @@ -9363,7 +9495,19 @@ final: prev: meta.homepage = "https://github.com/gcmt/taboo.vim/"; }; - tabpagebuffer-vim = buildVimPluginFrom2Nix { + tabout-nvim = buildVimPlugin { + pname = "tabout.nvim"; + version = "2023-03-29"; + src = fetchFromGitHub { + owner = "abecodes"; + repo = "tabout.nvim"; + rev = "0d275c8d25f32457e67b5c66d6ae43f26a61bce5"; + sha256 = "11zly7bfdz110a7ififylzgizin06ia0i3jipzp12n2n2paarp1f"; + }; + meta.homepage = "https://github.com/abecodes/tabout.nvim/"; + }; + + tabpagebuffer-vim = buildVimPlugin { pname = "tabpagebuffer.vim"; version = "2014-09-30"; src = fetchFromGitHub { @@ -9375,7 +9519,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/tabpagebuffer.vim/"; }; - tabular = buildVimPluginFrom2Nix { + tabular = buildVimPlugin { pname = "tabular"; version = "2019-02-19"; src = fetchFromGitHub { @@ -9387,31 +9531,31 @@ final: prev: meta.homepage = "https://github.com/godlygeek/tabular/"; }; - tagalong-vim = buildVimPluginFrom2Nix { + tagalong-vim = buildVimPlugin { pname = "tagalong.vim"; - version = "2023-06-11"; + version = "2023-09-07"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "tagalong.vim"; - rev = "d12622b866c9eea5204a792517d11586c51715a2"; - sha256 = "0qys780fh1p7q1my17kq700csg06qfdbn0k210bai9qmd5hhccii"; + rev = "5a2bbf2b1d5b657685a49d48d98a4aa921c1fde3"; + sha256 = "03nl8aqfvpx20451ha9q5i6gndi3w3yzks2dygrg9d1y33p6ldyd"; }; meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/"; }; - tagbar = buildVimPluginFrom2Nix { + tagbar = buildVimPlugin { pname = "tagbar"; - version = "2023-08-15"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "402e3e117fc7b47e43dbb87c51064daae3bc3bf3"; - sha256 = "0cg7s68lr0282ci1r34ixnkvls830j2j5k5dr55vqqkqi7614n3p"; + rev = "5d6990e4fc5b3e3b88a3af90146f2561c4f6d828"; + sha256 = "08i5gx57hsj4840m1b85064077l3gbdiyxq04g6s1m1zpj0xq7zj"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; - taglist-vim = buildVimPluginFrom2Nix { + taglist-vim = buildVimPlugin { pname = "taglist.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -9423,7 +9567,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/taglist.vim/"; }; - targets-vim = buildVimPluginFrom2Nix { + targets-vim = buildVimPlugin { pname = "targets.vim"; version = "2023-02-22"; src = fetchFromGitHub { @@ -9435,7 +9579,7 @@ final: prev: meta.homepage = "https://github.com/wellle/targets.vim/"; }; - taskwiki = buildVimPluginFrom2Nix { + taskwiki = buildVimPlugin { pname = "taskwiki"; version = "2022-12-14"; src = fetchFromGitHub { @@ -9447,19 +9591,32 @@ final: prev: meta.homepage = "https://github.com/tools-life/taskwiki/"; }; - tcomment_vim = buildVimPluginFrom2Nix { + tcomment_vim = buildVimPlugin { pname = "tcomment_vim"; - version = "2022-12-17"; + version = "2023-09-22"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "b4930f9da28647e5417d462c341013f88184be7e"; - sha256 = "06nlnnrxh3jgnlcbbr7czpaz9v7n2g60mw28lshc14wzqpl01vvx"; + rev = "593c9a6e1d411e276aee3eb459bcdaabb21550e5"; + sha256 = "0hx20j02h753q9jmwhzbddr0bf0z5magc3ayrc3yw8sjvhnqvrhw"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; - telescope-asynctasks-nvim = buildVimPluginFrom2Nix { + telekasten-nvim = buildVimPlugin { + pname = "telekasten.nvim"; + version = "2023-09-08"; + src = fetchFromGitHub { + owner = "renerocksai"; + repo = "telekasten.nvim"; + rev = "bd5d323581f24ee124b33688287e6a22244c6f2a"; + sha256 = "0bp554glsjfhl1rbz4xfl536g5x962bqw8ss134j3cjpr5q4bf8d"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/renerocksai/telekasten.nvim/"; + }; + + telescope-asynctasks-nvim = buildVimPlugin { pname = "telescope-asynctasks.nvim"; version = "2022-04-09"; src = fetchFromGitHub { @@ -9471,7 +9628,7 @@ final: prev: meta.homepage = "https://github.com/GustavoKatel/telescope-asynctasks.nvim/"; }; - telescope-cheat-nvim = buildVimPluginFrom2Nix { + telescope-cheat-nvim = buildVimPlugin { pname = "telescope-cheat.nvim"; version = "2023-02-19"; src = fetchFromGitHub { @@ -9483,7 +9640,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-cheat.nvim/"; }; - telescope-coc-nvim = buildVimPluginFrom2Nix { + telescope-coc-nvim = buildVimPlugin { pname = "telescope-coc.nvim"; version = "2023-02-16"; src = fetchFromGitHub { @@ -9495,55 +9652,55 @@ final: prev: meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; - telescope-dap-nvim = buildVimPluginFrom2Nix { + telescope-dap-nvim = buildVimPlugin { pname = "telescope-dap.nvim"; - version = "2022-12-02"; + version = "2023-09-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-dap.nvim"; - rev = "313d2ea12ae59a1ca51b62bf01fc941a983d9c9c"; - sha256 = "0dkmmg30bxpbz990wgpndfhzql2015knrlmnscgz4cwyd39wwgpm"; + rev = "4e2d5efb92062f0b865fe59b200b5ed7793833bf"; + sha256 = "1fa1kmwv21h06di1p1vb05saaiabpl97j1h15zrpqr8cxhxmp515"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-dap.nvim/"; }; - telescope-file-browser-nvim = buildVimPluginFrom2Nix { + telescope-file-browser-nvim = buildVimPlugin { pname = "telescope-file-browser.nvim"; - version = "2023-08-13"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "ad7b637c72549713b9aaed7c4f9c79c62bcbdff0"; - sha256 = "1fpqnpvmp33cv0fvxi6vg2afh1acpm587mjvrpsghlrrsp48mbca"; + rev = "6e51d0cd6447cf2525412220ff0a2885eef9039c"; + sha256 = "1ksx2w2vaxnjyvj937la3fsiw7z0ary5qjnylxspw0zqp6d2ri9q"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; - telescope-frecency-nvim = buildVimPluginFrom2Nix { + telescope-frecency-nvim = buildVimPlugin { pname = "telescope-frecency.nvim"; - version = "2023-08-13"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "3aee7e0c6b05f85729cfae2fb62941088e47fe53"; - sha256 = "1byf6biwmcbawnwp03ms42kn41g9c3abgij8y9yxmdia5pms0zm2"; + rev = "4bdd9bafc7ac2c6fed03e92efac1e6b4632eda28"; + sha256 = "01a4hdgjf3i0qywz45rvzga02hphb2zl5cnpafw0igzb3lrsxqqk"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; - telescope-fzf-native-nvim = buildVimPluginFrom2Nix { + telescope-fzf-native-nvim = buildVimPlugin { pname = "telescope-fzf-native.nvim"; - version = "2023-05-25"; + version = "2023-09-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-fzf-native.nvim"; - rev = "9bc8237565ded606e6c366a71c64c0af25cd7a50"; - sha256 = "0g5n3x66kf5fbzv8rprpyi8hb6v961s0whk8dc6v8r1msc2m4zbs"; + rev = "6c921ca12321edaa773e324ef64ea301a1d0da62"; + sha256 = "101dxn7jfyg2wdzkw5cnrw475mg0p3w475l1hplqfhghz33zb1hy"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/"; }; - telescope-fzf-writer-nvim = buildVimPluginFrom2Nix { + telescope-fzf-writer-nvim = buildVimPlugin { pname = "telescope-fzf-writer.nvim"; version = "2021-04-16"; src = fetchFromGitHub { @@ -9555,7 +9712,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-writer.nvim/"; }; - telescope-fzy-native-nvim = buildVimPluginFrom2Nix { + telescope-fzy-native-nvim = buildVimPlugin { pname = "telescope-fzy-native.nvim"; version = "2022-09-11"; src = fetchFromGitHub { @@ -9568,7 +9725,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-fzy-native.nvim/"; }; - telescope-github-nvim = buildVimPluginFrom2Nix { + telescope-github-nvim = buildVimPlugin { pname = "telescope-github.nvim"; version = "2022-04-22"; src = fetchFromGitHub { @@ -9580,19 +9737,19 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-github.nvim/"; }; - telescope-live-grep-args-nvim = buildVimPluginFrom2Nix { + telescope-live-grep-args-nvim = buildVimPlugin { pname = "telescope-live-grep-args.nvim"; - version = "2023-04-05"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-live-grep-args.nvim"; - rev = "0f75ea809c46af8997c64f49c52e3c641d887885"; - sha256 = "1dnr5ap329xzx3g6arwz7np1achwihwl2ryd4q5g3r8w1sbm3mbg"; + rev = "851c0997d55601f2afd7290db0f90dc364e29f58"; + sha256 = "0c3hrbrxkcf1qz8djlkmf10fzn34i637sy3ijkdc0ywx1cqr6r1g"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-live-grep-args.nvim/"; }; - telescope-lsp-handlers-nvim = buildVimPluginFrom2Nix { + telescope-lsp-handlers-nvim = buildVimPlugin { pname = "telescope-lsp-handlers.nvim"; version = "2023-03-04"; src = fetchFromGitHub { @@ -9606,17 +9763,17 @@ final: prev: telescope-manix = buildNeovimPlugin { pname = "telescope-manix"; - version = "2023-06-05"; + version = "2023-09-11"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "telescope-manix"; - rev = "3930d658899dff2c796d8a5b488f7cc77a08d966"; - sha256 = "030v85lihjhvma9m22j1xc37wm06g4jkmhlmxpv1hsafff8cmxhq"; + rev = "392a883dec9d8ccfb1da3e10d1101ae34e627b97"; + sha256 = "0z2ir6gkr314aq7adiyjr06l876v61dkjf9n804kck5zwlbqyk30"; }; meta.homepage = "https://github.com/MrcJkb/telescope-manix/"; }; - telescope-media-files-nvim = buildVimPluginFrom2Nix { + telescope-media-files-nvim = buildVimPlugin { pname = "telescope-media-files.nvim"; version = "2023-02-19"; src = fetchFromGitHub { @@ -9628,7 +9785,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-media-files.nvim/"; }; - telescope-project-nvim = buildVimPluginFrom2Nix { + telescope-project-nvim = buildVimPlugin { pname = "telescope-project.nvim"; version = "2023-04-27"; src = fetchFromGitHub { @@ -9640,7 +9797,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-project.nvim/"; }; - telescope-sg = buildVimPluginFrom2Nix { + telescope-sg = buildVimPlugin { pname = "telescope-sg"; version = "2023-08-09"; src = fetchFromGitHub { @@ -9652,7 +9809,7 @@ final: prev: meta.homepage = "https://github.com/Marskey/telescope-sg/"; }; - telescope-symbols-nvim = buildVimPluginFrom2Nix { + telescope-symbols-nvim = buildVimPlugin { pname = "telescope-symbols.nvim"; version = "2023-02-19"; src = fetchFromGitHub { @@ -9664,7 +9821,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-symbols.nvim/"; }; - telescope-ui-select-nvim = buildVimPluginFrom2Nix { + telescope-ui-select-nvim = buildVimPlugin { pname = "telescope-ui-select.nvim"; version = "2022-04-30"; src = fetchFromGitHub { @@ -9676,7 +9833,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-ui-select.nvim/"; }; - telescope-ultisnips-nvim = buildVimPluginFrom2Nix { + telescope-ultisnips-nvim = buildVimPlugin { pname = "telescope-ultisnips.nvim"; version = "2021-09-26"; src = fetchFromGitHub { @@ -9688,7 +9845,7 @@ final: prev: meta.homepage = "https://github.com/fhill2/telescope-ultisnips.nvim/"; }; - telescope-undo-nvim = buildVimPluginFrom2Nix { + telescope-undo-nvim = buildVimPlugin { pname = "telescope-undo.nvim"; version = "2023-06-03"; src = fetchFromGitHub { @@ -9700,7 +9857,7 @@ final: prev: meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/"; }; - telescope-vim-bookmarks-nvim = buildVimPluginFrom2Nix { + telescope-vim-bookmarks-nvim = buildVimPlugin { pname = "telescope-vim-bookmarks.nvim"; version = "2022-07-17"; src = fetchFromGitHub { @@ -9712,7 +9869,7 @@ final: prev: meta.homepage = "https://github.com/tom-anders/telescope-vim-bookmarks.nvim/"; }; - telescope-z-nvim = buildVimPluginFrom2Nix { + telescope-z-nvim = buildVimPlugin { pname = "telescope-z.nvim"; version = "2023-08-17"; src = fetchFromGitHub { @@ -9724,7 +9881,7 @@ final: prev: meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/"; }; - telescope-zf-native-nvim = buildVimPluginFrom2Nix { + telescope-zf-native-nvim = buildVimPlugin { pname = "telescope-zf-native.nvim"; version = "2023-03-15"; src = fetchFromGitHub { @@ -9737,7 +9894,7 @@ final: prev: meta.homepage = "https://github.com/natecraddock/telescope-zf-native.nvim/"; }; - telescope-zoxide = buildVimPluginFrom2Nix { + telescope-zoxide = buildVimPlugin { pname = "telescope-zoxide"; version = "2023-02-08"; src = fetchFromGitHub { @@ -9751,41 +9908,41 @@ final: prev: telescope-nvim = buildNeovimPlugin { pname = "telescope.nvim"; - version = "2023-08-10"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "2d92125620417fbea82ec30303823e3cd69e90e8"; - sha256 = "01373bppxb3zw68kz91acbm1g4453sdyfli137hx1855zcaqnkh5"; + rev = "ffe90fac32122f401429b14d383137bd92a685d0"; + sha256 = "1wf2kq3pv98fzy12hv19jg80r9phr96j2x5qvzbqfagglc1zb3jf"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; - telescope_hoogle = buildVimPluginFrom2Nix { + telescope_hoogle = buildVimPlugin { pname = "telescope_hoogle"; - version = "2022-10-27"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "luc-tielen"; repo = "telescope_hoogle"; - rev = "6322f74655a2773974377a8fc8d170c00f24938f"; - sha256 = "1pjq5bwnrxb3qhvvqd9v996hqfkbg5ah7qmbzrq1287h13m5jy2n"; + rev = "5c2ae51bcf905a7101134a597e6f7be2dc05f975"; + sha256 = "0nmzpyh9sdbvxf0hzvga748i4wnd0l6jmlwp8bmx84zazp93c667"; }; meta.homepage = "https://github.com/luc-tielen/telescope_hoogle/"; }; - template-string-nvim = buildVimPluginFrom2Nix { + template-string-nvim = buildVimPlugin { pname = "template-string.nvim"; - version = "2023-08-04"; + version = "2023-09-11"; src = fetchFromGitHub { owner = "axelvc"; repo = "template-string.nvim"; - rev = "89bffccadcbba5381274ed38d08c4c7ef7fe42aa"; - sha256 = "0mbbayhv9mgybfi81bdkjadvyr2x2xyp6bqc53z7i7zfpqib2gg8"; + rev = "5559125aba8499695eb23c3ff2434a13fb05e304"; + sha256 = "1d2sakk5m7qpnvch7q5yygl6il88k7idgq1si0xdm9gfhi4vvqmg"; }; meta.homepage = "https://github.com/axelvc/template-string.nvim/"; }; - tender-vim = buildVimPluginFrom2Nix { + tender-vim = buildVimPlugin { pname = "tender.vim"; version = "2021-05-24"; src = fetchFromGitHub { @@ -9797,7 +9954,7 @@ final: prev: meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; - term-edit-nvim = buildVimPluginFrom2Nix { + term-edit-nvim = buildVimPlugin { pname = "term-edit.nvim"; version = "2023-07-30"; src = fetchFromGitHub { @@ -9809,7 +9966,7 @@ final: prev: meta.homepage = "https://github.com/chomosuke/term-edit.nvim/"; }; - terminus = buildVimPluginFrom2Nix { + terminus = buildVimPlugin { pname = "terminus"; version = "2021-12-28"; src = fetchFromGitHub { @@ -9821,7 +9978,7 @@ final: prev: meta.homepage = "https://github.com/wincent/terminus/"; }; - termwrapper-nvim = buildVimPluginFrom2Nix { + termwrapper-nvim = buildVimPlugin { pname = "termwrapper.nvim"; version = "2021-03-28"; src = fetchFromGitHub { @@ -9833,7 +9990,7 @@ final: prev: meta.homepage = "https://github.com/oberblastmeister/termwrapper.nvim/"; }; - tern_for_vim = buildVimPluginFrom2Nix { + tern_for_vim = buildVimPlugin { pname = "tern_for_vim"; version = "2019-01-23"; src = fetchFromGitHub { @@ -9845,7 +10002,7 @@ final: prev: meta.homepage = "https://github.com/ternjs/tern_for_vim/"; }; - tex-conceal-vim = buildVimPluginFrom2Nix { + tex-conceal-vim = buildVimPlugin { pname = "tex-conceal.vim"; version = "2022-01-15"; src = fetchFromGitHub { @@ -9857,19 +10014,19 @@ final: prev: meta.homepage = "https://github.com/KeitaNakamura/tex-conceal.vim/"; }; - text-case-nvim = buildVimPluginFrom2Nix { + text-case-nvim = buildVimPlugin { pname = "text-case.nvim"; - version = "2023-04-06"; + version = "2023-09-03"; src = fetchFromGitHub { owner = "johmsalas"; repo = "text-case.nvim"; - rev = "cd7cc65a412beb713e68f3b84e45990a939b7b6b"; - sha256 = "1fwrvsl4rdsrljb8y6g4zpv5vvlz8hxakcyz6f7zr4xxnr5rlb3c"; + rev = "0a8ef564493a850b7646c57d55682e2ba19e50ad"; + sha256 = "184y9s384k5y10j5jr02jykh6h1d5g2wihfflzds1q98ip46zk2j"; }; meta.homepage = "https://github.com/johmsalas/text-case.nvim/"; }; - thesaurus_query-vim = buildVimPluginFrom2Nix { + thesaurus_query-vim = buildVimPlugin { pname = "thesaurus_query.vim"; version = "2022-12-11"; src = fetchFromGitHub { @@ -9881,7 +10038,7 @@ final: prev: meta.homepage = "https://github.com/ron89/thesaurus_query.vim/"; }; - thumbnail-vim = buildVimPluginFrom2Nix { + thumbnail-vim = buildVimPlugin { pname = "thumbnail.vim"; version = "2022-03-21"; src = fetchFromGitHub { @@ -9893,7 +10050,7 @@ final: prev: meta.homepage = "https://github.com/itchyny/thumbnail.vim/"; }; - timestamp-vim = buildVimPluginFrom2Nix { + timestamp-vim = buildVimPlugin { pname = "timestamp.vim"; version = "2010-11-06"; src = fetchFromGitHub { @@ -9905,19 +10062,19 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/timestamp.vim/"; }; - tint-nvim = buildVimPluginFrom2Nix { + tint-nvim = buildVimPlugin { pname = "tint.nvim"; - version = "2023-05-30"; + version = "2023-08-28"; src = fetchFromGitHub { owner = "levouh"; repo = "tint.nvim"; - rev = "80b15a91087991068d5834419437f652d1d4bc8e"; - sha256 = "14p909q7xlgapgjafpiwd71bf4f83xcrcikn6mlzlnhwrbmxmcns"; + rev = "862835626941d263466754b9c8e2ce2cb004f5ac"; + sha256 = "0m00zy9ihmwh1f28sk92rbrfd3h4azc41zzpy4jbh82gbnq8k4ks"; }; meta.homepage = "https://github.com/levouh/tint.nvim/"; }; - tlib_vim = buildVimPluginFrom2Nix { + tlib_vim = buildVimPlugin { pname = "tlib_vim"; version = "2022-07-22"; src = fetchFromGitHub { @@ -9929,7 +10086,7 @@ final: prev: meta.homepage = "https://github.com/tomtom/tlib_vim/"; }; - tmux-complete-vim = buildVimPluginFrom2Nix { + tmux-complete-vim = buildVimPlugin { pname = "tmux-complete.vim"; version = "2021-03-26"; src = fetchFromGitHub { @@ -9941,19 +10098,19 @@ final: prev: meta.homepage = "https://github.com/wellle/tmux-complete.vim/"; }; - tmux-nvim = buildVimPluginFrom2Nix { + tmux-nvim = buildVimPlugin { pname = "tmux.nvim"; - version = "2023-05-29"; + version = "2023-09-06"; src = fetchFromGitHub { owner = "aserowy"; repo = "tmux.nvim"; - rev = "03e28fdaa2ef54b975ba1930f1e69b5e231dedc9"; - sha256 = "0hr8f385mdr9dpf7fzyf4a2swm7pyrwl64pzihqphccsjwijiwj1"; + rev = "673782b74a6055d430d3f5148a033edd99e5519f"; + sha256 = "0q3942mzp54jjkv3f1aazbnlwmqz3jxvd1jlfgfbk2jpk008r5xg"; }; meta.homepage = "https://github.com/aserowy/tmux.nvim/"; }; - tmuxline-vim = buildVimPluginFrom2Nix { + tmuxline-vim = buildVimPlugin { pname = "tmuxline.vim"; version = "2021-07-20"; src = fetchFromGitHub { @@ -9965,7 +10122,7 @@ final: prev: meta.homepage = "https://github.com/edkolev/tmuxline.vim/"; }; - todo-comments-nvim = buildVimPluginFrom2Nix { + todo-comments-nvim = buildVimPlugin { pname = "todo-comments.nvim"; version = "2023-07-28"; src = fetchFromGitHub { @@ -9977,19 +10134,7 @@ final: prev: meta.homepage = "https://github.com/folke/todo-comments.nvim/"; }; - todo-nvim = buildVimPluginFrom2Nix { - pname = "todo.nvim"; - version = "2022-02-23"; - src = fetchFromGitHub { - owner = "AmeerTaweel"; - repo = "todo.nvim"; - rev = "6bd31dfd64b2730b33aad89423a1055c22fe276a"; - sha256 = "1887d1bjzixrdinr857cqq4x84760scik04r9mz9zmwdf8nfgh6b"; - }; - meta.homepage = "https://github.com/AmeerTaweel/todo.nvim/"; - }; - - todo-txt-vim = buildVimPluginFrom2Nix { + todo-txt-vim = buildVimPlugin { pname = "todo.txt-vim"; version = "2021-03-20"; src = fetchFromGitHub { @@ -10002,31 +10147,31 @@ final: prev: meta.homepage = "https://github.com/freitass/todo.txt-vim/"; }; - toggleterm-nvim = buildVimPluginFrom2Nix { + toggleterm-nvim = buildVimPlugin { pname = "toggleterm.nvim"; - version = "2023-08-03"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "12cba0a1967b4f3f31903484dec72a6100dcf515"; - sha256 = "1mlwncnnsp3skzszc544rbpx024im1p52k2pwvqlvwdjn46ffm2l"; + rev = "61e8ad370d4da5d84c77e31671027bc094ac06ca"; + sha256 = "0cwqlaqvbnw4ncm717v052mzb943jcynrfpx38c8aspzjqybdcpj"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; - tokyonight-nvim = buildVimPluginFrom2Nix { + tokyonight-nvim = buildVimPlugin { pname = "tokyonight.nvim"; - version = "2023-07-13"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "folke"; repo = "tokyonight.nvim"; - rev = "1ee11019f8a81dac989ae1db1a013e3d582e2033"; - sha256 = "0ygrwps4riq37wxwzplw2jyxi7qc7yagypfd444vp0vklqnslvn7"; + rev = "e89caa3ad6d8da9d0dd981ec74a82c55adc61ffd"; + sha256 = "11r0vd7yzmlim6r48nby0zm508fxfcmhcm7fz7alhwb480h7s22a"; }; meta.homepage = "https://github.com/folke/tokyonight.nvim/"; }; - traces-vim = buildVimPluginFrom2Nix { + traces-vim = buildVimPlugin { pname = "traces.vim"; version = "2022-04-11"; src = fetchFromGitHub { @@ -10038,7 +10183,7 @@ final: prev: meta.homepage = "https://github.com/markonm/traces.vim/"; }; - train-nvim = buildVimPluginFrom2Nix { + train-nvim = buildVimPlugin { pname = "train.nvim"; version = "2023-07-31"; src = fetchFromGitHub { @@ -10050,19 +10195,19 @@ final: prev: meta.homepage = "https://github.com/tjdevries/train.nvim/"; }; - treesj = buildVimPluginFrom2Nix { + treesj = buildVimPlugin { pname = "treesj"; - version = "2023-08-13"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "Wansmer"; repo = "treesj"; - rev = "7ee1250292491dfdd8ac7eda4e1d373a8c2be7de"; - sha256 = "1yqm5f4g3r02a6pkvpx35v9ls45j3hj0qgdmh2wdw72lq8c6ww4x"; + rev = "81d0ae51b84143e228d27b6cf79d09012d2021cb"; + sha256 = "0pk3zvz982gfdfwz4a1c8zr9ilqsip42l8bfc0vmnd7gc1r096w8"; }; meta.homepage = "https://github.com/Wansmer/treesj/"; }; - tremor-vim = buildVimPluginFrom2Nix { + tremor-vim = buildVimPlugin { pname = "tremor-vim"; version = "2021-09-07"; src = fetchFromGitHub { @@ -10074,7 +10219,7 @@ final: prev: meta.homepage = "https://github.com/tremor-rs/tremor-vim/"; }; - trim-nvim = buildVimPluginFrom2Nix { + trim-nvim = buildVimPlugin { pname = "trim.nvim"; version = "2023-03-22"; src = fetchFromGitHub { @@ -10086,19 +10231,19 @@ final: prev: meta.homepage = "https://github.com/cappyzawa/trim.nvim/"; }; - trouble-nvim = buildVimPluginFrom2Nix { + trouble-nvim = buildVimPlugin { pname = "trouble.nvim"; - version = "2023-07-29"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "folke"; repo = "trouble.nvim"; - rev = "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3"; - sha256 = "1i99lvxbr1kmfcz414zg8xdn8n0b1ad9v3hwsbac00xzqhrh1v8i"; + rev = "3f85d8ed30e97ceeddbbcf80224245d347053711"; + sha256 = "0l1mf8mpf2q2wk983baj75hy30dm7hwncbfazrnimycqdyarxn6x"; }; meta.homepage = "https://github.com/folke/trouble.nvim/"; }; - true-zen-nvim = buildVimPluginFrom2Nix { + true-zen-nvim = buildVimPlugin { pname = "true-zen.nvim"; version = "2023-06-09"; src = fetchFromGitHub { @@ -10110,7 +10255,7 @@ final: prev: meta.homepage = "https://github.com/Pocco81/true-zen.nvim/"; }; - tslime-vim = buildVimPluginFrom2Nix { + tslime-vim = buildVimPlugin { pname = "tslime.vim"; version = "2020-09-09"; src = fetchFromGitHub { @@ -10122,7 +10267,7 @@ final: prev: meta.homepage = "https://github.com/jgdavey/tslime.vim/"; }; - tsuquyomi = buildVimPluginFrom2Nix { + tsuquyomi = buildVimPlugin { pname = "tsuquyomi"; version = "2022-04-12"; src = fetchFromGitHub { @@ -10134,19 +10279,19 @@ final: prev: meta.homepage = "https://github.com/Quramy/tsuquyomi/"; }; - twilight-nvim = buildVimPluginFrom2Nix { + twilight-nvim = buildVimPlugin { pname = "twilight.nvim"; - version = "2023-05-22"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "folke"; repo = "twilight.nvim"; - rev = "a4843e6e67092a1e6fa9666f02bf0ab59174c1df"; - sha256 = "1d9c77kq55nyl5jlma4m1qg69hldm6zm75d0sjzc3ifq6f82ai0g"; + rev = "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4"; + sha256 = "0j3vvj1hdsxj36pi4fnfcnj34hk26igicnvzk6xch4rwjlakqlaq"; }; meta.homepage = "https://github.com/folke/twilight.nvim/"; }; - typescript-vim = buildVimPluginFrom2Nix { + typescript-vim = buildVimPlugin { pname = "typescript-vim"; version = "2023-05-11"; src = fetchFromGitHub { @@ -10158,7 +10303,7 @@ final: prev: meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; - typescript-nvim = buildVimPluginFrom2Nix { + typescript-nvim = buildVimPlugin { pname = "typescript.nvim"; version = "2023-08-12"; src = fetchFromGitHub { @@ -10170,31 +10315,31 @@ final: prev: meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/"; }; - typst-vim = buildVimPluginFrom2Nix { + typst-vim = buildVimPlugin { pname = "typst.vim"; - version = "2023-08-17"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "97f21818cb8d3d5ed6bb4b672ddb5af975aab71a"; - sha256 = "048n69wyiv9p8gwbhpcjf6i876v60r11wpv7j7jb2dg8l1m8gp73"; + rev = "65f9e78c11829a643d1539f3481c0ff875c83603"; + sha256 = "1q5v37l4awz5pm8cqvbvvwjizf45m7nqnxqv0inxzr70g9gqp7qv"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; - ultisnips = buildVimPluginFrom2Nix { + ultisnips = buildVimPlugin { pname = "ultisnips"; - version = "2023-08-05"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "24a3ebb36687b6d59a19d63173713575b486d739"; - sha256 = "0v6iq1mcnj1a6p2fks544wwhkgm0h8xnwr7ms427b1abvmj0sikz"; + rev = "f6d1501b630cb783b0af8507c5588328f826d40f"; + sha256 = "0h0rcqrfk4r48phlsb8nhvxb89vm9820lhbmkqvk1bqkjblsv279"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; - undotree = buildVimPluginFrom2Nix { + undotree = buildVimPlugin { pname = "undotree"; version = "2023-07-07"; src = fetchFromGitHub { @@ -10206,31 +10351,31 @@ final: prev: meta.homepage = "https://github.com/mbbill/undotree/"; }; - unicode-vim = buildVimPluginFrom2Nix { + unicode-vim = buildVimPlugin { pname = "unicode.vim"; - version = "2023-03-19"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "c8aa12b1e2e1b6254885b12bdb239ce6c885fdb1"; - sha256 = "1mvsb0l9wi903rfazskgn0yzylcb1xkdaqvlcbj1w5yay372x4i9"; + rev = "bc20d0fb3331a7b41708388c56bb8221c2104da7"; + sha256 = "1nrx791gj66sky9bb039n7hwkvcic7wr1nrrb1vrx1sgqmwfpy6f"; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; - unison = buildVimPluginFrom2Nix { + unison = buildVimPlugin { pname = "unison"; - version = "2023-08-19"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "1f1536341db8ac33615c35463f609818679e6d5f"; - sha256 = "0fjach9262xylvbbq4plwgjph0bq0afq1l4i6j923n9pd9y75d62"; + rev = "5fa80db737fa357d9f9f14a36cdc10cbb1cb7651"; + sha256 = "1001rbbwhfbb26ji36kpkc3ji1gsgf3xmlr990bxv8wh33qib2rf"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; - unite-vim = buildVimPluginFrom2Nix { + unite-vim = buildVimPlugin { pname = "unite.vim"; version = "2023-05-18"; src = fetchFromGitHub { @@ -10242,19 +10387,19 @@ final: prev: meta.homepage = "https://github.com/Shougo/unite.vim/"; }; - urlview-nvim = buildVimPluginFrom2Nix { + urlview-nvim = buildVimPlugin { pname = "urlview.nvim"; - version = "2023-05-23"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "b183133fd25caa6dd98b415e0f62e51e061cd522"; - sha256 = "0ychlw7lnnpmjflb5f5xyspv63kyrdzbxx88aw9ifaqiiyz3i4aq"; + rev = "bdbdf1e020e283551f003e71b0004096c746ef57"; + sha256 = "1bf226s400vyjffr6zqx9kr52qznzcgx1jnh356vfx3fjxsq81nl"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; - utl-vim = buildVimPluginFrom2Nix { + utl-vim = buildVimPlugin { pname = "utl.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -10266,7 +10411,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/utl.vim/"; }; - vCoolor-vim = buildVimPluginFrom2Nix { + vCoolor-vim = buildVimPlugin { pname = "vCoolor.vim"; version = "2020-10-14"; src = fetchFromGitHub { @@ -10278,7 +10423,7 @@ final: prev: meta.homepage = "https://github.com/KabbAmine/vCoolor.vim/"; }; - vader-vim = buildVimPluginFrom2Nix { + vader-vim = buildVimPlugin { pname = "vader.vim"; version = "2020-02-13"; src = fetchFromGitHub { @@ -10290,7 +10435,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vader.vim/"; }; - venn-nvim = buildVimPluginFrom2Nix { + venn-nvim = buildVimPlugin { pname = "venn.nvim"; version = "2022-11-22"; src = fetchFromGitHub { @@ -10302,7 +10447,7 @@ final: prev: meta.homepage = "https://github.com/jbyuki/venn.nvim/"; }; - verilog_systemverilog-vim = buildVimPluginFrom2Nix { + verilog_systemverilog-vim = buildVimPlugin { pname = "verilog_systemverilog.vim"; version = "2023-08-11"; src = fetchFromGitHub { @@ -10314,19 +10459,19 @@ final: prev: meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; - vifm-vim = buildVimPluginFrom2Nix { + vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "2023-08-13"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "38acf1128b0bd4f8b2f79c8644d1cda9dc297d9d"; - sha256 = "1n023my6hb856l8369sgqs6mc36lr47acjlimyadfd4m9s555sya"; + rev = "8b671c02525b6772ba9a8a38d17d0f06bfcb06bd"; + sha256 = "1v7gav6nzlzsv9jwyqbwbw73cch9m5ccq47nkrgmk702nyv7sq7s"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; - vim-CtrlXA = buildVimPluginFrom2Nix { + vim-CtrlXA = buildVimPlugin { pname = "vim-CtrlXA"; version = "2023-05-17"; src = fetchFromGitHub { @@ -10338,7 +10483,7 @@ final: prev: meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/"; }; - vim-DetectSpellLang = buildVimPluginFrom2Nix { + vim-DetectSpellLang = buildVimPlugin { pname = "vim-DetectSpellLang"; version = "2022-03-15"; src = fetchFromGitHub { @@ -10350,7 +10495,7 @@ final: prev: meta.homepage = "https://github.com/konfekt/vim-DetectSpellLang/"; }; - vim-LanguageTool = buildVimPluginFrom2Nix { + vim-LanguageTool = buildVimPlugin { pname = "vim-LanguageTool"; version = "2021-02-08"; src = fetchFromGitHub { @@ -10362,7 +10507,7 @@ final: prev: meta.homepage = "https://github.com/dpelle/vim-LanguageTool/"; }; - vim-ReplaceWithRegister = buildVimPluginFrom2Nix { + vim-ReplaceWithRegister = buildVimPlugin { pname = "vim-ReplaceWithRegister"; version = "2021-07-05"; src = fetchFromGitHub { @@ -10374,7 +10519,7 @@ final: prev: meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithRegister/"; }; - vim-ReplaceWithSameIndentRegister = buildVimPluginFrom2Nix { + vim-ReplaceWithSameIndentRegister = buildVimPlugin { pname = "vim-ReplaceWithSameIndentRegister"; version = "2020-06-17"; src = fetchFromGitHub { @@ -10386,7 +10531,7 @@ final: prev: meta.homepage = "https://github.com/inkarkat/vim-ReplaceWithSameIndentRegister/"; }; - vim-SyntaxRange = buildVimPluginFrom2Nix { + vim-SyntaxRange = buildVimPlugin { pname = "vim-SyntaxRange"; version = "2021-01-16"; src = fetchFromGitHub { @@ -10398,19 +10543,19 @@ final: prev: meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/"; }; - vim-abolish = buildVimPluginFrom2Nix { + vim-abolish = buildVimPlugin { pname = "vim-abolish"; - version = "2023-04-10"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "cb3dcb220262777082f63972298d57ef9e9455ec"; - sha256 = "0xriiima13cv84jlv37qd6ab4l6fjapqd8a8xsr5c87k0kkyyg13"; + rev = "dcbfe065297d31823561ba787f51056c147aa682"; + sha256 = "1yvpk0cnsx1b1q2wp52fv4mj71w8ssz4dcbbdix65m8qna6d0m9h"; }; meta.homepage = "https://github.com/tpope/vim-abolish/"; }; - vim-addon-actions = buildVimPluginFrom2Nix { + vim-addon-actions = buildVimPlugin { pname = "vim-addon-actions"; version = "2023-02-15"; src = fetchFromGitHub { @@ -10422,7 +10567,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-actions/"; }; - vim-addon-async = buildVimPluginFrom2Nix { + vim-addon-async = buildVimPlugin { pname = "vim-addon-async"; version = "2017-03-20"; src = fetchFromGitHub { @@ -10434,7 +10579,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-async/"; }; - vim-addon-background-cmd = buildVimPluginFrom2Nix { + vim-addon-background-cmd = buildVimPlugin { pname = "vim-addon-background-cmd"; version = "2015-12-11"; src = fetchFromGitHub { @@ -10446,7 +10591,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-background-cmd/"; }; - vim-addon-commenting = buildVimPluginFrom2Nix { + vim-addon-commenting = buildVimPlugin { pname = "vim-addon-commenting"; version = "2013-06-10"; src = fetchFromGitHub { @@ -10458,7 +10603,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-commenting/"; }; - vim-addon-completion = buildVimPluginFrom2Nix { + vim-addon-completion = buildVimPlugin { pname = "vim-addon-completion"; version = "2015-02-10"; src = fetchFromGitHub { @@ -10470,7 +10615,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-completion/"; }; - vim-addon-errorformats = buildVimPluginFrom2Nix { + vim-addon-errorformats = buildVimPlugin { pname = "vim-addon-errorformats"; version = "2022-08-28"; src = fetchFromGitHub { @@ -10482,7 +10627,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-errorformats/"; }; - vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { + vim-addon-goto-thing-at-cursor = buildVimPlugin { pname = "vim-addon-goto-thing-at-cursor"; version = "2020-02-07"; src = fetchFromGitHub { @@ -10494,7 +10639,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-goto-thing-at-cursor/"; }; - vim-addon-local-vimrc = buildVimPluginFrom2Nix { + vim-addon-local-vimrc = buildVimPlugin { pname = "vim-addon-local-vimrc"; version = "2023-02-28"; src = fetchFromGitHub { @@ -10506,7 +10651,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-local-vimrc/"; }; - vim-addon-manager = buildVimPluginFrom2Nix { + vim-addon-manager = buildVimPlugin { pname = "vim-addon-manager"; version = "2023-02-13"; src = fetchFromGitHub { @@ -10518,7 +10663,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/"; }; - vim-addon-mru = buildVimPluginFrom2Nix { + vim-addon-mru = buildVimPlugin { pname = "vim-addon-mru"; version = "2013-08-08"; src = fetchFromGitHub { @@ -10530,7 +10675,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-mru/"; }; - vim-addon-mw-utils = buildVimPluginFrom2Nix { + vim-addon-mw-utils = buildVimPlugin { pname = "vim-addon-mw-utils"; version = "2020-02-07"; src = fetchFromGitHub { @@ -10542,7 +10687,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-mw-utils/"; }; - vim-addon-nix = buildVimPluginFrom2Nix { + vim-addon-nix = buildVimPlugin { pname = "vim-addon-nix"; version = "2017-09-11"; src = fetchFromGitHub { @@ -10554,7 +10699,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-nix/"; }; - vim-addon-other = buildVimPluginFrom2Nix { + vim-addon-other = buildVimPlugin { pname = "vim-addon-other"; version = "2021-10-06"; src = fetchFromGitHub { @@ -10566,7 +10711,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-other/"; }; - vim-addon-php-manual = buildVimPluginFrom2Nix { + vim-addon-php-manual = buildVimPlugin { pname = "vim-addon-php-manual"; version = "2015-01-01"; src = fetchFromGitHub { @@ -10578,7 +10723,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-php-manual/"; }; - vim-addon-signs = buildVimPluginFrom2Nix { + vim-addon-signs = buildVimPlugin { pname = "vim-addon-signs"; version = "2013-04-19"; src = fetchFromGitHub { @@ -10590,7 +10735,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-signs/"; }; - vim-addon-sql = buildVimPluginFrom2Nix { + vim-addon-sql = buildVimPlugin { pname = "vim-addon-sql"; version = "2017-02-11"; src = fetchFromGitHub { @@ -10602,7 +10747,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-sql/"; }; - vim-addon-syntax-checker = buildVimPluginFrom2Nix { + vim-addon-syntax-checker = buildVimPlugin { pname = "vim-addon-syntax-checker"; version = "2017-06-26"; src = fetchFromGitHub { @@ -10614,7 +10759,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-syntax-checker/"; }; - vim-addon-toggle-buffer = buildVimPluginFrom2Nix { + vim-addon-toggle-buffer = buildVimPlugin { pname = "vim-addon-toggle-buffer"; version = "2012-01-13"; src = fetchFromGitHub { @@ -10626,7 +10771,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-toggle-buffer/"; }; - vim-addon-xdebug = buildVimPluginFrom2Nix { + vim-addon-xdebug = buildVimPlugin { pname = "vim-addon-xdebug"; version = "2014-08-29"; src = fetchFromGitHub { @@ -10638,7 +10783,7 @@ final: prev: meta.homepage = "https://github.com/MarcWeber/vim-addon-xdebug/"; }; - vim-after-object = buildVimPluginFrom2Nix { + vim-after-object = buildVimPlugin { pname = "vim-after-object"; version = "2018-09-17"; src = fetchFromGitHub { @@ -10650,7 +10795,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-after-object/"; }; - vim-agda = buildVimPluginFrom2Nix { + vim-agda = buildVimPlugin { pname = "vim-agda"; version = "2022-03-01"; src = fetchFromGitHub { @@ -10662,7 +10807,7 @@ final: prev: meta.homepage = "https://github.com/msuperdock/vim-agda/"; }; - vim-airline = buildVimPluginFrom2Nix { + vim-airline = buildVimPlugin { pname = "vim-airline"; version = "2023-07-19"; src = fetchFromGitHub { @@ -10674,7 +10819,7 @@ final: prev: meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; - vim-airline-clock = buildVimPluginFrom2Nix { + vim-airline-clock = buildVimPlugin { pname = "vim-airline-clock"; version = "2021-04-14"; src = fetchFromGitHub { @@ -10686,7 +10831,7 @@ final: prev: meta.homepage = "https://github.com/enricobacis/vim-airline-clock/"; }; - vim-airline-themes = buildVimPluginFrom2Nix { + vim-airline-themes = buildVimPlugin { pname = "vim-airline-themes"; version = "2022-11-08"; src = fetchFromGitHub { @@ -10698,7 +10843,7 @@ final: prev: meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; - vim-alias = buildVimPluginFrom2Nix { + vim-alias = buildVimPlugin { pname = "vim-alias"; version = "2021-05-25"; src = fetchFromGitHub { @@ -10710,19 +10855,19 @@ final: prev: meta.homepage = "https://github.com/Konfekt/vim-alias/"; }; - vim-android = buildVimPluginFrom2Nix { + vim-android = buildVimPlugin { pname = "vim-android"; - version = "2022-08-22"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "8911f86284315cd574e807424bcea62fd99c588a"; - sha256 = "013f2p7jf9gj4xxs789906zrflpjv2kqa1whbg7y4viqs6j62y9l"; + rev = "26990f9fa27b23ca5faf83e14d56711c0fec40ea"; + sha256 = "1iy9ap2i9lmqcjaqb38syb240m834ifacv79cjiwzxcpr23vq4r1"; }; meta.homepage = "https://github.com/hsanson/vim-android/"; }; - vim-anzu = buildVimPluginFrom2Nix { + vim-anzu = buildVimPlugin { pname = "vim-anzu"; version = "2022-12-18"; src = fetchFromGitHub { @@ -10734,7 +10879,7 @@ final: prev: meta.homepage = "https://github.com/osyo-manga/vim-anzu/"; }; - vim-apm = buildVimPluginFrom2Nix { + vim-apm = buildVimPlugin { pname = "vim-apm"; version = "2020-09-28"; src = fetchFromGitHub { @@ -10746,7 +10891,7 @@ final: prev: meta.homepage = "https://github.com/ThePrimeagen/vim-apm/"; }; - vim-argumentative = buildVimPluginFrom2Nix { + vim-argumentative = buildVimPlugin { pname = "vim-argumentative"; version = "2014-11-24"; src = fetchFromGitHub { @@ -10758,19 +10903,19 @@ final: prev: meta.homepage = "https://github.com/PeterRincker/vim-argumentative/"; }; - vim-argwrap = buildVimPluginFrom2Nix { + vim-argwrap = buildVimPlugin { pname = "vim-argwrap"; - version = "2022-07-14"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "FooSoft"; repo = "vim-argwrap"; - rev = "feaba6b8b6ca099d267c81ee2c4ba43ce6de8499"; - sha256 = "08hjsxwm0fxgc54awzr7fmq1mrddq3rah40wnj44l4lsd73f5lba"; + rev = "b532cb6805864da4cfcfe0bb6a1ced61e291be02"; + sha256 = "1z51vrh49260aydz135mmq3k8912k8svbg6l4n83ghfjjzdlp5q0"; }; meta.homepage = "https://github.com/FooSoft/vim-argwrap/"; }; - vim-asterisk = buildVimPluginFrom2Nix { + vim-asterisk = buildVimPlugin { pname = "vim-asterisk"; version = "2020-02-03"; src = fetchFromGitHub { @@ -10782,7 +10927,7 @@ final: prev: meta.homepage = "https://github.com/haya14busa/vim-asterisk/"; }; - vim-astro = buildVimPluginFrom2Nix { + vim-astro = buildVimPlugin { pname = "vim-astro"; version = "2022-08-25"; src = fetchFromGitHub { @@ -10794,7 +10939,7 @@ final: prev: meta.homepage = "https://github.com/wuelnerdotexe/vim-astro/"; }; - vim-asymptote = buildVimPluginFrom2Nix { + vim-asymptote = buildVimPlugin { pname = "vim-asymptote"; version = "2014-06-26"; src = fetchFromGitHub { @@ -10806,7 +10951,7 @@ final: prev: meta.homepage = "https://github.com/hura/vim-asymptote/"; }; - vim-auto-save = buildVimPluginFrom2Nix { + vim-auto-save = buildVimPlugin { pname = "vim-auto-save"; version = "2022-08-08"; src = fetchFromGitHub { @@ -10818,19 +10963,19 @@ final: prev: meta.homepage = "https://github.com/907th/vim-auto-save/"; }; - vim-autoformat = buildVimPluginFrom2Nix { + vim-autoformat = buildVimPlugin { pname = "vim-autoformat"; - version = "2023-04-17"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "7b35295b519f5f69be2e10b936db7fbac290b813"; - sha256 = "1cwxnbq4pngfi8151ycp9d78gybq70snrikv1nsxqmlk4k3wdipk"; + rev = "99dc8d5030945c01a7e04b1e44d107a9bd15af67"; + sha256 = "00a1j7snyz0gc3pxks26axhdwcbd5iqs9s2crhs6vwvcj5fymmr1"; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; }; - vim-automkdir = buildVimPluginFrom2Nix { + vim-automkdir = buildVimPlugin { pname = "vim-automkdir"; version = "2016-01-17"; src = fetchFromGitHub { @@ -10842,7 +10987,7 @@ final: prev: meta.homepage = "https://github.com/benizi/vim-automkdir/"; }; - vim-autosource = buildVimPluginFrom2Nix { + vim-autosource = buildVimPlugin { pname = "vim-autosource"; version = "2021-12-22"; src = fetchFromGitHub { @@ -10854,7 +10999,7 @@ final: prev: meta.homepage = "https://github.com/jenterkin/vim-autosource/"; }; - vim-autoswap = buildVimPluginFrom2Nix { + vim-autoswap = buildVimPlugin { pname = "vim-autoswap"; version = "2019-01-09"; src = fetchFromGitHub { @@ -10866,7 +11011,7 @@ final: prev: meta.homepage = "https://github.com/gioele/vim-autoswap/"; }; - vim-bazel = buildVimPluginFrom2Nix { + vim-bazel = buildVimPlugin { pname = "vim-bazel"; version = "2022-04-09"; src = fetchFromGitHub { @@ -10878,7 +11023,7 @@ final: prev: meta.homepage = "https://github.com/bazelbuild/vim-bazel/"; }; - vim-bbye = buildVimPluginFrom2Nix { + vim-bbye = buildVimPlugin { pname = "vim-bbye"; version = "2018-03-03"; src = fetchFromGitHub { @@ -10890,7 +11035,7 @@ final: prev: meta.homepage = "https://github.com/moll/vim-bbye/"; }; - vim-be-good = buildVimPluginFrom2Nix { + vim-be-good = buildVimPlugin { pname = "vim-be-good"; version = "2022-11-08"; src = fetchFromGitHub { @@ -10902,7 +11047,7 @@ final: prev: meta.homepage = "https://github.com/ThePrimeagen/vim-be-good/"; }; - vim-beancount = buildVimPluginFrom2Nix { + vim-beancount = buildVimPlugin { pname = "vim-beancount"; version = "2023-01-02"; src = fetchFromGitHub { @@ -10914,7 +11059,7 @@ final: prev: meta.homepage = "https://github.com/nathangrigg/vim-beancount/"; }; - vim-bepoptimist = buildVimPluginFrom2Nix { + vim-bepoptimist = buildVimPlugin { pname = "vim-bepoptimist"; version = "2022-06-24"; src = fetchFromGitHub { @@ -10926,7 +11071,7 @@ final: prev: meta.homepage = "https://github.com/sheoak/vim-bepoptimist/"; }; - vim-better-whitespace = buildVimPluginFrom2Nix { + vim-better-whitespace = buildVimPlugin { pname = "vim-better-whitespace"; version = "2022-06-30"; src = fetchFromGitHub { @@ -10938,7 +11083,7 @@ final: prev: meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/"; }; - vim-bookmarks = buildVimPluginFrom2Nix { + vim-bookmarks = buildVimPlugin { pname = "vim-bookmarks"; version = "2021-08-22"; src = fetchFromGitHub { @@ -10950,7 +11095,7 @@ final: prev: meta.homepage = "https://github.com/MattesGroeger/vim-bookmarks/"; }; - vim-boxdraw = buildVimPluginFrom2Nix { + vim-boxdraw = buildVimPlugin { pname = "vim-boxdraw"; version = "2021-01-28"; src = fetchFromGitHub { @@ -10962,7 +11107,7 @@ final: prev: meta.homepage = "https://github.com/gyim/vim-boxdraw/"; }; - vim-bracketed-paste = buildVimPluginFrom2Nix { + vim-bracketed-paste = buildVimPlugin { pname = "vim-bracketed-paste"; version = "2022-03-21"; src = fetchFromGitHub { @@ -10974,7 +11119,7 @@ final: prev: meta.homepage = "https://github.com/ConradIrwin/vim-bracketed-paste/"; }; - vim-bsv = buildVimPluginFrom2Nix { + vim-bsv = buildVimPlugin { pname = "vim-bsv"; version = "2020-11-08"; src = fetchFromGitHub { @@ -10986,7 +11131,7 @@ final: prev: meta.homepage = "https://github.com/mtikekar/vim-bsv/"; }; - vim-buffergator = buildVimPluginFrom2Nix { + vim-buffergator = buildVimPlugin { pname = "vim-buffergator"; version = "2021-11-28"; src = fetchFromGitHub { @@ -10998,7 +11143,7 @@ final: prev: meta.homepage = "https://github.com/jeetsukumaran/vim-buffergator/"; }; - vim-bufferline = buildVimPluginFrom2Nix { + vim-bufferline = buildVimPlugin { pname = "vim-bufferline"; version = "2016-02-09"; src = fetchFromGitHub { @@ -11010,7 +11155,7 @@ final: prev: meta.homepage = "https://github.com/bling/vim-bufferline/"; }; - vim-bufkill = buildVimPluginFrom2Nix { + vim-bufkill = buildVimPlugin { pname = "vim-bufkill"; version = "2022-04-19"; src = fetchFromGitHub { @@ -11022,7 +11167,7 @@ final: prev: meta.homepage = "https://github.com/qpkorr/vim-bufkill/"; }; - vim-caddyfile = buildVimPluginFrom2Nix { + vim-caddyfile = buildVimPlugin { pname = "vim-caddyfile"; version = "2022-05-09"; src = fetchFromGitHub { @@ -11034,7 +11179,7 @@ final: prev: meta.homepage = "https://github.com/isobit/vim-caddyfile/"; }; - vim-capslock = buildVimPluginFrom2Nix { + vim-capslock = buildVimPlugin { pname = "vim-capslock"; version = "2023-04-26"; src = fetchFromGitHub { @@ -11046,7 +11191,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-capslock/"; }; - vim-carbon-now-sh = buildVimPluginFrom2Nix { + vim-carbon-now-sh = buildVimPlugin { pname = "vim-carbon-now-sh"; version = "2022-08-11"; src = fetchFromGitHub { @@ -11058,7 +11203,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/vim-carbon-now-sh/"; }; - vim-ccls = buildVimPluginFrom2Nix { + vim-ccls = buildVimPlugin { pname = "vim-ccls"; version = "2022-04-23"; src = fetchFromGitHub { @@ -11070,7 +11215,7 @@ final: prev: meta.homepage = "https://github.com/m-pilia/vim-ccls/"; }; - vim-choosewin = buildVimPluginFrom2Nix { + vim-choosewin = buildVimPlugin { pname = "vim-choosewin"; version = "2021-04-22"; src = fetchFromGitHub { @@ -11082,7 +11227,7 @@ final: prev: meta.homepage = "https://github.com/t9md/vim-choosewin/"; }; - vim-clang-format = buildVimPluginFrom2Nix { + vim-clang-format = buildVimPlugin { pname = "vim-clang-format"; version = "2021-12-04"; src = fetchFromGitHub { @@ -11094,7 +11239,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/vim-clang-format/"; }; - vim-clojure-highlight = buildVimPluginFrom2Nix { + vim-clojure-highlight = buildVimPlugin { pname = "vim-clojure-highlight"; version = "2015-07-05"; src = fetchFromGitHub { @@ -11106,7 +11251,7 @@ final: prev: meta.homepage = "https://github.com/guns/vim-clojure-highlight/"; }; - vim-clojure-static = buildVimPluginFrom2Nix { + vim-clojure-static = buildVimPlugin { pname = "vim-clojure-static"; version = "2017-10-23"; src = fetchFromGitHub { @@ -11118,7 +11263,7 @@ final: prev: meta.homepage = "https://github.com/guns/vim-clojure-static/"; }; - vim-closer = buildVimPluginFrom2Nix { + vim-closer = buildVimPlugin { pname = "vim-closer"; version = "2022-11-01"; src = fetchFromGitHub { @@ -11130,7 +11275,7 @@ final: prev: meta.homepage = "https://github.com/rstacruz/vim-closer/"; }; - vim-closetag = buildVimPluginFrom2Nix { + vim-closetag = buildVimPlugin { pname = "vim-closetag"; version = "2022-05-22"; src = fetchFromGitHub { @@ -11142,7 +11287,7 @@ final: prev: meta.homepage = "https://github.com/alvan/vim-closetag/"; }; - vim-cmake = buildVimPluginFrom2Nix { + vim-cmake = buildVimPlugin { pname = "vim-cmake"; version = "2021-06-25"; src = fetchFromGitHub { @@ -11154,7 +11299,7 @@ final: prev: meta.homepage = "https://github.com/vhdirk/vim-cmake/"; }; - vim-code-dark = buildVimPluginFrom2Nix { + vim-code-dark = buildVimPlugin { pname = "vim-code-dark"; version = "2023-07-18"; src = fetchFromGitHub { @@ -11166,19 +11311,19 @@ final: prev: meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; - vim-codefmt = buildVimPluginFrom2Nix { + vim-codefmt = buildVimPlugin { pname = "vim-codefmt"; - version = "2023-07-28"; + version = "2023-08-22"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "4c233043b4bfd5fde2d65f72db01e53e8726c5df"; - sha256 = "15a9dz459z01j1h1p13fls04j8jbbzkypmw9axk03ld2g0h47yxk"; + rev = "03b8f306895137721d9e34ff8d3054cced89661a"; + sha256 = "059z2gmi32vl078nna58w56fkgn66y80jjb30qigr4gxlgn4r1y5"; }; meta.homepage = "https://github.com/google/vim-codefmt/"; }; - vim-coffee-script = buildVimPluginFrom2Nix { + vim-coffee-script = buildVimPlugin { pname = "vim-coffee-script"; version = "2020-12-20"; src = fetchFromGitHub { @@ -11190,7 +11335,7 @@ final: prev: meta.homepage = "https://github.com/kchmck/vim-coffee-script/"; }; - vim-colemak = buildVimPluginFrom2Nix { + vim-colemak = buildVimPlugin { pname = "vim-colemak"; version = "2016-10-16"; src = fetchFromGitHub { @@ -11202,7 +11347,7 @@ final: prev: meta.homepage = "https://github.com/kalbasit/vim-colemak/"; }; - vim-colors-solarized = buildVimPluginFrom2Nix { + vim-colors-solarized = buildVimPlugin { pname = "vim-colors-solarized"; version = "2011-05-09"; src = fetchFromGitHub { @@ -11214,7 +11359,7 @@ final: prev: meta.homepage = "https://github.com/altercation/vim-colors-solarized/"; }; - vim-colorschemes = buildVimPluginFrom2Nix { + vim-colorschemes = buildVimPlugin { pname = "vim-colorschemes"; version = "2020-05-15"; src = fetchFromGitHub { @@ -11226,7 +11371,7 @@ final: prev: meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; - vim-colorstepper = buildVimPluginFrom2Nix { + vim-colorstepper = buildVimPlugin { pname = "vim-colorstepper"; version = "2016-01-28"; src = fetchFromGitHub { @@ -11238,7 +11383,7 @@ final: prev: meta.homepage = "https://github.com/jonbri/vim-colorstepper/"; }; - vim-commentary = buildVimPluginFrom2Nix { + vim-commentary = buildVimPlugin { pname = "vim-commentary"; version = "2022-10-31"; src = fetchFromGitHub { @@ -11250,7 +11395,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-commentary/"; }; - vim-concourse = buildVimPluginFrom2Nix { + vim-concourse = buildVimPlugin { pname = "vim-concourse"; version = "2016-11-21"; src = fetchFromGitHub { @@ -11262,19 +11407,19 @@ final: prev: meta.homepage = "https://github.com/luan/vim-concourse/"; }; - vim-cool = buildVimPluginFrom2Nix { + vim-cool = buildVimPlugin { pname = "vim-cool"; - version = "2023-06-15"; + version = "2023-09-06"; src = fetchFromGitHub { owner = "romainl"; repo = "vim-cool"; - rev = "04bb7f5dade175a81b47abf4e87aeb30b05b33d8"; - sha256 = "093z89q65556jpnl7q2a018dl1zcdlb7rnmspbnm2apz6ypzgddr"; + rev = "662e7b11064cbeedad17c45d2fe926e78d3cd0b6"; + sha256 = "1ilddllx5riyzw4dx05rnvcxgngg7y2iydnkjn01wlddmid65p9k"; }; meta.homepage = "https://github.com/romainl/vim-cool/"; }; - vim-cpp-enhanced-highlight = buildVimPluginFrom2Nix { + vim-cpp-enhanced-highlight = buildVimPlugin { pname = "vim-cpp-enhanced-highlight"; version = "2021-04-19"; src = fetchFromGitHub { @@ -11286,7 +11431,7 @@ final: prev: meta.homepage = "https://github.com/octol/vim-cpp-enhanced-highlight/"; }; - vim-crates = buildVimPluginFrom2Nix { + vim-crates = buildVimPlugin { pname = "vim-crates"; version = "2021-05-07"; src = fetchFromGitHub { @@ -11298,7 +11443,7 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-crates/"; }; - vim-crystal = buildVimPluginFrom2Nix { + vim-crystal = buildVimPlugin { pname = "vim-crystal"; version = "2023-03-15"; src = fetchFromGitHub { @@ -11310,7 +11455,7 @@ final: prev: meta.homepage = "https://github.com/vim-crystal/vim-crystal/"; }; - vim-csharp = buildVimPluginFrom2Nix { + vim-csharp = buildVimPlugin { pname = "vim-csharp"; version = "2017-03-29"; src = fetchFromGitHub { @@ -11322,7 +11467,7 @@ final: prev: meta.homepage = "https://github.com/OrangeT/vim-csharp/"; }; - vim-css-color = buildVimPluginFrom2Nix { + vim-css-color = buildVimPlugin { pname = "vim-css-color"; version = "2023-07-26"; src = fetchFromGitHub { @@ -11334,7 +11479,7 @@ final: prev: meta.homepage = "https://github.com/ap/vim-css-color/"; }; - vim-cue = buildVimPluginFrom2Nix { + vim-cue = buildVimPlugin { pname = "vim-cue"; version = "2021-06-18"; src = fetchFromGitHub { @@ -11346,7 +11491,7 @@ final: prev: meta.homepage = "https://github.com/jjo/vim-cue/"; }; - vim-cursorword = buildVimPluginFrom2Nix { + vim-cursorword = buildVimPlugin { pname = "vim-cursorword"; version = "2022-11-17"; src = fetchFromGitHub { @@ -11358,7 +11503,7 @@ final: prev: meta.homepage = "https://github.com/itchyny/vim-cursorword/"; }; - vim-cute-python = buildVimPluginFrom2Nix { + vim-cute-python = buildVimPlugin { pname = "vim-cute-python"; version = "2020-11-17"; src = fetchFromGitHub { @@ -11370,7 +11515,7 @@ final: prev: meta.homepage = "https://github.com/ehamberg/vim-cute-python/"; }; - vim-dadbod = buildVimPluginFrom2Nix { + vim-dadbod = buildVimPlugin { pname = "vim-dadbod"; version = "2023-05-22"; src = fetchFromGitHub { @@ -11382,7 +11527,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; - vim-dadbod-completion = buildVimPluginFrom2Nix { + vim-dadbod-completion = buildVimPlugin { pname = "vim-dadbod-completion"; version = "2023-04-25"; src = fetchFromGitHub { @@ -11394,19 +11539,19 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/"; }; - vim-dadbod-ui = buildVimPluginFrom2Nix { + vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "2023-06-16"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "200aebf70e6fc4b0eb1d3ecf0d57028e198d8dc6"; - sha256 = "103plyq42w97j6azazi176nl2alki8zzi59qrplx5rx3z4vp5bqa"; + rev = "95fd22469507e86b78aa55d868c14108adee2881"; + sha256 = "049bqzh61rj3xril9mxb8h75jr074126pgvq65c90h4rm9ddk4ql"; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; }; - vim-dasht = buildVimPluginFrom2Nix { + vim-dasht = buildVimPlugin { pname = "vim-dasht"; version = "2023-01-31"; src = fetchFromGitHub { @@ -11418,7 +11563,7 @@ final: prev: meta.homepage = "https://github.com/sunaku/vim-dasht/"; }; - vim-deus = buildVimPluginFrom2Nix { + vim-deus = buildVimPlugin { pname = "vim-deus"; version = "2021-03-28"; src = fetchFromGitHub { @@ -11430,7 +11575,7 @@ final: prev: meta.homepage = "https://github.com/ajmwagar/vim-deus/"; }; - vim-devicons = buildVimPluginFrom2Nix { + vim-devicons = buildVimPlugin { pname = "vim-devicons"; version = "2022-10-01"; src = fetchFromGitHub { @@ -11442,7 +11587,7 @@ final: prev: meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; - vim-dim = buildVimPluginFrom2Nix { + vim-dim = buildVimPlugin { pname = "vim-dim"; version = "2021-01-29"; src = fetchFromGitHub { @@ -11454,7 +11599,7 @@ final: prev: meta.homepage = "https://github.com/jeffkreeftmeijer/vim-dim/"; }; - vim-diminactive = buildVimPluginFrom2Nix { + vim-diminactive = buildVimPlugin { pname = "vim-diminactive"; version = "2017-08-27"; src = fetchFromGitHub { @@ -11466,7 +11611,7 @@ final: prev: meta.homepage = "https://github.com/blueyed/vim-diminactive/"; }; - vim-dirdiff = buildVimPluginFrom2Nix { + vim-dirdiff = buildVimPlugin { pname = "vim-dirdiff"; version = "2021-06-03"; src = fetchFromGitHub { @@ -11478,7 +11623,7 @@ final: prev: meta.homepage = "https://github.com/will133/vim-dirdiff/"; }; - vim-dirvish = buildVimPluginFrom2Nix { + vim-dirvish = buildVimPlugin { pname = "vim-dirvish"; version = "2023-06-18"; src = fetchFromGitHub { @@ -11490,7 +11635,7 @@ final: prev: meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; - vim-dirvish-git = buildVimPluginFrom2Nix { + vim-dirvish-git = buildVimPlugin { pname = "vim-dirvish-git"; version = "2021-05-22"; src = fetchFromGitHub { @@ -11502,7 +11647,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/vim-dirvish-git/"; }; - vim-dispatch = buildVimPluginFrom2Nix { + vim-dispatch = buildVimPlugin { pname = "vim-dispatch"; version = "2023-02-05"; src = fetchFromGitHub { @@ -11514,7 +11659,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; - vim-dispatch-neovim = buildVimPluginFrom2Nix { + vim-dispatch-neovim = buildVimPlugin { pname = "vim-dispatch-neovim"; version = "2017-01-18"; src = fetchFromGitHub { @@ -11526,7 +11671,7 @@ final: prev: meta.homepage = "https://github.com/radenling/vim-dispatch-neovim/"; }; - vim-docbk = buildVimPluginFrom2Nix { + vim-docbk = buildVimPlugin { pname = "vim-docbk"; version = "2015-04-01"; src = fetchFromGitHub { @@ -11538,7 +11683,7 @@ final: prev: meta.homepage = "https://github.com/jhradilek/vim-docbk/"; }; - vim-dotenv = buildVimPluginFrom2Nix { + vim-dotenv = buildVimPlugin { pname = "vim-dotenv"; version = "2022-05-15"; src = fetchFromGitHub { @@ -11550,7 +11695,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-dotenv/"; }; - vim-easy-align = buildVimPluginFrom2Nix { + vim-easy-align = buildVimPlugin { pname = "vim-easy-align"; version = "2019-04-29"; src = fetchFromGitHub { @@ -11562,7 +11707,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-easy-align/"; }; - vim-easyescape = buildVimPluginFrom2Nix { + vim-easyescape = buildVimPlugin { pname = "vim-easyescape"; version = "2020-11-22"; src = fetchFromGitHub { @@ -11574,7 +11719,7 @@ final: prev: meta.homepage = "https://github.com/zhou13/vim-easyescape/"; }; - vim-easygit = buildVimPluginFrom2Nix { + vim-easygit = buildVimPlugin { pname = "vim-easygit"; version = "2018-07-08"; src = fetchFromGitHub { @@ -11586,7 +11731,7 @@ final: prev: meta.homepage = "https://github.com/neoclide/vim-easygit/"; }; - vim-easymotion = buildVimPluginFrom2Nix { + vim-easymotion = buildVimPlugin { pname = "vim-easymotion"; version = "2022-04-04"; src = fetchFromGitHub { @@ -11598,7 +11743,7 @@ final: prev: meta.homepage = "https://github.com/easymotion/vim-easymotion/"; }; - vim-easytags = buildVimPluginFrom2Nix { + vim-easytags = buildVimPlugin { pname = "vim-easytags"; version = "2015-07-01"; src = fetchFromGitHub { @@ -11610,7 +11755,7 @@ final: prev: meta.homepage = "https://github.com/xolox/vim-easytags/"; }; - vim-eighties = buildVimPluginFrom2Nix { + vim-eighties = buildVimPlugin { pname = "vim-eighties"; version = "2016-12-15"; src = fetchFromGitHub { @@ -11622,7 +11767,7 @@ final: prev: meta.homepage = "https://github.com/justincampbell/vim-eighties/"; }; - vim-elixir = buildVimPluginFrom2Nix { + vim-elixir = buildVimPlugin { pname = "vim-elixir"; version = "2022-06-25"; src = fetchFromGitHub { @@ -11634,7 +11779,7 @@ final: prev: meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; - vim-elm-syntax = buildVimPluginFrom2Nix { + vim-elm-syntax = buildVimPlugin { pname = "vim-elm-syntax"; version = "2021-01-09"; src = fetchFromGitHub { @@ -11646,7 +11791,7 @@ final: prev: meta.homepage = "https://github.com/andys8/vim-elm-syntax/"; }; - vim-emoji = buildVimPluginFrom2Nix { + vim-emoji = buildVimPlugin { pname = "vim-emoji"; version = "2018-01-30"; src = fetchFromGitHub { @@ -11658,7 +11803,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-emoji/"; }; - vim-endwise = buildVimPluginFrom2Nix { + vim-endwise = buildVimPlugin { pname = "vim-endwise"; version = "2023-04-23"; src = fetchFromGitHub { @@ -11670,7 +11815,19 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-endwise/"; }; - vim-erlang-compiler = buildVimPluginFrom2Nix { + vim-enmasse = buildVimPlugin { + pname = "vim-enmasse"; + version = "2018-04-03"; + src = fetchFromGitHub { + owner = "Olical"; + repo = "vim-enmasse"; + rev = "c2286f1d7bd735287a661cd223cd94e2a1f74deb"; + sha256 = "00c223zv9q9ir16irjcv8b8vyzfgal713mqnkawl5x187q52kqvq"; + }; + meta.homepage = "https://github.com/Olical/vim-enmasse/"; + }; + + vim-erlang-compiler = buildVimPlugin { pname = "vim-erlang-compiler"; version = "2021-06-20"; src = fetchFromGitHub { @@ -11682,7 +11839,7 @@ final: prev: meta.homepage = "https://github.com/vim-erlang/vim-erlang-compiler/"; }; - vim-erlang-omnicomplete = buildVimPluginFrom2Nix { + vim-erlang-omnicomplete = buildVimPlugin { pname = "vim-erlang-omnicomplete"; version = "2021-07-03"; src = fetchFromGitHub { @@ -11694,7 +11851,7 @@ final: prev: meta.homepage = "https://github.com/vim-erlang/vim-erlang-omnicomplete/"; }; - vim-erlang-runtime = buildVimPluginFrom2Nix { + vim-erlang-runtime = buildVimPlugin { pname = "vim-erlang-runtime"; version = "2022-10-02"; src = fetchFromGitHub { @@ -11706,7 +11863,7 @@ final: prev: meta.homepage = "https://github.com/vim-erlang/vim-erlang-runtime/"; }; - vim-erlang-tags = buildVimPluginFrom2Nix { + vim-erlang-tags = buildVimPlugin { pname = "vim-erlang-tags"; version = "2022-04-02"; src = fetchFromGitHub { @@ -11718,7 +11875,7 @@ final: prev: meta.homepage = "https://github.com/vim-erlang/vim-erlang-tags/"; }; - vim-eunuch = buildVimPluginFrom2Nix { + vim-eunuch = buildVimPlugin { pname = "vim-eunuch"; version = "2023-06-28"; src = fetchFromGitHub { @@ -11730,7 +11887,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; - vim-exchange = buildVimPluginFrom2Nix { + vim-exchange = buildVimPlugin { pname = "vim-exchange"; version = "2021-10-21"; src = fetchFromGitHub { @@ -11742,7 +11899,7 @@ final: prev: meta.homepage = "https://github.com/tommcdo/vim-exchange/"; }; - vim-expand-region = buildVimPluginFrom2Nix { + vim-expand-region = buildVimPlugin { pname = "vim-expand-region"; version = "2013-08-19"; src = fetchFromGitHub { @@ -11754,7 +11911,7 @@ final: prev: meta.homepage = "https://github.com/terryma/vim-expand-region/"; }; - vim-extradite = buildVimPluginFrom2Nix { + vim-extradite = buildVimPlugin { pname = "vim-extradite"; version = "2022-04-15"; src = fetchFromGitHub { @@ -11766,7 +11923,7 @@ final: prev: meta.homepage = "https://github.com/int3/vim-extradite/"; }; - vim-fetch = buildVimPluginFrom2Nix { + vim-fetch = buildVimPlugin { pname = "vim-fetch"; version = "2023-05-29"; src = fetchFromGitHub { @@ -11778,7 +11935,19 @@ final: prev: meta.homepage = "https://github.com/wsdjeg/vim-fetch/"; }; - vim-fireplace = buildVimPluginFrom2Nix { + vim-figlet = buildVimPlugin { + pname = "vim-figlet"; + version = "2022-12-08"; + src = fetchFromGitHub { + owner = "fadein"; + repo = "vim-figlet"; + rev = "f3141c1961e8c991cdc5ee5d9c070727d6013648"; + sha256 = "0h4lavkg57q7cwsrlj36q2624sm7n7k6n70pl47vbwyl7d0cbga8"; + }; + meta.homepage = "https://github.com/fadein/vim-figlet/"; + }; + + vim-fireplace = buildVimPlugin { pname = "vim-fireplace"; version = "2023-03-26"; src = fetchFromGitHub { @@ -11790,7 +11959,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; - vim-fish = buildVimPluginFrom2Nix { + vim-fish = buildVimPlugin { pname = "vim-fish"; version = "2017-11-22"; src = fetchFromGitHub { @@ -11802,31 +11971,31 @@ final: prev: meta.homepage = "https://github.com/dag/vim-fish/"; }; - vim-flagship = buildVimPluginFrom2Nix { + vim-flagship = buildVimPlugin { pname = "vim-flagship"; - version = "2022-04-21"; + version = "2023-08-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-flagship"; - rev = "6726cac1374c5a32e0b63f7f66007d33fdf3e21b"; - sha256 = "036w6b1wn6kamdjmakgchzwpzm0mwjpp1fpmc3bm79mc4q63cd06"; + rev = "56782f897db49b832a63669ca5398a1923da1371"; + sha256 = "0g40an83b0phkqkn81i80lw3fd6hxcykhy2ajhi580b08ygaw2lq"; }; meta.homepage = "https://github.com/tpope/vim-flagship/"; }; - vim-flake8 = buildVimPluginFrom2Nix { + vim-flake8 = buildVimPlugin { pname = "vim-flake8"; - version = "2023-03-22"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "nvie"; repo = "vim-flake8"; - rev = "5b950566e20d877184a06b1d2fe8bad0998b3ece"; - sha256 = "1mpj8n38fr1gfp65cah4w141cw381ms17zwmvl2iga2hz60rnz0d"; + rev = "fe47074aa4228b460ebc0d4b159345f886babbd9"; + sha256 = "1zb88dsb1m29cav42i95xz1h0f8zpx5p1snrlm7769fqx9gdyzcq"; }; meta.homepage = "https://github.com/nvie/vim-flake8/"; }; - vim-flatbuffers = buildVimPluginFrom2Nix { + vim-flatbuffers = buildVimPlugin { pname = "vim-flatbuffers"; version = "2018-10-11"; src = fetchFromGitHub { @@ -11838,31 +12007,31 @@ final: prev: meta.homepage = "https://github.com/dcharbon/vim-flatbuffers/"; }; - vim-floaterm = buildVimPluginFrom2Nix { + vim-floaterm = buildVimPlugin { pname = "vim-floaterm"; - version = "2023-07-10"; + version = "2023-09-02"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "bcaeabf89a92a924031d471395054d84bd88ce2f"; - sha256 = "0sf3imx44igw7ih0xah9c2ssqsfjsilk9z4ws6pfv5c4qxz32gn0"; + rev = "eeb3f6b5c98bde26752ebe0fbe1359fc974cbdcd"; + sha256 = "184nd73bw19vrf5avx345fcnlf8jbvbfnykjsa1xgj9q1wxrxprl"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; - vim-flog = buildVimPluginFrom2Nix { + vim-flog = buildVimPlugin { pname = "vim-flog"; - version = "2023-07-30"; + version = "2023-09-02"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "2cfa2e9d67a06a75d3d4e965c6bad558ff41e488"; - sha256 = "1wx8bimv39y8grwd4dk3lww2rsvpfpwa9sy8y9962s102pdck0sk"; + rev = "58c1d39ec42f92d23a1204b1869e5d1dece8b86c"; + sha256 = "11nbfrl8wpiy2cw1idc5dv41vkww065v9kv9iyvpp2nrrj0hrpl3"; }; meta.homepage = "https://github.com/rbong/vim-flog/"; }; - vim-flutter = buildVimPluginFrom2Nix { + vim-flutter = buildVimPlugin { pname = "vim-flutter"; version = "2023-06-07"; src = fetchFromGitHub { @@ -11874,7 +12043,7 @@ final: prev: meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; - vim-fsharp = buildVimPluginFrom2Nix { + vim-fsharp = buildVimPlugin { pname = "vim-fsharp"; version = "2018-11-13"; src = fetchFromGitHub { @@ -11886,7 +12055,7 @@ final: prev: meta.homepage = "https://github.com/fsharp/vim-fsharp/"; }; - vim-ft-diff_fold = buildVimPluginFrom2Nix { + vim-ft-diff_fold = buildVimPlugin { pname = "vim-ft-diff_fold"; version = "2013-02-10"; src = fetchFromGitHub { @@ -11898,7 +12067,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-ft-diff_fold/"; }; - vim-fubitive = buildVimPluginFrom2Nix { + vim-fubitive = buildVimPlugin { pname = "vim-fubitive"; version = "2023-08-16"; src = fetchFromGitHub { @@ -11910,19 +12079,19 @@ final: prev: meta.homepage = "https://github.com/tommcdo/vim-fubitive/"; }; - vim-fugitive = buildVimPluginFrom2Nix { + vim-fugitive = buildVimPlugin { pname = "vim-fugitive"; - version = "2023-07-04"; + version = "2023-09-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "b3b838d690f315a503ec4af8c634bdff3b200aaf"; - sha256 = "1y4jvrja0d77hsr24mb9bfgls5vy12r8g2bmsbsx40zvmwnlh294"; + rev = "99db68d9b3304580bd383da7aaee05c7a954a344"; + sha256 = "04c5zip3rll58zswjmns42g4wl69s7gbq7qja4w8q4p7phgb5l5w"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; - vim-fzf-coauthorship = buildVimPluginFrom2Nix { + vim-fzf-coauthorship = buildVimPlugin { pname = "vim-fzf-coauthorship"; version = "2021-07-14"; src = fetchFromGitHub { @@ -11934,7 +12103,7 @@ final: prev: meta.homepage = "https://github.com/maxjacobson/vim-fzf-coauthorship/"; }; - vim-gas = buildVimPluginFrom2Nix { + vim-gas = buildVimPlugin { pname = "vim-gas"; version = "2022-03-07"; src = fetchFromGitHub { @@ -11946,7 +12115,7 @@ final: prev: meta.homepage = "https://github.com/Shirk/vim-gas/"; }; - vim-gh-line = buildVimPluginFrom2Nix { + vim-gh-line = buildVimPlugin { pname = "vim-gh-line"; version = "2022-11-25"; src = fetchFromGitHub { @@ -11958,7 +12127,7 @@ final: prev: meta.homepage = "https://github.com/ruanyl/vim-gh-line/"; }; - vim-ghost = buildVimPluginFrom2Nix { + vim-ghost = buildVimPlugin { pname = "vim-ghost"; version = "2021-09-26"; src = fetchFromGitHub { @@ -11970,7 +12139,7 @@ final: prev: meta.homepage = "https://github.com/raghur/vim-ghost/"; }; - vim-gist = buildVimPluginFrom2Nix { + vim-gist = buildVimPlugin { pname = "vim-gist"; version = "2022-10-09"; src = fetchFromGitHub { @@ -11982,7 +12151,7 @@ final: prev: meta.homepage = "https://github.com/mattn/vim-gist/"; }; - vim-gista = buildVimPluginFrom2Nix { + vim-gista = buildVimPlugin { pname = "vim-gista"; version = "2020-09-19"; src = fetchFromGitHub { @@ -11994,7 +12163,7 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/vim-gista/"; }; - vim-git = buildVimPluginFrom2Nix { + vim-git = buildVimPlugin { pname = "vim-git"; version = "2023-03-26"; src = fetchFromGitHub { @@ -12006,7 +12175,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-git/"; }; - vim-gitbranch = buildVimPluginFrom2Nix { + vim-gitbranch = buildVimPlugin { pname = "vim-gitbranch"; version = "2021-08-20"; src = fetchFromGitHub { @@ -12018,19 +12187,19 @@ final: prev: meta.homepage = "https://github.com/itchyny/vim-gitbranch/"; }; - vim-gitgutter = buildVimPluginFrom2Nix { + vim-gitgutter = buildVimPlugin { pname = "vim-gitgutter"; - version = "2023-08-17"; + version = "2023-09-01"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "5f525476f3ade40e60aa295a8a2a01c0935b0d61"; - sha256 = "15mh6j4727fcy8rq6yzhdngg39wqqjlx6w042xk76hyzdnamcc10"; + rev = "f7b97666ae36c7b3f262f3190dbcd7033845d985"; + sha256 = "0qwp99ip17r1jf05w974ygbz1d9s69fpckwaccpbg7v3jgh973vm"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; - vim-github-dashboard = buildVimPluginFrom2Nix { + vim-github-dashboard = buildVimPlugin { pname = "vim-github-dashboard"; version = "2022-01-27"; src = fetchFromGitHub { @@ -12042,7 +12211,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-github-dashboard/"; }; - vim-glsl = buildVimPluginFrom2Nix { + vim-glsl = buildVimPlugin { pname = "vim-glsl"; version = "2022-05-10"; src = fetchFromGitHub { @@ -12054,7 +12223,7 @@ final: prev: meta.homepage = "https://github.com/tikhomirov/vim-glsl/"; }; - vim-gnupg = buildVimPluginFrom2Nix { + vim-gnupg = buildVimPlugin { pname = "vim-gnupg"; version = "2022-05-19"; src = fetchFromGitHub { @@ -12066,19 +12235,19 @@ final: prev: meta.homepage = "https://github.com/jamessan/vim-gnupg/"; }; - vim-go = buildVimPluginFrom2Nix { + vim-go = buildVimPlugin { pname = "vim-go"; - version = "2023-08-10"; + version = "2023-09-04"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "ca29cf84515431ba74dcf9abe6d403809b513e3b"; - sha256 = "13nsq9ch0jn79xnmhah3hi4v2dyaaypqgkw1x95az20apr19sv0f"; + rev = "a2e59981a2d965bed9f4052fa15a08d2ee2f8040"; + sha256 = "0wa6s45lkcphamkhgjlxmryx9wqgi6qzri0mqymkpzcsplgyqc9w"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; - vim-grammarous = buildVimPluginFrom2Nix { + vim-grammarous = buildVimPlugin { pname = "vim-grammarous"; version = "2020-11-30"; src = fetchFromGitHub { @@ -12090,19 +12259,19 @@ final: prev: meta.homepage = "https://github.com/rhysd/vim-grammarous/"; }; - vim-graphql = buildVimPluginFrom2Nix { + vim-graphql = buildVimPlugin { pname = "vim-graphql"; - version = "2023-01-16"; + version = "2023-09-11"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "996749a7d69a3709768fa8c4d259f79b5fd9bdb1"; + rev = "6089a44e89e76f9eba138fb68bfd132420404ff7"; sha256 = "1fm5rvvp7kh1lqfz6g9s8vjgbrbjqrdwysr573ymxacavbx8iri2"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; - vim-grepper = buildVimPluginFrom2Nix { + vim-grepper = buildVimPlugin { pname = "vim-grepper"; version = "2021-08-30"; src = fetchFromGitHub { @@ -12114,7 +12283,7 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-grepper/"; }; - vim-gruvbox8 = buildVimPluginFrom2Nix { + vim-gruvbox8 = buildVimPlugin { pname = "vim-gruvbox8"; version = "2023-08-04"; src = fetchFromGitHub { @@ -12126,7 +12295,7 @@ final: prev: meta.homepage = "https://github.com/lifepillar/vim-gruvbox8/"; }; - vim-gui-position = buildVimPluginFrom2Nix { + vim-gui-position = buildVimPlugin { pname = "vim-gui-position"; version = "2019-06-06"; src = fetchFromGitHub { @@ -12138,7 +12307,7 @@ final: prev: meta.homepage = "https://github.com/brennanfee/vim-gui-position/"; }; - vim-gutentags = buildVimPluginFrom2Nix { + vim-gutentags = buildVimPlugin { pname = "vim-gutentags"; version = "2023-04-14"; src = fetchFromGitHub { @@ -12150,7 +12319,7 @@ final: prev: meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/"; }; - vim-hardtime = buildVimPluginFrom2Nix { + vim-hardtime = buildVimPlugin { pname = "vim-hardtime"; version = "2022-05-06"; src = fetchFromGitHub { @@ -12162,7 +12331,7 @@ final: prev: meta.homepage = "https://github.com/takac/vim-hardtime/"; }; - vim-haskell-module-name = buildVimPluginFrom2Nix { + vim-haskell-module-name = buildVimPlugin { pname = "vim-haskell-module-name"; version = "2020-01-20"; src = fetchFromGitHub { @@ -12174,7 +12343,7 @@ final: prev: meta.homepage = "https://github.com/chkno/vim-haskell-module-name/"; }; - vim-haskellConcealPlus = buildVimPluginFrom2Nix { + vim-haskellConcealPlus = buildVimPlugin { pname = "vim-haskellConcealPlus"; version = "2020-01-21"; src = fetchFromGitHub { @@ -12186,7 +12355,7 @@ final: prev: meta.homepage = "https://github.com/enomsg/vim-haskellConcealPlus/"; }; - vim-haskellconceal = buildVimPluginFrom2Nix { + vim-haskellconceal = buildVimPlugin { pname = "vim-haskellconceal"; version = "2017-06-15"; src = fetchFromGitHub { @@ -12198,7 +12367,7 @@ final: prev: meta.homepage = "https://github.com/twinside/vim-haskellconceal/"; }; - vim-hcl = buildVimPluginFrom2Nix { + vim-hcl = buildVimPlugin { pname = "vim-hcl"; version = "2022-02-25"; src = fetchFromGitHub { @@ -12210,7 +12379,7 @@ final: prev: meta.homepage = "https://github.com/jvirtanen/vim-hcl/"; }; - vim-hdevtools = buildVimPluginFrom2Nix { + vim-hdevtools = buildVimPlugin { pname = "vim-hdevtools"; version = "2018-11-19"; src = fetchFromGitHub { @@ -12222,7 +12391,7 @@ final: prev: meta.homepage = "https://github.com/bitc/vim-hdevtools/"; }; - vim-helm = buildVimPluginFrom2Nix { + vim-helm = buildVimPlugin { pname = "vim-helm"; version = "2022-08-22"; src = fetchFromGitHub { @@ -12234,7 +12403,7 @@ final: prev: meta.homepage = "https://github.com/towolf/vim-helm/"; }; - vim-hexokinase = buildVimPluginFrom2Nix { + vim-hexokinase = buildVimPlugin { pname = "vim-hexokinase"; version = "2021-04-25"; src = fetchFromGitHub { @@ -12247,7 +12416,7 @@ final: prev: meta.homepage = "https://github.com/RRethy/vim-hexokinase/"; }; - vim-hier = buildVimPluginFrom2Nix { + vim-hier = buildVimPlugin { pname = "vim-hier"; version = "2011-08-27"; src = fetchFromGitHub { @@ -12259,7 +12428,7 @@ final: prev: meta.homepage = "https://github.com/jceb/vim-hier/"; }; - vim-highlightedyank = buildVimPluginFrom2Nix { + vim-highlightedyank = buildVimPlugin { pname = "vim-highlightedyank"; version = "2023-03-19"; src = fetchFromGitHub { @@ -12271,7 +12440,7 @@ final: prev: meta.homepage = "https://github.com/machakann/vim-highlightedyank/"; }; - vim-hindent = buildVimPluginFrom2Nix { + vim-hindent = buildVimPlugin { pname = "vim-hindent"; version = "2018-07-31"; src = fetchFromGitHub { @@ -12283,7 +12452,7 @@ final: prev: meta.homepage = "https://github.com/alx741/vim-hindent/"; }; - vim-hocon = buildVimPluginFrom2Nix { + vim-hocon = buildVimPlugin { pname = "vim-hocon"; version = "2017-09-08"; src = fetchFromGitHub { @@ -12295,7 +12464,7 @@ final: prev: meta.homepage = "https://github.com/GEverding/vim-hocon/"; }; - vim-hoogle = buildVimPluginFrom2Nix { + vim-hoogle = buildVimPlugin { pname = "vim-hoogle"; version = "2018-03-04"; src = fetchFromGitHub { @@ -12307,7 +12476,7 @@ final: prev: meta.homepage = "https://github.com/Twinside/vim-hoogle/"; }; - vim-horizon = buildVimPluginFrom2Nix { + vim-horizon = buildVimPlugin { pname = "vim-horizon"; version = "2023-03-17"; src = fetchFromGitHub { @@ -12319,7 +12488,7 @@ final: prev: meta.homepage = "https://github.com/ntk148v/vim-horizon/"; }; - vim-html-template-literals = buildVimPluginFrom2Nix { + vim-html-template-literals = buildVimPlugin { pname = "vim-html-template-literals"; version = "2021-06-03"; src = fetchFromGitHub { @@ -12331,7 +12500,7 @@ final: prev: meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/"; }; - vim-husk = buildVimPluginFrom2Nix { + vim-husk = buildVimPlugin { pname = "vim-husk"; version = "2015-11-29"; src = fetchFromGitHub { @@ -12343,7 +12512,7 @@ final: prev: meta.homepage = "https://github.com/vim-utils/vim-husk/"; }; - vim-hybrid = buildVimPluginFrom2Nix { + vim-hybrid = buildVimPlugin { pname = "vim-hybrid"; version = "2016-01-05"; src = fetchFromGitHub { @@ -12355,7 +12524,7 @@ final: prev: meta.homepage = "https://github.com/w0ng/vim-hybrid/"; }; - vim-hybrid-material = buildVimPluginFrom2Nix { + vim-hybrid-material = buildVimPlugin { pname = "vim-hybrid-material"; version = "2020-06-16"; src = fetchFromGitHub { @@ -12367,7 +12536,7 @@ final: prev: meta.homepage = "https://github.com/kristijanhusak/vim-hybrid-material/"; }; - vim-iced-coffee-script = buildVimPluginFrom2Nix { + vim-iced-coffee-script = buildVimPlugin { pname = "vim-iced-coffee-script"; version = "2013-12-26"; src = fetchFromGitHub { @@ -12379,19 +12548,19 @@ final: prev: meta.homepage = "https://github.com/noc7c9/vim-iced-coffee-script/"; }; - vim-illuminate = buildVimPluginFrom2Nix { + vim-illuminate = buildVimPlugin { pname = "vim-illuminate"; - version = "2023-08-17"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "76f28e858f1caae87bfa45fb4fd09e4b053fc45b"; - sha256 = "1gfz69v43myc38szlaqf6bd9vf3pdlmwd8vsiqnq1y0dvqkccl34"; + rev = "1b5d70332a51a1de05f281069851865a2bb1e6d7"; + sha256 = "0dbbak53d5hi8jkp0wxcb3x6kysdi7ry2w1k9n0lj64qkmp5afnb"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; - vim-indent-guides = buildVimPluginFrom2Nix { + vim-indent-guides = buildVimPlugin { pname = "vim-indent-guides"; version = "2023-03-18"; src = fetchFromGitHub { @@ -12403,7 +12572,7 @@ final: prev: meta.homepage = "https://github.com/preservim/vim-indent-guides/"; }; - vim-indent-object = buildVimPluginFrom2Nix { + vim-indent-object = buildVimPlugin { pname = "vim-indent-object"; version = "2018-04-08"; src = fetchFromGitHub { @@ -12415,7 +12584,7 @@ final: prev: meta.homepage = "https://github.com/michaeljsmith/vim-indent-object/"; }; - vim-indentwise = buildVimPluginFrom2Nix { + vim-indentwise = buildVimPlugin { pname = "vim-indentwise"; version = "2015-06-07"; src = fetchFromGitHub { @@ -12427,7 +12596,7 @@ final: prev: meta.homepage = "https://github.com/jeetsukumaran/vim-indentwise/"; }; - vim-indexed-search = buildVimPluginFrom2Nix { + vim-indexed-search = buildVimPlugin { pname = "vim-indexed-search"; version = "2021-12-13"; src = fetchFromGitHub { @@ -12439,7 +12608,7 @@ final: prev: meta.homepage = "https://github.com/henrik/vim-indexed-search/"; }; - vim-ipython = buildVimPluginFrom2Nix { + vim-ipython = buildVimPlugin { pname = "vim-ipython"; version = "2015-06-23"; src = fetchFromGitHub { @@ -12451,7 +12620,7 @@ final: prev: meta.homepage = "https://github.com/ivanov/vim-ipython/"; }; - vim-isort = buildVimPluginFrom2Nix { + vim-isort = buildVimPlugin { pname = "vim-isort"; version = "2023-07-12"; src = fetchFromGitHub { @@ -12463,7 +12632,7 @@ final: prev: meta.homepage = "https://github.com/fisadev/vim-isort/"; }; - vim-jack-in = buildVimPluginFrom2Nix { + vim-jack-in = buildVimPlugin { pname = "vim-jack-in"; version = "2023-04-17"; src = fetchFromGitHub { @@ -12475,7 +12644,7 @@ final: prev: meta.homepage = "https://github.com/clojure-vim/vim-jack-in/"; }; - vim-janah = buildVimPluginFrom2Nix { + vim-janah = buildVimPlugin { pname = "vim-janah"; version = "2018-10-01"; src = fetchFromGitHub { @@ -12487,7 +12656,7 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-janah/"; }; - vim-javacomplete2 = buildVimPluginFrom2Nix { + vim-javacomplete2 = buildVimPlugin { pname = "vim-javacomplete2"; version = "2022-06-05"; src = fetchFromGitHub { @@ -12499,7 +12668,7 @@ final: prev: meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; - vim-javascript = buildVimPluginFrom2Nix { + vim-javascript = buildVimPlugin { pname = "vim-javascript"; version = "2022-08-15"; src = fetchFromGitHub { @@ -12511,7 +12680,7 @@ final: prev: meta.homepage = "https://github.com/pangloss/vim-javascript/"; }; - vim-javascript-syntax = buildVimPluginFrom2Nix { + vim-javascript-syntax = buildVimPlugin { pname = "vim-javascript-syntax"; version = "2020-09-27"; src = fetchFromGitHub { @@ -12523,7 +12692,7 @@ final: prev: meta.homepage = "https://github.com/jelera/vim-javascript-syntax/"; }; - vim-jinja = buildVimPluginFrom2Nix { + vim-jinja = buildVimPlugin { pname = "vim-jinja"; version = "2021-08-26"; src = fetchFromGitHub { @@ -12535,7 +12704,7 @@ final: prev: meta.homepage = "https://github.com/lepture/vim-jinja/"; }; - vim-jinja-languages = buildVimPluginFrom2Nix { + vim-jinja-languages = buildVimPlugin { pname = "vim-jinja-languages"; version = "2022-04-04"; src = fetchFromGitHub { @@ -12547,7 +12716,7 @@ final: prev: meta.homepage = "https://github.com/seirl/vim-jinja-languages/"; }; - vim-jsbeautify = buildVimPluginFrom2Nix { + vim-jsbeautify = buildVimPlugin { pname = "vim-jsbeautify"; version = "2020-12-11"; src = fetchFromGitHub { @@ -12560,7 +12729,7 @@ final: prev: meta.homepage = "https://github.com/maksimr/vim-jsbeautify/"; }; - vim-jsdoc = buildVimPluginFrom2Nix { + vim-jsdoc = buildVimPlugin { pname = "vim-jsdoc"; version = "2023-05-23"; src = fetchFromGitHub { @@ -12572,7 +12741,7 @@ final: prev: meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; - vim-json = buildVimPluginFrom2Nix { + vim-json = buildVimPlugin { pname = "vim-json"; version = "2018-01-10"; src = fetchFromGitHub { @@ -12584,7 +12753,7 @@ final: prev: meta.homepage = "https://github.com/elzr/vim-json/"; }; - vim-jsonnet = buildVimPluginFrom2Nix { + vim-jsonnet = buildVimPlugin { pname = "vim-jsonnet"; version = "2023-02-20"; src = fetchFromGitHub { @@ -12596,7 +12765,7 @@ final: prev: meta.homepage = "https://github.com/google/vim-jsonnet/"; }; - vim-jsonpath = buildVimPluginFrom2Nix { + vim-jsonpath = buildVimPlugin { pname = "vim-jsonpath"; version = "2020-06-16"; src = fetchFromGitHub { @@ -12608,7 +12777,7 @@ final: prev: meta.homepage = "https://github.com/mogelbrod/vim-jsonpath/"; }; - vim-jsx-pretty = buildVimPluginFrom2Nix { + vim-jsx-pretty = buildVimPlugin { pname = "vim-jsx-pretty"; version = "2021-01-12"; src = fetchFromGitHub { @@ -12620,7 +12789,7 @@ final: prev: meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; - vim-jsx-typescript = buildVimPluginFrom2Nix { + vim-jsx-typescript = buildVimPlugin { pname = "vim-jsx-typescript"; version = "2020-12-03"; src = fetchFromGitHub { @@ -12632,7 +12801,7 @@ final: prev: meta.homepage = "https://github.com/peitalin/vim-jsx-typescript/"; }; - vim-julia-cell = buildVimPluginFrom2Nix { + vim-julia-cell = buildVimPlugin { pname = "vim-julia-cell"; version = "2020-08-04"; src = fetchFromGitHub { @@ -12644,7 +12813,7 @@ final: prev: meta.homepage = "https://github.com/mroavi/vim-julia-cell/"; }; - vim-just = buildVimPluginFrom2Nix { + vim-just = buildVimPlugin { pname = "vim-just"; version = "2023-08-02"; src = fetchFromGitHub { @@ -12656,7 +12825,7 @@ final: prev: meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; }; - vim-kitty-navigator = buildVimPluginFrom2Nix { + vim-kitty-navigator = buildVimPlugin { pname = "vim-kitty-navigator"; version = "2023-05-25"; src = fetchFromGitHub { @@ -12668,31 +12837,31 @@ final: prev: meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; - vim-lastplace = buildVimPluginFrom2Nix { + vim-lastplace = buildVimPlugin { pname = "vim-lastplace"; - version = "2023-08-17"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "farmergreg"; repo = "vim-lastplace"; - rev = "54fa1450f5c7c93f2793e5e8fffbd1863c002ad1"; - sha256 = "0mbzg1j2cwj9i5qr550gcg2cf0wiiz0rfbmkv9s4kj1wjrm9213b"; + rev = "bb3191b134ade9d1f01014e17c3df91e8911dd5c"; + sha256 = "0sv05v6q1lkc4xklqly0hf2p4w4schan3gvcf1s6493697hvcc4h"; }; meta.homepage = "https://github.com/farmergreg/vim-lastplace/"; }; - vim-latex-live-preview = buildVimPluginFrom2Nix { + vim-latex-live-preview = buildVimPlugin { pname = "vim-latex-live-preview"; - version = "2023-04-01"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "xuhdev"; repo = "vim-latex-live-preview"; - rev = "e1a6a31b123bf6b15635cac6d391afcb2670187a"; - sha256 = "163zvzchxmpff2slj769bqagfblq6n7h3gyxn557dfl7hj5bfs2y"; + rev = "e1906cd4930a58ebaa5eb446436df23522eafb51"; + sha256 = "1adfyk96prwbf8dmznnfqvz27jxq0fpjygdhbrcc8b2i93i2dia2"; }; meta.homepage = "https://github.com/xuhdev/vim-latex-live-preview/"; }; - vim-lawrencium = buildVimPluginFrom2Nix { + vim-lawrencium = buildVimPlugin { pname = "vim-lawrencium"; version = "2022-01-19"; src = fetchFromGitHub { @@ -12704,7 +12873,7 @@ final: prev: meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/"; }; - vim-leader-guide = buildVimPluginFrom2Nix { + vim-leader-guide = buildVimPlugin { pname = "vim-leader-guide"; version = "2018-10-06"; src = fetchFromGitHub { @@ -12716,7 +12885,7 @@ final: prev: meta.homepage = "https://github.com/hecal3/vim-leader-guide/"; }; - vim-lean = buildVimPluginFrom2Nix { + vim-lean = buildVimPlugin { pname = "vim-lean"; version = "2017-07-29"; src = fetchFromGitHub { @@ -12728,7 +12897,7 @@ final: prev: meta.homepage = "https://github.com/mk12/vim-lean/"; }; - vim-ledger = buildVimPluginFrom2Nix { + vim-ledger = buildVimPlugin { pname = "vim-ledger"; version = "2023-02-23"; src = fetchFromGitHub { @@ -12740,7 +12909,7 @@ final: prev: meta.homepage = "https://github.com/ledger/vim-ledger/"; }; - vim-lexical = buildVimPluginFrom2Nix { + vim-lexical = buildVimPlugin { pname = "vim-lexical"; version = "2022-02-11"; src = fetchFromGitHub { @@ -12752,7 +12921,7 @@ final: prev: meta.homepage = "https://github.com/preservim/vim-lexical/"; }; - vim-lfe = buildVimPluginFrom2Nix { + vim-lfe = buildVimPlugin { pname = "vim-lfe"; version = "2018-04-30"; src = fetchFromGitHub { @@ -12764,7 +12933,7 @@ final: prev: meta.homepage = "https://github.com/lfe-support/vim-lfe/"; }; - vim-lightline-coc = buildVimPluginFrom2Nix { + vim-lightline-coc = buildVimPlugin { pname = "vim-lightline-coc"; version = "2021-03-03"; src = fetchFromGitHub { @@ -12776,7 +12945,7 @@ final: prev: meta.homepage = "https://github.com/josa42/vim-lightline-coc/"; }; - vim-lion = buildVimPluginFrom2Nix { + vim-lion = buildVimPlugin { pname = "vim-lion"; version = "2020-07-18"; src = fetchFromGitHub { @@ -12788,7 +12957,7 @@ final: prev: meta.homepage = "https://github.com/tommcdo/vim-lion/"; }; - vim-liquid = buildVimPluginFrom2Nix { + vim-liquid = buildVimPlugin { pname = "vim-liquid"; version = "2021-11-28"; src = fetchFromGitHub { @@ -12800,7 +12969,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-liquid/"; }; - vim-llvm = buildVimPluginFrom2Nix { + vim-llvm = buildVimPlugin { pname = "vim-llvm"; version = "2023-05-31"; src = fetchFromGitHub { @@ -12812,7 +12981,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/vim-llvm/"; }; - vim-localvimrc = buildVimPluginFrom2Nix { + vim-localvimrc = buildVimPlugin { pname = "vim-localvimrc"; version = "2023-06-08"; src = fetchFromGitHub { @@ -12824,7 +12993,7 @@ final: prev: meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; - vim-logreview = buildVimPluginFrom2Nix { + vim-logreview = buildVimPlugin { pname = "vim-logreview"; version = "2022-02-28"; src = fetchFromGitHub { @@ -12836,7 +13005,7 @@ final: prev: meta.homepage = "https://github.com/andreshazard/vim-logreview/"; }; - vim-loves-dafny = buildVimPluginFrom2Nix { + vim-loves-dafny = buildVimPlugin { pname = "vim-loves-dafny"; version = "2018-09-25"; src = fetchFromGitHub { @@ -12848,7 +13017,7 @@ final: prev: meta.homepage = "https://github.com/mlr-msft/vim-loves-dafny/"; }; - vim-lsc = buildVimPluginFrom2Nix { + vim-lsc = buildVimPlugin { pname = "vim-lsc"; version = "2023-08-04"; src = fetchFromGitHub { @@ -12860,19 +13029,19 @@ final: prev: meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; - vim-lsp = buildVimPluginFrom2Nix { + vim-lsp = buildVimPlugin { pname = "vim-lsp"; - version = "2023-08-15"; + version = "2023-09-09"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "7dd6b72d0c3ecbee08cdcee7e42d520f52c96208"; - sha256 = "132ffc5vhzjdgmrck7yv4ygz6cvff2f5bq6h4n8fsksrjaf2blh6"; + rev = "7233bb2ec07506b6a6e57dfe4541f1c4e5647fd2"; + sha256 = "0h0qg61zixfl26czgaxklx7hdkkia2cc83xvv80ipyr1rva2crwh"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; - vim-lsp-ale = buildVimPluginFrom2Nix { + vim-lsp-ale = buildVimPlugin { pname = "vim-lsp-ale"; version = "2021-12-28"; src = fetchFromGitHub { @@ -12884,7 +13053,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/vim-lsp-ale/"; }; - vim-lsp-cxx-highlight = buildVimPluginFrom2Nix { + vim-lsp-cxx-highlight = buildVimPlugin { pname = "vim-lsp-cxx-highlight"; version = "2021-10-20"; src = fetchFromGitHub { @@ -12896,19 +13065,19 @@ final: prev: meta.homepage = "https://github.com/jackguo380/vim-lsp-cxx-highlight/"; }; - vim-lsp-settings = buildVimPluginFrom2Nix { + vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "2023-08-18"; + version = "2023-09-17"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "98da469f4926b8e582d4b892c274f7d518cf6a42"; - sha256 = "1dcymh0wgdd218bd9a96akl2dk4l38mh0z71sf1xdvr509cazlqq"; + rev = "7613a3f702ae7ff2794b659a9769494203f5cb67"; + sha256 = "0fa56dn9jmqz0hwd2jjc9g4j0rqyw5d5v64vzs8lq6r52fvzcm6j"; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; }; - vim-lsp-snippets = buildVimPluginFrom2Nix { + vim-lsp-snippets = buildVimPlugin { pname = "vim-lsp-snippets"; version = "2020-01-15"; src = fetchFromGitHub { @@ -12920,7 +13089,7 @@ final: prev: meta.homepage = "https://github.com/thomasfaingnaert/vim-lsp-snippets/"; }; - vim-lsp-ultisnips = buildVimPluginFrom2Nix { + vim-lsp-ultisnips = buildVimPlugin { pname = "vim-lsp-ultisnips"; version = "2023-04-07"; src = fetchFromGitHub { @@ -12932,7 +13101,7 @@ final: prev: meta.homepage = "https://github.com/thomasfaingnaert/vim-lsp-ultisnips/"; }; - vim-lua = buildVimPluginFrom2Nix { + vim-lua = buildVimPlugin { pname = "vim-lua"; version = "2020-08-05"; src = fetchFromGitHub { @@ -12944,7 +13113,7 @@ final: prev: meta.homepage = "https://github.com/tbastos/vim-lua/"; }; - vim-maktaba = buildVimPluginFrom2Nix { + vim-maktaba = buildVimPlugin { pname = "vim-maktaba"; version = "2023-03-21"; src = fetchFromGitHub { @@ -12956,7 +13125,7 @@ final: prev: meta.homepage = "https://github.com/google/vim-maktaba/"; }; - vim-manpager = buildVimPluginFrom2Nix { + vim-manpager = buildVimPlugin { pname = "vim-manpager"; version = "2022-07-23"; src = fetchFromGitHub { @@ -12968,31 +13137,31 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/vim-manpager/"; }; - vim-markbar = buildVimPluginFrom2Nix { + vim-markbar = buildVimPlugin { pname = "vim-markbar"; - version = "2023-07-18"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "Yilin-Yang"; repo = "vim-markbar"; - rev = "00f8620cd53f569dca26594e9c94534f03fe16d6"; - sha256 = "0h0m7mmc5x15mpq3af3n95nqfzhhb2mnw0rbxpr0xizjc2hcpg9z"; + rev = "7df6d0e918b610b798368a5af33825b787e0d20f"; + sha256 = "0814n9jqcv62hky04fywgby86ibfp434w4ij03vk5y2z9hgii8bd"; }; meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; - vim-markdown = buildVimPluginFrom2Nix { + vim-markdown = buildVimPlugin { pname = "vim-markdown"; - version = "2023-04-08"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "preservim"; repo = "vim-markdown"; - rev = "cc82d88e2a791f54d2b6e2b26e41f743351ac947"; - sha256 = "1l3vdx87sgqbxbh1jz00xm8s589rca4pszqk4jj9yvn1vxljnk87"; + rev = "4e9b4deda11d05a157ab34e97f76089669b5b7af"; + sha256 = "027i9y3f0dh6m3fw4fr7jd3pichbs9004c5hqm4i2fz82vb35smm"; }; meta.homepage = "https://github.com/preservim/vim-markdown/"; }; - vim-markdown-composer = buildVimPluginFrom2Nix { + vim-markdown-composer = buildVimPlugin { pname = "vim-markdown-composer"; version = "2022-06-14"; src = fetchFromGitHub { @@ -13005,7 +13174,7 @@ final: prev: meta.homepage = "https://github.com/euclio/vim-markdown-composer/"; }; - vim-markdown-toc = buildVimPluginFrom2Nix { + vim-markdown-toc = buildVimPlugin { pname = "vim-markdown-toc"; version = "2022-08-29"; src = fetchFromGitHub { @@ -13017,19 +13186,19 @@ final: prev: meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; }; - vim-matchup = buildVimPluginFrom2Nix { + vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "2023-08-06"; + version = "2023-09-02"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "582cbc8c2dc311deb7a03f7d505d52544c36d4b6"; - sha256 = "1yvf3932ci5l58ap0mmvw32wql2cp45h0wl4qzqz9jzdi2rifk56"; + rev = "6dbe108230c7dbbf00555b7d4d9f6a891837ef07"; + sha256 = "1c0rkdr0pjrrplvr5adnb0q9vkq11kr7m5mvlggm633g45khjw5l"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; - vim-mediawiki-editor = buildVimPluginFrom2Nix { + vim-mediawiki-editor = buildVimPlugin { pname = "vim-mediawiki-editor"; version = "2022-10-29"; src = fetchFromGitHub { @@ -13041,7 +13210,7 @@ final: prev: meta.homepage = "https://github.com/aquach/vim-mediawiki-editor/"; }; - vim-mergetool = buildVimPluginFrom2Nix { + vim-mergetool = buildVimPlugin { pname = "vim-mergetool"; version = "2019-06-22"; src = fetchFromGitHub { @@ -13053,19 +13222,19 @@ final: prev: meta.homepage = "https://github.com/samoshkin/vim-mergetool/"; }; - vim-merginal = buildVimPluginFrom2Nix { + vim-merginal = buildVimPlugin { pname = "vim-merginal"; - version = "2022-10-29"; + version = "2023-08-27"; src = fetchFromGitHub { owner = "idanarye"; repo = "vim-merginal"; - rev = "8ec5976aa4bd647c64504ff535eb06a8b709b051"; - sha256 = "0z43gdgm3vjbq4whwj6dm218fldkjlhp5kwks79w6x6rx84nnj6v"; + rev = "a4becdf09178c3c557b7069252b6df617ff04de3"; + sha256 = "060fcdbscb0984ma9pqjlv4jmrmqks2lmg0jffbw6zzw1fs4c72q"; }; meta.homepage = "https://github.com/idanarye/vim-merginal/"; }; - vim-metamath = buildVimPluginFrom2Nix { + vim-metamath = buildVimPlugin { pname = "vim-metamath"; version = "2017-02-10"; src = fetchFromGitHub { @@ -13077,7 +13246,7 @@ final: prev: meta.homepage = "https://github.com/david-a-wheeler/vim-metamath/"; }; - vim-misc = buildVimPluginFrom2Nix { + vim-misc = buildVimPlugin { pname = "vim-misc"; version = "2015-05-21"; src = fetchFromGitHub { @@ -13089,7 +13258,7 @@ final: prev: meta.homepage = "https://github.com/xolox/vim-misc/"; }; - vim-molokai-delroth = buildVimPluginFrom2Nix { + vim-molokai-delroth = buildVimPlugin { pname = "vim-molokai-delroth"; version = "2023-05-30"; src = fetchFromGitHub { @@ -13101,7 +13270,7 @@ final: prev: meta.homepage = "https://github.com/delroth/vim-molokai-delroth/"; }; - vim-monokai = buildVimPluginFrom2Nix { + vim-monokai = buildVimPlugin { pname = "vim-monokai"; version = "2022-12-09"; src = fetchFromGitHub { @@ -13113,7 +13282,7 @@ final: prev: meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; - vim-monokai-pro = buildVimPluginFrom2Nix { + vim-monokai-pro = buildVimPlugin { pname = "vim-monokai-pro"; version = "2022-06-25"; src = fetchFromGitHub { @@ -13125,19 +13294,19 @@ final: prev: meta.homepage = "https://github.com/phanviet/vim-monokai-pro/"; }; - vim-monokai-tasty = buildVimPluginFrom2Nix { + vim-monokai-tasty = buildVimPlugin { pname = "vim-monokai-tasty"; - version = "2023-02-15"; + version = "2023-09-12"; src = fetchFromGitHub { owner = "patstockwell"; repo = "vim-monokai-tasty"; - rev = "8c1052347dd204a83ef72f7af36bdf2fa6861e0b"; - sha256 = "12wri9qj8klvksn9n7g2jvnnsa41vn4ij44wsyc3g44630p2d7x9"; + rev = "c112e2d574dc6f1122a919d595f9b0d3bc5dc3ec"; + sha256 = "1q28hqbybdpqwx0i5w5zywxalyf31ljjqi9ym4z5w91qsqx6xp08"; }; meta.homepage = "https://github.com/patstockwell/vim-monokai-tasty/"; }; - vim-move = buildVimPluginFrom2Nix { + vim-move = buildVimPlugin { pname = "vim-move"; version = "2023-05-11"; src = fetchFromGitHub { @@ -13149,7 +13318,7 @@ final: prev: meta.homepage = "https://github.com/matze/vim-move/"; }; - vim-mucomplete = buildVimPluginFrom2Nix { + vim-mucomplete = buildVimPlugin { pname = "vim-mucomplete"; version = "2022-09-28"; src = fetchFromGitHub { @@ -13161,7 +13330,7 @@ final: prev: meta.homepage = "https://github.com/lifepillar/vim-mucomplete/"; }; - vim-multiple-cursors = buildVimPluginFrom2Nix { + vim-multiple-cursors = buildVimPlugin { pname = "vim-multiple-cursors"; version = "2020-07-30"; src = fetchFromGitHub { @@ -13173,7 +13342,7 @@ final: prev: meta.homepage = "https://github.com/terryma/vim-multiple-cursors/"; }; - vim-mundo = buildVimPluginFrom2Nix { + vim-mundo = buildVimPlugin { pname = "vim-mundo"; version = "2022-11-05"; src = fetchFromGitHub { @@ -13185,7 +13354,7 @@ final: prev: meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; - vim-mustache-handlebars = buildVimPluginFrom2Nix { + vim-mustache-handlebars = buildVimPlugin { pname = "vim-mustache-handlebars"; version = "2021-11-30"; src = fetchFromGitHub { @@ -13197,7 +13366,7 @@ final: prev: meta.homepage = "https://github.com/mustache/vim-mustache-handlebars/"; }; - vim-nerdtree-syntax-highlight = buildVimPluginFrom2Nix { + vim-nerdtree-syntax-highlight = buildVimPlugin { pname = "vim-nerdtree-syntax-highlight"; version = "2023-07-07"; src = fetchFromGitHub { @@ -13209,7 +13378,7 @@ final: prev: meta.homepage = "https://github.com/tiagofumo/vim-nerdtree-syntax-highlight/"; }; - vim-nerdtree-tabs = buildVimPluginFrom2Nix { + vim-nerdtree-tabs = buildVimPlugin { pname = "vim-nerdtree-tabs"; version = "2018-12-21"; src = fetchFromGitHub { @@ -13221,7 +13390,7 @@ final: prev: meta.homepage = "https://github.com/jistr/vim-nerdtree-tabs/"; }; - vim-nftables = buildVimPluginFrom2Nix { + vim-nftables = buildVimPlugin { pname = "vim-nftables"; version = "2020-06-29"; src = fetchFromGitHub { @@ -13233,7 +13402,7 @@ final: prev: meta.homepage = "https://github.com/nfnty/vim-nftables/"; }; - vim-niceblock = buildVimPluginFrom2Nix { + vim-niceblock = buildVimPlugin { pname = "vim-niceblock"; version = "2018-09-06"; src = fetchFromGitHub { @@ -13245,19 +13414,19 @@ final: prev: meta.homepage = "https://github.com/kana/vim-niceblock/"; }; - vim-nickel = buildVimPluginFrom2Nix { + vim-nickel = buildVimPlugin { pname = "vim-nickel"; - version = "2023-07-05"; + version = "2023-09-26"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "vim-nickel"; - rev = "535196c1e6b77e05f31a5ba50a5eaef393bbf280"; - sha256 = "042n288b6c58jihbgsxhilycx56llbqck341zw7gf8sk4sypqhhr"; + rev = "f22898d88affc0958453b42e1147ba076637e0ed"; + sha256 = "1yczwjs3svan4hmsmb3lzn3i2n50qfkmkncqyrvsy5qyrlv19gy1"; }; meta.homepage = "https://github.com/nickel-lang/vim-nickel/"; }; - vim-ninja-feet = buildVimPluginFrom2Nix { + vim-ninja-feet = buildVimPlugin { pname = "vim-ninja-feet"; version = "2021-05-27"; src = fetchFromGitHub { @@ -13269,7 +13438,7 @@ final: prev: meta.homepage = "https://github.com/tommcdo/vim-ninja-feet/"; }; - vim-nix = buildVimPluginFrom2Nix { + vim-nix = buildVimPlugin { pname = "vim-nix"; version = "2023-07-29"; src = fetchFromGitHub { @@ -13281,7 +13450,7 @@ final: prev: meta.homepage = "https://github.com/LnL7/vim-nix/"; }; - vim-nixhash = buildVimPluginFrom2Nix { + vim-nixhash = buildVimPlugin { pname = "vim-nixhash"; version = "2023-01-09"; src = fetchFromGitHub { @@ -13293,7 +13462,7 @@ final: prev: meta.homepage = "https://github.com/symphorien/vim-nixhash/"; }; - vim-noctu = buildVimPluginFrom2Nix { + vim-noctu = buildVimPlugin { pname = "vim-noctu"; version = "2015-06-27"; src = fetchFromGitHub { @@ -13305,7 +13474,7 @@ final: prev: meta.homepage = "https://github.com/noahfrederick/vim-noctu/"; }; - vim-nong-theme = buildVimPluginFrom2Nix { + vim-nong-theme = buildVimPlugin { pname = "vim-nong-theme"; version = "2020-12-16"; src = fetchFromGitHub { @@ -13317,7 +13486,7 @@ final: prev: meta.homepage = "https://github.com/fruit-in/vim-nong-theme/"; }; - vim-numbertoggle = buildVimPluginFrom2Nix { + vim-numbertoggle = buildVimPlugin { pname = "vim-numbertoggle"; version = "2021-07-14"; src = fetchFromGitHub { @@ -13329,7 +13498,7 @@ final: prev: meta.homepage = "https://github.com/jeffkreeftmeijer/vim-numbertoggle/"; }; - vim-obsession = buildVimPluginFrom2Nix { + vim-obsession = buildVimPlugin { pname = "vim-obsession"; version = "2022-12-02"; src = fetchFromGitHub { @@ -13341,7 +13510,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-obsession/"; }; - vim-ocaml = buildVimPluginFrom2Nix { + vim-ocaml = buildVimPlugin { pname = "vim-ocaml"; version = "2023-07-04"; src = fetchFromGitHub { @@ -13353,7 +13522,7 @@ final: prev: meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; - vim-one = buildVimPluginFrom2Nix { + vim-one = buildVimPlugin { pname = "vim-one"; version = "2020-12-14"; src = fetchFromGitHub { @@ -13365,7 +13534,7 @@ final: prev: meta.homepage = "https://github.com/rakr/vim-one/"; }; - vim-opencl = buildVimPluginFrom2Nix { + vim-opencl = buildVimPlugin { pname = "vim-opencl"; version = "2018-06-13"; src = fetchFromGitHub { @@ -13377,7 +13546,7 @@ final: prev: meta.homepage = "https://github.com/petRUShka/vim-opencl/"; }; - vim-openscad = buildVimPluginFrom2Nix { + vim-openscad = buildVimPlugin { pname = "vim-openscad"; version = "2022-07-26"; src = fetchFromGitHub { @@ -13389,7 +13558,7 @@ final: prev: meta.homepage = "https://github.com/sirtaj/vim-openscad/"; }; - vim-operator-replace = buildVimPluginFrom2Nix { + vim-operator-replace = buildVimPlugin { pname = "vim-operator-replace"; version = "2015-02-24"; src = fetchFromGitHub { @@ -13401,7 +13570,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-operator-replace/"; }; - vim-operator-surround = buildVimPluginFrom2Nix { + vim-operator-surround = buildVimPlugin { pname = "vim-operator-surround"; version = "2018-11-01"; src = fetchFromGitHub { @@ -13413,7 +13582,7 @@ final: prev: meta.homepage = "https://github.com/rhysd/vim-operator-surround/"; }; - vim-operator-user = buildVimPluginFrom2Nix { + vim-operator-user = buildVimPlugin { pname = "vim-operator-user"; version = "2015-02-17"; src = fetchFromGitHub { @@ -13425,7 +13594,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-operator-user/"; }; - vim-orgmode = buildVimPluginFrom2Nix { + vim-orgmode = buildVimPlugin { pname = "vim-orgmode"; version = "2022-12-09"; src = fetchFromGitHub { @@ -13437,7 +13606,7 @@ final: prev: meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; - vim-ormolu = buildVimPluginFrom2Nix { + vim-ormolu = buildVimPlugin { pname = "vim-ormolu"; version = "2020-11-25"; src = fetchFromGitHub { @@ -13449,7 +13618,7 @@ final: prev: meta.homepage = "https://github.com/sdiehl/vim-ormolu/"; }; - vim-osc52 = buildVimPluginFrom2Nix { + vim-osc52 = buildVimPlugin { pname = "vim-osc52"; version = "2020-09-19"; src = fetchFromGitHub { @@ -13461,7 +13630,7 @@ final: prev: meta.homepage = "https://github.com/fcpg/vim-osc52/"; }; - vim-oscyank = buildVimPluginFrom2Nix { + vim-oscyank = buildVimPlugin { pname = "vim-oscyank"; version = "2023-07-01"; src = fetchFromGitHub { @@ -13473,7 +13642,7 @@ final: prev: meta.homepage = "https://github.com/ojroques/vim-oscyank/"; }; - vim-over = buildVimPluginFrom2Nix { + vim-over = buildVimPlugin { pname = "vim-over"; version = "2020-01-26"; src = fetchFromGitHub { @@ -13485,7 +13654,7 @@ final: prev: meta.homepage = "https://github.com/osyo-manga/vim-over/"; }; - vim-packer = buildVimPluginFrom2Nix { + vim-packer = buildVimPlugin { pname = "vim-packer"; version = "2018-11-11"; src = fetchFromGitHub { @@ -13497,7 +13666,7 @@ final: prev: meta.homepage = "https://github.com/hashivim/vim-packer/"; }; - vim-pager = buildVimPluginFrom2Nix { + vim-pager = buildVimPlugin { pname = "vim-pager"; version = "2015-08-26"; src = fetchFromGitHub { @@ -13509,7 +13678,7 @@ final: prev: meta.homepage = "https://github.com/lambdalisue/vim-pager/"; }; - vim-pandoc = buildVimPluginFrom2Nix { + vim-pandoc = buildVimPlugin { pname = "vim-pandoc"; version = "2023-02-24"; src = fetchFromGitHub { @@ -13521,7 +13690,7 @@ final: prev: meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; - vim-pandoc-after = buildVimPluginFrom2Nix { + vim-pandoc-after = buildVimPlugin { pname = "vim-pandoc-after"; version = "2019-04-29"; src = fetchFromGitHub { @@ -13533,7 +13702,7 @@ final: prev: meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-after/"; }; - vim-pandoc-syntax = buildVimPluginFrom2Nix { + vim-pandoc-syntax = buildVimPlugin { pname = "vim-pandoc-syntax"; version = "2023-01-10"; src = fetchFromGitHub { @@ -13545,7 +13714,7 @@ final: prev: meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; - vim-paper = buildVimPluginFrom2Nix { + vim-paper = buildVimPlugin { pname = "vim-paper"; version = "2023-08-02"; src = fetchFromGitHub { @@ -13557,7 +13726,7 @@ final: prev: meta.homepage = "https://github.com/yorickpeterse/vim-paper/"; }; - vim-parinfer = buildVimPluginFrom2Nix { + vim-parinfer = buildVimPlugin { pname = "vim-parinfer"; version = "2022-11-29"; src = fetchFromGitHub { @@ -13569,7 +13738,7 @@ final: prev: meta.homepage = "https://github.com/bhurlow/vim-parinfer/"; }; - vim-pasta = buildVimPluginFrom2Nix { + vim-pasta = buildVimPlugin { pname = "vim-pasta"; version = "2023-08-12"; src = fetchFromGitHub { @@ -13581,7 +13750,7 @@ final: prev: meta.homepage = "https://github.com/ku1ik/vim-pasta/"; }; - vim-pathogen = buildVimPluginFrom2Nix { + vim-pathogen = buildVimPlugin { pname = "vim-pathogen"; version = "2022-08-24"; src = fetchFromGitHub { @@ -13593,7 +13762,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-pathogen/"; }; - vim-peekaboo = buildVimPluginFrom2Nix { + vim-peekaboo = buildVimPlugin { pname = "vim-peekaboo"; version = "2019-12-12"; src = fetchFromGitHub { @@ -13605,7 +13774,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-peekaboo/"; }; - vim-pencil = buildVimPluginFrom2Nix { + vim-pencil = buildVimPlugin { pname = "vim-pencil"; version = "2023-04-03"; src = fetchFromGitHub { @@ -13617,7 +13786,7 @@ final: prev: meta.homepage = "https://github.com/preservim/vim-pencil/"; }; - vim-phabricator = buildVimPluginFrom2Nix { + vim-phabricator = buildVimPlugin { pname = "vim-phabricator"; version = "2021-11-06"; src = fetchFromGitHub { @@ -13629,7 +13798,7 @@ final: prev: meta.homepage = "https://github.com/jparise/vim-phabricator/"; }; - vim-pico8-syntax = buildVimPluginFrom2Nix { + vim-pico8-syntax = buildVimPlugin { pname = "vim-pico8-syntax"; version = "2016-10-30"; src = fetchFromGitHub { @@ -13641,7 +13810,7 @@ final: prev: meta.homepage = "https://github.com/justinj/vim-pico8-syntax/"; }; - vim-plug = buildVimPluginFrom2Nix { + vim-plug = buildVimPlugin { pname = "vim-plug"; version = "2023-04-01"; src = fetchFromGitHub { @@ -13653,7 +13822,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-plug/"; }; - vim-plugin-AnsiEsc = buildVimPluginFrom2Nix { + vim-plugin-AnsiEsc = buildVimPlugin { pname = "vim-plugin-AnsiEsc"; version = "2019-04-07"; src = fetchFromGitHub { @@ -13665,7 +13834,7 @@ final: prev: meta.homepage = "https://github.com/powerman/vim-plugin-AnsiEsc/"; }; - vim-pluto = buildVimPluginFrom2Nix { + vim-pluto = buildVimPlugin { pname = "vim-pluto"; version = "2022-02-01"; src = fetchFromGitHub { @@ -13677,7 +13846,7 @@ final: prev: meta.homepage = "https://github.com/hasundue/vim-pluto/"; }; - vim-polyglot = buildVimPluginFrom2Nix { + vim-polyglot = buildVimPlugin { pname = "vim-polyglot"; version = "2022-10-14"; src = fetchFromGitHub { @@ -13689,19 +13858,7 @@ final: prev: meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; - vim-pony = buildVimPluginFrom2Nix { - pname = "vim-pony"; - version = "2018-07-27"; - src = fetchFromGitHub { - owner = "jakwings"; - repo = "vim-pony"; - rev = "b26f01a869000b73b80dceabd725d91bfe175b75"; - sha256 = "0if8g94m3xmpda80byfxs649w2is9ah1k8v3028nblan73zlc8x8"; - }; - meta.homepage = "https://github.com/jakwings/vim-pony/"; - }; - - vim-poweryank = buildVimPluginFrom2Nix { + vim-poweryank = buildVimPlugin { pname = "vim-poweryank"; version = "2017-08-13"; src = fetchFromGitHub { @@ -13713,7 +13870,7 @@ final: prev: meta.homepage = "https://github.com/haya14busa/vim-poweryank/"; }; - vim-prettier = buildVimPluginFrom2Nix { + vim-prettier = buildVimPlugin { pname = "vim-prettier"; version = "2021-11-24"; src = fetchFromGitHub { @@ -13725,7 +13882,7 @@ final: prev: meta.homepage = "https://github.com/prettier/vim-prettier/"; }; - vim-prettyprint = buildVimPluginFrom2Nix { + vim-prettyprint = buildVimPlugin { pname = "vim-prettyprint"; version = "2016-07-16"; src = fetchFromGitHub { @@ -13737,7 +13894,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-prettyprint/"; }; - vim-printer = buildVimPluginFrom2Nix { + vim-printer = buildVimPlugin { pname = "vim-printer"; version = "2022-03-01"; src = fetchFromGitHub { @@ -13749,7 +13906,7 @@ final: prev: meta.homepage = "https://github.com/meain/vim-printer/"; }; - vim-prisma = buildVimPluginFrom2Nix { + vim-prisma = buildVimPlugin { pname = "vim-prisma"; version = "2023-01-24"; src = fetchFromGitHub { @@ -13761,7 +13918,7 @@ final: prev: meta.homepage = "https://github.com/prisma/vim-prisma/"; }; - vim-projectionist = buildVimPluginFrom2Nix { + vim-projectionist = buildVimPlugin { pname = "vim-projectionist"; version = "2023-03-16"; src = fetchFromGitHub { @@ -13773,7 +13930,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; - vim-prosession = buildVimPluginFrom2Nix { + vim-prosession = buildVimPlugin { pname = "vim-prosession"; version = "2023-08-08"; src = fetchFromGitHub { @@ -13785,7 +13942,7 @@ final: prev: meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; - vim-protobuf = buildVimPluginFrom2Nix { + vim-protobuf = buildVimPlugin { pname = "vim-protobuf"; version = "2017-12-26"; src = fetchFromGitHub { @@ -13797,7 +13954,7 @@ final: prev: meta.homepage = "https://github.com/uarun/vim-protobuf/"; }; - vim-ps1 = buildVimPluginFrom2Nix { + vim-ps1 = buildVimPlugin { pname = "vim-ps1"; version = "2023-01-11"; src = fetchFromGitHub { @@ -13809,7 +13966,7 @@ final: prev: meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; - vim-pug = buildVimPluginFrom2Nix { + vim-pug = buildVimPlugin { pname = "vim-pug"; version = "2019-09-23"; src = fetchFromGitHub { @@ -13821,7 +13978,7 @@ final: prev: meta.homepage = "https://github.com/digitaltoad/vim-pug/"; }; - vim-puppet = buildVimPluginFrom2Nix { + vim-puppet = buildVimPlugin { pname = "vim-puppet"; version = "2022-05-21"; src = fetchFromGitHub { @@ -13833,7 +13990,7 @@ final: prev: meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; - vim-python-pep8-indent = buildVimPluginFrom2Nix { + vim-python-pep8-indent = buildVimPlugin { pname = "vim-python-pep8-indent"; version = "2020-03-20"; src = fetchFromGitHub { @@ -13845,7 +14002,7 @@ final: prev: meta.homepage = "https://github.com/Vimjas/vim-python-pep8-indent/"; }; - vim-qf = buildVimPluginFrom2Nix { + vim-qf = buildVimPlugin { pname = "vim-qf"; version = "2023-05-09"; src = fetchFromGitHub { @@ -13857,7 +14014,7 @@ final: prev: meta.homepage = "https://github.com/romainl/vim-qf/"; }; - vim-qlist = buildVimPluginFrom2Nix { + vim-qlist = buildVimPlugin { pname = "vim-qlist"; version = "2019-07-18"; src = fetchFromGitHub { @@ -13869,19 +14026,19 @@ final: prev: meta.homepage = "https://github.com/romainl/vim-qlist/"; }; - vim-qml = buildVimPluginFrom2Nix { + vim-qml = buildVimPlugin { pname = "vim-qml"; - version = "2023-06-13"; + version = "2023-09-11"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "vim-qml"; - rev = "8b775e922ebfd198b30d379339dd4a0cfcae4d6f"; - sha256 = "12rn9p5pl7qmimfgfg5ynyfpybildnps86p7q7c1fpvdgr1lyzha"; + rev = "892c36a80a8711025af7bb9d09a8a6b90fe3d0c8"; + sha256 = "1smvhfrwlzd1h1namzvs8kks0f3qkdmnpbw1i6kvk44dywmx4r8c"; }; meta.homepage = "https://github.com/peterhoeg/vim-qml/"; }; - vim-quickrun = buildVimPluginFrom2Nix { + vim-quickrun = buildVimPlugin { pname = "vim-quickrun"; version = "2022-07-10"; src = fetchFromGitHub { @@ -13893,7 +14050,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; - vim-racer = buildVimPluginFrom2Nix { + vim-racer = buildVimPlugin { pname = "vim-racer"; version = "2021-04-04"; src = fetchFromGitHub { @@ -13905,7 +14062,7 @@ final: prev: meta.homepage = "https://github.com/racer-rust/vim-racer/"; }; - vim-racket = buildVimPluginFrom2Nix { + vim-racket = buildVimPlugin { pname = "vim-racket"; version = "2022-12-30"; src = fetchFromGitHub { @@ -13917,7 +14074,7 @@ final: prev: meta.homepage = "https://github.com/wlangstroth/vim-racket/"; }; - vim-ragtag = buildVimPluginFrom2Nix { + vim-ragtag = buildVimPlugin { pname = "vim-ragtag"; version = "2022-03-21"; src = fetchFromGitHub { @@ -13929,19 +14086,19 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-ragtag/"; }; - vim-rails = buildVimPluginFrom2Nix { + vim-rails = buildVimPlugin { pname = "vim-rails"; - version = "2023-04-24"; + version = "2023-09-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "2b8c4fc831e0de2681beda0a2f48222812920a1d"; - sha256 = "1n3v24ngwqhpgkaij8nl9gq5snzvkwjapgp10n88rc8f65px3hqk"; + rev = "1ad9663ce31e8c08134849d04184cda94bb42aba"; + sha256 = "0kp2vbx5qfd86cmzrsnmgbpi3r07wpn5j6gn1gxgkh09xngf93nl"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; - vim-reasonml = buildVimPluginFrom2Nix { + vim-reasonml = buildVimPlugin { pname = "vim-reasonml"; version = "2020-07-16"; src = fetchFromGitHub { @@ -13953,7 +14110,7 @@ final: prev: meta.homepage = "https://github.com/jordwalke/vim-reasonml/"; }; - vim-repeat = buildVimPluginFrom2Nix { + vim-repeat = buildVimPlugin { pname = "vim-repeat"; version = "2021-01-25"; src = fetchFromGitHub { @@ -13965,7 +14122,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-repeat/"; }; - vim-rhubarb = buildVimPluginFrom2Nix { + vim-rhubarb = buildVimPlugin { pname = "vim-rhubarb"; version = "2023-03-29"; src = fetchFromGitHub { @@ -13977,19 +14134,19 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; - vim-rooter = buildVimPluginFrom2Nix { + vim-rooter = buildVimPlugin { pname = "vim-rooter"; - version = "2023-01-13"; + version = "2023-09-14"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "4f52ca556a0b9e257bf920658714470ea0320b7a"; - sha256 = "12rwb51xc0ncs0g1ha4sbbp473w9ijx00krns271al387q6dwhys"; + rev = "1353fa47ee3a81083c284e28ff4f7d92655d7c9e"; + sha256 = "1ybhld3nmdr08icj8fkmi3pn3wz38afp5974cx5hkkshydz2cx1s"; }; meta.homepage = "https://github.com/airblade/vim-rooter/"; }; - vim-rsi = buildVimPluginFrom2Nix { + vim-rsi = buildVimPlugin { pname = "vim-rsi"; version = "2023-04-30"; src = fetchFromGitHub { @@ -14001,19 +14158,19 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-rsi/"; }; - vim-ruby = buildVimPluginFrom2Nix { + vim-ruby = buildVimPlugin { pname = "vim-ruby"; - version = "2023-03-16"; + version = "2023-09-15"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "0960d0f59ce2bb576177a3cfed2bb55c53552a71"; - sha256 = "0ipmvi6xprrl6r7f6ssj6jx8hvcsna8afhyilpd54k9h9brgg8qj"; + rev = "88f29671b776fff56e5ee554becf34dd2ee1975c"; + sha256 = "1166568yvm54mlinbcxldb0f81c6x8pxsn471phh0n6kh6x9g8nk"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; - vim-salve = buildVimPluginFrom2Nix { + vim-salve = buildVimPlugin { pname = "vim-salve"; version = "2022-04-15"; src = fetchFromGitHub { @@ -14025,7 +14182,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-salve/"; }; - vim-sandwich = buildVimPluginFrom2Nix { + vim-sandwich = buildVimPlugin { pname = "vim-sandwich"; version = "2022-12-07"; src = fetchFromGitHub { @@ -14037,7 +14194,7 @@ final: prev: meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; - vim-sayonara = buildVimPluginFrom2Nix { + vim-sayonara = buildVimPlugin { pname = "vim-sayonara"; version = "2021-08-12"; src = fetchFromGitHub { @@ -14049,7 +14206,7 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-sayonara/"; }; - vim-scala = buildVimPluginFrom2Nix { + vim-scala = buildVimPlugin { pname = "vim-scala"; version = "2021-08-11"; src = fetchFromGitHub { @@ -14061,7 +14218,7 @@ final: prev: meta.homepage = "https://github.com/derekwyatt/vim-scala/"; }; - vim-scouter = buildVimPluginFrom2Nix { + vim-scouter = buildVimPlugin { pname = "vim-scouter"; version = "2014-08-10"; src = fetchFromGitHub { @@ -14073,7 +14230,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-scouter/"; }; - vim-scriptease = buildVimPluginFrom2Nix { + vim-scriptease = buildVimPlugin { pname = "vim-scriptease"; version = "2022-05-30"; src = fetchFromGitHub { @@ -14085,7 +14242,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-scriptease/"; }; - vim-search-pulse = buildVimPluginFrom2Nix { + vim-search-pulse = buildVimPlugin { pname = "vim-search-pulse"; version = "2022-04-26"; src = fetchFromGitHub { @@ -14097,7 +14254,7 @@ final: prev: meta.homepage = "https://github.com/inside/vim-search-pulse/"; }; - vim-sensible = buildVimPluginFrom2Nix { + vim-sensible = buildVimPlugin { pname = "vim-sensible"; version = "2023-03-29"; src = fetchFromGitHub { @@ -14109,7 +14266,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-sensible/"; }; - vim-sentence-chopper = buildVimPluginFrom2Nix { + vim-sentence-chopper = buildVimPlugin { pname = "vim-sentence-chopper"; version = "2023-02-15"; src = fetchFromGitHub { @@ -14121,7 +14278,7 @@ final: prev: meta.homepage = "https://github.com/Konfekt/vim-sentence-chopper/"; }; - vim-sexp = buildVimPluginFrom2Nix { + vim-sexp = buildVimPlugin { pname = "vim-sexp"; version = "2021-03-08"; src = fetchFromGitHub { @@ -14133,7 +14290,7 @@ final: prev: meta.homepage = "https://github.com/guns/vim-sexp/"; }; - vim-sexp-mappings-for-regular-people = buildVimPluginFrom2Nix { + vim-sexp-mappings-for-regular-people = buildVimPlugin { pname = "vim-sexp-mappings-for-regular-people"; version = "2022-11-26"; src = fetchFromGitHub { @@ -14145,7 +14302,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-sexp-mappings-for-regular-people/"; }; - vim-shellcheck = buildVimPluginFrom2Nix { + vim-shellcheck = buildVimPlugin { pname = "vim-shellcheck"; version = "2019-07-25"; src = fetchFromGitHub { @@ -14157,7 +14314,7 @@ final: prev: meta.homepage = "https://github.com/itspriddle/vim-shellcheck/"; }; - vim-signature = buildVimPluginFrom2Nix { + vim-signature = buildVimPlugin { pname = "vim-signature"; version = "2018-07-06"; src = fetchFromGitHub { @@ -14169,7 +14326,7 @@ final: prev: meta.homepage = "https://github.com/kshenoy/vim-signature/"; }; - vim-signify = buildVimPluginFrom2Nix { + vim-signify = buildVimPlugin { pname = "vim-signify"; version = "2023-05-10"; src = fetchFromGitHub { @@ -14181,7 +14338,7 @@ final: prev: meta.homepage = "https://github.com/mhinz/vim-signify/"; }; - vim-simpledb = buildVimPluginFrom2Nix { + vim-simpledb = buildVimPlugin { pname = "vim-simpledb"; version = "2020-10-02"; src = fetchFromGitHub { @@ -14193,7 +14350,7 @@ final: prev: meta.homepage = "https://github.com/ivalkeen/vim-simpledb/"; }; - vim-slash = buildVimPluginFrom2Nix { + vim-slash = buildVimPlugin { pname = "vim-slash"; version = "2019-08-28"; src = fetchFromGitHub { @@ -14205,7 +14362,7 @@ final: prev: meta.homepage = "https://github.com/junegunn/vim-slash/"; }; - vim-sleuth = buildVimPluginFrom2Nix { + vim-sleuth = buildVimPlugin { pname = "vim-sleuth"; version = "2023-01-10"; src = fetchFromGitHub { @@ -14217,19 +14374,19 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; - vim-slime = buildVimPluginFrom2Nix { + vim-slime = buildVimPlugin { pname = "vim-slime"; - version = "2023-07-28"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "c1f6a5bdd86f2beceaaf694e34a2587aca76319a"; - sha256 = "0lf3b25c3sx0ykqf7vpqk3wa87x6dsn8c6lbdj7pw9bkqfcw842f"; + rev = "3c523dd9d12f96703d07fa35e75d1afe45eecd96"; + sha256 = "0j9db2lvlzizhxf5arg3rfb1cxdsnqa3f8ri7afpl9n2zsa5prp0"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; - vim-smali = buildVimPluginFrom2Nix { + vim-smali = buildVimPlugin { pname = "vim-smali"; version = "2015-11-05"; src = fetchFromGitHub { @@ -14241,7 +14398,7 @@ final: prev: meta.homepage = "https://github.com/mzlogin/vim-smali/"; }; - vim-smalls = buildVimPluginFrom2Nix { + vim-smalls = buildVimPlugin { pname = "vim-smalls"; version = "2015-05-02"; src = fetchFromGitHub { @@ -14253,7 +14410,7 @@ final: prev: meta.homepage = "https://github.com/t9md/vim-smalls/"; }; - vim-smartbd = buildVimPluginFrom2Nix { + vim-smartbd = buildVimPlugin { pname = "vim-smartbd"; version = "2015-12-20"; src = fetchFromGitHub { @@ -14265,7 +14422,7 @@ final: prev: meta.homepage = "https://github.com/Industrial/vim-smartbd/"; }; - vim-smartbw = buildVimPluginFrom2Nix { + vim-smartbw = buildVimPlugin { pname = "vim-smartbw"; version = "2015-12-20"; src = fetchFromGitHub { @@ -14277,7 +14434,7 @@ final: prev: meta.homepage = "https://github.com/Industrial/vim-smartbw/"; }; - vim-smoothie = buildVimPluginFrom2Nix { + vim-smoothie = buildVimPlugin { pname = "vim-smoothie"; version = "2022-06-10"; src = fetchFromGitHub { @@ -14289,7 +14446,7 @@ final: prev: meta.homepage = "https://github.com/psliwka/vim-smoothie/"; }; - vim-smt2 = buildVimPluginFrom2Nix { + vim-smt2 = buildVimPlugin { pname = "vim-smt2"; version = "2023-05-17"; src = fetchFromGitHub { @@ -14301,7 +14458,7 @@ final: prev: meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; - vim-sneak = buildVimPluginFrom2Nix { + vim-sneak = buildVimPlugin { pname = "vim-sneak"; version = "2023-07-12"; src = fetchFromGitHub { @@ -14313,7 +14470,7 @@ final: prev: meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; - vim-snipmate = buildVimPluginFrom2Nix { + vim-snipmate = buildVimPlugin { pname = "vim-snipmate"; version = "2023-03-12"; src = fetchFromGitHub { @@ -14325,19 +14482,19 @@ final: prev: meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; - vim-snippets = buildVimPluginFrom2Nix { + vim-snippets = buildVimPlugin { pname = "vim-snippets"; - version = "2023-05-06"; + version = "2023-09-11"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "76e35f37aa9e47a8b7f2909de222844ae38c7007"; - sha256 = "0dz3z8aldwy6zg0abscm8x3w2f6h0sichysb9cm2nrn3gkmv21bq"; + rev = "ccc2fa1529d372f7ac16d5eb07a385a72b50e05d"; + sha256 = "19k2bl2w5z5yvjfgp7wfr9s7zvdj3ak1393q09lv2k11j57f90pm"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; - vim-solarized8 = buildVimPluginFrom2Nix { + vim-solarized8 = buildVimPlugin { pname = "vim-solarized8"; version = "2023-08-13"; src = fetchFromGitHub { @@ -14349,7 +14506,7 @@ final: prev: meta.homepage = "https://github.com/lifepillar/vim-solarized8/"; }; - vim-solidity = buildVimPluginFrom2Nix { + vim-solidity = buildVimPlugin { pname = "vim-solidity"; version = "2018-04-17"; src = fetchFromGitHub { @@ -14361,7 +14518,7 @@ final: prev: meta.homepage = "https://github.com/tomlion/vim-solidity/"; }; - vim-sort-motion = buildVimPluginFrom2Nix { + vim-sort-motion = buildVimPlugin { pname = "vim-sort-motion"; version = "2021-03-07"; src = fetchFromGitHub { @@ -14373,7 +14530,7 @@ final: prev: meta.homepage = "https://github.com/christoomey/vim-sort-motion/"; }; - vim-speeddating = buildVimPluginFrom2Nix { + vim-speeddating = buildVimPlugin { pname = "vim-speeddating"; version = "2022-10-10"; src = fetchFromGitHub { @@ -14385,31 +14542,31 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-speeddating/"; }; - vim-spirv = buildVimPluginFrom2Nix { + vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "2020-11-24"; + version = "2023-09-16"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "50669efc68a0a8b455f12727753b2413dab96f07"; - sha256 = "19h3pavy65irchpy9xn3kkf3lb531479v6apfa5lg02c18gmxq1f"; + rev = "3645b5ceb1898fe5a5cf968a5f078479cb8068f0"; + sha256 = "1z31942gbwywayl8gq0ky9f73q6zpg6c7r828h753xly5dq7s7b8"; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; }; - vim-startify = buildVimPluginFrom2Nix { + vim-startify = buildVimPlugin { pname = "vim-startify"; - version = "2021-05-08"; + version = "2023-09-20"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "81e36c352a8deea54df5ec1e2f4348685569bed2"; - sha256 = "1y8yi099lqg03781bnma2bj6x5lkvfq65vhdpnm65mfyak6dpzgz"; + rev = "4e089dffdad46f3f5593f34362d530e8fe823dcf"; + sha256 = "1ycqfqnmalqzrx1yy9a1fc2p0w922x4sqv2222bi9xjzmh77z4sv"; }; meta.homepage = "https://github.com/mhinz/vim-startify/"; }; - vim-startuptime = buildVimPluginFrom2Nix { + vim-startuptime = buildVimPlugin { pname = "vim-startuptime"; version = "2023-06-03"; src = fetchFromGitHub { @@ -14421,7 +14578,7 @@ final: prev: meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; - vim-strip-trailing-whitespace = buildVimPluginFrom2Nix { + vim-strip-trailing-whitespace = buildVimPlugin { pname = "vim-strip-trailing-whitespace"; version = "2022-02-01"; src = fetchFromGitHub { @@ -14433,7 +14590,7 @@ final: prev: meta.homepage = "https://github.com/axelf4/vim-strip-trailing-whitespace/"; }; - vim-stylish-haskell = buildVimPluginFrom2Nix { + vim-stylish-haskell = buildVimPlugin { pname = "vim-stylish-haskell"; version = "2022-08-08"; src = fetchFromGitHub { @@ -14445,7 +14602,7 @@ final: prev: meta.homepage = "https://github.com/nbouscal/vim-stylish-haskell/"; }; - vim-stylishask = buildVimPluginFrom2Nix { + vim-stylishask = buildVimPlugin { pname = "vim-stylishask"; version = "2021-09-10"; src = fetchFromGitHub { @@ -14457,7 +14614,7 @@ final: prev: meta.homepage = "https://github.com/alx741/vim-stylishask/"; }; - vim-substrata = buildVimPluginFrom2Nix { + vim-substrata = buildVimPlugin { pname = "vim-substrata"; version = "2021-03-23"; src = fetchFromGitHub { @@ -14469,7 +14626,7 @@ final: prev: meta.homepage = "https://github.com/lunacookies/vim-substrata/"; }; - vim-subversive = buildVimPluginFrom2Nix { + vim-subversive = buildVimPlugin { pname = "vim-subversive"; version = "2022-01-26"; src = fetchFromGitHub { @@ -14481,7 +14638,7 @@ final: prev: meta.homepage = "https://github.com/svermeulen/vim-subversive/"; }; - vim-surround = buildVimPluginFrom2Nix { + vim-surround = buildVimPlugin { pname = "vim-surround"; version = "2022-10-25"; src = fetchFromGitHub { @@ -14493,7 +14650,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-surround/"; }; - vim-svelte = buildVimPluginFrom2Nix { + vim-svelte = buildVimPlugin { pname = "vim-svelte"; version = "2022-10-27"; src = fetchFromGitHub { @@ -14505,7 +14662,7 @@ final: prev: meta.homepage = "https://github.com/evanleck/vim-svelte/"; }; - vim-swap = buildVimPluginFrom2Nix { + vim-swap = buildVimPlugin { pname = "vim-swap"; version = "2021-08-08"; src = fetchFromGitHub { @@ -14517,7 +14674,7 @@ final: prev: meta.homepage = "https://github.com/machakann/vim-swap/"; }; - vim-table-mode = buildVimPluginFrom2Nix { + vim-table-mode = buildVimPlugin { pname = "vim-table-mode"; version = "2022-10-20"; src = fetchFromGitHub { @@ -14529,7 +14686,7 @@ final: prev: meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; - vim-tabpagecd = buildVimPluginFrom2Nix { + vim-tabpagecd = buildVimPlugin { pname = "vim-tabpagecd"; version = "2021-09-23"; src = fetchFromGitHub { @@ -14541,7 +14698,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-tabpagecd/"; }; - vim-tbone = buildVimPluginFrom2Nix { + vim-tbone = buildVimPlugin { pname = "vim-tbone"; version = "2023-03-31"; src = fetchFromGitHub { @@ -14553,7 +14710,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-tbone/"; }; - vim-teal = buildVimPluginFrom2Nix { + vim-teal = buildVimPlugin { pname = "vim-teal"; version = "2021-01-05"; src = fetchFromGitHub { @@ -14565,7 +14722,7 @@ final: prev: meta.homepage = "https://github.com/teal-language/vim-teal/"; }; - vim-terminator = buildVimPluginFrom2Nix { + vim-terminator = buildVimPlugin { pname = "vim-terminator"; version = "2022-04-15"; src = fetchFromGitHub { @@ -14577,7 +14734,7 @@ final: prev: meta.homepage = "https://github.com/erietz/vim-terminator/"; }; - vim-terraform = buildVimPluginFrom2Nix { + vim-terraform = buildVimPlugin { pname = "vim-terraform"; version = "2023-04-26"; src = fetchFromGitHub { @@ -14589,7 +14746,7 @@ final: prev: meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; - vim-terraform-completion = buildVimPluginFrom2Nix { + vim-terraform-completion = buildVimPlugin { pname = "vim-terraform-completion"; version = "2021-04-11"; src = fetchFromGitHub { @@ -14602,19 +14759,19 @@ final: prev: meta.homepage = "https://github.com/juliosueiras/vim-terraform-completion/"; }; - vim-test = buildVimPluginFrom2Nix { + vim-test = buildVimPlugin { pname = "vim-test"; - version = "2023-08-16"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "7585ad2aa2dc8d4ffef0739a02cad8a30d75bfbb"; - sha256 = "0fcs03sdymy4r5ks0x136wc8nz9ikhj53lcqrxky587fg8zjbp2j"; + rev = "53c6c72f3a0c6a24a74e659eaa769d7057ef2ecd"; + sha256 = "0y36ckap8z07b3ayj53l9drz1m4wrg0fd12q8p0cyhhghf0g8s2i"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; - vim-textobj-comment = buildVimPluginFrom2Nix { + vim-textobj-comment = buildVimPlugin { pname = "vim-textobj-comment"; version = "2014-04-11"; src = fetchFromGitHub { @@ -14626,7 +14783,7 @@ final: prev: meta.homepage = "https://github.com/glts/vim-textobj-comment/"; }; - vim-textobj-entire = buildVimPluginFrom2Nix { + vim-textobj-entire = buildVimPlugin { pname = "vim-textobj-entire"; version = "2018-01-19"; src = fetchFromGitHub { @@ -14638,7 +14795,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-textobj-entire/"; }; - vim-textobj-function = buildVimPluginFrom2Nix { + vim-textobj-function = buildVimPlugin { pname = "vim-textobj-function"; version = "2014-05-03"; src = fetchFromGitHub { @@ -14650,7 +14807,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-textobj-function/"; }; - vim-textobj-haskell = buildVimPluginFrom2Nix { + vim-textobj-haskell = buildVimPlugin { pname = "vim-textobj-haskell"; version = "2014-10-27"; src = fetchFromGitHub { @@ -14662,7 +14819,7 @@ final: prev: meta.homepage = "https://github.com/gibiansky/vim-textobj-haskell/"; }; - vim-textobj-multiblock = buildVimPluginFrom2Nix { + vim-textobj-multiblock = buildVimPlugin { pname = "vim-textobj-multiblock"; version = "2014-06-02"; src = fetchFromGitHub { @@ -14674,7 +14831,7 @@ final: prev: meta.homepage = "https://github.com/osyo-manga/vim-textobj-multiblock/"; }; - vim-textobj-user = buildVimPluginFrom2Nix { + vim-textobj-user = buildVimPlugin { pname = "vim-textobj-user"; version = "2020-02-21"; src = fetchFromGitHub { @@ -14686,7 +14843,7 @@ final: prev: meta.homepage = "https://github.com/kana/vim-textobj-user/"; }; - vim-textobj-variable-segment = buildVimPluginFrom2Nix { + vim-textobj-variable-segment = buildVimPlugin { pname = "vim-textobj-variable-segment"; version = "2022-07-16"; src = fetchFromGitHub { @@ -14698,7 +14855,7 @@ final: prev: meta.homepage = "https://github.com/Julian/vim-textobj-variable-segment/"; }; - vim-themis = buildVimPluginFrom2Nix { + vim-themis = buildVimPlugin { pname = "vim-themis"; version = "2021-12-03"; src = fetchFromGitHub { @@ -14710,7 +14867,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-themis/"; }; - vim-tmux = buildVimPluginFrom2Nix { + vim-tmux = buildVimPlugin { pname = "vim-tmux"; version = "2021-10-04"; src = fetchFromGitHub { @@ -14722,7 +14879,7 @@ final: prev: meta.homepage = "https://github.com/tmux-plugins/vim-tmux/"; }; - vim-tmux-clipboard = buildVimPluginFrom2Nix { + vim-tmux-clipboard = buildVimPlugin { pname = "vim-tmux-clipboard"; version = "2023-04-24"; src = fetchFromGitHub { @@ -14734,7 +14891,7 @@ final: prev: meta.homepage = "https://github.com/roxma/vim-tmux-clipboard/"; }; - vim-tmux-focus-events = buildVimPluginFrom2Nix { + vim-tmux-focus-events = buildVimPlugin { pname = "vim-tmux-focus-events"; version = "2021-04-27"; src = fetchFromGitHub { @@ -14746,19 +14903,19 @@ final: prev: meta.homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events/"; }; - vim-tmux-navigator = buildVimPluginFrom2Nix { + vim-tmux-navigator = buildVimPlugin { pname = "vim-tmux-navigator"; - version = "2023-01-10"; + version = "2023-09-16"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "cdd66d6a37d991bba7997d593586fc51a5b37aa8"; - sha256 = "12jb59c9x3xbhfc9xps64dq3h9a5gsjfb60hv8kd8k2hl3jmnpc0"; + rev = "7db70e08ea03b3e4d91f63713d76134512e28d7e"; + sha256 = "05mz1lpc0akanxf7pcrlwp08v84x69ah6042cc2pzqsjj5l24a64"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; - vim-togglelist = buildVimPluginFrom2Nix { + vim-togglelist = buildVimPlugin { pname = "vim-togglelist"; version = "2021-12-08"; src = fetchFromGitHub { @@ -14770,7 +14927,7 @@ final: prev: meta.homepage = "https://github.com/milkypostman/vim-togglelist/"; }; - vim-toml = buildVimPluginFrom2Nix { + vim-toml = buildVimPlugin { pname = "vim-toml"; version = "2022-09-24"; src = fetchFromGitHub { @@ -14782,19 +14939,19 @@ final: prev: meta.homepage = "https://github.com/cespare/vim-toml/"; }; - vim-tpipeline = buildVimPluginFrom2Nix { + vim-tpipeline = buildVimPlugin { pname = "vim-tpipeline"; - version = "2023-08-19"; + version = "2023-09-10"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "0fcbe14fdfc3b86b8a41f7cdaa67dd2041cb77fe"; - sha256 = "04jgb3l84767c6b485475fddgz5vhf3268h07xbdq4pdkykmxafw"; + rev = "2889cbdbe756324e1e21716a34b3d36b058f959e"; + sha256 = "105zmflfvqf6wllm26gwnh7am3g98aywq1d034lpr1c7zm5ln0pv"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; - vim-trailing-whitespace = buildVimPluginFrom2Nix { + vim-trailing-whitespace = buildVimPlugin { pname = "vim-trailing-whitespace"; version = "2023-02-28"; src = fetchFromGitHub { @@ -14806,7 +14963,7 @@ final: prev: meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; - vim-tridactyl = buildVimPluginFrom2Nix { + vim-tridactyl = buildVimPlugin { pname = "vim-tridactyl"; version = "2022-11-30"; src = fetchFromGitHub { @@ -14818,7 +14975,7 @@ final: prev: meta.homepage = "https://github.com/tridactyl/vim-tridactyl/"; }; - vim-tsx = buildVimPluginFrom2Nix { + vim-tsx = buildVimPlugin { pname = "vim-tsx"; version = "2017-03-16"; src = fetchFromGitHub { @@ -14830,7 +14987,7 @@ final: prev: meta.homepage = "https://github.com/ianks/vim-tsx/"; }; - vim-twig = buildVimPluginFrom2Nix { + vim-twig = buildVimPlugin { pname = "vim-twig"; version = "2018-05-23"; src = fetchFromGitHub { @@ -14842,7 +14999,7 @@ final: prev: meta.homepage = "https://github.com/lumiliet/vim-twig/"; }; - vim-twiggy = buildVimPluginFrom2Nix { + vim-twiggy = buildVimPlugin { pname = "vim-twiggy"; version = "2022-01-10"; src = fetchFromGitHub { @@ -14854,7 +15011,7 @@ final: prev: meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; }; - vim-ultest = buildVimPluginFrom2Nix { + vim-ultest = buildVimPlugin { pname = "vim-ultest"; version = "2023-02-09"; src = fetchFromGitHub { @@ -14866,7 +15023,7 @@ final: prev: meta.homepage = "https://github.com/rcarriga/vim-ultest/"; }; - vim-unicoder = buildVimPluginFrom2Nix { + vim-unicoder = buildVimPlugin { pname = "vim-unicoder"; version = "2019-04-16"; src = fetchFromGitHub { @@ -14878,7 +15035,7 @@ final: prev: meta.homepage = "https://github.com/arthurxavierx/vim-unicoder/"; }; - vim-unimpaired = buildVimPluginFrom2Nix { + vim-unimpaired = buildVimPlugin { pname = "vim-unimpaired"; version = "2022-11-21"; src = fetchFromGitHub { @@ -14890,7 +15047,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; - vim-vagrant = buildVimPluginFrom2Nix { + vim-vagrant = buildVimPlugin { pname = "vim-vagrant"; version = "2018-11-11"; src = fetchFromGitHub { @@ -14902,7 +15059,7 @@ final: prev: meta.homepage = "https://github.com/hashivim/vim-vagrant/"; }; - vim-vinegar = buildVimPluginFrom2Nix { + vim-vinegar = buildVimPlugin { pname = "vim-vinegar"; version = "2022-01-11"; src = fetchFromGitHub { @@ -14914,7 +15071,7 @@ final: prev: meta.homepage = "https://github.com/tpope/vim-vinegar/"; }; - vim-visual-increment = buildVimPluginFrom2Nix { + vim-visual-increment = buildVimPlugin { pname = "vim-visual-increment"; version = "2020-05-03"; src = fetchFromGitHub { @@ -14926,7 +15083,7 @@ final: prev: meta.homepage = "https://github.com/triglav/vim-visual-increment/"; }; - vim-visual-multi = buildVimPluginFrom2Nix { + vim-visual-multi = buildVimPlugin { pname = "vim-visual-multi"; version = "2022-09-14"; src = fetchFromGitHub { @@ -14938,7 +15095,7 @@ final: prev: meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; - vim-visual-star-search = buildVimPluginFrom2Nix { + vim-visual-star-search = buildVimPlugin { pname = "vim-visual-star-search"; version = "2021-07-14"; src = fetchFromGitHub { @@ -14950,7 +15107,7 @@ final: prev: meta.homepage = "https://github.com/bronson/vim-visual-star-search/"; }; - vim-visualstar = buildVimPluginFrom2Nix { + vim-visualstar = buildVimPlugin { pname = "vim-visualstar"; version = "2015-08-27"; src = fetchFromGitHub { @@ -14962,7 +15119,7 @@ final: prev: meta.homepage = "https://github.com/thinca/vim-visualstar/"; }; - vim-vp4 = buildVimPluginFrom2Nix { + vim-vp4 = buildVimPlugin { pname = "vim-vp4"; version = "2022-06-06"; src = fetchFromGitHub { @@ -14974,19 +15131,19 @@ final: prev: meta.homepage = "https://github.com/ngemily/vim-vp4/"; }; - vim-vsnip = buildVimPluginFrom2Nix { + vim-vsnip = buildVimPlugin { pname = "vim-vsnip"; - version = "2023-03-12"; + version = "2023-09-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "7753ba9c10429c29d25abfd11b4c60b76718c438"; - sha256 = "1l8myq6c5rckk6jr3s5rx9jpnrgzk1a65yky1b28mvayd6yff4vs"; + rev = "be277461265f1e5c7db470aa479f30956597ea9e"; + sha256 = "0fiqz7qrcsla2ms5lfw0w8f6ysa5wivnhjn9463i00vasg19mcqi"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; - vim-vsnip-integ = buildVimPluginFrom2Nix { + vim-vsnip-integ = buildVimPlugin { pname = "vim-vsnip-integ"; version = "2023-07-01"; src = fetchFromGitHub { @@ -14998,7 +15155,7 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; - vim-vue = buildVimPluginFrom2Nix { + vim-vue = buildVimPlugin { pname = "vim-vue"; version = "2019-08-03"; src = fetchFromGitHub { @@ -15010,7 +15167,7 @@ final: prev: meta.homepage = "https://github.com/posva/vim-vue/"; }; - vim-vue-plugin = buildVimPluginFrom2Nix { + vim-vue-plugin = buildVimPlugin { pname = "vim-vue-plugin"; version = "2023-02-02"; src = fetchFromGitHub { @@ -15022,7 +15179,7 @@ final: prev: meta.homepage = "https://github.com/leafOfTree/vim-vue-plugin/"; }; - vim-wakatime = buildVimPluginFrom2Nix { + vim-wakatime = buildVimPlugin { pname = "vim-wakatime"; version = "2023-08-16"; src = fetchFromGitHub { @@ -15034,7 +15191,7 @@ final: prev: meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; - vim-watchdogs = buildVimPluginFrom2Nix { + vim-watchdogs = buildVimPlugin { pname = "vim-watchdogs"; version = "2019-09-09"; src = fetchFromGitHub { @@ -15046,31 +15203,31 @@ final: prev: meta.homepage = "https://github.com/osyo-manga/vim-watchdogs/"; }; - vim-wayland-clipboard = buildVimPluginFrom2Nix { + vim-wayland-clipboard = buildVimPlugin { pname = "vim-wayland-clipboard"; - version = "2022-12-31"; + version = "2023-09-08"; src = fetchFromGitHub { owner = "jasonccox"; repo = "vim-wayland-clipboard"; - rev = "9b6def0924e716fb5314d52e062965b950b707f8"; - sha256 = "0j383bs1s2l8qxmym3zwby8nj8md8dsx7nk7xnspcrgah4g3j4mm"; + rev = "6d0c9f8e7deac8a90c51d4c1e69068cb86361933"; + sha256 = "15h2zij39zd10m16g7vmy60y718mldmchnwlvfp9pb8x2q9y8yv2"; }; meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/"; }; - vim-which-key = buildVimPluginFrom2Nix { + vim-which-key = buildVimPlugin { pname = "vim-which-key"; - version = "2023-08-13"; + version = "2023-09-14"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-which-key"; - rev = "a98626b2bf88d6fc97a8276d02c75961ce2b35fa"; - sha256 = "0bda58d83p5mv2gribzq9xhqvlrncx1ngc7n5fi67v7k0c6b84r9"; + rev = "08cf520fc4785e656dfdb319ecf6fe9e75bfc4fa"; + sha256 = "033flr2sqlhmn7qilx5nz1z14kmy8dwzdh86rg8xh21r2894adx9"; }; meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; - vim-windowswap = buildVimPluginFrom2Nix { + vim-windowswap = buildVimPlugin { pname = "vim-windowswap"; version = "2018-05-16"; src = fetchFromGitHub { @@ -15082,7 +15239,7 @@ final: prev: meta.homepage = "https://github.com/wesQ3/vim-windowswap/"; }; - vim-wordmotion = buildVimPluginFrom2Nix { + vim-wordmotion = buildVimPlugin { pname = "vim-wordmotion"; version = "2023-02-26"; src = fetchFromGitHub { @@ -15094,7 +15251,7 @@ final: prev: meta.homepage = "https://github.com/chaoren/vim-wordmotion/"; }; - vim-wordy = buildVimPluginFrom2Nix { + vim-wordy = buildVimPlugin { pname = "vim-wordy"; version = "2022-02-13"; src = fetchFromGitHub { @@ -15106,7 +15263,7 @@ final: prev: meta.homepage = "https://github.com/preservim/vim-wordy/"; }; - vim-xdebug = buildVimPluginFrom2Nix { + vim-xdebug = buildVimPlugin { pname = "vim-xdebug"; version = "2012-08-15"; src = fetchFromGitHub { @@ -15118,7 +15275,7 @@ final: prev: meta.homepage = "https://github.com/joonty/vim-xdebug/"; }; - vim-xkbswitch = buildVimPluginFrom2Nix { + vim-xkbswitch = buildVimPlugin { pname = "vim-xkbswitch"; version = "2023-05-11"; src = fetchFromGitHub { @@ -15130,7 +15287,7 @@ final: prev: meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; - vim-xtabline = buildVimPluginFrom2Nix { + vim-xtabline = buildVimPlugin { pname = "vim-xtabline"; version = "2022-02-03"; src = fetchFromGitHub { @@ -15142,7 +15299,7 @@ final: prev: meta.homepage = "https://github.com/mg979/vim-xtabline/"; }; - vim-yaml = buildVimPluginFrom2Nix { + vim-yaml = buildVimPlugin { pname = "vim-yaml"; version = "2021-01-14"; src = fetchFromGitHub { @@ -15154,7 +15311,7 @@ final: prev: meta.homepage = "https://github.com/stephpy/vim-yaml/"; }; - vim-yapf = buildVimPluginFrom2Nix { + vim-yapf = buildVimPlugin { pname = "vim-yapf"; version = "2018-10-04"; src = fetchFromGitHub { @@ -15166,7 +15323,7 @@ final: prev: meta.homepage = "https://github.com/simonrw/vim-yapf/"; }; - vim-zettel = buildVimPluginFrom2Nix { + vim-zettel = buildVimPlugin { pname = "vim-zettel"; version = "2023-08-17"; src = fetchFromGitHub { @@ -15178,7 +15335,7 @@ final: prev: meta.homepage = "https://github.com/michal-h21/vim-zettel/"; }; - vim2hs = buildVimPluginFrom2Nix { + vim2hs = buildVimPlugin { pname = "vim2hs"; version = "2014-04-16"; src = fetchFromGitHub { @@ -15190,7 +15347,7 @@ final: prev: meta.homepage = "https://github.com/dag/vim2hs/"; }; - vim9-stargate = buildVimPluginFrom2Nix { + vim9-stargate = buildVimPlugin { pname = "vim9-stargate"; version = "2023-01-21"; src = fetchFromGitHub { @@ -15202,7 +15359,7 @@ final: prev: meta.homepage = "https://github.com/monkoose/vim9-stargate/"; }; - vim_current_word = buildVimPluginFrom2Nix { + vim_current_word = buildVimPlugin { pname = "vim_current_word"; version = "2023-05-23"; src = fetchFromGitHub { @@ -15214,7 +15371,7 @@ final: prev: meta.homepage = "https://github.com/dominikduda/vim_current_word/"; }; - vimacs = buildVimPluginFrom2Nix { + vimacs = buildVimPlugin { pname = "vimacs"; version = "2016-03-24"; src = fetchFromGitHub { @@ -15226,7 +15383,7 @@ final: prev: meta.homepage = "https://github.com/andrep/vimacs/"; }; - vimade = buildVimPluginFrom2Nix { + vimade = buildVimPlugin { pname = "vimade"; version = "2022-01-31"; src = fetchFromGitHub { @@ -15238,7 +15395,7 @@ final: prev: meta.homepage = "https://github.com/TaDaa/vimade/"; }; - vimagit = buildVimPluginFrom2Nix { + vimagit = buildVimPlugin { pname = "vimagit"; version = "2022-07-03"; src = fetchFromGitHub { @@ -15250,7 +15407,7 @@ final: prev: meta.homepage = "https://github.com/jreybert/vimagit/"; }; - vimelette = buildVimPluginFrom2Nix { + vimelette = buildVimPlugin { pname = "vimelette"; version = "2019-05-02"; src = fetchFromGitHub { @@ -15262,7 +15419,7 @@ final: prev: meta.homepage = "https://github.com/gotcha/vimelette/"; }; - vimfiler-vim = buildVimPluginFrom2Nix { + vimfiler-vim = buildVimPlugin { pname = "vimfiler.vim"; version = "2023-05-18"; src = fetchFromGitHub { @@ -15274,19 +15431,19 @@ final: prev: meta.homepage = "https://github.com/Shougo/vimfiler.vim/"; }; - vimoutliner = buildVimPluginFrom2Nix { + vimoutliner = buildVimPlugin { pname = "vimoutliner"; - version = "2021-04-24"; + version = "2023-08-29"; src = fetchFromGitHub { owner = "vimoutliner"; repo = "vimoutliner"; - rev = "6d849acb977fc2d008f9cd2edf4f1356537794fe"; - sha256 = "1hy4zgxrc0zn6dnbdv7zy2cn4ny99srsvrgkyvwhg4pzd9rwcqpp"; + rev = "c3efbd58926aec490f5f1e87aa14f63f778f488a"; + sha256 = "0rs0w8x0wckakabz9sv836zgvvlpslvrb4xb049liryabk0w5578"; }; meta.homepage = "https://github.com/vimoutliner/vimoutliner/"; }; - vimpreviewpandoc = buildVimPluginFrom2Nix { + vimpreviewpandoc = buildVimPlugin { pname = "vimpreviewpandoc"; version = "2023-08-14"; src = fetchFromGitHub { @@ -15298,7 +15455,7 @@ final: prev: meta.homepage = "https://github.com/tex/vimpreviewpandoc/"; }; - vimproc-vim = buildVimPluginFrom2Nix { + vimproc-vim = buildVimPlugin { pname = "vimproc.vim"; version = "2023-01-05"; src = fetchFromGitHub { @@ -15310,7 +15467,7 @@ final: prev: meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; - vimsence = buildVimPluginFrom2Nix { + vimsence = buildVimPlugin { pname = "vimsence"; version = "2021-05-01"; src = fetchFromGitHub { @@ -15322,7 +15479,7 @@ final: prev: meta.homepage = "https://github.com/vimsence/vimsence/"; }; - vimshell-vim = buildVimPluginFrom2Nix { + vimshell-vim = buildVimPlugin { pname = "vimshell.vim"; version = "2019-07-16"; src = fetchFromGitHub { @@ -15334,32 +15491,32 @@ final: prev: meta.homepage = "https://github.com/Shougo/vimshell.vim/"; }; - vimspector = buildVimPluginFrom2Nix { + vimspector = buildVimPlugin { pname = "vimspector"; - version = "2023-08-18"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "4e49a1782e34433410f96602640a05c9ec00a65f"; - sha256 = "0a2yagqpgnxkc8n7bq0nv77ab0y8hp2r4b5h8wh043vxrc0cf8xz"; + rev = "162a176f217616bac51ab1eb3b018b6e15b02e3a"; + sha256 = "1afnmrh9vp1zxsyn6w81pqmsnqd49vvipd80hsy8pxpzj4lpca9n"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; }; - vimtex = buildVimPluginFrom2Nix { + vimtex = buildVimPlugin { pname = "vimtex"; - version = "2023-08-19"; + version = "2023-09-28"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "534fd725f2475a9083b032e402c7e73b8a3fc6bb"; - sha256 = "0i1fnvj10m01jxp5kxjya8xsmk8xgnm9jn5bm5zrq4l7m1i85gk4"; + rev = "7d453a61b0256337f341a1195ca9eb3f3890a7df"; + sha256 = "0yk9zmcyl3mbfr5m1vs9w593irc78a9xwsn048qf7bpkwwmp1b0h"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; - vimux = buildVimPluginFrom2Nix { + vimux = buildVimPlugin { pname = "vimux"; version = "2022-09-26"; src = fetchFromGitHub { @@ -15371,7 +15528,7 @@ final: prev: meta.homepage = "https://github.com/preservim/vimux/"; }; - vimwiki = buildVimPluginFrom2Nix { + vimwiki = buildVimPlugin { pname = "vimwiki"; version = "2023-07-31"; src = fetchFromGitHub { @@ -15383,7 +15540,7 @@ final: prev: meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; - virtual-types-nvim = buildVimPluginFrom2Nix { + virtual-types-nvim = buildVimPlugin { pname = "virtual-types.nvim"; version = "2023-04-07"; src = fetchFromGitHub { @@ -15395,7 +15552,7 @@ final: prev: meta.homepage = "https://github.com/jubnzv/virtual-types.nvim/"; }; - vis = buildVimPluginFrom2Nix { + vis = buildVimPlugin { pname = "vis"; version = "2013-04-26"; src = fetchFromGitHub { @@ -15407,7 +15564,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/vis/"; }; - vissort-vim = buildVimPluginFrom2Nix { + vissort-vim = buildVimPlugin { pname = "vissort.vim"; version = "2014-01-31"; src = fetchFromGitHub { @@ -15419,19 +15576,19 @@ final: prev: meta.homepage = "https://github.com/navicore/vissort.vim/"; }; - vista-vim = buildVimPluginFrom2Nix { + vista-vim = buildVimPlugin { pname = "vista.vim"; - version = "2023-05-18"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "f925e481bba7cd5451fb8bca9a6ecfc2bf1f2858"; - sha256 = "1gnqiyg2ifnna3x99bmkk0fsa7mkhnhjzzrz42lzvznn11bn45v8"; + rev = "58dabc027909330970ac549e52bf799a723878c5"; + sha256 = "0xb385781kll7hrhgm7nw7frjx2fwd2gzriwn9gby2s7m6yx8xib"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; - wal-vim = buildVimPluginFrom2Nix { + wal-vim = buildVimPlugin { pname = "wal.vim"; version = "2020-11-08"; src = fetchFromGitHub { @@ -15443,7 +15600,7 @@ final: prev: meta.homepage = "https://github.com/dylanaraps/wal.vim/"; }; - webapi-vim = buildVimPluginFrom2Nix { + webapi-vim = buildVimPlugin { pname = "webapi-vim"; version = "2022-11-23"; src = fetchFromGitHub { @@ -15455,7 +15612,7 @@ final: prev: meta.homepage = "https://github.com/mattn/webapi-vim/"; }; - wgsl-vim = buildVimPluginFrom2Nix { + wgsl-vim = buildVimPlugin { pname = "wgsl.vim"; version = "2023-04-29"; src = fetchFromGitHub { @@ -15467,7 +15624,7 @@ final: prev: meta.homepage = "https://github.com/DingDean/wgsl.vim/"; }; - which-key-nvim = buildVimPluginFrom2Nix { + which-key-nvim = buildVimPlugin { pname = "which-key.nvim"; version = "2023-07-28"; src = fetchFromGitHub { @@ -15479,7 +15636,7 @@ final: prev: meta.homepage = "https://github.com/folke/which-key.nvim/"; }; - whitespace-nvim = buildVimPluginFrom2Nix { + whitespace-nvim = buildVimPlugin { pname = "whitespace.nvim"; version = "2023-04-18"; src = fetchFromGitHub { @@ -15491,7 +15648,7 @@ final: prev: meta.homepage = "https://github.com/johnfrankmorgan/whitespace.nvim/"; }; - wiki-ft-vim = buildVimPluginFrom2Nix { + wiki-ft-vim = buildVimPlugin { pname = "wiki-ft.vim"; version = "2023-05-14"; src = fetchFromGitHub { @@ -15503,19 +15660,19 @@ final: prev: meta.homepage = "https://github.com/lervag/wiki-ft.vim/"; }; - wiki-vim = buildVimPluginFrom2Nix { + wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "2023-08-09"; + version = "2023-09-25"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "04459625f1b6faa2b02ce763fc6fbc24d4a51f21"; - sha256 = "07nivlzg341xabhwmpsvqkpwbm9h405nqa6hpb7i634f2lg5kpcm"; + rev = "65b67f3669a0db078dab2750d3c51c680ee14df1"; + sha256 = "1j6bkk2gqmdaszs6q97yxjqnp3akl1wrlbvs6r31pz0faaswaqb8"; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; }; - wilder-nvim = buildVimPluginFrom2Nix { + wilder-nvim = buildVimPlugin { pname = "wilder.nvim"; version = "2022-08-13"; src = fetchFromGitHub { @@ -15527,7 +15684,7 @@ final: prev: meta.homepage = "https://github.com/gelguy/wilder.nvim/"; }; - wildfire-vim = buildVimPluginFrom2Nix { + wildfire-vim = buildVimPlugin { pname = "wildfire.vim"; version = "2023-07-22"; src = fetchFromGitHub { @@ -15539,7 +15696,7 @@ final: prev: meta.homepage = "https://github.com/gcmt/wildfire.vim/"; }; - winbar-nvim = buildVimPluginFrom2Nix { + winbar-nvim = buildVimPlugin { pname = "winbar.nvim"; version = "2022-07-18"; src = fetchFromGitHub { @@ -15551,7 +15708,7 @@ final: prev: meta.homepage = "https://github.com/fgheng/winbar.nvim/"; }; - windows-nvim = buildVimPluginFrom2Nix { + windows-nvim = buildVimPlugin { pname = "windows.nvim"; version = "2023-01-16"; src = fetchFromGitHub { @@ -15563,7 +15720,7 @@ final: prev: meta.homepage = "https://github.com/anuvyklack/windows.nvim/"; }; - winshift-nvim = buildVimPluginFrom2Nix { + winshift-nvim = buildVimPlugin { pname = "winshift.nvim"; version = "2022-09-06"; src = fetchFromGitHub { @@ -15575,7 +15732,7 @@ final: prev: meta.homepage = "https://github.com/sindrets/winshift.nvim/"; }; - wmgraphviz-vim = buildVimPluginFrom2Nix { + wmgraphviz-vim = buildVimPlugin { pname = "wmgraphviz.vim"; version = "2018-04-26"; src = fetchFromGitHub { @@ -15587,7 +15744,7 @@ final: prev: meta.homepage = "https://github.com/wannesm/wmgraphviz.vim/"; }; - wombat256-vim = buildVimPluginFrom2Nix { + wombat256-vim = buildVimPlugin { pname = "wombat256.vim"; version = "2010-10-18"; src = fetchFromGitHub { @@ -15599,7 +15756,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/wombat256.vim/"; }; - workflowish = buildVimPluginFrom2Nix { + workflowish = buildVimPlugin { pname = "workflowish"; version = "2015-12-03"; src = fetchFromGitHub { @@ -15611,19 +15768,19 @@ final: prev: meta.homepage = "https://github.com/lukaszkorecki/workflowish/"; }; - wrapping-nvim = buildVimPluginFrom2Nix { + wrapping-nvim = buildVimPlugin { pname = "wrapping.nvim"; - version = "2023-08-08"; + version = "2023-09-23"; src = fetchFromGitHub { owner = "andrewferrier"; repo = "wrapping.nvim"; - rev = "1fc811d99b512ca53a4a773580f9ed5394fe6b2a"; - sha256 = "01j0whf2f4bzkq9p1bdpf7bhj1v7sj1bzdq47xck1f7fkkk2i8cr"; + rev = "e1ce68aae5ea729fc20e5bc17fb569314f76b9bb"; + sha256 = "1wsvy0j3zgd34ssbnajih8sx12666v0yywp7vr6bijz0hc4mlihs"; }; meta.homepage = "https://github.com/andrewferrier/wrapping.nvim/"; }; - wstrip-vim = buildVimPluginFrom2Nix { + wstrip-vim = buildVimPlugin { pname = "wstrip.vim"; version = "2021-03-14"; src = fetchFromGitHub { @@ -15635,7 +15792,7 @@ final: prev: meta.homepage = "https://github.com/tweekmonster/wstrip.vim/"; }; - xptemplate = buildVimPluginFrom2Nix { + xptemplate = buildVimPlugin { pname = "xptemplate"; version = "2022-09-08"; src = fetchFromGitHub { @@ -15647,7 +15804,7 @@ final: prev: meta.homepage = "https://github.com/drmingdrmer/xptemplate/"; }; - xterm-color-table-vim = buildVimPluginFrom2Nix { + xterm-color-table-vim = buildVimPlugin { pname = "xterm-color-table.vim"; version = "2022-11-21"; src = fetchFromGitHub { @@ -15659,20 +15816,20 @@ final: prev: meta.homepage = "https://github.com/guns/xterm-color-table.vim/"; }; - yats-vim = buildVimPluginFrom2Nix { + yats-vim = buildVimPlugin { pname = "yats.vim"; - version = "2023-08-12"; + version = "2023-08-24"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "8878bdd7fc01eec647267d4433a763474b6a5db4"; - sha256 = "0070r63v9kjl3cx9w8xsilyww9nwyharc6l274y7mg4bfhddpbr3"; + rev = "2b6950c7143790e6930b8cf32d60c6858a50d47c"; + sha256 = "0385gak2sil6z8n20s5kdmnnpyw7ds5c2qcfr0pmyaz3dlyfx2ih"; fetchSubmodules = true; }; meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; }; - yescapsquit-vim = buildVimPluginFrom2Nix { + yescapsquit-vim = buildVimPlugin { pname = "yescapsquit.vim"; version = "2022-08-31"; src = fetchFromGitHub { @@ -15684,7 +15841,7 @@ final: prev: meta.homepage = "https://github.com/lucasew/yescapsquit.vim/"; }; - yuck-vim = buildVimPluginFrom2Nix { + yuck-vim = buildVimPlugin { pname = "yuck.vim"; version = "2022-10-29"; src = fetchFromGitHub { @@ -15696,7 +15853,7 @@ final: prev: meta.homepage = "https://github.com/elkowar/yuck.vim/"; }; - zeavim-vim = buildVimPluginFrom2Nix { + zeavim-vim = buildVimPlugin { pname = "zeavim.vim"; version = "2019-06-07"; src = fetchFromGitHub { @@ -15708,7 +15865,7 @@ final: prev: meta.homepage = "https://github.com/KabbAmine/zeavim.vim/"; }; - zen-mode-nvim = buildVimPluginFrom2Nix { + zen-mode-nvim = buildVimPlugin { pname = "zen-mode.nvim"; version = "2023-05-22"; src = fetchFromGitHub { @@ -15720,19 +15877,19 @@ final: prev: meta.homepage = "https://github.com/folke/zen-mode.nvim/"; }; - zenbones-nvim = buildVimPluginFrom2Nix { + zenbones-nvim = buildVimPlugin { pname = "zenbones.nvim"; - version = "2023-07-02"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "mcchrish"; repo = "zenbones.nvim"; - rev = "ba1c6ad48626526f65a2eb0149abbc2747cb961b"; - sha256 = "04k0l2nqjnw1qgzl0xnsi9r48rp91z6201dpwpnviv3bhlzsvdbf"; + rev = "491b8a79e0547e181c7c6fb054d778fd595f068c"; + sha256 = "1p8fakdby43sk3l54dszib5sf6h58mcmvdd3zvwjxn16diqjd6jd"; }; meta.homepage = "https://github.com/mcchrish/zenbones.nvim/"; }; - zenburn = buildVimPluginFrom2Nix { + zenburn = buildVimPlugin { pname = "zenburn"; version = "2022-08-13"; src = fetchFromGitHub { @@ -15744,7 +15901,7 @@ final: prev: meta.homepage = "https://github.com/jnurmine/zenburn/"; }; - zephyr-nvim = buildVimPluginFrom2Nix { + zephyr-nvim = buildVimPlugin { pname = "zephyr-nvim"; version = "2022-12-31"; src = fetchFromGitHub { @@ -15756,31 +15913,31 @@ final: prev: meta.homepage = "https://github.com/nvimdev/zephyr-nvim/"; }; - zig-vim = buildVimPluginFrom2Nix { + zig-vim = buildVimPlugin { pname = "zig.vim"; - version = "2023-07-22"; + version = "2023-09-27"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "15841fc4fecfb1b6c02da9b4cc17ced135edbf8e"; - sha256 = "0m9p0055x6j5bz7whln7arz6w7cn02wq4rgs1ynczrvbqd68iji2"; + rev = "a34fb9850a56bb1f1e62bb5cfd0641c8baaeb3f9"; + sha256 = "0zgd892b8z8blbs7z29qwwkvp43633iri9jf5rin9bgicj412cg9"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; - zk-nvim = buildVimPluginFrom2Nix { + zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "2023-07-09"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk-nvim"; - rev = "797618aa07f58ceba6f79fb6e777e8e45c51e1ce"; - sha256 = "1hr1k3h3pwh7iga7zdd62hkwgnvivsr6z9nbs8ypks3r34rw60xx"; + rev = "e9e5e21dbeacd0e753728c7ea45b7a7582d9080a"; + sha256 = "0ycx8ad6a9xyc2i4gzjccbl5pzvg1y7rqhpxf4mys5vh5j7iisvv"; }; meta.homepage = "https://github.com/mickael-menu/zk-nvim/"; }; - zoomwintab-vim = buildVimPluginFrom2Nix { + zoomwintab-vim = buildVimPlugin { pname = "zoomwintab.vim"; version = "2021-10-10"; src = fetchFromGitHub { @@ -15792,7 +15949,7 @@ final: prev: meta.homepage = "https://github.com/troydm/zoomwintab.vim/"; }; - zoxide-vim = buildVimPluginFrom2Nix { + zoxide-vim = buildVimPlugin { pname = "zoxide.vim"; version = "2023-05-21"; src = fetchFromGitHub { @@ -15804,43 +15961,43 @@ final: prev: meta.homepage = "https://github.com/nanotee/zoxide.vim/"; }; - catppuccin-nvim = buildVimPluginFrom2Nix { + catppuccin-nvim = buildVimPlugin { pname = "catppuccin-nvim"; - version = "2023-08-10"; + version = "2023-09-30"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "490078b1593c6609e6a50ad5001e7902ea601824"; - sha256 = "03nwnc8q65nqjvrxj5fg8c95ywqb94xyim2hxald95agiickv6rd"; + rev = "7a4bcdadafc59a5bedbd866c643fa486d8cca4a1"; + sha256 = "0v8syhgyvl4zs484dycz65qrclds2cd6f9ja85xy4gzfhisnc6s3"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; - catppuccin-vim = buildVimPluginFrom2Nix { + catppuccin-vim = buildVimPlugin { pname = "catppuccin-vim"; - version = "2023-06-29"; + version = "2023-09-12"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "5280d241fe6a4f4ddef17078a215b81a113388e8"; - sha256 = "1l8a7gn5wd7ry04lvm94x5s2fwf9dcl281200f5yq9ic6aw18p99"; + rev = "be4725cfc3fb6ed96f706d9d1bd5baa24d2b048c"; + sha256 = "1mhrch0ck3g1gs79c6mlbj2krhqqk7hp5g0v7ahap71bcfk5yxk7"; }; meta.homepage = "https://github.com/catppuccin/vim/"; }; - dracula-vim = buildVimPluginFrom2Nix { + dracula-vim = buildVimPlugin { pname = "dracula-vim"; - version = "2023-06-19"; + version = "2023-08-30"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "3e52a0682a53dd7c2c53133d45948f5a49c5fd9a"; - sha256 = "1rvfafi9l2m7bhr4lpccvmyyrf572k61y1bj3jr8vh10i21pmxf0"; + rev = "b2cc39273abbb6b38a3d173d2a5d8c2d1c79fc19"; + sha256 = "1fcggi03mh0rq1akr9a76mfycm6i34yihhkqmxzgbf63q4v90qrd"; }; meta.homepage = "https://github.com/dracula/vim/"; }; - embark-vim = buildVimPluginFrom2Nix { + embark-vim = buildVimPlugin { pname = "embark-vim"; version = "2023-04-21"; src = fetchFromGitHub { @@ -15852,19 +16009,19 @@ final: prev: meta.homepage = "https://github.com/embark-theme/vim/"; }; - gruvbox-community = buildVimPluginFrom2Nix { + gruvbox-community = buildVimPlugin { pname = "gruvbox-community"; - version = "2022-11-18"; + version = "2023-09-19"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "2b5b1f777f0583ffb39086d6c16f39e6e37459c0"; - sha256 = "1a5v9ccbkm8759m24a9y85y7d6g4yg7yr2bidjn6vqw04alwvjf6"; + rev = "86c767ff91e2518da44ba8c78b3bc6c979cf5403"; + sha256 = "1map59hiin7qwwyliqxqwq3v64hskn4xpxisnfpj7ci56c9viby8"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; - mattn-calendar-vim = buildVimPluginFrom2Nix { + mattn-calendar-vim = buildVimPlugin { pname = "mattn-calendar-vim"; version = "2022-02-10"; src = fetchFromGitHub { @@ -15876,19 +16033,19 @@ final: prev: meta.homepage = "https://github.com/mattn/calendar-vim/"; }; - nightfly = buildVimPluginFrom2Nix { + nightfly = buildVimPlugin { pname = "nightfly"; - version = "2023-08-19"; + version = "2023-10-01"; src = fetchFromGitHub { owner = "bluz71"; repo = "vim-nightfly-colors"; - rev = "456d7b392cd0fa6c94aefe8aa083ab1a7b4083bc"; - sha256 = "1qj78f7d3ahhlqfbx5dw69x20v7jnjccdnrfk93c3yjn25bhd677"; + rev = "60d7e7749c21dec4e77c70672c3882dc5653d02c"; + sha256 = "1z8d6i81n2j8ynfpa8gvlw27svjgv4rxs1ham4rl90vraryqgpl1"; }; meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/"; }; - nord-vim = buildVimPluginFrom2Nix { + nord-vim = buildVimPlugin { pname = "nord-vim"; version = "2023-05-03"; src = fetchFromGitHub { @@ -15900,19 +16057,19 @@ final: prev: meta.homepage = "https://github.com/nordtheme/vim/"; }; - nvchad-ui = buildVimPluginFrom2Nix { + nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "2023-08-15"; + version = "2023-09-13"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "e973096c282d14d1832d54345ad591048444fb17"; - sha256 = "06bfb9kbwf0cwm87j72zkaa7qnj4ly1q6b5547z8df206f6d3vsq"; + rev = "6c22f52568c4ab080a6676f7bb6515f0076e6567"; + sha256 = "1x7wbh4v5a4scxvdqvi86ql0z9kygw4fg3v7by0r2bcgqy9rxbcy"; }; meta.homepage = "https://github.com/nvchad/ui/"; }; - pure-lua = buildVimPluginFrom2Nix { + pure-lua = buildVimPlugin { pname = "pure-lua"; version = "2021-05-16"; src = fetchFromGitHub { @@ -15924,7 +16081,7 @@ final: prev: meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/"; }; - restore-view-vim = buildVimPluginFrom2Nix { + restore-view-vim = buildVimPlugin { pname = "restore-view-vim"; version = "2014-11-21"; src = fetchFromGitHub { @@ -15936,7 +16093,7 @@ final: prev: meta.homepage = "https://github.com/vim-scripts/restore_view.vim/"; }; - rose-pine = buildVimPluginFrom2Nix { + rose-pine = buildVimPlugin { pname = "rose-pine"; version = "2023-07-28"; src = fetchFromGitHub { @@ -15948,7 +16105,7 @@ final: prev: meta.homepage = "https://github.com/rose-pine/neovim/"; }; - samodostal-image-nvim = buildVimPluginFrom2Nix { + samodostal-image-nvim = buildVimPlugin { pname = "samodostal-image-nvim"; version = "2023-06-08"; src = fetchFromGitHub { @@ -15960,7 +16117,7 @@ final: prev: meta.homepage = "https://github.com/samodostal/image.nvim/"; }; - tinykeymap = buildVimPluginFrom2Nix { + tinykeymap = buildVimPlugin { pname = "tinykeymap"; version = "2019-03-15"; src = fetchFromGitHub { @@ -15972,7 +16129,7 @@ final: prev: meta.homepage = "https://github.com/tomtom/tinykeymap_vim/"; }; - vim-advanced-sorters = buildVimPluginFrom2Nix { + vim-advanced-sorters = buildVimPlugin { pname = "vim-advanced-sorters"; version = "2021-11-21"; src = fetchFromGitHub { @@ -15984,14 +16141,14 @@ final: prev: meta.homepage = "https://github.com/inkarkat/vim-AdvancedSorters/"; }; - vim-docbk-snippets = buildVimPluginFrom2Nix { + vim-docbk-snippets = buildVimPlugin { pname = "vim-docbk-snippets"; - version = "2023-06-05"; + version = "2023-09-29"; src = fetchFromGitHub { owner = "jhradilek"; repo = "vim-snippets"; - rev = "a279b708a49ca410b41b1628f62c56ab4dc0390b"; - sha256 = "06rnj834nrd0c1g088zfvb2bvbzqzbmbdhga9gza8srjw7p8kvhw"; + rev = "73aa6c7a3dcd9ac452271fbd4f8a2bdf66a7513e"; + sha256 = "1wpn6gfw1r89232d779lz8wy19asrribindlcsaikrsqvml3a0hr"; }; meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/get-plugins.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/get-plugins.nix index f81b9fc346..06ed71f379 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/get-plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/get-plugins.nix @@ -1,10 +1,10 @@ with import {}; let - inherit (vimUtils.override {inherit vim;}) buildVimPluginFrom2Nix; + inherit (vimUtils.override {inherit vim;}) buildVimPlugin; inherit (neovimUtils) buildNeovimPlugin; generated = callPackage { - inherit buildNeovimPlugin buildVimPluginFrom2Nix; + inherit buildNeovimPlugin buildVimPlugin; } {} {}; hasChecksum = value: lib.isAttrs value && lib.hasAttrByPath ["src" "outputHash"] value; 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 3e64ae39c4..dfda03ac5a 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 @@ -5,34 +5,46 @@ { ada = buildGrammar { language = "ada"; - version = "0.0.0+rev=ba7951a"; + version = "0.0.0+rev=f21f13a"; src = fetchFromGitHub { owner = "briot"; repo = "tree-sitter-ada"; - rev = "ba7951a8f3fb08f9ea923625153e7670c89f30b4"; - hash = "sha256-Rs+7wSsoV9ol0zV8occOeuvJaIofAe7qDXLmOxrjVw0="; + rev = "f21f13afe0410311be1f78959a25aee393c569c9"; + hash = "sha256-Qnw1skHo9Wy88WEXAxfV4kkD4v9rdvLmu/++raLIges="; }; meta.homepage = "https://github.com/briot/tree-sitter-ada"; }; agda = buildGrammar { language = "agda"; - version = "0.0.0+rev=80ea622"; + version = "0.0.0+rev=c21c3a0"; src = fetchFromGitHub { - owner = "AusCyberman"; + owner = "tree-sitter"; repo = "tree-sitter-agda"; - rev = "80ea622cf952a0059e168e5c92a798b2f1925652"; - hash = "sha256-D63jvITL2RA8yg/TBSi6GsOxwLKzSHibbm3hwIKzesU="; + rev = "c21c3a0f996363ed17b8ac99d827fe5a4821f217"; + hash = "sha256-EV0J38zcfSHaBqzu2Rcut1l20FpB+xneFRaizEX1DXg="; }; - meta.homepage = "https://github.com/AusCyberman/tree-sitter-agda"; + meta.homepage = "https://github.com/tree-sitter/tree-sitter-agda"; + }; + apex = buildGrammar { + language = "apex"; + version = "0.0.0+rev=e63bcdc"; + src = fetchFromGitHub { + owner = "aheber"; + repo = "tree-sitter-sfapex"; + rev = "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"; + hash = "sha256-7kfg8oqi39sExBuuKxmUgg5m9g22TW94rccas/7/5zE="; + }; + location = "apex"; + meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; arduino = buildGrammar { language = "arduino"; - version = "0.0.0+rev=a2aa2b3"; + version = "0.0.0+rev=db929fc"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-arduino"; - rev = "a2aa2b38301960822c5384cd10a07c2026e9d44e"; - hash = "sha256-VtY+SaWIkLHv48jewmU0k1AtPwqpthWbNkpTHtCS98Y="; + rev = "db929fc6822b9b9e1211678d508f187894ce0345"; + hash = "sha256-PXBXtsyqAIgykaU/LLIakokmmWqTdicsUG4A8hA28yU="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino"; }; @@ -49,23 +61,23 @@ }; awk = buildGrammar { language = "awk"; - version = "0.0.0+rev=2444262"; + version = "0.0.0+rev=374da90"; src = fetchFromGitHub { owner = "Beaglefoot"; repo = "tree-sitter-awk"; - rev = "244426241376b08d9531616290d657106ec8f7ff"; - hash = "sha256-rNQxGMgK9O1wpi1Rdhz/3I210w92AIPAJzEf0v/ICz8="; + rev = "374da90decaa60fea7a22490a77440ece6d4161d"; + hash = "sha256-gbA6VyhPh2lH9FqYKj9sL8uhuMizCmV0U42s5gvk7AE="; }; meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk"; }; bash = buildGrammar { language = "bash"; - version = "0.0.0+rev=8077be4"; + version = "0.0.0+rev=fd4e40d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-bash"; - rev = "8077be4c5504f2618f1280295bc4ae20a75988c1"; - hash = "sha256-i31QbosmsI1CUGAHOqeNGVeqoct13+i24CUtaGwdT7o="; + rev = "fd4e40dab883d6456da4d847de8321aee9c80805"; + hash = "sha256-dJUJGrpBWBLjcqiqxCnJ/MENwa2+uxAmQD71aYloxsw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-bash"; }; @@ -115,23 +127,23 @@ }; bitbake = buildGrammar { language = "bitbake"; - version = "0.0.0+rev=ed92abd"; + version = "0.0.0+rev=6cb07d9"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-bitbake"; - rev = "ed92abd7b67ab66a6fa3a747a0157f01d2e467d8"; - hash = "sha256-HfWUDYiBCmtlu5fFX287BSDHyCiD7gqIVFDTxH5APAE="; + rev = "6cb07d98f1cad180b8ea28965e59ee05023a5693"; + hash = "sha256-KfX0vzxHn4XVtmjOSPl31t17e+rSEoSacjAFQCl4+Ik="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-bitbake"; }; blueprint = buildGrammar { language = "blueprint"; - version = "0.0.0+rev=7f1a5df"; + version = "0.0.0+rev=863cea9"; src = fetchFromGitLab { owner = "gabmus"; repo = "tree-sitter-blueprint"; - rev = "7f1a5df44861291d6951b6b2146a9fef4c226e14"; - hash = "sha256-ihbcrDRMA+jGs7ZmDU1j9PwTEYY6SyMhC0vgmh1Om6Y="; + rev = "863cea9f83ad5637300478e0559262f1e791684b"; + hash = "sha256-QbkwdqH4Q+bqsp7XawUNXR45ROxfpMf+goCBFTw07I4="; }; meta.homepage = "https://gitlab.com/gabmus/tree-sitter-blueprint.git"; }; @@ -225,12 +237,12 @@ }; commonlisp = buildGrammar { language = "commonlisp"; - version = "0.0.0+rev=338db38"; + version = "0.0.0+rev=5153dbb"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-commonlisp"; - rev = "338db38330f0d25cba8e2c6428240ebc5e020264"; - hash = "sha256-mTBxnj/kqrHx8q7cAKTjfD0FOyVKjDub01Y50DXXjg0="; + rev = "5153dbbc70e4cc2324320c1bdae020d31079c7c0"; + hash = "sha256-0eC2cm/cP9BLfNKsubJd4S4BHF2nJdx/OCNJNC4ur6Q="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-commonlisp"; }; @@ -280,46 +292,46 @@ }; css = buildGrammar { language = "css"; - version = "0.0.0+rev=5f2c94b"; + version = "0.0.0+rev=fec7d37"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-css"; - rev = "5f2c94b897601b4029fedcce7db4c6d76ce8a128"; - hash = "sha256-HBCxnetErHqhSJeEIHFTaSqt8aJgJ4+OOgw8p+NDVDo="; + rev = "fec7d3757ab8f46a0ffe298be99b16ad5b9fa229"; + hash = "sha256-f3+pvJtULuJ6SHcmrMYyvreSAeEsq3L2+5V3dhloaj8="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-css"; }; csv = buildGrammar { language = "csv"; - version = "0.0.0+rev=f1d35df"; + version = "0.0.0+rev=6c19574"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-csv"; - rev = "f1d35df780976721d3cd38f0b16538dd31f87a23"; - hash = "sha256-t4uzc1VwJzS4qj0D1wolUvUNuc5OzC4L4RnLpYh+TXo="; + rev = "6c1957405bd6f7751b050f61367f1094fab91444"; + hash = "sha256-ISG+FgauEfuH5+uCxQWA1h9/HTaWR3eJcn+k2c51dYs="; }; location = "csv"; meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; }; cuda = buildGrammar { language = "cuda"; - version = "0.0.0+rev=f00c914"; + version = "0.0.0+rev=275cfb9"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-cuda"; - rev = "f00c91430124797e798cbf28e09075d7d192938a"; - hash = "sha256-9Jx6O4yfIrbCLTEPgpoZZ+3yxhi2r0MwrbiHCUexa60="; + rev = "275cfb95013b88382e11490aef1e7c9b17a95ef7"; + hash = "sha256-3sb9YLPRPjafSLGvyjLSuu+vqvolF63CI0MWZzvEGJw="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda"; }; cue = buildGrammar { language = "cue"; - version = "0.0.0+rev=0deecf4"; + version = "0.0.0+rev=2df92e6"; src = fetchFromGitHub { owner = "eonpatapon"; repo = "tree-sitter-cue"; - rev = "0deecf48944aa54bb73e5383ba8acfbf9f2c44b4"; - hash = "sha256-myHuYl3JfJ/JvVKM9toprsZ+RJ7L2G0LpzcNTmPTfHE="; + rev = "2df92e6755337e9234ad18ffef37f35d95e2ba9d"; + hash = "sha256-RsWbGMC2RXfZlZnkXJclMwiGecZ8Sc1OPkG+mmE5r6Q="; }; meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue"; }; @@ -337,23 +349,23 @@ }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=e398400"; + version = "0.0.0+rev=7e447dc"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "e398400a0b785af3cf571f5a57eccab242f0cdf9"; - hash = "sha256-+DFqJFR5raOnNG1oyGfO+tzpBXYBk0BBc8GbEkpEBhU="; + rev = "7e447dc18a2d293498670fb5ea16138648c883e5"; + hash = "sha256-BCWtpTgEv/3ahiflK3wHmnhHjTmtmvJxHGo2X7FggsE="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; devicetree = buildGrammar { language = "devicetree"; - version = "0.0.0+rev=d2cc332"; + version = "0.0.0+rev=cc26cbf"; src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; - rev = "d2cc332aeb814ea40e1e34ed6b9446324b32612a"; - hash = "sha256-iDiG6pNfALxy7nKyjuHfI9HW5/KElW/6zYguPaiMrzY="; + rev = "cc26cbf2121a27eaa72a05a795ce38aba4e0f86e"; + hash = "sha256-r23ycLCR79Ow4eI8rK03B3M1loU8/7K8dDrqBIPSAS0="; }; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; @@ -381,12 +393,12 @@ }; dockerfile = buildGrammar { language = "dockerfile"; - version = "0.0.0+rev=c0a9d69"; + version = "0.0.0+rev=1800d5a"; src = fetchFromGitHub { owner = "camdencheek"; repo = "tree-sitter-dockerfile"; - rev = "c0a9d694d9bf8ab79a919f5f9c7bc9c169caf321"; - hash = "sha256-dNrLw9E3I3LqQUqYx+YUBZTlSoAp/qoOf6+RL7Lv3ew="; + rev = "1800d5a06789797065ba5e7d80712b6bbf5483d7"; + hash = "sha256-qt626fHCZkHkl8yrEtDbJ+l7wwmU0XMcP0oPwrCYNgI="; }; meta.homepage = "https://github.com/camdencheek/tree-sitter-dockerfile"; }; @@ -401,6 +413,17 @@ }; meta.homepage = "https://github.com/rydesun/tree-sitter-dot"; }; + doxygen = buildGrammar { + language = "doxygen"; + version = "0.0.0+rev=a750758"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-doxygen"; + rev = "a750758da90955c86fcc22fcbb6fa44a7d009865"; + hash = "sha256-/4yBu5S9bQhxGO9JcNZukn+xpfzfaQQRLqVuDHgMYd0="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-doxygen"; + }; dtd = buildGrammar { language = "dtd"; version = "0.0.0+rev=9deacbf"; @@ -425,6 +448,17 @@ location = "crates/tree-sitter-ebnf"; meta.homepage = "https://github.com/RubixDev/ebnf"; }; + eds = buildGrammar { + language = "eds"; + version = "0.0.0+rev=fde6202"; + src = fetchFromGitHub { + owner = "uyha"; + repo = "tree-sitter-eds"; + rev = "fde62029d4c715562230070b9af51a9500c2ce10"; + hash = "sha256-E+VDOAnmbyUXzwhu+j2DXXBpuiI/d9gZdGsikAboLP4="; + }; + meta.homepage = "https://github.com/uyha/tree-sitter-eds"; + }; eex = buildGrammar { language = "eex"; version = "0.0.0+rev=f742f2f"; @@ -449,12 +483,12 @@ }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=b075803"; + version = "0.0.0+rev=0694058"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "b075803c445191af3cf7dbfdc84efef5f5bbc0f5"; - hash = "sha256-KtijU8ZODsqcNZc4Roh0AILaBWFs+D1cnSUfwQlEx84="; + rev = "0694058bf0555adbf5f700ce4868d18e463cb824"; + hash = "sha256-xalcXMXRHcpwhKLMF6p9y5lzC0ek/ljRq2Vnb1VwXBo="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -493,12 +527,12 @@ }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=7aa24fe"; + version = "0.0.0+rev=4a0ec79"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "7aa24fe8616072fc1a659f72d5b60bd8c01fb5cc"; - hash = "sha256-7rhwMBq5u5bVjyCE4j3f5tzY+9jL80Xd5hgkJjlqSr8="; + rev = "4a0ec79b7eb7671efe935cd97967430c34598c7d"; + hash = "sha256-q1V5lJsSQyx7ji4T+leIfSH9wAZRHW0XeLnY3Rc9WWI="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -546,14 +580,25 @@ }; meta.homepage = "https://github.com/FoamScience/tree-sitter-foam"; }; + forth = buildGrammar { + language = "forth"; + version = "0.0.0+rev=e7d1f8a"; + src = fetchFromGitHub { + owner = "AlexanderBrevig"; + repo = "tree-sitter-forth"; + rev = "e7d1f8a351fd5e95d9a89a8e87878c49ca14a5b0"; + hash = "sha256-AoV/DoQl2j4U0evWrM7ke544sei8VpdednWojwbhicU="; + }; + meta.homepage = "https://github.com/AlexanderBrevig/tree-sitter-forth"; + }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=6828cf3"; + version = "0.0.0+rev=f73d473"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "6828cf3629addb1706bdbbd33491e95f12b7042c"; - hash = "sha256-/DoXmcNmHvgWvYt4IkHJoDp46xgoHMp+cw1jYEcQCHI="; + rev = "f73d473e3530862dee7cbb38520f28824e7804f6"; + hash = "sha256-K9CnLhDKiWTxVM5OBZ80psV2oFDnlTgd+DDoP39ufds="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -603,12 +648,12 @@ }; git_config = buildGrammar { language = "git_config"; - version = "0.0.0+rev=a01b498"; + version = "0.0.0+rev=9c2a1b7"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-config"; - rev = "a01b498b25003d97a5f93b0da0e6f28307454347"; - hash = "sha256-9gLmao4zmDYj7uxrngjMa4AG9yIkKyptgaCBcL4GZYA="; + rev = "9c2a1b7894e6d9eedfe99805b829b4ecd871375e"; + hash = "sha256-O0w0BhhPPwhnKfniAFSPMWfBsZUTrijifAsmFiAncWg="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-config"; }; @@ -658,12 +703,12 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=8302c98"; + version = "0.0.0+rev=32c8f1e"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "8302c98ed78128b22f946fadefaf4af5ba5d5850"; - hash = "sha256-rWNReuod+P7/Wq+zJoJNo9tWLLpo9Xu7B5MYxjWdp0I="; + rev = "32c8f1e32aee036583ca09e7e6e4ea881852b42c"; + hash = "sha256-tAYlenGQM+TK8AR8RtyDULBgWjAXgHx13/lrhNAZVhs="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; @@ -680,12 +725,12 @@ }; glsl = buildGrammar { language = "glsl"; - version = "0.0.0+rev=4780c2b"; + version = "0.0.0+rev=ec6100d"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-glsl"; - rev = "4780c2b689a5a5bd0ccfd78403510e9cf4a0f2fc"; - hash = "sha256-lbdQSqLtjM1AtdmlAebCH0CewYPENIQHb7oyXNuUM6U="; + rev = "ec6100d2bdf22363ca8a711a212f2144ea49233f"; + hash = "sha256-QFsOq/1GH40XgnBT9V3Eb7aQabtBGOtxHp65FdugOz8="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl"; }; @@ -746,12 +791,12 @@ }; gpg = buildGrammar { language = "gpg"; - version = "0.0.0+rev=c44ce76"; + version = "0.0.0+rev=9c26b66"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-gpg-config"; - rev = "c44ce76960114352dd00728b835ceef02e0506b8"; - hash = "sha256-EDkmwHzRwf3x5LMsnOnhj+AbYLKF3dy/t4sGxuIWnYg="; + rev = "9c26b66d6bca0bd0520269e98241709806561bd5"; + hash = "sha256-OybtJVKiQYpftPA+jMyOjswxtkLHvqqyLbmZkKkBFZc="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-gpg-config"; }; @@ -779,12 +824,12 @@ }; hack = buildGrammar { language = "hack"; - version = "0.0.0+rev=2887d39"; + version = "0.0.0+rev=fca1e29"; src = fetchFromGitHub { owner = "slackhq"; repo = "tree-sitter-hack"; - rev = "2887d3927c5fadebfd71c604922d0c59748e9901"; - hash = "sha256-rScvFdoyv0odnAcoKhS+iBaBziV/uaKJa51zPnxMBFQ="; + rev = "fca1e294f6dce8ec5659233a6a21f5bd0ed5b4f2"; + hash = "sha256-XTcsqCvlwbAAi7/TXrYX8wT56Ie+0OW5+eNRMH7XNyk="; }; meta.homepage = "https://github.com/slackhq/tree-sitter-hack"; }; @@ -801,23 +846,23 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=9970682"; + version = "0.0.0+rev=d7ac98f"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-haskell"; - rev = "99706824b92f162d4e0f47c7e930bbccb367276e"; - hash = "sha256-JJvXkunDFRjWoXipxl1o2P+lRIDa4kw/Ys3LUu3piIY="; + rev = "d7ac98f49e3ed7e17541256fe3881a967d7ffdd3"; + hash = "sha256-XEfZSNnvF2BMOWwTfk6GXSnSpbKVfAYk7I3XbO1tIBg="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-haskell"; }; haskell_persistent = buildGrammar { language = "haskell_persistent"; - version = "0.0.0+rev=58a6ccf"; + version = "0.0.0+rev=577259b"; src = fetchFromGitHub { owner = "MercuryTechnologies"; repo = "tree-sitter-haskell-persistent"; - rev = "58a6ccfd56d9f1de8fb9f77e6c42151f8f0d0f3d"; - hash = "sha256-p4Anm/xeG/d7nYBPDABcdDih/a+0rMjwtVUJru7m9QY="; + rev = "577259b4068b2c281c9ebf94c109bd50a74d5857"; + hash = "sha256-ASdkBQ57GfpLF8NXgDzJMB/Marz9p1q03TZkwMgF/eQ="; }; meta.homepage = "https://github.com/MercuryTechnologies/tree-sitter-haskell-persistent"; }; @@ -834,12 +879,12 @@ }; heex = buildGrammar { language = "heex"; - version = "0.0.0+rev=9bf4ae4"; + version = "0.0.0+rev=4a36c9a"; src = fetchFromGitHub { owner = "connorlay"; repo = "tree-sitter-heex"; - rev = "9bf4ae444a8779839ecbca3b6b896dee426b10ae"; - hash = "sha256-ghknZmki1eBSzxY9omZN6wgLpvoJEYXBpvkVxxqLiIc="; + rev = "4a36c9a388505180da6ee0eda1d8afb8c83481c8"; + hash = "sha256-6gdAxNI81jbN8XZALRw31kFQRZg8ge/O7QRprLZpWOg="; }; meta.homepage = "https://github.com/connorlay/tree-sitter-heex"; }; @@ -856,12 +901,12 @@ }; hlsl = buildGrammar { language = "hlsl"; - version = "0.0.0+rev=45e60a6"; + version = "0.0.0+rev=d698c21"; src = fetchFromGitHub { owner = "theHamsta"; repo = "tree-sitter-hlsl"; - rev = "45e60a69b4dac922d81474b5d6fa88b4e5387b21"; - hash = "sha256-qQqgiFJAX3hT1ecvKJ6fssWvtkT8i3IdRVBt6L0coI4="; + rev = "d698c21dbfcfa1df84cdaaf9dba32cba1e4f92b4"; + hash = "sha256-oFpoErrhr83yG5c3IksjL/XjmsCrZGTP6+Sfu5fvOZM="; }; meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl"; }; @@ -878,12 +923,12 @@ }; hoon = buildGrammar { language = "hoon"; - version = "0.0.0+rev=900a272"; + version = "0.0.0+rev=1d5df35"; src = fetchFromGitHub { owner = "urbit-pilled"; repo = "tree-sitter-hoon"; - rev = "900a272271cc2fb78f24aa7b5a1e21ed36bb1d39"; - hash = "sha256-g2jBCZjsEsWG+LCAGj7b/t5mOET5/mVN39+/HDRUBCk="; + rev = "1d5df35af3e0afe592832a67b9fb3feeeba1f7b6"; + hash = "sha256-2xrpyA5JCibGxaJkRmcgNreFHcCvJaYkHThSc6KAV1U="; }; meta.homepage = "https://github.com/urbit-pilled/tree-sitter-hoon"; }; @@ -922,12 +967,12 @@ }; hurl = buildGrammar { language = "hurl"; - version = "0.0.0+rev=0eca909"; + version = "0.0.0+rev=cd1a0ad"; src = fetchFromGitHub { owner = "pfeiferj"; repo = "tree-sitter-hurl"; - rev = "0eca909c8338364992e04c4862ac6afc5342cbb8"; - hash = "sha256-6FiLZKnZ2DMS1Gcaelw5bJxflfZSyPzGV1pJfvO1pcM="; + rev = "cd1a0ada92cc73dd0f4d7eedc162be4ded758591"; + hash = "sha256-vu/zK/AILJXPn18TmQSKoap7BtUOwhCxAX9v8ekVrIo="; }; meta.homepage = "https://github.com/pfeiferj/tree-sitter-hurl"; }; @@ -966,23 +1011,23 @@ }; java = buildGrammar { language = "java"; - version = "0.0.0+rev=0b3f9cf"; + version = "0.0.0+rev=83044af"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-java"; - rev = "0b3f9cfe10a973df0530533313fdbef6c2c92bfa"; - hash = "sha256-dSRXjHfJOCrwm6HXlEz+prlKH7k+5B99S8vWyH49KzQ="; + rev = "83044af4950e9f1adb46a20f616d10934930ce7e"; + hash = "sha256-i3j55vAQV5TaMR7IsUkh0OrLCP95Xos0UCI0SoY5phI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-java"; }; javascript = buildGrammar { language = "javascript"; - version = "0.0.0+rev=c69aaba"; + version = "0.0.0+rev=f1e5a09"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-javascript"; - rev = "c69aabab53609d00e8e198ab902e4fde4b8e449f"; - hash = "sha256-6cyKT4yASueb+nNj8EqZbF7LZYZasMOYvq5ki2a0zQk="; + rev = "f1e5a09b8d02f8209a68249c93f0ad647b228e6e"; + hash = "sha256-VbK2asd1CavcBYGia30MomQh+KOgKgz5ax10V6nEVEs="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-javascript"; }; @@ -999,12 +1044,12 @@ }; jsdoc = buildGrammar { language = "jsdoc"; - version = "0.0.0+rev=189a6a4"; + version = "0.0.0+rev=d01984d"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-jsdoc"; - rev = "189a6a4829beb9cdbe837260653b4a3dfb0cc3db"; - hash = "sha256-Zhl9mEpJE9Qy3MVScE2JK4i8OFZUXl5KMhKMS4bw+mI="; + rev = "d01984de49927c979b46ea5c01b78c8ddd79baf9"; + hash = "sha256-O7iDoOlXi+HLesS/sKcYfb+EJLR6gfRkwA657aRRg4c="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-jsdoc"; }; @@ -1054,15 +1099,26 @@ }; julia = buildGrammar { language = "julia"; - version = "0.0.0+rev=ab0f70c"; + version = "0.0.0+rev=0c088d1"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-julia"; - rev = "ab0f70c0a919d38b41822305a8ca80e527c94e4f"; - hash = "sha256-+rD3kL3nSzdsj/P6pWf5i+XQugZsxUc0vz6JZIk/lr8="; + rev = "0c088d1ad270f02c4e84189247ac7001e86fe342"; + hash = "sha256-WEmuLNUoOyWkcDlVcf8ucdraPEi+gClAw8z9Gx51gpo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia"; }; + kconfig = buildGrammar { + language = "kconfig"; + version = "0.0.0+rev=aaba009"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-kconfig"; + rev = "aaba009ba9d7881f0f81742da588ae70b572316d"; + hash = "sha256-yjw1fr4utQHIrP/CA4df2adhpm+xrkvobZ5ZF5tjjEI="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-kconfig"; + }; kdl = buildGrammar { language = "kdl"; version = "0.0.0+rev=e180e05"; @@ -1087,12 +1143,12 @@ }; lalrpop = buildGrammar { language = "lalrpop"; - version = "0.0.0+rev=b7431e4"; + version = "0.0.0+rev=06ae1b6"; src = fetchFromGitHub { owner = "traxys"; repo = "tree-sitter-lalrpop"; - rev = "b7431e4b64183a5d0d094895a4cd5daf51ed3103"; - hash = "sha256-P7A/MFmnCHq5rn+QSogbRD3joT7OxC+F9v2oMQ+DZBE="; + rev = "06ae1b6c26e23c77c7fb86d51dddad62b42e66b0"; + hash = "sha256-kYJDTT4gsiRhOzAuRdLY5IxtnqNDBABbxgtAMm9L9qw="; }; meta.homepage = "https://github.com/traxys/tree-sitter-lalrpop"; }; @@ -1120,34 +1176,34 @@ }; llvm = buildGrammar { language = "llvm"; - version = "0.0.0+rev=d47c95d"; + version = "0.0.0+rev=1b96e58"; src = fetchFromGitHub { owner = "benwilliamgraham"; repo = "tree-sitter-llvm"; - rev = "d47c95d78ef0e7495a74d214dd6fcddf6e402dfc"; - hash = "sha256-CK7f0qSAsec2cuQElXLFRQ5uiQLGCyEpNIKTIDwbBrU="; + rev = "1b96e58faf558ce057d4dc664b904528aee743cb"; + hash = "sha256-9OCiD7Hotl7EYoggX0lArwFvK2OZisBUsX7xv8+Ig+o="; }; meta.homepage = "https://github.com/benwilliamgraham/tree-sitter-llvm"; }; lua = buildGrammar { language = "lua"; - version = "0.0.0+rev=88e4464"; + version = "0.0.0+rev=9668709"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "tree-sitter-lua"; - rev = "88e446476a1e97a8724dff7a23e2d709855077f2"; - hash = "sha256-w+WVQHPiS/xyRz0obdJoUHZ7QzIDAvgtSzmE98yDORY="; + rev = "9668709211b2e683f27f414454a8b51bf0a6bda1"; + hash = "sha256-5t5w8KqbefInNbA12/jpNzmky/uOUhsLjKdEqpl1GEc="; }; meta.homepage = "https://github.com/MunifTanjim/tree-sitter-lua"; }; luadoc = buildGrammar { language = "luadoc"; - version = "0.0.0+rev=8981072"; + version = "0.0.0+rev=990926b"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-luadoc"; - rev = "8981072676ec8bd74def6134be4f883655f7c082"; - hash = "sha256-HRHZDX0/duvQza0SJwCI/uKO0d12VYtvpuYB+KCkfow="; + rev = "990926b13488a4bc0fc0804fc0f8400b5b0a1fb4"; + hash = "sha256-LU8zF6gM8tlwfbdUy/tlg5ubhyFKUrwF/vU8NPXlOGQ="; }; meta.homepage = "https://github.com/amaanq/tree-sitter-luadoc"; }; @@ -1221,12 +1277,12 @@ }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=c8723b3"; + version = "0.0.0+rev=6071891"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "c8723b33970deda54257e640779714fb181d4d5f"; - hash = "sha256-iSpOB5hnd7iKmuhAzAYYbFgP5MiiD57yvAHHG8PS9HA="; + rev = "6071891a8c39600203eba20513666cf93b4d650a"; + hash = "sha256-H6eCCZtE1MbSpHyvdcVbG3piBijM499imiNDIhCoTJA="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1277,12 +1333,12 @@ }; nickel = buildGrammar { language = "nickel"; - version = "0.0.0+rev=e1d9337"; + version = "0.0.0+rev=b759233"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "e1d9337864d209898a08c26b8cd4c2dd14c15148"; - hash = "sha256-RcVBptlJ4lYwdDo64pwzxx5z90yqS96Dhyuj4VZWOiM="; + rev = "b759233581fd8bae239e905c67a9ba453205da78"; + hash = "sha256-4OrdtlpSsHTY/BmxRr0cKwTFfUSv+KN9IYDjfpdGIfg="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; @@ -1319,6 +1375,17 @@ }; meta.homepage = "https://github.com/nvim-neorg/tree-sitter-norg"; }; + nqc = buildGrammar { + language = "nqc"; + version = "0.0.0+rev=14e6da1"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-nqc"; + rev = "14e6da1627aaef21d2b2aa0c37d04269766dcc1d"; + hash = "sha256-Gf6410cWLENCgI1uIBVBl4RnRuVCHkWkn6sxusmI6j4="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-nqc"; + }; objc = buildGrammar { language = "objc"; version = "0.0.0+rev=62e61b6"; @@ -1434,12 +1501,12 @@ }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=ce2c73a"; + version = "0.0.0+rev=a05c611"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "ce2c73a8d84b5648e8792698dc9fd955e5f6a906"; - hash = "sha256-HZOIz9KiZ13aqeQtCeQln56RRRPUSgT7ulPJs54fzJc="; + rev = "a05c6112a1dfdd9e586cb275700931e68d3c7c85"; + hash = "sha256-9t+9TnyBVkQVrxHhCzoBkfIjHoKw3HW4gTJjNv+DpPw="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; }; @@ -1544,12 +1611,12 @@ }; psv = buildGrammar { language = "psv"; - version = "0.0.0+rev=f1d35df"; + version = "0.0.0+rev=6c19574"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-csv"; - rev = "f1d35df780976721d3cd38f0b16538dd31f87a23"; - hash = "sha256-t4uzc1VwJzS4qj0D1wolUvUNuc5OzC4L4RnLpYh+TXo="; + rev = "6c1957405bd6f7751b050f61367f1094fab91444"; + hash = "sha256-ISG+FgauEfuH5+uCxQWA1h9/HTaWR3eJcn+k2c51dYs="; }; location = "psv"; meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; @@ -1589,12 +1656,12 @@ }; python = buildGrammar { language = "python"; - version = "0.0.0+rev=c01fb4e"; + version = "0.0.0+rev=a901729"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-python"; - rev = "c01fb4e38587e959b9058b8cd34b9e6a3068c827"; - hash = "sha256-cV/QwvEQkIQcgo0Pm+3pUH2LhpYOPsuWMgjXMa8dv+s="; + rev = "a901729099257aac932d79c60adb5e8a53fa7e6c"; + hash = "sha256-gRhD3M1DkmwYQDDnyRq6QMTWUJUY0vbetGnN+pBTd84="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-python"; }; @@ -1655,12 +1722,12 @@ }; racket = buildGrammar { language = "racket"; - version = "0.0.0+rev=7dc4fb6"; + version = "0.0.0+rev=e4ba1a9"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "7dc4fb60390218b09bc351062eeede7dcdbb4d9f"; - hash = "sha256-80BJ12gstc2+SuPqwziOClOzeH9BJflQ39JSqUmutkQ="; + rev = "e4ba1a9674a3b4dd7905d04f194ae6f8331be342"; + hash = "sha256-4+TRol2i6ibuXqBr6O8jI/4MZq8hnf09eVBtPqaKp8s="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -1675,6 +1742,17 @@ }; meta.homepage = "https://github.com/Fymyte/tree-sitter-rasi"; }; + re2c = buildGrammar { + language = "re2c"; + version = "0.0.0+rev=47aa19c"; + src = fetchFromGitHub { + owner = "amaanq"; + repo = "tree-sitter-re2c"; + rev = "47aa19cf5f7aba2ed30e2b377f7172df76e819a6"; + hash = "sha256-Mwnm8kN0xfAdGG00aUYrqPU0zyWbc6QH9Zlgb4on+do="; + }; + meta.homepage = "https://github.com/amaanq/tree-sitter-re2c"; + }; regex = buildGrammar { language = "regex"; version = "0.0.0+rev=2354482"; @@ -1699,12 +1777,12 @@ }; requirements = buildGrammar { language = "requirements"; - version = "0.0.0+rev=56ddb4d"; + version = "0.0.0+rev=eda424e"; src = fetchFromGitHub { owner = "ObserverOfTime"; repo = "tree-sitter-requirements"; - rev = "56ddb4dad2ea0761d20c0995a0de2990caa350b5"; - hash = "sha256-0q7cyv/a9gZG00tyBcF2i9TUcj3TqAi89CWjbzszD7U="; + rev = "eda424eade0f2afbafbf0c89d18c77818fa19273"; + hash = "sha256-cZjj17316Cnz/A+7K3f81H/iedrlu0IDTdDLkXThcnQ="; }; meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements"; }; @@ -1765,23 +1843,23 @@ }; rust = buildGrammar { language = "rust"; - version = "0.0.0+rev=0a70e15"; + version = "0.0.0+rev=48e0533"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-rust"; - rev = "0a70e15da977489d954c219af9b50b8a722630ee"; - hash = "sha256-CrNY+4nsYQOzzVR7X+yuo4+5s6K3VHtVQyWfledKJ1U="; + rev = "48e053397b587de97790b055a1097b7c8a4ef846"; + hash = "sha256-ht0l1a3esvBbVHNbUosItmqxwL7mDp+QyhIU6XTUiEk="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-rust"; }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=3a67773"; + version = "0.0.0+rev=1b4c2fa"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "3a67773e205eb43c993cc5d43f633ddb79eb1653"; - hash = "sha256-S5vXtvdpQMh8Beacpm07zRaHoJCa+ZiH2j5IB6idOng="; + rev = "1b4c2fa5c55c5fd83cbb0d2f818f916aba221a42"; + hash = "sha256-93uWT5KMqCUwntdL5U2Vc71ci+uP3OdP9y6kVZ3bYLo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -1799,12 +1877,12 @@ }; scheme = buildGrammar { language = "scheme"; - version = "0.0.0+rev=af3af6c"; + version = "0.0.0+rev=85b6188"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-scheme"; - rev = "af3af6c9356b936f8a515a1e449c32e804c2b1a8"; - hash = "sha256-s9AoMNYnKvzr969aujgwUaVn4WoRaZ5snfFEF73KUGA="; + rev = "85b6188fb77c03dfb01d13e58e2844450506860c"; + hash = "sha256-v+iQpeAeySKPgMu5IQ8vNnUSc2duX1vYvO3qqK1/Pmc="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-scheme"; }; @@ -1852,6 +1930,17 @@ }; meta.homepage = "https://github.com/indoorvivants/tree-sitter-smithy"; }; + snakemake = buildGrammar { + language = "snakemake"; + version = "0.0.0+rev=65a6c3b"; + src = fetchFromGitHub { + owner = "osthomas"; + repo = "tree-sitter-snakemake"; + rev = "65a6c3b4671877821082164da0a310851b211953"; + hash = "sha256-NfbRqT3wB6gncrbL/Kx2Qtk7k5lXK2KwdQ4aOV0Acx8="; + }; + meta.homepage = "https://github.com/osthomas/tree-sitter-snakemake"; + }; solidity = buildGrammar { language = "solidity"; version = "0.0.0+rev=1680203"; @@ -1863,6 +1952,30 @@ }; meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity"; }; + soql = buildGrammar { + language = "soql"; + version = "0.0.0+rev=e63bcdc"; + src = fetchFromGitHub { + owner = "aheber"; + repo = "tree-sitter-sfapex"; + rev = "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"; + hash = "sha256-7kfg8oqi39sExBuuKxmUgg5m9g22TW94rccas/7/5zE="; + }; + location = "soql"; + meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; + }; + sosl = buildGrammar { + language = "sosl"; + version = "0.0.0+rev=e63bcdc"; + src = fetchFromGitHub { + owner = "aheber"; + repo = "tree-sitter-sfapex"; + rev = "e63bcdcc26ae808b3fe79dfb8fa61bebdb95bda4"; + hash = "sha256-7kfg8oqi39sExBuuKxmUgg5m9g22TW94rccas/7/5zE="; + }; + location = "sosl"; + meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; + }; sparql = buildGrammar { language = "sparql"; version = "0.0.0+rev=05f949d"; @@ -1876,12 +1989,12 @@ }; sql = buildGrammar { language = "sql"; - version = "0.0.0+rev=3dfa1b1"; + version = "0.0.0+rev=39750c4"; src = fetchFromGitHub { owner = "derekstride"; repo = "tree-sitter-sql"; - rev = "3dfa1b1fafac51e3ffc39064eafb26b5111861a2"; - hash = "sha256-sDXYfILv+7/fGIaWp4SOfsjZ67Mi3UPnpt9NEapKZ+M="; + rev = "39750c48bf9ad63bcc1399554355b0aa0aaa1c33"; + hash = "sha256-33GpCN9qdCvCcYvE60HMzFM2QzUDbf2QxJDZ6L+q27Y="; }; meta.homepage = "https://github.com/derekstride/tree-sitter-sql"; }; @@ -1896,6 +2009,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-squirrel"; }; + ssh_config = buildGrammar { + language = "ssh_config"; + version = "0.0.0+rev=e400863"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-ssh-config"; + rev = "e4008633536870f3fed3198c96503250af0b0a12"; + hash = "sha256-jPEJQgFys+gwwLiIXmhHvrsT9ai0R7wXJVxRQANACkI="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-ssh-config"; + }; starlark = buildGrammar { language = "starlark"; version = "0.0.0+rev=c45ce2b"; @@ -1907,6 +2031,17 @@ }; meta.homepage = "https://github.com/amaanq/tree-sitter-starlark"; }; + strace = buildGrammar { + language = "strace"; + version = "0.0.0+rev=0dc85e4"; + src = fetchFromGitHub { + owner = "sigmaSd"; + repo = "tree-sitter-strace"; + rev = "0dc85e4cfcd0cc4b33f855ddb782d81d1297bf6e"; + hash = "sha256-JK5+HlCELcBD2Af4uNNoBMYecDGnwcoTqdZr5mKBq+Q="; + }; + meta.homepage = "https://github.com/sigmaSd/tree-sitter-strace"; + }; supercollider = buildGrammar { language = "supercollider"; version = "0.0.0+rev=3b35bd0"; @@ -1942,12 +2077,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=29541ac"; + version = "0.0.0+rev=10eb01d"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "29541ac9bbe2090de75d0b1e70360b85bbda1fef"; - hash = "sha256-jT7SdhxX5AlZP33oH7NISV+HvJwQwsXMXDWzHorgnIc="; + rev = "10eb01d29827f24b1271672e89790661d94da9e1"; + hash = "sha256-5oHc2mGxOuvFQ1h1FEK0oJ7PYnKayoJSVHeuYleVE8o="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -1976,12 +2111,12 @@ }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=6da5e3c"; + version = "0.0.0+rev=c544082"; src = fetchFromGitLab { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "6da5e3cbabd376b566d04282005e52ffe67ef74a"; - hash = "sha256-BRDlNZolMurXpUqnFbS+7ADTcuBthGDYVr6wBn9PIr4="; + rev = "c544082904fd1d27da5493857bd3fc278bae2a1a"; + hash = "sha256-0iH5zEe5/BD2Wi4jb67grCXafmHhJkSD/NkjqGZZ3pY="; }; meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git"; }; @@ -2020,6 +2155,17 @@ location = "dialects/terraform"; meta.homepage = "https://github.com/MichaHoffmann/tree-sitter-hcl"; }; + textproto = buildGrammar { + language = "textproto"; + version = "0.0.0+rev=8dacf02"; + src = fetchFromGitHub { + owner = "PorterAtGoogle"; + repo = "tree-sitter-textproto"; + rev = "8dacf02aa402892c91079f8577998ed5148c0496"; + hash = "sha256-MpQTrNjjNO2Bj5qR6ESwI9SZtJPmcS6ckqjAR0qaLx8="; + }; + meta.homepage = "https://github.com/PorterAtGoogle/tree-sitter-textproto"; + }; thrift = buildGrammar { language = "thrift"; version = "0.0.0+rev=d4deb1b"; @@ -2033,12 +2179,12 @@ }; tiger = buildGrammar { language = "tiger"; - version = "0.0.0+rev=4a09924"; + version = "0.0.0+rev=a7f11d9"; src = fetchFromGitHub { owner = "ambroisie"; repo = "tree-sitter-tiger"; - rev = "4a099243ed68a4fc72fdad8ea3ce57ec411ebfe3"; - hash = "sha256-y3bpfBPwvkFNMl1qZtlnpVhi5nnOqo0K9XGS2bCWPmY="; + rev = "a7f11d946b44244f71df41d2a78af0665d618dae"; + hash = "sha256-zGrbf5cCkgKGw+dQiEqUyHqj8Fu42MfAhEEADoC8DIA="; }; meta.homepage = "https://github.com/ambroisie/tree-sitter-tiger"; }; @@ -2077,12 +2223,12 @@ }; tsv = buildGrammar { language = "tsv"; - version = "0.0.0+rev=f1d35df"; + version = "0.0.0+rev=6c19574"; src = fetchFromGitHub { owner = "amaanq"; repo = "tree-sitter-csv"; - rev = "f1d35df780976721d3cd38f0b16538dd31f87a23"; - hash = "sha256-t4uzc1VwJzS4qj0D1wolUvUNuc5OzC4L4RnLpYh+TXo="; + rev = "6c1957405bd6f7751b050f61367f1094fab91444"; + hash = "sha256-ISG+FgauEfuH5+uCxQWA1h9/HTaWR3eJcn+k2c51dYs="; }; location = "tsv"; meta.homepage = "https://github.com/amaanq/tree-sitter-csv"; @@ -2144,6 +2290,18 @@ }; meta.homepage = "https://github.com/Philipp-M/tree-sitter-ungrammar"; }; + unison = buildGrammar { + language = "unison"; + version = "0.0.0+rev=694c8c0"; + src = fetchFromGitHub { + owner = "kylegoetz"; + repo = "tree-sitter-unison"; + rev = "694c8c0c79f8d1b80d497401acf4d1b77bfb004a"; + hash = "sha256-g8g/YUKabxWwN+w0akMYMu0fFOkUHGAN44CVDOfPqI4="; + }; + generate = true; + meta.homepage = "https://github.com/kylegoetz/tree-sitter-unison"; + }; usd = buildGrammar { language = "usd"; version = "0.0.0+rev=718a6b3"; @@ -2202,12 +2360,12 @@ }; vhs = buildGrammar { language = "vhs"; - version = "0.0.0+rev=fec6e98"; + version = "0.0.0+rev=375b42e"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "tree-sitter-vhs"; - rev = "fec6e981b7795b68262ddf229d73d2aa03a89b9a"; - hash = "sha256-vGRmIFWUXSG3uDpKPcxALndV7gWiQ2nG4BOGL05oZ6U="; + rev = "375b42e9845f704dd491c17c7e37f7c972e0faf3"; + hash = "sha256-A9m0MNAINMbrNr3BYBU/WMtC5edXWCaxvcfCwDFe8p4="; }; meta.homepage = "https://github.com/charmbracelet/tree-sitter-vhs"; }; @@ -2268,12 +2426,12 @@ }; wing = buildGrammar { language = "wing"; - version = "0.0.0+rev=f30b02c"; + version = "0.0.0+rev=fac3f72"; src = fetchFromGitHub { owner = "winglang"; repo = "wing"; - rev = "f30b02c4bf363b797de39ae63375a4f357718ae9"; - hash = "sha256-562MgzH/hGvCBctNj34jXrsmwHXJt4Hxb2lsZ/IeN74="; + rev = "fac3f72d80d379fea61d1eca782cb99ac6d78b62"; + hash = "sha256-/PIqwqG5h2iFVzpTTlXOrAKEDNctcxRHIhGyv5jlkIw="; }; location = "libs/tree-sitter-wing"; generate = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py index bbacc6959c..37414b0735 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py @@ -7,8 +7,6 @@ from concurrent.futures import ThreadPoolExecutor from os import environ from os.path import dirname, join -lockfile = json.load(open(join(environ["NVIM_TREESITTER"], "lockfile.json"))) - configs = json.loads( subprocess.check_output( [ @@ -58,20 +56,26 @@ def generate_grammar(item): return generated -generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py +def update_grammars(lockfile: str): -{ buildGrammar, """ + generated_file = """# generated by pkgs/applications/editors/vim/plugins/nvim-treesitter/update.py -generated_file += subprocess.check_output(["nurl", "-Ls", ", "], text=True) + { buildGrammar, """ -generated_file += """ }: + generated_file += subprocess.check_output(["nurl", "-Ls", ", "], text=True) -{ -""" + generated_file += """ }: -for generated in ThreadPoolExecutor().map(generate_grammar, lockfile.items()): - generated_file += generated + { + """ + for generated in ThreadPoolExecutor().map(generate_grammar, lockfile.items()): + generated_file += generated + generated_file += "}\n" + generated_file += "}\n" -generated_file += "}\n" + open(join(dirname(__file__), "generated.nix"), "w").write(generated_file) -open(join(dirname(__file__), "generated.nix"), "w").write(generated_file) + +if __name__ == "__main__": + # TODO add lockfile + update_grammars() 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 68d1648bc7..bf3181f8fe 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -3,7 +3,7 @@ # nixpkgs functions , buildGoModule -, buildVimPluginFrom2Nix +, buildVimPlugin , fetchFromGitHub , fetchFromSourcehut , fetchpatch @@ -11,6 +11,8 @@ , substituteAll # Language dependencies +, fetchYarnDeps +, mkYarnModules , python3 , rustPlatform @@ -151,7 +153,7 @@ self: super: { }; # The GitHub repository returns 404, which breaks the update script - bitbake-vim = buildVimPluginFrom2Nix { + bitbake-vim = buildVimPlugin { pname = "bitbake.vim"; version = "2021-02-06"; src = fetchFromGitHub { @@ -163,6 +165,19 @@ self: super: { meta.homepage = "https://github.com/sblumentritt/bitbake.vim/"; }; + # The GitHub repository returns 404, which breaks the update script + vim-pony = buildVimPlugin { + pname = "vim-pony"; + version = "2018-07-27"; + src = fetchFromGitHub { + owner = "jakwings"; + repo = "vim-pony"; + rev = "b26f01a869000b73b80dceabd725d91bfe175b75"; + sha256 = "0if8g94m3xmpda80byfxs649w2is9ah1k8v3028nblan73zlc8x8"; + }; + meta.homepage = "https://github.com/jakwings/vim-pony/"; + }; + chadtree = super.chadtree.overrideAttrs { passthru.python3Dependencies = ps: with ps; [ pynvim-pp @@ -303,7 +318,7 @@ self: super: { dependencies = with self; [ nvim-cmp zsh ]; }; - coc-nginx = buildVimPluginFrom2Nix { + coc-nginx = buildVimPlugin { pname = "coc-nginx"; inherit (nodePackages."@yaegassy/coc-nginx") version meta; src = "${nodePackages."@yaegassy/coc-nginx"}/lib/node_modules/@yaegassy/coc-nginx"; @@ -551,7 +566,7 @@ self: super: { # Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim # plugin, since part of the fzf vim plugin is included in the main fzf # program. - fzfWrapper = buildVimPluginFrom2Nix { + fzfWrapper = buildVimPlugin { inherit (fzf) src version; pname = "fzf"; postInstall = '' @@ -592,7 +607,7 @@ self: super: { }; # https://hurl.dev/ - hurl = buildVimPluginFrom2Nix { + hurl = buildVimPlugin { pname = "hurl"; version = hurl.version; # dontUnpack = true; @@ -656,7 +671,7 @@ self: super: { ''; }; in - buildVimPluginFrom2Nix { + buildVimPlugin { pname = "LanguageClient-neovim"; inherit version; src = LanguageClient-neovim-src; @@ -705,7 +720,7 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }; - magma-nvim-goose = buildVimPluginFrom2Nix { + magma-nvim-goose = buildVimPlugin { pname = "magma-nvim-goose"; version = "2023-03-13"; src = fetchFromGitHub { @@ -730,8 +745,14 @@ self: super: { markdown-preview-nvim = let # We only need its dependencies `node-modules`. - nodeDep = nodePackages."markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim".overrideAttrs { - dontNpmInstall = true; + nodeDep = mkYarnModules rec { + inherit (super.markdown-preview-nvim) pname version; + packageJSON = ./markdown-preview-nvim/package.json; + yarnLock = "${super.markdown-preview-nvim.src}/yarn.lock"; + offlineCache = fetchYarnDeps { + inherit yarnLock; + hash = "sha256-kzc9jm6d9PJ07yiWfIOwqxOTAAydTpaLXVK6sEWM8gg="; + }; }; in super.markdown-preview-nvim.overrideAttrs { patches = [ @@ -741,7 +762,7 @@ self: super: { }) ]; postInstall = '' - ln -s ${nodeDep}/lib/node_modules/markdown-preview/node_modules $out/app + ln -s ${nodeDep}/node_modules $out/app ''; nativeBuildInputs = [ nodejs ]; @@ -759,7 +780,7 @@ self: super: { dependencies = with self; [ mason-nvim ]; }; - meson = buildVimPluginFrom2Nix { + meson = buildVimPlugin { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; meta.maintainers = with lib.maintainers; [ vcunat ]; @@ -777,7 +798,7 @@ self: super: { vimCommandCheck = "MinimapToggle"; }; - minsnip-nvim = buildVimPluginFrom2Nix { + minsnip-nvim = buildVimPlugin { pname = "minsnip.nvim"; version = "2022-01-04"; src = fetchFromGitHub { @@ -789,6 +810,10 @@ self: super: { meta.homepage = "https://github.com/jose-elias-alvarez/minsnip.nvim/"; }; + multicursors-nvim = super.multicursors-nvim.overrideAttrs { + dependencies = with self; [ nvim-treesitter hydra-nvim ]; + }; + ncm2 = super.ncm2.overrideAttrs { dependencies = with self; [ nvim-yarp ]; }; @@ -850,10 +875,18 @@ self: super: { dontBuild = true; }; + nvim-navbuddy = super.nvim-navbuddy.overrideAttrs { + dependencies = with self; [ nui-nvim nvim-lspconfig nvim-navic ]; + }; + vim-mediawiki-editor = super.vim-mediawiki-editor.overrideAttrs { passthru.python3Dependencies = [ python3.pkgs.mwclient ]; }; + nvim-navic = super.nvim-navic.overrideAttrs { + dependencies = with self; [ nvim-lspconfig ]; + }; + nvim-spectre = super.nvim-spectre.overrideAttrs { dependencies = with self; [ plenary-nvim ]; }; @@ -919,7 +952,7 @@ self: super: { inherit parinfer-rust; - phpactor = buildVimPluginFrom2Nix { + phpactor = buildVimPlugin { inherit (phpactor) pname src meta version; postPatch = '' substituteInPlace plugin/phpactor.vim \ @@ -966,7 +999,7 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-f14cGAGZFs4DG8FBKYDz1NY38TOuENW9Co2fywGc74E="; + cargoHash = "sha256-HdewCCraJ2jj2KAVnjzND+4O52jqfABonFU6ybWWAWY="; nativeBuildInputs = [ pkg-config ]; @@ -988,7 +1021,7 @@ self: super: { ''; }); - skim = buildVimPluginFrom2Nix { + skim = buildVimPlugin { pname = "skim"; inherit (skim) version; src = skim.vim; @@ -1028,7 +1061,7 @@ self: super: { doCheck = false; }; in - buildVimPluginFrom2Nix { + buildVimPlugin { pname = "sniprun"; inherit version src; @@ -1041,7 +1074,7 @@ self: super: { }; # The GitHub repository returns 404, which breaks the update script - Spacegray-vim = buildVimPluginFrom2Nix { + Spacegray-vim = buildVimPlugin { pname = "Spacegray.vim"; version = "2021-07-06"; src = fetchFromGitHub { @@ -1066,7 +1099,7 @@ self: super: { dependencies = with self; [ nvim-treesitter ]; }; - statix = buildVimPluginFrom2Nix rec { + statix = buildVimPlugin rec { inherit (statix) pname src meta; version = "0.1.0"; postPatch = '' @@ -1116,7 +1149,7 @@ self: super: { }; }; - taskwarrior = buildVimPluginFrom2Nix { + taskwarrior = buildVimPlugin { inherit (taskwarrior) version pname; src = "${taskwarrior.src}/scripts/vim"; }; @@ -1202,7 +1235,7 @@ self: super: { au BufNewFile,BufRead Tupfile,*.tup setf tup ''; in - buildVimPluginFrom2Nix { + buildVimPlugin { inherit (tup) pname version src; preInstall = '' mkdir -p vim-plugin/syntax vim-plugin/ftdetect @@ -1416,7 +1449,7 @@ self: super: { hexokinase = buildGoModule { name = "hexokinase"; src = old.src + "/hexokinase"; - vendorSha256 = null; + vendorHash = null; }; in '' @@ -1463,6 +1496,10 @@ self: super: { dependencies = with self; [ denops-vim ]; }; + vim-sensible = super.vim-sensible.overrideAttrs { + patches = [ ./patches/vim-sensible/fix-nix-store-path-regex.patch ]; + }; + vim-snipmate = super.vim-snipmate.overrideAttrs { dependencies = with self; [ vim-addon-mw-utils tlib_vim ]; }; @@ -1522,7 +1559,7 @@ self: super: { ''; }; - vim2nix = buildVimPluginFrom2Nix { + vim2nix = buildVimPlugin { pname = "vim2nix"; version = "1.0"; src = ./vim2nix; @@ -1546,7 +1583,7 @@ self: super: { }; # The GitHub repository returns 404, which breaks the update script - VimCompletesMe = buildVimPluginFrom2Nix { + VimCompletesMe = buildVimPlugin { pname = "VimCompletesMe"; version = "2022-02-18"; src = fetchFromGitHub { @@ -1617,6 +1654,17 @@ self: super: { --replace "'zoxide_executable', 'zoxide'" "'zoxide_executable', '${zoxide}/bin/zoxide'" ''; }; + LeaderF = super.LeaderF.overrideAttrs { + buildInputs = [ python3 ]; + # rm */build/ to prevent dependencies on gcc + # strip the *.so to keep files small + buildPhase = '' + patchShebangs . + ./install.sh + rm autoload/leaderf/fuzzyMatch_C/build/ -r + ''; + stripDebugList = [ "autoload/leaderf/python" ]; + }; } // ( let @@ -1635,7 +1683,6 @@ self: super: { "coc-haxe" "coc-highlight" "coc-html" - "coc-imselect" "coc-java" "coc-jest" "coc-json" @@ -1672,7 +1719,7 @@ self: super: { "coc-yaml" "coc-yank" ]; - nodePackage2VimPackage = name: buildVimPluginFrom2Nix { + nodePackage2VimPackage = name: buildVimPlugin { pname = name; inherit (nodePackages.${name}) version meta; src = "${nodePackages.${name}}/lib/node_modules/${name}"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/vim-sensible/fix-nix-store-path-regex.patch b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/vim-sensible/fix-nix-store-path-regex.patch new file mode 100644 index 0000000000..27241632ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/patches/vim-sensible/fix-nix-store-path-regex.patch @@ -0,0 +1,25 @@ +From 07c799a1b170c0e28b385474b511c1034cfcb263 Mon Sep 17 00:00:00 2001 +From: Janik H +Date: Sat, 16 Sep 2023 19:45:32 +0200 +Subject: [PATCH] fix nix store path regex + +--- + plugin/sensible.vim | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugin/sensible.vim b/plugin/sensible.vim +index 0fc26e0..b3ee6e9 100644 +--- a/plugin/sensible.vim ++++ b/plugin/sensible.vim +@@ -26,7 +26,7 @@ function! s:MaySet(option) abort + silent verbose execute 'setglobal all' a:option . '?' + redir END + endif +- return out !~# " \\(\\~[\\/][^\n]*\\|Lua\\)$" ++ return out !~# "/nix/store/.*" && out !~# " \\(\\~[\\/][^\n]*\\|Lua\\)$" + endfunction + + if s:MaySet('backspace') +-- +2.41.0 + diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update-shell.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update-shell.nix deleted file mode 100644 index eae7db7f53..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update-shell.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs ? import ../../../../.. { } }: - -# Ideally, pkgs points to default.nix file of Nixpkgs official tree -with pkgs; -let - pyEnv = python3.withPackages (ps: [ ps.gitpython ]); -in - -mkShell { - packages = [ - bash - pyEnv - nix - nix-prefetch-scripts - ]; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py index b77032849b..9770b27252 100755 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/update.py @@ -1,97 +1,109 @@ -#!/usr/bin/env nix-shell -#!nix-shell update-shell.nix -i python3 - +#!/usr/bin/env python +# run with: +# $ nix run .\#vimPluginsUpdater # format: -# $ nix run nixpkgs.python3Packages.black -c black update.py +# $ nix run nixpkgs#python3Packages.black -- update.py # type-check: -# $ nix run nixpkgs.python3Packages.mypy -c mypy update.py +# $ nix run nixpkgs#python3Packages.mypy -- update.py # linted: -# $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py +# $ nix run nixpkgs#python3Packages.flake8 -- --ignore E501,E265,E402 update.py -# If you see `HTTP Error 429: too many requests` errors while running this script, -# refer to: +# If you see `HTTP Error 429: too many requests` errors while running this +# script, refer to: # # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks/vim.section.md#updating-plugins-in-nixpkgs-updating-plugins-in-nixpkgs # -# (or the equivalent file /doc/languages-frameworks/vim.section.md from Nixpkgs master tree). +# (or the equivalent file /doc/languages-frameworks/vim.section.md +# from Nixpkgs master tree). # import inspect import os -import sys import logging -import subprocess import textwrap +import json from typing import List, Tuple from pathlib import Path -import git log = logging.getLogger() sh = logging.StreamHandler() -formatter = logging.Formatter('%(name)s:%(levelname)s: %(message)s') +formatter = logging.Formatter("%(name)s:%(levelname)s: %(message)s") sh.setFormatter(formatter) log.addHandler(sh) # Import plugin update library from maintainers/scripts/pluginupdate.py ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) -# Ideally, ROOT.(parent^5) points to root of Nixpkgs official tree -sys.path.insert(0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts")) import pluginupdate +import importlib from pluginupdate import run_nix_expr, PluginDesc +from treesitter import update_grammars - -GET_PLUGINS_LUA = """ -with import {}; -lib.attrNames lua51Packages""" - HEADER = ( "# GENERATED by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!" ) -def isNeovimPlugin(plug: pluginupdate.Plugin) -> bool: - ''' - Whether it's a neovim-only plugin - We can check if it's available in lua packages - ''' - global luaPlugins - if plug.normalized_name in luaPlugins: - log.debug("%s is a neovim plugin", plug) - return True - return False +NVIM_TREESITTER_GENERATED_NIX = \ + "pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix" class VimEditor(pluginupdate.Editor): nvim_treesitter_updated = False - def generate_nix(self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str): + def generate_nix( + self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str + ): sorted_plugins = sorted(plugins, key=lambda v: v[0].name.lower()) - nvim_treesitter_rev = pluginupdate.run_nix_expr("(import { }).vimPlugins.nvim-treesitter.src.rev") + nvim_treesitter_rev = pluginupdate.run_nix_expr( + "(import { }).vimPlugins.nvim-treesitter.src.rev", + self.nixpkgs + ) with open(outfile, "w+") as f: f.write(HEADER) - f.write(textwrap.dedent(""" - { lib, buildVimPluginFrom2Nix, buildNeovimPlugin, fetchFromGitHub, fetchgit }: + f.write( + textwrap.dedent( + """ + { lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub, fetchgit }: final: prev: { """ - )) + ) + ) for pdesc, plugin in sorted_plugins: content = self.plugin2nix(pdesc, plugin) f.write(content) - if plugin.name == "nvim-treesitter" and plugin.commit != nvim_treesitter_rev: + if ( + plugin.name == "nvim-treesitter" and plugin.commit != nvim_treesitter_rev + ): self.nvim_treesitter_updated = True f.write("\n}\n") print(f"updated {outfile}") def plugin2nix(self, pdesc: PluginDesc, plugin: pluginupdate.Plugin) -> str: + GET_PLUGINS_LUA = """ + with import {}; + lib.attrNames lua51Packages""" + luaPlugins = run_nix_expr(GET_PLUGINS_LUA, self.nixpkgs) repo = pdesc.repo - isNeovim = isNeovimPlugin(plugin) + + def _isNeovimPlugin(plug: pluginupdate.Plugin) -> bool: + """ + Whether it's a neovim-only plugin + We can check if it's available in lua packages + """ + # global luaPlugins + if plug.normalized_name in luaPlugins: + log.debug("%s is a neovim plugin", plug) + return True + return False + + isNeovim = _isNeovimPlugin(plugin) content = f" {plugin.normalized_name} = " src_nix = repo.as_nix(plugin) @@ -103,23 +115,28 @@ class VimEditor(pluginupdate.Editor): }}; """.format( - buildFn="buildNeovimPlugin" if isNeovim else "buildVimPluginFrom2Nix", plugin=plugin, src_nix=src_nix, repo=repo) + buildFn="buildNeovimPlugin" if isNeovim else "buildVimPlugin", + plugin=plugin, + src_nix=src_nix, + repo=repo, + ) log.debug(content) return content - def update(self, args): pluginupdate.update_plugins(self, args) if self.nvim_treesitter_updated: print("updating nvim-treesitter grammars") nvim_treesitter_dir = ROOT.joinpath("nvim-treesitter") - subprocess.check_call([nvim_treesitter_dir.joinpath("update.py")]) + lockfile = json.load(open(args.nixpkgs.join(NVIM_TREESITTER_GENERATED_FILE, "lockfile.json"))) + + nvim_treesitter.update_grammars(lockfile) if self.nixpkgs_repo: index = self.nixpkgs_repo.index for diff in index.diff(None): - if diff.a_path == "pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix": + if diff.a_path == NVIM_TREESITTER_GENERATED_NIX: msg = "vimPlugins.nvim-treesitter: update grammars" print(f"committing to nixpkgs: {msg}") index.add([str(nvim_treesitter_dir.joinpath("generated.nix"))]) @@ -131,11 +148,11 @@ class VimEditor(pluginupdate.Editor): def main(): global luaPlugins - luaPlugins = run_nix_expr(GET_PLUGINS_LUA) - with open(f"{ROOT}/get-plugins.nix") as f: + log.debug(f"Loading from {ROOT}/../get-plugins.nix") + with open(f"{ROOT}/../get-plugins.nix") as f: GET_PLUGINS = f.read() - editor = VimEditor("vim", ROOT, GET_PLUGINS) + editor = VimEditor("vim", Path("pkgs/applications/editors/vim/plugins"), GET_PLUGINS) editor.run() diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/updater.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/updater.nix new file mode 100644 index 0000000000..e82650a040 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/updater.nix @@ -0,0 +1,47 @@ +{ buildPythonApplication +, nix +, makeWrapper +, python3Packages +, lib + +# optional +, vimPlugins +, neovim +}: +let + my_neovim = neovim.override { + configure.packages.all.start = [ vimPlugins.nvim-treesitter ]; + }; + +in +buildPythonApplication { + format = "other"; + pname = "vim-plugins-updater"; + version = "0.1"; + + nativeBuildInputs = [ + makeWrapper + python3Packages.wrapPython + ]; + + pythonPath = [ + python3Packages.gitpython + ]; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp ${./update.py} $out/bin/vim-plugins-updater + cp ${./get-plugins.nix} $out/get-plugins.nix + cp ${./nvim-treesitter/update.py} $out/lib/treesitter.py + cp ${../../../../../maintainers/scripts/pluginupdate.py} $out/lib/pluginupdate.py + + # wrap python scripts + makeWrapperArgs+=( --prefix PATH : "${lib.makeBinPath [ nix my_neovim ]}" --prefix PYTHONPATH : "$out/lib" ) + wrapPythonPrograms + ''; + + meta.mainProgram = "vim-plugins-updater"; +} + diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix index 4236cf79e1..271f50919f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix @@ -53,7 +53,7 @@ let }; in -vimUtils.buildVimPluginFrom2Nix { +vimUtils.buildVimPlugin { pname = "vim-clap"; inherit version src meta; 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 7f4e97dcb3..64f721cee3 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 @@ -40,6 +40,8 @@ https://github.com/ycm-core/YouCompleteMe/,, https://github.com/vim-scripts/a.vim/,, https://github.com/mileszs/ack.vim/,, https://github.com/eikenb/acp/,, +https://github.com/aznhe21/actions-preview.nvim/,, +https://github.com/Mofiqul/adwaita.nvim/,HEAD, https://github.com/stevearc/aerial.nvim/,, https://github.com/Numkil/ag.nvim/,, https://github.com/derekelkins/agda-vim/,, @@ -348,9 +350,10 @@ https://github.com/Yggdroot/hiPairs/,, https://github.com/tzachar/highlight-undo.nvim/,HEAD, https://git.sr.ht/~soywod/himalaya-vim,, https://github.com/mpickering/hlint-refactor-vim/,, +https://github.com/calops/hmts.nvim/,, https://github.com/edluffy/hologram.nvim/,, https://github.com/urbit/hoon.vim/,, -https://github.com/phaazon/hop.nvim/,, +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, @@ -470,6 +473,7 @@ https://github.com/loctvl842/monokai-pro.nvim/,HEAD, https://github.com/shaunsingh/moonlight.nvim/,,pure-lua https://github.com/leafo/moonscript-vim/,HEAD, https://github.com/yegappan/mru/,, +https://github.com/smoka7/multicursors.nvim/,HEAD, https://github.com/jbyuki/nabla.nvim/,HEAD, https://github.com/ncm2/ncm2/,, https://github.com/ncm2/ncm2-bufword/,, @@ -595,6 +599,7 @@ https://gitlab.com/usmcamp0811/nvim-julia-autotest,HEAD, https://github.com/ethanholz/nvim-lastplace/,HEAD, https://github.com/kosayoda/nvim-lightbulb/,, https://github.com/josa42/nvim-lightline-lsp/,, +https://github.com/martineausimon/nvim-lilypond-suite/,HEAD, https://github.com/mfussenegger/nvim-lint/,, https://github.com/mrded/nvim-lsp-notify/,HEAD, https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,, @@ -614,6 +619,7 @@ https://github.com/LhKipp/nvim-nu/,HEAD, https://github.com/ojroques/nvim-osc52/,, https://github.com/gennaro-tedesco/nvim-peekup/,, https://github.com/yorickpeterse/nvim-pqf/,HEAD, +https://github.com/jamestthompson3/nvim-remote-containers/,HEAD, https://github.com/olrtg/nvim-rename-state/,HEAD, https://github.com/petertriho/nvim-scrollbar/,HEAD, https://github.com/dstein64/nvim-scrollview/,, @@ -628,7 +634,7 @@ https://github.com/norcalli/nvim-terminal.lua/,, https://github.com/klen/nvim-test/,, https://github.com/kyazdani42/nvim-tree.lua/,, https://github.com/nvim-treesitter/nvim-treesitter/,, -https://github.com/romgrk/nvim-treesitter-context/,, +https://github.com/nvim-treesitter/nvim-treesitter-context/,, https://github.com/RRethy/nvim-treesitter-endwise/,HEAD, https://github.com/eddiebergman/nvim-treesitter-pyfold/,, https://github.com/nvim-treesitter/nvim-treesitter-refactor/,, @@ -642,6 +648,7 @@ https://github.com/kevinhwang91/nvim-ufo/,HEAD, https://github.com/samjwill/nvim-unception/,HEAD, https://github.com/kyazdani42/nvim-web-devicons/,, https://github.com/AckslD/nvim-whichkey-setup.lua/,, +https://github.com/s1n7ax/nvim-window-picker/,HEAD, https://github.com/roxma/nvim-yarp/,, https://github.com/haringsrob/nvim_context_vt/,, https://github.com/neovim/nvimdev.nvim/,, @@ -663,6 +670,7 @@ https://github.com/Almo7aya/openingh.nvim/,, https://github.com/salkin-mada/openscad.nvim/,HEAD, https://github.com/nvim-orgmode/orgmode/,, https://github.com/rgroli/other.nvim/,HEAD, +https://github.com/jmbuhr/otter.nvim/,, https://github.com/stevearc/overseer.nvim/,HEAD, https://github.com/nyoom-engineering/oxocarbon.nvim/,HEAD, https://github.com/vuki656/package-info.nvim/,, @@ -696,11 +704,13 @@ https://github.com/purescript-contrib/purescript-vim/,, https://github.com/python-mode/python-mode/,, https://github.com/vim-python/python-syntax/,, https://github.com/AlphaTechnolog/pywal.nvim/,, +https://github.com/quarto-dev/quarto-nvim/,, https://github.com/unblevable/quick-scope/,, https://github.com/stefandtw/quickfix-reflector.vim/,, https://github.com/dannyob/quickfixstatus/,, https://github.com/jbyuki/quickmath.nvim/,HEAD, https://github.com/luochen1990/rainbow/,, +https://gitlab.com/HiPhish/rainbow-delimiters.nvim,HEAD, https://github.com/kien/rainbow_parentheses.vim/,, https://github.com/vim-scripts/random.vim/,, https://github.com/winston0410/range-highlight.nvim/,, @@ -742,6 +752,7 @@ https://github.com/lotabout/skim.vim/,, https://github.com/mopp/sky-color-clock.vim/,, https://github.com/kovisoft/slimv/,, https://github.com/mrjones2014/smart-splits.nvim/,, +https://github.com/m4xshen/smartcolumn.nvim/,, https://github.com/gorkunov/smartpairs.vim/,, https://github.com/ibhagwan/smartyank.nvim/,, https://github.com/camspiers/snap/,, @@ -785,6 +796,7 @@ https://github.com/kdheepak/tabline.nvim/,, https://github.com/vim-scripts/tabmerge/,, https://github.com/codota/tabnine-vim/,, https://github.com/gcmt/taboo.vim/,, +https://github.com/abecodes/tabout.nvim/,HEAD, https://github.com/Shougo/tabpagebuffer.vim/,, https://github.com/godlygeek/tabular/,, https://github.com/AndrewRadev/tagalong.vim/,, @@ -793,6 +805,7 @@ https://github.com/vim-scripts/taglist.vim/,, https://github.com/wellle/targets.vim/,, https://github.com/tools-life/taskwiki/,, https://github.com/tomtom/tcomment_vim/,, +https://github.com/renerocksai/telekasten.nvim/,, https://github.com/GustavoKatel/telescope-asynctasks.nvim/,, https://github.com/nvim-telescope/telescope-cheat.nvim/,, https://github.com/fannheyward/telescope-coc.nvim/,, @@ -837,7 +850,6 @@ https://github.com/wellle/tmux-complete.vim/,, https://github.com/aserowy/tmux.nvim/,HEAD, https://github.com/edkolev/tmuxline.vim/,, https://github.com/folke/todo-comments.nvim/,, -https://github.com/AmeerTaweel/todo.nvim/,, https://github.com/freitass/todo.txt-vim/,, https://github.com/akinsho/toggleterm.nvim/,, https://github.com/folke/tokyonight.nvim/,, @@ -984,6 +996,7 @@ https://github.com/elixir-editors/vim-elixir/,, https://github.com/andys8/vim-elm-syntax/,, https://github.com/junegunn/vim-emoji/,, https://github.com/tpope/vim-endwise/,, +https://github.com/Olical/vim-enmasse/,HEAD, https://github.com/vim-erlang/vim-erlang-compiler/,, https://github.com/vim-erlang/vim-erlang-omnicomplete/,, https://github.com/vim-erlang/vim-erlang-runtime/,, @@ -993,6 +1006,7 @@ https://github.com/tommcdo/vim-exchange/,, https://github.com/terryma/vim-expand-region/,, https://github.com/int3/vim-extradite/,, https://github.com/wsdjeg/vim-fetch/,, +https://github.com/fadein/vim-figlet/,HEAD, https://github.com/tpope/vim-fireplace/,, https://github.com/dag/vim-fish/,, https://github.com/tpope/vim-flagship/,, @@ -1153,7 +1167,6 @@ https://github.com/junegunn/vim-plug/,, https://github.com/powerman/vim-plugin-AnsiEsc/,, https://github.com/hasundue/vim-pluto/,HEAD, https://github.com/sheerun/vim-polyglot/,, -https://github.com/jakwings/vim-pony/,, https://github.com/haya14busa/vim-poweryank/,, https://github.com/prettier/vim-prettier/,, https://github.com/thinca/vim-prettyprint/,, diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix index 44ad9295e2..7b023118f0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -392,8 +392,9 @@ rec { inherit (import ./build-vim-plugin.nix { inherit lib stdenv rtpPath toVimPlugin; - }) buildVimPlugin buildVimPluginFrom2Nix; + }) buildVimPlugin; + buildVimPluginFrom2Nix = lib.warn "buildVimPluginFrom2Nix is deprecated: use buildVimPlugin instead" buildVimPlugin; # used to figure out which python dependencies etc. neovim needs requiredPlugins = { @@ -418,7 +419,7 @@ rec { forceShare = [ "man" "info" ]; nativeBuildInputs = oldAttrs.nativeBuildInputs or [] - ++ lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + ++ lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ vimCommandCheckHook vimGenDocHook # many neovim plugins keep using buildVimPlugin neovimRequireCheckHook diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim index 0ddbeaae6b..f6160795c5 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim @@ -50,7 +50,7 @@ fun! nix#NixDerivation(opts, name, repository) abort let dependencies = nix#DependenciesFromCheckout(a:opts, a:name, a:repository, dir) return {'n_a_name': n_a_name, 'n_n_name': n_n_name, 'dependencies': dependencies, 'derivation': join([ - \ ' '.n_a_name.' = buildVimPluginFrom2Nix {'.created_notice, + \ ' '.n_a_name.' = buildVimPlugin {'.created_notice, \ ' name = "'.n_n_name.'-'.date.'";', \ ' src = fetchgit {', \ ' url = "'. a:repository.url .'";', @@ -74,7 +74,7 @@ fun! nix#NixDerivation(opts, name, repository) abort let dependencies = nix#DependenciesFromCheckout(a:opts, a:name, a:repository, dir) return {'n_a_name': n_a_name, 'n_n_name': n_n_name, 'dependencies': dependencies, 'derivation': join([ - \ ' '.n_a_name.' = buildVimPluginFrom2Nix {'.created_notice, + \ ' '.n_a_name.' = buildVimPlugin {'.created_notice, \ ' name = "'.n_n_name.'";', \ ' src = fetchhg {', \ ' url = "'. a:repository.url .'";', @@ -99,7 +99,7 @@ fun! nix#NixDerivation(opts, name, repository) abort let dependencies = keys(get(addon_info, 'dependencies', {})) return {'n_a_name': n_a_name, 'n_n_name': n_n_name, 'dependencies': dependencies, 'derivation': join([ - \ ' '.n_a_name.' = buildVimPluginFrom2Nix {'.created_notice, + \ ' '.n_a_name.' = buildVimPlugin {'.created_notice, \ ' name = "'.n_n_name.'";', \ ' src = fetchurl {', \ ' url = "'. a:repository.url .'";', 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 20e9dc56c4..22f047a1bc 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -343,11 +343,16 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "0.0.97"; - sha256 = "sha256-rNGW8WB3jBSjThiB0j4/ORKMRAaxFiMiBfaa+dbGu/w="; + version = "0.8.2"; + sha256 = "0kw9asv91s37ql61blbb8pr7wb6c2ba1klchal53chp6ib55v5kn"; }; meta = { + changelog = "https://marketplace.visualstudio.com/items/asvetliakov.vscode-neovim/changelog"; + description = "Vim-mode for VS Code using embedded Neovim"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=asvetliakov.vscode-neovim"; license = lib.licenses.mit; + homepage = "https://github.com/vscode-neovim/vscode-neovim"; + maintainers = [ lib.maintainers.mikaelfangel ]; }; }; @@ -700,8 +705,8 @@ let mktplcRef = { name = "ruff"; publisher = "charliermarsh"; - version = "2023.32.0"; - sha256 = "sha256-phyPQqDgsYunF5FLqPevw8ZZG4Tw9qxjTOU4/kNGKU8="; + version = "2023.40.0"; + sha256 = "sha256-Ym76WtKvz18NgxH9o8O/Ozn+/AtqLvjJs8ffLhPOWkQ="; }; meta = { license = lib.licenses.mit; @@ -896,8 +901,8 @@ let mktplcRef = { name = "vscode-markdownlint"; publisher = "DavidAnson"; - version = "0.51.0"; - sha256 = "sha256-Xtr8cqcPrcrKpJBxQcY1j9Gl4CC6U3ZazS4bdBtdzUk="; + version = "0.52.0"; + sha256 = "sha256-Y8qkcNEvJ/yzT8PDeErRzKGxYBNKKfbNNsJVaFDeIV4="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DavidAnson.vscode-markdownlint/changelog"; @@ -1224,8 +1229,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.15.2"; - sha256 = "sha256-Zu/AcV0KY3QV0hyZsGrQdbc/Qc0pKNHVkHZVJ3PL0ps="; + version = "0.16.0"; + sha256 = "sha256-PZUyOZ/U6OkGid+PYY2G/pAe5R5eumUibKNel9HBI+s="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -1400,8 +1405,8 @@ let mktplcRef = { name = "vscode-firefox-debug"; publisher = "firefox-devtools"; - version = "2.9.8"; - sha256 = "sha256-MCL562FPgEfhUM1KH5LMl7BblbjIkQ4UEwB67RlO5Mk="; + version = "2.9.10"; + sha256 = "sha256-xuvlE8L/qjOn8Qhkv9sutn/xRbwC9V/IIfEr4Ixm1vA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/firefox-devtools.vscode-firefox-debug/changelog"; @@ -2412,6 +2417,38 @@ let }; }; + ms-python.black-formatter = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "black-formatter"; + publisher = "ms-python"; + version = "2023.4.1"; + sha256 = "sha256-IJaLke0WF1rlKTiuwJHAXDQB1SS39AoQhc4iyqqlTyY="; + }; + meta = with lib; { + description = "Formatter extension for Visual Studio Code using black"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.black-formatter"; + homepage = "https://github.com/microsoft/vscode-black-formatter"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; + }; + + ms-python.isort = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "isort"; + publisher = "ms-python"; + version = "2023.10.1"; + sha256 = "sha256-NRsS+mp0pIhGZiqxAMXNZ7SwLno9Q8pj+RS1WB92HzU="; + }; + meta = with lib; { + description = "Import sorting extension for Visual Studio Code using isort"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-python.isort"; + homepage = "https://github.com/microsoft/vscode-isort"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; + }; + ms-python.python = callPackage ./ms-python.python { }; ms-python.vscode-pylance = buildVscodeMarketplaceExtension { @@ -2578,6 +2615,22 @@ let }; }; + ms-vscode-remote.remote-containers = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "remote-containers"; + publisher = "ms-vscode-remote"; + version = "0.305.0"; + sha256 = "sha256-srSRD/wgDbQo9P1uJk8YtcXPZO62keG5kRnp1TmHqOc="; + }; + meta = { + description = "Open any folder or repository inside a Docker container."; + downloadPage = "Use a container as your development environment"; + homepage = "https://code.visualstudio.com/docs/devcontainers/containers"; + license = lib.licenses.unfree; + maintainers = [ lib.maintainers.anthonyroussel ]; + }; + }; + ms-vscode-remote.remote-ssh = callPackage ./ms-vscode-remote.remote-ssh { }; ms-vsliveshare.vsliveshare = callPackage ./ms-vsliveshare.vsliveshare { }; @@ -2929,6 +2982,7 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=RoweWilsonFrederiskHolme.wikitext"; homepage = "https://github.com/Frederisk/Wikitext-VSCode-Extension"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.rapiteanu ]; }; }; @@ -3059,8 +3113,8 @@ let mktplcRef = { publisher = "shd101wyy"; name = "markdown-preview-enhanced"; - version = "0.6.8"; - sha256 = "9NRaHgtyiZJ0ic6h1B01MWzYhDABAl3Jm2IUPogYWr0="; + version = "0.6.10"; + sha256 = "sha256-nCsl7ZYwuTvNZSTUMR6jEywClmcPm8xW6ABu9220wJI="; }; meta = { description = "Provides a live preview of markdown using either markdown-it or pandoc"; @@ -3204,8 +3258,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.20.5"; - sha256 = "sha256-IR/mwEmiSPN/ZRiazclRSOie9RAjdNM0zXexVzImOs8="; + version = "3.0.1"; + sha256 = "sha256-KeYE6/yO2n3RHPjnJOnOyHsz4XW81y9AbkSC/I975kQ="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -3458,6 +3512,22 @@ let }; }; + uiua-lang.uiua-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "uiua-vscode"; + publisher = "uiua-lang"; + version = "0.0.15"; + sha256 = "sha256-q+hSssxOIfeRUw2z9nMiCmH8cAF+GPTvlmc1jl/L4uU="; + }; + meta = { + description = "VSCode language extension for Uiua"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=uiua-lang.uiua-vscode"; + homepage = "https://github.com/uiua-lang/uiua-vscode"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.wackbyte ]; + }; + }; + unifiedjs.vscode-mdx = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-mdx"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix index 1742c1e0a0..e8ae861bf2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/generic.nix @@ -1,6 +1,6 @@ { stdenv, lib, makeDesktopItem , unzip, libsecret, libXScrnSaver, libxshmfence, buildPackages -, atomEnv, at-spi2-atk, autoPatchelfHook +, at-spi2-atk, autoPatchelfHook, alsa-lib, mesa, nss, nspr, xorg , systemd, fontconfig, libdbusmenu, glib, buildFHSEnv, wayland , libglvnd, libkrb5 @@ -8,7 +8,7 @@ , tests # needed to fix "Save as Root" -, nodePackages, bash +, asar, bash # Attributes inherit from specific versions , version, src, meta, sourceRoot, commandLineArgs @@ -67,14 +67,14 @@ let }; buildInputs = [ libsecret libXScrnSaver libxshmfence ] - ++ lib.optionals (!stdenv.isDarwin) ([ at-spi2-atk libkrb5 ] ++ atomEnv.packages); + ++ lib.optionals (!stdenv.isDarwin) [ alsa-lib at-spi2-atk libkrb5 mesa nss nspr systemd xorg.libxkbfile ]; runtimeDependencies = lib.optionals stdenv.isLinux [ (lib.getLib systemd) fontconfig.lib libdbusmenu wayland libsecret ]; nativeBuildInputs = [ unzip ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook - nodePackages.asar + asar # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 (buildPackages.wrapGAppsHook.override { inherit (buildPackages) makeWrapper; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index b1f0451cc1..c924e49dfa 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0j3lmyj77qalhn8hrgfg3zgw6jqv8rscfy16vhkl0ir2xnmb19jf"; - x86_64-darwin = "06dx8lhw1cqignv06pcjjv8v743kr8bck1iqgl1881jmqyhggi4f"; - aarch64-linux = "0nyd452wcp5qw2cx1zj89v4fgk3jvbk3hhiix9a0gv150q48vyfa"; - aarch64-darwin = "1yfbsfnkjbf99yl1dcflpyxppa9mhnxigyyplz0jaqgpwmhs2s0b"; - armv7l-linux = "1miz95rz2fdw7xplflnydzq57hnz894xg29mhpywwiib8kypfrm7"; + x86_64-linux = "1ayb0fj3dfcvwmfc749aihn1mm2h4nin914kvalchkm9q0xvc2y9"; + x86_64-darwin = "0yvcm1m1dlklacc0rir4ja2bqiwlwmrmx3qwxf3ik40m1dfwhh53"; + aarch64-linux = "0vj7q6b82n9509dph0p4d6n7b9gwz5b3wkg4wysm4w4xflqlx9al"; + aarch64-darwin = "144fxkxg6c5216ds32wdx7qf5hnvlq4a429z90wz62iynslaggl4"; + armv7l-linux = "1819dg30dy8hd8gi84b1992ii1bxcfcvhx9yf4q8wdf62hw5nkpq"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.81.1"; + version = "1.83.0"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "6c3e3dba23e8fadc360aed75ce363ba185c49794"; + rev = "e7e037083ff4455cf320e344325dacb480062c3c"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "1xfyl81d5l2bl7k4vz4rnj84j1ijwv90sqgv9lnqzza2dfckfd6m"; + sha256 = "11lf24hsbc4xbi08lrzxw4bn0jqp7rbhz120y9i3ffq25kni989l"; }; }; @@ -97,7 +97,7 @@ in homepage = "https://code.visualstudio.com/"; downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; - maintainers = with maintainers; [ eadwu synthetica maxeaubrey bobby285271 Enzime ]; + maintainers = with maintainers; [ eadwu synthetica amaxine bobby285271 Enzime ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index f714e709f6..f7527096f1 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0wx53ajjwil82s3nl6wvpdf01mh33yqasf1ia54s1rfzz10fa1m6"; - x86_64-darwin = "1avq0xlhsnxf6yfay1czi0rc0hy47ahj25rg07mzgb274p4x9q95"; - aarch64-linux = "1chdcy59w4zm27ga71iph7yqq88lv2rw73br1nmmjznbqgzk9lpc"; - aarch64-darwin = "140lrka50yqqd9dp9gb93jlc2zn2fjiq9palibwvgb14nzsb3x68"; - armv7l-linux = "0qf95nxy55f9m2z91fykwjgffj7wqvlqjn2d2xnfapa457v5lbir"; + x86_64-linux = "1xzmfvkzqfxblahi2pc54fr7i6rynqm76p4wpbfzxrrh5a3xjwn3"; + x86_64-darwin = "0lp6yqwqwfngl98nba8f77yypb44cfn7kcjhbc93s8kqd57m97zj"; + aarch64-linux = "1hpwjdbfc8l4a7ln50s6h68abcb6djcc5y0h686s9k5v2axm7f3v"; + aarch64-darwin = "0cbms9p8g2gjx9wmm78fzlscw62qasjv30al8v39bda3k694wnh5"; + armv7l-linux = "0hvaray6b36j8s0fvffnkbsw7kf2rn2z4y8q4wlnqx3hfyalcvcn"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.81.1.23222"; + version = "1.82.2.23257"; pname = "vscodium"; executableName = "codium"; @@ -61,7 +61,7 @@ in downloadPage = "https://github.com/VSCodium/vscodium/releases"; license = licenses.mit; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ synthetica bobby285271 ]; + maintainers = with maintainers; [ synthetica bobby285271 ludovicopiero ]; mainProgram = "codium"; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "armv7l-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/86box/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/86box/default.nix index 7a5533f057..e14d3d0d71 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/86box/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/86box/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config, makeWrapper, freetype, SDL2 , glib, pcre2, openal, rtmidi, fluidsynth, jack2, alsa-lib, qt5, libvncserver -, discord-gamesdk, libpcap +, discord-gamesdk, libpcap, libslirp , enableDynarec ? with stdenv.hostPlatform; isx86 || isAarch , enableNewDynarec ? enableDynarec && stdenv.hostPlatform.isAarch @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "86Box"; - version = "3.11"; + version = "4.0"; src = fetchFromGitHub { owner = "86Box"; repo = "86Box"; rev = "v${version}"; - hash = "sha256-n3Q/NUiaC6/EZyBUn6jUomnQCqr8tvYKPI5JrRRFScI="; + hash = "sha256-VTfYCVEbArcYVzh3NkX1yBXhtRnGZ/+khk0KG42fs24="; }; nativeBuildInputs = [ @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype + fluidsynth SDL2 glib openal @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { pcre2 jack2 libpcap + libslirp qt5.qtbase qt5.qttools ] ++ lib.optional stdenv.isLinux alsa-lib @@ -60,7 +62,6 @@ stdenv.mkDerivation rec { postFixup = let libPath = lib.makeLibraryPath ([ libpcap - fluidsynth ] ++ lib.optional unfreeEnableDiscord discord-gamesdk); libPathVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; in diff --git a/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix index 38ff3db999..35ed421469 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/box64/default.nix @@ -15,13 +15,13 @@ assert withDynarec -> stdenv.hostPlatform.isAarch64; stdenv.mkDerivation rec { pname = "box64"; - version = "0.2.2"; + version = "0.2.4"; src = fetchFromGitHub { owner = "ptitSeb"; repo = pname; rev = "v${version}"; - hash = "sha256-aIvL0H0k0/lz2lCLxB17RxNm0cxVozYthy0z85/FuUE="; + hash = "sha256-iCZv/WvqZkH6i23fSLA/p0nG5/CgzjyU5glVgje4c3w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix index d38865adc2..3858ddf55b 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/cemu/default.nix @@ -13,6 +13,7 @@ , fmt_9 , glm , gtk3 +, hidapi , imgui , libpng , libzip @@ -31,13 +32,13 @@ stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-45"; + version = "2.0-47"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-Bi2ws08e+6rNv83ypLrgB/KZWt95i7UkFrqhCr/0Zko="; + hash = "sha256-0N/bJJHWMHF+ZlVxNHV8t/1jFr3ER3GNF8CPAHVSsak="; }; patches = [ @@ -64,6 +65,7 @@ stdenv.mkDerivation rec { fmt_9 glm gtk3 + hidapi imgui libpng libzip diff --git a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix index 37d995334a..9da8650577 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "x16-emulator"; - version = "43"; + version = "44"; src = fetchFromGitHub { owner = "X16Community"; repo = "x16-emulator"; rev = "r${finalAttrs.version}"; - hash = "sha256-cZB7MRYlchD3zcBSWBIzyBiGHJobJvozkVT/7ftFkNg="; + hash = "sha256-NDtfbhqGldxtvWQf/t6UnMRjI2DR7JYKbm2KFAMZhHY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix index 8c9c1d1b50..c272faa706 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "x16-rom"; - version = "43"; + version = "44"; src = fetchFromGitHub { owner = "X16Community"; repo = "x16-rom"; rev = "r${finalAttrs.version}"; - hash = "sha256-LkGHfralxlishG1oyBojDnLMJ3c3KYp5YwJSZ2SIrbM="; + hash = "sha256-x/U+8e869mkWZKmCiW2fZKGB9un2cFXNclemwxbAjLQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix index ba7fc2cfb8..6e3f93701c 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , pkg-config , wrapQtAppsHook @@ -12,6 +13,7 @@ , enet , ffmpeg , fmt_8 +, gtest , hidapi , libevdev , libGL @@ -22,6 +24,7 @@ , libXdmcp , libXext , libXrandr +, lzo , mbedtls_2 , mgba , miniupnpc @@ -29,12 +32,13 @@ , openal , pugixml , qtbase +, qtsvg , sfml -, soundtouch , udev , vulkan-loader , xxHash , xz +, zlib-ng # Used in passthru , common-updater-scripts @@ -55,16 +59,25 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-19368"; + version = "5.0-19870"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "dadbeb4bae7e7fa23af2b46e0add4143094dc107"; - sha256 = "sha256-XLtFn2liONPizvrKyySZx0mY7qC2fpwhAWaRZLlEzh8="; + rev = "032c77b462a220016f23c5079e71bb23e0ad2adf"; + sha256 = "sha256-TgRattksYsMGcbfu4T5mCFO9BkkHRX0NswFxGwZWjEw="; fetchSubmodules = true; }; + patches = [ + (fetchpatch { + url = "https://github.com/dolphin-emu/dolphin/commit/c43c9101c07376297abbbbc40ef9a1965a1681cd.diff"; + sha256 = "sha256-yHlyG86ta76YKrJsyefvFh521dNbQOqiPOpRUVxKuZM="; + }) + # Remove when merged https://github.com/dolphin-emu/dolphin/pull/12070 + ./find-minizip-ng.patch + ]; + nativeBuildInputs = [ stdenv.cc cmake @@ -87,22 +100,25 @@ stdenv.mkDerivation rec { enet ffmpeg fmt_8 + gtest hidapi libiconv libpulseaudio libspng libusb1 libXdmcp + lzo mbedtls_2 miniupnpc minizip-ng openal pugixml qtbase + qtsvg sfml - soundtouch xxHash - xz + xz # LibLZMA + zlib-ng ] ++ lib.optionals stdenv.isLinux [ alsa-lib bluez @@ -110,7 +126,7 @@ stdenv.mkDerivation rec { libGL libXext libXrandr - # FIXME: Remove comment on next mgba version + # FIXME: Vendored version is newer than mgba's stable release, remove the comment on next mgba's version #mgba # Derivation doesn't support Darwin udev vulkan-loader @@ -118,7 +134,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DDISTRIBUTOR=NixOS" - "-DUSE_SHARED_ENET=ON" "-DDOLPHIN_WC_REVISION=${src.rev}" "-DDOLPHIN_WC_DESCRIBE=${version}" "-DDOLPHIN_WC_BRANCH=master" diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/find-minizip-ng.patch b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/find-minizip-ng.patch new file mode 100644 index 0000000000..b5c64d6e71 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/find-minizip-ng.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ee44d04458..2fa6bd8a10 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -678,7 +678,7 @@ dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Ex + + dolphin_find_optional_system_library_pkgconfig(ZLIB zlib-ng ZLIB::ZLIB Externals/zlib-ng) + +-dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip>=3.0.0 minizip::minizip Externals/minizip) ++dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip-ng>=3.0.0 minizip::minizip Externals/minizip) + + dolphin_find_optional_system_library(LZO Externals/LZO) + diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix index 73a4485af2..7c409692d9 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -134,6 +134,7 @@ stdenv.mkDerivation rec { mv $out/share/applications/dolphin-emu.desktop $out/share/applications/dolphin-emu-primehack.desktop mv $out/share/icons/hicolor/256x256/apps/dolphin-emu.png $out/share/icons/hicolor/256x256/apps/dolphin-emu-primehack.png substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop --replace 'dolphin-emu' 'dolphin-emu-primehack' + substituteInPlace $out/share/applications/dolphin-emu-primehack.desktop --replace 'Dolphin Emulator' 'PrimeHack' '' + lib.optionalString stdenv.hostPlatform.isLinux '' install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules ''; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/duckstation/001-fix-test-inclusion.diff b/third_party/nixpkgs/pkgs/applications/emulators/duckstation/001-fix-test-inclusion.diff new file mode 100644 index 0000000000..b2dabe0262 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/emulators/duckstation/001-fix-test-inclusion.diff @@ -0,0 +1,11 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 879d46bc..95570f6b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -20,5 +20,5 @@ if(BUILD_REGTEST) + endif() + + if(BUILD_TESTS) +- add_subdirectory(common-tests EXCLUDE_FROM_ALL) ++ add_subdirectory(common-tests) + endif() diff --git a/third_party/nixpkgs/pkgs/applications/emulators/duckstation/002-hardcode-vars.diff b/third_party/nixpkgs/pkgs/applications/emulators/duckstation/002-hardcode-vars.diff new file mode 100644 index 0000000000..f0b7bb67a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/emulators/duckstation/002-hardcode-vars.diff @@ -0,0 +1,19 @@ +diff --git a/src/scmversion/gen_scmversion.sh b/src/scmversion/gen_scmversion.sh +index 9c1dacab..d1f895ee 100755 +--- a/src/scmversion/gen_scmversion.sh ++++ b/src/scmversion/gen_scmversion.sh +@@ -10,10 +10,10 @@ else + fi + + +-HASH=$(git rev-parse HEAD) +-BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n') +-TAG=$(git describe --tags --dirty --exclude latest --exclude preview --exclude legacy --exclude previous-latest | tr -d '\r\n') +-DATE=$(git log -1 --date=iso8601-strict --format=%cd) ++HASH="@gitHash@" ++BRANCH="@gitBranch@" ++TAG="@gitTag@" ++DATE="@gitDate@" + + cd $CURDIR + diff --git a/third_party/nixpkgs/pkgs/applications/emulators/duckstation/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/duckstation/default.nix index 87470f5614..e7980e20dd 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/duckstation/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/duckstation/default.nix @@ -8,31 +8,45 @@ , curl , extra-cmake-modules , libXrandr +, libbacktrace , makeDesktopItem -, mesa # for libgbm , ninja , pkg-config , qtbase , qtsvg , qttools , qtwayland +, substituteAll , vulkan-loader , wayland , wrapQtAppsHook , enableWayland ? true }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "duckstation"; - version = "unstable-2023-04-14"; + version = "unstable-2023-09-30"; src = fetchFromGitHub { owner = "stenzek"; repo = "duckstation"; - rev = "5fee6f5abee7f3aad65da5523e57896e10e2a53a"; - sha256 = "sha256-sRs/b4GVXhF3zrOef8DSBKJJGYECUER/nNWZAqv7suA="; + rev = "d5608bf12df7a7e03750cb94a08a3d7999034ae2"; + hash = "sha256-ktfZgacjkN6GQb1vLmyTZMr8QmmH12qAvFSIBTjgRSs="; }; + patches = [ + # Tests are not built by default + ./001-fix-test-inclusion.diff + # Patching yet another script that fills data based on git commands... + (substituteAll { + src = ./002-hardcode-vars.diff; + gitHash = finalAttrs.src.rev; + gitBranch = "master"; + gitTag = "0.1-5889-gd5608bf1"; + gitDate = "2023-09-30T23:20:09+10:00"; + }) + ]; + nativeBuildInputs = [ cmake copyDesktopItems @@ -49,7 +63,7 @@ stdenv.mkDerivation { SDL2 curl libXrandr - mesa + libbacktrace qtbase qtsvg vulkan-loader @@ -60,10 +74,12 @@ stdenv.mkDerivation { ] ++ cubeb.passthru.backendLibs; + strictDeps = true; + cmakeFlags = [ - "-DUSE_DRMKMS=ON" - ] - ++ lib.optionals enableWayland [ "-DUSE_WAYLAND=ON" ]; + (lib.cmakeBool "BUILD_TESTS" true) + (lib.cmakeBool "ENABLE_WAYLAND" enableWayland) + ]; desktopItems = [ (makeDesktopItem { @@ -79,6 +95,13 @@ stdenv.mkDerivation { }) ]; + doCheck = true; + checkPhase = '' + runHook preCheck + bin/common-tests + runHook postCheck + ''; + installPhase = '' runHook preInstall @@ -92,23 +115,16 @@ stdenv.mkDerivation { runHook postInstall ''; - doCheck = true; - checkPhase = '' - runHook preCheck - bin/common-tests - runHook postCheck - ''; - qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ vulkan-loader ] ++ cubeb.passthru.backendLibs)}" ]; - meta = with lib; { + meta = { homepage = "https://github.com/stenzek/duckstation"; description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; mainProgram = "duckstation-qt"; - maintainers = with maintainers; [ guibou AndersonTorres ]; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ guibou AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/dynamips/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/dynamips/default.nix index 80910700da..2c529af3a8 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/dynamips/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/dynamips/default.nix @@ -35,7 +35,8 @@ stdenv.mkDerivation rec { routers. ''; license = licenses.gpl2Plus; - platforms = platforms.linux; + mainProgram = "dynamips"; maintainers = with maintainers; [ primeos ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/fs-uae/launcher.nix b/third_party/nixpkgs/pkgs/applications/emulators/fs-uae/launcher.nix index 63ff7eee2e..6135ee064e 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/fs-uae/launcher.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/fs-uae/launcher.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { # fs-uae-launcher search side by side for fs-uae # see $src/fsgs/plugins/pluginexecutablefinder.py#find_executable ln -s ${fsuae}/bin/fs-uae $out/bin + ln -s ${fsuae}/bin/fs-uae-device-helper $out/bin ''; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix index 6fe3e4455d..730ed7b7ac 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/mame/default.nix @@ -38,14 +38,14 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.257"; + version = "0.259"; srcVersion = builtins.replaceStrings [ "." ] [ "" ] version; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${srcVersion}"; - hash = "sha256-iBLHvdqIgF6XkJQX5hFLrP9KkTGWfVvTCs+DRJhsSp4="; + hash = "sha256-F8psPvwuaILXZF7dCStJApVTD9zzzBwjf1CKGelHlqE="; }; outputs = [ "out" "tools" ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/openmsx/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/openmsx/default.nix index 9def450b03..c9f7827d09 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/openmsx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/openmsx/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "openmsx"; - version = "19.0"; + version = "19.1"; src = fetchFromGitHub { owner = "openMSX"; repo = "openMSX"; rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; - sha256 = "sha256-NR0+vOUkbyuVWdHLmKEewDDmR1ibi3dtbSq+6RaxrGo="; + sha256 = "sha256-5ULljLmEDGFp32rnrXKLfL6P3ad2STJUNngBuWlRCbc="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix index fea7bf17ef..9a18bf9685 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix @@ -4,6 +4,7 @@ , llvmPackages_16 , cubeb , curl +, extra-cmake-modules , ffmpeg , fmt_8 , gettext @@ -18,7 +19,6 @@ , qtbase , qtsvg , qttools -, qttranslations , qtwayland , rapidyaml , SDL2 @@ -37,20 +37,20 @@ let pcsx2_patches = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2_patches"; - rev = "c09d842168689aeba88b656e3e0a042128673a7c"; - sha256 = "sha256-h1jqv3a3Ib/4C7toZpSlVB1VFNNF1MrrUxttqKJL794="; + rev = "04d727b3bf451da11b6594602036e4f7f5580610"; + sha256 = "sha256-zrulsSMRNLPFvrC/jeYzl53i4ZvFQ4Yl2nB0bA6Y8KU="; }; in llvmPackages_16.stdenv.mkDerivation rec { pname = "pcsx2"; - version = "1.7.4658"; + version = "1.7.5004"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-5y7CYFWgNh9oCBuTITvw7Rn4sC6MbMczVMAwtWFkn9A="; + sha256 = "sha256-o+9VSuoZgTkS75rZ6qYM8ITD+0OcwXp+xh/hdUGpVK4="; }; cmakeFlags = [ @@ -62,6 +62,7 @@ llvmPackages_16.stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + extra-cmake-modules pkg-config strip-nondeterminism wrapQtAppsHook @@ -83,7 +84,6 @@ llvmPackages_16.stdenv.mkDerivation rec { qtbase qtsvg qttools - qttranslations qtwayland rapidyaml SDL2 diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix index 64a33bf5fe..db76473250 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix @@ -34,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString enableQt "-qt" + lib.optionalString (!enableQt) "-sdl" + lib.optionalString forceWayland "-wayland"; - version = "1.15.4"; + version = "1.16.5"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-D94PLJfWalLk2kbS0PEHTMDdWxZW4YXwp3VQDHNZlRU="; + sha256 = "sha256-R4XJ/Rn1e7tWjYMztE/YQFlTEVGmt2izaLvLdycVCXQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/emulators/resim/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/resim/default.nix deleted file mode 100644 index d69aafcec2..0000000000 --- a/third_party/nixpkgs/pkgs/applications/emulators/resim/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ fetchFromGitHub, lib, stdenv, cmake, qt4 }: - -stdenv.mkDerivation { - pname = "resim"; - version = "unstable-2016-11-11"; - src = fetchFromGitHub { - owner = "itszor"; - repo = "resim"; - rev = "cdc7808ceb7ba4ac00d0d08ca646b58615059150"; - sha256 = "1743lngqxd7ai4k6cd4d1cf9h60z2pnvr2iynfs1zlpcj3w1hx0c"; - }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 ]; - installPhase = '' - mkdir -pv $out/{lib,bin} - cp -v libresim/libarmsim.so $out/lib/libarmsim.so - cp -v vc4emul/vc4emul $out/bin/vc4emul - ''; - - cmakeFlags = [ - # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ - "-DCMAKE_SKIP_BUILD_RPATH=ON" - ]; - - meta.license = lib.licenses.mit; -} diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix index a07d899ee7..d1cbf12b34 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/cores.nix @@ -50,7 +50,7 @@ let mkLibretroCore = { core , src ? (getCoreSrc core) - , version ? "unstable-2023-03-13" + , version ? "unstable-2023-09-24" , ... }@args: import ./mkLibretroCore.nix ({ @@ -100,12 +100,22 @@ in }; }; + beetle-pce = mkLibretroCore { + core = "mednafen-pce"; + src = getCoreSrc "beetle-pce"; + makefile = "Makefile"; + meta = { + description = "Port of Mednafen's PC Engine core to libretro"; + license = lib.licenses.gpl2Only; + }; + }; + beetle-pce-fast = mkLibretroCore { core = "mednafen-pce-fast"; src = getCoreSrc "beetle-pce-fast"; makefile = "Makefile"; meta = { - description = "Port of Mednafen's PC Engine core to libretro"; + description = "Port of Mednafen's PC Engine fast core to libretro"; license = lib.licenses.gpl2Only; }; }; @@ -291,7 +301,11 @@ in core = "citra"; extraBuildInputs = [ libGLU libGL boost ffmpeg nasm ]; makefile = "Makefile"; - makeFlags = [ "HAVE_FFMPEG_STATIC=0" ]; + makeFlags = [ + "HAVE_FFMPEG_STATIC=0" + # https://github.com/libretro/citra/blob/1a66174355b5ed948de48ef13c0ed508b6d6169f/Makefile#L90 + "BUILD_DATE=01/01/1970_00:00" + ]; meta = { description = "Port of Citra to libretro"; license = lib.licenses.gpl2Plus; @@ -410,7 +424,9 @@ in flycast = mkLibretroCore { core = "flycast"; + extraNativeBuildInputs = [ cmake ]; extraBuildInputs = [ libGL libGLU ]; + cmakeFlags = [ "-DLIBRETRO=ON" ]; makefile = "Makefile"; meta = { description = "Flycast libretro port"; @@ -502,7 +518,10 @@ in mame = mkLibretroCore { core = "mame"; - extraBuildInputs = [ alsa-lib libGLU libGL portaudio python3 xorg.libX11 ]; + extraNativeBuildInputs = [ python3 ]; + extraBuildInputs = [ alsa-lib libGLU libGL ]; + # Setting this is breaking compilation of src/3rdparty/genie for some reason + makeFlags = [ "ARCH=" ]; meta = { description = "Port of MAME to libretro"; license = with lib.licenses; [ bsd3 gpl2Plus ]; @@ -626,6 +645,13 @@ in src = getCoreSrc "mupen64plus"; extraBuildInputs = [ libGLU libGL libpng nasm xorg.libX11 ]; makefile = "Makefile"; + makeFlags = [ + "HAVE_PARALLEL_RDP=1" + "HAVE_PARALLEL_RSP=1" + "HAVE_THR_AL=1" + "LLE=1" + "WITH_DYNAREC=${stdenv.hostPlatform.parsed.cpu.name}" + ]; meta = { description = "Libretro port of Mupen64 Plus, GL only"; license = lib.licenses.gpl3Only; @@ -698,6 +724,11 @@ in core = "parallel-n64"; extraBuildInputs = [ libGLU libGL libpng ]; makefile = "Makefile"; + makeFlags = [ + "HAVE_PARALLEL=1" + "HAVE_PARALLEL_RSP=1" + "ARCH=${stdenv.hostPlatform.parsed.cpu.name}" + ]; postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' sed -i -e '1 i\CPUFLAGS += -DARM_FIX -DNO_ASM -DARM_ASM -DDONT_WANT_ARM_OPTIMIZATIONS -DARM64' Makefile \ && sed -i -e 's,CPUFLAGS :=,,g' Makefile @@ -737,7 +768,7 @@ in # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; - postBuild = "cd /build/source/build/pcsx2"; + postBuild = "cd $NIX_BUILD_TOP/source/build/pcsx2"; meta = { description = "Port of PCSX2 to libretro"; license = lib.licenses.gpl3Plus; @@ -842,19 +873,18 @@ in }; }; - scummvm = mkLibretroCore rec { - core = "scummvm"; - version = "unstable-2022-04-06"; - # Commit below introduces libretro platform, that uses libretro-{deps,common} as - # submodules. We will probably need to introduce this as separate derivations, - # but for now let's just use the last known version that does not use it. - # https://github.com/libretro/scummvm/commit/36446fa6eb33e67cc798f56ce1a31070260e2ada - src = fetchFromGitHub { - owner = "libretro"; - repo = core; - rev = "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3"; - hash = "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew="; + same_cdi = mkLibretroCore { + core = "same_cdi"; + extraNativeBuildInputs = [ python3 ]; + extraBuildInputs = [ alsa-lib libGLU libGL portaudio xorg.libX11 ]; + meta = { + description = "SAME_CDI is a libretro core to play CD-i games"; + license = with lib.licenses; [ bsd3 gpl2Plus ]; }; + }; + + scummvm = mkLibretroCore { + core = "scummvm"; extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU libGL ]; makefile = "Makefile"; preConfigure = "cd backends/platform/libretro/build"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix index 2abbdb1c46..6b7da614cd 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix @@ -8,7 +8,6 @@ , alsa-lib , dbus , fetchFromGitHub -, fetchpatch , ffmpeg_4 , flac , freetype @@ -17,7 +16,6 @@ , libGL , libGLU , libpulseaudio -, libretro-core-info , libv4l , libX11 , libXdmcp @@ -32,10 +30,8 @@ , pkg-config , python3 , qtbase -, retroarch-assets , SDL2 , spirv-tools -, substituteAll , udev , vulkan-loader , wayland @@ -50,12 +46,12 @@ let in stdenv.mkDerivation rec { pname = "retroarch-bare"; - version = "1.15.0"; + version = "1.16.0.3"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - hash = "sha256-kJOR3p3fKqGM8a5rgDPkz43uuf5AtS5fVnvr3tJgWbc="; + hash = "sha256-BT+LzRDoQF03aNT2Kg7YaSWhK74CvOOiHUeHDtFpe9s="; rev = "v${version}"; }; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json index 410e782d0a..f1099967fe 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/hashes.json @@ -8,8 +8,8 @@ "atari800": { "owner": "libretro", "repo": "libretro-atari800", - "rev": "94033288b026fe699bc50703609807aa8075f4dd", - "hash": "sha256-fTKFELELt1g7t3uPgnXIgeMkkSbl9GHr0/k2FHcpDFI=" + "rev": "20d59afb3f19065749549732f20845c3be82e68c", + "hash": "sha256-5cxBubhw60Jmp1p5TQ/L6RLaLANctG0TdpzGnpCadIM=" }, "beetle-gba": { "owner": "libretro", @@ -20,8 +20,8 @@ "beetle-lynx": { "owner": "libretro", "repo": "beetle-lynx-libretro", - "rev": "3ca44fda26f27418c92ada1b0f38b948af2151ae", - "hash": "sha256-f0A8gA3UT40UDaAkWQcPoDd6vAcM37tNtZ2hCOIyBJA=" + "rev": "fab3ac02d5622eb53a707bd392cc037282e9d8b4", + "hash": "sha256-+MKH8LmqDqznDIca/Q129zIXYI23V7s38sCD6rKiZlk=" }, "beetle-ngp": { "owner": "libretro", @@ -29,29 +29,35 @@ "rev": "65460e3a9ad529f6901caf669abbda11f437ab55", "hash": "sha256-+xfD1ZMKtbv5Lp12+5RM7Vl3eEF38kykKW8wj/2EN5w=" }, + "beetle-pce": { + "owner": "libretro", + "repo": "beetle-pce-libretro", + "rev": "541463bd937dad175aec09c2a0c8d6a52d175386", + "hash": "sha256-wWS9reb6aN71Q7OlGst+32T8XX1yMCSOHUKHkXht3hg=" + }, "beetle-pce-fast": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "e480f6388375f59fd3e7aeef8ef8531c20e5c73e", - "hash": "sha256-uURt6rB0IngWzEpl0DjbckdaTIjNwVCm3auvy7AwUdA=" + "rev": "f2ff19e56fb33361793f9fdaf44c1ea28bce1da3", + "hash": "sha256-w7weSz8HR4YNPiBPqa81s3/8b9oFijr6DxNeQ/+I9OE=" }, "beetle-pcfx": { "owner": "libretro", "repo": "beetle-pcfx-libretro", - "rev": "724bd21b4524f8cf376dbc29c3e5a12cb674c758", - "hash": "sha256-xeIVZ8FWGbETWYRIBNs3Yum7FDit5fb77hhH+RU45BY=" + "rev": "47c355b6a515aef6dc57f57df1535570108a0e21", + "hash": "sha256-ylFo/wmLQpQGYSrv9PF2DBmr/8rklmHF9R+3y8v93Rs=" }, "beetle-psx": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "fd812d4cf8f65644faef1ea8597f826ddc37c0a0", - "hash": "sha256-yvMgnY2dGUk8TvvfDklN3f6b1ol7vDu6AJcYzdwy9pI=" + "rev": "f256cc3dc3ec2f6017f7088f056996f8f155db64", + "hash": "sha256-McMV5p1qEvqkeTjqOaD+xHNRQly+CNen9YUJxqLpJzk=" }, "beetle-saturn": { "owner": "libretro", "repo": "beetle-saturn-libretro", - "rev": "9bd31a4a42d06ca0f6d30ee38a569e57c150c414", - "hash": "sha256-RHvH9Jp6c4cgEMTo+p+dU7qgJqjPbRqJLURadjAysrM=" + "rev": "cd395e9e3ee407608450ebc565e871b24e7ffed6", + "hash": "sha256-EIZRv1EydfLWFoBb8TzvAY3kkL9Qr2OrwrljOnnM92A=" }, "beetle-snes": { "owner": "libretro", @@ -62,26 +68,26 @@ "beetle-supafaust": { "owner": "libretro", "repo": "supafaust", - "rev": "75c658cce454e58ae04ea252f53a31c60d61548e", - "hash": "sha256-2fXarVfb5/SYXF8t25/fGNFvODpGas5Bi0hLIbXgB+0=" + "rev": "6b639c98372d1c9bac885c55d772c812d2a9d525", + "hash": "sha256-EVXwjrxooZm1JqG4HswUe8zwN81Rm7SPB5Fr4WfpTnc=" }, "beetle-supergrafx": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "1ff2daa9377114d5394142f75f1c388b706567ed", - "hash": "sha256-0FCm9kURtUQpyPb8cSmRAxttnUJnhE3EWV8DPvlj8HE=" + "rev": "56261ccd56f576a42a2d22190c09eb326a4331da", + "hash": "sha256-aoEq4o9uZIAsjQQsN+tJNhOuFA9SNb7RKIUwqUGPhJQ=" }, "beetle-vb": { "owner": "libretro", "repo": "beetle-vb-libretro", - "rev": "dd6393f76ff781df0f4e8c953f5b053b1e61b313", - "hash": "sha256-C8OtTNdC7GNFsY2EH56in35IX8d6ou/1R04kMvM9674=" + "rev": "732a8f701e671bf032165730fdf8bd96fb5ca7bb", + "hash": "sha256-M19+ZidqqDdohuAVPxGVFQDQqoMl2QYM+K1WToqeOWM=" }, "beetle-wswan": { "owner": "libretro", "repo": "beetle-wswan-libretro", - "rev": "81e8b2afd31b7f0f939a3df6d70c8723bcc8a701", - "hash": "sha256-xmDtMC5pId5X4vf9kHO55HmRpp/4ZruOM8QJSl//9R8=" + "rev": "a0ddcd3f084f5b4eb06acb6e03b8c4707a2f6123", + "hash": "sha256-FJfznSo/3YKecVSU9mZW6yzd4/8vf2qrX4xhWjptd+A=" }, "blastem": { "owner": "libretro", @@ -92,20 +98,20 @@ "bluemsx": { "owner": "libretro", "repo": "bluemsx-libretro", - "rev": "acf358be18644a9df0ed9602d63c2f73d4fe605a", - "hash": "sha256-K4mH+brakYZcVEeYMFUkFThqdZGt2+aP5DfpOgWSJxg=" + "rev": "e21bf74bddb79ad1bbe20b4d964e7515269c669b", + "hash": "sha256-U58zJd7txOyd9jymVmogQMIH5Av2kjO5MOn49T2FmqQ=" }, "bsnes": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "4da970a334ba4644cef72e560985ea3f31fa40f7", - "hash": "sha256-Bu5j1wrMNVMmxQULZwTdXyWi2i6F5C6m8wFDxvtjYdI=" + "rev": "3fe4f9049f99ac71d038b3cb684ebfc8e6cef15a", + "hash": "sha256-fUcJQGkLGTgxEGwWVoZ4Hys9kOKAft7CDTTdQ8j4+Do=" }, "bsnes-hd": { "owner": "DerKoun", "repo": "bsnes-hd", - "rev": "04821703aefdc909a4fd66d168433fcac06c2ba7", - "hash": "sha256-QmNthbWb92vel5PFwJRXeEEVZHIxfvZ0ls+csodpGbU=" + "rev": "f46b6d6368ea93943a30b5d4e79e8ed51c2da5e8", + "hash": "sha256-Y3FhGtcz7BzwUSBy1SGMuylJdZti/JB8qQnabIkG/dI=" }, "bsnes-mercury": { "owner": "libretro", @@ -123,8 +129,8 @@ "desmume": { "owner": "libretro", "repo": "desmume", - "rev": "fbd368c8109f95650e1f81bca1facd6d4d8687d7", - "hash": "sha256-7MFa5zd1jdOCqSI+VPl5nAHE7Kfm/lA0lbSPFskzqaQ=" + "rev": "cf0fcc6ea4a85b7491bdf9adc7bf09748b4be7da", + "hash": "sha256-ne4Tu8U/WSB4vlwBQMK7Ss3UEpDxsOFltpMk2hIx23M=" }, "desmume2015": { "owner": "libretro", @@ -147,14 +153,14 @@ "dosbox-pure": { "owner": "schellingb", "repo": "dosbox-pure", - "rev": "035e01e43623f83a9e71f362364fd74091379455", - "hash": "sha256-j7Or4yTK5l+ZVC5UFeym9sLx+88PRlofoBT1tMuf31A=" + "rev": "e8396b8564ed88d87702ee40b935dec6384c0e5a", + "hash": "sha256-rD7b1uX/Wsu2ik06IiHKbUHT05IllCoBcPMN9OJ0+X4=" }, "eightyone": { "owner": "libretro", "repo": "81-libretro", - "rev": "340a51b250fb8fbf1a9e5d3ad3924044250064e0", - "hash": "sha256-Cz3gPwbME8lDMKju3dn8hM8O2u9h9+8EUg7Nf6a7epA=" + "rev": "6d1b4d26aa9870133616fcfb5a763ca138ae25d1", + "hash": "sha256-KCtJvYWcS3DjAZfyP4sG496X9fOHji/ZwpjiZD0OFDY=" }, "fbalpha2012": { "owner": "libretro", @@ -165,32 +171,33 @@ "fbneo": { "owner": "libretro", "repo": "fbneo", - "rev": "ffcd114b8ea3f3387b66997263ea5df358675aa5", - "hash": "sha256-a4hXRluHQY5hC5jFU2mlqUAI5GmQk6Rbl1HNRA929CI=" + "rev": "9e22c4c7ac42d5f1e5ffacdecb26acae60c663eb", + "hash": "sha256-obzPz5lPqcQzLbB7cFGI50W1rFnF8tqZkpocETSAH0Q=" }, "fceumm": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "1fa798b220a6df8417dcf7da0ab117533385d9c2", - "hash": "sha256-B1iHZ7BVaM/GBgdD2jNZIEmXcRqKC6YaO9z1ByocMtE=" + "rev": "7fad08e5522e5396a1196055fc106be9b5d5de77", + "hash": "sha256-XHutsAc2PD8INP2u8WTmr2+rxuklXjBruH/mNl5Ro34=" }, "flycast": { - "owner": "libretro", + "owner": "flyinghead", "repo": "flycast", - "rev": "4c293f306bc16a265c2d768af5d0cea138426054", - "hash": "sha256-9IxpRBY1zifhOebLJSDMA/wiOfcZj+KOiPrgmjiFxvo=" + "rev": "39a212140a159e7e7a183a40a201863c0560a945", + "hash": "sha256-lvagJRedkh9m48yHo7ErsIyW9W2QXs6wnEjSgtrHE74=", + "fetchSubmodules": true }, "fmsx": { "owner": "libretro", "repo": "fmsx-libretro", - "rev": "1360c9ff32b390383567774d01fbe5d6dfcadaa3", - "hash": "sha256-LLGD29HKpV34IOJ2ygjHZZT7XQqHHXccnpGNfWCuabg=" + "rev": "1806eed4376fbe2fad82fa19271ea298cfbb7795", + "hash": "sha256-nX0H/+iEq7eBN4tm1+dT6/3BYLCpoyiE/L6waDPmUZI=" }, "freeintv": { "owner": "libretro", "repo": "freeintv", - "rev": "9a65ec6e31d48ad0dae1f381c1ec61c897f970cb", - "hash": "sha256-ZeWw/K6i04XRympqZ6sQG/yjN8cJglVcIkxpyRHx424=" + "rev": "85bf25a39a34bbc39fe36677175d87c2b597dbe7", + "hash": "sha256-4cU/YRZZb7EWNBJX8M91Lb+bCCIlks6xX2Cf6Iq/g9g=" }, "fuse": { "owner": "libretro", @@ -201,62 +208,62 @@ "gambatte": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "ea563fac40e281b29d37f6b56657abef8f1aaf0d", - "hash": "sha256-2jVbEsGkvdH1lA2//mb2Rm3xeh4EyFUcOUXdydSisvk=" + "rev": "64561b7e1b21dfa42eecb94963c1c495ba332466", + "hash": "sha256-BRh357MGHlglGSs48LhhRNTTyAUD9O0QmGeqLnyYap0=" }, "genesis-plus-gx": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "f6a9bd72a56a11c2068be2d15fa52dda3e1e8027", - "hash": "sha256-4siJGPRMpXHfP6mBPoDJArNaISTNjPKT69cvtGldadI=" + "rev": "141257e1e2104c4e4a49dc771d9f3c06e00292ec", + "hash": "sha256-voNDwfwBIzuq9peNJ2CtF6UBnaJCDpiWmqPgtrPZplU=" }, "gpsp": { "owner": "libretro", "repo": "gpsp", - "rev": "541adc9e1c6c9328c07058659594d6300ae0fa19", - "hash": "sha256-2iv/gMOgTZReDgVzEc3WyOdAlYgfANK08CtpZIyPxgA=" + "rev": "c0d8ffaa384f724e1a0743e18cb042c29dd48f7f", + "hash": "sha256-KKO0bBV+5+8UcSspZHfinntp/mxukcf6/P4kIi6doUs=" }, "gw": { "owner": "libretro", "repo": "gw-libretro", - "rev": "19a1cb3105ca4a82139fb4994e7995fd956f6f8d", - "hash": "sha256-luhKXzxrXVNAHw8ArF1I78Zch7XEPwI3aqe0f6WRgD0=" + "rev": "0ecff52b11c327af52b22ea94b268c90472b6732", + "hash": "sha256-N/nZoo+duk7XhRtNdV1paWzxYUhv8nLUcnnOs2gbZuQ=" }, "handy": { "owner": "libretro", "repo": "libretro-handy", - "rev": "63db085af671bad2929078c55434623b7d4632a1", - "hash": "sha256-N6M3KSU4NPJCqoG/UMrna9/6H5PsBBMUQLrvqiIdxpE=" + "rev": "0559d3397f689ea453b986311aeac8dbd33afb0b", + "hash": "sha256-Nsp0jiOLWjTGJRURkwx8mj7bBG8nM5fRqE93Lo9n4ac=" }, "hatari": { "owner": "libretro", "repo": "hatari", - "rev": "1ebf0a0488580ef95c0b28f02223b31813c867c5", - "hash": "sha256-i6dr+fFWPatRCIY+ajIZ1p3ERPV5ktv0nxHKxbGE5ao=" + "rev": "d0903a9447323e647ed9756238ba1550cac92940", + "hash": "sha256-kSdK7rkORgTkMg8kL56pNb+wU+m2413shEt7UQ9SCjM=" }, "mame": { "owner": "libretro", "repo": "mame", - "rev": "f7761a9902d59030882c58d4482446196e748c50", - "hash": "sha256-g37WAMt9iBbAYq4DfeTlHWmdW5/Vl7g90v6vCLmMQ3g=" + "rev": "3d612fb19eb95c0ae322c3cab343857b14a65a9c", + "hash": "sha256-ibd8HEKQJo7hrhzqYDu6LzMmIFncXCafod9VXBx9OU0=" }, "mame2000": { "owner": "libretro", "repo": "mame2000-libretro", - "rev": "0208517404e841fce0c094f1a2776a0e1c6c101d", - "hash": "sha256-WEJd7wSzY32sqMpMrjCD0hrOyAQq1WMBaGiY/2QQ4BQ=" + "rev": "720b8ad4cbd76abd57b9aeced9ba541dc8476f7f", + "hash": "sha256-3HnDsZQRjp7PqUdYTAEGsroP1paoTAcTBb1fd7/LBJA=" }, "mame2003": { "owner": "libretro", "repo": "mame2003-libretro", - "rev": "b1cc49cf1d8bbef88b890e1c2a315a39d009171b", - "hash": "sha256-bc4uER92gHf20JjR/Qcetvlu89ZmldJ1DiQphJZt/EA=" + "rev": "105ca02fb85e92b9dd5d6ee43f7152d1199eb149", + "hash": "sha256-zYv3OIgapglsyjWs69IhSJGVQ7CkviKJjKnVom5f9/c=" }, "mame2003-plus": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "0b9309d9d86aea2457df74709e997bea37899475", - "hash": "sha256-US0nkEH4EeKRejuN8UoDeLt5dhafuo7PEVx0FnpeUG0=" + "rev": "a1ff7485de011926ab21309ad1766f9cad3af58e", + "hash": "sha256-Amp+Fcl2dWS1qDMaa/QL0X5loXRYmnByUjUzliQmLvY=" }, "mame2010": { "owner": "libretro", @@ -279,14 +286,14 @@ "melonds": { "owner": "libretro", "repo": "melonds", - "rev": "0e1f06da626cbe67215c3f06f6bdf510dd4e4649", - "hash": "sha256-ax9Vu8+1pNAHWPXrx5QA0n5EsmaJ2T7KJ5Otz8DSZwM=" + "rev": "c6488c88cb4c7583dbcd61609e0eef441572fae8", + "hash": "sha256-kU0xPM6WBqK6UpMNMotHc3jRFTodahPJRrfbcjdCJTI=" }, "mesen": { "owner": "libretro", "repo": "mesen", - "rev": "caa4e6f14373c40bd2805c600d1b476e7616444a", - "hash": "sha256-cnPNBWXbnCpjgW/wJIboiRBzv3zrHWxpNM1kg09ShLU=" + "rev": "d25d60fc190f3f7603a1113ef1e11d9da65b7583", + "hash": "sha256-C/05mkPHJ8Bsj+uZOqY6rhMc0qx33kSxAT5SNDUPRUU=" }, "mesen-s": { "owner": "libretro", @@ -303,14 +310,14 @@ "mgba": { "owner": "libretro", "repo": "mgba", - "rev": "a69c3434afe8b26cb8f9463077794edfa7d5efad", - "hash": "sha256-rmitsZzRWJ0VYzcNz/UtIK8OscQ4lkyuAwgfXOvSTzg=" + "rev": "314bf7b676f5b820f396209eb0c7d6fbe8103486", + "hash": "sha256-Rk+glDgSa1J1IIe5NrJElX9zr59+LQynfDXuHWyZcEM=" }, "mupen64plus": { "owner": "libretro", "repo": "mupen64plus-libretro-nx", - "rev": "5a63aadedc29655254d8fc7b4da3a325472e198b", - "hash": "sha256-QNa8WGJFShO4vc4idUntCUaLik4xQXBA+X7z5sjZ2NE=" + "rev": "26fd1edd640ff3db49dd5ebb7e54f0de6600fc45", + "hash": "sha256-JueRR2PheAz8sPG8OIpjp1Xih6z2Xp8f7WD+2MuBPo4=" }, "neocd": { "owner": "libretro", @@ -321,8 +328,8 @@ "nestopia": { "owner": "libretro", "repo": "nestopia", - "rev": "16b14865caf1effca030630e2fc73d2d4271fc53", - "hash": "sha256-dU9X8sK/qDA/Qj0x1GicmSAzQyRqVmLiTcfCPe8+BjM=" + "rev": "3dcbec4682e079312d6943e1357487645ec608c7", + "hash": "sha256-+jWedFwuFwZzdYEyKR77AhEBoW6ecY7HAIYEKt9PRg8=" }, "np2kai": { "owner": "AZO234", @@ -346,71 +353,77 @@ "opera": { "owner": "libretro", "repo": "opera-libretro", - "rev": "8a49bb8877611037438aeb857cb182f41ee0e3a1", - "hash": "sha256-oH+sQi4D+xkqiJbq7fgGdHjgvyLt8UjlgXIo7K3wXZM=" + "rev": "100ae1e7decefe1f17d98cfcb9f2af4ff8452691", + "hash": "sha256-GOabGs5JP4hg4y5xEATZMEWuqQxFxdc6ZMnO4oLC2yk=" }, "parallel-n64": { "owner": "libretro", "repo": "parallel-n64", - "rev": "a03fdcba6b2e9993f050b50112f597ce2f44fa2c", - "hash": "sha256-aJG+s+1OkHQHPvVzlJWU/VziQWj1itKkRwqcEBK+lgA=" + "rev": "49eadb4da85f7e3bd59b60f61e8fd5dbfb9f07d5", + "hash": "sha256-S8gsPOgxdq0SwoYFua4ouT7XjT45d/mwCYmI3VVahdI=" }, "pcsx2": { "owner": "libretro", - "repo": "pcsx2", + "repo": "lrps2", "rev": "f3c8743d6a42fe429f703b476fecfdb5655a98a9", "hash": "sha256-0piCNWX7QbZ58KyTlWp4h1qLxXpi1z6ML8sBHMTvCY4=" }, "pcsx_rearmed": { "owner": "libretro", "repo": "pcsx_rearmed", - "rev": "4373e29de72c917dbcd04ec2a5fb685e69d9def3", - "hash": "sha256-727//NqBNEo6RHNQr1RY5cxMrEvfuJczCo+cUJZVv7U=" + "rev": "ead6fd751369f6fe50cb5092ab5530fbf1d66b67", + "hash": "sha256-JzvcM8T/xMP7MDn/58TDNrHN8bjU63/PBtj7JJYYiVo=" }, "picodrive": { "owner": "libretro", "repo": "picodrive", - "rev": "7ab066aab84f15388a53433ea273420bcf917e00", - "hash": "sha256-NK9ASiiIkGZmi2YfCqEzZallVfS7nprLRrBk4dlGyAI=", + "rev": "570319349588288f64c676123244acdb0be33881", + "hash": "sha256-KG5A5NBWi5jKpJOSdSQxjn+wm2F198AINKIU+figoqs=", "fetchSubmodules": true }, "play": { "owner": "jpd002", "repo": "Play-", - "rev": "b33834af08a4954f06be215eee80a72e7a378e91", - "hash": "sha256-IxZk+kSdrkDAabbzdFM8QUrjaJUc1DHjSfAtDuwDJkw=", + "rev": "f50566ffdf6a2f1d0cedfb900f1ee24b9c80fd8e", + "hash": "sha256-G45UMzNh5I7beO8sBtwc80HPioB907UEPtfB1NSS4OY=", "fetchSubmodules": true }, "ppsspp": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "7df51c3d060a780b7383c5c1380e346ad9304bb4", - "hash": "sha256-GK3W0/yWaID3s0W0v6TcgJ0ZU984YspWMS6+XLyThjM=", + "rev": "638192b0245e73a602c5f0d60e80dc7b78ff0793", + "hash": "sha256-Ls9k563j8yEasu6dBs2cmWR+9twBKTolqTLkr3Nt7Uk=", "fetchSubmodules": true }, "prboom": { "owner": "libretro", "repo": "libretro-prboom", - "rev": "d9c3975669b4aab5a1397e0174838bcbbc3c1582", - "hash": "sha256-klSJ7QIpNjlfyjhfeEQZ3j8Gnp4agd0qKVp0vr+KHVA=" + "rev": "6ec854969fd9dec33bb2cab350f05675d1158969", + "hash": "sha256-y0qZwYNwcO4ofWDZ7UXN9ZVMPFxjCnLDDZKBMdZLxEY=" }, "prosystem": { "owner": "libretro", "repo": "prosystem-libretro", - "rev": "763ad22c7de51c8f06d6be0d49c554ce6a94a29b", - "hash": "sha256-rE/hxP8hl9lLTNx/WympFDByjZs46ekyxLKRV4V8D9E=" + "rev": "4202ac5bdb2ce1a21f84efc0e26d75bb5aa7e248", + "hash": "sha256-BR0DTWcB5g0rEoNSxBx+OxBmLELjdR2fgsmdPU7cK68=" }, "puae": { "owner": "libretro", "repo": "libretro-uae", - "rev": "ae58c0f226b654d643b9f2dce58f64657f57cb76", - "hash": "sha256-6oMTwCYGdVhh+R853gOQRzZfa7slDwe6aGVCvdm6NDU=" + "rev": "7bdd798ef14dccafe283588cbf8eb303832a1858", + "hash": "sha256-ML3hRYujyh7WPm9Sx6RzQAxaTqlhneVLDi6qcNJ+hi8=" }, "quicknes": { "owner": "libretro", "repo": "QuickNES_Core", - "rev": "75d501a87ec2074e8d2f7256fb0359513c263c29", - "hash": "sha256-yAHVTgOt8SGyPXihp4YNKKAvxl9VBBAvHyzLW86zSCw=" + "rev": "058d66516ed3f1260b69e5b71cd454eb7e9234a3", + "hash": "sha256-eWnbx4NsxanvSls8lguKBijYZ4+uF97d9es9Yn+3PKs=" + }, + "same_cdi": { + "owner": "libretro", + "repo": "same_cdi", + "rev": "54cf493c2dee4c46666059c452f8aaaa0bd7c8e0", + "hash": "sha256-/+4coMzj/o82Q04Z65DQiPaykK6N56W6PRQLtyJOd8E=" }, "sameboy": { "owner": "libretro", @@ -419,10 +432,10 @@ "hash": "sha256-hQWIuNwCykkJR+6naNarR50kUvIFNny+bbZHR6/GA/4=" }, "scummvm": { - "owner": "libretro", + "owner": "libretro-mirrors", "repo": "scummvm", - "rev": "ab2e5d59cd25dfa5943d45c2567e8330d67fad8b", - "hash": "sha256-9IaQR0prbCT70iWA99NMgGAKPobifdWBX17p4zL0fEM=" + "rev": "2fb2e4c551c9c1510c56f6e890ee0300b7b3fca3", + "hash": "sha256-wrlFqu+ONbYH4xMFDByOgySobGrkhVc7kYWI4JzA4ew=" }, "smsplus-gx": { "owner": "libretro", @@ -433,8 +446,8 @@ "snes9x": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "cc0a87711a7a208cabefc9fd1dbb90e31fe51684", - "hash": "sha256-1m6QvYl5Z0WM1XeXCYLvQaXH8A15P3x8ZzwdFeVPeWo=" + "rev": "0e03a36847c2ab14d84963b0263e653aa4087ff4", + "hash": "sha256-wRkBT80HBE1JXqNSvm0LhhUSjHe1DP3uMy3fKW71uZA=" }, "snes9x2002": { "owner": "libretro", @@ -457,8 +470,8 @@ "stella": { "owner": "stella-emu", "repo": "stella", - "rev": "93ea39d6155f08c21707a85a0b04b33008a7ab15", - "hash": "sha256-9dCBaLxb1CBbngBd3tJ0x5lT+dnzzhK2DO4Gk/S6WW4=" + "rev": "85f23044437a5da35d68f96045d363d0e339f872", + "hash": "sha256-b/3cq+CdQ6MLFzzF/cFTbL0XCSqZFc0Rj9e+bNiN3WY=" }, "stella2014": { "owner": "libretro", @@ -469,8 +482,8 @@ "swanstation": { "owner": "libretro", "repo": "swanstation", - "rev": "e24f21196cdcd50321475c4366b51af245a6bbe6", - "hash": "sha256-DjAB0Z0yY9IGESeNNkkbdoAO5ItJ/8cZ5ycRofHG978=" + "rev": "376744746a6880b5eec7ac48b5c006c9ae8c6770", + "hash": "sha256-5mKNypA0x/FkDZvWhuEr/J5WP7saR7cKo0DQ2DZ36ZE=" }, "tgbdual": { "owner": "libretro", @@ -494,26 +507,26 @@ "vba-m": { "owner": "libretro", "repo": "vbam-libretro", - "rev": "640ce45325694d1dc574e90c95c55bc464368d7e", - "hash": "sha256-aiIeleZHt95Y/kigLEbRaCb3KM0ezMB7yzO16FbuBNM=" + "rev": "a2378f05f600a5a9cf450c60a87976b80d6a895a", + "hash": "sha256-vWm28cSEGex5h7JkJjzNPqEGtQWHK0dpK2gVDlQ3NbM=" }, "vba-next": { "owner": "libretro", "repo": "vba-next", - "rev": "0c310082a6345790124e9348861b300bcccbeced", - "hash": "sha256-RQx/WR83EtPcQkx0ft4Y0/5LaKIOST3L/fh4qoPxz78=" + "rev": "ee92625d2f1666496be4f5662508a2430e846b00", + "hash": "sha256-r3FKBD4GUUkobMJ33VceseyTyqxm/Wsa5Er6XcfGL2Q=" }, "vecx": { "owner": "libretro", "repo": "libretro-vecx", - "rev": "8e932c1d585ae9e467186dea9e73ce38fe1490f7", - "hash": "sha256-2Vo30yiP6SfUt3XHCfQTKTKEtCywdRIoUe6d0Or21WM=" + "rev": "a401c268e425dc8ae6a301e7fdb9a9e96f39b8ea", + "hash": "sha256-24/bcQ5mgLl7zKvpnnSYr5SoLG02al6dP27KoOtnua4=" }, "virtualjaguar": { "owner": "libretro", "repo": "virtualjaguar-libretro", - "rev": "2cc06899b839639397b8b30384a191424b6f529d", - "hash": "sha256-7FiU5/n1hVePttkz7aVfXXx88+zX06/5SJk3EaRYvhQ=" + "rev": "8126e5c504ac7217a638f38e4cd9190822c8abdd", + "hash": "sha256-U/qdKApE0OU3jc6ekfgEZ7VCaIqCc2h+Y+IHe7PIRY0=" }, "yabause": { "owner": "libretro", diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/libretro-core-info.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/libretro-core-info.nix index 308f78c08e..952881f410 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/libretro-core-info.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/libretro-core-info.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "libretro-core-info"; - version = "1.15.0"; + version = "unstable-2023-07-31"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-core-info"; - hash = "sha256-WIgcHuZgAOrlg+WyOS4TyzWziNzjyQB2sPDM9fR6kwA="; - rev = "v${version}"; + hash = "sha256-VdFsrLiJ+Wu1OKvwX9fMI96CxTareOTK8x6OfksBuYs="; + rev = "dacae85b406131feb12395a415fdf57fc4745201"; }; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-assets.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-assets.nix index 265b827577..1902296397 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-assets.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-assets.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "retroarch-assets"; - version = "unstable-2022-10-24"; + version = "unstable-2023-09-11"; src = fetchFromGitHub { owner = "libretro"; repo = "retroarch-assets"; - rev = "4ec80faf1b5439d1654f407805bb66141b880826"; - hash = "sha256-j1npVKEknq7hpFr/XfST2GNHI5KnEYjZAM0dw4tMsYk="; + rev = "7b735ef18bcc6508b1c9a626eb237779ff787179"; + hash = "sha256-S9wWag9fNpCTMKY8yQaF7jFuX1P5XLy/Z4vjtVDK7lg="; }; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix index 92ba7f20c8..ca12c1e2a1 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "retroarch-joypad-autoconfig"; - version = "1.15.0"; + version = "unstable-2023-08-01"; src = fetchFromGitHub { owner = "libretro"; repo = "retroarch-joypad-autoconfig"; - rev = "v${version}"; - hash = "sha256-/F2Y08uDA/pIIeLiLfOQfGVjX2pkuOqPourlx2RbZ28="; + rev = "5666e46bb89caf4e9af358fdb97a2b384cb62f36"; + hash = "sha256-5Po0v0E/dc+nVHnHlJRZzv66B/DKYarwqTkS9+/ktC4="; }; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py index a091958c38..5348092c52 100755 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/update_cores.py @@ -17,6 +17,7 @@ CORES = { "beetle-gba": {"repo": "beetle-gba-libretro"}, "beetle-lynx": {"repo": "beetle-lynx-libretro"}, "beetle-ngp": {"repo": "beetle-ngp-libretro"}, + "beetle-pce": {"repo": "beetle-pce-libretro"}, "beetle-pce-fast": {"repo": "beetle-pce-fast-libretro"}, "beetle-pcfx": {"repo": "beetle-pcfx-libretro"}, "beetle-psx": {"repo": "beetle-psx-libretro"}, @@ -41,7 +42,7 @@ CORES = { "fbalpha2012": {"repo": "fbalpha2012"}, "fbneo": {"repo": "fbneo"}, "fceumm": {"repo": "libretro-fceumm"}, - "flycast": {"repo": "flycast"}, + "flycast": {"repo": "flycast", "owner": "flyinghead", "fetch_submodules": True}, "fmsx": {"repo": "fmsx-libretro"}, "freeintv": {"repo": "freeintv"}, "fuse": {"repo": "fuse-libretro"}, @@ -71,7 +72,10 @@ CORES = { "o2em": {"repo": "libretro-o2em"}, "opera": {"repo": "opera-libretro"}, "parallel-n64": {"repo": "parallel-n64"}, - "pcsx2": {"repo": "pcsx2"}, + # libretro/lrps2 is a hard-fork of pcsx2 with simplified code to target + # only libretro, while libretro/pcsx2 is supposedly closer to upstream. + # TODO: switch to libretro/pcsx2 since this is more up-to-date + "pcsx2": {"repo": "lrps2"}, "pcsx_rearmed": {"repo": "pcsx_rearmed"}, "picodrive": {"repo": "picodrive", "fetch_submodules": True}, "play": {"repo": "Play-", "owner": "jpd002", "fetch_submodules": True}, @@ -81,7 +85,13 @@ CORES = { "puae": {"repo": "libretro-uae"}, "quicknes": {"repo": "QuickNES_Core"}, "sameboy": {"repo": "sameboy"}, - "scummvm": {"repo": "scummvm"}, + "same_cdi": {"repo": "same_cdi"}, + # This is the old source code before they upstreamed the source code, + # so now the libretro related code lives in the scummvm/scummvm repository. + # However this broke the old way we were doing builds, so for now point + # to a mirror with the old source code until this issue is fixed. + # TODO: switch to libretro/scummvm since this is more up-to-date + "scummvm": {"repo": "scummvm", "owner": "libretro-mirrors"}, "smsplus-gx": {"repo": "smsplus-gx"}, "snes9x": {"repo": "snes9x", "owner": "snes9xgit"}, "snes9x2002": {"repo": "snes9x2002"}, diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ripes/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ripes/default.nix index 3966be9e76..b3e58658b4 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ripes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ripes/default.nix @@ -8,6 +8,7 @@ , wrapQtAppsHook , cmake , python3 +, stdenv }: mkDerivation rec { @@ -36,15 +37,23 @@ mkDerivation rec { ]; installPhase = '' + runHook preInstall + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -r Ripes.app $out/Applications/ + makeBinaryWrapper $out/Applications/Ripes.app/Contents/MacOS/Ripes $out/bin/Ripes + '' + lib.optionalString stdenv.isLinux '' install -D Ripes $out/bin/Ripes + '' + '' cp -r ${src}/appdir/usr/share $out/share + runHook postInstall ''; meta = with lib; { description = "A graphical processor simulator and assembly editor for the RISC-V ISA"; homepage = "https://github.com/mortbopet/Ripes"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ rewine ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix index 19e9ea8026..028e1daff0 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ryujinx/default.nix @@ -28,13 +28,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.986"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.1012"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "33f544fd9248361440afd6013e0ef9d69971d6da"; - sha256 = "1cnz3j8qndfrm1iifbzswyf4vcii939naj29bvr2mp6bdwrbqi49"; + rev = "e6700b314f1384f015666767baf9ea1d8411e330"; + sha256 = "1szgmvwril7zwfbvqz850xavrk70i56i1yyqfh9mxpxlc3n9xxzr"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix index 2b252f0f10..b090864d0d 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/vbam/default.nix @@ -18,12 +18,12 @@ stdenv.mkDerivation rec { pname = "visualboyadvance-m"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "visualboyadvance-m"; repo = "visualboyadvance-m"; rev = "v${version}"; - sha256 = "1fph8phbswq6d9lgw1y1767wdp316w5hn5bws6h2dj75gvsqf221"; + sha256 = "sha256-XMb4+YPH1xgbiRC4vmooxALmjX2QURLWOGOwepdWI7o="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE='Release'" "-DENABLE_FFMPEG='true'" "-DENABLE_LINK='true'" "-DSYSCONFDIR=etc" diff --git a/third_party/nixpkgs/pkgs/applications/emulators/vice/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/vice/default.nix index 45fb03f1ac..0b6dac3286 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/vice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/vice/default.nix @@ -6,175 +6,68 @@ , perl , libpng , giflib -, libjpeg , alsa-lib , readline , libGLU , libGL -, libXaw , pkg-config -, gtk2 +, gtk3 +, glew , SDL , SDL_image -, autoreconfHook -, makeDesktopItem , dos2unix +, runtimeShell , xa , file +, wrapGAppsHook +, xdg-utils }: -let - desktopItems = [ - (makeDesktopItem { - name = "x128"; - exec = "x128"; - comment = "VICE: C128 Emulator"; - desktopName = "VICE: C128 Emulator"; - genericName = "Commodore 128 emulator"; - categories = [ "System" ]; - }) - - (makeDesktopItem { - name = "x64"; - exec = "x64"; - comment = "VICE: C64 Emulator"; - desktopName = "VICE: C64 Emulator"; - genericName = "Commodore 64 emulator"; - categories = [ "System" ]; - }) - - (makeDesktopItem { - name = "x64dtv"; - exec = "x64dtv"; - comment = "VICE: C64 DTV Emulator"; - desktopName = "VICE: C64 DTV Emulator"; - genericName = "Commodore 64 DTV emulator"; - categories = [ "System" ]; - }) - - (makeDesktopItem { - name = "x64sc"; - exec = "x64sc"; - comment = "VICE: C64 SC Emulator"; - desktopName = "VICE: C64 SC Emulator"; - genericName = "Commodore 64 SC emulator"; - categories = [ "System" ]; - }) - - (makeDesktopItem { - name = "xcbm2"; - exec = "xcbm2"; - comment = "VICE: CBM-II B-Model Emulator"; - desktopName = "VICE: CBM-II B-Model Emulator"; - genericName = "CBM-II B-Model Emulator"; - categories = [ "System" ]; - }) - - (makeDesktopItem { - name = "xcbm5x0"; - exec = "xcbm5x0"; - comment = "VICE: CBM-II P-Model Emulator"; - desktopName = "VICE: CBM-II P-Model Emulator"; - genericName = "CBM-II P-Model Emulator"; - categories = [ "System" ]; - }) - - (makeDesktopItem { - name = "xpet"; - exec = "xpet"; - comment = "VICE: PET Emulator"; - desktopName = "VICE: PET Emulator"; - genericName = "Commodore PET Emulator"; - categories = [ "System" ]; - }) - - (makeDesktopItem { - name = "xplus4"; - exec = "xplus4"; - comment = "VICE: PLUS4 Emulator"; - desktopName = "VICE: PLUS4 Emulator"; - genericName = "Commodore PLUS4 Emulator"; - categories = [ "System" ]; - }) - - (makeDesktopItem { - name = "xscpu64"; - exec = "xscpu64"; - comment = "VICE: SCPU64 Emulator"; - desktopName = "VICE: SCPU64 Emulator"; - genericName = "Commodore SCPU64 Emulator"; - categories = [ "System" ]; - }) - - (makeDesktopItem { - name = "xvic"; - exec = "xvic"; - comment = "VICE: VIC-20 Emulator"; - desktopName = "VICE: VIC-20 Emulator"; - genericName = "Commodore VIC-20 Emulator"; - categories = [ "System" ]; - }) - - (makeDesktopItem { - name = "vsid"; - exec = "vsid"; - comment = "VSID: The SID Emulator"; - desktopName = "VSID: The SID Emulator"; - genericName = "SID Emulator"; - categories = [ "System" ]; - }) - ]; -in stdenv.mkDerivation rec { pname = "vice"; - version = "3.6.1"; + version = "3.7.1"; src = fetchurl { url = "mirror://sourceforge/vice-emu/vice-${version}.tar.gz"; - sha256 = "sha256-IN+EyFGq8vUABRCSf20xsy8mmRbTUUZcNm3Ar8ncFQw="; + sha256 = "sha256-fjgR5gJNsGmL+8MhuzJFckRriFPQG0Bz8JhllXsMq5g="; }; nativeBuildInputs = [ - autoreconfHook bison dos2unix file flex pkg-config + wrapGAppsHook ]; buildInputs = [ alsa-lib giflib - gtk2 + gtk3 + glew libGL libGLU - libXaw - libjpeg libpng perl readline SDL SDL_image xa + xdg-utils ]; dontDisableStatic = true; - configureFlags = [ "--enable-fullscreen" "--enable-gnomeui" "--disable-pdf-docs" ]; + configureFlags = [ "--enable-sdl2ui" "--enable-gtk3ui" "--enable-desktop-files" "--disable-pdf-docs" "--with-gif" ]; + + LIBS = "-lGL"; preBuild = '' - for i in src/resid src/resid-dtv - do - mkdir -pv $i/src - ln -sv ../../wrap-u-ar.sh $i/src - done + sed -i -e 's|#!/usr/bin/env bash|${runtimeShell}/bin/bash|' src/arch/gtk3/novte/box_drawing_generate.sh ''; postInstall = '' - for app in ${toString desktopItems} - do - mkdir -p $out/share/applications - cp $app/share/applications/* $out/share/applications - done + mkdir -p $out/share/applications + cp src/arch/gtk3/data/unix/vice-org-*.desktop $out/share/applications ''; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix index bc8051d6de..2e84a8f209 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optional fontconfigSupport pkgs.fontconfig ++ lib.optional alsaSupport pkgs.alsa-lib ++ lib.optional pulseaudioSupport pkgs.libpulseaudio - ++ lib.optional (xineramaSupport && !waylandSupport) pkgs.xorg.libXinerama + ++ lib.optional (xineramaSupport && x11Support) pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev ++ lib.optional vulkanSupport (if stdenv.isDarwin then moltenvk else pkgs.vulkan-loader) ++ lib.optional sdlSupport pkgs.SDL2 @@ -90,11 +90,11 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] ++ lib.optionals (openglSupport && !stdenv.isDarwin) [ pkgs.libGLU pkgs.libGL pkgs.mesa.osmesa pkgs.libdrm ] ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ - CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security + CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration PCSC Security ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenCL Cocoa Carbon ]) - ++ lib.optionals (stdenv.isLinux && !waylandSupport) (with pkgs.xorg; [ - libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext + ++ lib.optionals (x11Support) (with pkgs.xorg; [ + libX11 libXcomposite libXcursor libXext libXfixes libXi libXrandr libXrender libXxf86vm ]) ++ lib.optionals waylandSupport (with pkgs; [ wayland libxkbcommon wayland-protocols wayland.dev libxkbcommon.dev @@ -103,14 +103,27 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { patches = [ ] ++ lib.optionals stdenv.isDarwin [ - # Wine requires `MTLDevice.registryID` for `winemac.drv`, but that property is not available - # in the 10.12 SDK (current SDK on x86_64-darwin). Work around that by using selector syntax. + # Wine uses `MTLDevice.registryID` in `winemac.drv`, but that property is not available in + # the 10.12 SDK (current SDK on x86_64-darwin). That can be worked around by using selector + # syntax. As of Wine 8.12, the logic has changed and uses selector syntax, but it still + # uses property syntax in one place. The first patch is necessary only with older + # versions of Wine. The second is needed on all versions of Wine. + (lib.optional (lib.versionOlder version "8.12") ./darwin-metal-compat-pre8.12.patch) ./darwin-metal-compat.patch # Wine requires `qos.h`, which is not included by default on the 10.12 SDK in nixpkgs. ./darwin-qos.patch ] ++ patches'; + # Because the 10.12 SDK doesn’t define `registryID`, clang assumes the undefined selector returns + # `id`, which is a pointer. This causes implicit pointer to integer errors in clang 15+. + # The following post-processing step adds a cast to `uint64_t` before the selector invocation to + # silence these errors. + postPatch = lib.optionalString stdenv.isDarwin '' + sed -e 's|\(\[[A-Za-z_][][A-Za-z_0-9]* registryID\]\)|(uint64_t)\1|' \ + -i dlls/winemac.drv/cocoa_display.m + ''; + configureFlags = prevConfigFlags ++ lib.optionals supportFlags.waylandSupport [ "--with-wayland" ] ++ lib.optionals supportFlags.vulkanSupport [ "--with-vulkan" ] @@ -192,7 +205,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { ]; description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms; - maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira ]; + maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira reckenrode ]; inherit mainProgram; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/builder-wow.sh b/third_party/nixpkgs/pkgs/applications/emulators/wine/builder-wow.sh index f07b1e8c24..7608e5c57e 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/builder-wow.sh +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/builder-wow.sh @@ -45,7 +45,7 @@ buildPhase # checkPhase eval "$preInstall" -cd $TMP/wine-wow && make install -cd $TMP/wine64 && make install +cd $TMP/wine-wow && make install -j$NIX_BUILD_CORES +cd $TMP/wine64 && make install -j$NIX_BUILD_CORES eval "$postInstall" fixupPhase diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.12.patch b/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.12.patch new file mode 100644 index 0000000000..aaf8a1b89b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat-pre8.12.patch @@ -0,0 +1,22 @@ +diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m +--- a/dlls/winemac.drv/cocoa_display.m ++++ b/dlls/winemac.drv/cocoa_display.m +@@ -289,7 +289,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) + * the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps + * using the integrated GPU. This is the behavior of Windows on a Mac. */ + primary_device = [MTLCreateSystemDefaultDevice() autorelease]; +- if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, primary_device.registryID)) ++ if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, [primary_device registryID])) + goto done; + + /* Hide the integrated GPU if the system default device is a dedicated GPU */ +@@ -301,7 +301,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) + + for (i = 0; i < devices.count; i++) + { +- if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], devices[i].registryID)) ++ if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], [devices[i] registryID])) + goto done; + + if (hide_integrated && devices[i].isLowPower) + diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat.patch b/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat.patch index aeee7533bb..181b2a0d1a 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat.patch +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/darwin-metal-compat.patch @@ -1,31 +1,12 @@ diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m -index f64a6c0f6ad..6da0391e3fa 100644 --- a/dlls/winemac.drv/cocoa_display.m +++ b/dlls/winemac.drv/cocoa_display.m -@@ -289,7 +289,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) - * the primary GPU because we need to hide the integrated GPU for an automatic graphic switching pair to avoid apps - * using the integrated GPU. This is the behavior of Windows on a Mac. */ - primary_device = [MTLCreateSystemDefaultDevice() autorelease]; -- if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, primary_device.registryID)) -+ if (macdrv_get_gpu_info_from_registry_id(&primary_gpu, (uint64_t)[primary_device registryID])) - goto done; - - /* Hide the integrated GPU if the system default device is a dedicated GPU */ -@@ -301,7 +301,7 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count) - - for (i = 0; i < devices.count; i++) - { -- if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], devices[i].registryID)) -+ if (macdrv_get_gpu_info_from_registry_id(&gpus[gpu_count], (uint64_t)[devices[i] registryID])) - goto done; - - if (hide_integrated && devices[i].isLowPower) @@ -354,7 +354,7 @@ static int macdrv_get_gpu_info_from_display_id_using_metal(struct macdrv_gpu* gp device = [CGDirectDisplayCopyCurrentMetalDevice(display_id) autorelease]; if (device && [device respondsToSelector:@selector(registryID)]) - ret = macdrv_get_gpu_info_from_registry_id(gpu, device.registryID); -+ ret = macdrv_get_gpu_info_from_registry_id(gpu, (uint64_t)[device registryID]); ++ ret = macdrv_get_gpu_info_from_registry_id(gpu, [device registryID]); done: [pool release]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/default.nix index d3b285f36d..06c2b7486c 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/default.nix @@ -37,6 +37,7 @@ usbSupport ? false, mingwSupport ? wineRelease != "stable", waylandSupport ? wineRelease == "wayland", + x11Support ? stdenv.isLinux, embedInstallers ? false, # The Mono and Gecko MSI installers moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily }: @@ -46,12 +47,14 @@ let wine-build = build: release: wineRelease = release; supportFlags = { inherit - cupsSupport gettextSupport dbusSupport cairoSupport - odbcSupport netapiSupport cursesSupport vaSupport pcapSupport - v4lSupport saneSupport gphoto2Support krb5Support fontconfigSupport - alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport - tlsSupport openglSupport gstreamerSupport udevSupport vulkanSupport - sdlSupport usbSupport mingwSupport waylandSupport embedInstallers; + alsaSupport cairoSupport cupsSupport cursesSupport dbusSupport + embedInstallers fontconfigSupport gettextSupport gphoto2Support + gstreamerSupport gtkSupport krb5Support mingwSupport netapiSupport + odbcSupport openclSupport openglSupport pcapSupport + pulseaudioSupport saneSupport sdlSupport tlsSupport udevSupport + usbSupport v4lSupport vaSupport vulkanSupport waylandSupport + x11Support xineramaSupport + ; }; inherit moltenvk; }); diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix index 1bfb35e76d..813d032bf9 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix @@ -69,9 +69,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "8.13"; + version = "8.17"; url = "https://dl.winehq.org/wine/source/8.x/wine-${version}.tar.xz"; - hash = "sha256-JuXTqD0lxUGMbA9USORD0gh2OiZDqrSw8a01KSKkwnU="; + hash = "sha256-8BeFvTFix05l3rE6oK3XEeN8SERUcZvt0OjCsaNGm34="; inherit (stable) patches; ## see http://wiki.winehq.org/Gecko @@ -116,8 +116,8 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases - inherit (unstable) version; - hash = "sha256-5upC+IWHBJE5DeFv96lD1hr4LYYaqAAzfxIroK9KlOY="; + version = "8.17.1"; + hash = "sha256-h36NDFYsI0y8TG41IH10IdF4QEuBkBewQ3knZ9iwDpg="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix index b36d4862a7..9e9a03ebfc 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix @@ -5,7 +5,7 @@ with callPackage ./util.nix {}; let patch = (callPackage ./sources.nix {}).staging; build-inputs = pkgNames: extra: (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra; -in assert lib.getVersion wineUnstable == patch.version; +in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMinor patch.version; (lib.overrideDerivation wineUnstable (self: { buildInputs = build-inputs [ "perl" "util-linux" "autoconf" "gitMinimal" ] self.buildInputs; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix index 71306bdc43..3fdd6db846 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/generic.nix @@ -110,7 +110,7 @@ in stdenv.mkDerivation { # This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt` # making the build fail, as that path does not exist dontFixCmake = true; - patches = [./vulkan_version.patch]; + cmakeFlags = [ # actually has a noticeable performance impact "-DYUZU_ENABLE_LTO=ON" diff --git a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix index d417dc6f03..fc6d1813af 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/sources.nix @@ -1,19 +1,19 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2023-08-14 +# Last updated: 2023-10-07 { compatList = { - rev = "fbecbb568ce45c2d118a76ff41f9e817a8b899e6"; + rev = "156a0a80efc47069ba3360f8a1b268a1c6f2f505"; hash = "sha256:1hdsza3wf9a0yvj6h55gsl7xqvhafvbz1i8paz9kg7l49b0gnlh1"; }; mainline = { - version = "1522"; - hash = "sha256:15ka5lg9mdfgwngmsjm3dk74c64hxak2zkf36jdgqcjlwxdx81qk"; + version = "1579"; + hash = "sha256:0689w42as1di8xbh8kq2p0cws8gdwq64zdj3i8wq612nkw0q5s60"; }; ea = { - version = "3805"; - distHash = "sha256:1hxq4aifnncilnxmymgbz73m558y8v5f72cpgdfaqr450vlc5sks"; - fullHash = "sha256:1psivknzv1kycpnl81g0b9d9ck70lxddkn1gaimic37a7kxpg395"; + version = "3911"; + distHash = "sha256:0xj642kjhj0gp9l15b3ysj3gmyy47rcvzw9amghsfl13bg5ffnwh"; + fullHash = "sha256:13rd6kwnhpvjzp67k6pqgl9fsqzwy5d8043hv6kd93gg8jbxkp38"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/update.sh b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/update.sh index 0fcb524173..ad34bfee3d 100755 --- a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/update.sh +++ b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/update.sh @@ -1,5 +1,5 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p nix nix-prefetch-git gnutar curl jq +#! nix-shell -i bash -p nix nix-prefetch-git gnutar curl jq unzip set -euo pipefail diff --git a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/vulkan_version.patch b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/vulkan_version.patch deleted file mode 100644 index 7b77179e9f..0000000000 --- a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/vulkan_version.patch +++ /dev/null @@ -1,13 +0,0 @@ -Yuzu requires a version of Vulkan that has not yet been released as a stable Vulkan SDK. In case this patch fails, check which version Yuzu is currently using and verify that it still works with the version shipped in Nixpkgs. - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -314,7 +314,7 @@ - find_package(zstd 1.5 REQUIRED) - - if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) -- find_package(Vulkan 1.3.256 REQUIRED) -+ find_package(Vulkan 1.3.250 REQUIRED) - endif() - - if (ENABLE_LIBUSB) diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/browsr/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/browsr/default.nix index 4c1beee352..b26d20c650 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/browsr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/browsr/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "browsr"; - version = "1.13.0"; + version = "1.16.0"; format = "pyproject"; src = fetchFromGitHub { owner = "juftin"; repo = "browsr"; rev = "v${version}"; - hash = "sha256-vYb4XWBdQ4HJzICXNiBXit4aVgjYA9SCX15MppVtTS8="; + hash = "sha256-Tb/7ek5aKFxv8g4jAmj9nQ909LiHqrAXJoeC9o6fwFM="; }; nativeBuildInputs = with python3.pkgs; [ @@ -50,6 +50,7 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "art" + "pandas" "pymupdf" "rich-click" "textual" @@ -70,6 +71,5 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/juftin/browsr/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; - broken = versionAtLeast python3.pkgs.pandas.version "2" || versionAtLeast python3.pkgs.pillow.version "10"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix index f07309a8ad..37369ccdb2 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/clifm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clifm"; - version = "1.13"; + version = "1.14.6"; src = fetchFromGitHub { owner = "leo-arch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y9z3HT36Z1fwweOnniRgyNQX1cbrLSGGgB5UAxkq9mI="; + sha256 = "sha256-0EOG7BAZL3OPP2/qePNkljAa0/Qb3zwuJWz2P4l8GZc="; }; buildInputs = [ libcap acl file readline ]; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/doublecmd/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/doublecmd/default.nix index 35f7855e53..a7aafbbf3d 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/doublecmd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/doublecmd/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doublecmd"; - version = "1.0.11"; + version = "1.1.2"; src = fetchFromGitHub { owner = "doublecmd"; repo = "doublecmd"; rev = "v${finalAttrs.version}"; - hash = "sha256-UV5LooVkCBzUk9E7dYje6t19HOuMCO8jY+fNGTES0KA="; + hash = "sha256-hRBF0Xl1SSoW+vbp9c1iCuFBVIzLtueNJaqoFMF8lJ4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix index a3572e782b..b0b7c34127 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.7.0"; + version = "2.8.1"; src = fetchFromGitHub { owner = "kyoheiu"; - repo = pname; + repo = "felix"; rev = "v${version}"; - sha256 = "sha256-3oXF9BG3BjGOeXqJHo3+fpcqcTOKrLED7Y3VQ06tnNA="; + hash = "sha256-RDCX5+Viq/VRb0SXUYxCtWF+aVahI5WGhp9/Vn+uHqI="; }; - cargoHash = "sha256-2XMVappHbf1ZPtQO8zy8Z0n9wshDM4d30qkmG8OBoUY="; + cargoHash = "sha256-kgI+afly+/Ag0witToM95L9b3yQXP5Gskwl4Lf4SusY="; nativeBuildInputs = [ pkg-config ]; @@ -37,6 +37,11 @@ rustPlatform.buildRustPackage rec { "--skip=state::tests::test_has_write_permission" ]; + # Cargo.lock is outdated + postConfigure = '' + cargo metadata --offline + ''; + meta = with lib; { description = "A tui file manager with vim-like key mapping"; homepage = "https://github.com/kyoheiu/felix"; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix index e85631d196..937991ede4 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix @@ -22,6 +22,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kamiyaa/joshuto"; changelog = "https://github.com/kamiyaa/joshuto/releases/tag/${src.rev}"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ figsoda totoroot ]; + maintainers = with maintainers; [ figsoda totoroot xrelkd ]; + mainProgram = "joshuto"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/lf/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/lf/default.nix index 0ef56e8a2b..9caf29a5a9 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/lf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/lf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "lf"; - version = "30"; + version = "31"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; rev = "r${version}"; - hash = "sha256-hlhmnkPm1x7uJMwUM/B02rXLffsXFbkxXYITKD3BERY="; + hash = "sha256-Tuk/4R/gGtSY+4M/+OhQCbhXftZGoxZ0SeLIwYjTLA4="; }; - vendorHash = "sha256-DYReTxH4SHnJERbiE6rOp5XqzN3NRbICt5iNeX8Jgt8="; + vendorHash = "sha256-PVvHrXfMN6ZSWqd5GJ08VaeKaHrFsz6FKdDoe0tk2BE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/llama/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/llama/default.nix deleted file mode 100644 index a4729c49bd..0000000000 --- a/third_party/nixpkgs/pkgs/applications/file-managers/llama/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ buildGoModule, fetchFromGitHub, lib }: - -buildGoModule rec { - pname = "llama"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "antonmedv"; - repo = "llama"; - rev = "v${version}"; - sha256 = "sha256-mJUxi2gqTMcodznCUDb2iB6j/p7bMUhhBLtZMbvfE1c="; - }; - - vendorHash = "sha256-nngto104p/qJpWM1NlmEqcrJThXSeCfcoXCzV1CClYQ="; - - meta = with lib; { - description = "Terminal file manager"; - homepage = "https://github.com/antonmedv/llama"; - license = licenses.mit; - maintainers = with maintainers; [ portothree ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix index 65211bb543..e83dd0379a 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/mc/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.29"; + version = "4.8.30"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-AdijuU9YGAzKW/FyV7UHjR/W/SeptcDpcOx2dUlUCtQ="; + sha256 = "sha256-Xrw8shRLlwxRSf2lVsStULeHgElGls3y0UpTIEyVx98="; }; nativeBuildInputs = [ pkg-config unzip ] 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 eb3e943676..af4064abbe 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix @@ -10,11 +10,14 @@ , readline , which , musl-fts +, pcre # options , conf ? null , withIcons ? false , withNerdIcons ? false , withEmojis ? false +, withPcre ? false +, extraMakeFlags ? [ ] }: # Mutually exclusive options @@ -24,13 +27,13 @@ assert withEmojis -> (withIcons == false && withNerdIcons == false); stdenv.mkDerivation (finalAttrs: { pname = "nnn"; - version = "4.8"; + version = "4.9"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${finalAttrs.version}"; - hash = "sha256-QbKW2wjhUNej3zoX18LdeUHqjNLYhEKyvPH2MXzp/iQ="; + hash = "sha256-g19uI36HyzTF2YUQKFP4DE2ZBsArGryVHhX79Y0XzhU="; }; patches = [ @@ -38,18 +41,15 @@ stdenv.mkDerivation (finalAttrs: { # By default, nnn expects the macOS default file command, not the one provided by Nix. # However, both commands use different arguments to obtain the MIME type. ./darwin-fix-file-mime-opts.patch - # FIXME: remove for next release - (fetchpatch { - url = "https://github.com/jarun/nnn/commit/20e944f5e597239ed491c213a634eef3d5be735e.patch"; - hash = "sha256-RxG3AU8i3lRPCjRVZPnej4m1No/SKtsHwbghj9JQ7RQ="; - }) ]; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); preBuild = lib.optionalString (conf != null) "cp ${finalAttrs.configFile} src/nnn.h"; nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ]; - buildInputs = [ readline ncurses ] ++ lib.optional stdenv.hostPlatform.isMusl musl-fts; + buildInputs = [ readline ncurses ] + ++ lib.optional stdenv.hostPlatform.isMusl musl-fts + ++ lib.optional withPcre pcre; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isMusl "-I${musl-fts}/include"; NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-lfts"; @@ -57,7 +57,9 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" ] ++ lib.optionals withIcons [ "O_ICONS=1" ] ++ lib.optionals withNerdIcons [ "O_NERD=1" ] - ++ lib.optionals withEmojis [ "O_EMOJI=1" ]; + ++ lib.optionals withEmojis [ "O_EMOJI=1" ] + ++ lib.optionals withPcre [ "O_PCRE=1" ] + ++ extraMakeFlags; binPath = lib.makeBinPath [ file which ]; @@ -68,6 +70,9 @@ stdenv.mkDerivation (finalAttrs: { installShellCompletion --fish misc/auto-completion/fish/nnn.fish installShellCompletion --zsh misc/auto-completion/zsh/_nnn + cp -r plugins $out/share + cp -r misc/quitcd $out/share/quitcd + wrapProgram $out/bin/nnn --prefix PATH : "$binPath" ''; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix index ef28d8cea3..3ee1f0c03e 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/portfolio-filemanager/default.nix @@ -7,18 +7,18 @@ , glib , gobject-introspection , gtk3 -, libhandy -, librsvg +, gtk4 +, libadwaita , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , nix-update-script }: python3.pkgs.buildPythonApplication rec { pname = "portfolio"; - version = "0.9.15"; + version = "1.0.0"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "tchx84"; repo = "Portfolio"; rev = "v${version}"; - hash = "sha256-/OwHeeUjpjm35O7mySoAfKt7Rsp1EK2WE+tfiV3oiQg="; + hash = "sha256-ahVrOyyF/7X19ZJcHQ4YbC+4b96CPEnns7TUAFCvKao="; }; postPatch = '' @@ -37,20 +37,17 @@ python3.pkgs.buildPythonApplication rec { appstream-glib desktop-file-utils gettext - glib gobject-introspection - gtk3 + gtk3 # For gtk-update-icon-cache meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook4 ]; buildInputs = [ - glib - gtk3 - libhandy - librsvg + gtk4 + libadwaita ]; propagatedBuildInputs = with python3.pkgs; [ @@ -65,6 +62,12 @@ python3.pkgs.buildPythonApplication rec { ln -s dev.tchx84.Portfolio "$out/bin/portfolio" ''; + # Prevent double wrapping + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + passthru = { updateScript = nix-update-script { }; }; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix index 96d43dc8f2..4906a06123 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/ranger/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m +{ lib, fetchFromGitHub, python3Packages, file, less, highlight, w3m, ranger, testers , imagePreviewSupport ? true , neoVimSupport ? true , improvedEncodingDetection ? true @@ -49,6 +49,10 @@ python3Packages.buildPythonApplication rec { --replace "set preview_images false" "set preview_images true" ''; + passthru.tests.version = testers.testVersion { + package = ranger; + }; + meta = with lib; { description = "File manager with minimalistic curses interface"; homepage = "https://ranger.github.io/"; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/tuifimanager/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/tuifimanager/default.nix index 8bb7024793..252c77deb8 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/tuifimanager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/tuifimanager/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "tuifi-manager"; - version = "3.0.0"; + version = "3.3.1"; format = "pyproject"; src = fetchFromGitHub { owner = "GiorgosXou"; repo = "TUIFIManager"; rev = "v.${version}"; - hash = "sha256-ahZUm+FkAaM4I6FfSa/Oej+lMux8avw8LxzzGqTpuH8="; + hash = "sha256-yBMme0LJSlEXPxE9NMr0Z5VJWcWOzzdvbTnavkLHsvo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/walk/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/walk/default.nix new file mode 100644 index 0000000000..2a15b12a9f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/file-managers/walk/default.nix @@ -0,0 +1,23 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "walk"; + version = "1.6.2"; + + src = fetchFromGitHub { + owner = "antonmedv"; + repo = "walk"; + rev = "v${version}"; + hash = "sha256-Wo8i0nPAuzADLXlsEho9TSSbNh3d13iNsXXx5onPnIs="; + }; + + vendorHash = "sha256-AmgCyq+N+EMdpIUCe6Lzd8bDXHsbOzclsHPp+H5ROMc="; + + meta = with lib; { + description = "Terminal file manager"; + homepage = "https://github.com/antonmedv/walk"; + license = licenses.mit; + maintainers = with maintainers; [ portothree surfaceflinger ]; + mainProgram = "walk"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/xplr/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/xplr/default.nix index 4885783aba..b16c595038 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/xplr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/xplr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "xplr"; @@ -11,19 +11,37 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-lqFhLCOLiuSQWhbcZUEj2xFRlZ+x1ZTVc8IJw7tJjhE="; }; - buildInputs = lib.optional stdenv.isDarwin libiconv; - cargoHash = "sha256-3hrpg2cMvIuFy6mH1/1igIpU4nbzFQLCAhiIRZbTuaI="; - checkFlags = [ - # failure: path::tests::test_relative_to_parent - "--skip=path::tests::test_relative_to_parent" - ]; + # fixes `thread 'main' panicked at 'cannot find strip'` on x86_64-darwin + env = lib.optionalAttrs (stdenv.isx86_64 && stdenv.isDarwin) { + TARGET_STRIP = "${stdenv.cc.targetPrefix}strip"; + }; + + # error: linker `aarch64-linux-gnu-gcc` not found + postPatch = '' + rm .cargo/config + ''; + + postInstall = '' + mkdir -p $out/share + cp assets/desktop/xplr.desktop $out/share + + mkdir -p $out/share/icons/hicolor/scalable/apps + cp assets/icon/xplr.svg $out/share/icons/hicolor/scalable/apps + + for size in 16 32 64 128; do + icon_dir=$out/share/icons/hicolor/''${size}x$size/apps + mkdir -p $icon_dir + cp assets/icon/xplr$size.png $icon_dir/xplr.png + done + ''; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; homepage = "https://xplr.dev"; + changelog = "https://github.com/sayanarijit/xplr/releases/tag/${src.rev}"; license = licenses.mit; - maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g mimame ]; + maintainers = with maintainers; [ sayanarijit suryasr007 thehedgeh0g mimame figsoda ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/yazi/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/yazi/default.nix index ef9c47490c..7757a1322b 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/yazi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/yazi/default.nix @@ -30,16 +30,16 @@ rustPlatform.buildRustPackage rec { pname = "yazi"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "sxyazi"; repo = pname; rev = "v${version}"; - hash = "sha256-IUE2846AltYyEefkavCJOEak9mW0wygojWsucwUEgh4="; + hash = "sha256-ARpludMVQlZtCRAfW0cNYVmT3m9t9lunMIW24peYX6Y="; }; - cargoHash = "sha256-wwtdaReb+teXf+VDwqAqCbSy2qWI11IRlcygmWdaqF4="; + cargoHash = "sha256-dhdk5aGKv6tY8x7MmA0hWcmJBiXOXC92DlQTd/1AKtQ="; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/ytree/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/ytree/default.nix index fcfbdbd10d..4ba320919e 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/ytree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/ytree/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "ytree"; - version = "2.04"; + version = "2.05"; src = fetchurl { url = "https://han.de/~werner/${pname}-${version}.tar.gz"; - sha256 = "sha256-bnqLf2jv5tNlq+M6HQbXOa2F8io9VN3QrsJKNHjWZkI="; + sha256 = "sha256-jPixUeSRO1t/epHf/VxzBhBqQkd+xE5x1ix19mq2Glc="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/finance/cryptowatch/default.nix b/third_party/nixpkgs/pkgs/applications/finance/cryptowatch/default.nix index 4bf7a1a0b4..08c260c8b8 100644 --- a/third_party/nixpkgs/pkgs/applications/finance/cryptowatch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/finance/cryptowatch/default.nix @@ -11,15 +11,16 @@ , libXrandr , udev , unzip +, alsa-lib }: stdenv.mkDerivation rec { pname = "cryptowatch-desktop"; - version = "0.5.0"; + version = "0.7.1"; src = fetchurl { url = "https://cryptowat.ch/desktop/download/linux/${version}"; - sha256 = "0lr5fsd0f44b1v9f2dvx0a0lmz9dyivyz5d98qx2gcv3jkngw34v"; + hash = "sha256-ccyHfjp00CgQH+3SiDWx9yE1skOj0RWxnBomHWY/IaU="; }; unpackPhase = "unzip $src"; @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus udev + alsa-lib ]; sourceRoot = "."; @@ -53,6 +55,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ livnev ]; + maintainers = with maintainers; [ livnev kashw2 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/finance/denaro/default.nix b/third_party/nixpkgs/pkgs/applications/finance/denaro/default.nix index 65d501a9ca..4da73b2a4e 100644 --- a/third_party/nixpkgs/pkgs/applications/finance/denaro/default.nix +++ b/third_party/nixpkgs/pkgs/applications/finance/denaro/default.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "denaro"; - version = "2023.6.2"; + version = "2023.9.2"; src = fetchFromGitHub { owner = "NickvisionApps"; repo = "Denaro"; rev = version; - hash = "sha256-wnqk+UuOQc/Yph9MbQU8FRsNC/8ZQ9FxgF205pdHf+s="; + hash = "sha256-3Atdi0R7OHpP1HUBWGu2Y4L8hr9jLPMIFYCEWeoEq6A="; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; @@ -54,6 +54,7 @@ buildDotnetModule rec { gtk4 libadwaita glib # Fixes "Could not retrieve parent type - is the typeid valid?" + gdk-pixbuf ]; passthru.updateScript = ./update.sh; @@ -64,7 +65,7 @@ buildDotnetModule rec { mainProgram = "NickvisionMoney.GNOME"; license = licenses.mit; changelog = "https://github.com/nlogozzo/NickvisionMoney/releases/tag/${version}"; - maintainers = with maintainers; [ chuangzhu ]; + maintainers = with maintainers; [ chuangzhu kashw2 ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/finance/denaro/deps.nix b/third_party/nixpkgs/pkgs/applications/finance/denaro/deps.nix index cf53b42d9e..be415c6d57 100644 --- a/third_party/nixpkgs/pkgs/applications/finance/denaro/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/finance/denaro/deps.nix @@ -2,33 +2,45 @@ # Please dont edit it manually, your changes might get overwritten! { fetchNuGet }: [ - (fetchNuGet { pname = "Cake.Tool"; version = "3.0.0"; sha256 = "0gjacqdgnh1d40sm9vrdb8vr6jv3vyh6j265gj1aaf9af2569637"; }) + (fetchNuGet { pname = "Ace4896.DBus.Services.Secrets"; version = "1.1.0"; sha256 = "03rs3f71vgzk3pp0mx83rx6aqg2aq7xwk0p42mj5701m3592x49d"; }) + (fetchNuGet { pname = "Cake.Tool"; version = "3.1.0"; sha256 = "1kv9zz0qsx40wiygydw5z6vkj8hfayvgy9bsii2lamdas9z0vmbc"; }) (fetchNuGet { pname = "Docnet.Core"; version = "2.3.1"; sha256 = "03b39x0vlymdknwgwhsmnpw4gj3njmbl9pd57ls3rhfn9r832d44"; }) + (fetchNuGet { pname = "FuzzySharp"; version = "2.0.2"; sha256 = "1xq3q4s9d5p1yn4j91a90hawk9wcrz1bl6zj9866y01yx9aamr8s"; }) (fetchNuGet { pname = "GetText.NET"; version = "1.8.7"; sha256 = "0djn5sc7p33ayjmxmxs4hqagh51bg70wqs6mwbhlhsrc67bvgj9a"; }) - (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.3.0"; sha256 = "1bsjqxck58dff9hnw21cp3xk1afly8721sfsbnxcr5i39hlrbl37"; }) - (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.3.0"; sha256 = "1zb8ilgywpwgjrzrbdvzvy70f46fb05iy49592mkjg2lv24q5l3y"; }) - (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.3.0"; sha256 = "1bc78409bdhfqqbirwr1lkzxl27adndv05q5fcm5sivmlzr7fbkm"; }) - (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.3.0"; sha256 = "1dz7f29jbmkzcwbggjwsx6r4nmw5xvvyfmia0xpjvpx1zzmfvmc4"; }) - (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.3.0"; sha256 = "1jgwhqghg14z5qkgakd42dnyk6n8cj7nkgf0hbj9zxbd0my9vv6p"; }) - (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.3.0"; sha256 = "0hv55x8snr4fk0z8dn52n8p030f02i3gfysin0bsrlmi879gn9ln"; }) - (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.3.0"; sha256 = "1aibc13yb96bbirh25jv5gp0cqvz1ya9drrdhirfsrn41274ikpm"; }) - (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.3.0"; sha256 = "1xd4yfppr34ngmal3s16f08mqdn7mra97jmjpk13aa9yjbp0avij"; }) - (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.3.0"; sha256 = "065fg5dj97sidrr7n2a6gv8vmylhpfznhw3zazra6krcvzgf1gcz"; }) - (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.3.0"; sha256 = "1r68lfxj98y3fvcxl33lk2cbjz7dn9grqb6c5axdlfjjgnkwjvlj"; }) - (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.3.0"; sha256 = "0c9im9sbiqsykrj4yq93x5nlsj9c5an7dj1j6yirb874zqq6jhsp"; }) - (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.3.0"; sha256 = "12nva0xzykvf102m69gn19ap1cyiap3i93n9gha9pnl4d5g4b4k1"; }) - (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.3.0"; sha256 = "1waiqs52gmpfqxc7yfdz7lp4jr3462js8hrs6acfr47vzddksymi"; }) + (fetchNuGet { pname = "GirCore.Adw-1"; version = "0.4.0"; sha256 = "1wy780mwvl7n1kr85r2icwsz9p3vsw749603x0wm3ka5ywbzv91k"; }) + (fetchNuGet { pname = "GirCore.Cairo-1.0"; version = "0.4.0"; sha256 = "11rg8hgran23b4m1116sfvfss0fgz874imafrv3h9w7c76f6hhci"; }) + (fetchNuGet { pname = "GirCore.FreeType2-2.0"; version = "0.4.0"; sha256 = "101qr6kijslzqd6dcmpjzrbdp8nr6ibi8958frvkpxifqa4xyp4c"; }) + (fetchNuGet { pname = "GirCore.Gdk-4.0"; version = "0.4.0"; sha256 = "1bws3zry4awy73lwzllbdljl8wybmxfm870m175wl38c7pa18sav"; }) + (fetchNuGet { pname = "GirCore.GdkPixbuf-2.0"; version = "0.4.0"; sha256 = "05maiqg2qxsg56zb8zamv241gqkskli8laa7i0dxl3f93ddc78f6"; }) + (fetchNuGet { pname = "GirCore.Gio-2.0"; version = "0.4.0"; sha256 = "1gy8gx7vy070nc2afj1zsn3d004y9d3gwn7zdj9g2fbhavbc4snk"; }) + (fetchNuGet { pname = "GirCore.GLib-2.0"; version = "0.4.0"; sha256 = "05q00p06kn97143az2xi5zhfpi30qqcds1n1zfj87gi5w0jla4ib"; }) + (fetchNuGet { pname = "GirCore.GObject-2.0"; version = "0.4.0"; sha256 = "06vrkjyzj4rjvlni3ixj12zpky2mah8v1q8nbbkfwca08k5hdz7p"; }) + (fetchNuGet { pname = "GirCore.Graphene-1.0"; version = "0.4.0"; sha256 = "06b2c35ynmkknk5zbhs75081dki0zm165xa659mg8i88cyxsgrh4"; }) + (fetchNuGet { pname = "GirCore.Gsk-4.0"; version = "0.4.0"; sha256 = "1hwmd3j4gllzjwkqq3m4wbl3v7hh2nsa7i1d2ziw3fvgbnbnb1vi"; }) + (fetchNuGet { pname = "GirCore.Gtk-4.0"; version = "0.4.0"; sha256 = "1r8hkr7vm32cjmw092l67kaysqa5jzyn7v518502nljlm9ivil6f"; }) + (fetchNuGet { pname = "GirCore.HarfBuzz-0.0"; version = "0.4.0"; sha256 = "1wyq9s18gfs73z01gaqm87i7h71ir2n0jz1dyi26hj6b3qp0p34a"; }) + (fetchNuGet { pname = "GirCore.Pango-1.0"; version = "0.4.0"; sha256 = "0qifms5nlljzccgzvnyx5vcdgvfdyp2q7s0zdglay5x5g4zrl8fv"; }) + (fetchNuGet { pname = "GirCore.PangoCairo-1.0"; version = "0.4.0"; sha256 = "1vn8bgi9ijnw25id5vis15gv9h0d4y03scr4jv03scisv411jrl8"; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.3"; sha256 = "115aybicqs9ijjlcv6k6r5v0agkjm1bm1nkd0rj3jglv8s0xvmp2"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.4-preview.84"; sha256 = "1kk2ja6lsfmx00sliniyky9fimrk9pcq2ql7j72310kx3qaad45v"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.3"; sha256 = "1f18ahwkaginrg0vwsi6s56lvnqvvxv7pzklfs5lnknasxy1a76z"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.4-preview.84"; sha256 = "0q5nmqhvdyg112c6q5h2h407d11g7sickbrn3fc5036n7svij13z"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.4-preview.84"; sha256 = "1jkkjj2p8wiabc6m5m88kf1ykq5wdjihyn27279mvw8vyrp4zp5d"; }) (fetchNuGet { pname = "Hazzik.Qif"; version = "1.0.3"; sha256 = "16v6cfy3pa0qy699v843pss3418rvq5agz6n43sikzh69vzl2azy"; }) + (fetchNuGet { pname = "LiveChartsCore"; version = "2.0.0-beta.910"; sha256 = "0yw54yd1kp4j8js1g405m4lvv84zx4zkx4m64iiqsc765a4alvvy"; }) + (fetchNuGet { pname = "LiveChartsCore.SkiaSharpView"; version = "2.0.0-beta.910"; sha256 = "1ifhvcsa0319mip98xbmlib3k7fkn24igfxxyfi2d31rajqv970r"; }) + (fetchNuGet { pname = "Markdig"; version = "0.31.0"; sha256 = "0iic44i47wp18jbbpl44iifhj2mfnil9gakkw3bzp7zif3rhl19m"; }) + (fetchNuGet { pname = "Meziantou.Framework.Win32.CredentialManager"; version = "1.4.2"; sha256 = "0x7xlym8jsm0zgbb75ip74gnw3fssb30phc48xf35yx6i0sfb2dh"; }) (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.5"; sha256 = "11gkdlf2apnzvwfd7bxdhjvb4qd0p2ridp4rrz44f7h76x1sb0gk"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "Nickvision.Aura"; version = "2023.9.3"; sha256 = "0j3fqjl8nskqqwmkc41h3pgnvl63nq9w443b571j154xibly5iw7"; }) + (fetchNuGet { pname = "Nickvision.GirExt"; version = "2023.7.3"; sha256 = "1ahf4mld9khk2gaja30zfcjmhclz2l2nims0q4l7jk2nm9p7rzi9"; }) (fetchNuGet { pname = "OfxSharp.NetStandard"; version = "1.0.0"; sha256 = "1v7yw2glyywb4s0y5fw306bzh2vw175bswrhi5crvd92wf93makj"; }) (fetchNuGet { pname = "PdfSharpCore"; version = "1.3.56"; sha256 = "0a01b2a14gygh25rq3509rky85331l8808q052br2fzidhb2vc10"; }) (fetchNuGet { pname = "QuestPDF"; version = "2023.5.1"; sha256 = "1yfjwb7aj975aars7mcp1dxvarxl8aq122bndpw808b4cx3058gl"; }) @@ -53,10 +65,14 @@ (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0-beta17"; sha256 = "1qm8q82wzj54nbv63kx3ybln51k47sl18hia3jnzk1zrb6wdsw9a"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.3"; sha256 = "12qb0r7v2v91vw8q8ygr67y527gwhbas6d6zdvrv4ksxwjx9dzp9"; }) (fetchNuGet { pname = "SkiaSharp"; version = "2.88.3"; sha256 = "1yq694myq2rhfp2hwwpyzcg1pzpxcp7j72wib8p9pw9dfj7008sv"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.4-preview.84"; sha256 = "1isyjmmfqzbvqiypsvvnqrwf6ifr2ypngzvzj41m5nbk1jr8nn6m"; }) (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.3"; sha256 = "0axz2zfyg0h3zis7rr86ikrm2jbxxy0gqb3bbawpgynf1k0fsi6a"; }) + (fetchNuGet { pname = "SkiaSharp.HarfBuzz"; version = "2.88.4-preview.84"; sha256 = "132n0sq2fjk53mc89yx6qn20w194145sv9367s623di7ysz467br"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.3"; sha256 = "0dajvr60nwvnv7s6kcqgw1w97zxdpz1c5lb7kcq7r0hi0l05ck3q"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.4-preview.84"; sha256 = "0vqwc2wh8brzn99cc61qgcyf3gd8vqlbdkjcmc3bcb07bc8k16v7"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.4-preview.84"; sha256 = "0m48d87cp2kvrhxvykxnhbzgm7xrw8jkdagvma80bag5gzdiicy2"; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.5"; sha256 = "0xnzpkhm9z09yay76wxgn4j8js260pansx8r10lrksxv2b4b0n4x"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; }) (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.5"; sha256 = "03181hahmxv8jlaikx0nkzfc2q1l1cdp3chgx5q6780nhqyjkhhx"; }) @@ -79,6 +95,7 @@ (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.0"; sha256 = "08211lvckdsdbd67xz4f6cyk76cli565j0dby1grlc4k9bhwby65"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) @@ -120,4 +137,6 @@ (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.15.0"; sha256 = "1bz5j6wfp9hn4fg5vjxl6mr9lva4gx6zqncqyqxrcb8lw7hvhwc6"; }) + (fetchNuGet { pname = "Tmds.DBus.Protocol"; version = "0.15.0"; sha256 = "0d99kcs7r9cp6gpyc7z230czkkyx4164x86dhy0mca73f2ykc2g2"; }) ] diff --git a/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix b/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix index cfd181aa4d..f00118fdf7 100644 --- a/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/finance/odoo/default.nix @@ -1,9 +1,9 @@ { stdenv , lib , fetchFromGitHub -, fetchurl +, fetchzip , python310 -, nodePackages +, rtlcss , wkhtmltopdf , nixosTests }: @@ -44,31 +44,26 @@ let }; }; - odoo_version = "15.0"; - odoo_release = "20230317"; + odoo_version = "16.0"; + odoo_release = "20230722"; in python.pkgs.buildPythonApplication rec { pname = "odoo"; version = "${odoo_version}.${odoo_release}"; format = "setuptools"; - # latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile - src = fetchurl { - url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.tar.gz"; + # latest release is at https://github.com/odoo/docker/blob/master/16.0/Dockerfile + src = fetchzip { + url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; name = "${pname}-${version}"; - hash = "sha256-nJEFPtZhq7DLLDCL9xt0RV75d/a45o6hBKsUlQAWh1U="; # odoo + hash = "sha256-pSycpYSiqJ6DKENvCWwLz+JaPUXT5dmaq8x4Aency60="; # odoo }; - unpackPhase = '' - tar xfz $src - cd odoo* - ''; - # needs some investigation doCheck = false; makeWrapperArgs = [ - "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf nodePackages.rtlcss ]}" + "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf rtlcss ]}" ]; propagatedBuildInputs = with python.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/finance/odoo/odoo15.nix b/third_party/nixpkgs/pkgs/applications/finance/odoo/odoo15.nix new file mode 100644 index 0000000000..a3255c4aa1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/finance/odoo/odoo15.nix @@ -0,0 +1,121 @@ +{ stdenv, lib, fetchFromGitHub, fetchzip, python310, rtlcss, wkhtmltopdf +, nixosTests }: + +let + python = python310.override { + packageOverrides = self: super: { + pypdf2 = super.pypdf2.overridePythonAttrs (old: rec { + version = "1.28.6"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "py-pdf"; + repo = "pypdf"; + rev = version; + fetchSubmodules = true; + hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4="; + }; + + nativeBuildInputs = [ ]; + + nativeCheckInputs = with self; [ pytestCheckHook pillow ]; + }); + flask = super.flask.overridePythonAttrs (old: rec { + version = "2.1.3"; + src = old.src.override { + inherit version; + hash = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss="; + }; + }); + werkzeug = super.werkzeug.overridePythonAttrs (old: rec { + version = "2.1.2"; + src = old.src.override { + inherit version; + hash = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY="; + }; + }); + }; + }; + + odoo_version = "15.0"; + odoo_release = "20230816"; +in python.pkgs.buildPythonApplication rec { + pname = "odoo15"; + version = "${odoo_version}.${odoo_release}"; + + format = "setuptools"; + + # latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile + src = fetchzip { + url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; + name = "${pname}-${version}"; + hash = "sha256-h81JA0o44DVtl/bZ52rGQfg54TigwQcNpcMjQbi0zIQ="; # odoo + }; + + # needs some investigation + doCheck = false; + + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + "${lib.makeBinPath [ wkhtmltopdf rtlcss ]}" + ]; + + propagatedBuildInputs = with python.pkgs; [ + babel + chardet + decorator + docutils + ebaysdk + freezegun + gevent + greenlet + idna + jinja2 + libsass + lxml + markupsafe + mock + num2words + ofxparse + passlib + pillow + polib + psutil + psycopg2 + pydot + pyopenssl + pypdf2 + pyserial + python-dateutil + python-ldap + python-stdnum + pytz + pyusb + qrcode + reportlab + requests + setuptools + vobject + werkzeug + xlrd + xlsxwriter + xlwt + zeep + ]; + + # takes 5+ minutes and there are not files to strip + dontStrip = true; + + passthru = { + tests = { inherit (nixosTests) odoo15; }; + }; + + meta = with lib; { + description = "Open Source ERP and CRM"; + homepage = "https://www.odoo.com/"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/finance/odoo/update.sh b/third_party/nixpkgs/pkgs/applications/finance/odoo/update.sh index 1bec751ae7..0f7ee144cf 100755 --- a/third_party/nixpkgs/pkgs/applications/finance/odoo/update.sh +++ b/third_party/nixpkgs/pkgs/applications/finance/odoo/update.sh @@ -1,9 +1,9 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix coreutils +#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch set -euo pipefail -DOCKER=$(curl -s https://raw.githubusercontent.com/odoo/docker/master/15.0/Dockerfile) +DOCKER=$(curl -s https://raw.githubusercontent.com/odoo/docker/master/16.0/Dockerfile) get_var() { echo "$DOCKER" | grep -E "^[A-Z][A-Z][A-Z] ODOO_$1" | sed -r "s|^[A-Z]{3} ODOO_$1.||g" @@ -22,6 +22,6 @@ fi cd "$(dirname "${BASH_SOURCE[0]}")" -sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch-url --type sha256 "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.tar.gz")\"; # odoo|g" default.nix +sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" default.nix sed -ri "s| odoo_version.+| odoo_version = \"$VERSION\";|" default.nix sed -ri "s| odoo_release.+| odoo_release = \"$RELEASE\";|" default.nix diff --git a/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix b/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix index 0d16ba036a..654aa6451f 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix @@ -32,14 +32,14 @@ , zstd }: -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "grass"; version = "8.3.0"; - src = with lib; fetchFromGitHub { + src = fetchFromGitHub { owner = "OSGeo"; repo = "grass"; - rev = version; + rev = finalAttrs.version; hash = "sha256-YHQtvp/AYMWme46yIc4lE/izjqVePnPxn3GY5RRfPq4="; }; diff --git a/third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix b/third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix index b73fb71f69..9722c3cb4d 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/default.nix @@ -14,8 +14,6 @@ , qtlocation , qtsensors , qttools -, qttranslations -, substituteAll , zlib }: @@ -31,11 +29,6 @@ mkDerivation rec { }; patches = [ - # https://github.com/NixOS/nixpkgs/issues/86054 - (substituteAll { - src = ./fix-qttranslations-path.diff; - inherit qttranslations; - }) # https://github.com/OpenOrienteering/mapper/pull/1907 (fetchpatch { url = "https://github.com/OpenOrienteering/mapper/commit/bc52aa567e90a58d6963b44d5ae1909f3f841508.patch"; diff --git a/third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/fix-qttranslations-path.diff b/third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/fix-qttranslations-path.diff deleted file mode 100644 index 06c465a8fb..0000000000 --- a/third_party/nixpkgs/pkgs/applications/gis/openorienteering-mapper/fix-qttranslations-path.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/src/util/translation_util.cpp w/src/util/translation_util.cpp -index da03d216..c1f12751 100644 ---- i/src/util/translation_util.cpp -+++ w/src/util/translation_util.cpp -@@ -103,7 +103,7 @@ TranslationUtil::TranslationUtil(const QString& code, QString translation_file) - } - - QString translation_name = QLatin1String("qt_") + language.code; -- if (!qt_translator.load(translation_name, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) -+ if (!qt_translator.load(translation_name, QLatin1String("@qttranslations@/translations"))) - load(qt_translator, translation_name); - - load(app_translator, translation_file); diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix index b3220f8d70..8b19c70c3b 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/default.nix @@ -1,8 +1,12 @@ -{ lib, makeWrapper, symlinkJoin +{ lib +, makeWrapper +, nixosTests +, symlinkJoin + , extraPythonPackages ? (ps: [ ]) + , libsForQt5 }: -with lib; let qgis-unwrapped = libsForQt5.callPackage ./unwrapped.nix { }; in symlinkJoin rec { @@ -12,7 +16,10 @@ in symlinkJoin rec { paths = [ qgis-unwrapped ]; - nativeBuildInputs = [ makeWrapper qgis-unwrapped.py.pkgs.wrapPython ]; + nativeBuildInputs = [ + makeWrapper + qgis-unwrapped.py.pkgs.wrapPython + ]; # extend to add to the python environment of QGIS without rebuilding QGIS application. pythonInputs = qgis-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-unwrapped.py.pkgs); @@ -27,7 +34,10 @@ in symlinkJoin rec { --set PYTHONPATH $program_PYTHONPATH ''; - passthru.unwrapped = qgis-unwrapped; + passthru = { + unwrapped = qgis-unwrapped; + tests.qgis = nixosTests.qgis; + }; meta = qgis-unwrapped.meta; } diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/ltr.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/ltr.nix index d34e1e6983..b551fe0a1e 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/ltr.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/ltr.nix @@ -1,8 +1,12 @@ -{ lib, makeWrapper, symlinkJoin +{ lib +, makeWrapper +, nixosTests +, symlinkJoin + , extraPythonPackages ? (ps: [ ]) + , libsForQt5 }: -with lib; let qgis-ltr-unwrapped = libsForQt5.callPackage ./unwrapped-ltr.nix { }; in symlinkJoin rec { @@ -12,7 +16,10 @@ in symlinkJoin rec { paths = [ qgis-ltr-unwrapped ]; - nativeBuildInputs = [ makeWrapper qgis-ltr-unwrapped.py.pkgs.wrapPython ]; + nativeBuildInputs = [ + makeWrapper + qgis-ltr-unwrapped.py.pkgs.wrapPython + ]; # extend to add to the python environment of QGIS without rebuilding QGIS application. pythonInputs = qgis-ltr-unwrapped.pythonBuildInputs ++ (extraPythonPackages qgis-ltr-unwrapped.py.pkgs); @@ -27,7 +34,10 @@ in symlinkJoin rec { --set PYTHONPATH $program_PYTHONPATH ''; - passthru.unwrapped = qgis-ltr-unwrapped; + passthru = { + unwrapped = qgis-ltr-unwrapped; + tests.qgis-ltr = nixosTests.qgis-ltr; + }; inherit (qgis-ltr-unwrapped) meta; } diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch b/third_party/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch new file mode 100644 index 0000000000..5553f80fbc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs-ltr.patch @@ -0,0 +1,59 @@ +diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake +index b51fd0075e..87ee317e05 100644 +--- a/cmake/FindPyQt5.cmake ++++ b/cmake/FindPyQt5.cmake +@@ -25,7 +25,7 @@ ELSE(EXISTS PYQT5_VERSION_STR) + IF(SIP_BUILD_EXECUTABLE) + # SIP >= 5.0 path + +- FILE(GLOB _pyqt5_metadata "${Python_SITEARCH}/PyQt5-*.dist-info/METADATA") ++ FILE(GLOB _pyqt5_metadata "@pyQt5PackageDir@/PyQt5-*.dist-info/METADATA") + IF(_pyqt5_metadata) + FILE(READ ${_pyqt5_metadata} _pyqt5_metadata_contents) + STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" PYQT5_VERSION_STR ${_pyqt5_metadata_contents}) +@@ -34,8 +34,8 @@ ELSE(EXISTS PYQT5_VERSION_STR) + ENDIF(_pyqt5_metadata) + + IF(PYQT5_VERSION_STR) +- SET(PYQT5_MOD_DIR "${Python_SITEARCH}/PyQt5") +- SET(PYQT5_SIP_DIR "${Python_SITEARCH}/PyQt5/bindings") ++ SET(PYQT5_MOD_DIR "@pyQt5PackageDir@/PyQt5") ++ SET(PYQT5_SIP_DIR "@pyQt5PackageDir@/PyQt5/bindings") + FIND_PROGRAM(__pyuic5 "pyuic5") + GET_FILENAME_COMPONENT(PYQT5_BIN_DIR ${__pyuic5} DIRECTORY) + +diff --git a/cmake/FindQsci.cmake b/cmake/FindQsci.cmake +index 69e41c1fe9..5456c3d59b 100644 +--- a/cmake/FindQsci.cmake ++++ b/cmake/FindQsci.cmake +@@ -24,7 +24,7 @@ ELSE(QSCI_MOD_VERSION_STR) + IF(SIP_BUILD_EXECUTABLE) + # SIP >= 5.0 path + +- FILE(GLOB _qsci_metadata "${Python_SITEARCH}/QScintilla*.dist-info/METADATA") ++ FILE(GLOB _qsci_metadata "@qsciPackageDir@/QScintilla*.dist-info/METADATA") + IF(_qsci_metadata) + FILE(READ ${_qsci_metadata} _qsci_metadata_contents) + STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" QSCI_MOD_VERSION_STR ${_qsci_metadata_contents}) +@@ -33,7 +33,7 @@ ELSE(QSCI_MOD_VERSION_STR) + ENDIF(_qsci_metadata) + + IF(QSCI_MOD_VERSION_STR) +- SET(QSCI_SIP_DIR "${PYQT5_SIP_DIR}") ++ SET(QSCI_SIP_DIR "@qsciPackageDir@/PyQt5/bindings") + SET(QSCI_FOUND TRUE) + ENDIF(QSCI_MOD_VERSION_STR) + +diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt +index 4cd19c3af4..668cc6a5e6 100644 +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt +@@ -206,7 +206,7 @@ if (WITH_GUI) + install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi DESTINATION ${QGIS_PYTHON_DIR}) + endif() + if(QSCI_SIP_DIR) +- set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${QSCI_SIP_DIR}) ++ set(SIP_BUILD_EXTRA_OPTIONS ${SIP_BUILD_EXTRA_OPTIONS} --include-dir=${QSCI_SIP_DIR}) + else() + message(STATUS "Qsci sip file not found - disabling bindings for derived classes") + set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_QSCI_SIP) diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch b/third_party/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch index 5553f80fbc..725c0b350e 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch @@ -39,7 +39,7 @@ index 69e41c1fe9..5456c3d59b 100644 ENDIF(_qsci_metadata) IF(QSCI_MOD_VERSION_STR) -- SET(QSCI_SIP_DIR "${PYQT5_SIP_DIR}") +- SET(QSCI_SIP_DIR "${PYQT_SIP_DIR}") + SET(QSCI_SIP_DIR "@qsciPackageDir@/PyQt5/bindings") SET(QSCI_FOUND TRUE) ENDIF(QSCI_MOD_VERSION_STR) @@ -48,7 +48,7 @@ diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 4cd19c3af4..668cc6a5e6 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt -@@ -206,7 +206,7 @@ if (WITH_GUI) +@@ -212,7 +212,7 @@ if (WITH_GUI) install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi DESTINATION ${QGIS_PYTHON_DIR}) endif() if(QSCI_SIP_DIR) diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/test.py b/third_party/nixpkgs/pkgs/applications/gis/qgis/test.py new file mode 100644 index 0000000000..4f5772e30c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/test.py @@ -0,0 +1,64 @@ +# QGIS test script. +# This script will create vector memory layer containing Nix snowflake. + +# Set QGIS_TEST_INTERACTIVE=True to run this script in interactive mode (and see +# Nix snowflake). + +# Run script as following: +# QGIS_TEST_INTERACTIVE=True ./result/bin/qgis --code pkgs/applications/gis/qgis/test.py + +import os + +test_interactive = eval(os.getenv("QGIS_TEST_INTERACTIVE", "False")) + +def test(test_interactive=False): + + import osgeo # just to check if geo python modules are available + from qgis.core import QgsVectorLayer, QgsFeature, QgsGeometry, QgsProject + + # Nix snowflake as WKT + WKT = """ + MULTIPOLYGON ( + ((37.10819200000000251 45.01934500000000128, 41.42360200000000248 45.0228350000000006, 43.98593199999999825 46.39836900000000242, 51.11554000000000286 46.39135900000000134, 52.20562400000000025 46.98079299999999847, 51.13812500000000227 47.55708200000000119, 46.12925599999999804 47.56117799999999818, 48.65136199999999889 48.91279899999999969, 46.46644299999999816 50.06610299999999825, 37.10819200000000251 45.01934500000000128)), + ((36.37806400000000195 49.06532800000000094, 34.21064499999999953 50.22733199999999698, 29.10392099999999971 50.23055699999999746, 25.55861099999999908 52.15672200000000203, 23.37426999999999921 52.15597100000000097, 22.30527299999999968 51.57995100000000122, 24.79831000000000074 50.22714599999999763, 19.77820099999999925 50.23147999999999769, 17.66315000000000168 49.06561399999999651, 36.37806400000000195 49.06532800000000094)), + ((25.51021400000000128 46.84120599999999968, 23.36222199999999916 45.67570500000000067, 25.90661599999999964 44.29694800000000043, 22.32231799999999922 42.37779100000000199, 23.41657500000000169 41.78910799999999881, 25.55307200000000023 41.78884599999999949, 28.06890399999999985 43.13755299999999693, 30.56690599999999947 41.78159999999999741, 34.86687599999999776 41.79416100000000256, 25.51021400000000128 46.84120599999999968)), + ((29.60533099999999962 44.88583400000000267, 31.77274900000000102 43.72382000000000346, 36.87947299999999728 43.7205939999999984, 40.42478299999999791 41.79442999999999842, 42.60912400000000133 41.7951929999999976, 43.67812200000000189 42.37121299999999735, 41.18508400000000336 43.72401599999999888, 46.20519399999999877 43.71968400000000088, 48.32024400000000242 44.885548, 29.60533099999999962 44.88583400000000267)), + ((28.88739899999999849 48.92013800000000145, 24.57198899999999853 48.9166450000000026, 22.0096589999999992 47.54111400000000032, 14.88005199999999917 47.54812199999999933, 13.78996700000000075 46.95868999999999716, 14.85746600000000051 46.38240100000000155, 19.86633600000000044 46.37830199999999792, 17.34422899999999856 45.02668100000000351, 19.52914900000000031 43.87337800000000243, 28.88739899999999849 48.92013800000000145)), + ((25.52133699999999905 46.84445300000000145, 23.37334500000000048 45.67894900000000291, 25.91773900000000097 44.30019200000000268, 22.33344200000000157 42.38103699999999918, 23.4276990000000005 41.79235400000000311, 25.56419500000000156 41.79209199999999669, 28.08002700000000118 43.14079900000000123, 30.57802999999999827 41.78484600000000171, 34.87800000000000011 41.79740699999999975, 25.52133699999999905 46.84445300000000145)), + ((25.52133699999999905 46.84445300000000145, 23.37334500000000048 45.67895099999999786, 25.91773900000000097 44.30019200000000268, 22.33344200000000157 42.38103699999999918, 23.4276990000000005 41.79235400000000311, 25.56419500000000156 41.79209199999999669, 28.08002700000000118 43.14079900000000123, 30.57802999999999827 41.78484600000000171, 34.87800000000000011 41.79740699999999975, 25.52133699999999905 46.84445300000000145)), + ((25.51021400000000128 46.84120599999999968, 23.36222199999999916 45.67570500000000067, 25.90661599999999964 44.29694800000000043, 22.32231799999999922 42.37779100000000199, 23.41657500000000169 41.78910799999999881, 25.55307200000000023 41.78884599999999949, 28.06890399999999985 43.13755299999999693, 30.56690599999999947 41.78159999999999741, 34.86687599999999776 41.79416100000000256, 25.51021400000000128 46.84120599999999968)), + ((40.49807200000000051 47.09720099999999832, 42.64606299999999806 48.26270199999999733, 40.10166999999999859 49.64145899999999756, 43.685966999999998 51.56061600000000311, 42.59170999999999907 52.14929899999999918, 40.45521399999999801 52.1495609999999985, 37.93938099999999736 50.80085400000000107, 35.44137899999999775 52.15680700000000058, 31.14140899999999945 52.14424700000000001, 40.49807200000000051 47.09720099999999832)), + ) + """ + + layer = QgsVectorLayer('Polygon?crs=epsg:3857', 'QGIS-on-Nix', 'memory') + provider = layer.dataProvider() + + polygon = QgsFeature() + geom = QgsGeometry.fromWkt(WKT) + polygon.setGeometry(geom) + provider.addFeatures([polygon]) + + layer.updateExtents() + QgsProject.instance().addMapLayers([layer]) + + # Make sure our test layer contains exactly one feature + assert layer.featureCount() == 1 + + if not test_interactive: + QgsProject.instance().removeMapLayer(layer) + QgsProject.instance().clear() + +try: + test(test_interactive=test_interactive) + + if not test_interactive: + print("QGIS test script was successfully executed.") + os._exit(0) # iface.actionExit().trigger() doesn't work + +except Exception as e: + if not test_interactive: + print("QGIS test script has failed.") + print("Error message: {}".format(e)) + os._exit(1) + diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 1506f0bb9e..83be13b959 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -1,45 +1,48 @@ { lib -, mkDerivation , fetchFromGitHub -, cmake -, ninja -, flex +, fetchpatch +, makeWrapper +, mkDerivation +, substituteAll +, wrapGAppsHook + +, withGrass ? true +, withWebKit ? false + , bison -, proj -, geos -, sqlite -, gsl -, qwt +, cmake +, exiv2 , fcgi -, python3 +, flex +, geos +, grass +, gsl +, hdf5 , libspatialindex , libspatialite -, postgresql -, txt2tags -, openssl , libzip -, hdf5 , netcdf -, exiv2 -, protobuf -, qtbase -, qtsensors -, qca-qt5 -, qtkeychain -, qt3d -, qscintilla -, qtlocation -, qtserialport -, qtxmlpatterns -, withGrass ? true -, grass -, withWebKit ? false -, qtwebkit +, ninja +, openssl , pdal +, postgresql +, proj +, protobuf +, python3 +, qca-qt5 +, qscintilla +, qt3d +, qtbase +, qtkeychain +, qtlocation +, qtsensors +, qtserialport +, qtwebkit +, qtxmlpatterns +, qwt +, sqlite +, txt2tags , zstd -, makeWrapper -, wrapGAppsHook -, substituteAll }: let @@ -53,34 +56,34 @@ let }; pythonBuildInputs = with py.pkgs; [ - qscintilla-qt5 + chardet gdal jinja2 numpy - psycopg2 - chardet - python-dateutil - pyyaml - pytz - requests - urllib3 - pygments - pyqt5 - pyqt-builder - sip - setuptools owslib + psycopg2 + pygments + pyqt-builder + pyqt5 + python-dateutil + pytz + pyyaml + qscintilla-qt5 + requests + setuptools + sip six + urllib3 ]; in mkDerivation rec { - version = "3.28.7"; + version = "3.28.11"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-RWQ3RlE8fPMuDGosxKNVgbjRTigZRolqNyaJoC1xdec="; + hash = "sha256-3yV47GlIhYGR7+ZlPLQw1vy1x8xuJd5erUJO3Pw7L+g="; }; passthru = { @@ -88,6 +91,16 @@ in mkDerivation rec { inherit py; }; + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + + bison + cmake + flex + ninja + ]; + buildInputs = [ openssl proj @@ -120,19 +133,23 @@ in mkDerivation rec { ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; - nativeBuildInputs = [ makeWrapper wrapGAppsHook cmake flex bison ninja ]; - patches = [ (substituteAll { - src = ./set-pyqt-package-dirs.patch; + src = ./set-pyqt-package-dirs-ltr.patch; pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; }) + (fetchpatch { + name = "qgis-3.28.9-exiv2-0.28.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-geosciences/qgis/files/qgis-3.28.9-exiv2-0.28.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; + hash = "sha256-mPRo0A7ko4GCHJrfJ2Ls0dUKvkFtDmhKekI2CR9StMw="; + }) ]; cmakeFlags = [ "-DWITH_3D=True" "-DWITH_PDAL=TRUE" + "-DENABLE_TESTS=False" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass (let gmajor = lib.versions.major grass.version; @@ -143,10 +160,10 @@ in mkDerivation rec { dontWrapGApps = true; # wrapper params passed below postFixup = lib.optionalString withGrass '' - # grass has to be availble on the command line even though we baked in + # GRASS has to be availble on the command line even though we baked in # the path at build time using GRASS_PREFIX. - # using wrapGAppsHook also prevents file dialogs from crashing the program - # on non-NixOS + # Using wrapGAppsHook also prevents file dialogs from crashing the program + # on non-NixOS. wrapProgram $out/bin/qgis \ "''${gappsWrapperArgs[@]}" \ --prefix PATH : ${lib.makeBinPath [ grass ]} diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index c2d51f5b98..8d01ce5f7a 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,49 +1,53 @@ { lib -, mkDerivation , fetchFromGitHub -, cmake -, ninja -, flex +, fetchpatch +, makeWrapper +, mkDerivation +, substituteAll +, wrapGAppsHook +, wrapQtAppsHook + +, withGrass ? true +, withWebKit ? false + , bison -, proj -, geos -, sqlite -, gsl -, qwt +, cmake +, exiv2 , fcgi -, python3 +, flex +, geos +, grass +, gsl +, hdf5 , libspatialindex , libspatialite -, postgresql -, txt2tags -, openssl , libzip -, hdf5 , netcdf -, exiv2 -, protobuf -, qtbase -, qtsensors -, qca-qt5 -, qtkeychain -, qt3d -, qscintilla -, qtlocation -, qtserialport -, qtxmlpatterns -, withGrass ? true -, grass -, withWebKit ? false -, qtwebkit +, ninja +, openssl , pdal +, postgresql +, proj +, protobuf +, python3 +, qca-qt5 +, qscintilla +, qt3d +, qtbase +, qtkeychain +, qtlocation +, qtmultimedia +, qtsensors +, qtserialport +, qtwebkit +, qtxmlpatterns +, qwt +, sqlite +, txt2tags , zstd -, makeWrapper -, wrapGAppsHook -, substituteAll }: let - py = python3.override { packageOverrides = self: super: { pyqt5 = super.pyqt5.override { @@ -53,34 +57,34 @@ let }; pythonBuildInputs = with py.pkgs; [ - qscintilla-qt5 + chardet gdal jinja2 numpy - psycopg2 - chardet - python-dateutil - pyyaml - pytz - requests - urllib3 - pygments - pyqt5 - pyqt-builder - sip - setuptools owslib + psycopg2 + pygments + pyqt-builder + pyqt5 + python-dateutil + pytz + pyyaml + qscintilla-qt5 + requests + setuptools + sip six + urllib3 ]; in mkDerivation rec { - version = "3.28.3"; + version = "3.32.3"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-nXauZSC78BX1fcx0SXniwQpRmdSLfoqZ5jlbXeHgRGI="; + hash = "sha256-ge5ne22sDLKbrJk2vYQxpu3iRXSoOk9924c/RdtD3Nc="; }; passthru = { @@ -88,51 +92,73 @@ in mkDerivation rec { inherit py; }; + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + wrapQtAppsHook + + cmake + flex + bison + ninja + ]; + buildInputs = [ - openssl - proj - geos - sqlite - gsl - qwt exiv2 - protobuf fcgi + geos + gsl + hdf5 libspatialindex libspatialite - postgresql - txt2tags libzip - hdf5 netcdf - qtbase - qtsensors + openssl + pdal + postgresql + proj + protobuf qca-qt5 - qtkeychain qscintilla + qt3d + qtbase + qtkeychain qtlocation + qtmultimedia + qtsensors qtserialport qtxmlpatterns - qt3d - pdal + qwt + sqlite + txt2tags zstd ] ++ lib.optional withGrass grass ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; - nativeBuildInputs = [ makeWrapper wrapGAppsHook cmake flex bison ninja ]; - patches = [ (substituteAll { src = ./set-pyqt-package-dirs.patch; pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; }) + (fetchpatch { + name = "exiv2-0.28.patch"; + url = "https://github.com/qgis/QGIS/commit/32f5418fc4f7bb2ee986dee1824ff2989c113a94.patch"; + hash = "sha256-zWyf+kLro4ZyUJLX/nDjY0nLneTaI1DxHvRsvwoWq14="; + }) ]; + # Add path to Qt platform plugins + # (offscreen is needed by "${APIS_SRC_DIR}/generate_console_pap.py") + preBuild = '' + export QT_QPA_PLATFORM_PLUGIN_PATH=${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms + ''; + cmakeFlags = [ "-DWITH_3D=True" "-DWITH_PDAL=TRUE" + "-DENABLE_TESTS=False" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass (let gmajor = lib.versions.major grass.version; @@ -140,13 +166,17 @@ in mkDerivation rec { in "-DGRASS_PREFIX${gmajor}=${grass}/grass${gmajor}${gminor}" ); + qtWrapperArgs = [ + "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.version}/plugins/platforms" + ]; + dontWrapGApps = true; # wrapper params passed below postFixup = lib.optionalString withGrass '' - # grass has to be availble on the command line even though we baked in + # GRASS has to be availble on the command line even though we baked in # the path at build time using GRASS_PREFIX. - # using wrapGAppsHook also prevents file dialogs from crashing the program - # on non-NixOS + # Using wrapGAppsHook also prevents file dialogs from crashing the program + # on non-NixOS. wrapProgram $out/bin/qgis \ "''${gappsWrapperArgs[@]}" \ --prefix PATH : ${lib.makeBinPath [ grass ]} diff --git a/third_party/nixpkgs/pkgs/applications/gis/qmapshack/default.nix b/third_party/nixpkgs/pkgs/applications/gis/qmapshack/default.nix index 2665e74ed3..3460f60d2b 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qmapshack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qmapshack/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, cmake, substituteAll, wrapQtAppsHook -, qtscript, qttranslations, qtwebengine, gdal, proj, routino, quazip }: +{ lib, stdenv, fetchFromGitHub, cmake, wrapQtAppsHook +, qtscript, qtwebengine, gdal, proj, routino, quazip }: stdenv.mkDerivation rec { pname = "qmapshack"; @@ -12,14 +12,6 @@ stdenv.mkDerivation rec { hash = "sha256-qG/fiR2J5wQZaR+xvBGjdp3L7viqki2ktkzBUf6fZi8="; }; - patches = [ - # See https://github.com/NixOS/nixpkgs/issues/86054 - (substituteAll { - src = ./fix-qttranslations-path.patch; - inherit qttranslations; - }) - ]; - nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtscript qtwebengine gdal proj routino quazip ]; diff --git a/third_party/nixpkgs/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch b/third_party/nixpkgs/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch deleted file mode 100644 index 9f05611f5a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/gis/qmapshack/fix-qttranslations-path.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git i/src/qmapshack/setup/CAppSetupLinux.cpp w/src/qmapshack/setup/CAppSetupLinux.cpp -index 7581ef32..26eba3c8 100644 ---- i/src/qmapshack/setup/CAppSetupLinux.cpp -+++ w/src/qmapshack/setup/CAppSetupLinux.cpp -@@ -30,7 +30,7 @@ void CAppSetupLinux::initQMapShack() { - prepareGdal("", ""); - - // setup translators -- QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); -+ QLatin1String resourceDir = QLatin1String("@qttranslations@/translations"); - QString translationPath = QCoreApplication::applicationDirPath(); - translationPath.replace(QRegExp("bin$"), "share/qmapshack/translations"); - prepareTranslator(resourceDir, "qt_"); -diff --git i/src/qmapshack/setup/CAppSetupMac.cpp w/src/qmapshack/setup/CAppSetupMac.cpp -index 37602802..ae4a5a23 100644 ---- i/src/qmapshack/setup/CAppSetupMac.cpp -+++ w/src/qmapshack/setup/CAppSetupMac.cpp -@@ -56,7 +56,7 @@ void CAppSetupMac::initQMapShack() { - - // setup translators - QString translationPath = getApplicationDir(relTranslationDir).absolutePath(); -- prepareTranslator(translationPath, "qt_"); -+ prepareTranslator(QLatin1String("@qttranslations@/translations"), "qt_"); - prepareTranslator(translationPath, "qmapshack_"); - - // load and apply style sheet -diff --git i/src/qmaptool/setup/CAppSetupLinux.cpp w/src/qmaptool/setup/CAppSetupLinux.cpp -index b703e7bb..637d653e 100644 ---- i/src/qmaptool/setup/CAppSetupLinux.cpp -+++ w/src/qmaptool/setup/CAppSetupLinux.cpp -@@ -29,7 +29,7 @@ void CAppSetupLinux::initQMapTool() { - prepareGdal("", ""); - - // setup translators -- QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); -+ QLatin1String resourceDir = QLatin1String("@qttranslations@/translations"); - QString translationPath = QCoreApplication::applicationDirPath(); - translationPath.replace(QRegExp("bin$"), "share/qmaptool/translations"); - prepareTranslator(resourceDir, "qt_"); -diff --git i/src/qmaptool/setup/CAppSetupMac.cpp w/src/qmaptool/setup/CAppSetupMac.cpp -index dd68b9c1..84351cf4 100644 ---- i/src/qmaptool/setup/CAppSetupMac.cpp -+++ w/src/qmaptool/setup/CAppSetupMac.cpp -@@ -57,7 +57,7 @@ void CAppSetupMac::initQMapTool() { - - // setup translators - QString translationPath = getApplicationDir(relTranslationDir).absolutePath(); -- prepareTranslator(translationPath, "qt_"); -+ prepareTranslator(QLatin1String("@qttranslations@/translations"), "qt_"); - prepareTranslator(translationPath, "qmaptool_"); - - migrateDirContent(defaultCachePath()); -diff --git i/src/qmt_rgb2pct/main.cpp w/src/qmt_rgb2pct/main.cpp -index 589d3d52..5f7c12f8 100644 ---- i/src/qmt_rgb2pct/main.cpp -+++ w/src/qmt_rgb2pct/main.cpp -@@ -47,7 +47,7 @@ static void prepareTranslator(QString translationPath, QString translationPrefix - static void loadTranslations() { - #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(__FreeBSD_kernel__) || defined(__GNU__) || \ - defined(Q_OS_CYGWIN) -- QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); -+ QLatin1String resourceDir = QLatin1String("@qttranslations@/translations"); - QString translationPath = QCoreApplication::applicationDirPath(); - translationPath.replace(QRegExp("bin$"), "share/" APP_STR "/translations"); - prepareTranslator(resourceDir, "qt_"); -@@ -58,7 +58,7 @@ static void loadTranslations() { - // os x - static QString relTranslationDir = "Resources/translations"; // app - QString translationPath = getApplicationDir(relTranslationDir).absolutePath(); -- prepareTranslator(translationPath, "qt_"); -+ prepareTranslator(QLatin1String("@qttranslations@/translations"), "qt_"); - prepareTranslator(translationPath, APP_STR "_"); - #endif - diff --git a/third_party/nixpkgs/pkgs/applications/gis/spatialite-tools/default.nix b/third_party/nixpkgs/pkgs/applications/gis/spatialite-tools/default.nix index b336c41862..b05b3949ae 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/spatialite-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/spatialite-tools/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "spatialite-tools"; - version = "5.1.0"; + version = "5.1.0a"; src = fetchurl { url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/spatialite-tools-${version}.tar.gz"; - hash = "sha256-3zAwNnwInKkPpmMIl/PxooB4TaKeG6Y080DbpLCFg7U="; + hash = "sha256-EZ40dY6AiM27Q+2BtKbq6ojHZLC32hkAGlUUslRVAc4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index fa90b95bd7..c6d3a83e0c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -30,6 +30,7 @@ , Foundation , testers , imagemagick +, perlPackages , python3 }: @@ -47,13 +48,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-15"; + version = "7.1.1-19"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-/fI/RrwcgvKX5loIrDAur60VF5O4FgyPYN7BbcPP/bU="; + hash = "sha256-SxvaodAjSlOvmGPnD0AcXHrE5dTX2eX1sDM/441rP64="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -125,12 +126,14 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { version = testers.testVersion { package = finalAttrs.finalPackage; }; + inherit (perlPackages) ImageMagick; inherit (python3.pkgs) img2pdf; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; meta = with lib; { homepage = "http://www.imagemagick.org/"; + changelog = "https://github.com/ImageMagick/Website/blob/main/ChangeLog.md"; description = "A software suite to create, edit, compose, or convert bitmap images"; pkgConfigModules = [ "ImageMagick" "MagickWand" ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/animbar/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/animbar/default.nix deleted file mode 100644 index dda734363e..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/animbar/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, lib, fetchurl, cmake, qt4, file }: - -stdenv.mkDerivation rec { - pname = "animbar"; - version = "1.2"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0836nwcpyfdrapyj3hbg3wh149ihc26pc78h01adpc7c0r7d9pr9"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ qt4 file ]; - - installPhase = '' - mkdir -p $out/bin $out/share/pixmaps - cp src/animbar $out/bin - cp ../icon/* $out/share/pixmaps - ''; - - meta = with lib; { - description = "Create your own animation on paper and transparancy"; - longDescription = '' - Animbar lets you easily create your own animation on paper and - transparancy. From a set of input images two output images are - computed, that are printed one on paper and one on - transparency. By moving the transparency over the paper you - create a fascinating animation effect. This kind of animation - technique is hundreds of years old and known under several - names: picket fence animation, barrier grid animation, Moiré - animation, to name a few. - ''; - homepage = "http://animbar.mnim.org"; - maintainers = with maintainers; [ leenaars ]; - platforms = platforms.linux; - license = licenses.gpl3; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix index b98e7a4fb4..de6f593fc4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/artem/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "artem"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "finefindus"; - repo = pname; + repo = "artem"; rev = "v${version}"; - hash = "sha256-liYZloaXN9doNyPO76iCaiZO9ZkNGBm+BxxNX87ZqBM="; + hash = "sha256-t8L1lylaacEHGg3wxVgiB2XmBHDGzql774oHrg/vUC0="; }; - cargoHash = "sha256-fTAuh4jbfNpFaEu1X0LwVA30ghQ6mh5/Afap7gUjzMc="; + cargoHash = "sha256-rsgl8g6AqNmdq2gJ3PHvKMb7eid8ewtheajGWSWbeBw="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ascii-image-converter/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ascii-image-converter/default.nix index ed99f1ac73..c4a63aa4fb 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ascii-image-converter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ascii-image-converter/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-svM/TzGQU/QgjqHboy0470+A6p4kR76typ9gnfjfAJk="; }; - vendorSha256 = "sha256-rQS3QH9vnEbQZszG3FOr1P5HYgS63BurCNCFQTTdvZs="; + vendorHash = "sha256-rQS3QH9vnEbQZszG3FOr1P5HYgS63BurCNCFQTTdvZs="; meta = with lib; { description = "Convert images into ASCII art on the console"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix index 5afd0f1d87..50a1031054 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_22 }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_25 }: stdenv.mkDerivation rec { pname = "blockbench-electron"; - version = "4.5.2"; + version = "4.8.1"; src = fetchurl { url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage"; - sha256 = "sha256-uUgVBdYMCF31+L/FV4ADIpUdEAmnW59KfscQxUStPWM="; + sha256 = "sha256-CE2wDOt1WBcYmPs4sEyZ3LYvKLequFZH0B3huMYHlwA="; name = "${pname}-${version}.AppImage"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; postFixup = '' - makeWrapper ${electron_22}/bin/electron $out/bin/${pname} \ + makeWrapper ${electron_25}/bin/electron $out/bin/${pname} \ --add-flags $out/share/${pname}/resources/app.asar \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" ''; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/brlcad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/brlcad/default.nix index 2a0853fb22..f30a6acbbb 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/brlcad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/brlcad/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBRLCAD_ENABLE_STRICT=OFF" - "-DCMAKE_BUILD_TYPE=Release" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix index 0adc585603..093a53978a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/dia/default.nix @@ -2,12 +2,11 @@ , stdenv , fetchFromGitLab , appstream-glib -, cmake , dblatex , desktop-file-utils , graphene -, gtk2 -, gtk-mac-integration-gtk2 +, gtk3 +, gtk-mac-integration-gtk3 , intltool , libxml2 , libxslt @@ -16,24 +15,22 @@ , pkg-config , poppler , python3 - # Building with docs are failing in unstable-2022-12-14 + # Building with docs are still failing in unstable-2023-09-28 , withDocs ? false }: stdenv.mkDerivation { pname = "dia"; - version = "unstable-2022-12-14"; + version = "unstable-2023-09-28"; src = fetchFromGitLab { owner = "GNOME"; repo = "dia"; domain = "gitlab.gnome.org"; - rev = "4a619ec7cc93be5ddfbcc48d9e1572d04943bcad"; - hash = "sha256-xi45Ak4rlDQjs/FNkdkm145mx76GNHjE6Nrs1dc94ww="; + rev = "bd551bb2558dcc89bc0bf7b4dd85b38cd85ad322"; + hash = "sha256-U+8TUE1ULt6MNxnvw9kFjCAVBecUy2Sarof6H9+kR7Q="; }; - patches = [ ./poppler-22_09-build-fix.patch ]; - # Required for the PDF plugin when building with clang. CXXFLAGS = "-std=c++17"; @@ -43,7 +40,7 @@ stdenv.mkDerivation { buildInputs = [ graphene - gtk2 + gtk3 libxml2 python3 poppler @@ -52,7 +49,7 @@ stdenv.mkDerivation { libxslt ] ++ lib.optionals stdenv.isDarwin [ - gtk-mac-integration-gtk2 + gtk-mac-integration-gtk3 ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index 10ba1013b8..9241453152 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -14,19 +14,19 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "21.6.1"; + version = "22.0.2"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-60fOecWDYGkn4rJzxmum14L4IAaHAG+uKyjNo9nkVHg="; + hash = "sha256-L+tbNCokVoiS2KkaPVBjG7H/8cqz1e8dlXC5H8BkPvU="; }; offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-Knk9ys8Kjk1QOl80vmIA2H6wP8Mj6iNcmb/bR4zMQgw="; + hash = "sha256-d8AquOKdrPQHBhRG9o1GB18LpwlwQK6ZaM1gLAcjilM="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { yarn --offline run electron-builder --dir \ --config electron-builder-linux-mac.json \ - -c.electronDist=${electron}/lib/electron \ + -c.electronDist=${electron}/libexec/electron \ -c.electronVersion=${electron.version} runHook postBuild @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { comment = "draw.io desktop"; mimeTypes = [ "application/vnd.jgraph.mxfile" "application/vnd.visio" ]; categories = [ "Graphics" ]; - startupWMClass = "drawio"; + startupWMClass = "draw.io"; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix index 918350b3fc..0207d3fa13 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "f3d"; - version = "2.1.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "f3d-app"; repo = "f3d"; rev = "refs/tags/v${version}"; - hash = "sha256-2LDHIeKgLUS2ujJUx2ZerXmZYB9rrT3PYvrtzV4vcHM="; + hash = "sha256-3Pg8uvrUGPKPmsn24q5HPMg9dgvukAXBgSVTW0NiCME="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix index 80e13fda92..1a21752949 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/fig2dev/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "fig2dev"; - version = "3.2.8b"; + version = "3.2.9"; src = fetchurl { url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; - sha256 = "1jv8rg71dsy00lpg434r5zqs5qrg8mxqvv2gpcjjvmzsm551d2j1"; + hash = "sha256-FeJGyNE8xy3iXggxQDitUM59Le+pzxr8Fy/X9ZMgkLE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix index 1afc65ea0f..64af09ada8 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/figma-linux/default.nix @@ -4,19 +4,20 @@ , fetchurl , autoPatchelfHook , dpkg +, wrapGAppsHook , ... }: with lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "figma-linux"; version = "0.10.0"; src = fetchurl { - url = "https://github.com/Figma-Linux/figma-linux/releases/download/v${version}/figma-linux_${version}_linux_amd64.deb"; + url = "https://github.com/Figma-Linux/figma-linux/releases/download/v${finalAttrs.version}/figma-linux_${finalAttrs.version}_linux_amd64.deb"; sha256 = "sha256-+xiXEwSSxpt1/Eu9g57/L+Il/Av+a/mgGBQl/4LKR74="; }; - nativeBuildInputs = [ autoPatchelfHook dpkg ]; + nativeBuildInputs = [ autoPatchelfHook dpkg wrapGAppsHook ]; buildInputs = with pkgs;[ alsa-lib @@ -64,7 +65,7 @@ stdenv.mkDerivation rec { postFixup = '' substituteInPlace $out/share/applications/figma-linux.desktop \ - --replace "Exec=/opt/figma-linux/figma-linux" "Exec=$out/bin/${pname}" + --replace "Exec=/opt/figma-linux/figma-linux" "Exec=$out/bin/${finalAttrs.pname}" ''; meta = { @@ -72,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Figma-Linux/figma-linux"; platforms = [ "x86_64-linux" ]; license = licenses.gpl2; - maintainers = with maintainers; [ ercao ]; + maintainers = with maintainers; [ ercao kashw2 ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/flaca/Cargo.lock b/third_party/nixpkgs/pkgs/applications/graphics/flaca/Cargo.lock index 459059ea20..fe91f0890a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/flaca/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/graphics/flaca/Cargo.lock @@ -37,6 +37,12 @@ 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 = "bitvec" version = "1.0.1" @@ -57,9 +63,9 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "byteorder" @@ -69,11 +75,12 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -142,9 +149,9 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.0" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e" +checksum = "82e95fbd621905b854affdc67943b043a0fbb6ed7385fd5a25650d19a8a6cfdf" dependencies = [ "nix", "windows-sys", @@ -152,9 +159,9 @@ dependencies = [ [[package]] name = "dactyl" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee53db074fe946dcfb43408f19964425827d2967f74c5f4509c48a91bd2899f" +checksum = "72f762271c6826d426c3fd2e37aa827fa039596bc7050e9289cb713265be3d7f" dependencies = [ "num-traits", ] @@ -177,15 +184,15 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -204,12 +211,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" [[package]] name = "fdeflate" @@ -222,7 +226,7 @@ dependencies = [ [[package]] name = "flaca" -version = "2.2.1" +version = "2.3.0" dependencies = [ "argyle", "cc", @@ -239,9 +243,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -255,9 +259,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "fyi_msg" -version = "0.11.0" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34a6cc16a2874d6da616ed0766edc29ed01f51ed4121f6d8c723d622433f4298" +checksum = "04bb9530916893c31bca029d18088c77f02ea93e270cffab771f9b985cdeb4bb" dependencies = [ "ahash", "bytecount", @@ -274,24 +278,15 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" 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" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -311,26 +306,6 @@ dependencies = [ "hashbrown", ] -[[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 0.3.1", - "libc", - "windows-sys", -] - [[package]] name = "itertools" version = "0.10.5" @@ -351,9 +326,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.146" +version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b" +checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" [[package]] name = "libdeflate-sys" @@ -375,15 +350,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memoffset" @@ -406,9 +381,9 @@ dependencies = [ [[package]] name = "mozjpeg-sys" -version = "1.1.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626df331e335cf8a26510918010954f4770f3b04714026c1904e42c4507f8a3e" +checksum = "808feab72499ffd6c267a6fd06bd07e37bef14650c328a5c64636fecfa113eff" dependencies = [ "cc", "dunce", @@ -427,14 +402,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cfg-if", "libc", - "static_assertions", ] [[package]] @@ -460,20 +434,20 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[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", ] @@ -503,11 +477,11 @@ dependencies = [ [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", @@ -548,7 +522,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -577,13 +551,12 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.20" +version = "0.38.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0" +checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" dependencies = [ - "bitflags", + "bitflags 2.4.0", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys", @@ -591,27 +564,21 @@ dependencies = [ [[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 = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "tap" @@ -621,11 +588,10 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg", "cfg-if", "fastrand", "redox_syscall", @@ -688,9 +654,9 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -703,51 +669,51 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "write_atomic" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12c8ddcf39a6adf57b643d28dd93e9e04c9f3df6af8aaf924c4c4622172cc103" +checksum = "e1cc5bd3df909eefc4f13328da8ac3b9e6016e0899477c0354c6880c67362cfc" dependencies = [ "rustix", "tempfile", diff --git a/third_party/nixpkgs/pkgs/applications/graphics/flaca/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/flaca/default.nix index 039ddcfecc..0c421618d0 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/flaca/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/flaca/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "flaca"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Blobfolio"; repo = pname; rev = "v${version}"; - hash = "sha256-RXMqPpQM2h6EtIIH8Ix31euC7zK3v2QohZqouNlK7rM="; + hash = "sha256-gK9nKvhrqGQ3yDAfnqDF2K1g6JK3CYz0kSpTLqfGTzc="; }; # upstream does not provide a Cargo.lock diff --git a/third_party/nixpkgs/pkgs/applications/graphics/fontmatrix/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/fontmatrix/default.nix index 3c67b11844..6945c3ac3a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/fontmatrix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/fontmatrix/default.nix @@ -1,28 +1,26 @@ -{ lib, mkDerivation, fetchpatch, fetchFromGitHub, cmake, qttools, qtwebkit }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qttools +, qtwebkit +}: mkDerivation rec { pname = "fontmatrix"; - version = "0.6.0-qt5"; + version = "0.9.100"; src = fetchFromGitHub { - owner = "fcoiffie"; + owner = "fontmatrix"; repo = "fontmatrix"; - rev = "1ff8382d8c85c18d9962918f461341ff4fe21993"; - sha256 = "0yx1gbsjj9ddq1kiqplif1w5x5saw250zbmhmd4phqmaqzr60w0h"; + rev = "v${version}"; + sha256 = "sha256-DtajGhx79DiecglXHja9q/TKVq8Jl2faQdA5Ib/yT88="; }; - # Add missing QAction include - patches = [ (fetchpatch { - url = "https://github.com/fcoiffie/fontmatrix/commit/dc6de8c414ae21516b72daead79c8db88309b102.patch"; - sha256 = "092860fdyf5gq67jqfxnlgwzjgpizi6j0njjv3m62aiznrhig7c8"; - })]; - buildInputs = [ qttools qtwebkit ]; nativeBuildInputs = [ cmake ]; - hardeningDisable = [ "format" ]; - meta = with lib; { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; homepage = "https://github.com/fontmatrix/fontmatrix"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix index 29f8746b38..f997f23d43 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -1,8 +1,9 @@ { lib +, fmt , stdenv -, mkDerivation , fetchFromGitHub , cmake +, doxygen , ninja , gitpython , boost @@ -46,15 +47,15 @@ , zlib }: -mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freecad"; - version = "0.20.2"; + version = "0.21.1"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; - rev = version; - hash = "sha256-v8hanhy0UE0o+XqqIH3ZUtVom3q0KGELcfXFRSDr0TA="; + rev = finalAttrs.version; + hash = "sha256-rwt81Z+Bp8uZlR4iuGQEDKBu/Dr9Rqg7d9SsCdofTUU="; }; nativeBuildInputs = [ @@ -71,7 +72,9 @@ mkDerivation rec { gitpython # for addon manager boost coin3d + doxygen eigen + fmt gts hdf5 libGLU @@ -143,8 +146,8 @@ mkDerivation rec { ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd ''; - meta = with lib; { - homepage = "https://www.freecadweb.org/"; + meta = { + homepage = "https://www.freecad.org"; description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; longDescription = '' FreeCAD is an open-source parametric 3D modeler made primarily to design @@ -162,8 +165,8 @@ mkDerivation rec { programmer, an experienced CAD user, a student or a teacher, you will feel right at home with FreeCAD. ''; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ viric gebner AndersonTorres ]; - platforms = platforms.linux; + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ viric gebner AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix index 603d14b31d..f0f796ed59 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gthumb/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , gnome , pkg-config , meson @@ -20,6 +19,7 @@ , libchamplain , librsvg , libwebp +, libX11 , json-glib , webkitgtk , lcms2 @@ -35,29 +35,13 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.12.2"; + version = "3.12.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-l/iv5SJTUhZUHrvx47VG0Spr6zio8OuF8m5naTSq1CU="; + sha256 = "sha256-k9s11xQCxIoILVDPQIW7a4DkvVyLmxYaH3tRhBsQBxE="; }; - patches = [ - # Fix build with libraw 0.21, can be removed on next update - # https://hydra.nixos.org/build/209327709/nixlog/1 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec.patch"; - sha256 = "sha256-/l9US19rKxIUJjZ+oynGLr/9PKJPg9VUuA/VSuIT5AQ="; - }) - - # Fix build with exiv2 0.28, can be removed on next update - # https://gitlab.gnome.org/GNOME/gthumb/-/issues/282 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/3376550ae109286de09ce5f89e05060eb80230a7.patch"; - sha256 = "sha256-zHX+kV7RaHXFqbR15RTaRcZJPU/P3uUj03tFUv0DR5o="; - }) - ]; - nativeBuildInputs = [ bison desktop-file-utils @@ -93,6 +77,7 @@ stdenv.mkDerivation rec { libsoup libtiff libwebp + libX11 webkitgtk ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix index d690f5e067..a8db24c352 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix @@ -3,7 +3,6 @@ , fetchpatch , fetchFromGitHub , cmake -, extra-cmake-modules , qtbase , wrapQtAppsHook , libraw @@ -17,12 +16,12 @@ mkDerivation rec { pname = "hdrmerge"; - version = "unstable-2020-11-12"; + version = "unstable-2023-01-04"; src = fetchFromGitHub { owner = "jcelaya"; repo = "hdrmerge"; - rev = "f5a2538cffe3e27bd9bea5d6a199fa211d05e6da"; - sha256 = "1bzf9wawbdvdbv57hnrmh0gpjfi5hamgf2nwh2yzd4sh1ssfa8jz"; + rev = "ca38b54f980564942a7f2b014a5f57a64c1d9019"; + hash = "sha256-DleYgpDXP0NvbmEURXnBfe3OYnT1CaQq+Mw93JQQprE="; }; nativeBuildInputs = [ @@ -39,17 +38,11 @@ mkDerivation rec { ]; patches = [ + # https://github.com/jcelaya/hdrmerge/pull/222 (fetchpatch { - # patch FindAlglib.cmake to respect ALGLIB_DIR - # see https://github.com/jcelaya/hdrmerge/pull/213 - name = "patch-hdrmerge-CMake.patch"; - url = "https://github.com/mkroehnert/hdrmerge/commit/472b2dfe7d54856158aea3d5412a02d0bab1da4c.patch"; - sha256 = "0jc713ajr4w08pfbi6bva442prj878nxp1fpl9112i3xj34x9sdi"; - }) - (fetchpatch { - name = "support-libraw-0.21.patch"; - url = "https://github.com/jcelaya/hdrmerge/commit/779e566b3e2807280b78c79affda2cdfa64bde87.diff"; - sha256 = "48sivCfJWEtGiBXTrO+SWTVlT9xyx92w2kkB8Wt/clk="; + name = "exiv2-0.28.patch"; + url = "https://github.com/jcelaya/hdrmerge/commit/377d8e6f3c7cdd1a45b63bce2493ad177dde03fb.patch"; + hash = "sha256-lXHML6zGkVeWKvmY5ECoJL2xjmtZz77XJd5prpgJiZo="; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hugin/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hugin/default.nix index d5feb67f4b..29535438ec 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hugin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hugin/default.nix @@ -2,6 +2,7 @@ , stdenv , cmake , fetchurl +, fetchpatch , gnumake , makeWrapper , pkg-config @@ -41,9 +42,17 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/hugin/hugin-${version}.tar.bz2"; - sha256 = "sha256-l8hWKgupp0PguVWkPf3gSLHGDNnl8u4rad4agWRuBac="; + hash = "sha256-l8hWKgupp0PguVWkPf3gSLHGDNnl8u4rad4agWRuBac="; }; + patches = [ + (fetchpatch { + name = "hugin-2022.0.0-exiv2-0.28.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/hugin/files/hugin-2022.0.0-exiv2-0.28.patch?id=d18335caa756f5e5c1478d5fe3ba17f011a78c80"; + hash = "sha256-Y+79bFb926GW5oLOL0e5y7kLhqU/vZcry+kLL4H2fUE="; + }) + ]; + buildInputs = [ boost cairo diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch new file mode 100644 index 0000000000..e7200814eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch @@ -0,0 +1,18 @@ +diff --git a/hydrus/core/HydrusConstants.py b/hydrus/core/HydrusConstants.py +index 809338ef..9125928f 100644 +--- a/hydrus/core/HydrusConstants.py ++++ b/hydrus/core/HydrusConstants.py +@@ -59,12 +59,7 @@ elif PLATFORM_HAIKU: + RUNNING_FROM_SOURCE = sys.argv[0].endswith( '.py' ) or sys.argv[0].endswith( '.pyw' ) + RUNNING_FROM_MACOS_APP = os.path.exists( os.path.join( BASE_DIR, 'running_from_app' ) ) + +-if RUNNING_FROM_SOURCE: +- NICE_RUNNING_AS_STRING = 'from source' +-elif RUNNING_FROM_FROZEN_BUILD: +- NICE_RUNNING_AS_STRING = 'from frozen build' +-elif RUNNING_FROM_MACOS_APP: +- NICE_RUNNING_AS_STRING = 'from App' ++NICE_RUNNING_AS_STRING = "from nixpkgs (source)" + + BIN_DIR = os.path.join( BASE_DIR, 'bin' ) + HELP_DIR = os.path.join( BASE_DIR, 'help' ) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index ed8f2bef9e..968f60ba80 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -12,16 +12,21 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "520"; + version = "544"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-y8KfPe3cBBq/iPCG7hNXrZDkOSNi+qSir6rO/65SHkI="; + hash = "sha256-e3VvkdJAQx5heKDJ1Ms6XpXrXWdzv48f8yu0DHfPy1A="; }; + patches = [ + # Nixpkgs specific, can be removed if upstream makes a more reasonable check + ./0001-inform-nixpkgs.patch + ]; + nativeBuildInputs = [ wrapQtAppsHook python3Packages.mkdocs-material @@ -37,13 +42,16 @@ python3Packages.buildPythonPackage rec { cbor2 chardet cloudscraper + dateparser html5lib lxml lz4 numpy opencv4 pillow + pillow-heif psutil + psd-tools pympler pyopenssl pyqt6 @@ -56,7 +64,6 @@ python3Packages.buildPythonPackage rec { requests send2trash service-identity - six twisted ]; @@ -92,6 +99,7 @@ python3Packages.buildPythonPackage rec { -e TestHydrusSessions \ -e TestServer \ -e TestClientMetadataMigration \ + -e TestClientFileStorage \ ''; outputs = [ "out" "doc" ]; @@ -100,13 +108,16 @@ python3Packages.buildPythonPackage rec { # Move the hydrus module and related directories mkdir -p $out/${python3Packages.python.sitePackages} mv {hydrus,static} $out/${python3Packages.python.sitePackages} + # Fix random files being marked with execute permissions + chmod -x $out/${python3Packages.python.sitePackages}/static/*.{png,svg,ico} + # Build docs mkdocs build -d help mv help $out/doc/ # install the hydrus binaries mkdir -p $out/bin - install -m0755 server.py $out/bin/hydrus-server - install -m0755 client.py $out/bin/hydrus-client + install -m0755 hydrus_server.py $out/bin/hydrus-server + install -m0755 hydrus_client.py $out/bin/hydrus-client '' + lib.optionalString enableSwftools '' mkdir -p $out/${python3Packages.python.sitePackages}/bin # swfrender seems to have to be called sfwrender_linux diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index 3e1e482bb3..575f93efcb 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -10,6 +10,7 @@ , ghostscript , glib , glibmm +, gobject-introspection , gsl , gspell , gtk-mac-integration @@ -47,6 +48,7 @@ let appdirs beautifulsoup4 cachecontrol + filelock numpy lxml packaging @@ -104,6 +106,7 @@ stdenv.mkDerivation rec { glib # for setup hook gdk-pixbuf # for setup hook wrapGAppsHook + gobject-introspection ] ++ (with perlPackages; [ perl XMLParser diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix index 08260c968c..d411091bbd 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix @@ -10,13 +10,13 @@ hexmap = stdenv.mkDerivation { pname = "hexmap"; - version = "unstable-2020-06-06"; + version = "unstable-2023-01-26"; src = fetchFromGitHub { owner = "lifelike"; repo = "hexmapextension"; - rev = "11401e23889318bdefb72df6980393050299d8cc"; - sha256 = "1a4jhva624mbljj2k43wzi6hrxacjz4626jfk9y2fg4r4sga22mm"; + rev = "241c9512d0113e8193b7cf06b69ef2c4730b0295"; + hash = "sha256-pSPAupp3xLlbODE2BGu1Xiiiu1Y6D4gG4HhZwccAZ2E="; }; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix index 48ef9fc8c0..8f317bd513 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.22.0"; + version = "1.24.2"; format = "other"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-6Pqa3qNnH8WF/GK4CLyEmLoPm4A6Q3Gri2x0whf6WTY="; + hash = "sha256-c00JRy1K/jYoQYNAMSm6lQkuGQXZv/2liV1F4jpg+C4="; }; nativeBuildInputs = [ @@ -87,6 +87,7 @@ python3.pkgs.buildPythonApplication rec { description = "Manga reader for GNOME"; homepage = "https://valos.gitlab.io/Komikku/"; license = licenses.gpl3Plus; + changelog = "https://gitlab.com/valos/Komikku/-/releases/v${version}"; maintainers = with maintainers; [ chuangzhu infinitivewitch ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/krita/generic.nix b/third_party/nixpkgs/pkgs/applications/graphics/krita/generic.nix index 4f16661ced..507aaf0f76 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/krita/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/krita/generic.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, makeWrapper, fetchurl, cmake, extra-cmake-modules +{ mkDerivation, lib, stdenv, fetchpatch, makeWrapper, fetchurl, cmake, extra-cmake-modules , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash, breeze-icons @@ -21,6 +21,14 @@ mkDerivation rec { inherit sha256; }; + patches = [ + (fetchpatch { + name = "exiv2-0.28.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/krita/-/raw/acd9a818660e86b14a66fceac295c2bab318c671/exiv2-0.28.patch"; + hash = "sha256-iD2pyid513ThJVeotUlVDrwYANofnEiZmWINNUm/saw="; + }) + ]; + nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; buildInputs = [ @@ -47,10 +55,11 @@ mkDerivation rec { --replace 'PYTHONPATH=''${_krita_python_path}' 'PYTHONPATH=${pythonPath}' ''; + cmakeBuildType = "RelWithDebInfo"; + cmakeFlags = [ "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" "-DPYQT_SIP_DIR_OVERRIDE=${python3Packages.pyqt5}/${python3Packages.python.sitePackages}/PyQt5/bindings" - "-DCMAKE_BUILD_TYPE=RelWithDebInfo" ]; preInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix index 97d889c285..53d1278576 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, cmake, fetchFromGitHub, pkg-config +{ lib, mkDerivation, cmake, fetchFromGitHub, fetchpatch, pkg-config , boost, exiv2, fftwFloat, gsl , ilmbase, lcms2, libraw, libtiff, openexr , qtbase, qtdeclarative, qttools, qtwebengine, eigen @@ -6,15 +6,23 @@ mkDerivation rec { pname = "luminance-hdr"; - version = "2.6.0"; + version = "2.6.1.1"; src = fetchFromGitHub { owner = "LuminanceHDR"; repo = "LuminanceHDR"; rev = "v.${version}"; - sha256 = "1izmgjjp8mgyxv57sjjr05z7g7059ykb5wchlcn4wrnnb6aslnvn"; + sha256 = "sha256-PWqtYGx8drfMVp7D7MzN1sIUTQ+Xz5yyeHN87p2r6PY="; }; + patches = [ + (fetchpatch { + name = "exiv2-0.28.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/luminancehdr/-/raw/2e4a7321c7d20a52da104f4aa4dc76ac7224d94b/exiv2-0.28.patch"; + hash = "sha256-Hj+lqAd5VuTjmip8Po7YiGOWWDxnu4IMXOiEFBukXpk="; + }) + ]; + env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/lutgen/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/lutgen/default.nix new file mode 100644 index 0000000000..5b5af34cdc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/lutgen/default.nix @@ -0,0 +1,26 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "lutgen"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "ozwaldorf"; + repo = "lutgen-rs"; + rev = "v${version}"; + hash = "sha256-9olBUPOi6ZQorgPxQX2lqZSlYjEPMwfhUF/Ze34v0nc="; + }; + + cargoHash = "sha256-hMbrzjfLSawrm+GmtLx7sQ7atr1aV2RU9rJXgun6HR8="; + + meta = with lib; { + description = "A blazingly fast interpolated LUT generator and applicator for arbitrary and popular color palettes"; + homepage = "https://github.com/ozwaldorf/lutgen-rs"; + maintainers = with maintainers; [ zzzsy ]; + mainProgram = "lutgen"; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix index 24732eee9e..d197fdadc3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitLab { owner = "postmarketOS"; repo = "megapixels"; rev = version; - hash = "sha256-ZkTDHDL5nhpR8PKqia12pbrEZLnRXEm8DwBYdYrP5Qo="; + hash = "sha256-ejTCYZMDkqz8P3vroq8XAl+pUGgcS56cm3tzOTE3rfc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/meme-image-generator/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/meme-image-generator/default.nix index 198f685774..6d09c59df9 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/meme-image-generator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/meme-image-generator/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "meme-image-generator"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "nomad-software"; repo = "meme"; rev = "v${version}"; - hash = "sha256-MzSPJCszVEZkBvSbRzXR7AaDQOOjDQ2stKKJr8oGOSE="; + hash = "sha256-L+JpNg9X3RSNXTozv2H1n2JiQx75i9gFGaQmDFaMIf0="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix index 3067bfefd2..3da49cf801 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix @@ -27,8 +27,8 @@ mkDerivation rec { src = fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "meshlab"; - rev = "Meshlab-${version}"; - sha256 = "sha256-MP+jkiV6yS1T1eWClxM56kZWLXwu0g4w/zBHy6CSL6Y="; + rev = "MeshLab-${version}"; + sha256 = "sha256-jcc3PfsiIeYyipteZgzd0NwZgFFgR/mMBiaInzhOcDY="; fetchSubmodules = true; # for vcglib }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/monado/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/monado/default.nix index 7a2577e8af..c8c5e5abb3 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/monado/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/monado/default.nix @@ -8,6 +8,7 @@ , pkg-config , python3 , SDL2 +, bluez , dbus , eigen , ffmpeg @@ -28,8 +29,10 @@ , libuvc , libv4l , libxcb +, onnxruntime , opencv4 , openhmd +, openvr , udev , vulkan-headers , vulkan-loader @@ -47,14 +50,14 @@ stdenv.mkDerivation rec { pname = "monado"; - version = "unstable-2023-01-14"; + version = "unstable-2023-08-22"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "monado"; repo = "monado"; - rev = "1ef49b92f2d6cb519039edd7ba7f70e8073fbe88"; - sha256 = "sha256-zieJmI6BKHpYyCPOOUora9qoWn+NXehbHKvoi4h81UA="; + rev = "4cc68f07c0f3c2fee57b01dde28a02e314d3bee6"; + sha256 = "sha256-VibdOSA/b4RmwwwXrwhivuiukNK10YazYF/p+YnqRZ8="; }; nativeBuildInputs = [ @@ -72,6 +75,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 + bluez dbus eigen ffmpeg @@ -92,8 +96,10 @@ stdenv.mkDerivation rec { libuvc libv4l libxcb + onnxruntime opencv4 openhmd + openvr udev vulkan-headers vulkan-loader @@ -104,6 +110,13 @@ stdenv.mkDerivation rec { zlib ]; + # known disabled drivers: + # - DRIVER_DEPTHAI - Needs depthai-core https://github.com/luxonis/depthai-core + # - DRIVER_ILLIXR - needs ILLIXR headers https://github.com/ILLIXR/ILLIXR + # - DRIVER_REALSENSE - see below + # - DRIVER_SIMULAVR - needs realsense + # - DRIVER_ULV2 - needs proprietary Leapmotion SDK https://api.leapmotion.com/documentation/v2/unity/devguide/Leap_SDK_Overview.html + # realsense is disabled, the build ends with the following error: # # CMake Error in src/xrt/drivers/CMakeLists.txt: @@ -119,6 +132,14 @@ stdenv.mkDerivation rec { export XDG_CONFIG_DIRS=@out@/etc/xdg''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}} ''; + patches = [ + # We don't have $HOME/.steam when building + ./force-enable-steamvr_lh.patch + + # A recent (as of August 2023) SteamVR Beta has upgraded a driver interface which is incompatible with Monado + ./steamvr_lh-use-old-interface.patch + ]; + meta = with lib; { description = "Open source XR runtime"; homepage = "https://monado.freedesktop.org/"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch b/third_party/nixpkgs/pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch new file mode 100644 index 0000000000..eac92675eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/monado/force-enable-steamvr_lh.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4308d73d..0081d536 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -219,6 +219,7 @@ option(BUILD_TESTING "Enable building of the test suite?" ON) + if(EXISTS "$ENV{HOME}/.steam/root") + set(XRT_HAVE_STEAM YES) + endif() ++set(XRT_HAVE_STEAM YES) + + if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(XRT_HAVE_INTERNAL_HID ON) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/monado/steamvr_lh-use-old-interface.patch b/third_party/nixpkgs/pkgs/applications/graphics/monado/steamvr_lh-use-old-interface.patch new file mode 100644 index 0000000000..d5194956e1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/monado/steamvr_lh-use-old-interface.patch @@ -0,0 +1,13 @@ +diff --git a/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp b/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp +index 24b69fd..5b3a5ca 100644 +--- a/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp ++++ b/src/xrt/drivers/steamvr_lh/steamvr_lh.cpp +@@ -138,7 +138,7 @@ Context::setup_hmd(const char *serial, vr::ITrackedDeviceServerDriver *driver) + vr::EVRInitError err = driver->Activate(0); + VERIFY(err == vr::VRInitError_None, std::to_string(err).c_str()); + +- auto *display = static_cast(driver->GetComponent(vr::IVRDisplayComponent_Version)); ++ auto *display = static_cast(driver->GetComponent("IVRDisplayComponent_003")); + VERIFY(display, "IVRDisplayComponent is null"); + #undef VERIFY + diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix index 34a9bcd161..3cb4b00112 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/mozjpeg/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libpng, zlib, nasm }: stdenv.mkDerivation rec { - version = "4.1.3"; + version = "4.1.4"; pname = "mozjpeg"; src = fetchFromGitHub { owner = "mozilla"; repo = "mozjpeg"; rev = "v${version}"; - sha256 = "sha256-KbePLQu/BfPCZ4edTyo5NbFvvwd0h8ZfaLE25CDJjmw="; + sha256 = "sha256-F9W7tWfcNP2UNuwMbYiSvS8BnFq4ob//b8AXXrRjVuA="; }; cmakeFlags = [ "-DENABLE_STATIC=NO" "-DPNG_SUPPORTED=TRUE" ]; # See https://github.com/mozilla/mozjpeg/issues/351 diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix index 48cc00d008..6381c39931 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/mypaint/default.nix @@ -29,7 +29,7 @@ in buildPythonApplication rec { owner = "mypaint"; repo = "mypaint"; rev = "v${version}"; - sha256 = "rVKcxzWZRLcuxK8xRyRgvitXAh4uOEyqHswLeTdA2Mk="; + hash = "sha256-rVKcxzWZRLcuxK8xRyRgvitXAh4uOEyqHswLeTdA2Mk="; fetchSubmodules = true; }; @@ -38,7 +38,13 @@ in buildPythonApplication rec { # https://github.com/mypaint/mypaint/pull/1183 (fetchpatch { url = "https://github.com/mypaint/mypaint/commit/423950bec96d6057eac70442de577364d784a847.patch"; - sha256 = "OxJJOi20bFMRibL59zx6svtMrkgeMYyEvbdSXbZHqpc="; + hash = "sha256-OxJJOi20bFMRibL59zx6svtMrkgeMYyEvbdSXbZHqpc="; + }) + # https://github.com/mypaint/mypaint/pull/1193 + (fetchpatch { + name = "python-3.11-compatibility.patch"; + url = "https://github.com/mypaint/mypaint/commit/032a155b72f2b021f66a994050d83f07342d04af.patch"; + hash = "sha256-EI4WJbpZrCtFMKd6QdXlWpRpIHi37gJffDjclzTLaLc="; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix index 7c909de9f8..3169d5f0d4 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/nomacs/default.nix @@ -1,10 +1,9 @@ -{ stdenv -, lib -, mkDerivation +{ lib +, stdenv , fetchFromGitHub -, fetchpatch , cmake , pkg-config +, wrapQtAppsHook , qtbase , qttools @@ -18,32 +17,24 @@ , quazip }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "nomacs"; - version = "3.17.2206"; + version = "3.17.2285"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4"; + hash = "sha256-/K7LRPwNy2PG7tIGD0tiKnEOPZ491lxFRlgf4xWYtxs="; }; - patches = [ - # Add support for Quazip 1.x. - (fetchpatch { - url = "https://github.com/nomacs/nomacs/pull/576.patch"; - sha256 = "11ryjvd9jbb0cqagai4a6980jfq8lrcbyw2d7z9yld1f42w9kbxm"; - stripLen = 1; - }) - ]; - setSourceRoot = '' sourceRoot=$(echo */ImageLounge) ''; nativeBuildInputs = [cmake - pkg-config]; + pkg-config + wrapQtAppsHook]; buildInputs = [qtbase qttools @@ -62,13 +53,16 @@ mkDerivation rec { "-DENABLE_TRANSLATIONS=ON" "-DUSE_SYSTEM_QUAZIP=ON"]; + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/lib + mv $out/libnomacsCore.dylib $out/lib/libnomacsCore.dylib + ''; + meta = with lib; { homepage = "https://nomacs.org"; description = "Qt-based image viewer"; maintainers = with lib.maintainers; [ mindavi ]; license = licenses.gpl3Plus; inherit (qtbase.meta) platforms; - # Broken on hydra since 2020-08-15: https://hydra.nixos.org/build/125495291 (bump from 3.16 to 3.17 prerelease) - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/normcap/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/normcap/default.nix new file mode 100644 index 0000000000..820ca99033 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/normcap/default.nix @@ -0,0 +1,52 @@ +# From NUR https://github.com/nix-community/nur-combined/blob/6bddae47680482383b5769dd3aa7d82b88e6cbc8/repos/renesat/pkgs/normcap/default.nix + +{ + lib, + stdenv, + python3, + fetchFromGitHub, + tesseract4, + leptonica, + wl-clipboard +}: +python3.pkgs.buildPythonApplication rec { + pname = "normcap"; + version = "0.4.4"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "dynobo"; + repo = "normcap"; + rev = "v${version}"; + hash = "sha256-dShtmoqS9TC3PHuwq24OEOhYfBHGhDCma8Du8QCkFuI="; + }; + + buildInputs = [ + wl-clipboard + ]; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + tesseract4 + leptonica + pyside6 + + # Test + toml + pytest-qt + ]; + + postPatch = '' + substituteInPlace pyproject.toml --replace 'PySide6-Essentials = "6.5.1"' "" + ''; + + meta = with lib; { + description = "OCR powered screen-capture tool to capture information instead of images"; + homepage = "https://dynobo.github.io/normcap/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ cafkafk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/nufraw/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/nufraw/default.nix index f6031bea06..8b5966bbaf 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/nufraw/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/nufraw/default.nix @@ -1,6 +1,7 @@ -{ stdenv +{ lib +, stdenv , fetchurl -, lib +, fetchpatch , autoreconfHook , bzip2 @@ -49,14 +50,28 @@ stdenv.mkDerivation rec { "--enable-dst-correction" ]; + env.NIX_CFLAGS_COMPILE = "-Wno-narrowing"; + postInstall = lib.optionalString addThumbnailer '' mkdir -p $out/share/thumbnailers substituteAll ${./nufraw.thumbnailer} $out/share/thumbnailers/${pname}.thumbnailer ''; - # Fixes an upstream issue where headers with templates were included in an extern-C scope - # which caused the build to fail - patches = [ ./move-extern-c.patch ]; + patches = [ + # Fixes an upstream issue where headers with templates were included in an extern-C scope + # which caused the build to fail + (fetchpatch { + name = "0001-nufraw-glib-2.70.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/gimp-nufraw/-/raw/3405bc864752dbd04f2d182a21b4108d6cc3aa95/0001-nufraw-glib-2.70.patch"; + hash = "sha256-XgzgjikWTcqymHa7bKmruNZaeb2/lpN19HXoRUt5rTk="; + }) + ] ++ lib.optionals (lib.versionAtLeast exiv2.version "0.28") [ + (fetchpatch { + name = "0002-exiv2-error.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/gimp-nufraw/-/raw/3405bc864752dbd04f2d182a21b4108d6cc3aa95/0002-exiv2-error.patch"; + hash = "sha256-40/Wwk1sWiaIWp077EYgP8jFO4k1cvf30heRDMYJw3M="; + }) + ]; meta = with lib; { homepage = "https://nufraw.sourceforge.io/"; @@ -70,6 +85,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; maintainers = with maintainers; [ asbachb ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/nufraw/move-extern-c.patch b/third_party/nixpkgs/pkgs/applications/graphics/nufraw/move-extern-c.patch deleted file mode 100644 index 43a4942d3e..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/nufraw/move-extern-c.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/uf_glib.h b/uf_glib.h -index c1a17bd..8a10800 100644 ---- a/uf_glib.h -+++ b/uf_glib.h -@@ -13,13 +13,13 @@ - #ifndef _UF_GLIB_H - #define _UF_GLIB_H - -+#include -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif - --#include --#include -- - // g_win32_locale_filename_from_utf8 is needed only on win32 - #ifdef _WIN32 - #define uf_win32_locale_filename_from_utf8(__some_string__) \ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/default.nix index 1c473d2c41..25df4c69c6 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ocrfeeder/default.nix @@ -1,27 +1,27 @@ { lib, stdenv , fetchurl , pkg-config -, gtk3 -, gtkspell3 -, isocodes -, goocanvas2 +, wrapGAppsHook , intltool , itstool , libxml2 +, gobject-introspection +, gtk3 +, goocanvas2 +, gtkspell3 +, isocodes , gnome , python3 -, gobject-introspection -, wrapGAppsHook , tesseract4 , extraOcrEngines ? [] # other supported engines are: ocrad gocr cuneiform }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ocrfeeder"; version = "0.8.5"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${finalAttrs.pname}/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; sha256 = "sha256-sD0qWUndguJzTw0uy0FIqupFf4OX6dTFvcd+Mz+8Su0="; }; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ] ++ extraOcrEngines); preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${enginesPath}") + gappsWrapperArgs+=(--prefix PATH : "${finalAttrs.enginesPath}") gappsWrapperArgs+=(--set ISO_CODES_DIR "${isocodes}/share/xml/iso-codes") ''; @@ -70,4 +70,4 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/oculante/Cargo.lock b/third_party/nixpkgs/pkgs/applications/graphics/oculante/Cargo.lock index 4b71b4662f..e6b3b52c32 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/oculante/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/graphics/oculante/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39" +checksum = "b1061f3ff92c2f65800df1f12fc7b4ff44ee14783104187dd04dfee6f11b0fd2" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -20,9 +20,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -33,6 +33,17 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + [[package]] name = "ahash" version = "0.8.3" @@ -46,13 +57,58 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab" dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-activity" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" +dependencies = [ + "android-properties", + "bitflags 1.3.2", + "cc", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum 0.6.1", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[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 = "any_ascii" version = "0.1.7" @@ -84,7 +140,7 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" dependencies = [ - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -95,9 +151,9 @@ checksum = "db55d72333851e17d572bec876e390cd3b11eb1ef53ae821dd9f3b653d2b4569" [[package]] name = "arboard" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" +checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc" dependencies = [ "clipboard-win", "core-graphics", @@ -106,7 +162,6 @@ dependencies = [ "objc", "objc-foundation", "objc_id", - "once_cell", "parking_lot", "thiserror", "winapi", @@ -115,13 +170,13 @@ dependencies = [ [[package]] name = "arg_enum_proc_macro" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c29b43ee8654590587cd033b3eca2f9c4f8cdff945ec0e6ee91ceb057d87f3" +checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -130,12 +185,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "arrayvec" version = "0.7.4" @@ -145,6 +194,53 @@ 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.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite", + "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", +] + [[package]] name = "async-io" version = "1.13.0" @@ -159,7 +255,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.23", + "rustix 0.37.24", "slab", "socket2 0.4.9", "waker-fn", @@ -171,14 +267,77 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "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 1.0.0", + "event-listener 3.0.0", + "futures-lite", + "rustix 0.38.17", + "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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1079d27511f6c038736279421774ef4ad4bdd2e300825f4a48c4cc463a57cedf" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if 1.0.0", + "futures-core", + "futures-io", + "rustix 0.38.17", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" + +[[package]] +name = "async-trait" +version = "0.1.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", ] [[package]] name = "atk-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ad703eb64dc058024f0e57ccfa069e15a413b98dbd50a1a950e743b7f11148" +checksum = "251e0b7d90e33e0ba930891a505a9a35ece37b2dd37a14f3ffc306c13b980009" dependencies = [ "glib-sys", "gobject-sys", @@ -187,10 +346,16 @@ dependencies = [ ] [[package]] -name = "atomic_refcell" -version = "0.1.11" +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atomic_refcell" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76f2bfe491d41d45507b8431da8274f7feeca64a49e86d980eed2937ec2ff020" [[package]] name = "atty" @@ -216,7 +381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f6ca6f0c18c02c2fbfc119df551b8aeb8a385f6d5980f1475ba0255f1e97f1e" dependencies = [ "anyhow", - "arrayvec 0.7.4", + "arrayvec", "itertools", "log", "nom", @@ -257,9 +422,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -272,9 +437,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.2" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "bincode" @@ -307,9 +472,9 @@ checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bitreader" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f10043e4864d975e7f197f993ec4018636ad93946724b2571c4474d51845869b" +checksum = "bdd859c9d97f7c468252795b35aeccc412bdbb1e90ee6969c4fa6328272eaeff" dependencies = [ "cfg-if 1.0.0", ] @@ -336,6 +501,15 @@ dependencies = [ "byte-tools", ] +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array 0.14.7", +] + [[package]] name = "block-sys" version = "0.1.0-beta.1" @@ -355,6 +529,22 @@ dependencies = [ "objc2-encode", ] +[[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", + "piper", + "tracing", +] + [[package]] name = "built" version = "0.5.2" @@ -366,9 +556,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byte-tools" @@ -378,41 +568,41 @@ checksum = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[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.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cairo-sys-rs" -version = "0.16.3" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" +checksum = "685c9fa8e590b8b3d678873528d83411db17242a73fccaed827770ea0fedda51" dependencies = [ "libc", "system-deps", @@ -462,9 +652,9 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" [[package]] name = "cfg-expr" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" +checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" dependencies = [ "smallvec", "target-lexicon", @@ -497,6 +687,18 @@ dependencies = [ "libc", ] +[[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 0.2.17", + "windows-targets 0.48.5", +] + [[package]] name = "clap" version = "3.2.25" @@ -566,37 +768,6 @@ dependencies = [ "syn 1.0.109", ] -[[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", - "foreign-types 0.3.2", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", - "objc", -] - [[package]] name = "color_quant" version = "1.1.0" @@ -621,9 +792,9 @@ checksum = "7439becb5fafc780b6f4de382b1a7a3e70234afe783854a4702ee8adbb838609" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -676,7 +847,7 @@ dependencies = [ "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types 0.3.2", + "foreign-types", "libc", ] @@ -692,14 +863,11 @@ dependencies = [ ] [[package]] -name = "core-text" -version = "19.2.0" +name = "cpufeatures" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ - "core-foundation", - "core-graphics", - "foreign-types 0.3.2", "libc", ] @@ -712,6 +880,29 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "crevice_notan" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bb0b2bca5ce777a79dd787fafb8113f2be4f020e4c2468363b473041f2d9b90" +dependencies = [ + "bytemuck", + "crevice_notan-derive", + "glam", + "mint", +] + +[[package]] +name = "crevice_notan-derive" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c99d1aa96f6017828f2d26743f8d4fa3a80927a2a169b9c5c5871cfb3b51f30" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "crossbeam-channel" version = "0.5.8" @@ -755,29 +946,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "crossfont" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21fd3add36ea31aba1520aa5288714dd63be506106753226d0eb387a93bc9c45" -dependencies = [ - "cocoa", - "core-foundation", - "core-foundation-sys", - "core-graphics", - "core-text", - "dwrote", - "foreign-types 0.5.0", - "freetype-rs", - "libc", - "log", - "objc", - "once_cell", - "pkg-config", - "servo-fontconfig", - "winapi", -] - [[package]] name = "crunchy" version = "0.2.2" @@ -785,44 +953,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] -name = "cty" -version = "0.2.2" +name = "crypto-common" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - -[[package]] -name = "darling" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ - "darling_core", - "darling_macro", + "generic-array 0.14.7", + "typenum", ] [[package]] -name = "darling_core" -version = "0.13.4" +name = "dark-light" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "a62007a65515b3cd88c733dd3464431f05d2ad066999a824259d8edc3cf6f645" dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", + "dconf_rs", + "detect-desktop-environment", + "dirs 4.0.0", + "objc", + "rust-ini", + "web-sys", + "winreg 0.10.1", + "zbus", + "zvariant", ] [[package]] @@ -831,6 +985,12 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d7439c3735f405729d52c3fbbe4de140eaf938a1fe47d227c27f8254d4302a5" +[[package]] +name = "dconf_rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7046468a81e6a002061c01e6a7c83139daf91b11c30e66795b13217c2d885c8b" + [[package]] name = "dds-rs" version = "0.7.0" @@ -843,13 +1003,40 @@ dependencies = [ "serde_derive", ] +[[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 = "detect-desktop-environment" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21d8ad60dd5b13a4ee6bd8fa2d5d88965c597c67bce32b5fc49c94f55cb50810" + [[package]] name = "digest" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90" dependencies = [ - "generic-array", + "generic-array 0.9.1", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common", ] [[package]] @@ -862,6 +1049,15 @@ dependencies = [ "dirs-sys 0.3.7", ] +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + [[package]] name = "dirs" version = "5.0.1" @@ -906,45 +1102,37 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.0", + "libloading 0.8.1", ] +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + [[package]] name = "downcast-rs" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" -[[package]] -name = "dwrote" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" -dependencies = [ - "lazy_static", - "libc", - "serde", - "serde_derive", - "winapi", - "wio", -] - [[package]] name = "ecolor" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b601108bca3af7650440ace4ca55b2daf52c36f2635be3587d77b16efd8d0691" +checksum = "2e479a7fa3f23d4e794f8b2f8b3568dd4e47886ad1b12c9c095e141cb591eb63" dependencies = [ "bytemuck", ] [[package]] name = "egui" -version = "0.20.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65a5e883a316e53866977450eecfbcac9c48109c2ab3394af29feb83fcde4ea9" +checksum = "a3aef8ec3ae1b772f340170c65bf27d5b8c28f543a0116c844d2ac08d01123e7" dependencies = [ - "ahash", + "ahash 0.8.3", "epaint", "nohash-hasher", ] @@ -957,9 +1145,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "emath" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5277249c8c3430e7127e4f2c40a77485e7baf11ae132ce9b3253a8ed710df0a0" +checksum = "3857d743a6e0741cdd60b622a74c7a36ea75f5f8f11b793b41d905d2c9721a4b" dependencies = [ "bytemuck", ] @@ -972,13 +1160,34 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if 1.0.0", ] +[[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 = "env_logger" version = "0.10.0" @@ -994,12 +1203,12 @@ dependencies = [ [[package]] name = "epaint" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de14b65fe5e423e0058f77a8beb2c863b056d0566d6c4ce0d097aa5814cb705a" +checksum = "09333964d4d57f40a85338ba3ca5ed4716070ab184dcfed966b35491c5c64f3b" dependencies = [ "ab_glyph", - "ahash", + "ahash 0.8.3", "atomic_refcell", "bytemuck", "ecolor", @@ -1016,25 +1225,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" 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 = "error-code" version = "2.3.1" @@ -1051,14 +1249,14 @@ version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" dependencies = [ - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] name = "evalexpr" -version = "8.2.0" +version = "11.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6aed2b80295745e5fed7a9e869bb8b592961584379df6fddcf0922877206974e" +checksum = "1e757e796a66b54d19fa26de38e75c3351eb7a3755c85d7d181a8c61437ff60c" [[package]] name = "event-listener" @@ -1067,20 +1265,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] -name = "expat-sys" -version = "2.1.6" +name = "event-listener" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" dependencies = [ - "cmake", - "pkg-config", + "concurrent-queue", + "parking", + "pin-project-lite", ] [[package]] name = "exr" -version = "1.7.0" +version = "1.71.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18" +checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8" dependencies = [ "bit_field", "flume", @@ -1130,7 +1329,7 @@ version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc789a40040e11bbe4ba31ca319406805a12fe3f8d71314bbc4bd076602ad55a" dependencies = [ - "num-traits 0.2.16", + "num-traits 0.2.17", "thiserror", ] @@ -1145,9 +1344,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" @@ -1191,19 +1390,15 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fc612c5837986b7104a87a0df74a5460931f1c5274be12f8d0f40aa2f30d632" dependencies = [ - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", "spin 0.9.8", ] @@ -1243,7 +1438,7 @@ dependencies = [ "memmap2 0.6.2", "slotmap", "tinyvec", - "ttf-parser 0.19.1", + "ttf-parser 0.19.2", ] [[package]] @@ -1252,28 +1447,7 @@ 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.29", + "foreign-types-shared", ] [[package]] @@ -1282,12 +1456,6 @@ 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" @@ -1297,28 +1465,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "freetype-rs" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb" -dependencies = [ - "bitflags 1.3.2", - "freetype-sys", - "libc", -] - -[[package]] -name = "freetype-sys" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" -dependencies = [ - "cmake", - "libc", - "pkg-config", -] - [[package]] name = "fruitbasket" version = "0.10.0" @@ -1403,7 +1549,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1438,9 +1584,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", "glib-sys", @@ -1451,9 +1597,9 @@ dependencies = [ [[package]] name = "gdk-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a" +checksum = "31ff856cb3386dae1703a920f803abafcc580e9b5f711ca62ed1620c25b51ff2" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1475,6 +1621,16 @@ dependencies = [ "typenum", ] +[[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 = "gethostname" version = "0.2.3" @@ -1492,10 +1648,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if 1.0.0", - "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -1510,9 +1664,9 @@ dependencies = [ [[package]] name = "gif-dispose" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a40dfdf5be59e0cbbf77cb7c6a91a18ee6d398b70fc54ad900e2bcba1860cb50" +checksum = "347afae04a03ca25a3a76d130abb63e7e6e7367b895470fdc3d996aec916c3d7" dependencies = [ "gif", "imgref", @@ -1521,15 +1675,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio-sys" -version = "0.16.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", @@ -1551,18 +1705,19 @@ dependencies = [ [[package]] name = "glam" -version = "0.22.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f597d56c1bd55a811a1be189459e8fad2bbc272616375602443bdfb37fa774" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" dependencies = [ "bytemuck", + "mint", ] [[package]] name = "glib-sys" -version = "0.16.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", "system-deps", @@ -1576,9 +1731,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "glow" -version = "0.11.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" dependencies = [ "js-sys", "slotmap", @@ -1586,27 +1741,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "glsl-layout" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a4206fa405b25ca1b607f4db6cfdeeebec5513458d65abe21fc246ee89ac295" -dependencies = [ - "glam", - "glsl-layout-derive", -] - -[[package]] -name = "glsl-layout-derive" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b870f33b0cec52fd0347c09722c2f9a85e9a4e9aa5c0453e75dedc12bde7ddb8" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "glsl-to-spirv" version = "0.1.7" @@ -1635,7 +1769,7 @@ dependencies = [ "libloading 0.7.4", "objc2", "once_cell", - "raw-window-handle 0.5.2", + "raw-window-handle", "wayland-sys 0.30.1", "windows-sys 0.45.0", "x11-dl", @@ -1643,13 +1777,13 @@ dependencies = [ [[package]] name = "glutin-winit" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "303a5502bc2becb232febde04b40c636c8c2877eb6e9d75e1f36d5ad13ef6078" +checksum = "629a873fc04062830bfe8f97c03773bcd7b371e23bcc465d0a61448cd1588fa4" dependencies = [ "cfg_aliases", "glutin", - "raw-window-handle 0.5.2", + "raw-window-handle", "winit", ] @@ -1684,9 +1818,9 @@ dependencies = [ [[package]] name = "glyph_brush" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4edefd123f28a0b1d41ec4a489c2b43020b369180800977801611084f342978d" +checksum = "a3676f482c536a985fca36ce320a5e5b8fafd7b260806742af1963b71c5dc38c" dependencies = [ "glyph_brush_draw_cache", "glyph_brush_layout", @@ -1722,9 +1856,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", "libc", @@ -1733,9 +1867,9 @@ dependencies = [ [[package]] name = "gtk-sys" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b5f8946685d5fe44497007786600c2f368ff6b1e61a16251c89f72a97520a3" +checksum = "771437bf1de2c1c0b496c11505bdf748e26066bbe942dfc8f614c9460f6d7722" dependencies = [ "atk-sys", "cairo-sys-rs", @@ -1782,6 +1916,9 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash 0.7.6", +] [[package]] name = "hashbrown" @@ -1789,14 +1926,18 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash", + "ahash 0.8.3", ] [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", +] [[package]] name = "heck" @@ -1815,9 +1956,15 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "home" @@ -1907,10 +2054,27 @@ dependencies = [ ] [[package]] -name = "ident_case" -version = "1.0.1" +name = "iana-time-zone" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows 0.48.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] [[package]] name = "idna" @@ -1935,7 +2099,7 @@ dependencies = [ "gif", "jpeg-decoder", "num-rational", - "num-traits 0.2.16", + "num-traits 0.2.17", "png", "qoi", "tiff", @@ -1976,19 +2140,19 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] name = "indicatif" -version = "0.17.6" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" +checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" dependencies = [ "console", "instant", @@ -2011,13 +2175,13 @@ dependencies = [ [[package]] name = "interpolate_name" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b35f4a811037cfdcd44c5db40678464b2d5d248fc1abeeaaa125b370d47f17" +checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] @@ -2026,7 +2190,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.3", "libc", "windows-sys 0.48.0", ] @@ -2043,8 +2207,8 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.8", + "hermit-abi 0.3.3", + "rustix 0.38.17", "windows-sys 0.48.0", ] @@ -2143,9 +2307,9 @@ dependencies = [ [[package]] name = "jxl-frame" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2c4e276ea56d8bc4961f13501d565cc6b665f0da76e0e5f90aa44a1475eb409" +checksum = "8d63bdd104e3746669a123de86f940aa5d59fdc9c5a65f16a4f867dde75e45e1" dependencies = [ "jxl-bitstream", "jxl-coding", @@ -2164,9 +2328,9 @@ checksum = "48800b21ed6bb3bbc2f818ae9cd40530bdfb1a211f57d5a7a49b8b10f62145e8" [[package]] name = "jxl-image" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d10c717baa0dd19c25b37b6baebb5f07d7efdaa6225a65aa98dcaf1d40a3e5" +checksum = "ef86f7f74acc9c9e66604c8d030e00cdef5a0c455ea3d7d26bd9ddbb9160be59" dependencies = [ "jxl-bitstream", "jxl-color", @@ -2176,9 +2340,9 @@ dependencies = [ [[package]] name = "jxl-modular" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4fea731da48d358a60d6185c58ac897f22895ea0e3380df04c106c87e192a7d" +checksum = "504e6b55db362568592be81993c772fc6786c56fb67ae769ff62dc514c3e6748" dependencies = [ "jxl-bitstream", "jxl-coding", @@ -2188,9 +2352,9 @@ dependencies = [ [[package]] name = "jxl-oxide" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d90d7ccb9a843e69563abdab2cd362702668f23e39e7fa3dcdf2594b1d29042" +checksum = "57e3b7e459d823979c4ca0c9584f391581db154437f34596ea443b082e9b6064" dependencies = [ "jxl-bitstream", "jxl-color", @@ -2203,9 +2367,9 @@ dependencies = [ [[package]] name = "jxl-render" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774684715db3b6e60a13059ad746829c9f9b39b7865ba0dc7ea9fd93469d9297" +checksum = "7157d1c6c4896ddc800cb0cc8ba545ba7417ab9afc51f39e69484e6607c8707e" dependencies = [ "jxl-bitstream", "jxl-coding", @@ -2220,9 +2384,9 @@ dependencies = [ [[package]] name = "jxl-vardct" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abaffccbc217e48cb45b9aca639c18a873b66200fc5a3695fb98333e0b1fead" +checksum = "eb4a2d9ba8c48a52f6143ba01c38aac67d1309c9b939a9f84cd60f650d15053e" dependencies = [ "jxl-bitstream", "jxl-coding", @@ -2252,7 +2416,7 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", ] [[package]] @@ -2318,15 +2482,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libdav1d-sys" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2449c0cf51b69ae65edb12fa071063e5a51034a8b2347269b5a40aefe2071fcf" +checksum = "c232de5110b390272f9fb7fedde31ecad0ac4ea5293099be140f3a20d298bf12" [[package]] name = "libfuzzer-sys" @@ -2350,9 +2514,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if 1.0.0", "windows-sys 0.48.0", @@ -2360,15 +2524,15 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libwebp-sys" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5df1e76f0acef0058aa2164ccf74e610e716e7f9eeb3ee2283de7d43659d823" +checksum = "3e0df0a0f9444d52aee6335cd724d21a2ee3285f646291799a72be518ec8ee3c" dependencies = [ "cc", "glob", @@ -2388,9 +2552,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "45786cec4d5e54a224b15cb9f06751883103a27c19c93eda09b0b4f5f08fefac" [[package]] name = "lock_api" @@ -2404,9 +2568,9 @@ dependencies = [ [[package]] name = "lodepng" -version = "3.7.2" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ad39f75bbaa4b10bb6f2316543632a8046a5bcf9c785488d79720b21f044f8" +checksum = "a3cdccd0cf57a5d456f0656ebcff72c2e19503287e1afbf3b84382812adc0606" dependencies = [ "crc32fast", "fallible_collections", @@ -2438,7 +2602,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e" dependencies = [ "lyon_path", - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -2447,9 +2611,9 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "euclid", - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -2459,7 +2623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca507745ba7ccbc76e5c44e7b63b1a29d2b0d6126f375806a5bbaf657c7d6c45" dependencies = [ "lyon_geom", - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -2484,9 +2648,9 @@ dependencies = [ [[package]] name = "matrixmultiply" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" dependencies = [ "autocfg", "rawpointer", @@ -2503,9 +2667,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap2" @@ -2534,6 +2698,15 @@ dependencies = [ "autocfg", ] +[[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" @@ -2584,6 +2757,12 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "mint" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" + [[package]] name = "mio" version = "0.8.8" @@ -2613,7 +2792,7 @@ dependencies = [ "nalgebra-macros", "num-complex", "num-rational", - "num-traits 0.2.16", + "num-traits 0.2.17", "simba", "typenum", ] @@ -2629,15 +2808,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - [[package]] name = "nasm-rs" version = "0.2.5" @@ -2656,8 +2826,8 @@ dependencies = [ "bitflags 1.3.2", "jni-sys", "ndk-sys", - "num_enum", - "raw-window-handle 0.5.2", + "num_enum 0.5.11", + "raw-window-handle", "thiserror", ] @@ -2667,35 +2837,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-glue" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" -dependencies = [ - "libc", - "log", - "ndk", - "ndk-context", - "ndk-macro", - "ndk-sys", - "once_cell", - "parking_lot", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "ndk-sys" version = "0.4.1+23.1.7779620" @@ -2736,6 +2877,18 @@ dependencies = [ "memoffset 0.6.5", ] +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if 1.0.0", + "libc", + "memoffset 0.7.1", +] + [[package]] name = "nohash-hasher" version = "0.2.0" @@ -2760,33 +2913,35 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "notan" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe05ab2904de4bad18950790a346b21ace46399308a1257cc96727b42cdf465" +checksum = "2b709ad2baec6100b65ca8acd977c9da975b40c8391dbfc8c36b0fe812c63666" dependencies = [ "notan_app", "notan_backend", "notan_core", "notan_draw", "notan_egui", + "notan_glyph", "notan_graphics", "notan_input", "notan_macro", "notan_math", + "notan_text", "notan_utils", ] [[package]] name = "notan_app" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cf05fb9bd79b1a75b7d05f4d524b252ffd3b65e0334abc0988563b9e8ed3d22" +checksum = "f777d1ffd0da733ec192456367335361db07393a9b1c362badd3edc81e00a0be" dependencies = [ "bytemuck", "downcast-rs", "futures", "futures-util", - "hashbrown 0.13.2", + "hashbrown 0.14.1", "indexmap 1.9.3", "js-sys", "log", @@ -2804,9 +2959,9 @@ dependencies = [ [[package]] name = "notan_backend" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157b87a240d02a8cacdfb3a6e916f2db19ab79c108dcb70de1af028f02852c4c" +checksum = "fd7c12525dc871fb18e9ec400b70ab0bd06a1bd7456b94aa44742f150773bd71" dependencies = [ "notan_web", "notan_winit", @@ -2814,18 +2969,18 @@ dependencies = [ [[package]] name = "notan_core" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d9b634a7f30f311802a031b3b02287365e48c10a14cb44f2576acfaa64f2e11" +checksum = "5f8a6d7defd240442818cf66d311f06e467ea1241021eb786ed6a95991ef3c07" dependencies = [ "web-sys", ] [[package]] name = "notan_draw" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e89627179eaa85bec2de5966562a89ba6cb5d72175eadb983421f463b25687b" +checksum = "98c111d6dff0417d0c583fa259eb86b816752f54b61d7f18c7e8a12d7bf5ee8f" dependencies = [ "log", "lyon", @@ -2841,9 +2996,9 @@ dependencies = [ [[package]] name = "notan_egui" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4119d7b4cd389af870ae7ff9e9f9ab39ffc6766d5c65e52f1c5bc02d1393d69c" +checksum = "ffbb5eb384a5ea7d47ff5f2323fa5310b3bfc1ddbc88b7a26d50fd47bcadef34" dependencies = [ "bytemuck", "egui", @@ -2855,13 +3010,13 @@ dependencies = [ [[package]] name = "notan_glow" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48961f4ccc256904221e4be862a57bc0963a20b2b30333c7eeffeae14ee4cf45" +checksum = "a582a21460de213619608d3dfbcd29eb4a932e173e3c75de5bf5a41724a4d7e2" dependencies = [ "bytemuck", "glow", - "hashbrown 0.13.2", + "hashbrown 0.14.1", "image", "js-sys", "log", @@ -2872,27 +3027,27 @@ dependencies = [ [[package]] name = "notan_glyph" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24760e1fa2ab081fc493ccd2f2a6946864d87b8806767dfd998eb7365aae3c4" +checksum = "1414bd4b412986d12a4e7323d5c7ec8aee682098f2f266201ad2b8fe302efa85" dependencies = [ "bytemuck", "glyph_brush", "log", "notan_app", "notan_graphics", + "notan_macro", "notan_math", ] [[package]] name = "notan_graphics" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b8437c9bb4f96b1fd18ae3e61a6b1a437ac32f3ccf078de531ab38cd6861ee" +checksum = "f23b057dea1c71e2f6048431082896915b0f94992d2c1607a1e85a15e4f73295" dependencies = [ "bytemuck", - "glsl-layout", - "image", + "crevice_notan", "notan_macro", "notan_math", "notan_utils", @@ -2901,11 +3056,11 @@ dependencies = [ [[package]] name = "notan_input" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78c182ba310d14e24e39fdbbb523f8686d2bcd85a8e3415ac15a1b203383b320" +checksum = "eb044011996008c6a06153fb1eb255240168dc53eb14a6eba30e8c945aad977e" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.1", "log", "notan_core", "notan_math", @@ -2913,9 +3068,9 @@ dependencies = [ [[package]] name = "notan_macro" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf38df1753b05ffd6e4f3e6cf309f8f2c1f6d60d97b0b29f0da81da3fcd35b4" +checksum = "3368df42ed4243799badfe0802e740f72b351b0d17322d6d987b1c479d6b83d6" dependencies = [ "cfg_aliases", "glsl-to-spirv", @@ -2923,25 +3078,25 @@ dependencies = [ "proc-macro2", "quote", "spirv_cross", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "notan_math" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4768d6a1f20f635ae20dffde5f4d1d4d84bfd8caebe312e4c4ca7d134f2aae1d" +checksum = "2e08bcd1b1d1ae4086de6d9ccf424c87e5912daef5c70a5a6418cf1c72a951ef" dependencies = [ "glam", ] [[package]] name = "notan_text" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db09dd4b60817fff7cc8852837e5dc97ea7520d894dff29d01f2d3b74480aa7e" +checksum = "5441676461769e2c958653a18f923a187803a941d621ebc9d3376d75d39c84db" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.1", "lazy_static", "log", "notan_app", @@ -2953,9 +3108,9 @@ dependencies = [ [[package]] name = "notan_utils" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7293931f914054e89fd958112ad34f707ec5e89caedb29fdfafeb7f71744318b" +checksum = "f63bb6b737dfa28775900fbff6abff456368d2bd6c7d5c7fae34457a34eb140f" dependencies = [ "instant", "log", @@ -2963,9 +3118,9 @@ dependencies = [ [[package]] name = "notan_web" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efe6523a123951d028a30275d8891d6678fa41cfadd4b0b29182c1755f7152c" +checksum = "30d8293c4db9b100ca7ae3c8aa0d56d757eb1e1de9abd05332b9f2d45ed0fd92" dependencies = [ "console_error_panic_hook", "futures-util", @@ -2982,9 +3137,9 @@ dependencies = [ [[package]] name = "notan_winit" -version = "0.9.5" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c407c236419054799047de0880e0ac2cec2d9666e2c2a006ee57424845aef396" +checksum = "c8d4c0029b13aa756aa74f9ece67a5d4495f77c317a39dff56b53e4f0d1d6b8a" dependencies = [ "glutin", "glutin-winit", @@ -2994,7 +3149,7 @@ dependencies = [ "notan_app", "notan_core", "notan_glow", - "raw-window-handle 0.5.2", + "raw-window-handle", "winit", ] @@ -3009,18 +3164,18 @@ dependencies = [ "num-integer", "num-iter", "num-rational", - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] name = "num-bigint" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -3029,7 +3184,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -3045,13 +3200,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6a0fd4f737c707bd9086cc16c925f294943eb62eb71499e9fd4cf71f8b9f4e" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3061,7 +3216,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -3072,7 +3227,7 @@ checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -3084,7 +3239,7 @@ dependencies = [ "autocfg", "num-bigint", "num-integer", - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -3093,14 +3248,14 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -3112,7 +3267,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi 0.3.3", "libc", ] @@ -3122,7 +3277,16 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "num_enum_derive", + "num_enum_derive 0.5.11", +] + +[[package]] +name = "num_enum" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" +dependencies = [ + "num_enum_derive 0.6.1", ] [[package]] @@ -3137,6 +3301,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "num_enum_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" +dependencies = [ + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "number_prefix" version = "0.4.0" @@ -3210,22 +3386,23 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] [[package]] name = "oculante" -version = "0.7.2" +version = "0.7.7" dependencies = [ "anyhow", "arboard", "avif-decode", "clap", "cmd_lib", + "dark-light", "dds-rs", "dirs 5.0.1", "env_logger", @@ -3261,6 +3438,7 @@ dependencies = [ "strum_macros", "tiff", "tiny-skia 0.9.1", + "trash", "turbojpeg", "usvg", "webbrowser", @@ -3282,12 +3460,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] -name = "ordered-float" -version = "3.9.0" +name = "orbclient" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126d3e6f3926bfb0fb24495b4f4da50626f547e54956594748e3d8882a0320b4" +checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" dependencies = [ - "num-traits 0.2.16", + "redox_syscall 0.3.5", +] + +[[package]] +name = "ordered-float" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3a540f3e3b3d7929c884e46d093d344e4e5bdeed54d08bf007df50c93cc85d5" +dependencies = [ + "num-traits 0.2.17", +] + +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +dependencies = [ + "dlv-list", + "hashbrown 0.12.3", +] + +[[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]] @@ -3312,7 +3519,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" dependencies = [ - "ttf-parser 0.19.1", + "ttf-parser 0.19.2", ] [[package]] @@ -3344,14 +3551,14 @@ checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "pango-sys" -version = "0.16.3" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ "glib-sys", "gobject-sys", @@ -3361,9 +3568,9 @@ dependencies = [ [[package]] name = "parking" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" [[package]] name = "parking_lot" @@ -3465,7 +3672,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3492,31 +3699,11 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" -[[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.29", -] - [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -3524,6 +3711,17 @@ 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 = "pkg-config" version = "0.3.27" @@ -3573,9 +3771,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" [[package]] name = "ppv-lite86" @@ -3590,7 +3788,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] @@ -3625,9 +3823,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c" dependencies = [ "unicode-ident", ] @@ -3734,7 +3932,7 @@ checksum = "16c383692a5e7abd9f6d1eddb1a5e0269f859392387883361bb09e5555852ec1" dependencies = [ "arbitrary", "arg_enum_proc_macro", - "arrayvec 0.7.4", + "arrayvec", "av1-grain", "bitstream-io", "built", @@ -3750,7 +3948,7 @@ dependencies = [ "new_debug_unreachable", "noop_proc_macro", "num-derive 0.3.3", - "num-traits 0.2.16", + "num-traits 0.2.17", "once_cell", "paste", "rand", @@ -3764,15 +3962,6 @@ dependencies = [ "v_frame", ] -[[package]] -name = "raw-window-handle" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - [[package]] name = "raw-window-handle" version = "0.5.2" @@ -3787,9 +3976,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -3797,14 +3986,12 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -3844,9 +4031,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" dependencies = [ "aho-corasick", "memchr", @@ -3856,9 +4043,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ "aho-corasick", "memchr", @@ -3867,15 +4054,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.19" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20b9b67e2ca7dd9e9f9285b759de30ff538aab981abaaf7bc9bd90b84a0126c3" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64", "bytes", @@ -3899,6 +4086,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-rustls", "tower-service", @@ -3930,14 +4118,12 @@ dependencies = [ [[package]] name = "rfd" -version = "0.11.4" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fe664af397d2b6a13a8ba1d172a2b5c87c6c5149039edbf8fa122b98c9ed96f" +checksum = "241a0deb168c88050d872294f7b3106c1dfa8740942bcc97bc91b98e97b5c501" dependencies = [ - "async-io", "block", "dispatch", - "futures-util", "glib-sys", "gobject-sys", "gtk-sys", @@ -3946,11 +4132,11 @@ dependencies = [ "objc", "objc-foundation", "objc_id", - "raw-window-handle 0.5.2", + "raw-window-handle", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows", + "windows-sys 0.48.0", ] [[package]] @@ -3992,13 +4178,23 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8f595a457b6b8c6cda66a48503e92ee8d19342f905948f29c383200ec9eb1d8" +checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" dependencies = [ "xmlparser", ] +[[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", +] + [[package]] name = "rust_hawktracer" version = "0.7.0" @@ -4044,9 +4240,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d" dependencies = [ "bitflags 1.3.2", "errno", @@ -4058,22 +4254,22 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.9", "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", "ring", @@ -4092,9 +4288,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.101.3" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261e9e0888cba427c3316e6322805653c9425240b6fd96cee7cb671ab70ab8d0" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ "ring", "untrusted", @@ -4128,15 +4324,6 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" -[[package]] -name = "safe_arch" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" -dependencies = [ - "bytemuck", -] - [[package]] name = "safe_arch" version = "0.7.1" @@ -4185,14 +4372,15 @@ dependencies = [ [[package]] name = "sctk-adwaita" -version = "0.4.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339" +checksum = "cda4e97be1fd174ccc2aae81c8b694e803fa99b34e8fd0f057a9d70698e3ed09" dependencies = [ - "crossfont", + "ab_glyph", "log", + "memmap2 0.5.10", "smithay-client-toolkit", - "tiny-skia 0.7.0", + "tiny-skia 0.8.4", ] [[package]] @@ -4215,44 +4403,55 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.185" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ "itoa", "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" @@ -4275,24 +4474,14 @@ dependencies = [ ] [[package]] -name = "servo-fontconfig" -version = "0.5.1" +name = "sha1" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "libc", - "servo-fontconfig-sys", -] - -[[package]] -name = "servo-fontconfig-sys" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" -dependencies = [ - "expat-sys", - "freetype-sys", - "pkg-config", + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.7", ] [[package]] @@ -4301,12 +4490,21 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9eb6be24e4c23a84d7184280d2722f7f2731fcdd4a9d886efbfe4413e4847ea0" dependencies = [ - "block-buffer", + "block-buffer 0.3.3", "byte-tools", - "digest", + "digest 0.7.6", "fake-simd", ] +[[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 = "simba" version = "0.8.1" @@ -4315,7 +4513,7 @@ checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" dependencies = [ "approx", "num-complex", - "num-traits 0.2.16", + "num-traits 0.2.17", "paste", "wide", ] @@ -4346,15 +4544,15 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[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", ] @@ -4370,15 +4568,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "smithay-client-toolkit" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" +checksum = "870427e30b8f2cbe64bf43ec4b86e88fe39b0a84b3f15efd9c9c2d020bc86eb9" dependencies = [ "bitflags 1.3.2", "calloop", @@ -4405,9 +4603,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys 0.48.0", @@ -4491,7 +4689,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -4527,9 +4725,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -4537,15 +4735,36 @@ dependencies = [ ] [[package]] -name = "system-deps" -version = "6.1.1" +name = "system-configuration" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "system-deps" +version = "6.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94af52f9402f94aac4948a2518b43359be8d9ce6cd9efc1c4de3b2f7b7e897d6" dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml 0.7.6", + "toml 0.8.2", "version-compare", ] @@ -4562,17 +4781,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.0", + "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix 0.38.8", + "rustix 0.38.17", "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -4585,22 +4804,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -4627,17 +4846,16 @@ dependencies = [ [[package]] name = "tiny-skia" -version = "0.7.0" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642680569bb895b16e4b9d181c60be1ed136fa0c9c7f11d004daf053ba89bf82" +checksum = "df8493a203431061e901613751931f047d1971337153f96d0e5e363d6dbf6a67" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec", "bytemuck", "cfg-if 1.0.0", "png", - "safe_arch 0.5.2", - "tiny-skia-path 0.7.0", + "tiny-skia-path 0.8.4", ] [[package]] @@ -4647,7 +4865,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce2986c82f77818c7b9144c70818fdde98db15308e329ae2f7204d767808fd3c" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec", "bytemuck", "cfg-if 1.0.0", "log", @@ -4657,12 +4875,13 @@ dependencies = [ [[package]] name = "tiny-skia-path" -version = "0.7.0" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c114d32f0c2ee43d585367cb013dfaba967ab9f62b90d9af0d696e955e70fa6c" +checksum = "adbfb5d3f3dd57a0e11d12f4f13d4ebbbc1b5c15b7ab0a156d030b21da5f677c" dependencies = [ "arrayref", "bytemuck", + "strict-num", ] [[package]] @@ -4703,7 +4922,7 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.3", + "socket2 0.5.4", "windows-sys 0.48.0", ] @@ -4719,9 +4938,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -4742,14 +4961,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.20.2", ] [[package]] @@ -4763,11 +4982,22 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", + "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", @@ -4788,9 +5018,21 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if 1.0.0", "pin-project-lite", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.38", +] + [[package]] name = "tracing-core" version = "0.1.31" @@ -4800,6 +5042,22 @@ dependencies = [ "once_cell", ] +[[package]] +name = "trash" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7b23f2b0cf93f537bbe90cbb59ea9176cc8ce9b010a36dcd5b726facd82825e" +dependencies = [ + "chrono", + "libc", + "log", + "objc", + "once_cell", + "scopeguard", + "url", + "windows 0.44.0", +] + [[package]] name = "try-lock" version = "0.2.4" @@ -4814,9 +5072,9 @@ checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" [[package]] name = "ttf-parser" -version = "0.19.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a464a4b34948a5f67fddd2b823c62d9d92e44be75058b99939eae6c5b6960b33" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" [[package]] name = "turbojpeg" @@ -4855,15 +5113,25 @@ 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 = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi", +] [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -4894,9 +5162,9 @@ checksum = "2281c8c1d221438e373249e065ca4989c4c36952c211ff21a0ee91c44a3869e7" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -4921,9 +5189,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "untrusted" @@ -4933,9 +5201,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -5016,8 +5284,8 @@ checksum = "85db69f33d00031c1b07f7292e56317d5aa9475bdbd3d27ef18f3633438a697e" dependencies = [ "cfg-if 1.0.0", "noop_proc_macro", - "num-derive 0.4.0", - "num-traits 0.2.16", + "num-derive 0.4.1", + "num-traits 0.2.17", "rust_hawktracer", ] @@ -5041,15 +5309,15 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -5097,7 +5365,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -5131,7 +5399,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5249,7 +5517,7 @@ dependencies = [ "log", "ndk-context", "objc", - "raw-window-handle 0.5.2", + "raw-window-handle", "url", "web-sys", ] @@ -5268,12 +5536,12 @@ checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" [[package]] name = "wide" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" +checksum = "ebecebefc38ff1860b4bc47550bbfa63af5746061cf0d29fcd7fa63171602598" dependencies = [ "bytemuck", - "safe_arch 0.7.1", + "safe_arch", ] [[package]] @@ -5294,9 +5562,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", ] @@ -5326,16 +5594,12 @@ dependencies = [ ] [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows-targets 0.48.5", ] [[package]] @@ -5398,12 +5662,6 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -5416,12 +5674,6 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -5434,12 +5686,6 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -5452,12 +5698,6 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -5482,12 +5722,6 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -5512,12 +5746,13 @@ dependencies = [ [[package]] name = "winit" -version = "0.27.5" +version = "0.28.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" +checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" dependencies = [ + "android-activity", "bitflags 1.3.2", - "cocoa", + "cfg_aliases", "core-foundation", "core-graphics", "dispatch", @@ -5526,28 +5761,29 @@ dependencies = [ "log", "mio", "ndk", - "ndk-glue", - "objc", + "objc2", "once_cell", - "parking_lot", + "orbclient", "percent-encoding", - "raw-window-handle 0.4.3", - "raw-window-handle 0.5.2", + "raw-window-handle", + "redox_syscall 0.3.5", "sctk-adwaita", "smithay-client-toolkit", "wasm-bindgen", "wayland-client", + "wayland-commons", "wayland-protocols", + "wayland-scanner", "web-sys", - "windows-sys 0.36.1", + "windows-sys 0.45.0", "x11-dl", ] [[package]] name = "winnow" -version = "0.5.14" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97" +checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" dependencies = [ "memchr", ] @@ -5562,6 +5798,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + [[package]] name = "winreg" version = "0.50.0" @@ -5581,15 +5826,6 @@ dependencies = [ "toml 0.5.11", ] -[[package]] -name = "wio" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" -dependencies = [ - "winapi", -] - [[package]] name = "x11-dl" version = "2.21.0" @@ -5632,6 +5868,16 @@ dependencies = [ "nom", ] +[[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix 0.26.4", + "winapi", +] + [[package]] name = "xi-unicode" version = "0.3.0" @@ -5640,15 +5886,15 @@ checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" [[package]] name = "xml-rs" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "xmlparser" -version = "0.13.5" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xmlwriter" @@ -5662,10 +5908,76 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "157c9233496247738a5417ce7e8ecf953c3d4e1931374d16b0c6a95636572be4" dependencies = [ - "num-traits 0.2.16", + "num-traits 0.2.17", "rgb", ] +[[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 0.26.4", + "once_cell", + "ordered-stream", + "rand", + "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 = "zune-core" version = "0.2.14" @@ -5695,3 +6007,41 @@ dependencies = [ "zune-core", "zune-inflate", ] + +[[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/applications/graphics/oculante/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix index 271a9dba88..9e0206a91c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/oculante/default.nix @@ -21,13 +21,13 @@ rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.7.2"; + version = "0.7.7"; src = fetchFromGitHub { owner = "woelper"; repo = pname; rev = version; - hash = "sha256-OJKmnH1uJvVnHiuieveDaR+lybpWHC3MZvis0iAKiZU="; + hash = "sha256-uDSZ7qwDC/eR0aZN372ju21PBGuBiiYmlx/26Ta3luE="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix index 0bd1fc20c5..9448e0b172 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libpano13"; - version = "2.9.21"; + version = "2.9.22"; src = fetchurl { url = "mirror://sourceforge/panotools/${pname}-${version}.tar.gz"; - sha256 = "sha256-eeWhRSGZMF4pYUYnIO9ZQRUnecEnxblvw0DSSS5jNZA="; + sha256 = "sha256-r/xoMM2+ccKNJzHcv43qKs2m2f/UYJxtvzugxoRAqOM="; }; buildInputs = [ perl libjpeg libpng libtiff ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/paraview/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/paraview/default.nix index c50a0ebb74..14c86082e6 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/paraview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/paraview/default.nix @@ -45,7 +45,6 @@ in stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DPARAVIEW_ENABLE_FFMPEG=ON" "-DPARAVIEW_ENABLE_GDAL=ON" "-DPARAVIEW_ENABLE_MOTIONFX=ON" diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix index 9c81314daf..eb1d89a008 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4crBl0aQFsSB1D3iuAVcwcet8KSUB3/tUi1kD1VmpAI="; + sha256 = "sha256-dEAlOKjNXL7zqlll6lqGmbopjdplDR3ewMMNu9TMsmw="; }; - vendorHash = "sha256-qFupm0ymDw9neAu6Xl3fQ/mMWn9f40Vdf7uOLOBkcaE="; + vendorHash = "sha256-WZsm2wiKedMP0miwnzhnSrF7Qw+jqd8dnpcehlsdMCA="; # No tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/photoqt/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/photoqt/default.nix index 3b17ce8fd4..6a7a57fd25 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/photoqt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/photoqt/default.nix @@ -1,28 +1,70 @@ -{ mkDerivation, lib, fetchurl, cmake, exiv2, graphicsmagick, libraw -, qtbase, qtdeclarative, qtmultimedia, qtquickcontrols2, qttools, qtgraphicaleffects -, extra-cmake-modules, poppler, kimageformats, libarchive, pugixml, wrapQtAppsHook}: +{ lib +, stdenv +, fetchurl +, cmake +, extra-cmake-modules +, qttools +, wrapQtAppsHook +, exiv2 +, graphicsmagick +, kimageformats +, libarchive +, libraw +, mpv +, poppler +, pugixml +, qtbase +, qtdeclarative +, qtgraphicaleffects +, qtmultimedia +, qtquickcontrols +, qtquickcontrols2 +}: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "photoqt"; - version = "3.1"; + version = "3.4"; src = fetchurl { - url = "https://${pname}.org/pkgs/${pname}-${version}.tar.gz"; - hash = "sha256-hihfqE7XIlSAxPg3Kzld3LrYS97wDH//GGqpBpBwFm0="; + url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; + hash = "sha256-kVf9+zI9rtEMmS0N4qrN673T/1fnqfcV3hQPnMXMLas="; }; - nativeBuildInputs = [ cmake extra-cmake-modules qttools wrapQtAppsHook ]; + # error: no member named 'setlocale' in namespace 'std'; did you mean simply 'setlocale'? + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace cplusplus/main.cpp \ + --replace "std::setlocale" "setlocale" + ''; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + qttools + wrapQtAppsHook + ]; buildInputs = [ - qtbase qtquickcontrols2 exiv2 graphicsmagick poppler - qtmultimedia qtdeclarative libraw qtgraphicaleffects - kimageformats libarchive pugixml + exiv2 + graphicsmagick + kimageformats + libarchive + libraw + mpv + poppler + pugixml + qtbase + qtdeclarative + qtgraphicaleffects + qtmultimedia + qtquickcontrols + qtquickcontrols2 ]; cmakeFlags = [ - "-DFREEIMAGE=OFF" "-DDEVIL=OFF" "-DCHROMECAST=OFF" + "-DFREEIMAGE=OFF" + "-DIMAGEMAGICK=OFF" ]; preConfigure = '' @@ -30,9 +72,11 @@ mkDerivation rec { ''; meta = { - homepage = "https://photoqt.org/"; description = "Simple, yet powerful and good looking image viewer"; + homepage = "https://photoqt.org/"; license = lib.licenses.gpl2Plus; + mainProgram = "photoqt"; + maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/phototonic/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/phototonic/default.nix index 5044e60161..738f78cf34 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/phototonic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/phototonic/default.nix @@ -1,18 +1,26 @@ -{ mkDerivation, lib, fetchFromGitHub, qtbase, qmake, exiv2 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, qmake, wrapQtAppsHook, qtbase, exiv2 }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "phototonic"; version = "2.1"; src = fetchFromGitHub { - repo = "phototonic"; owner = "oferkv"; + repo = "phototonic"; rev = "v${version}"; - sha256 = "0csidmxl1sfmn6gq81vn9f9jckb4swz3sgngnwqa4f75lr6604h7"; + hash = "sha256-BxJgTKblOKIwt88+PT7XZE0mk0t2B4SfsdXpQHttUTM="; }; + patches = [ + (fetchpatch { + name = "exiv2-0.28.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/phototonic/-/raw/fcfa17307ad8988750cc09200188c9365c2c0b79/exiv2-0.28.patch"; + hash = "sha256-EayJYM4qobUWosxV2Ylj+2eiyhk1jM8OfnFZDbVdGII="; + }) + ]; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; buildInputs = [ qtbase exiv2 ]; - nativeBuildInputs = [ qmake ]; preConfigure = '' sed -i 's;/usr;$$PREFIX/;g' phototonic.pro @@ -20,9 +28,9 @@ mkDerivation rec { meta = with lib; { description = "An image viewer and organizer"; - homepage = "https://sourceforge.net/projects/phototonic/"; - license = licenses.gpl3; - platforms = platforms.linux; + homepage = "https://github.com/oferkv/phototonic"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix index 137a858820..a4b8bbc9c2 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -12,18 +12,18 @@ buildPythonPackage rec { pname = "pick-colour-picker"; - version = "unstable-2021-01-19"; + version = "unstable-2022-05-08"; src = fetchFromGitHub { owner = "stuartlangridge"; repo = "ColourPicker"; - rev = "dec8f144918aa7964aaf86a346161beb7e997f09"; - sha256 = "hW2rarfchZ3M0JVfz5RbJRvMhv2PpyLNEMyMAp2gC+o="; - fetchSubmodules = false; + rev = "e3e4c2bcec5d7285425582b92bb564c74be2cf77"; + hash = "sha256-vW8mZiB3JFQtbOCWauhJGfZMlGsA/nNcljNNPtJtgGw="; }; postPatch = '' sed "s|sys\.prefix|'\.'|g" -i setup.py + sed "s|os.environ.get(\"SNAP\")|'$out'|g" -i pick/__main__.py sed "s|os.environ.get('SNAP'), \"usr\"|'$out'|g" -i pick/__main__.py ''; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix index 131dd4457d..8d376730a9 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -9,15 +9,15 @@ , cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pineapple-pictures"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; - rev = version; - hash = "sha256-6peNZc+rrQrUFSrn1AK8lZsy4RQf9DwpmXY0McfEus8="; + rev = finalAttrs.version; + hash = "sha256-dD0pHqw1Gxp+yxzYdm2ZgxiHKyuJKBGYpjv99B1Da1g="; }; nativeBuildInputs = [ @@ -36,12 +36,12 @@ stdenv.mkDerivation rec { "-DPREFER_QT_5=OFF" ]; - meta = with lib; { + meta = { description = "Homebrew lightweight image viewer"; homepage = "https://github.com/BLumia/pineapple-pictures"; - license = licenses.mit; - platforms = platforms.linux; + license = lib.licenses.mit; + platforms = lib.platforms.linux; mainProgram = "ppic"; - maintainers = with maintainers; [ rewine ]; + maintainers = with lib.maintainers; [ rewine ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix index b75e5564d6..08502ccf06 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pixinsight/default.nix @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { version = "1.8.9-2"; src = requireFile rec { - name = "PI-linux-x64-${version}-20230814-c.tar.xz"; + name = "PI-linux-x64-${version}-20230920-c.tar.xz"; url = "https://pixinsight.com/"; - sha256 = "sha256-4Jspkl5riMlbeJX/h1zhVfVymORPK1X4l0LyOgXm05Y="; + hash = "sha256-g7paYTYv52XBg0w3d3YhVNrmt+iS20uobaUsvY6F3jM="; message = '' PixInsight is available from ${url} and requires a commercial (or trial) license. After a license has been obtained, PixInsight can be downloaded from the software distribution diff --git a/third_party/nixpkgs/pkgs/applications/graphics/qscreenshot/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/qscreenshot/default.nix index 6a47760082..efbab2e04b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/qscreenshot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/qscreenshot/default.nix @@ -1,23 +1,34 @@ -{ lib, stdenv, fetchurl, dos2unix, which, qt, Carbon }: +{ stdenv +, lib +, fetchgit +, dos2unix +, qtbase +, qttools +, qtx11extras +, wrapQtAppsHook +, cmake }: stdenv.mkDerivation rec { pname = "qscreenshot"; - version = "1.0"; + version = "unstable-2021-10-18"; - src = fetchurl { - url = "mirror://sourceforge/qscreenshot/qscreenshot-${version}-src.tar.gz"; - sha256 = "1spj5fg2l8p5bk81xsv6hqn1kcrdiy54w19jsfb7g5i94vcb1pcx"; + src = fetchgit { + url = "https://git.code.sf.net/p/qscreenshot/code"; + rev = "e340f06ae2f1a92a353eaa68e103d1c840adc12d"; + sha256 = "0mdiwn74vngiyazr3lq72f3jnv5zw8wyd2dw6rik6dbrvfs69jig"; }; - buildInputs = [ dos2unix which qt ] - ++ lib.optional stdenv.isDarwin Carbon; - - # Remove carriage returns that cause /bin/sh to abort - preConfigure = '' - dos2unix configure - sed -i "s|lrelease-qt4|lrelease|" src/src.pro - ''; + preConfigure = "cd qScreenshot"; + nativeBuildInputs = [ + cmake + qttools + wrapQtAppsHook + ]; + buildInputs = [ + qtbase + qtx11extras + ]; meta = with lib; { description = "Simple creation and editing of screenshots"; homepage = "https://sourceforge.net/projects/qscreenshot/"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/scantailor/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/scantailor/default.nix deleted file mode 100644 index 3e2037f6d4..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/scantailor/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, qt4, cmake, libjpeg, libtiff, boost }: - -stdenv.mkDerivation rec { - pname = "scantailor"; - version = "0.9.12.1"; - - src = fetchFromGitHub { - owner = "scantailor"; - repo = "scantailor"; - rev = "RELEASE_${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-Jn8+X737vwaE0ZPYdQv/1SocmWFA74XL90IW8yNiafA="; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 libjpeg libtiff boost ]; - - meta = { - homepage = "https://scantailor.org/"; - description = "Interactive post-processing tool for scanned pages"; - - license = lib.licenses.gpl3Plus; - - maintainers = [ lib.maintainers.viric ]; - platforms = lib.platforms.gnu ++ lib.platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/structorizer/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/structorizer/default.nix index ca58271425..d1f796e42f 100755 --- a/third_party/nixpkgs/pkgs/applications/graphics/structorizer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/structorizer/default.nix @@ -5,11 +5,12 @@ , makeDesktopItem , makeWrapper , copyDesktopItems +, nix-update-script }: stdenv.mkDerivation rec { pname = "structorizer"; - version = "3.32-11"; + version = "3.32-12"; desktopItems = [ (makeDesktopItem { @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { owner = "fesch"; repo = "Structorizer.Desktop"; rev = version; - hash = "sha256-rGyeOcGm6uBplgTjMIOy/xRekfHacwDy9kkMigmRSdk="; + hash = "sha256-DZktq07MoXBg2AwHOoPLTbON/giSqDZOfmaMkZl1w1g="; }; patches = [ ./makeStructorizer.patch ./makeBigJar.patch ]; @@ -94,11 +95,14 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Create Nassi-Shneiderman diagrams (NSD)"; homepage = "https://structorizer.fisch.lu"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ annaaurora ]; + mainProgram = "structorizer"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/upscayl/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/upscayl/default.nix index 84d33fa741..ec37b9b429 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/upscayl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/upscayl/default.nix @@ -4,11 +4,11 @@ lib, }: let pname = "upscayl"; - version = "2.5.5"; + version = "2.8.6"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-qpLxOGphR9iHvtb8AZZaMict/g8wLkL7Dhr4mt3LZdk="; + hash = "sha256-w5rjLqdlPOZWgdc2t0Y3tl24qZqpjBV6I9gruLaI+qc="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix index 2a1dbe44f3..74cc2bdc4e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/viewnior/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, desktop-file-utils, gtk2, libpng, exiv2, lcms +{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, gtk2, libpng, exiv2, lcms , intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}: stdenv.mkDerivation rec { @@ -9,9 +9,22 @@ stdenv.mkDerivation rec { owner = "hellosiyan"; repo = "Viewnior"; rev = "${pname}-${version}"; - sha256 = "sha256-LTahMmcAqgqviUxR624kTozJGTniAAGWKo1ZqXjoG5M="; + hash = "sha256-LTahMmcAqgqviUxR624kTozJGTniAAGWKo1ZqXjoG5M="; }; + 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 diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix index 1b0b2a1516..83bbbecdc6 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/vimiv-qt/default.nix @@ -2,23 +2,26 @@ , fetchFromGitHub , python3 , qt5 +, stdenv , installShellFiles }: python3.pkgs.buildPythonApplication rec { pname = "vimiv-qt"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "karlch"; repo = pname; rev = "v${version}"; - sha256 = "1pj3gak7nxkw9r9m71zsfvcaq8dk9crbk5rz4n7pravxkl5hs2bg"; + sha256 = "sha256-28sk5qDVmrgXYX2wm5G8zv564vG6GwxNp+gjrFHCRfU="; }; nativeBuildInputs = [ installShellFiles qt5.wrapQtAppsHook python3.pkgs.setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ pyqt5 py3exiv2 qt5.qtsvg ]; + propagatedBuildInputs = with python3.pkgs; [ pyqt5 py3exiv2 ]; + + buildInputs = [ qt5.qtsvg ] ++ lib.optionals stdenv.isLinux [ qt5.qtwayland ]; postInstall = '' install -Dm644 misc/vimiv.desktop $out/share/applications/vimiv.desktop @@ -35,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { # Vimiv has to be wrapped manually because it is a non-ELF executable. dontWrapQtApps = true; preFixup = '' - wrapQtApp $out/bin/vimiv + wrapQtApp $out/bin/vimiv ''; meta = with lib; { @@ -43,6 +46,7 @@ python3.pkgs.buildPythonApplication rec { license = licenses.gpl3Plus; homepage = "https://github.com/karlch/vimiv-qt"; maintainers = with maintainers; [ dschrempf ]; + mainProgram = "vimiv"; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix index 2752eaff87..c40de85767 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/vipsdisp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "vipsdisp"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "jcupitt"; repo = "vipsdisp"; rev = "v${version}"; - hash = "sha256-hx7daXVarV4JdxZfwnTHsuxxijCRP17gkOjicI3EFlM="; + hash = "sha256-iLjS3vBhdPPQNtIaM++xKekYTsr1X9f6ED2A7DYV7Lc="; }; postPatch = '' @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jcupitt/vipsdisp"; description = "Tiny image viewer with libvips"; license = licenses.mit; + mainProgram = "vipsdisp"; maintainers = with maintainers; [ foo-dogsquared ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xfig/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xfig/default.nix index 69190511ed..00e736731f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xfig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xfig/default.nix @@ -9,16 +9,17 @@ , libXp , Xaw3d , libXaw +, libXft , fig2dev }: stdenv.mkDerivation rec { pname = "xfig"; - version = "3.2.8b"; + version = "3.2.9"; src = fetchurl { url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz"; - sha256 = "0fndgbm1mkqb1sn2v2kj3nx9mxj70jbp31y2bjvzcmmkry0q3k5j"; + hash = "sha256-E+2dBNG7wt7AnafvSc7sJ4OC0pD2zZJkdMLy0Bb+wvc="; }; nativeBuildInputs = [ imagemagick makeWrapper ]; @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { libXp Xaw3d libXaw + libXft ]; postPatch = '' @@ -57,6 +59,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { + changelog = "https://sourceforge.net/p/mcj/xfig/ci/${version}/tree/CHANGES"; description = "An interactive drawing tool for X11"; longDescription = '' Note that you need to have the netpbm tools diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix index cd3b73b6b4..fbc99ad208 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0xsNfnKdGl34qeN0KZbII9w6PzC1HvvO7mtlNlRvUqQ="; + sha256 = "sha256-dnFNGWPpK/eoW4Ib1E5w/kPy5okPxAja1v4rf0KpVKM="; }; nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix index 7810ea3213..ccb6b08721 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yEd"; - version = "3.23.1"; + version = "3.23.2"; src = fetchzip { url = "https://www.yworks.com/resources/yed/demo/${pname}-${version}.zip"; - sha256 = "sha256-MboljULek5vCcHpRFL9kdT4AROTD774AOBYeOTzcdig="; + sha256 = "sha256-u83OmIzq9VygKbfa886mj6BIa/9ET1btry2nR/wxeyI="; }; nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/akonadi-calendar.nix b/third_party/nixpkgs/pkgs/applications/kde/akonadi-calendar.nix index 95ee121b59..c149ac905d 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/akonadi-calendar.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/akonadi-calendar.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-contacts, kcalendarcore, kcalutils, kcontacts, - kidentitymanagement, kio, kmailtransport, + kidentitymanagement, kio, kmailtransport, messagelib }: mkDerivation { @@ -14,7 +14,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedBuildInputs = [ akonadi akonadi-contacts kcalendarcore kcalutils kcontacts kidentitymanagement - kio kmailtransport + kio kmailtransport messagelib ]; outputs = [ "out" "dev" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/kde/angelfish.nix b/third_party/nixpkgs/pkgs/applications/kde/angelfish.nix index f5fa9f6641..66a47281d1 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/angelfish.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/angelfish.nix @@ -4,6 +4,7 @@ , cmake , corrosion , extra-cmake-modules +, futuresql , kconfig , kcoreaddons , kdbusaddons @@ -13,6 +14,7 @@ , knotifications , kpurpose , kwindowsystem +, qcoro , qtfeedback , qtquickcontrols2 , qqc2-desktop-style @@ -22,7 +24,7 @@ , srcs # provided as callPackage input to enable easier overrides through overlays -, cargoSha256 ? "sha256-Wthw7foadXO6jYJO1TB4OOYtpwnp8iCdda4tdiYg41A=" +, cargoSha256 ? "sha256-ggYQ2cUwTnqFdoBlTar5zCWtUQGsWAAtWCcebtovF/k=" }: mkDerivation rec { @@ -45,6 +47,7 @@ mkDerivation rec { ]; buildInputs = [ + futuresql kconfig kcoreaddons kdbusaddons @@ -54,6 +57,7 @@ mkDerivation rec { knotifications kpurpose kwindowsystem + qcoro qtfeedback qtquickcontrols2 qqc2-desktop-style diff --git a/third_party/nixpkgs/pkgs/applications/misc/arianna/default.nix b/third_party/nixpkgs/pkgs/applications/kde/arianna.nix similarity index 68% rename from third_party/nixpkgs/pkgs/applications/misc/arianna/default.nix rename to third_party/nixpkgs/pkgs/applications/kde/arianna.nix index d8faf1e9a2..e1a0998003 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/arianna/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/arianna.nix @@ -1,51 +1,52 @@ { lib , mkDerivation -, fetchurl , cmake , extra-cmake-modules -, pkg-config -, baloo -, kfilemetadata -, kirigami2 -, kirigami-addons -, kitemmodels -, kquickcharts -, plasma-framework -, qqc2-desktop-style , qtbase +, qtdeclarative , qtquickcontrols2 -, qtwebsockets +, qtwebchannel , qtwebengine +, qtwebsockets +, baloo +, karchive +, kconfig +, kcoreaddons +, kdbusaddons +, kfilemetadata +, ki18n +, kirigami-addons +, kquickcharts +, kwindowsystem +, qqc2-desktop-style }: -mkDerivation rec { +mkDerivation { pname = "arianna"; - version = "1.1.0"; - - src = fetchurl { - url = "mirror://kde/stable/arianna/arianna-${version}.tar.xz"; - hash = "sha256-C60PujiUTyw2DwImu8PVmU687CP9CuWZ+d8LuZKthKY="; - }; nativeBuildInputs = [ cmake extra-cmake-modules - pkg-config ]; buildInputs = [ - baloo - kfilemetadata - kirigami2 - kirigami-addons - kitemmodels - kquickcharts - plasma-framework - qqc2-desktop-style qtbase + qtdeclarative qtquickcontrols2 - qtwebsockets + qtwebchannel qtwebengine + qtwebsockets + baloo + karchive + kconfig + kcoreaddons + kdbusaddons + kfilemetadata + ki18n + kirigami-addons + kquickcharts + kwindowsystem + qqc2-desktop-style ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/kde/audiotube.nix b/third_party/nixpkgs/pkgs/applications/kde/audiotube.nix index 0bd22ee06f..ca36d51ac3 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/audiotube.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/audiotube.nix @@ -4,12 +4,14 @@ , extra-cmake-modules , wrapGAppsHook +, futuresql , gst_all_1 , kcoreaddons , kcrash , ki18n , kirigami2 , kirigami-addons +, qcoro , qtimageformats , qtmultimedia , qtquickcontrols2 @@ -27,11 +29,13 @@ mkDerivation rec { ]; buildInputs = [ + futuresql kcoreaddons kcrash ki18n kirigami2 kirigami-addons + qcoro qtimageformats qtmultimedia qtquickcontrols2 diff --git a/third_party/nixpkgs/pkgs/applications/kde/cantor.nix b/third_party/nixpkgs/pkgs/applications/kde/cantor.nix index 1c9a9f718a..0acfa430ea 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/cantor.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/cantor.nix @@ -93,12 +93,7 @@ mkDerivation { qtWrapperArgs = [ "--prefix PATH : ${placeholder "out"}/bin" - ]; - - postInstall = lib.optionalString withSage '' - wrapProgram $out/share/cantor/sagebackend/cantor-execsage \ - --prefix PATH : ${sage-with-env}/bin - ''; + ] ++ lib.optional withSage "--prefix PATH : ${sage-with-env}/bin"; meta = with lib; { description = "Front end to powerful mathematics and statistics packages"; diff --git a/third_party/nixpkgs/pkgs/applications/kde/colord-kde.nix b/third_party/nixpkgs/pkgs/applications/kde/colord-kde.nix index 07f34c84d6..7b3c783995 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/colord-kde.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/colord-kde.nix @@ -1,8 +1,8 @@ { mkDerivation, lib , extra-cmake-modules, ki18n -, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils -, kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem -, kitemmodels, kitemviews, lcms2, libXrandr, qtx11extras +, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kirigami-addons +, kcmutils, kio, knotifications, plasma-framework, kwidgetsaddons +, kwindowsystem, kitemmodels, kitemviews, lcms2, libXrandr, qtx11extras }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes + kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes kirigami-addons kcmutils ki18n kio knotifications plasma-framework kwidgetsaddons kwindowsystem kitemmodels kitemviews lcms2 libXrandr qtx11extras ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/default.nix b/third_party/nixpkgs/pkgs/applications/kde/default.nix index f6988f9831..a0e59c43d1 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/default.nix @@ -73,6 +73,7 @@ let akonadiconsole = callPackage ./akonadiconsole.nix {}; akregator = callPackage ./akregator.nix {}; analitza = callPackage ./analitza.nix {}; + arianna = callPackage ./arianna.nix {}; ark = callPackage ./ark {}; baloo-widgets = callPackage ./baloo-widgets.nix {}; bomber = callPackage ./bomber.nix {}; @@ -99,7 +100,7 @@ let kaccounts-providers = callPackage ./kaccounts-providers.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; - kalendar = callPackage ./kalendar.nix {}; + merkuro = callPackage ./merkuro.nix {}; kalzium = callPackage ./kalzium.nix {}; kamoso = callPackage ./kamoso.nix {}; kapman = callPackage ./kapman.nix {}; @@ -119,7 +120,7 @@ let kdebugsettings = callPackage ./kdebugsettings.nix {}; kdeconnect-kde = callPackage ./kdeconnect-kde.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; - kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; + kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; kdenlive = callPackage ./kdenlive {}; kdepim-addons = callPackage ./kdepim-addons.nix {}; @@ -134,7 +135,6 @@ let kdiamond = callPackage ./kdiamond.nix {}; keditbookmarks = callPackage ./keditbookmarks.nix {}; kfind = callPackage ./kfind.nix {}; - kfloppy = callPackage ./kfloppy.nix {}; kgeography = callPackage ./kgeography.nix {}; kget = callPackage ./kget.nix {}; kgpg = callPackage ./kgpg.nix {}; diff --git a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh index 0acdb529fc..57fa10b84e 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/fetch.sh +++ b/third_party/nixpkgs/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/release-service/23.04.3/src -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/release-service/23.08.1/src -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/third_party/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix similarity index 55% rename from third_party/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers.nix rename to third_party/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix index f0d9fea5d0..6686f582d6 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchpatch, + mkDerivation, lib, ghostscript, substituteAll, extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw, kdegraphics-mobipocket }: @@ -11,4 +11,13 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive kio libkexiv2 libkdcraw kdegraphics-mobipocket ]; + + patches = [ + # Hardcode patches to Ghostscript so PDF thumbnails work OOTB. + # Intentionally not doing the same for dvips because TeX is big. + (substituteAll { + gs = "${ghostscript}/bin/gs"; + src = ./gs-paths.patch; + }) + ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers/gs-paths.patch b/third_party/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers/gs-paths.patch new file mode 100644 index 0000000000..5aa4a8d744 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kdegraphics-thumbnailers/gs-paths.patch @@ -0,0 +1,22 @@ +diff --git a/ps/gscreator.cpp b/ps/gscreator.cpp +index 5b84e49..cbb7c25 100644 +--- a/ps/gscreator.cpp ++++ b/ps/gscreator.cpp +@@ -101,7 +101,7 @@ static const char *epsprolog = + "[ ] 0 setdash newpath false setoverprint false setstrokeadjust\n"; + + static const char * gsargs_ps[] = { +- "gs", ++ "@gs@", + "-sDEVICE=png16m", + "-sOutputFile=-", + "-dSAFER", +@@ -120,7 +120,7 @@ static const char * gsargs_ps[] = { + }; + + static const char * gsargs_eps[] = { +- "gs", ++ "@gs@", + "-sDEVICE=png16m", + "-sOutputFile=-", + "-dSAFER", diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix b/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix index 885b1c1d8c..bcd8ba360a 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix @@ -17,6 +17,7 @@ , knotifyconfig , kplotting , ktextwidgets +, mediainfo , mlt , shared-mime-info , libv4l @@ -58,6 +59,7 @@ mkDerivation { knotifyconfig kplotting ktextwidgets + mediainfo mlt phonon-backend-gstreamer qtdeclarative @@ -77,9 +79,11 @@ mkDerivation { # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it # doesn't find them. See: # https://github.com/NixOS/nixpkgs/issues/83885 - patches = [ ./mlt-path.patch ./ffmpeg-path.patch ]; - inherit mlt; + patches = [ ./dependency-paths.patch ]; + + inherit mlt mediainfo; ffmpeg = ffmpeg-full; + postPatch = # Module Qt5::Concurrent must be included in `find_package` before it is used. '' diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdenlive/dependency-paths.patch b/third_party/nixpkgs/pkgs/applications/kde/kdenlive/dependency-paths.patch new file mode 100644 index 0000000000..ba3f7e6c8d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kdenlive/dependency-paths.patch @@ -0,0 +1,46 @@ +diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg +index 029849e5f..8befe4888 100644 +--- a/src/kdenlivesettings.kcfg ++++ b/src/kdenlivesettings.kcfg +@@ -517,7 +517,7 @@ + + + +- ++ @mlt@/share/mlt/profiles + + + +@@ -527,27 +527,27 @@ + + + +- ++ @mlt@/bin/melt + + + + +- ++ @ffmpeg@/bin/ffmpeg + + + + +- ++ @ffmpeg@/bin/ffplay + + + + +- ++ @ffmpeg@/bin/ffprobe + + + + +- ++ @mediainfo@/bin/mediainfo + + + diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdenlive/ffmpeg-path.patch b/third_party/nixpkgs/pkgs/applications/kde/kdenlive/ffmpeg-path.patch deleted file mode 100644 index a0cef882f5..0000000000 --- a/third_party/nixpkgs/pkgs/applications/kde/kdenlive/ffmpeg-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg -index 5edad5ae7..d35347a40 100644 ---- a/src/kdenlivesettings.kcfg -+++ b/src/kdenlivesettings.kcfg -@@ -403,17 +403,17 @@ - - - -- -+ @ffmpeg@/bin/ffmpeg - - - - -- -+ @ffmpeg@/bin/ffplay - - - - -- -+ @ffmpeg@/bin/ffprobe - - - diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdenlive/mlt-path.patch b/third_party/nixpkgs/pkgs/applications/kde/kdenlive/mlt-path.patch deleted file mode 100644 index 9bfb66c1a8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/kde/kdenlive/mlt-path.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ruN old/src/kdenlivesettings.kcfg new/src/kdenlivesettings.kcfg ---- old/src/kdenlivesettings.kcfg 2019-09-10 23:20:27.555392353 -0400 -+++ new/src/kdenlivesettings.kcfg 2019-09-10 23:25:47.533964155 -0400 -@@ -378,14 +378,14 @@ - - - -- -+ - -- -+ - - diff --git a/third_party/nixpkgs/pkgs/applications/kde/kfloppy.nix b/third_party/nixpkgs/pkgs/applications/kde/kfloppy.nix deleted file mode 100644 index a88fd9283e..0000000000 --- a/third_party/nixpkgs/pkgs/applications/kde/kfloppy.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcompletion, kxmlgui }: - -mkDerivation { - pname = "kfloppy"; - meta = with lib; { - homepage = "https://kde.org/applications/en/utilities/org.kde.kfloppy"; - description = "Utility to format 3.5\" and 5.25\" floppy disks"; - maintainers = with maintainers; [ freezeboy ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kdoctools - kcompletion - kxmlgui - ]; -} diff --git a/third_party/nixpkgs/pkgs/applications/kde/kalendar.nix b/third_party/nixpkgs/pkgs/applications/kde/merkuro.nix similarity index 86% rename from third_party/nixpkgs/pkgs/applications/kde/kalendar.nix rename to third_party/nixpkgs/pkgs/applications/kde/merkuro.nix index 30303cc497..b8d3107eb6 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/kalendar.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/merkuro.nix @@ -41,8 +41,8 @@ , messagelib }: -mkDerivation rec { - pname = "kalendar"; +mkDerivation { + pname = "merkuro"; nativeBuildInputs = [ cmake @@ -89,14 +89,11 @@ mkDerivation rec { ]; propagatedUserEnvPkgs = [ akonadi kdepim-runtime akonadi-search ]; - postFixup = '' - wrapProgram "$out/bin/kalendar" \ - --prefix PATH : "${lib.makeBinPath [ akonadi kdepim-runtime akonadi-search ]}" - ''; + qtWrapperArgs = [''--prefix PATH : "${lib.makeBinPath [ akonadi kdepim-runtime akonadi-search ]}"'']; meta = with lib; { description = "A calendar application using Akonadi to sync with external services (Nextcloud, GMail, ...)"; - homepage = "https://apps.kde.org/kalendar/"; + homepage = "https://invent.kde.org/pim/merkuro"; license = licenses.gpl3Plus; maintainers = with maintainers; [ Thra11 ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/kde/neochat.nix b/third_party/nixpkgs/pkgs/applications/kde/neochat.nix index 0b9f3c57f6..a9661648dd 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/neochat.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/neochat.nix @@ -1,6 +1,5 @@ { mkDerivation , lib -, fetchpatch , cmake , extra-cmake-modules @@ -16,6 +15,7 @@ , kirigami2 , kitemmodels , knotifications +, kquickcharts , kquickimageedit , libpulseaudio , libquotient @@ -25,6 +25,7 @@ , qqc2-desktop-style , qtgraphicaleffects , qtkeychain +, qtlocation , qtmultimedia , qtquickcontrols2 , sonnet @@ -33,14 +34,6 @@ mkDerivation { pname = "neochat"; - patches = [ - (fetchpatch { - name = "libquotient-0.8.patch"; - url = "https://invent.kde.org/network/neochat/-/commit/d9d5e17be2a2057ab2ee545561fab721cb211f7f.patch"; - hash = "sha256-y1PEehFCW+69OH8YvL3SUGOb8Hhyf8xwRvSZzJ5J5Wc="; - }) - ]; - nativeBuildInputs = [ cmake extra-cmake-modules @@ -58,6 +51,7 @@ mkDerivation { kirigami2 kitemmodels knotifications + kquickcharts kquickimageedit libpulseaudio libquotient @@ -66,6 +60,7 @@ mkDerivation { qcoro qtgraphicaleffects qtkeychain + qtlocation qtmultimedia qtquickcontrols2 qqc2-desktop-style diff --git a/third_party/nixpkgs/pkgs/applications/kde/skanlite.nix b/third_party/nixpkgs/pkgs/applications/kde/skanlite.nix index 30ceba645b..e31c775c3d 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/skanlite.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/skanlite.nix @@ -1,5 +1,6 @@ { mkDerivation, lib, + wrapGAppsHook, extra-cmake-modules, kdoctools, kio, libksane }: @@ -13,6 +14,6 @@ mkDerivation { maintainers = with maintainers; [ polendri ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ wrapGAppsHook extra-cmake-modules kdoctools ]; buildInputs = [ kio libksane ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/skanpage.nix b/third_party/nixpkgs/pkgs/applications/kde/skanpage.nix index d06ff7746b..fc16723ce4 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/skanpage.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/skanpage.nix @@ -1,15 +1,15 @@ { lib , mkDerivation -, fetchurl , extra-cmake-modules , kirigami2 , ktextwidgets , libksane , qtquickcontrols2 , kpurpose +, kquickimageedit }: -mkDerivation rec { +mkDerivation { pname = "skanpage"; nativeBuildInputs = [ extra-cmake-modules ]; @@ -20,13 +20,13 @@ mkDerivation rec { libksane qtquickcontrols2 kpurpose + kquickimageedit ]; meta = with lib; { description = "KDE utility to scan images and multi-page documents"; homepage = "https://apps.kde.org/skanpage"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix index 7e9c80cd64..8505e34920 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/spectacle.nix @@ -5,21 +5,12 @@ , knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi , qtx11extras, knewstuff, kwayland, qttools, kcolorpicker, kimageannotator , qcoro, qtquickcontrols2, wayland, plasma-wayland-protocols, kpurpose, kpipewire -, wrapGAppsHook, fetchpatch +, wrapGAppsHook }: mkDerivation { pname = "spectacle"; - patches = [ - # backport fix for region capture with multi-display high-dpi setups - # FIXME: remove in 23.08 - (fetchpatch { - url = "https://invent.kde.org/graphics/spectacle/-/commit/d0886c85445fad227b256152a549cb33bd97b776.patch"; - hash = "sha256-t0+X1pzjlS2OWduMwQBoYbjh+o/SF4hOkAqzz/MJw3E="; - }) - ]; - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; buildInputs = [ kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications diff --git a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix index 32de119a7b..657d412a02 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/srcs.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/srcs.nix @@ -4,2051 +4,1955 @@ { akonadi = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-23.04.3.tar.xz"; - sha256 = "0jpp91d5rlblq6r981wxizmsv512kc43lfk8y29bdky6j4idflrb"; - name = "akonadi-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/akonadi-23.08.1.tar.xz"; + sha256 = "0f4nac4lhklryrdjsd17xjs566272m6vy48b7smxpd67y59lm54a"; + name = "akonadi-23.08.1.tar.xz"; }; }; akonadi-calendar = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-calendar-23.04.3.tar.xz"; - sha256 = "166xm57jcy7d2dv2pfy4lllzic4giin31szxz7xq3a7ixsd6g7cs"; - name = "akonadi-calendar-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/akonadi-calendar-23.08.1.tar.xz"; + sha256 = "1kbw43z82jhlyqbdjmg2j67g5ci2blcs7g0vj03sagc37s0h8s1b"; + name = "akonadi-calendar-23.08.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-calendar-tools-23.04.3.tar.xz"; - sha256 = "1msbvmq664wij1rcivmgw14kpw5x4xz57567xl0q60j584v2wq07"; - name = "akonadi-calendar-tools-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/akonadi-calendar-tools-23.08.1.tar.xz"; + sha256 = "1chqp1nl40drizqbpbaxfzvx35l5xz86v7p5wlck0kgscjwickdf"; + name = "akonadi-calendar-tools-23.08.1.tar.xz"; }; }; akonadi-contacts = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-contacts-23.04.3.tar.xz"; - sha256 = "10vlzj56ps1pysf7g6i14v8wp2wkxh53055r2v4iq4cpq3mzayc6"; - name = "akonadi-contacts-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/akonadi-contacts-23.08.1.tar.xz"; + sha256 = "15la1n1b2dxh1lwnykvm2yynsimsjs3ri56a36vgbm5vdnzq93nx"; + name = "akonadi-contacts-23.08.1.tar.xz"; }; }; akonadi-import-wizard = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-import-wizard-23.04.3.tar.xz"; - sha256 = "0dj7cvxnvld2h9nbg6v0bn3p81fx73dgj6kbpginavci52kgk240"; - name = "akonadi-import-wizard-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/akonadi-import-wizard-23.08.1.tar.xz"; + sha256 = "1ph9n8xjslf79yk5lq89672w0fkx8wxlx2358izlbwjn72k86s36"; + name = "akonadi-import-wizard-23.08.1.tar.xz"; }; }; akonadi-mime = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-mime-23.04.3.tar.xz"; - sha256 = "1r33v2q49s7l90id4jqg0lar9p1j5k0cbnzsaqdksavzpzkcklh5"; - name = "akonadi-mime-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/akonadi-mime-23.08.1.tar.xz"; + sha256 = "0cafgafg504a11zxsg33d7hwgqmcxmamvnx7ds9il120h6fakd6a"; + name = "akonadi-mime-23.08.1.tar.xz"; }; }; akonadi-notes = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-notes-23.04.3.tar.xz"; - sha256 = "0s5a414cdcz37srys2w3c2z5c63ha9ivsqj0srnfwwv0pxix266v"; - name = "akonadi-notes-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/akonadi-notes-23.08.1.tar.xz"; + sha256 = "1lpfmsn0qmiysdxvfzv2kgqjf2gz4sxvd3c8mv5rx2lc5c2ryr76"; + name = "akonadi-notes-23.08.1.tar.xz"; }; }; akonadi-search = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadi-search-23.04.3.tar.xz"; - sha256 = "1hpclfcb7almvajscm2az36bw9rrhkp3ywb9h0j9h8ims2gm60m7"; - name = "akonadi-search-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/akonadi-search-23.08.1.tar.xz"; + sha256 = "1aw2dna3m74nynk4mn4n4w5mrczavqxv65fak9ahn3cnrph6fgi4"; + name = "akonadi-search-23.08.1.tar.xz"; }; }; akonadiconsole = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akonadiconsole-23.04.3.tar.xz"; - sha256 = "005wq3rxgi37zb2gg6vawyav473q23q0d6l6pilnzsjw5rc1r3lk"; - name = "akonadiconsole-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/akonadiconsole-23.08.1.tar.xz"; + sha256 = "12d5w865ji1k6m9kq9clcxfh9zd624z5kj10cdzzdbc3agd3az4d"; + name = "akonadiconsole-23.08.1.tar.xz"; }; }; akregator = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/akregator-23.04.3.tar.xz"; - sha256 = "0g916453zip8i5g61pf8ib68fiqfbmr1i1lhbnwmsv1cryx035w9"; - name = "akregator-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/akregator-23.08.1.tar.xz"; + sha256 = "1zm092hs9yr6x3sxmzrqysrph5jqqhvc3pj13lkaml6zsqx7mgd6"; + name = "akregator-23.08.1.tar.xz"; }; }; alligator = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/alligator-23.04.3.tar.xz"; - sha256 = "0xnykm6m4mab9vdlbc0dfik6iizb032n1rcyj6mxkj2q5k0gl8h4"; - name = "alligator-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/alligator-23.08.1.tar.xz"; + sha256 = "0463igl4yf1dr1avl27mqw5x9y8b485cj2b5iqs3fqizjlq5fb4j"; + name = "alligator-23.08.1.tar.xz"; }; }; analitza = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/analitza-23.04.3.tar.xz"; - sha256 = "1lcs0bncn8pl593dh0kki7knwbzyyai5dz3kf2gb7wp4liz48k1m"; - name = "analitza-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/analitza-23.08.1.tar.xz"; + sha256 = "0frrzmyd2basi0i8irwp0xkwh6n34gs29216ghijm56mjq9m4n29"; + name = "analitza-23.08.1.tar.xz"; }; }; angelfish = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/angelfish-23.04.3.tar.xz"; - sha256 = "0pk6rzy0i5sx2yg8pdc36jvamxah7j2czxb0njjycx760pzn61ah"; - name = "angelfish-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/angelfish-23.08.1.tar.xz"; + sha256 = "13zr28hlm764l92ysy3cdb6jsiwcbbrqrdkr287l2mk600z75rpf"; + name = "angelfish-23.08.1.tar.xz"; + }; + }; + arianna = { + version = "23.08.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/23.08.1/src/arianna-23.08.1.tar.xz"; + sha256 = "05184ii5l4cn5g22hwzkcxznrvc7j22kh19qbky9fpd9ls8n8jgl"; + name = "arianna-23.08.1.tar.xz"; }; }; ark = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ark-23.04.3.tar.xz"; - sha256 = "081swq9f87yxg4dxdl5i4hszhr0q4ph402in397zfa5vpyspzy41"; - name = "ark-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ark-23.08.1.tar.xz"; + sha256 = "07bx9zbim64lna219zdj7cndviq5dda3b17zw9fwlhjkj2lm9m3y"; + name = "ark-23.08.1.tar.xz"; }; }; artikulate = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/artikulate-23.04.3.tar.xz"; - sha256 = "0klp20clcpdm14wc2r14h6f7zrma34a22cz16mdc5c9k8dmalsz9"; - name = "artikulate-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/artikulate-23.08.1.tar.xz"; + sha256 = "05rwmdjanyr5xpgkc7aq3vc5pl7fqngsm0rfmg9rlfqhd2z8dlq3"; + name = "artikulate-23.08.1.tar.xz"; }; }; audiocd-kio = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/audiocd-kio-23.04.3.tar.xz"; - sha256 = "0kl0j5qy54q88cbclwqj0rn8hj3gzjhzk7bimjgw5w0xy3cw6kql"; - name = "audiocd-kio-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/audiocd-kio-23.08.1.tar.xz"; + sha256 = "1lbf1k52ds6h5slyksx33a57mqqpmwl2h13wgf550xqfscn22195"; + name = "audiocd-kio-23.08.1.tar.xz"; }; }; audiotube = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/audiotube-23.04.3.tar.xz"; - sha256 = "1qbb34qi81j2r2sblgs0qry9diijizlbs12gwg9hmiybrdkk6qh4"; - name = "audiotube-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/audiotube-23.08.1.tar.xz"; + sha256 = "07mdmcfkcdcd98msmlisq2bfqzdhxiz12ad8xh6g6rwz01lk5mcp"; + name = "audiotube-23.08.1.tar.xz"; }; }; baloo-widgets = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/baloo-widgets-23.04.3.tar.xz"; - sha256 = "01k8kmzr2vgd567v4js080cnyl2i43zh6zz25ml76z77lywlfzz6"; - name = "baloo-widgets-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/baloo-widgets-23.08.1.tar.xz"; + sha256 = "0mxh2wkg0s48p448jsagkxgi96kn8jpcfdgpfakpx6y4y26nv01r"; + name = "baloo-widgets-23.08.1.tar.xz"; }; }; blinken = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/blinken-23.04.3.tar.xz"; - sha256 = "1bxw0bp6cj93gcwcb19ansz6xz4y53rah2pa6kq18xzafkrzrihm"; - name = "blinken-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/blinken-23.08.1.tar.xz"; + sha256 = "1xmbhkcvr8fjkxm5lnscqk04nj3zbar3ahblvfsywayvksknnh5f"; + name = "blinken-23.08.1.tar.xz"; }; }; bomber = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/bomber-23.04.3.tar.xz"; - sha256 = "0qgixhmlkcjni5i9391hjg3sfc3ps24lmk9v8199lmnplrybklqj"; - name = "bomber-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/bomber-23.08.1.tar.xz"; + sha256 = "04iibsj75fcv14711zd5imw3h6yqymxw6vayaal9rcxc72llrszz"; + name = "bomber-23.08.1.tar.xz"; }; }; bovo = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/bovo-23.04.3.tar.xz"; - sha256 = "1zds6d4rmcf4sa2sfhyp1i5n7s7cgslikvbra4pz2kpi0hmvihi1"; - name = "bovo-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/bovo-23.08.1.tar.xz"; + sha256 = "0ln0jfsqqdda44k7sfd65dpr24d3w6hpiz59q4abl8va849y0m4c"; + name = "bovo-23.08.1.tar.xz"; }; }; calendarsupport = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/calendarsupport-23.04.3.tar.xz"; - sha256 = "1zk6kv5nhcd7a5llzh31890xpqdg522ahjdgbwsm7pcp62y0nbsj"; - name = "calendarsupport-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/calendarsupport-23.08.1.tar.xz"; + sha256 = "0vxgzkdvgvs1n5szv1pkr37rri67argn3cqydcjlsq0yr75k6kvv"; + name = "calendarsupport-23.08.1.tar.xz"; }; }; calindori = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/calindori-23.04.3.tar.xz"; - sha256 = "1vadyrpf0f6mkgplwpfyn8z13fj7ny2zac85583czhnjci3aqvdd"; - name = "calindori-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/calindori-23.08.1.tar.xz"; + sha256 = "0mwiqa7wvs9pdlr4fkfmxmvi46vmafp64m9wq34vx54s64jd4bwa"; + name = "calindori-23.08.1.tar.xz"; }; }; cantor = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/cantor-23.04.3.tar.xz"; - sha256 = "0c1drzkvmk4ifxzhch8qz5la14nbv7q0scx0vldp9k78ldgliwlw"; - name = "cantor-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/cantor-23.08.1.tar.xz"; + sha256 = "051qnalbdqa75j4xb89si6b1cavarzjr98ankvhgi17ygxdfabgr"; + name = "cantor-23.08.1.tar.xz"; }; }; cervisia = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/cervisia-23.04.3.tar.xz"; - sha256 = "18dc0441lq87cz9xwwph5vqbqkhq291r3dpkik8894rkxsmkja1c"; - name = "cervisia-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/cervisia-23.08.1.tar.xz"; + sha256 = "0mp8qbk3ppp5m50r082mafvgdr5gznbgjfvhlyc77qhck0d4c04x"; + name = "cervisia-23.08.1.tar.xz"; }; }; colord-kde = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/colord-kde-23.04.3.tar.xz"; - sha256 = "19hnmlwmms1jlk6b7z88fsibf80sl462wgx1gin8czp0f7v5pkz0"; - name = "colord-kde-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/colord-kde-23.08.1.tar.xz"; + sha256 = "0i83445inqjcmababvg9hrl6qjqf57j2k2bqvyca15w91d159mz2"; + name = "colord-kde-23.08.1.tar.xz"; }; }; dolphin = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/dolphin-23.04.3.tar.xz"; - sha256 = "0bys24i2a3a65ahq5p3q1zr2px8jqip1gjn5m7rngq4hcddb1ji8"; - name = "dolphin-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/dolphin-23.08.1.tar.xz"; + sha256 = "1rhmxjhjn20mf88rgliwzkswyb5nvjfyzhai47vq45795rvj3kh5"; + name = "dolphin-23.08.1.tar.xz"; }; }; dolphin-plugins = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/dolphin-plugins-23.04.3.tar.xz"; - sha256 = "0h1b559icj5g3xrx5697a9rncpdcmsjg774c6m36ild56bwc048v"; - name = "dolphin-plugins-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/dolphin-plugins-23.08.1.tar.xz"; + sha256 = "0m8b7a2pkzi8ayzxrki9g5pgi2w6fns3hbsa62qfxml07fgl4bwr"; + name = "dolphin-plugins-23.08.1.tar.xz"; }; }; dragon = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/dragon-23.04.3.tar.xz"; - sha256 = "0mliddp0nyxz91wzy8md0p0i45mlhffip4zqjl4db55x4p6wh4y8"; - name = "dragon-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/dragon-23.08.1.tar.xz"; + sha256 = "195mkqrjcavlafc1660zg8j5nnb1h5pic99fnfrbfhgk4z1vzhfc"; + name = "dragon-23.08.1.tar.xz"; }; }; elisa = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/elisa-23.04.3.tar.xz"; - sha256 = "1ry4mhj7wc31xq9fip3amv8fj631m213zz0qg44h68q77sik4422"; - name = "elisa-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/elisa-23.08.1.tar.xz"; + sha256 = "0c1rpr6q96m8hsz395239pvwgpvmsggfwjqxh1pfr0592zpd3nyr"; + name = "elisa-23.08.1.tar.xz"; }; }; eventviews = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/eventviews-23.04.3.tar.xz"; - sha256 = "1nh8a7jy0sjsyi41pxhxwjkq6fr4yy9rqgcjjbj01dnx1ykz3d7l"; - name = "eventviews-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/eventviews-23.08.1.tar.xz"; + sha256 = "185g8pydk4j9vmgpmdp7yz9bb88vhk35qggd133jsvlhciim2hlb"; + name = "eventviews-23.08.1.tar.xz"; }; }; falkon = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/falkon-23.04.3.tar.xz"; - sha256 = "11r1iwimdzabfah68gsvw6xi67cj539anqa6s1rg33agsi5y56d3"; - name = "falkon-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/falkon-23.08.1.tar.xz"; + sha256 = "0sg50hbh2q6fyybzgkp0vmw5nz3mp5hwkn4lpr8ywxfgh5hqa45f"; + name = "falkon-23.08.1.tar.xz"; }; }; ffmpegthumbs = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ffmpegthumbs-23.04.3.tar.xz"; - sha256 = "02wvhjqqird55xcs4kkj0s7nam4vqh3khjz5f1mjqfnk62sj1plx"; - name = "ffmpegthumbs-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ffmpegthumbs-23.08.1.tar.xz"; + sha256 = "1k52y40v63k0vzbh63jd0r3xfgv2r17lhpwdghg1y9jgk5n0hfli"; + name = "ffmpegthumbs-23.08.1.tar.xz"; }; }; filelight = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/filelight-23.04.3.tar.xz"; - sha256 = "1mwl1dkknvqw9hd5jsh4cdx1zd8f6rxca0vyq01wrx44q9p6dn1n"; - name = "filelight-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/filelight-23.08.1.tar.xz"; + sha256 = "0b5c19gfhx1i2d6cmqpd9zwsmn3ym811c6ya2qylkqfc25drwncj"; + name = "filelight-23.08.1.tar.xz"; }; }; ghostwriter = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ghostwriter-23.04.3.tar.xz"; - sha256 = "1q3rhm6jnkbfylifj5km7hiygyib9c3m718kdsmyxas6k6vjx9rp"; - name = "ghostwriter-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ghostwriter-23.08.1.tar.xz"; + sha256 = "1kc64wa0hj4q08b88n9p3la72zwm8bzl9k8w7rskrjj55ayiyz7w"; + name = "ghostwriter-23.08.1.tar.xz"; }; }; granatier = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/granatier-23.04.3.tar.xz"; - sha256 = "1zyadmgnpgsx728gzd55qyijsm13pb9cxs1y4l4c4m9lnz4y183v"; - name = "granatier-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/granatier-23.08.1.tar.xz"; + sha256 = "01ih2a3rqg9yiaamppwl8vlx908ncizws23asgl75iy6vvrfd5va"; + name = "granatier-23.08.1.tar.xz"; }; }; grantlee-editor = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/grantlee-editor-23.04.3.tar.xz"; - sha256 = "1skv2hki0rck7596ci026bi3kss5fl4zrh3walsh44422yqkbj2a"; - name = "grantlee-editor-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/grantlee-editor-23.08.1.tar.xz"; + sha256 = "1v1wmz31gr16qqdfyk40x746ch4iix3p4ih9vbx9z7ghl9kr99c6"; + name = "grantlee-editor-23.08.1.tar.xz"; }; }; grantleetheme = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/grantleetheme-23.04.3.tar.xz"; - sha256 = "01kkj3y6xhc792jaxnkglkwvlqx9ckn5yhlfrpqff5hlf5x9vn4w"; - name = "grantleetheme-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/grantleetheme-23.08.1.tar.xz"; + sha256 = "1g3xfggg2byh9hv6qhmazbnd32175plq25rkp8lhk1kx3ih1z02i"; + name = "grantleetheme-23.08.1.tar.xz"; }; }; gwenview = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/gwenview-23.04.3.tar.xz"; - sha256 = "0vijsq4174p4asdjq47bzdp2xkfn8hpg7b4dgp3yvapfxwjgp148"; - name = "gwenview-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/gwenview-23.08.1.tar.xz"; + sha256 = "0xmjvhhp067xzc8h9km32wpjc4r4jhbx2imv6j4ikpzzaj9hnzwp"; + name = "gwenview-23.08.1.tar.xz"; }; }; incidenceeditor = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/incidenceeditor-23.04.3.tar.xz"; - sha256 = "1pqfl7gqz7ibpns2gpwqpvzhsba7xj4ilhi4ax1vn3m086iyh3a0"; - name = "incidenceeditor-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/incidenceeditor-23.08.1.tar.xz"; + sha256 = "12dw3dhf5jn2r2fsmiw2f0m56gd9nzff9llxdrvb0vm6cxycgy2y"; + name = "incidenceeditor-23.08.1.tar.xz"; }; }; itinerary = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/itinerary-23.04.3.tar.xz"; - sha256 = "132x68wc4pallxgkvridfsimfq5m2g47fj9lcgz1kq4gdsidzf6i"; - name = "itinerary-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/itinerary-23.08.1.tar.xz"; + sha256 = "1fmp9gihnkj79iv7lprx59ilhswwdp7j7m567smh9w85niki0fyc"; + name = "itinerary-23.08.1.tar.xz"; }; }; juk = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/juk-23.04.3.tar.xz"; - sha256 = "1q0r0iv4nn6jd0g8db54r7xdw7kdw1ja0z1ggxl1sy0k60m9c4q3"; - name = "juk-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/juk-23.08.1.tar.xz"; + sha256 = "1hx7l7mzc3lmv34w29gr1pmq6s6rkvhma3dsmjnixcrdfdqdjxk4"; + name = "juk-23.08.1.tar.xz"; }; }; k3b = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/k3b-23.04.3.tar.xz"; - sha256 = "1kr1hw4pws87zzwyrwrg2ysdn11qf0qhwi1vc9b0k8jkjmmdplmb"; - name = "k3b-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/k3b-23.08.1.tar.xz"; + sha256 = "03v0j3x8s1ybh1g6bpbx5mvz67lvr7385mgrbp9f763dcmwp6m15"; + name = "k3b-23.08.1.tar.xz"; }; }; kaccounts-integration = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kaccounts-integration-23.04.3.tar.xz"; - sha256 = "1mn64xw5r2magy5y0qmg5r907jz1y8jar0qqkc6s1zjjr3s3knac"; - name = "kaccounts-integration-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kaccounts-integration-23.08.1.tar.xz"; + sha256 = "1zrh3bcb6s3j6ld014ilxnbfq60qnslk2fg8mc30mvzm7hzfnx38"; + name = "kaccounts-integration-23.08.1.tar.xz"; }; }; kaccounts-providers = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kaccounts-providers-23.04.3.tar.xz"; - sha256 = "1lrmj6r09ypnpl2s586i4rd3fk3760qlxyrhh91k43wkb8i6m8f0"; - name = "kaccounts-providers-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kaccounts-providers-23.08.1.tar.xz"; + sha256 = "04fyw7ir8j1wz5m10fa2plrci72mmm4gbm1gbi6azqhlfp2251ap"; + name = "kaccounts-providers-23.08.1.tar.xz"; }; }; kaddressbook = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kaddressbook-23.04.3.tar.xz"; - sha256 = "0zjbri91dh9vnwi6jqkbmyq667yzn8g4kw5v47qn8id2629zj6jq"; - name = "kaddressbook-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kaddressbook-23.08.1.tar.xz"; + sha256 = "0bb65yipczlpbqkhrb7rk5l9bsdrfjg20mavszy8y2b8qlx6sl27"; + name = "kaddressbook-23.08.1.tar.xz"; }; }; kajongg = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kajongg-23.04.3.tar.xz"; - sha256 = "16v87x0qikfk9jpp8dfxnb7mnjzzi0qlkp5lbn2xypkfhqaz99fi"; - name = "kajongg-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kajongg-23.08.1.tar.xz"; + sha256 = "15yvcn3d6g1njlmdimbrzlpb7hdvlspykikmjq2alzq0d8qbxnal"; + name = "kajongg-23.08.1.tar.xz"; }; }; kalarm = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kalarm-23.04.3.tar.xz"; - sha256 = "120q5y889i9wdg9mxl51v8wz6nvdbhv178bhpscrb307ing538g0"; - name = "kalarm-23.04.3.tar.xz"; - }; - }; - kalendar = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kalendar-23.04.3.tar.xz"; - sha256 = "1w56glv8m1rlk86v78h69d21ydxb6i61g1dk6mcizjr5rvi4liy0"; - name = "kalendar-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kalarm-23.08.1.tar.xz"; + sha256 = "0p4fjycp4rs193nb6br87yxpzzmsxi9ng91svm8fsvi2jzs7kqzj"; + name = "kalarm-23.08.1.tar.xz"; }; }; kalgebra = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kalgebra-23.04.3.tar.xz"; - sha256 = "04ygs073za4jjfp38am962jmyycx3hs8yswcnl91v9nx2lcpzdw5"; - name = "kalgebra-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kalgebra-23.08.1.tar.xz"; + sha256 = "1p6yk6yip76pvdiyyn4cb1rfmbngjrayr8fb4lrmfjcmnqxdnw0n"; + name = "kalgebra-23.08.1.tar.xz"; }; }; kalk = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kalk-23.04.3.tar.xz"; - sha256 = "191x0vgbbq26qm36fph246alhyw3afdbbnyjg95mh3y0f3lw1n8d"; - name = "kalk-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kalk-23.08.1.tar.xz"; + sha256 = "0rb53dk1hwf36bijz9ich8wbn31ihjz1v1x2sdf49g07fjgfvlnn"; + name = "kalk-23.08.1.tar.xz"; }; }; kalzium = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kalzium-23.04.3.tar.xz"; - sha256 = "041mrly5yzdxxlj9r04s10a6i4amlslw57j1ysj0k4vzh5js27zw"; - name = "kalzium-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kalzium-23.08.1.tar.xz"; + sha256 = "1ppl6waya1qsplkzqkvc5lmz9bgibmgnr3v4l104lav2k0f9waw9"; + name = "kalzium-23.08.1.tar.xz"; }; }; kamera = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kamera-23.04.3.tar.xz"; - sha256 = "09qqigcklp8d2pqibf8kxfras025zhpviwaaky69sd7nmqqd7gi9"; - name = "kamera-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kamera-23.08.1.tar.xz"; + sha256 = "0cx396k9s9lgcrygi8npb6y179m0955cb2r652r5kfkcja5jhl7q"; + name = "kamera-23.08.1.tar.xz"; }; }; kamoso = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kamoso-23.04.3.tar.xz"; - sha256 = "1f06331qigf5wi6lgir5ij8h1fsdn54v32fyw2mgf0hg05xndrcl"; - name = "kamoso-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kamoso-23.08.1.tar.xz"; + sha256 = "18wddia3lwpvzl7x9gn614xhw7dwcz8v0062jyxzv7i4lnqiwymk"; + name = "kamoso-23.08.1.tar.xz"; }; }; kanagram = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kanagram-23.04.3.tar.xz"; - sha256 = "1w6qmm32m9j0ffqlqhn95q899pxvgx2xckd1s11n8v8f4s193p9k"; - name = "kanagram-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kanagram-23.08.1.tar.xz"; + sha256 = "0zqrfmhk2m62hfqc4418l61rc1dsx26zhv31q912f29hk9f90phw"; + name = "kanagram-23.08.1.tar.xz"; }; }; kapman = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kapman-23.04.3.tar.xz"; - sha256 = "0ildsd7pig3lm9n616kw5mpl8hbwidsnbzdfifx8nnffslrr4bv7"; - name = "kapman-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kapman-23.08.1.tar.xz"; + sha256 = "0gg3gvibqhng0spk197vjq8vwwy2rpq2kl0ghn69xpjm4ymbh5k9"; + name = "kapman-23.08.1.tar.xz"; }; }; kapptemplate = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kapptemplate-23.04.3.tar.xz"; - sha256 = "1kdi948w5x328nalxcf17rnmxsp7mx3p7a58f7c65cf2y4ap9vwm"; - name = "kapptemplate-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kapptemplate-23.08.1.tar.xz"; + sha256 = "06hrzgxhdk0c4abax29iqixyj108f9mwv5vfp00mqzhdrxb9bg4d"; + name = "kapptemplate-23.08.1.tar.xz"; }; }; kasts = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kasts-23.04.3.tar.xz"; - sha256 = "0qpc04c841ry2f12pb1bc22qk9ncxmb0b2ji3m60il4ivgwarq9b"; - name = "kasts-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kasts-23.08.1.tar.xz"; + sha256 = "1qw1ic3ll7m1yb30vqps8121z6g3qq2d39fgw7vri0c1fbnf2xj8"; + name = "kasts-23.08.1.tar.xz"; }; }; kate = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kate-23.04.3.tar.xz"; - sha256 = "0yyhh21pvzsaz7swmghdchzsfk089axhqkjwjv1m8j4q3q3rhv86"; - name = "kate-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kate-23.08.1.tar.xz"; + sha256 = "0zagpi602by5nivgs4q37qxk0l0gyghm7wq26mxff8b4z3pp6zpg"; + name = "kate-23.08.1.tar.xz"; }; }; katomic = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/katomic-23.04.3.tar.xz"; - sha256 = "0a571058r9s2y6pyyapxfvlbpr6grabpl7x1lqlg3hfzyc7gl2h1"; - name = "katomic-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/katomic-23.08.1.tar.xz"; + sha256 = "1ikp0rb5yvq0l4n88zn0mnpz5jixpw0vppwank324q1rbikrhf8p"; + name = "katomic-23.08.1.tar.xz"; }; }; kbackup = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kbackup-23.04.3.tar.xz"; - sha256 = "121w54ivmq8qnxc97g47i8vq4nkivypp84pqs9rs5bid4cpfvh9p"; - name = "kbackup-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kbackup-23.08.1.tar.xz"; + sha256 = "1cb6p6qlviibq0j0j204a1xw16waij3fjlxml3876i4lnsy3afld"; + name = "kbackup-23.08.1.tar.xz"; }; }; kblackbox = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kblackbox-23.04.3.tar.xz"; - sha256 = "0h7byd7g52yvmz3gxrzp2frs4iifm0r6lq8fjz2nxbl1rkw9ljbp"; - name = "kblackbox-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kblackbox-23.08.1.tar.xz"; + sha256 = "0ymlwjk3026bdaqcd5iy5mi6dk3dcvpy8g2bkyb9gbwjrnlwq2wb"; + name = "kblackbox-23.08.1.tar.xz"; }; }; kblocks = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kblocks-23.04.3.tar.xz"; - sha256 = "1z5f2zpnmfh05vlmjw85jj2d0sfxl5w1kg30ky6gmgmmfzj2sjzx"; - name = "kblocks-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kblocks-23.08.1.tar.xz"; + sha256 = "0k71ycz7h0msrh03dbzslhbhrf56xsm46l3091kkn8dd5xl7f6iz"; + name = "kblocks-23.08.1.tar.xz"; }; }; kbounce = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kbounce-23.04.3.tar.xz"; - sha256 = "06b0q4f4yn8m8gy7wgax54ldwnkgykr8yfr2h0ih8mfg3w8xsx7s"; - name = "kbounce-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kbounce-23.08.1.tar.xz"; + sha256 = "1060qr1ddipfkyv15qqzywbjc1jv894gjd9rmgmli9wp5j6r9yn0"; + name = "kbounce-23.08.1.tar.xz"; }; }; kbreakout = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kbreakout-23.04.3.tar.xz"; - sha256 = "08fq0s1c71ag6jzyxz6spc5ylmzpbqpyqi9lqjk0x7y7brkfk9fq"; - name = "kbreakout-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kbreakout-23.08.1.tar.xz"; + sha256 = "04gvy33haf4gnycms0jv7liqz3vz443plhl9wny0cxhdfwdc3ml8"; + name = "kbreakout-23.08.1.tar.xz"; }; }; kbruch = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kbruch-23.04.3.tar.xz"; - sha256 = "0gr5d5xlrca71lrjqxnllsw4wji21y8wnzpq685f1nkkkhamxk37"; - name = "kbruch-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kbruch-23.08.1.tar.xz"; + sha256 = "1jy3gcdnm9mxxf3m81knxwhm3nbrcrvyh4vccdr33ylg9zmvdzx3"; + name = "kbruch-23.08.1.tar.xz"; }; }; kcachegrind = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcachegrind-23.04.3.tar.xz"; - sha256 = "175bag1mfidp7bdsjb3zinib76jy8h881rqxgmkn90gmv4fqy62b"; - name = "kcachegrind-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kcachegrind-23.08.1.tar.xz"; + sha256 = "16lxdqr89ipn9qfnhdr5qniqg197vym3sddlj80mz5wxbz229vk9"; + name = "kcachegrind-23.08.1.tar.xz"; }; }; kcalc = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcalc-23.04.3.tar.xz"; - sha256 = "04mqicwqn6h99jgh1zl0wsgk1rdkswzxaq8b8yz5hq654dsyq6y1"; - name = "kcalc-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kcalc-23.08.1.tar.xz"; + sha256 = "1ny5cndpa90icp2d8hvbvkp3bxpgyfqc6sgvcwfn7ysrhnc4dif4"; + name = "kcalc-23.08.1.tar.xz"; }; }; kcalutils = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcalutils-23.04.3.tar.xz"; - sha256 = "1j7f5ai25zcxggw3dvky624asxim5bkd6a35rcdzkjhj1qwk3vll"; - name = "kcalutils-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kcalutils-23.08.1.tar.xz"; + sha256 = "0mhivayzlkbm9w6n8ri9rr6bzrvwr98bndr2560rn5cb64akdpqm"; + name = "kcalutils-23.08.1.tar.xz"; }; }; kcharselect = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcharselect-23.04.3.tar.xz"; - sha256 = "05z80j8bwrj1zfpy376gsx30bv7bxsa3lyvrqsz197w1g8vp5gix"; - name = "kcharselect-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kcharselect-23.08.1.tar.xz"; + sha256 = "1wby00750qqzwzs291w0khwn19j887mywx8126n1967lgvn764q3"; + name = "kcharselect-23.08.1.tar.xz"; }; }; kclock = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kclock-23.04.3.tar.xz"; - sha256 = "1rn1v7y7kjmly703qlk0jhsqk5kiixrf7z339h38l7b32r8vdm9r"; - name = "kclock-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kclock-23.08.1.tar.xz"; + sha256 = "0x7aqiyfjrc7l8601x1zljsixcvk40s84qv8bzh0ymy31j4x6l73"; + name = "kclock-23.08.1.tar.xz"; }; }; kcolorchooser = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcolorchooser-23.04.3.tar.xz"; - sha256 = "1ripvn2li74rwngicay9c78j0slia1rpsi1f43rbb36p9af02lwq"; - name = "kcolorchooser-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kcolorchooser-23.08.1.tar.xz"; + sha256 = "1xxlb8s704862sckndv1wb0sbkqqcnc0absl0rm4ncvfjdybg6mr"; + name = "kcolorchooser-23.08.1.tar.xz"; }; }; kcron = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kcron-23.04.3.tar.xz"; - sha256 = "107rx45d4gzkxiab8i87jk0qvyagwlrynq0k7098w5zfxg603vgg"; - name = "kcron-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kcron-23.08.1.tar.xz"; + sha256 = "1s2923vadml9h5pajw4ljlblmif9jnndrshf248lcl8yp66xbkan"; + name = "kcron-23.08.1.tar.xz"; }; }; kde-dev-scripts = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kde-dev-scripts-23.04.3.tar.xz"; - sha256 = "079wvyr7qjbxgywdzd9mydn7l4wq9jx20dv2j3iwq5cq9scwfgvm"; - name = "kde-dev-scripts-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kde-dev-scripts-23.08.1.tar.xz"; + sha256 = "1n64apxnqcgwmnfjic2f228pq7x239kklzvp3r6n0csdmcywi1pb"; + name = "kde-dev-scripts-23.08.1.tar.xz"; }; }; kde-dev-utils = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kde-dev-utils-23.04.3.tar.xz"; - sha256 = "0gadxs9qxqkla6rwirpyckfh718m8lslvwi4lc0xsn3nkjprj7kl"; - name = "kde-dev-utils-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kde-dev-utils-23.08.1.tar.xz"; + sha256 = "0akxzjaj4fz4x30vwygyspjnziski3fx0dyayqk72rw3kapz0zfx"; + name = "kde-dev-utils-23.08.1.tar.xz"; }; }; kde-inotify-survey = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kde-inotify-survey-23.04.3.tar.xz"; - sha256 = "1l9lvjwqrc05fz75d7whkkxk5hy1ra6n5mf8dj0p8k0xxnxhs178"; - name = "kde-inotify-survey-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kde-inotify-survey-23.08.1.tar.xz"; + sha256 = "1yr6jyvribwap8dsvzb3br2i7wplfqiikajrl5c3vs3r1h8gzcwv"; + name = "kde-inotify-survey-23.08.1.tar.xz"; }; }; kdebugsettings = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdebugsettings-23.04.3.tar.xz"; - sha256 = "02igg8ry1cxa83pdj6pgwzw7hpjwfrfk57d9ybgfvy2x08d5kvqz"; - name = "kdebugsettings-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdebugsettings-23.08.1.tar.xz"; + sha256 = "1maby2ir488ca110ml6mb5qakn5p22k9xv0yqfi9xkazx4fz4nr4"; + name = "kdebugsettings-23.08.1.tar.xz"; }; }; kdeconnect-kde = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdeconnect-kde-23.04.3.tar.xz"; - sha256 = "1gcmqqj752h3lmcpvc7cm6k6bpb158ha7i5ysp0kqvf8cmpi5ydz"; - name = "kdeconnect-kde-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdeconnect-kde-23.08.1.tar.xz"; + sha256 = "1hcfg6jj8y0d9f3a8707h5pmv2ir9dbi9sfh2mwsxbhcdzqbfnnk"; + name = "kdeconnect-kde-23.08.1.tar.xz"; }; }; kdeedu-data = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdeedu-data-23.04.3.tar.xz"; - sha256 = "0qki2anbhwrmfcyin0n2hx2xmax3ybks59g4lcxbganyk3k64yfc"; - name = "kdeedu-data-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdeedu-data-23.08.1.tar.xz"; + sha256 = "0iav1jarz361ij4zczizqcpy3mmahacxqjymd039lk2czdm4i7h5"; + name = "kdeedu-data-23.08.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdegraphics-mobipocket-23.04.3.tar.xz"; - sha256 = "13hn6dh5d4vsblvg6wyyvbmcyl0yyqr8srilik86wilp58qbsrdv"; - name = "kdegraphics-mobipocket-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdegraphics-mobipocket-23.08.1.tar.xz"; + sha256 = "0f5nwhzy5xv41vvbvnnpc71spqffwgp3x0wlw5jqwd9qhzd5ghz4"; + name = "kdegraphics-mobipocket-23.08.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdegraphics-thumbnailers-23.04.3.tar.xz"; - sha256 = "16z6sf8v9874ng5b6b6wzvnlqncp7xz2fqpc93vs7sby8rwsdpy0"; - name = "kdegraphics-thumbnailers-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdegraphics-thumbnailers-23.08.1.tar.xz"; + sha256 = "02aa24xfykwqfmlmrwkck6f8b5qnb2871jq6jqfis87j7q2nhw7r"; + name = "kdegraphics-thumbnailers-23.08.1.tar.xz"; }; }; kdenetwork-filesharing = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdenetwork-filesharing-23.04.3.tar.xz"; - sha256 = "19izy4bjz5xzibabhf0dvijag7ig7vf3pz1c2dphspsbqkgpjanb"; - name = "kdenetwork-filesharing-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdenetwork-filesharing-23.08.1.tar.xz"; + sha256 = "15ncyna3l9011pr9kfi180310d6nnlz1c2xzwax7gxl9gsvsnj5k"; + name = "kdenetwork-filesharing-23.08.1.tar.xz"; }; }; kdenlive = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdenlive-23.04.3.tar.xz"; - sha256 = "0jy95mbsifcv5kg80dw6nn86qcs5vy1652w4ig2wd2f7q864wfri"; - name = "kdenlive-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdenlive-23.08.1.tar.xz"; + sha256 = "1chf765ygc23408whs2hr1q15g7261n4gr7d9gm2hz6wrj31gmjb"; + name = "kdenlive-23.08.1.tar.xz"; }; }; kdepim-addons = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdepim-addons-23.04.3.tar.xz"; - sha256 = "1nai47wccf1shrgvywslqdkxk066zdkpb1grf3qzh8q77za2kmqz"; - name = "kdepim-addons-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdepim-addons-23.08.1.tar.xz"; + sha256 = "1bivfjyr7lhhslbzpvbv6ydsp7fld5m0dvrhxhrdx3pkhiph6gx9"; + name = "kdepim-addons-23.08.1.tar.xz"; }; }; kdepim-runtime = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdepim-runtime-23.04.3.tar.xz"; - sha256 = "1wvwibq6zzjlhh8yqrlqras0m8i01ynlwj9z6l3f0g0hyyz5nkw4"; - name = "kdepim-runtime-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdepim-runtime-23.08.1.tar.xz"; + sha256 = "1nacmyvr6ji66z1a4mr5r7bz3m4plqbrga8xznmk94hmd6s8a7lb"; + name = "kdepim-runtime-23.08.1.tar.xz"; }; }; kdesdk-kio = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdesdk-kio-23.04.3.tar.xz"; - sha256 = "0sxdjpwxwbbinmpz0pq2icm2h9cv9k0yzha0szf1ighfc7kyqwbs"; - name = "kdesdk-kio-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdesdk-kio-23.08.1.tar.xz"; + sha256 = "0hm0p6caw8igj66i8ykb3dkj3bv0dgz8pvfysr4djki0klp2izlc"; + name = "kdesdk-kio-23.08.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdesdk-thumbnailers-23.04.3.tar.xz"; - sha256 = "04fw6lrilccvi71y70zz0nag41gdpfp49556c6vx3nv3ndm28wfa"; - name = "kdesdk-thumbnailers-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdesdk-thumbnailers-23.08.1.tar.xz"; + sha256 = "1pw1cfdw5dnhiqn4br1m2f6k13qc9gxi5si5n9shr4gqd9lxjrap"; + name = "kdesdk-thumbnailers-23.08.1.tar.xz"; }; }; kdev-php = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdev-php-23.04.3.tar.xz"; - sha256 = "1nrdf5iyhcfy77fynaq65y06z3n3z7v2qzd9zp74ngb4j3x3ks1p"; - name = "kdev-php-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdev-php-23.08.1.tar.xz"; + sha256 = "19rjnhp62c06gyymdzmv8145p5q0x156x7pzw5yx65qkb40kzy8f"; + name = "kdev-php-23.08.1.tar.xz"; }; }; kdev-python = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdev-python-23.04.3.tar.xz"; - sha256 = "1i1rba7405gfzywh7in915s27b6gn2f8m76kc6ra63dvh75qpyyi"; - name = "kdev-python-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdev-python-23.08.1.tar.xz"; + sha256 = "1pj5igbpqk04ch12kbgq2f7rab3b8gcam9rikiq7vmm1hs6brlx4"; + name = "kdev-python-23.08.1.tar.xz"; }; }; kdevelop = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdevelop-23.04.3.tar.xz"; - sha256 = "0m1q5nhx7wd4b8850ikw7dk6zka57gapf78wawjv2h1hijxcyf4v"; - name = "kdevelop-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdevelop-23.08.1.tar.xz"; + sha256 = "09v2c61wkiz0916sfvlcbnpckffr710y2s6l6i06v2yz2blxbnrf"; + name = "kdevelop-23.08.1.tar.xz"; }; }; kdf = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdf-23.04.3.tar.xz"; - sha256 = "11ndcbfkq5fhb1lfij0mmm43fw49sh0z3nw644sll0smcwic76aa"; - name = "kdf-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdf-23.08.1.tar.xz"; + sha256 = "0yckh6nbv3bn050fyalw87s9h4h9af34iar3xpcayxvvqd9zvjvw"; + name = "kdf-23.08.1.tar.xz"; }; }; kdialog = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdialog-23.04.3.tar.xz"; - sha256 = "042az7d9ngar6xp7gv3xcmlns9hpbvs39dkymanqgc0riwa1mvsx"; - name = "kdialog-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdialog-23.08.1.tar.xz"; + sha256 = "1xwfiihbgj3289vigrrbilmjz9z8ry774lpydii00xr1lf6ycs3f"; + name = "kdialog-23.08.1.tar.xz"; }; }; kdiamond = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kdiamond-23.04.3.tar.xz"; - sha256 = "038lpp387m45zcy49rgmisiz5ajrvxwxnf424wllrjkihxy1siyn"; - name = "kdiamond-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kdiamond-23.08.1.tar.xz"; + sha256 = "0znr6g4xcq0wzphym6a31x96xqnd1pv12raa56l0yf1w1s2mk1r9"; + name = "kdiamond-23.08.1.tar.xz"; }; }; keditbookmarks = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/keditbookmarks-23.04.3.tar.xz"; - sha256 = "08cgyfbnszr5l3xg8a15rml3n8ldszdzm9xqnmjpifrzj5qbw9va"; - name = "keditbookmarks-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/keditbookmarks-23.08.1.tar.xz"; + sha256 = "0r52ggpmhk0vl63lhgr8gfgkq6agaczlddrk0a25d88nb18dj9cd"; + name = "keditbookmarks-23.08.1.tar.xz"; }; }; keysmith = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/keysmith-23.04.3.tar.xz"; - sha256 = "1rfp516adliyc57nx4ha1rp8v2z340ygsvblh5sqmsdsg2ivjklj"; - name = "keysmith-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/keysmith-23.08.1.tar.xz"; + sha256 = "04scdlwr01khrz8ncmdn07ijv0p0w7x37gair0f571s9pvvdzhsj"; + name = "keysmith-23.08.1.tar.xz"; }; }; kfind = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kfind-23.04.3.tar.xz"; - sha256 = "03g9cn0wp3f2n9zwzbc5sbcria4hcp2ls77fbxyj3wkady3m50if"; - name = "kfind-23.04.3.tar.xz"; - }; - }; - kfloppy = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kfloppy-23.04.3.tar.xz"; - sha256 = "1q33bjvp376amgryjwday3qqkx41q5p7vyqkbwpgb2x97gk7q94x"; - name = "kfloppy-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kfind-23.08.1.tar.xz"; + sha256 = "0v4javkfrn3dfspidl9bwqqydqc714w4jcg56k7sv3x7jxc0rl2m"; + name = "kfind-23.08.1.tar.xz"; }; }; kfourinline = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kfourinline-23.04.3.tar.xz"; - sha256 = "0chfjp0k4ps5f6vy8nxqc2xlj4xql08llxnzsz6c2x611n69aszm"; - name = "kfourinline-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kfourinline-23.08.1.tar.xz"; + sha256 = "17a3z0pkd342j6zlr73dga7vpk09bdsvy4g1vwl250q44ka6y2rd"; + name = "kfourinline-23.08.1.tar.xz"; }; }; kgeography = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kgeography-23.04.3.tar.xz"; - sha256 = "16vvfz7rw2d5zslifrk4s6vvm5502rcjjg60z67nplfckx1vi4a5"; - name = "kgeography-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kgeography-23.08.1.tar.xz"; + sha256 = "10ixnd8x6zj1g37k00m6v2bjnjmk81zyws1a7xl8pilvlag6vwws"; + name = "kgeography-23.08.1.tar.xz"; }; }; kget = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kget-23.04.3.tar.xz"; - sha256 = "1n9wnm1si4g4rv8zaqpr8m3c2aav0mj8i7z96m78dk1apippx77r"; - name = "kget-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kget-23.08.1.tar.xz"; + sha256 = "1xd75b46awjcq1px97wbvrk3cfczi4l2ib4bld21r1wvvspd57j9"; + name = "kget-23.08.1.tar.xz"; }; }; kgoldrunner = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kgoldrunner-23.04.3.tar.xz"; - sha256 = "0acavby9lwbqbx577a3az9lcahchngcs15571va2ndnq1r16paxf"; - name = "kgoldrunner-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kgoldrunner-23.08.1.tar.xz"; + sha256 = "1zv0qqri9jmmkm0aq5g19q2rbaqr49m0c1syva3dm9hn43zqhsh5"; + name = "kgoldrunner-23.08.1.tar.xz"; }; }; kgpg = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kgpg-23.04.3.tar.xz"; - sha256 = "1ihxw1s4sq7cp5pm6rddcmvqk0v5gfg4v38b6yg8hyjg655x63jz"; - name = "kgpg-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kgpg-23.08.1.tar.xz"; + sha256 = "1qg104bz8mkdk586z52izlj6ic74l0rygmh251wwlwaqliaxhbad"; + name = "kgpg-23.08.1.tar.xz"; }; }; khangman = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/khangman-23.04.3.tar.xz"; - sha256 = "1rzl6kfb7457w4s0wgkk07s0vr8nngivhpfr6q0m4261qf7b17zw"; - name = "khangman-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/khangman-23.08.1.tar.xz"; + sha256 = "12yj5322z88dr33kh07dhgi3acnj5n89xwxw0b8ypaa4hihdwdvq"; + name = "khangman-23.08.1.tar.xz"; }; }; khelpcenter = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/khelpcenter-23.04.3.tar.xz"; - sha256 = "10rivj5c14v5hwk87z41gwk830sy35fz0jg1jpay43jzw0ss995y"; - name = "khelpcenter-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/khelpcenter-23.08.1.tar.xz"; + sha256 = "04s8wbwdn32s2wnfsflrxx2accwff75nsskm1lfrdh1amirf8jn9"; + name = "khelpcenter-23.08.1.tar.xz"; }; }; kidentitymanagement = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kidentitymanagement-23.04.3.tar.xz"; - sha256 = "03bfz0x35wiynla39iysxa5g3rckmy9nj2z1f439v9sblcqbvz3p"; - name = "kidentitymanagement-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kidentitymanagement-23.08.1.tar.xz"; + sha256 = "116wy5a63i1mlycvs3lmnc3ymqd4x6a1g7m1ihn82avspigpgx5w"; + name = "kidentitymanagement-23.08.1.tar.xz"; }; }; kig = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kig-23.04.3.tar.xz"; - sha256 = "18ml5ca8mmqb1a0j18pf9ajpj20rs5i0knvz4rssjfzibf9v6cbs"; - name = "kig-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kig-23.08.1.tar.xz"; + sha256 = "04znz479ywf0r8pg6qpcxsvr70gy0j1inxkhgvywbi8jvv8wmczg"; + name = "kig-23.08.1.tar.xz"; }; }; kigo = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kigo-23.04.3.tar.xz"; - sha256 = "0qx9plrs588210rdgvb2bkm5yjw4pna9q7v38cb166nfgkh6gv63"; - name = "kigo-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kigo-23.08.1.tar.xz"; + sha256 = "0si0gwmkcl42wa349516wsr7ijw9cvqgam6q3a4bxkss1zkvsidw"; + name = "kigo-23.08.1.tar.xz"; }; }; killbots = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/killbots-23.04.3.tar.xz"; - sha256 = "0ygg2cmp7wqzw9nsn768vzgjs8i44k3skwcn2abg1jj5k64wp9cb"; - name = "killbots-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/killbots-23.08.1.tar.xz"; + sha256 = "1nbl1jcl0ssxpfgkw57kxqk3rfilynjsxp86m51v55l2fixpvnjy"; + name = "killbots-23.08.1.tar.xz"; }; }; kimagemapeditor = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kimagemapeditor-23.04.3.tar.xz"; - sha256 = "05c30x7gihljw9vxpq2ag68bfyikh5gj17xbckkkg6l01qk6lqdc"; - name = "kimagemapeditor-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kimagemapeditor-23.08.1.tar.xz"; + sha256 = "1x2jz0vnpb1mlv7j39rvr7pcs6hpqz269jgvj932v9igk12g5g41"; + name = "kimagemapeditor-23.08.1.tar.xz"; }; }; kimap = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kimap-23.04.3.tar.xz"; - sha256 = "08s2891f2cnf5f7q034lmqv3vnh3v61l7bsyssdx711jfbswg9ik"; - name = "kimap-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kimap-23.08.1.tar.xz"; + sha256 = "1ldrh47c1cvwmgh2a67xpryvhyawxmp7ff85b3l0821rrzbiiink"; + name = "kimap-23.08.1.tar.xz"; }; }; kio-admin = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kio-admin-23.04.3.tar.xz"; - sha256 = "1vpl0bmgf23zvigbmxvmmpl01p99n81g4640qdjfx2f9854qqzz0"; - name = "kio-admin-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kio-admin-23.08.1.tar.xz"; + sha256 = "1ccvigavnpppiilgg4dq146nf2p3alq6qk7k2wz4p5cb4scv0apm"; + name = "kio-admin-23.08.1.tar.xz"; }; }; kio-extras = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kio-extras-23.04.3.tar.xz"; - sha256 = "1ygxfq62idpgf1dlic1245y5gf0fnkrpbqxd230xmxi7a35za8qd"; - name = "kio-extras-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kio-extras-23.08.1.tar.xz"; + sha256 = "1nb1rlwfghkcvmaa4ba4maas29s2zkff5ym0ifc3cdyaajgmanqw"; + name = "kio-extras-23.08.1.tar.xz"; }; }; kio-gdrive = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kio-gdrive-23.04.3.tar.xz"; - sha256 = "0s7kz25z46gh1rv85i2ndbgv8nhbjlwc7ypd8fsd4lqgf025h0ns"; - name = "kio-gdrive-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kio-gdrive-23.08.1.tar.xz"; + sha256 = "1i28psm3bk1f5cjkfd7d2s6s0gmy35vf9c2y3h2g075jb7c0kxdz"; + name = "kio-gdrive-23.08.1.tar.xz"; }; }; kio-zeroconf = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kio-zeroconf-23.04.3.tar.xz"; - sha256 = "0b7p5ivfcggs63y5hmyy5fwjxs63ghhkrs603h7hmj24apfwk15a"; - name = "kio-zeroconf-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kio-zeroconf-23.08.1.tar.xz"; + sha256 = "10vizxkcjbsglan4mm4464gk463v53xzjxkrdf9a64f8qh4qfcbs"; + name = "kio-zeroconf-23.08.1.tar.xz"; }; }; kipi-plugins = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kipi-plugins-23.04.3.tar.xz"; - sha256 = "12785nyni2jj6phyr7xwnspr179pkaq17pzs985azxjm4wsjn5bz"; - name = "kipi-plugins-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kipi-plugins-23.08.1.tar.xz"; + sha256 = "0ngl4jx5da7c64qw7nqr8k7h55jgs67lj4v0n5yvmi1cx25kysi2"; + name = "kipi-plugins-23.08.1.tar.xz"; }; }; kirigami-gallery = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kirigami-gallery-23.04.3.tar.xz"; - sha256 = "0j719ggd1kd9qwqsc5wd256l8yiqivq1ifkfsisc14llawb7m0h2"; - name = "kirigami-gallery-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kirigami-gallery-23.08.1.tar.xz"; + sha256 = "1lvkc7z8vsmjs3d019a4dapx5hiaj3k1zrrvx47lxr249rgwj601"; + name = "kirigami-gallery-23.08.1.tar.xz"; }; }; kiriki = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kiriki-23.04.3.tar.xz"; - sha256 = "13lzpbhkp48r9m0bcrzfqacz9xvc89xavf3yn3ql50g3jjlkq41v"; - name = "kiriki-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kiriki-23.08.1.tar.xz"; + sha256 = "0gw2ybispmpjmralhrml62xpvfq7pyhfljqqr9az4y7kfb84jaka"; + name = "kiriki-23.08.1.tar.xz"; }; }; kiten = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kiten-23.04.3.tar.xz"; - sha256 = "0l3cgcamkrfyjdqy4x38lc18p1acn97xyhm01q91pbr644gyiy25"; - name = "kiten-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kiten-23.08.1.tar.xz"; + sha256 = "0n0cc5f1pkdqgy6iwp5nwrzklg197k2vy5nxmnkirbz69syaic9y"; + name = "kiten-23.08.1.tar.xz"; }; }; kitinerary = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kitinerary-23.04.3.tar.xz"; - sha256 = "0fcqix7hgmv7qcfxzmqy61kg7dqi5zas5vqfs7pfycgcxma0g869"; - name = "kitinerary-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kitinerary-23.08.1.tar.xz"; + sha256 = "1wy7b13rnycaz8s33cq9wydi9z0zq7hgcy7lylyyxr4sv5frhhi8"; + name = "kitinerary-23.08.1.tar.xz"; }; }; kjournald = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kjournald-23.04.3.tar.xz"; - sha256 = "0mnfn3b8792hajfwfxm701n67knvvz46kvr6pm1jwwz5l6hbwncq"; - name = "kjournald-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kjournald-23.08.1.tar.xz"; + sha256 = "0ysvv0wpb24xj5ir5d87w17aan7v86rf90pf8y5773wciq4hfa4l"; + name = "kjournald-23.08.1.tar.xz"; }; }; kjumpingcube = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kjumpingcube-23.04.3.tar.xz"; - sha256 = "09bh57vzjnn56dnhpp4szx72wyskc5g714vlyp6c27vr27xry8fi"; - name = "kjumpingcube-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kjumpingcube-23.08.1.tar.xz"; + sha256 = "0pbgdkwn3njiln5l11s4213mn556qylnbdhcjiv3f3z3y3x7846c"; + name = "kjumpingcube-23.08.1.tar.xz"; }; }; kldap = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kldap-23.04.3.tar.xz"; - sha256 = "0hp5j02kwh91xf0n6zqzgam7g50r54hzbkli5i7c0rxdb1g28ihm"; - name = "kldap-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kldap-23.08.1.tar.xz"; + sha256 = "0g3y21nbg173hirby99ml5qgzfci81zkh8qnnfy5jjp0h0sw1br8"; + name = "kldap-23.08.1.tar.xz"; }; }; kleopatra = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kleopatra-23.04.3.tar.xz"; - sha256 = "0lcl20yihsa8dq0s24akp5z0290vh9nxjjjdwqk88nz8vmsr29i0"; - name = "kleopatra-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kleopatra-23.08.1.tar.xz"; + sha256 = "1xw34mcdyagbms3lijgh4b4hy4n4y34i8w8d6xhbc4w76gxqclya"; + name = "kleopatra-23.08.1.tar.xz"; }; }; klettres = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/klettres-23.04.3.tar.xz"; - sha256 = "09vklxcj7hhbb1m9b5gpd73qcxnkvh94v49cn84d9hdnm7gbsb23"; - name = "klettres-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/klettres-23.08.1.tar.xz"; + sha256 = "1k2w2f1009y0anqxi655mljx7k55rmzhrbr2506sgajsi4rdlnvk"; + name = "klettres-23.08.1.tar.xz"; }; }; klickety = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/klickety-23.04.3.tar.xz"; - sha256 = "0ngbjn3dlw4257p2gzlhm8rlljqgzjmb160wiw6j4yz1mxd75fr2"; - name = "klickety-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/klickety-23.08.1.tar.xz"; + sha256 = "18zy9n4qbhzwm803x44c4qhhpc9dn0pjw83vs9ac4hp78jwr01yz"; + name = "klickety-23.08.1.tar.xz"; }; }; klines = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/klines-23.04.3.tar.xz"; - sha256 = "1dny7wsj90c3vbgbrpxvxfy44j9ip3vdylc7889ckzbliivipxk4"; - name = "klines-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/klines-23.08.1.tar.xz"; + sha256 = "1lpkc8n8sapj1iv2fb5s4irmz1n7myk3la66ndmvp6029qq9a3b0"; + name = "klines-23.08.1.tar.xz"; }; }; kmag = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmag-23.04.3.tar.xz"; - sha256 = "13ar37yv3gk5451cdqrgbm91jm50qw4559sx25fv95g2i9wa7z74"; - name = "kmag-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kmag-23.08.1.tar.xz"; + sha256 = "0hav7ndrdy4dyjx4qinpa21mzzrd82bkvl2v7mr2qmziqyarg7zs"; + name = "kmag-23.08.1.tar.xz"; }; }; kmahjongg = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmahjongg-23.04.3.tar.xz"; - sha256 = "1q2aq8y3c4a84rjvqk4gz6mlyflfnzw6im68p96wmcn98s5gsc22"; - name = "kmahjongg-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kmahjongg-23.08.1.tar.xz"; + sha256 = "1qs69map1mb3gv8chnpsk83h50hdiqq0x7iscvdx1zv184507i8h"; + name = "kmahjongg-23.08.1.tar.xz"; }; }; kmail = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmail-23.04.3.tar.xz"; - sha256 = "16gz0i7na1pkyly9jnvavyffkawxf5irr92rd50w68p01b82dhc6"; - name = "kmail-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kmail-23.08.1.tar.xz"; + sha256 = "12ml9wq7rg85mk482d74llr72lqxrq6yapwk77ha6sih9382akra"; + name = "kmail-23.08.1.tar.xz"; }; }; kmail-account-wizard = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmail-account-wizard-23.04.3.tar.xz"; - sha256 = "1840zjgrqwk2zgqbb33gl9nvigsrmk5grzvzg5cw116h7lb7z7xx"; - name = "kmail-account-wizard-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kmail-account-wizard-23.08.1.tar.xz"; + sha256 = "1474lx2lpbagms4ynr9m5lihk22pzikz6dw57qm8m8gkask46v10"; + name = "kmail-account-wizard-23.08.1.tar.xz"; }; }; kmailtransport = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmailtransport-23.04.3.tar.xz"; - sha256 = "14vmm9vla8i477jq40z73lc4klx6mm03y2xnljvx1v4inm3cpw2c"; - name = "kmailtransport-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kmailtransport-23.08.1.tar.xz"; + sha256 = "1a9qsjw9i8q5vcdq3yywllm8680cpgmqygfcbacgvldzb9vkmc50"; + name = "kmailtransport-23.08.1.tar.xz"; }; }; kmbox = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmbox-23.04.3.tar.xz"; - sha256 = "05hdfjwp6ay2j16rxp55k3fywwf7kxiig4dv9fh51iysglmzzn76"; - name = "kmbox-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kmbox-23.08.1.tar.xz"; + sha256 = "1hvwckqw0vhclrc0av7c2677hi6j3x6ll0y33cwdxx65khdb4bk5"; + name = "kmbox-23.08.1.tar.xz"; }; }; kmime = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmime-23.04.3.tar.xz"; - sha256 = "1i38g0s98d24882kxyjay965nz3d3fjhb3mv1p4sllm2lnffrq2d"; - name = "kmime-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kmime-23.08.1.tar.xz"; + sha256 = "0zxvvkkd452xk7pbmz40phh25azw8v68irnbdk4dc3xxwcks7p56"; + name = "kmime-23.08.1.tar.xz"; }; }; kmines = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmines-23.04.3.tar.xz"; - sha256 = "0x301dsppn0sav31ds5hpbfkbbisjg640ri13103s1jn0y2b90b9"; - name = "kmines-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kmines-23.08.1.tar.xz"; + sha256 = "1xbyfapwjghh4s7p2p26aqzgbaqp837zfggmzff7by5bhpaarw98"; + name = "kmines-23.08.1.tar.xz"; }; }; kmix = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmix-23.04.3.tar.xz"; - sha256 = "09pfsa6y1phm6z24da60s47gc18w4cvv7r8sxh5qfww7b0dnhixj"; - name = "kmix-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kmix-23.08.1.tar.xz"; + sha256 = "0fkhq7j1807kcs9wzqapichp1p1wrxbmaxv1khxmn4gqkrnc4092"; + name = "kmix-23.08.1.tar.xz"; }; }; kmousetool = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmousetool-23.04.3.tar.xz"; - sha256 = "1prh9xdzwx0mx93g9cbjy55hxwcci90hvrv2ckj4dqdnv5fv4h21"; - name = "kmousetool-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kmousetool-23.08.1.tar.xz"; + sha256 = "1lycnk5243plmwbhcz0by355zmvv90yki26vvif0g47s8c53d64p"; + name = "kmousetool-23.08.1.tar.xz"; }; }; kmouth = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmouth-23.04.3.tar.xz"; - sha256 = "0qyzq4cvcsacb7hr6n79i3rzyjr0m3c8lrf8fwbzdivswpk8wss3"; - name = "kmouth-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kmouth-23.08.1.tar.xz"; + sha256 = "13l8vcff6d161y3inacn5inh0v9nbd6q19symrnpxp7q0s73q2zd"; + name = "kmouth-23.08.1.tar.xz"; }; }; kmplot = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kmplot-23.04.3.tar.xz"; - sha256 = "1wln4agx0mkbs82nynb5m63z798s3rlyymf9llcvrhqqpvi9416b"; - name = "kmplot-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kmplot-23.08.1.tar.xz"; + sha256 = "140msfsacr4d0vs04m7wb14ykamgnm6g0dmkyizd7bqd4ljfv32q"; + name = "kmplot-23.08.1.tar.xz"; }; }; knavalbattle = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/knavalbattle-23.04.3.tar.xz"; - sha256 = "1brj2dvymgpf74vbsrs2m81lxxfxsly9pafd13g8rkzdx3hn1n0q"; - name = "knavalbattle-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/knavalbattle-23.08.1.tar.xz"; + sha256 = "0my2bj39r4chdnbh6m9i8m8yk5cnjy5grcscj88rim224df6c1sc"; + name = "knavalbattle-23.08.1.tar.xz"; }; }; knetwalk = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/knetwalk-23.04.3.tar.xz"; - sha256 = "1xqqwsbm3f8bmid7afbnacxlg1hih644f0nw0i87pr746m1sskgz"; - name = "knetwalk-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/knetwalk-23.08.1.tar.xz"; + sha256 = "0j3qph7i9adv1dw548nai613lkra80a7g4x6i7wwvf2l8gy494lw"; + name = "knetwalk-23.08.1.tar.xz"; }; }; knights = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/knights-23.04.3.tar.xz"; - sha256 = "09vc765fb01vqcxyg1qqik8z76r9mmb02axy9a5wmjdf1k4y9cia"; - name = "knights-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/knights-23.08.1.tar.xz"; + sha256 = "1v3jwi6frn3x7kdgaljyvgai1v8py60hx6vr6dhgij4wxj7fiflh"; + name = "knights-23.08.1.tar.xz"; }; }; knotes = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/knotes-23.04.3.tar.xz"; - sha256 = "0f2a9xy2w909y792hwwnmsqvxx91azn6f0j0xl2mlmav00a4w6za"; - name = "knotes-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/knotes-23.08.1.tar.xz"; + sha256 = "0lxijxc0r6cri43pqgypsazzkm1mdljx8kic7x6ih046njazd3zw"; + name = "knotes-23.08.1.tar.xz"; }; }; koko = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/koko-23.04.3.tar.xz"; - sha256 = "1n76fpj955rqg98z46plhv2lwlvwskvgwqws0fslmn9vxfnzv989"; - name = "koko-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/koko-23.08.1.tar.xz"; + sha256 = "1q627hdmqcsl0580l2yp43fwlyjqyfmwgzr1srhsp2pvdnv5spg7"; + name = "koko-23.08.1.tar.xz"; }; }; kolf = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kolf-23.04.3.tar.xz"; - sha256 = "0wbdpclc6nimjzs2pqbzaxnqn516hci1yk1dgig0jgdy1jv2nyhv"; - name = "kolf-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kolf-23.08.1.tar.xz"; + sha256 = "1qbj4ld1rx1riwfy7b3yp7p8m1iljyxcng2y659daafi3izxmlxp"; + name = "kolf-23.08.1.tar.xz"; }; }; kollision = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kollision-23.04.3.tar.xz"; - sha256 = "0g9nz3df8nibcwlrjlyw306dnrx58nlga2lljn7a9acpmvbp6qgi"; - name = "kollision-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kollision-23.08.1.tar.xz"; + sha256 = "1nk15nfvc07a3yf5ynmwbzqvkkmjswz4bqp13mmz9gy4bn5fsmjf"; + name = "kollision-23.08.1.tar.xz"; }; }; kolourpaint = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kolourpaint-23.04.3.tar.xz"; - sha256 = "1ab9v6ksb185f6jfhhk578qazhmy8hx6s8vjr9xyh7k3jilayj9v"; - name = "kolourpaint-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kolourpaint-23.08.1.tar.xz"; + sha256 = "086dnbhd05ydxxp0kpll8yw19kagkjdp7r2i73sx8k57amzg5f48"; + name = "kolourpaint-23.08.1.tar.xz"; }; }; kompare = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kompare-23.04.3.tar.xz"; - sha256 = "058rr0n5r9czxqs6ixacx0bm8hglwjmhfpf5xf1zr0fjgcirlrwy"; - name = "kompare-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kompare-23.08.1.tar.xz"; + sha256 = "1nccs2b6n7iqf2n4gr7d0aa11qhm4m6r8946b2b2qzh1zgyw6n0l"; + name = "kompare-23.08.1.tar.xz"; }; }; kongress = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kongress-23.04.3.tar.xz"; - sha256 = "1yns427iivbn7s3lw11jpf9qgsv6wdbc827apdsg5lp35n8dvr0p"; - name = "kongress-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kongress-23.08.1.tar.xz"; + sha256 = "0ln8qk9lsa0mickj8qvvhxlkg73cpqzhvc0fsj5jmgkqwqlyakg2"; + name = "kongress-23.08.1.tar.xz"; }; }; konqueror = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/konqueror-23.04.3.tar.xz"; - sha256 = "0qynyslgjqa0yqcfsq7957i7a2rbqc0fbr5vcycmib9593wi9ip0"; - name = "konqueror-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/konqueror-23.08.1.tar.xz"; + sha256 = "0vbhy24jyjzbx19cbd015bnyiiica6vbkjks6j0qchn03hihlaff"; + name = "konqueror-23.08.1.tar.xz"; }; }; konquest = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/konquest-23.04.3.tar.xz"; - sha256 = "0svzaibs8v1xd36ysj3wk7sxma26fl5pz6yp774jg0g9zi9rlkff"; - name = "konquest-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/konquest-23.08.1.tar.xz"; + sha256 = "06n889qmc2igyf5zzb14f2q7c54ndwnj52b6jhdl6vlwjishl5mv"; + name = "konquest-23.08.1.tar.xz"; }; }; konsole = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/konsole-23.04.3.tar.xz"; - sha256 = "1k68y1i3g3bsz1dz81jhkx1q2fb13rbm5ywh632bcyln0c6l0vz0"; - name = "konsole-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/konsole-23.08.1.tar.xz"; + sha256 = "0k0zrbzpvn0vi8mrjdzdpnjwq6zhrbk1hd26g2hkn92hw5i1ra0y"; + name = "konsole-23.08.1.tar.xz"; }; }; kontact = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kontact-23.04.3.tar.xz"; - sha256 = "05kfdz0pfyfq28cvxjc05v2j89n4yj2hik1qx1qp99ydb0hbk69y"; - name = "kontact-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kontact-23.08.1.tar.xz"; + sha256 = "05khswfrdx0ivs87df670qm4lr2psn8vcdddxq74dldn6gwrb5sl"; + name = "kontact-23.08.1.tar.xz"; }; }; kontactinterface = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kontactinterface-23.04.3.tar.xz"; - sha256 = "16fg24hz9vx912cffc94x5zx4jv3k72mbxgp5ck50lydypx6rfns"; - name = "kontactinterface-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kontactinterface-23.08.1.tar.xz"; + sha256 = "0wisa3kwv43gwp4l5pmk7jlmb14rvzngkb5az0ywjdsam1b3lzr2"; + name = "kontactinterface-23.08.1.tar.xz"; }; }; kontrast = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kontrast-23.04.3.tar.xz"; - sha256 = "08qwvc2b5bj3012lvwxainbw7d34mkbwwznj3661ydsnfjyxxs92"; - name = "kontrast-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kontrast-23.08.1.tar.xz"; + sha256 = "1v2j9p3j2djwdl9k7ka0gvgbf15x3w0ks7inr748vr38n2n4zn9i"; + name = "kontrast-23.08.1.tar.xz"; }; }; konversation = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/konversation-23.04.3.tar.xz"; - sha256 = "1ip0jlz71fad5l0ppbc6w914hqk7h626s12ssbb9p1c2yvlr1j1v"; - name = "konversation-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/konversation-23.08.1.tar.xz"; + sha256 = "0nhxgzlj7ankk66m9hrpcgrs1pvvfd00ashhinz8ps91hyv5xnrh"; + name = "konversation-23.08.1.tar.xz"; }; }; kopeninghours = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kopeninghours-23.04.3.tar.xz"; - sha256 = "14m4wl79b4qad42l1capz59pslfcrm25jshyhmcqzhqb0wzwkav9"; - name = "kopeninghours-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kopeninghours-23.08.1.tar.xz"; + sha256 = "0dl40y57ghgc0rq97d00fhasnmmpcijxmb3icl4vmi6j6r8v1x92"; + name = "kopeninghours-23.08.1.tar.xz"; }; }; kopete = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kopete-23.04.3.tar.xz"; - sha256 = "1ps6g440p1dy2zwbj23f0mzw1d78r02aj88fy3i5sws9p9ra92gi"; - name = "kopete-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kopete-23.08.1.tar.xz"; + sha256 = "1awws8whbb5c0s0kic51f535q0790np6piqp6qin4c1dirmm6l66"; + name = "kopete-23.08.1.tar.xz"; }; }; korganizer = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/korganizer-23.04.3.tar.xz"; - sha256 = "1vp1jsmna059vvfj7xaj9fhhhq0lz9k0pphczkfbwm3gy6nzcavz"; - name = "korganizer-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/korganizer-23.08.1.tar.xz"; + sha256 = "0z6b0c5nbnncdn112qqlz6w28w7m4mlr1kaz803ipv4njjlx9ji5"; + name = "korganizer-23.08.1.tar.xz"; }; }; kosmindoormap = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kosmindoormap-23.04.3.tar.xz"; - sha256 = "1winrgc3698wjpil0hblw7bgbgaxgjh6h3dsl1kwc77w14f6vql3"; - name = "kosmindoormap-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kosmindoormap-23.08.1.tar.xz"; + sha256 = "1f9rcz761v4n0il8asmmr341r3kyz20h3vr8bhfywfrc1i3xhdid"; + name = "kosmindoormap-23.08.1.tar.xz"; }; }; kpat = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kpat-23.04.3.tar.xz"; - sha256 = "15c34vv0vdlsgrjy4i0v6ghk95c0x0h6jl0qn2bin9lgvvba3bkl"; - name = "kpat-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kpat-23.08.1.tar.xz"; + sha256 = "1whc2a35118659zgxfrl1275bablpyccm2c0zhp8hkblnp1nghmh"; + name = "kpat-23.08.1.tar.xz"; }; }; kpimtextedit = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kpimtextedit-23.04.3.tar.xz"; - sha256 = "1rrs19bwl8qvasridysbbgsgdy9hyjlpi26hw77hli5ixkflj85b"; - name = "kpimtextedit-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kpimtextedit-23.08.1.tar.xz"; + sha256 = "0bciybwkhynlmi36pk412n29za2wnqa7zq94kwbs23xzhaa535lk"; + name = "kpimtextedit-23.08.1.tar.xz"; }; }; kpkpass = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kpkpass-23.04.3.tar.xz"; - sha256 = "1l3k33yzfjzarc2rpf576ib86ifzrfmsvpcdmv060dy0k8lbm1k9"; - name = "kpkpass-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kpkpass-23.08.1.tar.xz"; + sha256 = "10bb70fza0q810l3fg05m9yp9blcbmsprja4kvwh7zrvkccvz4sv"; + name = "kpkpass-23.08.1.tar.xz"; }; }; kpmcore = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kpmcore-23.04.3.tar.xz"; - sha256 = "0cz0pz84sxa7lvkq8v25775z7x7g6pz9sq7c90pfv8h9qsz8q1l9"; - name = "kpmcore-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kpmcore-23.08.1.tar.xz"; + sha256 = "1nvmdl3lrd6spbm4b3dsxccp0sd3v9ah5gfsrfabxdmrnsj8sfcx"; + name = "kpmcore-23.08.1.tar.xz"; }; }; kpublictransport = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kpublictransport-23.04.3.tar.xz"; - sha256 = "04fa9ismgkhskpmjf6b8gvra2z0jpsigz79b93m1snxm4046xihb"; - name = "kpublictransport-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kpublictransport-23.08.1.tar.xz"; + sha256 = "1509q4hmp7cgxgnv785wb1hqvsrvfx19hi66d9n84k98i4n30l4q"; + name = "kpublictransport-23.08.1.tar.xz"; }; }; kqtquickcharts = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kqtquickcharts-23.04.3.tar.xz"; - sha256 = "12812djkanz0y4sxnpm3xmkjpjf4spvjsykaxby4cnsag3jpjr1v"; - name = "kqtquickcharts-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kqtquickcharts-23.08.1.tar.xz"; + sha256 = "0zc709c9vwn7cy1s22mhnzvfhhhd2pzsphsd6zxkyfb5sj6l9wn9"; + name = "kqtquickcharts-23.08.1.tar.xz"; }; }; krdc = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/krdc-23.04.3.tar.xz"; - sha256 = "0jva74n11fpm4ix4sbi0y1xnbly97lnap7dfj0bliw5s2d0sdjr0"; - name = "krdc-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/krdc-23.08.1.tar.xz"; + sha256 = "09920l7mjvv5h0y3syffb28i6kvdg6s6aizphrjxvbzbaxzr38wz"; + name = "krdc-23.08.1.tar.xz"; }; }; krecorder = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/krecorder-23.04.3.tar.xz"; - sha256 = "1dxz896jkammfigwg3nyz5mzm4npxxzgdnpqimi06swd76bjyd3k"; - name = "krecorder-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/krecorder-23.08.1.tar.xz"; + sha256 = "0pz76gl7fqad4llh5qsip9c5vmbskjdry16261jq0bxi36vz168a"; + name = "krecorder-23.08.1.tar.xz"; }; }; kreversi = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kreversi-23.04.3.tar.xz"; - sha256 = "1mb1xrywk5p7ipjml1g2mjqfs7rlpa41if3yc7p9zcrkcasnbffv"; - name = "kreversi-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kreversi-23.08.1.tar.xz"; + sha256 = "1lmk76pkjl133dgy54rv2x6pb6nbyi4fh8k9c3md600nlksx5ip3"; + name = "kreversi-23.08.1.tar.xz"; }; }; krfb = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/krfb-23.04.3.tar.xz"; - sha256 = "0qbrvf2wa3af1z1dpq3pqkngfbrfdgqfz8xs1qpdpyb7jxnphry7"; - name = "krfb-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/krfb-23.08.1.tar.xz"; + sha256 = "1k8fdjly2v04wvzr88fkkp6syx84qjh5apgdh9ky3ix4fgzr8630"; + name = "krfb-23.08.1.tar.xz"; }; }; kross-interpreters = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kross-interpreters-23.04.3.tar.xz"; - sha256 = "1cr78xz318dnqjrkfr4xbvbra6d5fssgj57vl8zybz15dyh6fbic"; - name = "kross-interpreters-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kross-interpreters-23.08.1.tar.xz"; + sha256 = "1nkxbajiwar3w8pnmlvrp6pd3w17h8swr7q0bs0vf84pcz4paikm"; + name = "kross-interpreters-23.08.1.tar.xz"; }; }; kruler = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kruler-23.04.3.tar.xz"; - sha256 = "079kmi66xms6a9x6p3csrvqia57ip9d8r9cjdgdqx6bnn0gfc0w3"; - name = "kruler-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kruler-23.08.1.tar.xz"; + sha256 = "12w9grnqbvha2mliaincxvsw1cm8s6kl7q966b5x7nh2vskl30k5"; + name = "kruler-23.08.1.tar.xz"; }; }; ksanecore = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksanecore-23.04.3.tar.xz"; - sha256 = "19dd54y9mkb8lmxwz8wvmnvgq9gky3md2la9fpanxwzq2bh4237i"; - name = "ksanecore-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ksanecore-23.08.1.tar.xz"; + sha256 = "1nxpwick1ya29rxq7as0dx8sdggbhnxbgy3sd6l9r9qdx8a3wkb4"; + name = "ksanecore-23.08.1.tar.xz"; }; }; kshisen = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kshisen-23.04.3.tar.xz"; - sha256 = "0bfk6nbwl35sfqxhf7cdv3n61ybi5962i2lvg7m1vlpp21q0diz8"; - name = "kshisen-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kshisen-23.08.1.tar.xz"; + sha256 = "1rskwd3n87h2ni85skicqgp1fn2ii059nidvxkvnwl75hs278ki5"; + name = "kshisen-23.08.1.tar.xz"; }; }; ksirk = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksirk-23.04.3.tar.xz"; - sha256 = "1sp5mhnf8r3fvifz0kw74436j5kwsmiw66myygb4rsggb8amh5x4"; - name = "ksirk-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ksirk-23.08.1.tar.xz"; + sha256 = "0i8ccbdhwm6498h1bh4j1cwik4cmgc5ls4850kbhp5kz5sxvcpid"; + name = "ksirk-23.08.1.tar.xz"; }; }; ksmtp = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksmtp-23.04.3.tar.xz"; - sha256 = "0pz17vmn38n2xl35d9di1b9138dh54wgyal9hx412nh123w13h12"; - name = "ksmtp-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ksmtp-23.08.1.tar.xz"; + sha256 = "0p43z4lq446r9gvp9ip2x7qd1r4c09m5rpm12s0xg526w7yzd1gc"; + name = "ksmtp-23.08.1.tar.xz"; }; }; ksnakeduel = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksnakeduel-23.04.3.tar.xz"; - sha256 = "182z9664p0shyx4rbr1cn32mzlfzl80x96nwakvv1ss7sf7dp1x3"; - name = "ksnakeduel-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ksnakeduel-23.08.1.tar.xz"; + sha256 = "1h9v8502k3bmgdljpjvyq13cgb2is3qa0nky0880dmym85dwc3wy"; + name = "ksnakeduel-23.08.1.tar.xz"; }; }; kspaceduel = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kspaceduel-23.04.3.tar.xz"; - sha256 = "1mpry73vvi332wxyw2wymh3lsrj2amblg50dym9ni1lj2af657ia"; - name = "kspaceduel-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kspaceduel-23.08.1.tar.xz"; + sha256 = "0zgpv834a5ywy7hpak9cn8k992v3ksna1ajpnkjhwm49ag4bagzr"; + name = "kspaceduel-23.08.1.tar.xz"; }; }; ksquares = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksquares-23.04.3.tar.xz"; - sha256 = "0b3r99hfhm5r4jxkwiji0lww703r7dj60x2m55ginvdy7ixm46rm"; - name = "ksquares-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ksquares-23.08.1.tar.xz"; + sha256 = "0dwa3yrfk4zkc6dhy2l1snaw0bnkjgzkil15s9qgw3dpl8bh289b"; + name = "ksquares-23.08.1.tar.xz"; }; }; ksudoku = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksudoku-23.04.3.tar.xz"; - sha256 = "03hrwyvwzhxdbq7pp03c7lkz0dhv9yi6lcwvz3s63mn01wyq6iv3"; - name = "ksudoku-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ksudoku-23.08.1.tar.xz"; + sha256 = "1lxp1xdl5k92ycpx3v2qwr28cksn16fwxv5ikvhai2smf5ml310b"; + name = "ksudoku-23.08.1.tar.xz"; }; }; ksystemlog = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ksystemlog-23.04.3.tar.xz"; - sha256 = "15c1h1dlcgbx2adhjzry2zwia0alym7vc251zymyzhl2xjacvqlm"; - name = "ksystemlog-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ksystemlog-23.08.1.tar.xz"; + sha256 = "0wnchhvfd5l4si4vahcnzpjfj53xa7wv88h64c6g5833c3h0wqwa"; + name = "ksystemlog-23.08.1.tar.xz"; }; }; kteatime = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kteatime-23.04.3.tar.xz"; - sha256 = "02c3j21f0adilvwyy20pmkbrq4h33vdmrp00cqjbncsk6il5xym7"; - name = "kteatime-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kteatime-23.08.1.tar.xz"; + sha256 = "0pra050l62f5im0vjgm3vy548pd0mcazc3gl1ikkgbja7qqhwksd"; + name = "kteatime-23.08.1.tar.xz"; }; }; ktimer = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktimer-23.04.3.tar.xz"; - sha256 = "1n5az5cgb0q28lz5f7afqjlfga32q232g836nkl1sfq8n5whj5z5"; - name = "ktimer-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ktimer-23.08.1.tar.xz"; + sha256 = "1cc4cnj4c2p7hxid1xhv2dhxajyakk1vdnl4p4fgvbs8xrkj3357"; + name = "ktimer-23.08.1.tar.xz"; }; }; ktnef = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktnef-23.04.3.tar.xz"; - sha256 = "00dkcmywjxzq5v2kp4klw50c3w74lmh16kbcwn8qd97kky3pd5ik"; - name = "ktnef-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ktnef-23.08.1.tar.xz"; + sha256 = "0j750z0cl83cnihfhjj3llds1ma8j4ia7b94xjwv6mh6m80rkasa"; + name = "ktnef-23.08.1.tar.xz"; }; }; ktorrent = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktorrent-23.04.3.tar.xz"; - sha256 = "17q6ivnbh4zxqnbm1bdzz3hri1434sq2rs9y57lvn4bb2xdwn1z5"; - name = "ktorrent-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ktorrent-23.08.1.tar.xz"; + sha256 = "1i2lijbdlaadjh4sfcdcf3264hvybr73iw4nafsiyy42ddri8qp1"; + name = "ktorrent-23.08.1.tar.xz"; }; }; ktouch = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktouch-23.04.3.tar.xz"; - sha256 = "1kpljbg5vjclydiymzn474wzb05bvn7587dr3pns2x09h6iv3c98"; - name = "ktouch-23.04.3.tar.xz"; - }; - }; - ktp-accounts-kcm = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-accounts-kcm-23.04.3.tar.xz"; - sha256 = "06p3fl229ks9kf820g91jb5f7qynysnybaay2pcq1yyqvv98ayrl"; - name = "ktp-accounts-kcm-23.04.3.tar.xz"; - }; - }; - ktp-approver = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-approver-23.04.3.tar.xz"; - sha256 = "0hin782xn9xdya2cv3vy79qhywjd72r2mx9sl1c69qkklqsf9xpr"; - name = "ktp-approver-23.04.3.tar.xz"; - }; - }; - ktp-auth-handler = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-auth-handler-23.04.3.tar.xz"; - sha256 = "1hn3a9rc4yzc18rxn2j6by6hjnrpnqqgzyzg7nxyrsfwcc7wgvq9"; - name = "ktp-auth-handler-23.04.3.tar.xz"; - }; - }; - ktp-call-ui = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-call-ui-23.04.3.tar.xz"; - sha256 = "1gz5a5hjsz2f9k8dyfb5k9x8n2wqps30fpf6kgv8m0mazszgy87y"; - name = "ktp-call-ui-23.04.3.tar.xz"; - }; - }; - ktp-common-internals = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-common-internals-23.04.3.tar.xz"; - sha256 = "0hhba4nwc88yhn1qai3lc0mvczw4kvqjg6h3lq4mr2zfac0g2wbs"; - name = "ktp-common-internals-23.04.3.tar.xz"; - }; - }; - ktp-contact-list = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-contact-list-23.04.3.tar.xz"; - sha256 = "1di1rbfdq28y4p0v6hdj3cyvzini6zkzzam72gffjdayp4ba5mrn"; - name = "ktp-contact-list-23.04.3.tar.xz"; - }; - }; - ktp-contact-runner = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-contact-runner-23.04.3.tar.xz"; - sha256 = "0hyj92wiaj4vzp030pfn7yr9zjx921d4x2rxgfkmhymkvj0v7pqb"; - name = "ktp-contact-runner-23.04.3.tar.xz"; - }; - }; - ktp-desktop-applets = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-desktop-applets-23.04.3.tar.xz"; - sha256 = "1sricvnmsdmh0458v04i7wkywc57vnc0w727zys9xcbbv1zc1n2r"; - name = "ktp-desktop-applets-23.04.3.tar.xz"; - }; - }; - ktp-filetransfer-handler = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-filetransfer-handler-23.04.3.tar.xz"; - sha256 = "1wnqd8xji5pykxczlgyyjf8hcxw9v131n5ssflx4wyrvkccgii95"; - name = "ktp-filetransfer-handler-23.04.3.tar.xz"; - }; - }; - ktp-kded-module = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-kded-module-23.04.3.tar.xz"; - sha256 = "1chgrjmd23kzzcrya5dch8al5x8d1ll48bb597ik2hhr8w63s3cb"; - name = "ktp-kded-module-23.04.3.tar.xz"; - }; - }; - ktp-send-file = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-send-file-23.04.3.tar.xz"; - sha256 = "1hkk88i88vwysqxbfi0ahhz6aw3snyjgz1jkcf5j5iik73xspcmb"; - name = "ktp-send-file-23.04.3.tar.xz"; - }; - }; - ktp-text-ui = { - version = "23.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktp-text-ui-23.04.3.tar.xz"; - sha256 = "01rikl02cdnb77l8irz6jcbz2viq947l0wbvrqpjlvxv7x7hyvfx"; - name = "ktp-text-ui-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ktouch-23.08.1.tar.xz"; + sha256 = "11j4jcschflxl5s5971bz972gxg700wibqzb4x0nlhcq9qrwvkbf"; + name = "ktouch-23.08.1.tar.xz"; }; }; ktrip = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktrip-23.04.3.tar.xz"; - sha256 = "1y2gbz5jv08jjjhdy2vyvwalmj436h332dmbw8qwc06ify2r469l"; - name = "ktrip-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ktrip-23.08.1.tar.xz"; + sha256 = "1viymrqni2p91bjd1z81240ah7h21328f7b8j750xb57nqhxsk4h"; + name = "ktrip-23.08.1.tar.xz"; }; }; ktuberling = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/ktuberling-23.04.3.tar.xz"; - sha256 = "0zk7wijp425657s2j7xq7mhybgyddpam88ih8i0sbpcs0sliyz7k"; - name = "ktuberling-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/ktuberling-23.08.1.tar.xz"; + sha256 = "1b862cf4pri4alwix148ld0v5y9scf4v2j0a34ivaqfsr1nifcms"; + name = "ktuberling-23.08.1.tar.xz"; }; }; kturtle = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kturtle-23.04.3.tar.xz"; - sha256 = "0hknmg65kafm1f6885yiz86g9jpqyycjg6208iyi6i15lyqjr4a9"; - name = "kturtle-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kturtle-23.08.1.tar.xz"; + sha256 = "0i3rhdf0695niv076g6hhxrzm010n5w94xgshxqb0bw03prxz354"; + name = "kturtle-23.08.1.tar.xz"; }; }; kubrick = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kubrick-23.04.3.tar.xz"; - sha256 = "0nank1ga4c4xfsw0m1cqhjhyz2wpbsxplyyb9x3l2vpg92gj5dbs"; - name = "kubrick-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kubrick-23.08.1.tar.xz"; + sha256 = "0yi5v15sn2dwfw94nahqpmpirfp727cx1cl4dh51g2418863r7ih"; + name = "kubrick-23.08.1.tar.xz"; }; }; kwalletmanager = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kwalletmanager-23.04.3.tar.xz"; - sha256 = "1g3yw32kv7yij2ymk52fpp0srncr2ijfckfvz5hc0nsn7xhyqdby"; - name = "kwalletmanager-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kwalletmanager-23.08.1.tar.xz"; + sha256 = "1r4d0hhqfdf9k4qk1swbx8a2i4ywycgxr77fnqw7wfhv76zd7jih"; + name = "kwalletmanager-23.08.1.tar.xz"; }; }; kwave = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kwave-23.04.3.tar.xz"; - sha256 = "0s9w8jgwblljwfji2a19bqs3nx6sr2qzz35kwbi0ahwncy69k4jx"; - name = "kwave-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kwave-23.08.1.tar.xz"; + sha256 = "1lryirz3q46rkz5l0ymg2pfnrrhjdk7lsibbah9bxhx1rw59dsb6"; + name = "kwave-23.08.1.tar.xz"; }; }; kweather = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kweather-23.04.3.tar.xz"; - sha256 = "1147lagd99m5qgpy9dk5vkc500p2jw4nb50kjhr1b9yhdz8dcbwn"; - name = "kweather-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kweather-23.08.1.tar.xz"; + sha256 = "10piaaayxjhd5vw2fyi6f4j2lz9aa6snmdnpi36lj4nk0l8xw043"; + name = "kweather-23.08.1.tar.xz"; }; }; kwordquiz = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/kwordquiz-23.04.3.tar.xz"; - sha256 = "15abyxccp02b1bmcb79g0k7sd6j6dmhw2k8l2h9as2ja4r5xhir1"; - name = "kwordquiz-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/kwordquiz-23.08.1.tar.xz"; + sha256 = "1sgk25awkm1bzri3k5szqw9h1visiym3nr6zws1hg7hr2vbdqd12"; + name = "kwordquiz-23.08.1.tar.xz"; }; }; libgravatar = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libgravatar-23.04.3.tar.xz"; - sha256 = "03zhnpb114y6a6vhiv9c1fiqsinjmk52j1k9w2r04ibxp35m3xj7"; - name = "libgravatar-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libgravatar-23.08.1.tar.xz"; + sha256 = "05q8w7kr0kvyw4xgvqfidaw45d1jcv6y2njpvzf7krlkw9garj1x"; + name = "libgravatar-23.08.1.tar.xz"; }; }; libkcddb = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkcddb-23.04.3.tar.xz"; - sha256 = "1s10g6m6c3h14gzxvp2s0v51jxzsrh23xfn7gl51a0r50srbbz52"; - name = "libkcddb-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libkcddb-23.08.1.tar.xz"; + sha256 = "0l9lzs8pd68wplj0wd7317s91nv2n6c770dqngsai3bhwg5zprpg"; + name = "libkcddb-23.08.1.tar.xz"; }; }; libkcompactdisc = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkcompactdisc-23.04.3.tar.xz"; - sha256 = "0gl21mhfz3vj89x0r8y79yiijcag1xfdnyfrjqzkx9i8yd2k45b1"; - name = "libkcompactdisc-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libkcompactdisc-23.08.1.tar.xz"; + sha256 = "1xqz38p0x9rf52d44fqfsmi2ln794dliwdphrfq6v5d9h0kh9xy5"; + name = "libkcompactdisc-23.08.1.tar.xz"; }; }; libkdcraw = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkdcraw-23.04.3.tar.xz"; - sha256 = "0vwr44j77c1vffsppkzdasd0l8apzx7jn6llwhzb4bjp93arx18w"; - name = "libkdcraw-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libkdcraw-23.08.1.tar.xz"; + sha256 = "0rv2wrfnrf8yj4x3jkh212yncvnjx5kwqlsj95q5fiaqi0fhnifr"; + name = "libkdcraw-23.08.1.tar.xz"; }; }; libkdegames = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkdegames-23.04.3.tar.xz"; - sha256 = "1sicpfsrkxn5d0fdy71h7033rpkb94r5hjvv5ab7qbmzb1qa4awq"; - name = "libkdegames-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libkdegames-23.08.1.tar.xz"; + sha256 = "15yvlwmadr1arx81xr5mnlx3hlvniiia3zlkywkwr7dzcakn18hf"; + name = "libkdegames-23.08.1.tar.xz"; }; }; libkdepim = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkdepim-23.04.3.tar.xz"; - sha256 = "1i5c4qqd4ghlfjvxniy8sbfqh0fsrz4sadvh0n2d207s9rsl274v"; - name = "libkdepim-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libkdepim-23.08.1.tar.xz"; + sha256 = "18hkv0vm8wp3f6503miyqm3mv29vp9q5vbxflhgjpkky89s8x074"; + name = "libkdepim-23.08.1.tar.xz"; }; }; libkeduvocdocument = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkeduvocdocument-23.04.3.tar.xz"; - sha256 = "04qnahyy3400ys56nvqlq5lgyp5w64bxj13jpljggja5r72ay9n0"; - name = "libkeduvocdocument-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libkeduvocdocument-23.08.1.tar.xz"; + sha256 = "0qinhp0k0r416r8zp9vwnf3dchybfdw0x2kqgn98i1549bxw3fyj"; + name = "libkeduvocdocument-23.08.1.tar.xz"; }; }; libkexiv2 = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkexiv2-23.04.3.tar.xz"; - sha256 = "16cb7cab4pyarwwn2byyvanwlakcgq5h203hkysp44flszq515cl"; - name = "libkexiv2-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libkexiv2-23.08.1.tar.xz"; + sha256 = "0dmp6v3c13h4z20li7b3fprpgb6zbj4bwjkb8df605kii6c34fhj"; + name = "libkexiv2-23.08.1.tar.xz"; }; }; libkgapi = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkgapi-23.04.3.tar.xz"; - sha256 = "18jcrp7qi35zxzb4b7mn6519bjw47s7kwfahd6a50p40j17k09bs"; - name = "libkgapi-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libkgapi-23.08.1.tar.xz"; + sha256 = "0g3acv89ljhrf718z089nypnqhc0r4hps7pj4w1miz1pivf7cris"; + name = "libkgapi-23.08.1.tar.xz"; }; }; libkipi = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkipi-23.04.3.tar.xz"; - sha256 = "1g6p7nvdd1k7p5nixq7p18zd0dmr5ym6irvz7s9j879a71w444j8"; - name = "libkipi-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libkipi-23.08.1.tar.xz"; + sha256 = "0x4di8y25zjcjgqg5qdj7x0bqq0xzq4pddqnq64hjqm39zz7nn4i"; + name = "libkipi-23.08.1.tar.xz"; }; }; libkleo = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkleo-23.04.3.tar.xz"; - sha256 = "0l77n4dlbv9hclzvh69kdzji907if7yayxiasxnnjkzsvcm1af25"; - name = "libkleo-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libkleo-23.08.1.tar.xz"; + sha256 = "07db9lhlj2r4wgvki8kxi2rj6pb6qwl1lxrngxd2kfnnf6nzfad1"; + name = "libkleo-23.08.1.tar.xz"; }; }; libkmahjongg = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkmahjongg-23.04.3.tar.xz"; - sha256 = "1a0c0q34h5yxwx76y6934ibn6hm1ip1hc2xvl11q1kaazq0alca3"; - name = "libkmahjongg-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libkmahjongg-23.08.1.tar.xz"; + sha256 = "1rd9y76p584kf5qj9ycza0shj23p8p152jni6dcpvg7kwsryawiw"; + name = "libkmahjongg-23.08.1.tar.xz"; }; }; libkomparediff2 = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libkomparediff2-23.04.3.tar.xz"; - sha256 = "1zkiyyrbfbr1i7zyhhayf53daaarzc8a2xz0iqjy9za7rawnmgbv"; - name = "libkomparediff2-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libkomparediff2-23.08.1.tar.xz"; + sha256 = "022g3fkfcqnsfvdagh69mca5z4bjcp2wndvf21x8jb68y5xmkmg2"; + name = "libkomparediff2-23.08.1.tar.xz"; }; }; libksane = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libksane-23.04.3.tar.xz"; - sha256 = "0hmsrkrcqiyhdcshln5jg9xzqn7xvyjj1g6vrx82pfs1lwsczhr6"; - name = "libksane-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libksane-23.08.1.tar.xz"; + sha256 = "0dlfpf9sawh448v1qbn4fdchwysvgszf4n9yw5ivl7r3yb3cmgga"; + name = "libksane-23.08.1.tar.xz"; }; }; libksieve = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libksieve-23.04.3.tar.xz"; - sha256 = "066z33v30h568bmdcsl4v478p3xhiwsmq7pr7kziilrhy3a2m7p6"; - name = "libksieve-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libksieve-23.08.1.tar.xz"; + sha256 = "0mlslampcd5b6961sd4ns3c5zlpiws35b8m9jcnzg639xyd4m8p8"; + name = "libksieve-23.08.1.tar.xz"; }; }; libktorrent = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/libktorrent-23.04.3.tar.xz"; - sha256 = "1m6gyk1bids7qr9wfh6gcfq73ac9j5b2bljvfvfsw9f1ky1cmwab"; - name = "libktorrent-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/libktorrent-23.08.1.tar.xz"; + sha256 = "1q6hdd5v7ic9m208bwxzjxxxhj9x5kmsb52znq717dzfdgvm6qnb"; + name = "libktorrent-23.08.1.tar.xz"; }; }; lokalize = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/lokalize-23.04.3.tar.xz"; - sha256 = "0czkb5dk44yb5zwknq3s2m5im99fs06dmbsp60gx2m6p355m4w8z"; - name = "lokalize-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/lokalize-23.08.1.tar.xz"; + sha256 = "04j6zi6vzidrwd1b833c7jypf0ngi61d7y7hq5lkvy14fwnkaz65"; + name = "lokalize-23.08.1.tar.xz"; }; }; lskat = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/lskat-23.04.3.tar.xz"; - sha256 = "1qphzc1r26qwc8sl5rjkw16ia3lsj7c2lg9fxnhk08k8mxncymxg"; - name = "lskat-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/lskat-23.08.1.tar.xz"; + sha256 = "14yr5xpcvkp4zagl52jx1z1f0syzgvp019lfhg2xpm9g7wfga2ic"; + name = "lskat-23.08.1.tar.xz"; }; }; mailcommon = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/mailcommon-23.04.3.tar.xz"; - sha256 = "165a0qf6i2862dpsw4wvgnxi4wv7hnc9s63fsf9jp6kbwwfw9nqv"; - name = "mailcommon-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/mailcommon-23.08.1.tar.xz"; + sha256 = "0d48di7bapjkrqm0psg0f1h1mxmk2wci6f86zbpxxs1z2h1fmhrs"; + name = "mailcommon-23.08.1.tar.xz"; }; }; mailimporter = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/mailimporter-23.04.3.tar.xz"; - sha256 = "18shpxz7rg64g2mxdhdjhxhn893m0930v76cdnij339ycbcq5ypc"; - name = "mailimporter-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/mailimporter-23.08.1.tar.xz"; + sha256 = "139hy4q0aism6xj6brymlk010d1wvi6l9f2813zc87avqwxp4ydn"; + name = "mailimporter-23.08.1.tar.xz"; }; }; marble = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/marble-23.04.3.tar.xz"; - sha256 = "14ys9yfnwh3i64wm198gsf7z1iyxsi5wv93ygv0wy7rv9czb1zl8"; - name = "marble-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/marble-23.08.1.tar.xz"; + sha256 = "15bi85zirvfpmvkiai417q41rfchh79745rjjlj56p0syx4l0dc4"; + name = "marble-23.08.1.tar.xz"; }; }; markdownpart = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/markdownpart-23.04.3.tar.xz"; - sha256 = "0w3aflbsrmbgsiin3xl7svrw3rwbj3dk9kh3ibycvvmrp03p9yp4"; - name = "markdownpart-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/markdownpart-23.08.1.tar.xz"; + sha256 = "0n0il32nl5rpqcmphszlwg4swvda11gz64yp07hkhzn9zar9araa"; + name = "markdownpart-23.08.1.tar.xz"; }; }; mbox-importer = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/mbox-importer-23.04.3.tar.xz"; - sha256 = "0qaz4r69gmqag6jwmxk54rih78sh88jsw2qvyjhdhdywc4r8bx32"; - name = "mbox-importer-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/mbox-importer-23.08.1.tar.xz"; + sha256 = "1v7rgfbv1qln8p4ln6ms995pmdzkdfbb5x5nvg1ds8n0vr9f45iv"; + name = "mbox-importer-23.08.1.tar.xz"; + }; + }; + merkuro = { + version = "23.08.1"; + src = fetchurl { + url = "${mirror}/stable/release-service/23.08.1/src/merkuro-23.08.1.tar.xz"; + sha256 = "06gv1g53f3f4a4br22vb5zr9wblzi22nxslz4agwsymh1lfcb5lb"; + name = "merkuro-23.08.1.tar.xz"; }; }; messagelib = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/messagelib-23.04.3.tar.xz"; - sha256 = "0aqac0p46cwnr3qxjk0ivalfwjcgwy52s088wnk6ckp77m7r65is"; - name = "messagelib-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/messagelib-23.08.1.tar.xz"; + sha256 = "15rpf4dhmx8b5pk654rs8x8jpjynrm562z7fm9zavax2fja7j8kg"; + name = "messagelib-23.08.1.tar.xz"; }; }; minuet = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/minuet-23.04.3.tar.xz"; - sha256 = "1lsnm52jcr37bk8lf9j1h6nvx2avc4z12g418bhg3424bwv4pmlf"; - name = "minuet-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/minuet-23.08.1.tar.xz"; + sha256 = "1g7i7wvrcj74w81p6q9p2gsx2cmjd3fa409p1hi16w5bw2sqsh8h"; + name = "minuet-23.08.1.tar.xz"; }; }; neochat = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/neochat-23.04.3.tar.xz"; - sha256 = "015g42qbnj0g5n6swjj85nsxvlcih829ff11l14h1a7f4ip00yif"; - name = "neochat-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/neochat-23.08.1.tar.xz"; + sha256 = "07535rjdpwg1kanb8izirrb72jvj3wvzhslj6qpvhns0w2jlcdn7"; + name = "neochat-23.08.1.tar.xz"; }; }; okular = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/okular-23.04.3.tar.xz"; - sha256 = "1vgcqkq6mzd270hzabmdqqv105iv6kr6ah2h18b15al2n9rmg0bi"; - name = "okular-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/okular-23.08.1.tar.xz"; + sha256 = "05s8965gqvps9m5a5axmcmvrakbbkzvfqrz7cx4k54hnf0np7cs3"; + name = "okular-23.08.1.tar.xz"; }; }; palapeli = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/palapeli-23.04.3.tar.xz"; - sha256 = "19xh03rhb48m4bbdmpga4aqij6agqg047ghl92p98z1phg5lxzrv"; - name = "palapeli-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/palapeli-23.08.1.tar.xz"; + sha256 = "0yhrwp6qi00mqrbmbsqqny7h0kzdk69m45n2zy4gn219ap6bmyvp"; + name = "palapeli-23.08.1.tar.xz"; }; }; parley = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/parley-23.04.3.tar.xz"; - sha256 = "136ygvdv0p9pfpbyddc1y3jj8jaak2r5b4szrfaq051m3y54i9mb"; - name = "parley-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/parley-23.08.1.tar.xz"; + sha256 = "0vg0z2npm6njfqiffwcq61yir2wbbqg3zhxxa6haqff61liclmqr"; + name = "parley-23.08.1.tar.xz"; }; }; partitionmanager = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/partitionmanager-23.04.3.tar.xz"; - sha256 = "03xx3nh2grkgkjn8dixy529lb4gnrdhlzhzsry82g64f8c6sfqqm"; - name = "partitionmanager-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/partitionmanager-23.08.1.tar.xz"; + sha256 = "0px5xcaqlx41mvp1a7i9w2qy85qa7bq0696n1l9kmbv0vm7cy2kx"; + name = "partitionmanager-23.08.1.tar.xz"; }; }; picmi = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/picmi-23.04.3.tar.xz"; - sha256 = "1x1iv6a840jwldfpx44wvh1vki1jz1hixzvzhdfx2mhw05v91fjx"; - name = "picmi-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/picmi-23.08.1.tar.xz"; + sha256 = "1l2sd0hqyv30c07rws7ah5arpyysk6lack1kkmwkrxl1f67prrss"; + name = "picmi-23.08.1.tar.xz"; }; }; pim-data-exporter = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/pim-data-exporter-23.04.3.tar.xz"; - sha256 = "1bwh5srkdlqmxindci9416zmrp0gjvci59zyilvnr09kwg7lmwn0"; - name = "pim-data-exporter-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/pim-data-exporter-23.08.1.tar.xz"; + sha256 = "094aba9r8z52wlbwh64m7661qgxf87dlann8x97nhn1a54dvang7"; + name = "pim-data-exporter-23.08.1.tar.xz"; }; }; pim-sieve-editor = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/pim-sieve-editor-23.04.3.tar.xz"; - sha256 = "1yik788sniv7jh1w9wwc4rf06x1kd3bwkb3vflckinn37y2rpl4a"; - name = "pim-sieve-editor-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/pim-sieve-editor-23.08.1.tar.xz"; + sha256 = "0mbzs5jhjvg4nz8nkrh22i6m71q98waa0glpmhpf91243imgv129"; + name = "pim-sieve-editor-23.08.1.tar.xz"; }; }; pimcommon = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/pimcommon-23.04.3.tar.xz"; - sha256 = "1v2nv83h9p1ajbcwfdk8b7lrr84r8c855lysknzvzkpm5z012z3l"; - name = "pimcommon-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/pimcommon-23.08.1.tar.xz"; + sha256 = "1p2rl00sld8qkvshzhlmcqazahkpvkc4p6z0hyc7lixxi7v3r6b7"; + name = "pimcommon-23.08.1.tar.xz"; }; }; plasmatube = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/plasmatube-23.04.3.tar.xz"; - sha256 = "0wmzzh8db3ybzhn9hh4j9c126pzcdshz4a0fzakgx93z1ph59pcg"; - name = "plasmatube-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/plasmatube-23.08.1.tar.xz"; + sha256 = "0bw5idiif9vwmkmz3fk6n4l59r6nm0v5kf2inxy3l53zv8p01r7g"; + name = "plasmatube-23.08.1.tar.xz"; }; }; poxml = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/poxml-23.04.3.tar.xz"; - sha256 = "11rqd7hhsy6f8qi0529cmy381bhskji6wf4fij7yjksmrsdvfw6d"; - name = "poxml-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/poxml-23.08.1.tar.xz"; + sha256 = "1qhwlsqil4lz08jxqwlv9kqdfnxkx6q0zr2i64wz0f4p59abjkdb"; + name = "poxml-23.08.1.tar.xz"; }; }; print-manager = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/print-manager-23.04.3.tar.xz"; - sha256 = "1fnbkx2xk3pr3cwcji1xbswcf5b7h8r4kag8i3lv28cnjw3ahs52"; - name = "print-manager-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/print-manager-23.08.1.tar.xz"; + sha256 = "080pwc7zamlqcirb150mr7wc9yrgrkfb4psws4dlqnkm6pps6r8g"; + name = "print-manager-23.08.1.tar.xz"; }; }; qmlkonsole = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/qmlkonsole-23.04.3.tar.xz"; - sha256 = "146c7rzgr3m2gw8ndac9i2kzkhpinn86h17f3vky6kph6nrmlx9j"; - name = "qmlkonsole-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/qmlkonsole-23.08.1.tar.xz"; + sha256 = "1z1ms4kbhx4wqbmjdybgsk7w4g337mlagbpql4asmmbsp55g2wgy"; + name = "qmlkonsole-23.08.1.tar.xz"; }; }; rocs = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/rocs-23.04.3.tar.xz"; - sha256 = "13bzxsicsylfq7kdpfik4afgkbv2g7avg3imbkiw969jbgl8qbmb"; - name = "rocs-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/rocs-23.08.1.tar.xz"; + sha256 = "10kyaiwyx66mg2a8c2m60v7hwdxsl3k6ajqgsfdr9np2fd8kqjl1"; + name = "rocs-23.08.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/signon-kwallet-extension-23.04.3.tar.xz"; - sha256 = "067lldmvsrr1p2vp15xi2zwaq61x55yh7wqq3nhmmblpjiimywvl"; - name = "signon-kwallet-extension-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/signon-kwallet-extension-23.08.1.tar.xz"; + sha256 = "0b9gyhxbbv1gwd0gf5h6xr58413dms5aknivzdzy291bvcfl1152"; + name = "signon-kwallet-extension-23.08.1.tar.xz"; }; }; skanlite = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/skanlite-23.04.3.tar.xz"; - sha256 = "0g6p3m16vx8cmshyj1c5qkvlhghi1az6rv6jqkzwjjk5mzchmcgj"; - name = "skanlite-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/skanlite-23.08.1.tar.xz"; + sha256 = "0wrcvai0wzh0n3d60jkq4vak68kfbw7lwbzaygyx2piciqbmv25k"; + name = "skanlite-23.08.1.tar.xz"; }; }; skanpage = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/skanpage-23.04.3.tar.xz"; - sha256 = "1j5jaq67mrnrb0vgspb5rlhcvpskc3f4bfnksr84njrv0jd3gzi2"; - name = "skanpage-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/skanpage-23.08.1.tar.xz"; + sha256 = "0ajia4vippfvmjpxyqvfw2csgnqnfmzckg8azj909cbsmmsl0xka"; + name = "skanpage-23.08.1.tar.xz"; }; }; spectacle = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/spectacle-23.04.3.tar.xz"; - sha256 = "1fyklcvz0zndxabflkka75rham6768rp01as7m5dv0ic4lipkf9m"; - name = "spectacle-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/spectacle-23.08.1.tar.xz"; + sha256 = "03zpyhjsq1in3cnlk6lxbc2x24qab321vbxc8gfw0s71c26f4q2i"; + name = "spectacle-23.08.1.tar.xz"; }; }; step = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/step-23.04.3.tar.xz"; - sha256 = "0ayg41vw4ssaq1zk3a8vs8gbvvbkkq042msasas5avq1pdixl470"; - name = "step-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/step-23.08.1.tar.xz"; + sha256 = "107fa1804x4lj5ar4lf2cdshcb2chaqjc629hy3ng292xrw3ls2f"; + name = "step-23.08.1.tar.xz"; }; }; svgpart = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/svgpart-23.04.3.tar.xz"; - sha256 = "0cc4b4iq19ylmmawapcnk5d6h0qj30x9gm81x3w4k29pp754mmli"; - name = "svgpart-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/svgpart-23.08.1.tar.xz"; + sha256 = "1dshw332bm6v7p222l570pwhkl85y27v1isr2g2k5i3ihhzdx7fw"; + name = "svgpart-23.08.1.tar.xz"; }; }; sweeper = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/sweeper-23.04.3.tar.xz"; - sha256 = "19b382cgdcd4qh4ppdmbhsacvcc9nlbs7spcg8ii02bdpx6qw9b7"; - name = "sweeper-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/sweeper-23.08.1.tar.xz"; + sha256 = "0bdkqfa1axgn2xxw1m3yzf8xd268y8rw7sbrlxrfn3g76rcj9vd0"; + name = "sweeper-23.08.1.tar.xz"; }; }; telly-skout = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/telly-skout-23.04.3.tar.xz"; - sha256 = "0rnidnzv8qifb5ci3qk0sfvadycqg5wfdmiv47pgmp61jsgrqgrb"; - name = "telly-skout-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/telly-skout-23.08.1.tar.xz"; + sha256 = "1yip90svx81npyyng1sdmg01scksisbzbzhkdj1y8azric4x697y"; + name = "telly-skout-23.08.1.tar.xz"; }; }; tokodon = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/tokodon-23.04.3.tar.xz"; - sha256 = "021pd3r4hxa7g9jswb9c57j8c9gxyjclrk6r5fm2nnai5z7cz1ky"; - name = "tokodon-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/tokodon-23.08.1.tar.xz"; + sha256 = "0zn7cdcz5v3zl7aqivv0kb8yga3mb5ln40dnmqv349n8nh5syriv"; + name = "tokodon-23.08.1.tar.xz"; }; }; umbrello = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/umbrello-23.04.3.tar.xz"; - sha256 = "1mk779xl4vqk7qz7vlxyc2ddx1345pg8mz46igkragrx1kq4vbzw"; - name = "umbrello-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/umbrello-23.08.1.tar.xz"; + sha256 = "11abrw45h0a9wiy2dbw1c3fxhxcm73z2jx7cvsr344rlrfnbzrrd"; + name = "umbrello-23.08.1.tar.xz"; }; }; yakuake = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/yakuake-23.04.3.tar.xz"; - sha256 = "17ylm5z5lzjq5g4d48s0clpl3hg4rym9sc1p5hr0wfs9jx7197jy"; - name = "yakuake-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/yakuake-23.08.1.tar.xz"; + sha256 = "0jmm7s1vs6sbi6zc1s0icxv63a3pcqsjp6xsqr92m9v729pn46g9"; + name = "yakuake-23.08.1.tar.xz"; }; }; zanshin = { - version = "23.04.3"; + version = "23.08.1"; src = fetchurl { - url = "${mirror}/stable/release-service/23.04.3/src/zanshin-23.04.3.tar.xz"; - sha256 = "0f6d2wf9vly7qqbzv9nfahjvyi8db77anb9w0qfc95i69hggy2yj"; - name = "zanshin-23.04.3.tar.xz"; + url = "${mirror}/stable/release-service/23.08.1/src/zanshin-23.08.1.tar.xz"; + sha256 = "0ngqvwj1cw3fnwq10i8mr6i4f1l47h4qcn8d4lzymh6bxkg4ilwa"; + name = "zanshin-23.08.1.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/tokodon.nix b/third_party/nixpkgs/pkgs/applications/kde/tokodon.nix index bf40a5a001..43da82e890 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/tokodon.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/tokodon.nix @@ -20,6 +20,7 @@ , qtwebsockets , kitemmodels , pimcommon +, mpv }: mkDerivation { @@ -47,6 +48,7 @@ mkDerivation { qtwebsockets kitemmodels pimcommon + mpv ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix b/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix index c48631eefe..b0744505d0 100644 --- a/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "humioctl"; - version = "0.31.1"; + version = "0.32.3"; src = fetchFromGitHub { owner = "humio"; repo = "cli"; rev = "v${version}"; - hash = "sha256-L5Ttos0TL8m62Y69riwnGmB1cOVF6XIH7jMVU8NuFKI="; + hash = "sha256-MaBJL/3TZYmXjwt5/WmBBTXVhlJ6oyCgm+Lb8id6J3c="; }; - vendorHash = "sha256-GTPEHw3QsID9K6DcYNZRyDJzTqfDV9lHP2Trvd2aC8Y="; + vendorHash = "sha256-FAy0LNmesEDgS3JTz5DPd8vkR5CHHhAbms++N8TQApA="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/maui/booth.nix b/third_party/nixpkgs/pkgs/applications/maui/booth.nix index 0f753832ad..f820558958 100644 --- a/third_party/nixpkgs/pkgs/applications/maui/booth.nix +++ b/third_party/nixpkgs/pkgs/applications/maui/booth.nix @@ -7,6 +7,7 @@ , kirigami2 , mauikit , mauikit-filebrowsing +, prison , qtgraphicaleffects , qtmultimedia , qtquickcontrols2 @@ -27,6 +28,7 @@ mkDerivation { kirigami2 mauikit mauikit-filebrowsing + prison qtgraphicaleffects qtmultimedia qtquickcontrols2 diff --git a/third_party/nixpkgs/pkgs/applications/maui/default.nix b/third_party/nixpkgs/pkgs/applications/maui/default.nix index 5379910c88..b64a3d8455 100644 --- a/third_party/nixpkgs/pkgs/applications/maui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/maui/default.nix @@ -61,6 +61,7 @@ let mauikit = callPackage ./mauikit.nix { }; mauikit-accounts = callPackage ./mauikit-accounts.nix { }; mauikit-calendar = callPackage ./mauikit-calendar { }; + mauikit-documents = callPackage ./mauikit-documents.nix { }; mauikit-filebrowsing = callPackage ./mauikit-filebrowsing.nix { }; mauikit-imagetools = callPackage ./mauikit-imagetools.nix { }; mauikit-terminal = callPackage ./mauikit-terminal.nix { }; diff --git a/third_party/nixpkgs/pkgs/applications/maui/mauikit-documents.nix b/third_party/nixpkgs/pkgs/applications/maui/mauikit-documents.nix new file mode 100644 index 0000000000..19d8e9faa2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/maui/mauikit-documents.nix @@ -0,0 +1,44 @@ +{ lib +, mkDerivation +, cmake +, extra-cmake-modules +, karchive +, kconfig +, kcoreaddons +, kfilemetadata +, kguiaddons +, ki18n +, kiconthemes +, kio +, mauikit +, poppler +}: + +mkDerivation { + pname = "mauikit-documents"; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + karchive + kconfig + kcoreaddons + kfilemetadata + kguiaddons + ki18n + kiconthemes + kio + mauikit + poppler + ]; + + meta = { + homepage = "https://invent.kde.org/maui/mauikit-documents"; + description = "MauiKit QtQuick plugins for text editing"; + license = with lib.licenses; [ bsd2 lgpl21Plus ]; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/maui/shelf.nix b/third_party/nixpkgs/pkgs/applications/maui/shelf.nix index 3942b9a34d..3ac8045125 100644 --- a/third_party/nixpkgs/pkgs/applications/maui/shelf.nix +++ b/third_party/nixpkgs/pkgs/applications/maui/shelf.nix @@ -9,6 +9,7 @@ , kio , kirigami2 , mauikit +, mauikit-documents , mauikit-filebrowsing , mauikit-texteditor , qtmultimedia @@ -32,6 +33,7 @@ mkDerivation { kio kirigami2 mauikit + mauikit-documents mauikit-filebrowsing mauikit-texteditor qtmultimedia diff --git a/third_party/nixpkgs/pkgs/applications/maui/srcs.nix b/third_party/nixpkgs/pkgs/applications/maui/srcs.nix index 2221ae4a42..6473b9607b 100644 --- a/third_party/nixpkgs/pkgs/applications/maui/srcs.nix +++ b/third_party/nixpkgs/pkgs/applications/maui/srcs.nix @@ -4,19 +4,19 @@ { agenda = { - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "${mirror}/stable/maui/agenda/0.5.0/agenda-0.5.0.tar.xz"; - sha256 = "1ak87cda64c05knzdjf6sxjn70chs2sa6zh2adhq3mqm3dh9flf7"; - name = "agenda-0.5.0.tar.xz"; + url = "${mirror}/stable/maui/agenda/0.5.1/agenda-0.5.1.tar.xz"; + sha256 = "1c45fnlg15pjd3ljmm3w2jcrq94jirrykpq1xrvgfbv5d50796x7"; + name = "agenda-0.5.1.tar.xz"; }; }; arca = { - version = "0.5.0"; + version = "0.5.1"; src = fetchurl { - url = "${mirror}/stable/maui/arca/0.5.0/arca-0.5.0.tar.xz"; - sha256 = "12bqk5dxh1rqnbj61kymkzzgmilas6jilid4rijdgjaahdahw6hk"; - name = "arca-0.5.0.tar.xz"; + url = "${mirror}/stable/maui/arca/0.5.1/arca-0.5.1.tar.xz"; + sha256 = "0irbc1ysnia5wp398ddijad77qg7gd076fkm972wgk4pmqnm0rcz"; + name = "arca-0.5.1.tar.xz"; }; }; bonsai = { @@ -28,35 +28,35 @@ }; }; booth = { - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "${mirror}/stable/maui/booth/1.1.0/booth-1.1.0.tar.xz"; - sha256 = "1jr5iha1lvqnsh29y6k60nd63dqyh1clj8idqssfvaz09skbyk1q"; - name = "booth-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/booth/1.1.1/booth-1.1.1.tar.xz"; + sha256 = "1s3h083qbjjj5dmm27vc66vx0mzgpl4klhi9cc07z3apjldf1si0"; + name = "booth-1.1.1.tar.xz"; }; }; buho = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/buho/3.0.0/buho-3.0.0.tar.xz"; - sha256 = "1426b9wr8l8rzxgyahlchv9d4dgpqz5dr5nza3jax6mlh4ams507"; - name = "buho-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/buho/3.0.1/buho-3.0.1.tar.xz"; + sha256 = "0favgdwnb8gvmpisq58bmjvnajzgdk886z5m07vz4mfj7ipjjzbv"; + name = "buho-3.0.1.tar.xz"; }; }; clip = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/clip/3.0.0/clip-3.0.0.tar.xz"; - sha256 = "0a6z4h5rp3kmy5pp37df0abvbqxd6hx1jkss9w2sh59v8zijvrck"; - name = "clip-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/clip/3.0.1/clip-3.0.1.tar.xz"; + sha256 = "1acjnam8ljc6mw7xbphh99li9437kqlmdb258j7w3vgnqh2psipx"; + name = "clip-3.0.1.tar.xz"; }; }; communicator = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/communicator/3.0.0/communicator-3.0.0.tar.xz"; - sha256 = "01qgqirjax3l8sn9813dl6ppz9p2syg83ljrxqgaj94h08ll2vi0"; - name = "communicator-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/communicator/3.0.1/communicator-3.0.1.tar.xz"; + sha256 = "1j4yaw8w1hyvndra881r70ayz4ph00w41hhysqhgccxr36abcncl"; + name = "communicator-3.0.1.tar.xz"; }; }; era = { @@ -68,123 +68,123 @@ }; }; fiery = { - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "${mirror}/stable/maui/fiery/1.1.0/fiery-1.1.0.tar.xz"; - sha256 = "16kwi6gwxzrb2c8x9s97ibsflv30j3z3sp2if6ypand74ni1b4px"; - name = "fiery-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/fiery/1.1.1/fiery-1.1.1.tar.xz"; + sha256 = "03aszdvksx5bsrh479wl6vq28l026ddfv8p9privigjpcdbbaslk"; + name = "fiery-1.1.1.tar.xz"; }; }; index-fm = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/index/3.0.0/index-fm-3.0.0.tar.xz"; - sha256 = "1w9fdwn7yvy389300p8qhb3795zzaqkqfrc1vnxydgzn995yv80w"; - name = "index-fm-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/index/3.0.1/index-fm-3.0.1.tar.xz"; + sha256 = "046in0bqblpqcxp4rz417pjpy1m57p611wlzdsw8hp4dl1l2qmn9"; + name = "index-fm-3.0.1.tar.xz"; }; }; mauikit = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit/3.0.0/mauikit-3.0.0.tar.xz"; - sha256 = "1n95fcwgda9m9fmc90q0079xx4m9yh99yd51pj0nw7ynazlq2wyy"; - name = "mauikit-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit/3.0.1/mauikit-3.0.1.tar.xz"; + sha256 = "0vlxs13k3wk2kk3jcxrdmpa3d9gblvzp22sqqd7nys6kilq8kzdb"; + name = "mauikit-3.0.1.tar.xz"; }; }; mauikit-accounts = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-accounts/3.0.0/mauikit-accounts-3.0.0.tar.xz"; - sha256 = "0ff7zrlvhqfsnwbfbp5bz3vgxldxl09rlaajz4g9k7n81apa0fgv"; - name = "mauikit-accounts-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-accounts/3.0.1/mauikit-accounts-3.0.1.tar.xz"; + sha256 = "1b6nmnh5fh6gis7r56s41204g9y7cp5g2qmsk0r6b3a3x0ndwmqj"; + name = "mauikit-accounts-3.0.1.tar.xz"; }; }; mauikit-calendar = { - version = "1.1.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-calendar/1.1.0/mauikit-calendar-1.1.0.tar.xz"; - sha256 = "1532ndxw6a2isw1zxhp5khk0ydczm03d7b42c5smjy56fkp7xmgx"; - name = "mauikit-calendar-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-calendar/3.0.1/mauikit-calendar-3.0.1.tar.xz"; + sha256 = "1s95nkbyc4k8999hsnr5aw80qhr66q4z51wq2ail3h0df7p1f700"; + name = "mauikit-calendar-3.0.1.tar.xz"; }; }; mauikit-documents = { - version = "1.1.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-documents/1.1.0/mauikit-documents-1.1.0.tar.xz"; - sha256 = "06r5jf0rmrry9hd0gbjz63a0f5r8dykkggww531jaqm898h79wrs"; - name = "mauikit-documents-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-documents/3.0.1/mauikit-documents-3.0.1.tar.xz"; + sha256 = "1w2dszggxbqla5ab3739l1j79l2qa3br8drvkidivir8vwxifj3v"; + name = "mauikit-documents-3.0.1.tar.xz"; }; }; mauikit-filebrowsing = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-filebrowsing/3.0.0/mauikit-filebrowsing-3.0.0.tar.xz"; - sha256 = "03qdiww4dh6picsfhmzg0v5mf3ygsnprwq3x6s1lzlanl5a83pyk"; - name = "mauikit-filebrowsing-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-filebrowsing/3.0.1/mauikit-filebrowsing-3.0.1.tar.xz"; + sha256 = "0z8070p1m2c2mv3xdhsz4scnasbwxf698mql0svqzmjiy8vjfnn2"; + name = "mauikit-filebrowsing-3.0.1.tar.xz"; }; }; mauikit-imagetools = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-imagetools/3.0.0/mauikit-imagetools-3.0.0.tar.xz"; - sha256 = "0lj8d6k78xiy3wcc2jhhqvdw0p5vji95280dvclkmh0ilvb7lfrd"; - name = "mauikit-imagetools-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-imagetools/3.0.1/mauikit-imagetools-3.0.1.tar.xz"; + sha256 = "0aayhmmk6bd3n5p1mgm9k1jycsw8li5fs1xq7x42h93zhvxcw1va"; + name = "mauikit-imagetools-3.0.1.tar.xz"; }; }; mauikit-terminal = { - version = "1.1.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-terminal/1.1.0/mauikit-terminal-1.1.0.tar.xz"; - sha256 = "0aki6m39yy2cnq3v6mdgyzld3slp0k5qd7v5g5hqb38mrbsbl66a"; - name = "mauikit-terminal-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-terminal/3.0.1/mauikit-terminal-3.0.1.tar.xz"; + sha256 = "1w7d04cdq2b4mkjl7ngj1v580dlhrpvr1n0gy5jcfv6x4ia3g8k3"; + name = "mauikit-terminal-3.0.1.tar.xz"; }; }; mauikit-texteditor = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauikit-texteditor/3.0.0/mauikit-texteditor-3.0.0.tar.xz"; - sha256 = "1flbgsrp91fgv9m1xvlzsng3ks94i07k79832nx2azzs4g704sgf"; - name = "mauikit-texteditor-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/mauikit-texteditor/3.0.1/mauikit-texteditor-3.0.1.tar.xz"; + sha256 = "063zxzc530zgamr6fm5brm2rqpmq4rx4wsq7cx7sxfgyknag52m6"; + name = "mauikit-texteditor-3.0.1.tar.xz"; }; }; mauiman = { - version = "1.1.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/mauiman/1.1.0/mauiman-1.1.0.tar.xz"; - sha256 = "13s6wvp7h4zivw2m4hblsyha9qkihfqx41gh9jyw9pj8kmfp08v5"; - name = "mauiman-1.1.0.tar.xz"; + url = "${mirror}/stable/maui/mauiman/3.0.1/mauiman-3.0.1.tar.xz"; + sha256 = "0nygvb0nixcidla94xhwa4rrdwi3r2kcq62m9a3sabpl0z22mppq"; + name = "mauiman-3.0.1.tar.xz"; }; }; nota = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/nota/3.0.0/nota-3.0.0.tar.xz"; - sha256 = "0jk18qxkcx6n54pnm4mr2vpnhi07hscavacr1kijk4rxf0dyxf1i"; - name = "nota-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/nota/3.0.1/nota-3.0.1.tar.xz"; + sha256 = "1ynnpkwjmj9xx5xzlz32y0k6mcrz2y50z1s4lq5kshiwa3vbjn61"; + name = "nota-3.0.1.tar.xz"; }; }; pix = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/pix/3.0.0/pix-3.0.0.tar.xz"; - sha256 = "1h82c3xip1s3ii5f1maq5d9invgbxzarai8ba6c274lkv70yv1ni"; - name = "pix-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/pix/3.0.1/pix-3.0.1.tar.xz"; + sha256 = "1c1fz21x324r606ab7qsnbqpz3xvc4b6794xbf7vm6p7cfsgkdq7"; + name = "pix-3.0.1.tar.xz"; }; }; shelf = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/shelf/3.0.0/shelf-3.0.0.tar.xz"; - sha256 = "1944626qyxyybd8asfs00mkvljykz5ndxmnmi4jiz01j0xc70dyd"; - name = "shelf-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/shelf/3.0.1/shelf-3.0.1.tar.xz"; + sha256 = "02qg37qpfccan3n87pbq3i7zyl22g32ipr8smbdcpwdyhxz1v00q"; + name = "shelf-3.0.1.tar.xz"; }; }; station = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/station/3.0.0/station-3.0.0.tar.xz"; - sha256 = "04kidqm8hcxf8l1r6qi5bfxg6rkdy77i4inzgsgf3i7ky6gvah96"; - name = "station-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/station/3.0.1/station-3.0.1.tar.xz"; + sha256 = "11nbhax5xxrypy6ly5i609yvg7n754fhwjdpbf8c5c8j7285lnbz"; + name = "station-3.0.1.tar.xz"; }; }; strike = { @@ -196,11 +196,11 @@ }; }; vvave = { - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "${mirror}/stable/maui/vvave/3.0.0/vvave-3.0.0.tar.xz"; - sha256 = "1x2vbmc3qk2kgx64dm8k5xm16vlvnhfnhgzv5kx1qxpr7kr3vif8"; - name = "vvave-3.0.0.tar.xz"; + url = "${mirror}/stable/maui/vvave/3.0.1/vvave-3.0.1.tar.xz"; + sha256 = "0z7y27sdwcpxh0jr8k0h17rk0smljvky28ck741ysxqdv992bbk9"; + name = "vvave-3.0.1.tar.xz"; }; }; } 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 cf2ac98bc0..a1bc11ce97 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix @@ -9,43 +9,43 @@ let pname = "1password"; - version = if channel == "stable" then "8.10.9" else "8.10.12-10.BETA"; + version = if channel == "stable" then "8.10.16" else "8.10.18-19.BETA"; sources = { stable = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-Ef0ee41WVN46IOYbdyF1w8Ud2s7ncR71/5TFnQwOnVU="; + hash = "sha256-p9JTJUwPqJAAykhfVwlEkPlqgZ0h9VLQR3K2BYABn5I="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-IuRPCphagpx0jynJmhL9ETSzS0JaWCpDaodt0TDm7xs="; + hash = "sha256-RyG1QzmErwJi31pytlOjWE6QfhWjvZQuaTEtIEpg02k="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-KwMYxe6WpLFXaJ3jyEOc18IYO/pwZ7RiPF/7RN2c5xg="; + hash = "sha256-a2U6jmHMZY4PgigLCzTAOOtt5xOSV6sqJy7Tr2y2VvQ="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-MDc2Okc8nZbAPPn0ihoraDe9kNI5xx654DdTe7AlD3E="; + hash = "sha256-0LKAiY+eLYeWG/66d7n92aqI2nHZMijS0YM/d9TqYFo="; }; }; beta = { x86_64-linux = { url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - hash = "sha256-SnfFd+ksJc69r7GGFUYCLH0NAwwiSxEDyaIRTrj/VWo="; + hash = "sha256-siQ6w1byDkfNrbkvjLWmQRbJ5nVZZv24vg0RFWaRHmE="; }; aarch64-linux = { url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; - hash = "sha256-5PDlMe/EZNBkfIrf6se4B5TKVYycSSoqiv0iMEPiIrA="; + hash = "sha256-WX6NzBXBSBf/hIl1kTIuUvCnEZ1+B0NBHfKvMeIZOw4="; }; x86_64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; - hash = "sha256-nn8lnn52MkKcFRluH9k8IoAu4vZ1C9Uk/+k6TQ6CKFs="; + hash = "sha256-HQRw1OGIT/cVjDk4PGa8x4QdYHQxtqMePsUh+cpyysM="; }; aarch64-darwin = { url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; - hash = "sha256-ACeFyaDzo1I4w/9CrkQ5iO/JBHYRbxxzMDhTX4oI548="; + hash = "sha256-1KcTgmxDhbvB6gzTqF3bhu5toCSjskGjCflrBSNYzk4="; }; }; }; @@ -59,7 +59,7 @@ let homepage = "https://1password.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; + maintainers = with maintainers; [ timstott savannidgerinel amaxine sebtm ]; platforms = builtins.attrNames sources.${channel}; mainProgram = "1password"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix index 4a05bc4e3a..a4f0b957c9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar }: +{ lib, stdenv, fetchurl, fetchzip, autoPatchelfHook, installShellFiles, cpio, xar, _1password, testers }: let inherit (stdenv.hostPlatform) system; @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.19.0"; + version = "2.21.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-/sP5Z52fWkRcv+Wj45HTV1Ckve+jA92m91kGGJwdC6s=" "zip"; - i686-linux = fetch "linux_386" "sha256-UGPWk0I/nCaqWWz/rwG/TSDie0/tarKroGi+7Ge7kE4=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-rSZM0GuroSqVokhkjPtk3+2+C9w5/Tkh2cvB+kShyHY=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-3zVD8LUdxhzroLlnQCiCVELEQMPmCriRff85ZlfgSKI=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-pXGBlduNOvxpPMd/BObHVXXGQ0ZTlIkqZ3jYyoGXnqA=" "zip"; + i686-linux = fetch "linux_386" "sha256-iePA4nzwBtAlYWybmQdV7Zvvnv+jPqrndB4aabf/JMM=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-wevv0KYe01ZL70zL4BNti/oCcAzNJ3EO97QIU1BYQRE=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-AViR53q1/jZtzpFZ7FaBwoZAGuXsGHfULEIuIrTqgSs=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; @@ -63,6 +63,10 @@ stdenv.mkDerivation { $out/bin/${mainProgram} --version ''; + passthru.tests.version = testers.testVersion { + package = _1password; + }; + meta = with lib; { description = "1Password command-line tool"; homepage = "https://developer.1password.com/docs/cli/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix index 0dbcf051c3..60b835c719 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "ArchiSteamFarm"; # nixpkgs-update: no auto update - version = "5.4.7.3"; + version = "5.4.9.3"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; rev = version; - hash = "sha256-xxHNMqFHxFVbKpy9JHHif4GZ/jk9CUUwgyPWmlTXgcc="; + hash = "sha256-Yp8hnMIeV+ZHY6yISJdFd1yAQipQsU5vcXgxFDvkGnA="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_7_0; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix index 40c6bf53a7..5d353bfdf6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix @@ -56,12 +56,12 @@ (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; }) (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; }) - (fetchNuGet { pname = "JetBrains.Annotations"; version = "2022.3.1"; sha256 = "0lkhyyz25q82ygnxy26lwy5cl8fvkdc13pcn433xpjj8akzbmgd6"; }) - (fetchNuGet { pname = "Markdig.Signed"; version = "0.31.0"; sha256 = "1amf0yp5fqdkrr2r6nscpw1h1r3gghhxbczk6j255smdhhy0dzv9"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.2.0"; sha256 = "0nx7nrzbg9gk9skdc9x330cbr5xbsly6z9gzxm46vywf55yp8vaj"; }) + (fetchNuGet { pname = "Markdig.Signed"; version = "0.32.0"; sha256 = "0rc1d8pwypq44pr15wn8g52zbqz70swdrdmjlzccf6zvwy1vyqkc"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; version = "7.0.0"; sha256 = "1f13vsfs1rp9bmdp3khk4mk2fif932d72yxm2wszpsr239x4s2bf"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; version = "7.0.0"; sha256 = "1w49rg0n5wb1m5wnays2mmym7qy7bsi2b1zxz97af2rkbw3s3hbd"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.6.2"; sha256 = "1wwmg6hn4dp2mvwn2bm81wccdw149lq17xdnpz17mvg4zcwmax7g"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.7.0"; sha256 = "12m9fay2d7jvj00hfpws37vflpqvz4dy4gcm25bjycg1zyfpzvly"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "6.0.0"; sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) @@ -71,14 +71,14 @@ (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "6.0.0"; sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.6.2"; sha256 = "1a658bnh5q3lfkrr81h3lyx1mc3hggnjr1bpmim71rr2s42ad70v"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.7.0"; sha256 = "1srhqqmnf9pxdbpffr7dh0bihhf09d0iq5g6gh8ql7brfrh99lvb"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.2.3"; sha256 = "07b19k89whj69j87afkz86gp9b3iybw8jqwvlgcn43m7fb2y99rr"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.6.2"; sha256 = "0asbrbdyyig1p034smf79lszzbfv1cn6q181i7d4p2vsiqpjp9sj"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.6.2"; sha256 = "0lcj8kkcnxbwiaw6j0xf4fxqpa6z0s41nq52spvckfg4367lg4fg"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.7.0"; sha256 = "1sqmk99644fx66zk2qa2ims1zl6741i3wl4rjh4z6jakd4xbc28i"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.7.0"; sha256 = "1s8ap0ljqssbqp1ilgsidjr948b9szf1cbl3fgl6smxig9im4zrl"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) - (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.0.4"; sha256 = "02jffh6kmkccakr51v3iwwq3281sypdilpjjf845dwrsl9ksf73k"; }) - (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.0.4"; sha256 = "0dz0mn6bp3bb650k992mr2lga7xn1xc3qfbdfivgknfccyy8d6k8"; }) + (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.1.1"; sha256 = "0y3ic8jv5jhld6gan2qfa2wyk4z57f7y4y5a47njr0jvxxnarg2c"; }) + (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.1.1"; sha256 = "1lbgkrbrkmw4c54g61cwbmwc4zl8hyqmp283ymvj93lq7chbxasn"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; sha256 = "0c27bhy9x3c2n26inq32kmp6drpm71n6mqnmcr19wrlcaihglj35"; }) @@ -86,9 +86,9 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.2.0"; sha256 = "1j27wrjxjpfy10s5182d477y6qb50fdak6r0vx44bbsakmv0zv3s"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.0"; sha256 = "08rlrag6ilxn1wyd5ivsny0rgidsn3imsx5bqjwv5dlwdjh5acfh"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.0"; sha256 = "1fmdp6bjzcj1nfpnlzcyszl8jnmr35gd79ngqx6cikpg8xpyczhr"; }) + (fetchNuGet { pname = "NLog"; version = "5.2.3"; sha256 = "0srai3s2kk9y2jimdvw1xw86nch38q6nza598dpr81dghx3s6j6w"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.3"; sha256 = "0j19fljxbcc0bysmj7i0fmiax6sp5kjapf2llkimv7dh63rj9ckg"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.3"; sha256 = "0rhha2lwrzwlx0q1a8w9ph9xwayl3kmmy200ygsghcd02srlazkj"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.2.16"; sha256 = "0pwlqlq2p8my2sr8b0cvdav5cm8wpwf3s4gy7s1ba701ac2zyb9y"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.16"; sha256 = "00znhikq7valr3jaxg66cwli9hf75wkmmpf6rf8p790hf8lxq0c5"; }) diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index c04eb6811d..77f4e9c6e2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -9,11 +9,11 @@ buildNpmPackage { repo = "ASF-ui"; # updated by the update script # this is always the commit that should be used with asf-ui from the latest asf version - rev = "0dc9b31a571fe840ac1661b9e9777f253304529d"; - hash = "sha256-gY+4H6roqqoRFTwyNboXKg8LM7BfxQYYij/eilohFNY="; + rev = "0b812a7ab0d2f01a675d27f80008ad7b6972b4aa"; + hash = "sha256-ut0x/qT3DyDASW4QbNT+BF6eXHCIbTol5E+3+tirFDA="; }; - npmDepsHash = "sha256-3sRjlFuFyG8j8CPKG8Gj5QhE4YD9DJ5qaTJlNJT2Oao="; + npmDepsHash = "sha256-HpBEoAIGejpHJnUciz4iWILcXdgpw7X1xFuXmx9Z9dw="; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/applications/misc/HentaiAtHome/default.nix b/third_party/nixpkgs/pkgs/applications/misc/HentaiAtHome/default.nix index 4c94fa8348..d5023c64fd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/HentaiAtHome/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/HentaiAtHome/default.nix @@ -10,12 +10,11 @@ }: stdenvNoCC.mkDerivation rec { pname = "HentaiAtHome"; - version = "1.6.1"; + version = "1.6.2"; src = fetchzip { url = "https://repo.e-hentai.org/hath/HentaiAtHome_${version}_src.zip"; - hash = - "sha512-j+B0kx6fjUibI3MjVJ5PVTq9xxtSOTTY/XizAJKjeNkpExJF9DIV4VCwf+sfLlg+7W4UBosnyb8hZNNoidRBKA=="; + hash = "sha256-ioL/GcnbYjt1IETH8521d1TcLGtENdFzceJui1ywXTY="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/OSCAR/default.nix b/third_party/nixpkgs/pkgs/applications/misc/OSCAR/default.nix index 3d8ea91195..fee0c79cd5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/OSCAR/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/OSCAR/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }: mkDerivation rec { pname = "OSCAR"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitLab { owner = "pholy"; repo = "OSCAR-code"; rev = "v${version}"; - sha256 = "sha256-bgETkpyL0yhCD1FfTVN0s9RNOPkDp88W/1Gdxvu+Ons="; + sha256 = "sha256-eaj2/ioh9dXxWv7X/IZv7m/oVcU6t7r+mK5YrrViF2w="; }; buildInputs = [ qtbase qttools qtserialport libGLU ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/activate-linux/default.nix b/third_party/nixpkgs/pkgs/applications/misc/activate-linux/default.nix index b48236dd96..1a6da925d0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/activate-linux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/activate-linux/default.nix @@ -4,39 +4,63 @@ , pkg-config , xorg , cairo +, wayland +, wayland-protocols +, wayland-scanner +, libconfig }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "activate-linux"; - version = "unstable-2022-05-22"; + version = "1.1.0"; src = fetchFromGitHub { owner = "MrGlockenspiel"; - repo = pname; - rev = "18a6dc9771c568c557569ef680386d5d67f25e96"; - sha256 = "wYoCyWZqu/jgqAuNYdNr2bjpz4pFRTnAF7qF4BRs9GE="; + repo = "activate-linux"; + rev = "v${finalAttrs.version}"; + hash = "sha256-6XnoAoZwAs2hKToWlDqkaGqucmV1VMkEc4QO0G0xmrg="; }; makeFlags = [ "PREFIX=$(out)" ]; nativeBuildInputs = [ pkg-config + wayland-scanner ]; buildInputs = [ + cairo xorg.libX11 xorg.libXext xorg.libXfixes + xorg.libXi xorg.libXinerama - cairo + xorg.libXrandr + xorg.libXt + xorg.xorgproto + wayland + wayland-protocols + libconfig ]; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + + cp activate-linux $out/bin + cp activate-linux.1 $out/share/man/man1 + + runHook postInstall + ''; meta = with lib; { description = "The \"Activate Windows\" watermark ported to Linux"; homepage = "https://github.com/MrGlockenspiel/activate-linux"; license = licenses.gpl3; - maintainers = with maintainers; [ alexnortung ]; + maintainers = with maintainers; [ alexnortung donovanglover ]; platforms = platforms.linux; + mainProgram = "activate-linux"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/albert/default.nix b/third_party/nixpkgs/pkgs/applications/misc/albert/default.nix index fddfaf70f2..a9008283dd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/albert/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/albert/default.nix @@ -4,43 +4,51 @@ , cmake , libqalculate , muparser +, libarchive , python3Packages , qtbase , qtscxml , qtsvg +, qtdeclarative +, qt5compat , wrapQtAppsHook , nix-update-script +, pkg-config }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "albert"; - version = "0.20.14"; + version = "0.22.13"; src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; - rev = "v${version}"; - sha256 = "sha256-c1Bp7rIloXuWv/kUzWGJJ+bh9656vpuqADy77zYZjqk="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-IZpIgU/cf25XxH8J0xQJLASu0YmTmcHY5RxUcbKrtvA="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake + pkg-config wrapQtAppsHook ]; buildInputs = [ libqalculate + libarchive muparser qtbase qtscxml qtsvg + qtdeclarative + qt5compat ] ++ (with python3Packages; [ python pybind11 ]); postPatch = '' find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' \; - sed -i src/nativepluginprovider.cpp \ + sed -i src/qtpluginprovider.cpp \ -e "/QStringList dirs = {/a QFileInfo(\"$out/lib\").canonicalFilePath()," ''; @@ -50,7 +58,9 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + }; meta = with lib; { description = "A fast and flexible keyboard launcher"; @@ -60,9 +70,10 @@ stdenv.mkDerivation rec { framework. ''; homepage = "https://albertlauncher.github.io"; - changelog = "https://github.com/albertlauncher/albert/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/albertlauncher/albert/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes synthetica ]; + mainProgram = "albert"; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix b/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix index 090d1d5dca..f9ca3c316e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/anytype/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchurl, appimageTools }: +{ lib, fetchurl, appimageTools, makeWrapper }: let pname = "anytype"; - version = "0.34.3"; + version = "0.35.4"; name = "Anytype-${version}"; nameExecutable = pname; src = fetchurl { url = "https://anytype-release.fra1.cdn.digitaloceanspaces.com/Anytype-${version}.AppImage"; name = "Anytype-${version}.AppImage"; - sha256 = "sha256-YJMpCEQ6eJYISGeYgvS6TcQwU2eD6fjgHrHRKA6CQJU="; + sha256 = "sha256-heS+3ucxv4WTiqegdmjpv8aWuC+3knxC00SDDg4R8iU="; }; appimageContents = appimageTools.extractType2 { inherit name src; }; in @@ -20,6 +20,9 @@ appimageTools.wrapType2 { extraInstallCommands = '' mv $out/bin/${name} $out/bin/${pname} + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" install -m 444 -D ${appimageContents}/anytype.desktop -t $out/share/applications substituteInPlace $out/share/applications/anytype.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' diff --git a/third_party/nixpkgs/pkgs/applications/misc/appcleaner/default.nix b/third_party/nixpkgs/pkgs/applications/misc/appcleaner/default.nix new file mode 100644 index 0000000000..eff32c76f9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/appcleaner/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenvNoCC +, fetchurl +, unzip +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "appcleaner"; + version = "3.6.8"; + + src = fetchurl { + url = "https://freemacsoft.net/downloads/AppCleaner_${finalAttrs.version}.zip"; + hash = "sha256-4BL3KUQkc8IOfM4zSwAYJSHktmcupoGzSTGxgP6z1r4="; + }; + dontUnpack = true; + + nativeBuildInputs = [ unzip ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + unzip -d $out/Applications $src + + runHook postInstall + ''; + + meta = with lib; { + description = "Uninstall unwanted apps"; + homepage = "https://freemacsoft.net/appcleaner"; + license = licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ emilytrau Enzime ]; + platforms = platforms.darwin; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix index 7fb0de24c1..2389285e99 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix @@ -11,10 +11,10 @@ buildGoModule rec { owner = "mholt"; repo = pname; rev = "v${version}"; - sha256 = "1py186hfy4p69wghqmbsyi1r3xvw1nyl55pz8f97a5qhmwxb3mwp"; + hash = "sha256-l9exOq8QF3WSQ/+WQr0NfPeRQ/R6VQwfT+YS76BBwd8="; }; - vendorSha256 = "1y4v95z1ga111g3kdv5wvyikwifl25f36firf1i916rxli6f6g5i"; + vendorHash = "sha256-sTzjTKQ9m5BicDk6M1wR1EU+o9+87DbHCyGoF35Jm/g="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix index 3ab0b19f63..6ef313fa6d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ausweisapp2/default.nix @@ -14,6 +14,12 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; + # The build scripts copy the entire translations directory from Qt + # which ends up being read-only because it's in the store. + preBuild = '' + chmod +w resources/translations + ''; + buildInputs = [ qtsvg qttools qtwebsockets qtquickcontrols2 qtgraphicaleffects pcsclite ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix index 199e89dc0b..95a439b675 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "authy"; # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version' - version = "2.3.0"; - rev = "19"; + version = "2.4.1"; + rev = "21"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; - hash = "sha256-WN/vcY3kfF/HQZ7opyIdDevU5oDYDGjshS7XVU7yrj8="; + hash = "sha256-a5z6Lwdgody88f7has/f2AMg9m9fGWsJSexZM6KUGOY="; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix b/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix index ef91009391..43aad6d5be 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/auto-multiple-choice/default.nix @@ -25,10 +25,11 @@ }: stdenv.mkDerivation (finalAttrs: rec { pname = "auto-multiple-choice"; - version = "1.5.2"; + version = "1.6.0"; src = fetchurl { - url = "https://download.auto-multiple-choice.net/${pname}_${version}_precomp.tar.gz"; - sha256 = "sha256-AjonJOooSe53Fww3QU6Dft95ojNqWrTuPul3nkIbctM="; + url = "https://download.auto-multiple-choice.net/${pname}_${version}_dist.tar.gz"; + # before 1.6.0, the URL pattern used "precomp" instead of "dist". ^^^^ + sha256 = "sha256-I9Xw1BN8ZSQhi5F1R3axHBKE6tnaCNk8k5tts6LoMjY="; }; # There's only the Makefile diff --git a/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix b/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix index 7e366d19d5..f90bed6390 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/azuredatastudio/default.nix @@ -4,21 +4,31 @@ , copyDesktopItems , makeDesktopItem , makeWrapper -, libuuid -, libunwind -, libxkbcommon -, icu -, openssl -, zlib -, curl -, at-spi2-core +, alsa-lib , at-spi2-atk +, at-spi2-core +, cairo +, cups +, curl +, dbus +, expat +, gdk-pixbuf +, glib , gnutar -, atomEnv -, libkrb5 +, gtk3 +, icu , libdrm +, libunwind +, libuuid +, libxkbcommon , mesa +, nspr +, nss +, openssl +, pango +, systemd , xorg +, zlib }: # from justinwoo/azuredatastudio-nix @@ -115,20 +125,34 @@ stdenv.mkDerivation rec { sqltoolsservicePath = "${targetPath}/resources/app/extensions/mssql/sqltoolsservice/Linux/4.7.1.6"; rpath = lib.concatStringsSep ":" [ - atomEnv.libPath - ( - lib.makeLibraryPath [ - libuuid - at-spi2-core - at-spi2-atk - stdenv.cc.cc.lib - libkrb5 - libdrm - libxkbcommon - mesa - xorg.libxshmfence - ] - ) + (lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + mesa + nss + nspr + libdrm + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxshmfence + libxkbcommon + xorg.libxkbfile + pango + stdenv.cc.cc.lib + systemd + ]) targetPath sqltoolsserviceRpath ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix index d9fe7a52bb..57d87d906e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix @@ -5,15 +5,15 @@ , x11Support ? true, xorg }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bemenu"; - version = "0.6.15"; + version = "0.6.16"; src = fetchFromGitHub { owner = "Cloudef"; - repo = pname; - rev = version; - sha256 = "sha256-gdeNaqtxqxBtG9bkxozPE/DLQgLqCt1vh2A2WmgNn7w="; + repo = finalAttrs.pname; + rev = finalAttrs.version; + sha256 = "sha256-K9a9BUodpKwvEOhnF2/TGo5zLm7F9RzqSCcWzuhKcWA="; }; strictDeps = true; @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { description = "Dynamic menu library and client program inspired by dmenu"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lheckemann ]; + mainProgram = "bemenu"; platforms = with platforms; linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix index f007fb7137..534107f615 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/birdtray/default.nix @@ -7,35 +7,24 @@ , qtbase , qttools , qtx11extras - , qttranslations }: mkDerivation rec { pname = "birdtray"; - version = "1.9.0"; + version = "1.11.4"; src = fetchFromGitHub { owner = "gyunaev"; repo = pname; rev = "v${version}"; - sha256 = "1469ng6zk0qx0qfsihrnlz1j9i1wk0hx4vqdaplz9mdpyxvmlryk"; + sha256 = "sha256-rj8tPzZzgW0hXmq8c1LiunIX1tO/tGAaqDGJgCQda5M="; }; - patches = [ - # See https://github.com/NixOS/nixpkgs/issues/86054 - ./fix-qttranslations-path.diff - ]; - nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ qtbase qttools qtx11extras ]; - postPatch = '' - substituteInPlace src/birdtrayapp.cpp \ - --subst-var-by qttranslations ${qttranslations} - ''; - # Wayland support is broken. # https://github.com/gyunaev/birdtray/issues/113#issuecomment-621742315 qtWrapperArgs = [ "--set QT_QPA_PLATFORM xcb" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/birdtray/fix-qttranslations-path.diff b/third_party/nixpkgs/pkgs/applications/misc/birdtray/fix-qttranslations-path.diff deleted file mode 100644 index 2a379b5e27..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/birdtray/fix-qttranslations-path.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/birdtrayapp.cpp b/src/birdtrayapp.cpp -index 847b4d3..3a3709a 100644 ---- a/src/birdtrayapp.cpp -+++ b/src/birdtrayapp.cpp -@@ -130,7 +130,7 @@ bool BirdtrayApp::loadTranslations() { - [](QString path) { return path.append("/translations"); }); - QLocale locale = QLocale::system(); - bool success = loadTranslation( -- qtTranslator, locale, "qt", {QLibraryInfo::location(QLibraryInfo::TranslationsPath)}); -+ qtTranslator, locale, "qt", {QLatin1String("@qttranslations@/translations")}); - success &= loadTranslation(dynamicTranslator, locale, "dynamic", locations); - success &= loadTranslation(mainTranslator, locale, "main", locations); - return success; diff --git a/third_party/nixpkgs/pkgs/applications/misc/bitwarden-menu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bitwarden-menu/default.nix index 95ec2826a5..d6c7faab4d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bitwarden-menu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bitwarden-menu/default.nix @@ -27,6 +27,6 @@ buildPythonApplication rec { description = "Dmenu/Rofi frontend for managing Bitwarden vaults. Uses the Bitwarden CLI tool to interact with the Bitwarden database."; homepage = "https://github.com/firecat53/bitwarden-menu"; license = licenses.mit; - maintainers = [ maintainers.rodrgz ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix index 86409f1491..0b368ef1b3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix @@ -15,6 +15,9 @@ , potrace , openxr-loader , embree, gmp, libharu +, openpgl +, mesa +, runCommand }: let @@ -26,13 +29,13 @@ let }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "blender"; - version = "3.6.2"; + version = "3.6.4"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-olEmcOM3VKo/IWOhQp/qOkdJvwzM7bCkf8i8Bzh07Eg="; + hash = "sha256-zFL0GRWAtNC3C+SAspWZmGa8US92EiYQgVfiOsCJRx4="; }; patches = [ @@ -56,6 +59,7 @@ stdenv.mkDerivation rec { potrace libharu libepoxy + openpgl ] ++ lib.optionals waylandSupport [ wayland wayland-protocols libffi libdecor libxkbcommon dbus @@ -79,7 +83,7 @@ stdenv.mkDerivation rec { ++ lib.optional cudaSupport cudaPackages.cudatoolkit ++ lib.optional colladaSupport opencollada ++ lib.optional spaceNavSupport libspnav; - pythonPath = with python310Packages; [ numpy requests ]; + pythonPath = with python310Packages; [ numpy requests zstandard ]; postPatch = '' '' + @@ -184,7 +188,45 @@ stdenv.mkDerivation rec { done ''; - passthru = { inherit python; }; + passthru = { + inherit python; + + tests = { + render = runCommand "${pname}-test" { } '' + set -euo pipefail + + export LIBGL_DRIVERS_PATH=${mesa.drivers}/lib/dri + export __EGL_VENDOR_LIBRARY_FILENAMES=${mesa.drivers}/share/glvnd/egl_vendor.d/50_mesa.json + + cat <<'PYTHON' > scene-config.py + import bpy + bpy.context.scene.eevee.taa_render_samples = 32 + bpy.context.scene.cycles.samples = 32 + if ${if stdenv.isAarch64 then "True" else "False"}: + bpy.context.scene.cycles.use_denoising = False + bpy.context.scene.render.resolution_x = 100 + bpy.context.scene.render.resolution_y = 100 + bpy.context.scene.render.threads_mode = 'FIXED' + bpy.context.scene.render.threads = 1 + PYTHON + + mkdir $out + for engine in BLENDER_EEVEE CYCLES; do + echo "Rendering with $engine..." + # Beware that argument order matters + ${finalAttrs.finalPackage}/bin/blender \ + --background \ + -noaudio \ + --factory-startup \ + --python-exit-code 1 \ + --python scene-config.py \ + --engine "$engine" \ + --render-output "$out/$engine" \ + --render-frame 1 + done + ''; + }; + }; meta = with lib; { description = "3D Creation/Animation/Publishing System"; @@ -198,4 +240,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ goibhniu veprbl ]; mainProgram = "blender"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix index 64f0df2e4a..eb0c6a8414 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix @@ -28,13 +28,13 @@ python3Packages.buildPythonApplication rec { pname = "bottles-unwrapped"; - version = "51.6"; + version = "51.9"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = "bottles"; rev = version; - sha256 = "sha256-9oEC+ksgHz2HP4jVwTbLzjqc8WG1+S8hmVgl2dcuPB0="; + sha256 = "sha256-iZUszwVcbVn6Xsqou6crSp9gJBRmm5vEqxS87h/s3PQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix b/third_party/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix index 969a2d8178..fd0d38f698 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bottles/fhsenv.nix @@ -1,7 +1,6 @@ { buildFHSEnv , symlinkJoin , bottles-unwrapped -, gst_all_1 , extraPkgs ? pkgs: [ ] , extraLibraries ? pkgs: [ ] }: @@ -37,6 +36,14 @@ let fhsEnv = { libXv libXxf86vm ]; + gstreamerDeps = pkgs: with pkgs.gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-plugins-bad + gst-libav + ]; in pkgs: with pkgs; [ # https://wiki.winehq.org/Building_Wine @@ -49,12 +56,6 @@ let fhsEnv = { gnutls libglvnd gsm - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-ugly - gst_all_1.gst-plugins-bad - gst_all_1.gst-libav libgphoto2 libjpeg_turbo libkrb5 @@ -91,11 +92,8 @@ let fhsEnv = { p11-kit zlib # Freetype ] ++ xorgDeps pkgs + ++ gstreamerDeps pkgs ++ extraLibraries pkgs; - - profile = '' - export GST_PLUGIN_PATH=/usr/lib32/gstreamer-1.0:/usr/lib64/gstreamer-1.0 - ''; }; in symlinkJoin { diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix index ea04a7ea56..a71984dd2c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix @@ -32,25 +32,24 @@ stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "6.25.0"; + version = "6.26.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-4ghB2RUImh8AsMGsBCsVeKXgyV+llCLNy24/2LNJwv0="; + hash = "sha256-7UUnDtTRf162xKMUuZoKh+y47oeUtrOsFHUTAvtOryM="; }; - # https://sources.debian.org/patches/calibre/${finalAttrs.version}+dfsg-1 patches = [ # allow for plugin update check, but no calibre version check (fetchpatch { name = "0001-only-plugin-update.patch"; - url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}-1/debian/patches/0001-only-plugin-update.patch"; + url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/0001-only-plugin-update.patch"; hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ="; }) (fetchpatch { name = "0007-Hardening-Qt-code.patch"; - url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}-1/debian/patches/hardening/0007-Hardening-Qt-code.patch"; - hash = "sha256-WBm0dWDXoPT6alEdK5dVMrVTOxG7Z8bq1s0iO2HTy/Q="; + url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch"; + hash = "sha256-2V8H6ElvzS5yw1di+XZvMssuokUT5zP3aTzpDpMsMac="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; @@ -204,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: { license = if unrarSupport then lib.licenses.unfreeRedistributable else lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ pSub AndersonTorres ]; + maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.unix; broken = stdenv.isDarwin; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cambrinary/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cambrinary/default.nix index 67e325cbce..1fecfe1c17 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cambrinary/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cambrinary/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication , fetchFromGitHub +, flit , aiohttp , beautifulsoup4 }: @@ -8,7 +9,7 @@ buildPythonApplication rec { pname = "cambrinary"; version = "unstable-2023-07-16"; - format = "flit"; + format = "pyproject"; src = fetchFromGitHub { owner = "xueyuanl"; @@ -17,6 +18,10 @@ buildPythonApplication rec { hash = "sha256-wDcvpKAY/6lBjO5h3qKH3+Y2G2gm7spcKCXFMt/bAtE="; }; + nativeBuildInputs = [ + flit + ]; + propagatedBuildInputs = [ aiohttp beautifulsoup4 diff --git a/third_party/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix new file mode 100644 index 0000000000..be7898d696 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/camunda-modeler/default.nix @@ -0,0 +1,71 @@ +{ stdenvNoCC +, lib +, fetchurl +, electron +, makeWrapper +, makeDesktopItem +, copyDesktopItems +}: + +stdenvNoCC.mkDerivation rec { + pname = "camunda-modeler"; + version = "5.15.1"; + + src = fetchurl { + url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; + hash = "sha256-q9wzfNyMzlyGTjaFOA7TZt+F/jC6EnPb/i4Q9eRxS3E="; + }; + sourceRoot = "camunda-modeler-${version}-linux-x64"; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/${pname} + cp -a {locales,resources} $out/share/${pname} + install -Dm644 support/mime-types.xml $out/share/mime/packages/${pname}.xml + + for SIZE in 16 48 128; do + install -D -m0644 support/icon_''${SIZE}.png "$out/share/icons/hicolor/''${SIZE}x''${SIZE}/apps/${pname}.png" + done + + runHook postInstall + ''; + + postFixup = '' + makeWrapper ${electron}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar + ''; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = pname; + desktopName = "Camunda Modeler"; + icon = pname; + keywords = [ "bpmn" "cmmn" "dmn" "form" "modeler" "camunda"]; + genericName = "Process Modeling Tool"; + comment = meta.description; + mimeTypes = [ "application/bpmn" "application/cmmn" "application/dmn" "application/camunda-form" ]; + extraConfig = { + X-Ayatana-Desktop-Shortcuts = "NewWindow;RepositoryBrowser"; + }; + }) + ]; + + meta = with lib; { + homepage = "https://github.com/camunda/camunda-modeler"; + description = "An integrated modeling solution for BPMN, DMN and Forms based on bpmn.io"; + maintainers = teams.wdz.members; + license = licenses.mit; + inherit (electron.meta) platforms; + }; +} + diff --git a/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix index 319d0a39be..d03b382f1c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cartridges/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cartridges"; - version = "2.2.1"; + version = "2.3"; src = fetchFromGitHub { owner = "kra-mo"; repo = "cartridges"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-LCO3GSRNi1alP9rRwBAfVAF49i4FmhsMOG9LW4PGB3s="; + hash = "sha256-d0c0043kssPvGxs6FygDkTKZoYtFge2cH4MIhz2vVYk="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/chatblade/default.nix b/third_party/nixpkgs/pkgs/applications/misc/chatblade/default.nix index ede64d0faa..e338322ae6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/chatblade/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/chatblade/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "chatblade"; - version = "0.2.3"; + version = "0.3.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-YXZeqIX8cxNDvM4Pn0or6Lqj2ffX9aQb3b/xMIeBHRk="; + sha256 = "sha256-QBURvPfDBbhF+AhQ0SsHYnZzr5RN36Cqa2DrAQZW0gU="; }; doCheck = false; # there are no tests diff --git a/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix index c6e6568eaa..1b85a1ec65 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { installShellCompletion scripts/cheat.{bash,fish,zsh} ''; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix index 0abdb65ca0..04c30deef7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "cherrytree"; - version = "0.99.56"; + version = "1.0.1"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - hash = "sha256-kDbUn81YfSMAX7FKcw+nDSrsNvrhOX0+NmgZUYNqCqQ="; + hash = "sha256-A/4OcsAOECgQnENj2l9BX713KHG+zk5cJE+yyHXw1TM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix b/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix index d5b35fc04c..f5c6da15bd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/chrysalis/default.nix @@ -2,34 +2,40 @@ let pname = "chrysalis"; - version = "0.12.0"; -in appimageTools.wrapAppImage rec { + version = "0.13.2"; name = "${pname}-${version}-binary"; - - src = appimageTools.extract { - inherit name; - src = fetchurl { - url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; - sha256 = "sha256-sQoEO1UII4Gbp7UbHCCyejsd94lkBbi93TH325EamFc="; - }; + src = fetchurl { + url = + "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}-x64.AppImage"; + hash = + "sha512-WuItdQ/hDxbZZ3zulHI74NUkuYfesV/31rA1gPakCFgX2hpPrmKzwUez2vqt4N5qrGyphrR0bcelUatGZhOn5A=="; }; + appimageContents = appimageTools.extract { inherit name src; }; +in appimageTools.wrapType2 rec { + inherit name pname src; multiArch = false; - extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ - p.glib - ]; + extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.glib ]; # Also expose the udev rules here, so it can be used as: # services.udev.packages = [ pkgs.chrysalis ]; # to allow non-root modifications to the keyboards. extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} + mv $out/bin/{${name},${pname}} - mkdir -p $out/lib/udev/rules.d - ln -s \ - --target-directory=$out/lib/udev/rules.d \ - ${src}/resources/static/udev/60-kaleidoscope.rules + install -m 444 \ + -D ${appimageContents}/usr/lib/chrysalis/resources/static/udev/60-kaleidoscope.rules \ + -t $out/lib/udev/rules.d + + install -m 444 \ + -D ${appimageContents}/Chrysalis.desktop \ + -t $out/share/applications + substituteInPlace \ + $out/share/applications/Chrysalis.desktop \ + --replace 'Exec=Chrysalis' 'Exec=${pname}' + + cp -r ${appimageContents}/usr/share/icons $out/share ''; meta = with lib; { @@ -38,5 +44,6 @@ in appimageTools.wrapAppImage rec { license = licenses.gpl3; maintainers = with maintainers; [ aw ]; platforms = [ "x86_64-linux" ]; + mainProgram = pname; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch b/third_party/nixpkgs/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch deleted file mode 100644 index 7ba0dab2d1..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/cobang/0001-Poetry-core-and-pillow-9.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 324a267b0e5505c9124874581bc48fb174fb2542 Mon Sep 17 00:00:00 2001 -From: "P. R. d. O" -Date: Fri, 4 Mar 2022 07:03:17 -0600 -Subject: [PATCH] Pillow update - ---- - pyproject.toml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pyproject.toml b/pyproject.toml -index 5dc25e0..b3ba397 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -11,7 +11,7 @@ readme = "README.rst" - [tool.poetry.dependencies] - python = "^3.7" - logbook = "^1.5.3" --Pillow = "^8.2.0" -+Pillow = "^9.0.0" - requests = "^2.24.0" - kiss-headers = "^2.2.3" - single-version = "^1.5.1" -@@ -33,4 +33,4 @@ skip-string-normalization = true - - [build-system] --requires = ["poetry>=0.12"] -+requires = ["poetry-core"] --build-backend = "poetry.masonry.api" -+build-backend = "poetry.core.masonry.api" --- -2.35.1 - diff --git a/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix index d8f8932fd7..d3d203b6ae 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cobang/default.nix @@ -1,49 +1,62 @@ { lib +, atk , buildPythonApplication , fetchFromGitHub -, wrapGAppsHook -, atk , gdk-pixbuf , gobject-introspection -, gtk3 , gst-plugins-good +, gst-python +, gtk3 +, kiss-headers , libhandy , librsvg +, logbook , networkmanager , pango -, gst-python -, kiss-headers -, logbook , pillow , poetry-core , pygobject3 +, pytestCheckHook , python , python-zbar +, pythonRelaxDepsHook , requests , single-version -, pytestCheckHook }: +, wrapGAppsHook +}: buildPythonApplication rec { pname = "cobang"; - version = "0.9.6"; + version = "0.10.1"; format = "pyproject"; src = fetchFromGitHub { owner = "hongquan"; repo = "CoBang"; - rev = "v${version}"; - sha256 = "sha256-YcXQ2wAgFSsJEqcaDQotpX1put4pQaF511kwq/c2yHw="; + rev = "refs/tags/v${version}"; + hash = "sha256-yNDnBTBmwcP3g51UkkLNyF4eHYjblwxPxS2lMwbFKUM="; }; - patches = [ - ./0001-Poetry-core-and-pillow-9.patch + pythonRelaxDeps = [ + "logbook" + "Pillow" ]; nativeBuildInputs = [ gobject-introspection + pythonRelaxDepsHook wrapGAppsHook ]; + buildInputs = [ + atk + gdk-pixbuf + gst-plugins-good + libhandy + networkmanager + pango + ]; + propagatedBuildInputs = [ gst-python kiss-headers @@ -56,15 +69,6 @@ buildPythonApplication rec { single-version ]; - buildInputs = [ - atk - gdk-pixbuf - gst-plugins-good - libhandy - networkmanager - pango - ]; - nativeCheckInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix index a0ceabf9d1..6e22b443a5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-NAw1uoBL/FnNLJ86L9aBCOY65aJn1DDGK0Cd0IO2kr0="; }; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/conceal/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/conceal/Cargo.lock index 39e329dfcf..05ab253d4c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/conceal/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/conceal/Cargo.lock @@ -2,6 +2,12 @@ # It is not intended for manual editing. version = 3 +[[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" @@ -13,39 +19,48 @@ dependencies = [ [[package]] name = "anstream" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" dependencies = [ "anstyle", "anstyle-parse", + "anstyle-query", "anstyle-wincon", - "concolor-override", - "concolor-query", + "colorchoice", "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "0.3.5" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] name = "anstyle-parse" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ "utf8parse", ] [[package]] -name = "anstyle-wincon" -version = "0.2.0" +name = "anstyle-query" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ "anstyle", "windows-sys", @@ -64,10 +79,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bumpalo" -version = "3.11.1" +name = "bitflags" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + +[[package]] +name = "bumpalo" +version = "3.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "cc" @@ -83,24 +104,24 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", - "time 0.1.44", + "time 0.1.45", "wasm-bindgen", "winapi", ] [[package]] name = "clap" -version = "4.2.0" +version = "4.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6efb5f0a41b5ef5b50c5da28c07609c20091df0c1fc33d418fa2a7e693c2b624" +checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d" dependencies = [ "clap_builder", "clap_derive", @@ -109,31 +130,30 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.2.0" +version = "4.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671fcaa5debda4b9a84aa7fde49c907c8986c0e6ab927e04217c9cb74e7c8bc9" +checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b" dependencies = [ "anstream", "anstyle", - "bitflags", "clap_lex", "strsim", ] [[package]] name = "clap_complete" -version = "4.2.0" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c22dcfb410883764b29953103d9ef7bb8fe21b3fa1158bc99986c2067294bd" +checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce" dependencies = [ "clap", ] [[package]] name = "clap_complete_nushell" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fa41f5e6aa83bd151b70fd0ceaee703d68cd669522795dc812df9edad1252c" +checksum = "5d02bc8b1a18ee47c4d2eec3fb5ac034dc68ebea6125b1509e9ccdffcddce66e" dependencies = [ "clap", "clap_complete", @@ -141,115 +161,74 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.2.0" +version = "4.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.10", + "syn", ] [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" [[package]] -name = "codespan-reporting" -version = "0.11.1" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "conceal" -version = "0.3.2" +version = "0.4.1" dependencies = [ "clap", "clap_complete", "clap_complete_nushell", + "dirs", "owo-colors", "thiserror", - "time 0.3.20", + "time 0.3.23", "trash", ] [[package]] -name = "concolor-override" -version = "1.0.0" +name = "core-foundation-sys" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] -name = "concolor-query" -version = "0.3.3" +name = "dirs" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" +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", ] -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "cxx" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn 1.0.107", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.107", -] - [[package]] name = "errno" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" dependencies = [ "errno-dragonfly", "libc", @@ -268,13 +247,24 @@ dependencies = [ [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + [[package]] name = "heck" version = "0.4.1" @@ -283,111 +273,86 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows 0.48.0", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", ] -[[package]] -name = "io-lifetimes" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys", -] - [[package]] name = "is-terminal" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "io-lifetimes", "rustix", "windows-sys", ] [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] [[package]] name = "libc" -version = "0.2.140" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" - -[[package]] -name = "link-cplusplus" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" -dependencies = [ - "cc", -] +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "linux-raw-sys" -version = "0.3.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd550e73688e6d578f0ac2119e32b797a327631a42f9433e59d02e139c8df60d" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" [[package]] name = "log" -version = "0.4.17" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" [[package]] name = "malloc_buf" @@ -398,16 +363,6 @@ dependencies = [ "libc", ] -[[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-traits" version = "0.2.15" @@ -437,9 +392,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "owo-colors" @@ -449,37 +410,56 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "proc-macro2" -version = "1.0.54" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +checksum = "78803b62cbf1f46fde80d7c0e803111524b9877184cfe7c3033659490ac7a7da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] [[package]] -name = "rustix" -version = "0.37.4" +name = "redox_syscall" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c348b5dc624ecee40108aa2922fed8bad89d7fcc2b9f8cb18f632898ac4a37f9" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "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", + "redox_syscall", + "thiserror", +] + +[[package]] +name = "rustix" +version = "0.38.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" +dependencies = [ + "bitflags 2.3.3", "errno", - "io-lifetimes", "libc", "linux-raw-sys", "windows-sys", @@ -491,17 +471,11 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "scratch" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" - [[package]] name = "serde" -version = "1.0.152" +version = "1.0.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" [[package]] name = "strsim" @@ -511,71 +485,51 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.107" +version = "2.0.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "15e3fc8c0c74267e2df136e5e5fb656a464158aa57624053375eb9c8c6e25ae2" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "syn" -version = "2.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aad1363ed6d37b84299588d62d3a7d95b5a5c2d9aad5c85609fda12afaa1f40" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.10", + "syn", ] [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", - "wasi", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] [[package]] name = "time" -version = "0.3.20" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" +checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" dependencies = [ "itoa", "libc", @@ -587,15 +541,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" dependencies = [ "time-core", ] @@ -611,9 +565,9 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "trash" @@ -628,20 +582,20 @@ dependencies = [ "scopeguard", "thiserror", "url", - "windows", + "windows 0.44.0", ] [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" [[package]] name = "unicode-normalization" @@ -652,17 +606,11 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", "idna", @@ -682,10 +630,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] -name = "wasm-bindgen" -version = "0.2.83" +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +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", @@ -693,24 +647,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.107", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -718,22 +672,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "winapi" @@ -751,15 +705,6 @@ 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" @@ -772,16 +717,25 @@ version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" dependencies = [ - "windows-targets", + "windows-targets 0.42.2", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.1", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.1", ] [[package]] @@ -790,13 +744,28 @@ version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +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]] @@ -805,38 +774,80 @@ 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" diff --git a/third_party/nixpkgs/pkgs/applications/misc/conceal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/conceal/default.nix index 3fa0712640..1771624992 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/conceal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/conceal/default.nix @@ -1,14 +1,14 @@ -{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv }: +{ lib, rustPlatform, fetchFromGitHub, installShellFiles, stdenv, testers, conceal }: rustPlatform.buildRustPackage rec { pname = "conceal"; - version = "0.3.2"; + version = "0.4.1"; src = fetchFromGitHub { owner = "TD-Sky"; repo = pname; rev = "v${version}"; - sha256 = "NKAp15mm/pH4g3+fPCxI6U8Y4qdAhV9CLkmII76oGrw="; + sha256 = "sha256-zrG4AE8I1nVvEGNvi7tOsqn6yNOqpRmhJzbuJINnJBw="; }; cargoLock = { @@ -26,14 +26,20 @@ rustPlatform.buildRustPackage rec { --zsh completions/{cnc/_cnc,conceal/_conceal} ''; - # There are no any tests in source project. + # There are not any tests in source project. doCheck = false; + passthru.tests = testers.testVersion { + package = conceal; + command = "conceal --version"; + version = "conceal ${version}"; + }; + meta = with lib; { description = "A trash collector written in Rust"; homepage = "https://github.com/TD-Sky/conceal"; license = licenses.mit; - maintainers = with maintainers; [ jedsek ]; + maintainers = with maintainers; [ jedsek kashw2 ]; broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/copyq/default.nix index 79317e7211..cbd66c89f9 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 = "unstable-2023-04-14"; + version = "7.1.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; - rev = "c4e481315be5a1fa35503c9717b396319b43aa9b"; - hash = "sha256-XLuawTKzDi+ixEUcsllyW5tCVTPlzIozu1UzYOjTqDU="; + rev = "v${version}"; + hash = "sha256-aAmpFKIIFZLPWUaOcf4V1d/wVQ7xRcnXFsqFjROsabg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix index fdc88b417e..f95633f0c8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/coursera-dl/default.nix @@ -15,17 +15,23 @@ python3.pkgs.buildPythonApplication rec { owner = "coursera-dl"; repo = "coursera-dl"; rev = "refs/tags/${version}"; - sha256 = "0akgwzrsx094jj30n4bd2ilwgva4qxx38v3bgm69iqfxi8c2bqbk"; + hash = "sha256-c+ElGIrd4ZhMfWtsNHrHRO3HaRRtEQuGlCSBrvPnbyo="; }; patches = [ (fetchpatch { url = "https://github.com/coursera-dl/coursera-dl/commit/c8796e567698be166cb15f54e095140c1a9b567e.patch"; - sha256 = "sha256:07ca6zdyw3ypv7yzfv2kzmjvv86h0rwzllcg0zky27qppqz917bv"; + hash = "sha256-e52QPr4XH+HnB49R+nkG0KC9Zf1TbPf92dcP7ts3ih0="; }) (fetchpatch { url = "https://github.com/coursera-dl/coursera-dl/commit/6c221706ba828285ca7a30a08708e63e3891b36f.patch"; - sha256 = "sha256-/AKFvBPInSq/lsz+G0jVSl/ukVgCnt66oePAb+66AjI="; + hash = "sha256-/AKFvBPInSq/lsz+G0jVSl/ukVgCnt66oePAb+66AjI="; + }) + # https://github.com/coursera-dl/coursera-dl/pull/857 + (fetchpatch { + name = "python-3.11-compatibility.patch"; + url = "https://github.com/coursera-dl/coursera-dl/commit/7b0783433b6b198fca9e51405b18386f90790892.patch"; + hash = "sha256-OpW8gqzrMyaE69qH3uGsB5TNQTYaO7pn3uJ7NU5SrcM="; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix index 77611e2da4..9c207dcd77 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchzip -, substituteAll , cmake , extra-cmake-modules , qttools @@ -10,7 +9,6 @@ , tesseract4 , qtmultimedia , qtx11extras -, qttranslations , wrapQtAppsHook , gst_all_1 , testers @@ -26,14 +24,6 @@ stdenv.mkDerivation rec { hash = "sha256-PvfruCqmTBFLWLeIL9NV6+H2AifXcY97ImHzD1zEs28="; }; - patches = [ - (substituteAll { - # See https://github.com/NixOS/nixpkgs/issues/86054 - src = ./fix-qttranslations-path.patch; - inherit qttranslations; - }) - ]; - postPatch = '' substituteInPlace data/io.crow_translate.CrowTranslate.desktop \ --replace "Exec=qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" diff --git a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch b/third_party/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch deleted file mode 100644 index 65cfbdf1ac..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/crow-translate/fix-qttranslations-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/src/settings/appsettings.cpp w/src/settings/appsettings.cpp -index 32cabfb..aab92ea 100644 ---- i/src/settings/appsettings.cpp -+++ w/src/settings/appsettings.cpp -@@ -79,7 +79,7 @@ void AppSettings::applyLocale(const QLocale &locale) - const QLocale newLocale = locale == defaultLocale() ? QLocale::system() : locale; - QLocale::setDefault(newLocale); - s_appTranslator.load(newLocale, QStringLiteral(PROJECT_NAME), QStringLiteral("_"), QStandardPaths::locate(QStandardPaths::AppDataLocation, i18nDir, QStandardPaths::LocateDirectory)); -- s_qtTranslator.load(newLocale, QStringLiteral("qt"), QStringLiteral("_"), QLibraryInfo::location(QLibraryInfo::TranslationsPath)); -+ s_qtTranslator.load(newLocale, QStringLiteral("qt"), QStringLiteral("_"), QLatin1String("@qttranslations@/translations")); - } - - QLocale AppSettings::defaultLocale() diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreaction/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreaction/default.nix index 258c8b4ce7..b21f001a0a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreaction/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreaction/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreaction"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rJ4EFKk/zlvQqptbL81WdqqZQUR9hYADFkXuw11SzRc="; + hash = "sha256-qhYuLqWXCpOJCqg+JJ8VQQokNEQVwxpHAtYGITxHZ3Y="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix index 4403a2c08d..590f41a764 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corearchiver"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rn0rasFWSjgBIOpKIb35xsEewOfAQOr4kEiA1GhShg0="; + hash = "sha256-TKBr/CFY4ixQnJuaN+wJB88s6g4lvQz4rwq9YsccRYk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corefm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corefm/default.nix index 3d3edae1b1..c618ee100a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corefm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corefm/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corefm"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ue0OOBf0PAxYHTfo37RvxnsKxzAEGIiGltXBVZpI6lk="; + hash = "sha256-mCFFT/vHzfC4jl1I8SkgaX8qu+AFNNcwUZx4eJeE+i4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coregarage/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coregarage/default.nix index 15cd71ec9e..4c332c4a9a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coregarage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coregarage/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coregarage"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NsCJS+FyHWj2aLXlbzxcHEcdZ2cViZmJlh501/48xdI="; + hash = "sha256-WCSc3ppYaktj9WnPb4n7SmSNWxT2HiXNmPKS3md3ST4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corehunt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corehunt/default.nix index 060a5bc4eb..52c39752af 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corehunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corehunt/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corehunt"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-txQ/uoSwseo0i4/CqdQm3wN9/3p3gioRG9IuJTsgSF4="; + hash = "sha256-Xir1RQG7AlO166lZq1TJssiWoSixY6EfLEjxek+9ifo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreimage/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreimage/default.nix index 0703586727..8ba09d6c94 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreimage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreimage/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreimage"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8ILnZQIErLakiNfGZ91/vY+9XS/eOHcAnIFIuT1x9Mg="; + hash = "sha256-SyGIeoYC4bTBWZ0adOfYJpWkW3/bvFNZg5zK2MN27kA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix index bb9e603f06..69dbcd33a8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreinfo"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EWz2FQQzWVeP2qw1pz2Lg3COUo2y7/9a105R1Bj0Aqw="; + hash = "sha256-DmvmFMttEvNnIp1zwCe0BLrMx3Wlw1U9LcJwyb4Mx9U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix index bf065bc2a5..734b183c84 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corekeyboard"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zOH/w4QroMaVjWnFuWAJQ11RYlpXwIXRG9QYGDkfLVY="; + hash = "sha256-Hylz1x9Wsk0iVhpNBFZJChsl3gIvJDICgpITjIXDZAg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepad/default.nix index d1856445ab..4b27137980 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepad/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepad"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MZdEdGfCaQp5DuDDYRNXi37O+O/aRS8XgAN0Jma/J3k="; + hash = "sha256-qiw6P+I9iAcFcBWiMKAzyxM6waXx/2TPVQHLcLjAnoY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepaint/default.nix index 745a963764..958532bb6f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepaint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepaint/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepaint"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wRF2Z2n9rEixmKYDRqKxQad2JDSxsgfGIWQWpjz/+yU="; + hash = "sha256-ndknVT/gl2P0s3ADW0txiVtAyI/l/ZFWEgufFleS0A4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepdf/default.nix index 8bf3a6f8cb..b7679827f3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepdf/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepdf"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Dm3RDVHw1JXSC3HdS0k/IVTO/o5vaWiCr5vPDjr2uFk="; + hash = "sha256-t3r/bF/uKoprdDoRjrmYTND0Jws+jX6tAGnBeqofBF8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepins/default.nix index c71e64f162..e1274c6d6d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corepins/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corepins"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wrP9Jm3T9gzEwEjNH2SXSqwP/+YRxVIyQRSPxdYgPCs="; + hash = "sha256-vA2Phs+sEs+Gd73xzj6vb91Krm8q3+koWDM7rCUayTQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix index cdec45c745..7d87fc6f45 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corerenamer"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hjI7KK+/u7OcqyjrZkRtBTfo8obDNqdudlFYcJR0dl8="; + hash = "sha256-jN1keyo2tDlgUu243173zgChw2nhvbsLPH9af6jDhKs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreshot/default.nix index 808adcc3d3..183765f635 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreshot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreshot/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreshot"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-K/K6630ctWG856igXF1fAukwu6FbsBzF8JxG8K3gICc="; + hash = "sha256-XPECvwZkJIoN/r5oFWJpgl/WASpybgLjCK/F0XVMHyU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corestats/default.nix index b08a7980fe..8dd6f1089d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corestats/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corestats/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corestats"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AhM7Rvxh8WZPrpDzhY6DYALVe4VlF9b77oX61AVntI0="; + hash = "sha256-584dSlXhPfvTBeDjex1o2TZPoG40tl1fNDiIYqjyzOI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corestuff/default.nix index e482ece3d1..a2946485ab 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corestuff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/corestuff/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "corestuff"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F0kddb622W44MDkZOh4YTyFQ+J/UGGbkcrWXCSDYcek="; + hash = "sha256-2tnJMBbROGWZQDWjy/xGBNkv7DXXKLWrHf2XnMjOjWQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix index 7710f2f753..30570f5e91 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "coreterminal"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sFNKyqzNrPAGitmR8YEtIf6vtnvAP7+jXk4GFnDeGJs="; + hash = "sha256-zMSE1gQ2HJQCqil3MB4slRe0Cojv2XRLd8wLTokF8H0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coretime/default.nix index 844e18b26b..c2a717453e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coretime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coretime/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coretime"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XTX4oeUFwfZE0ey1NjXpAzw0x+4d8IGwU/sEojRwBBY="; + hash = "sha256-0x3014UG861lXRwIBpYiiYVPmhln9Q20jJ4tIO50Tjs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix index 9da76dfa4c..920850cc60 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix @@ -30,13 +30,13 @@ mkDerivation rec { pname = "coretoppings"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3wLDTN3SrbQNs43nQmSBrSB0bD6YineBQ8eNPDws1G8="; + hash = "sha256-IYUkPGgFGI6889IyromMBobIoqSZtALVsSswQ7O1Bp0="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix index a29aa95fdc..8eb056f777 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "coreuniverse"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore/coreapps"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ThEzuwBrPUkXURcW9KiXJs8ExqYWZamlfeQ1IggMWdc="; + hash = "sha256-SjD37+uLKJrPvjxK0douNgGCUq9He3EK86takZlrX7Q="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch index 3d2238b577..08214c30a8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch @@ -15,13 +15,13 @@ index 4c40d4c..5dbb6ff 100644 SystemXdgMime::SystemXdgMime() { -- appsDirs << QDir::home().filePath(".local/share/applications/"); -- appsDirs << "/usr/local/share/applications/" << "/usr/share/applications/"; -- appsDirs << "/usr/share/applications/kde4/" << "/usr/share/gnome/applications/"; -+ appsDirs << QDir::home().filePath(".nix-profile/share/applications/"); -+ appsDirs << "/run/current-system/sw/share/applications/"; -+ appsDirs << "/run/current-system/sw/share/applications/kde4/"; -+ appsDirs << "/run/current-system/sw/share/gnome/applications/"; +- appsDirs << QDir::home().filePath(".local/share/applications/"); +- appsDirs << QDir::root().filePath("usr/local/share/applications/") << QDir::root().filePath("usr/share/applications/"); +- appsDirs << QDir::root().filePath("usr/share/applications/kde4/") << QDir::root().filePath("usr/share/gnome/applications/"); ++ appsDirs << QDir::home().filePath(".nix-profile/share/applications/"); ++ appsDirs << "/run/current-system/sw/share/applications/"; ++ appsDirs << "/run/current-system/sw/share/applications/kde4/"; ++ appsDirs << "/run/current-system/sw/share/gnome/applications/"; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/libcprime/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/libcprime/default.nix index 37f95c4ad1..90df8e546e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/libcprime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/libcprime/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libcprime"; - version = "4.4.1"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6kkKmF9mARhSm93ZrWJiwRNmpkiCxyhSD3W7X3gYuu4="; + hash = "sha256-j6WFLcjDMkYl+9HCmhMRttwtjNX05oP5mfdOsoLC7og="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/libcsys/default.nix index adba59b9da..3a36c40fd2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/libcsys/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cubocore-packages/libcsys/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "libcsys"; - version = "4.4.1"; + version = "4.5.0"; src = fetchFromGitLab { owner = "cubocore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IWzgRwouI/0bQBuEd9CV0Ue6cF2HwRw3jMdLyGA1+TY="; + hash = "sha256-1MHyx01w+dCeAeumcSXRBStgAec2yu1rLwaZaCXRgTc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/darkman/default.nix b/third_party/nixpkgs/pkgs/applications/misc/darkman/default.nix index a20b8ab726..89678b7d0f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/darkman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/darkman/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-6SNXVe6EfVwcXH9O6BxNw+v4/uhKhCtVS3XE2GTc2Sc="; }; - vendorSha256 = "sha256-xEPmNnaDwFU4l2G4cMvtNeQ9KneF5g9ViQSFrDkrafY="; + vendorHash = "sha256-xEPmNnaDwFU4l2G4cMvtNeQ9KneF5g9ViQSFrDkrafY="; nativeBuildInputs = [ scdoc ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix index 836449b3a9..04804732ed 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "dasel"; - version = "2.3.4"; + version = "2.3.6"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-/1CTtRTLgMlmFeubq3ebGnA9Do1mW6TtAXsCwi1JFmk="; + sha256 = "sha256-k+I4n05IbQT7tGzkJ0aPW6kLT1mGqwQOwoKDyal8L3w="; }; - vendorHash = "sha256-cLf0MzEAykmtnPjT2vGOSPwIXJP6BhxheUaicT7o/X4="; + vendorHash = "sha256-Gueo8aZS5N1rLqZweXjXv7BLrtShxGDSGfbkYXhy4DQ="; ldflags = [ "-s" "-w" "-X github.com/tomwright/dasel/v2/internal.Version=${version}" diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index 15dbb33118..bd45046117 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -14,7 +14,7 @@ , libXtst , zlib , maven -, webkitgtk_4_1 +, webkitgtk , glib-networking }: @@ -53,7 +53,7 @@ mavenJdk17.buildMavenPackage rec { libXtst zlib ] ++ lib.optionals stdenv.isLinux [ - webkitgtk_4_1 + webkitgtk glib-networking ]; @@ -109,7 +109,7 @@ mavenJdk17.buildMavenPackage rec { makeWrapper $out/dbeaver/dbeaver $out/bin/dbeaver \ --prefix PATH : ${jdk17}/bin \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk_4_1 glib-networking ])} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk3 libXtst webkitgtk glib-networking ])} \ --prefix GIO_EXTRA_MODULES : "${glib-networking}/lib/gio/modules" \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" diff --git a/third_party/nixpkgs/pkgs/applications/misc/deadd-notification-center/default.nix b/third_party/nixpkgs/pkgs/applications/misc/deadd-notification-center/default.nix index 39630f12c0..44c36281fa 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/deadd-notification-center/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/deadd-notification-center/default.nix @@ -17,13 +17,13 @@ let ''; in mkDerivation rec { pname = "deadd-notification-center"; - version = "2.0.4"; + version = "2.1.1"; src = fetchFromGitHub { owner = "phuhl"; repo = "linux_notification_center"; rev = version; - hash = "sha256-ascg31HsHeXKhvMNntiRLuZ4+T2+fokfDhZ3c8N/Gzg="; + hash = "sha256-VU9NaQVS0n8hFRjWMvCMkaF5mZ4hpnluV31+/SAK7tU="; }; isLibrary = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dict-cc-py/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dict-cc-py/default.nix new file mode 100644 index 0000000000..cbacf11912 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/dict-cc-py/default.nix @@ -0,0 +1,32 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonPackage rec { + pname = "dict.cc.py"; + version = "3.1.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "rbaron"; + repo = "dict.cc.py"; + rev = "a8b469767590fdd15d3aeb0b00e2ae62aa15a918"; + hash = "sha256-wc0WY1pETBdOT3QUaVGsX8YdcnhxLIHrZ2vt2t5LYKU="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + beautifulsoup4 + colorama + requests + ]; + + pythonImportsCheck = [ "dictcc" ]; + + meta = with lib; { + description = "Unofficial command line client for dict.cc"; + homepage = "https://github.com/rbaron/dict.cc.py"; + license = with licenses; [ cc0 ]; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch b/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch new file mode 100644 index 0000000000..e305c5618d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/djvulibre/CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch @@ -0,0 +1,105 @@ +From cd8b5c97b27a5c1dc83046498b6ca49ad20aa9b6 Mon Sep 17 00:00:00 2001 +From: Leon Bottou +Date: Tue, 11 May 2021 14:44:09 -0400 +Subject: [PATCH] Reviewed Fedora patches and adopted some of them (or variants + thereof) + + - Patch0: djvulibre-3.5.22-cdefs.patch (forward ported) +Does not make imuch sense. GSmartPointer.h already includes "stddef.h" + - Patch6: djvulibre-3.5.27-export-file.patch (forward ported) +Incorrect: inkscape command is --export-png, not --export-filename. + - Patch8: djvulibre-3.5.27-check-image-size.patch (forward ported) +Correct: adopted a variant of this + - Patch9: djvulibre-3.5.27-integer-overflow.patch (forward ported) +Correct: adopted a variant of this + - Patch10: djvulibre-3.5.27-check-input-pool.patch (forward ported) +Adopted: input validation never hurts + - Patch11: djvulibre-3.5.27-djvuport-stack-overflow.patch (forward ported) +Dubious: Instead I changed djvufile to prevent a file from including itself +which is the only way I can imagine to create an file creation loop. + - Patch12: djvulibre-3.5.27-unsigned-short-overflow.patch (forward ported) +Adopted: but without including limits.h +--- + libdjvu/DataPool.cpp | 3 ++- + libdjvu/DjVuFile.cpp | 2 ++ + libdjvu/GBitmap.cpp | 2 ++ + libdjvu/IW44Image.cpp | 4 ++++ + tools/ddjvu.cpp | 7 +++++-- + 5 files changed, 15 insertions(+), 3 deletions(-) + +diff --git a/libdjvu/DataPool.cpp b/libdjvu/DataPool.cpp +index 5fcbedf..b58fc45 100644 +--- a/libdjvu/DataPool.cpp ++++ b/libdjvu/DataPool.cpp +@@ -790,7 +790,8 @@ DataPool::create(const GP & pool, int start, int length) + { + DEBUG_MSG("DataPool::DataPool: pool=" << (void *)((DataPool *)pool) << " start=" << start << " length= " << length << "\n"); + DEBUG_MAKE_INDENT(3); +- ++ if (!pool) ++ G_THROW( ERR_MSG("DataPool.zero_DataPool") ); + DataPool *xpool=new DataPool(); + GP retval=xpool; + xpool->init(); +diff --git a/libdjvu/DjVuFile.cpp b/libdjvu/DjVuFile.cpp +index 143346b..2587491 100644 +--- a/libdjvu/DjVuFile.cpp ++++ b/libdjvu/DjVuFile.cpp +@@ -576,6 +576,8 @@ DjVuFile::process_incl_chunk(ByteStream & str, int file_num) + GURL incl_url=pcaster->id_to_url(this, incl_str); + if (incl_url.is_empty()) // Fallback. Should never be used. + incl_url=GURL::UTF8(incl_str,url.base()); ++ if (incl_url == url) // Infinite loop avoidance ++ G_THROW( ERR_MSG("DjVuFile.malformed") ); + + // Now see if there is already a file with this *name* created + { +diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp +index c2fdbe4..8ad64b2 100644 +--- a/libdjvu/GBitmap.cpp ++++ b/libdjvu/GBitmap.cpp +@@ -1284,6 +1284,8 @@ GBitmap::decode(unsigned char *runs) + // initialize pixel array + if (nrows==0 || ncolumns==0) + G_THROW( ERR_MSG("GBitmap.not_init") ); ++ if (ncolumns + border != (unsigned short)(ncolumns+border)) ++ G_THROW("GBitmap: image size exceeds maximum (corrupted file?)"); + bytes_per_row = ncolumns + border; + if (runs==0) + G_THROW( ERR_MSG("GBitmap.null_arg") ); +diff --git a/libdjvu/IW44Image.cpp b/libdjvu/IW44Image.cpp +index e8d4b44..4a1797e 100644 +--- a/libdjvu/IW44Image.cpp ++++ b/libdjvu/IW44Image.cpp +@@ -676,9 +676,13 @@ IW44Image::Map::image(signed char *img8, int rowsize, int pixsep, int fast) + // Allocate reconstruction buffer + short *data16; + size_t sz = bw * bh; ++ if (sz == 0) ++ G_THROW("IW44Image: image size is zero (corrupted file?)"); + if (sz / (size_t)bw != (size_t)bh) // multiplication overflow + G_THROW("IW44Image: image size exceeds maximum (corrupted file?)"); + GPBuffer gdata16(data16,sz); ++ if (data16 == 0) ++ G_THROW("IW44Image: unable to allocate image buffer"); + // Copy coefficients + int i; + short *p = data16; +diff --git a/tools/ddjvu.cpp b/tools/ddjvu.cpp +index 7109952..e7b489b 100644 +--- a/tools/ddjvu.cpp ++++ b/tools/ddjvu.cpp +@@ -393,8 +393,11 @@ render(ddjvu_page_t *page, int pageno) + } else if (style == DDJVU_FORMAT_GREY8) + rowsize = rrect.w; + else +- rowsize = rrect.w * 3; +- if (! (image = (char*)malloc(rowsize * rrect.h))) ++ rowsize = rrect.w * 3; ++ size_t bufsize = (size_t)rowsize * rrect.h; ++ if (bufsize / rowsize != rrect.h) ++ die(i18n("Integer overflow when allocating image buffer for page %d"), pageno); ++ if (! (image = (char*)malloc(bufsize))) + die(i18n("Cannot allocate image buffer for page %d"), pageno); + + /* Render */ \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/djvulibre/default.nix index 65591c8d82..073a6e348c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/djvulibre/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/djvulibre/default.nix @@ -30,12 +30,16 @@ stdenv.mkDerivation rec { bash ]; - # Remove uses of the `register` storage class specifier, which was removed in C++17. - # Fixes compilation with clang 16, which defaults to C++17. - patches = [ ./c++17-register-class.patch ]; - enableParallelBuilding = true; + patches = [ + # Remove uses of the `register` storage class specifier, which was removed in C++17. + # Fixes compilation with clang 16, which defaults to C++17. + ./c++17-register-class.patch + + ./CVE-2021-3500+CVE-2021-32490+CVE-2021-32491+CVE-2021-32492+CVE-2021-32493.patch + ]; + meta = with lib; { description = "The big set of CLI tools to make/modify/optimize/show/export DJVU files"; homepage = "https://djvu.sourceforge.net"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix b/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix index 2569300ccc..08e9d94224 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dmenu/wayland.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - pname = "dmenu-wayland-unstable"; - version = "2022-11-04"; + pname = "dmenu-wayland"; + version = "unstable-2023-05-18"; src = fetchFromGitHub { owner = "nyyManni"; repo = "dmenu-wayland"; - rev = "b60047236ef7a4e5dcde6c4ac0dcfaa070d90041"; - sha256 = "sha256-CeJWLBPAzE3JITVuS6f4CQxLz9v09WvfG3O0wErJJS4="; + rev = "a380201dff5bfac2dace553d7eaedb6cea6855f9"; + hash = "sha256-dqFvU2mRYEw7n8Fmbudwi5XMLQ7mQXFkug9D9j4FIrU="; }; outputs = [ "out" "man" ]; @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config makeWrapper wayland-scanner ]; buildInputs = [ cairo pango wayland-protocols glib wayland libxkbcommon ]; - # Patch to support cross-compilation, see https://github.com/nyyManni/dmenu-wayland/pull/23/ patches = [ # can be removed when https://github.com/nyyManni/dmenu-wayland/pull/23 is included (fetchpatch { + name = "support-cross-compilation.patch"; url = "https://github.com/nyyManni/dmenu-wayland/commit/3434410de5dcb007539495395f7dc5421923dd3a.patch"; sha256 = "sha256-im16kU8RWrCY0btYOYjDp8XtfGEivemIPlhwPX0C77o="; }) @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = with lib; { license = licenses.mit; platforms = platforms.linux; - description = "dmenu for wayland-compositors"; + description = "An efficient dynamic menu for wayland (wlroots)"; homepage = "https://github.com/nyyManni/dmenu-wayland"; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ rewine ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix index fb2a5b729a..571763be5f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix @@ -11,12 +11,12 @@ buildGoModule rec { sha256 = "sha256-xZFQQDK+yGAv4IbuNe2dvNa3GDASeJY2mOYw94goAIM="; }; - # Set vendorSha256 to null because dstask vendors its dependencies (meaning + # Set vendorHash to null because dstask vendors its dependencies (meaning # that third party dependencies are stored in the repository). # # Ref # and - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/edgetx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/edgetx/default.nix index 785ad0ba22..9e7cf60af1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/edgetx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/edgetx/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub , cmake, gcc-arm-embedded, python3Packages -, qtbase, qtmultimedia, qttranslations, SDL, gtest +, qtbase, qtmultimedia, qttools, SDL, gtest , dfu-util }: @@ -16,9 +16,9 @@ mkDerivation rec { sha256 = "sha256-bKMAyONy1Udd+2nDVEMrtIsnfqrNuBVMWU7nCqvZ+3E="; }; - nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; + nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow qttools ]; - buildInputs = [ qtbase qtmultimedia qttranslations SDL ]; + buildInputs = [ qtbase qtmultimedia SDL ]; postPatch = '' sed -i companion/src/burnconfigdialog.cpp \ @@ -27,7 +27,6 @@ mkDerivation rec { cmakeFlags = [ "-DGTEST_ROOT=${gtest.src}/googletest" - "-DQT_TRANSLATIONS_DIR=${qttranslations}/translations" "-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" # file RPATH_CHANGE could not write new RPATH "-DCMAKE_SKIP_BUILD_RPATH=ON" diff --git a/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix b/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix index 301a5eb09b..dbf22e9508 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/etesync-dav/default.nix @@ -16,6 +16,17 @@ let inherit version; hash = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; }; + + patches = [ + # Pulling in this patch lets us continue running tests without any + # other changes using setuptools >= 67.5.0. + (fetchpatch { + name = "remove-deprecated-pkg-resources.patch"; + url = "https://github.com/pallets/flask/commit/751d85f3de3f726446bb12e4ddfae885a6645ba1.patch"; + hash = "sha256-T4vKSSe3P0xtb2/iQjm0RH2Bwk1ZHWiPoX1Ycr63EqU="; + includes = [ "src/flask/cli.py" ]; + }) + ]; }); flask-wtf = super.flask-wtf.overridePythonAttrs (old: rec { version = "0.15.1"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/expenses/default.nix b/third_party/nixpkgs/pkgs/applications/misc/expenses/default.nix index e838bd3eda..220cd11785 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/expenses/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/expenses/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-sqsogF2swMvYZL7Kj+ealrB1AAgIe7ZXXDLRdHL6Q+0="; }; - vendorSha256 = "sha256-rIcwZUOi6bdfiWZEsRF4kl1reNPPQNuBPHDOo7RQgYo="; + vendorHash = "sha256-rIcwZUOi6bdfiWZEsRF4kl1reNPPQNuBPHDOo7RQgYo="; # package does not contain any tests as of v0.2.3 doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix index 0df585ab33..df9d08dacc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , fetchgit , makeWrapper @@ -9,6 +10,7 @@ , ffmpeg , callPackage , unstableGitUpdater +, darwin }: rustPlatform.buildRustPackage { @@ -39,6 +41,8 @@ rustPlatform.buildRustPackage { glib libopus vips + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreServices ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix index 34c0e857a4..53c4e88c3e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/firefly-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "firefly-desktop"; - version = "1.3.3"; + version = "2.1.5"; src = fetchurl { url = "https://github.com/iotaledger/firefly/releases/download/desktop-${version}/${pname}-${version}.AppImage"; - sha256 = "a052efa29aa692eeafc921a2be4a5cbf71ae0b4216bd4759ea179086fb44c6d6"; + sha256 = "sha256-33LQedZTfps7uAB5LGGXM/YB7SySTJLp70+yS5pMvIk="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/flashprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/flashprint/default.nix new file mode 100644 index 0000000000..e698f4857b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/flashprint/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, libGLU, qtbase, fetchurl, dpkg, autoPatchelfHook, wrapQtAppsHook }: + +stdenv.mkDerivation (finalAttrs: { + pname = "flashprint"; + version = "5.7.1"; + + src = fetchurl { + url = "http://www.ishare3d.com/3dapp/public/FlashPrint-5/FlashPrint/flashprint5_${finalAttrs.version}_amd64.deb"; + hash = "sha256-kxvqEgXlKQlfzlCqKb5o3hvop82vDsJmQDK9XOCq61g="; + }; + + nativeBuildInputs = [ dpkg autoPatchelfHook wrapQtAppsHook ]; + + buildInputs = [ qtbase libGLU ]; + + qtWrapperArgs = [ "--prefix QT_QPA_PLATFORM : xcb" ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv etc usr/* $out + ln -s $out/share/FlashPrint5/FlashPrint $out/bin/flashprint + sed -i "/^Exec=/ c Exec=$out/bin/flashprint" $out/share/applications/FlashPrint5.desktop + + runHook postInstall + ''; + + meta = with lib; { + description = "Slicer for the FlashForge 3D printers"; + homepage = "https://www.flashforge.com/"; + license = licenses.unfree; + mainProgram = "flashprint"; + maintainers = [ maintainers.ianliu ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = [ sourceTypes.binaryNativeCode ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix index 2b0cd7de05..ff1630dc35 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.25.0"; + version = "1.25.3"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-p8NesTNwsiq4YiEHtBpYP6eljs4PvDaQ2Ot6/htvzr4="; + sha256 = "sha256-raslLhVbeUL6Zoz5cw+fKtqdUvAkd7frAncd+q1AVxs="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix b/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix index e90c0a4ec1..40cbeaea61 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/font-manager/default.nix @@ -18,9 +18,8 @@ , desktop-file-utils , wrapGAppsHook , gobject-introspection -, libsoup -, glib-networking -, webkitgtk +# withWebkit enables the "webkit" feature, also known as Google Fonts +, withWebkit ? true, glib-networking, libsoup, webkitgtk }: stdenv.mkDerivation rec { @@ -29,9 +28,9 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "FontManager"; - repo = "master"; + repo = "font-manager"; rev = version; - sha256 = "sha256-M13Q9d2cKhc0tudkvw0zgqPAFTlmXwK+LltXeuDPWxo="; + hash = "sha256-M13Q9d2cKhc0tudkvw0zgqPAFTlmXwK+LltXeuDPWxo="; }; nativeBuildInputs = [ @@ -56,13 +55,15 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas # for font settings gtk3 gnome.adwaita-icon-theme - libsoup + ] ++ lib.optionals withWebkit [ glib-networking # for SSL so that Google Fonts can load + libsoup webkitgtk ]; mesonFlags = [ "-Dreproducible=true" # Do not hardcode build directory… + (lib.mesonBool "webkit" withWebkit) ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix b/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix index ce86dfdea9..dd8405772c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.20"; + version = "3.0.21"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - hash = "sha256-Dqrys7bAkSnpbOF0D17RDYi7q47ExlM75d5OOAnHCVU="; + hash = "sha256-zRO0buYfKtybUisWZJRkvLJVLJYZwLcDnT04rnQWy+s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 4b5ee339b1..49da3ac99a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "gallery-dl"; - version = "1.25.8"; + version = "1.26.0"; format = "setuptools"; src = fetchPypi { inherit version; pname = "gallery_dl"; - sha256 = "sha256-6q2F9zSGZp0iZoBvOUIuIEqNs97hbsbzE23XJyTZUDc="; + sha256 = "sha256-+g4tfr7RF9rrimQcXhcz3o/Cx9xLNrTDV1Fx7XSxh7I="; }; propagatedBuildInputs = [ @@ -38,6 +38,7 @@ buildPythonApplication rec { homepage = "https://github.com/mikf/gallery-dl"; changelog = "https://github.com/mikf/gallery-dl/blob/v${version}/CHANGELOG.md"; license = licenses.gpl2Only; + mainProgram = "gallery-dl"; maintainers = with maintainers; [ dawidsowa marsam ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix index 884ee44098..2483cc000f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/get_iplayer/default.nix @@ -7,8 +7,6 @@ , perl , atomicparsley , ffmpeg -, flvstreamer -, rtmpdump }: perlPackages.buildPerlPackage rec { @@ -25,7 +23,7 @@ perlPackages.buildPerlPackage rec { nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isDarwin shortenPerlShebang; buildInputs = [ perl ]; propagatedBuildInputs = with perlPackages; [ - HTMLParser HTTPCookies LWP LWPProtocolHttps XMLLibXML XMLSimple Mojolicious + LWP LWPProtocolHttps XMLLibXML Mojolicious ]; preConfigure = "touch Makefile.PL"; @@ -36,7 +34,7 @@ perlPackages.buildPerlPackage rec { runHook preInstall mkdir -p $out/bin $out/share/man/man1 cp get_iplayer $out/bin - wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/get_iplayer --suffix PATH : ${lib.makeBinPath [ atomicparsley ffmpeg ]} --prefix PERL5LIB : $PERL5LIB cp get_iplayer.1 $out/share/man/man1 runHook postInstall ''; @@ -46,9 +44,9 @@ perlPackages.buildPerlPackage rec { ''; meta = with lib; { - description = "Downloads TV and radio from BBC iPlayer"; + description = "Downloads TV and radio programmes from BBC iPlayer and BBC Sounds"; license = licenses.gpl3Plus; - homepage = "https://squarepenguin.co.uk/"; + homepage = "https://github.com/get-iplayer/get_iplayer"; platforms = platforms.all; maintainers = with maintainers; [ rika jgarcia ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ghosttohugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ghosttohugo/default.nix new file mode 100644 index 0000000000..29091a8447 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/ghosttohugo/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "ghosttohugo"; + version = "0.5.3"; + + src = fetchFromGitHub { + owner = "jbarone"; + repo = "ghostToHugo"; + rev = "v${version}"; + hash = "sha256-lYqjwLPvSX9/HaFvSwtkvxbCToTwfDPeVivNfazZwQA="; + }; + + vendorHash = "sha256-/7MsVLVek2nQwf8rVJQywBKiIOCGe72L45CkAElXrMo="; + + meta = with lib; { + description = "Convert Ghost export to Hugo posts"; + homepage = "https://github.com/jbarone/ghostToHugo"; + license = licenses.mit; + maintainers = with maintainers; [ clerie ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/gmnitohtml/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gmnitohtml/default.nix index dc64b1142b..463d1d50ab 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gmnitohtml/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gmnitohtml/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = version; hash = "sha256-nKNSLVBBdZI5mkbEUkMv0CIOQIyH3OX+SEFf5O47DFY="; }; - vendorSha256 = "sha256-Cx8x8AISRVTA4Ufd73vOVky97LX23NkizHDingr/zVk="; + vendorHash = "sha256-Cx8x8AISRVTA4Ufd73vOVky97LX23NkizHDingr/zVk="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix index de12d97512..6570ea7968 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix @@ -11,6 +11,8 @@ , desktop-file-utils , glib , gobject-introspection +, blueprint-compiler +, libxml2 , libnotify , libadwaita , libportal @@ -18,17 +20,18 @@ , librsvg , tesseract5 , zbar +, gst_all_1 }: python3Packages.buildPythonApplication rec { pname = "gnome-frog"; - version = "1.3.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "TenderOwl"; repo = "Frog"; rev = "refs/tags/${version}"; - sha256 = "sha256-ErDHrdD9UZxOIGwgN5eakY6vhNvE6D9SoRYXZhzmYX4="; + sha256 = "sha256-w/ENUhJt7bYy5htBLolb/HysK8/scRaPQX5qEezQcXY="; }; format = "other"; @@ -52,6 +55,8 @@ python3Packages.buildPythonApplication rec { glib wrapGAppsHook4 gobject-introspection + blueprint-compiler + libxml2 ]; buildInputs = [ @@ -61,6 +66,7 @@ python3Packages.buildPythonApplication rec { libportal zbar tesseract5 + gst_all_1.gstreamer ]; propagatedBuildInputs = with python3Packages; [ @@ -68,6 +74,7 @@ python3Packages.buildPythonApplication rec { pillow pytesseract pyzbar + gtts ]; # This is to prevent double-wrapping the package. We'll let @@ -83,6 +90,7 @@ python3Packages.buildPythonApplication rec { description = "Intuitive text extraction tool (OCR) for GNOME desktop"; license = licenses.mit; + mainProgram = "frog"; maintainers = with maintainers; [ foo-dogsquared ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/go-jira/default.nix b/third_party/nixpkgs/pkgs/applications/misc/go-jira/default.nix index 4a368e92ec..a3d31d034e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/go-jira/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/go-jira/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-h/x77xGqdOxPBxdchElZU9GFgjnNo89o9gx4fYM5dME="; }; - vendorSha256 = "sha256-r69aFl3GwgZ1Zr4cEy4oWlqsrjNCrqjwW9BU9+d8xDQ="; + vendorHash = "sha256-r69aFl3GwgZ1Zr4cEy4oWlqsrjNCrqjwW9BU9+d8xDQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/go-thumbnailer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/go-thumbnailer/default.nix deleted file mode 100644 index 99a8f5a510..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/go-thumbnailer/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, pkg-config -, vips -}: - -buildGoModule rec { - pname = "go-thumbnailer"; - version = "0.1.0"; - - src = fetchFromGitHub { - owner = "donovanglover"; - repo = pname; - rev = version; - sha256 = "sha256-sgd5kNnDXcSesGT+OignZ+APjNSxSP0Z60dr8cWO6sU="; - }; - - buildInputs = [ - vips - ]; - - nativeBuildInputs = [ - pkg-config - ]; - - vendorSha256 = "sha256-4zgsoExdhEqvycGerNVxZ6LnjeRRO+f6DhJdINR5ZyI="; - - postInstall = '' - mkdir -p $out/share/thumbnailers - substituteAll ${./go.thumbnailer} $out/share/thumbnailers/go.thumbnailer - ''; - - meta = with lib; { - description = "A cover thumbnailer written in Go for performance and reliability"; - homepage = "https://github.com/donovanglover/go-thumbnailer"; - license = licenses.mit; - maintainers = with maintainers; [ donovanglover ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/go-thumbnailer/go.thumbnailer b/third_party/nixpkgs/pkgs/applications/misc/go-thumbnailer/go.thumbnailer deleted file mode 100644 index c105e0674d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/go-thumbnailer/go.thumbnailer +++ /dev/null @@ -1,3 +0,0 @@ -[Thumbnailer Entry] -Exec=@out@/bin/go-thumbnailer %s %i %o -MimeType=inode/directory diff --git a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix index fa11f77162..ff46b57e1a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah-bin/default.nix @@ -1,12 +1,12 @@ -{ appimageTools, lib, fetchurl, stdenv }: +{ appimageTools, lib, fetchurl, nix-update-script, stdenv }: let pname = "golden-cheetah"; - version = "3.6-RC4"; + version = "3.6"; src = fetchurl { - url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v3.6-DEV_x64.AppImage"; - hash = "sha256-I5GafK/W1djSx67xrjcMyPqMSqGW9AfrcPYcGcf0Pag="; + url = "https://github.com/GoldenCheetah/GoldenCheetah/releases/download/v${version}/GoldenCheetah_v${version}_x64.AppImage"; + hash = "sha256-PMRUDQSQxbECbF9SPOo03t4Xxj1OtYJAPXEMyyy6EVY="; }; appimageContents = appimageTools.extract { inherit pname src version; }; @@ -24,12 +24,15 @@ appimageTools.wrapType2 { cp ${appimageContents}/gc.png $out/share/pixmaps/ ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava"; - platforms = platforms.linux; + platforms = lib.platforms.linux; broken = !stdenv.isx86_64; - maintainers = with maintainers; [ gador ]; - license = licenses.gpl2Plus; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ gador adamcstephens ]; + license = lib.licenses.gpl2Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + knownVulnerabilities = [ "Vendors libwebp vulnerable to CVE-2023-4863" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix index f13cf8a21d..1345dc5159 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, mkDerivation +{ lib, fetchFromGitHub, nix-update-script, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools , qtconnectivity, qtcharts, libusb-compat-0_1, gsl, blas , bison, flex, zlib, qmake, makeDesktopItem, wrapQtAppsHook @@ -16,13 +16,13 @@ let }; in mkDerivation rec { pname = "golden-cheetah"; - version = "3.6-RC4"; + version = "3.6"; src = fetchFromGitHub { owner = "GoldenCheetah"; repo = "GoldenCheetah"; rev = "refs/tags/v${version}"; - hash = "sha256-2cwxsfy4Zc9fF3fe6QcZp3LPd2yWw2rDlYrK/QGiJYw="; + hash = "sha256-Ntim1/ZPaTPCHQ5p8xF5LWpqq8+OgkPfaQqqysv9j/c="; }; buildInputs = [ @@ -72,10 +72,12 @@ in mkDerivation rec { runHook postInstall ''; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { description = "Performance software for cyclists, runners and triathletes. Built from source and without API tokens"; - platforms = platforms.linux; - maintainers = with maintainers; [ adamcstephens ]; - license = licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ adamcstephens ]; + license = lib.licenses.gpl2Plus; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix b/third_party/nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix index eacea109cf..fcae98b530 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/goldendict-ng/default.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "goldendict-ng"; - version = "23.07.23"; + version = "23.09.10"; src = fetchFromGitHub { owner = "xiaoyifang"; repo = "goldendict-ng"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ZKbrO5L4KFmr2NsGDihRWBeW0OXHoPRwZGj6kt1Anc8="; + rev = "v${finalAttrs.version}-WhiteDew.54c8bd56"; + hash = "sha256-X9xqodCqHjppz1zIHLnb87NiDE4FWlXiQufhDu/rJq4="; }; nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook wrapGAppsHook ]; @@ -83,8 +83,9 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://xiaoyifang.github.io/goldendict-ng/"; - description = "Advanced multi-dictionary lookup program."; + description = "An advanced multi-dictionary lookup program"; platforms = platforms.linux; + mainProgram = "goldendict"; maintainers = with maintainers; [ slbtty ]; license = licenses.gpl3Plus; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix b/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix index 532965f9b2..a339e399e3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/goldendict/default.nix @@ -2,6 +2,7 @@ , libXtst, libvorbis, hunspell, lzo, xz, bzip2, libiconv , qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake , wrapQtAppsHook +, wrapGAppsHook , withCC ? true, opencc , withEpwing ? true, libeb , withExtraTiff ? true, libtiff @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { --replace "opencc.2" "opencc" ''; - nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; + nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook wrapGAppsHook ]; buildInputs = [ qtbase qtsvg qtwebkit qttools libvorbis hunspell xz lzo diff --git a/third_party/nixpkgs/pkgs/applications/misc/gopacked/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gopacked/default.nix index 42b886e4c7..1af03a1528 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gopacked/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gopacked/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "tulir"; repo = "gopacked"; rev = "v${version}"; - sha256 = "03qr8rlnipziy16nbcpf631jh42gsyv2frdnh8yzsh8lm0p8p4ry"; + hash = "sha256-PpOLLqgUQf09grZlJ7bXTxAowzDusmVN8PHfaGlGGQ8="; }; - vendorSha256 = "0fklr3lxh8g7gda65wf2wdkqv15869h7m1bwbzbiv8pasrf5b352"; + vendorHash = "sha256-ooxVXNbqoh3XX3yFemAyqISNZ+PC8WJUe+ch2OnIdDo="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix index 60a1e40a61..0898c3ccee 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, fetchurl, pkg-config, which -, qtbase, qmake, qttools, qttranslations, wrapQtAppsHook +, qmake, qttools, wrapQtAppsHook , libusb1, shapelib, zlib , withGUI ? false, qtserialport , withMapPreview ? (!stdenv.isDarwin), qtwebengine @@ -21,11 +21,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs testo - '' + lib.optionalString withGUI '' - # See https://github.com/NixOS/nixpkgs/issues/86054 - substituteInPlace gui/mainwindow.cc \ - --replace 'QLibraryInfo::location(QLibraryInfo::TranslationsPath)' \ - 'QLatin1String("${qttranslations}/translations")' '' + lib.optionalString withDoc '' substituteInPlace gbversion.h.qmake.in \ --replace /usr/share/doc $doc/share/doc diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix index 4fe60064cd..67e246227f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, pkg-config, exiv2, libxml2, gtk3 +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, exiv2, libxml2, gtk3 , libxslt, docbook_xsl, docbook_xml_dtd_42, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1wkpb0nqnm0ik46hp2sibf96h2gxi6n951zm8c72scgmh4ciq4fl"; }; + patches = [ + (fetchpatch { + name = "gpscorrelate-2.0-exiv2-0.28.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-geosciences/gpscorrelate/files/gpscorrelate-2.0-exiv2-0.28.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; + hash = "sha256-/5czvSh2siPmohXWHQEg6VWCUQnZxEm2livLsEOAa6c="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils docbook_xml_dtd_42 diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix index dd76fe8755..7b59df8fd4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix @@ -17,12 +17,17 @@ stdenv.mkDerivation rec { desktopItems = [ (makeDesktopItem { name = "gpsprune"; - exec = "gpsprune"; + exec = "gpsprune %F"; icon = "gpsprune"; desktopName = "GpsPrune"; genericName = "GPS Data Editor"; comment = meta.description; categories = [ "Education" "Geoscience" ]; + mimeTypes = [ + "application/gpx+xml" + "application/vnd.google-earth.kml+xml" + "application/vnd.google-earth.kmz" + ]; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix index c196a107f0..887a469397 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,31 +1,58 @@ -{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, wrapGAppsHook }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, libxml2 +, meson +, ninja +, vala +, pkg-config +, gnome +, libchamplain +, gdl +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "gpx-viewer"; - version = "0.4.0"; + version = "0.5.0"; - src = fetchurl { - url = "https://launchpad.net/gpx-viewer/trunk/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "956acfaf870ac436300cd9953dece630df7fd7dff8e4ae2577a6002884466f80"; + src = fetchFromGitHub { + owner = "DaveDavenport"; + repo = "gpx-viewer"; + rev = version; + hash = "sha256-6AChX0UEIrQExaq3oo9Be5Sr13+POHFph7pZegqcjio="; }; - patches = fetchurl { - url = "https://code.launchpad.net/~chkr/gpx-viewer/gtk3-bugfix/+merge/260766/+preview-diff/628965/+files/preview.diff"; - sha256 = "1yl7jk7skkcx10nny5zdixswcymjd9s9c1zhm1i5y3aqhchvmfs7"; - }; - patchFlags = [ "-p0" ]; - - configureFlags = [ "--disable-database-updates" ]; + patches = [ + # Compile with libchamplain>=0.12.21 + (fetchpatch { + url = "https://github.com/DaveDavenport/gpx-viewer/commit/12ed6003bdad840586351bdb4e00c18719873c0e.patch"; + hash = "sha256-2/r0M3Yxj+vWgny1Pd5G7NYMb0uC/ByZ7y3tqLVccOc="; + }) + ]; nativeBuildInputs = [ - intltool pkg-config + meson + ninja + pkg-config + vala wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; - buildInputs = [ gdl libchamplain gnome.adwaita-icon-theme libxml2 ]; + + buildInputs = [ + gdl + libchamplain + gnome.adwaita-icon-theme + libxml2 + ]; + + hardeningDisable = [ "format" ]; meta = with lib; { homepage = "https://blog.sarine.nl/tag/gpxviewer/"; description = "Simple tool to visualize tracks and waypoints stored in a gpx file"; + changelog = "https://github.com/DaveDavenport/gpx-viewer/blob/${src.rev}/NEWS"; platforms = with platforms; linux; license = licenses.gpl2Plus; maintainers = with maintainers; [ dotlambda ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxlab/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxlab/default.nix index 8d2b95ea4f..9d3d7c27ec 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxlab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxlab/default.nix @@ -1,5 +1,5 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub, substituteAll -, qmake, qttools, qttranslations +{ stdenv, mkDerivation, lib, fetchFromGitHub +, qmake, qttools }: mkDerivation rec { @@ -13,12 +13,6 @@ mkDerivation rec { sha256 = "080vnwcciqblfrbfyz9gjhl2lqw1hkdpbgr5qfrlyglkd4ynjd84"; }; - patches = (substituteAll { - # See https://github.com/NixOS/nixpkgs/issues/86054 - src = ./fix-qttranslations-path.patch; - inherit qttranslations; - }); - nativeBuildInputs = [ qmake qttools ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch b/third_party/nixpkgs/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch deleted file mode 100644 index 8dcba75d76..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxlab/fix-qttranslations-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git i/GPXLab/main.cpp w/GPXLab/main.cpp -index b12d2dd..58d37c5 100644 ---- i/GPXLab/main.cpp -+++ w/GPXLab/main.cpp -@@ -19,10 +19,10 @@ int main(int argc, char *argv[]) - app.installTranslator(&gpxlab); - - QTranslator qt; --#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) -+#if defined(Q_OS_WIN32) - qt.load(QLocale::system(), "qt", "_", TRANSLATIONS_DIR); - #else -- qt.load(QLocale::system(), "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath)); -+ qt.load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations")); - #endif - app.installTranslator(&qt); - diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 694323df82..99fc367835 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -3,13 +3,10 @@ , fetchFromGitHub , qmake , nix-update-script -, substituteAll , qtbase , qttools -, qttranslations , qtlocation ? null # qt5 only , qtpositioning ? null # qt6 only -, qtpbfimageplugin , qtserialport , qtsvg , qt5compat ? null # qt6 only @@ -18,27 +15,21 @@ let isQt6 = lib.versions.major qtbase.version == "6"; - in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.4"; + version = "13.9"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; - rev = version; - hash = "sha256-Zf2eyDx5QK69W6HNz/IGGHkX2qCDnxYsU8KLCgU9teY="; + rev = finalAttrs.version; + hash = "sha256-vzbZN+0lDSmvZnQCuvNJCYHTYKqErFhW4RI5Mfbgr6o="; }; - patches = (substituteAll { - # See https://github.com/NixOS/nixpkgs/issues/86054 - src = ./fix-qttranslations-path.diff; - inherit qttranslations; - }); - - buildInputs = [ qtpbfimageplugin qtserialport ] - ++ (if isQt6 then [ + buildInputs = [ + qtserialport + ] ++ (if isQt6 then [ qtbase qtpositioning qtsvg @@ -47,7 +38,11 @@ stdenv.mkDerivation rec { qtlocation ]); - nativeBuildInputs = [ qmake qttools wrapQtAppsHook ]; + nativeBuildInputs = [ + qmake + qttools + wrapQtAppsHook + ]; preConfigure = '' lrelease gpxsee.pro @@ -64,17 +59,17 @@ stdenv.mkDerivation rec { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { + broken = isQt6 && stdenv.isDarwin; + changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes"; description = "GPS log file viewer and analyzer"; + homepage = "https://www.gpxsee.org/"; + license = lib.licenses.gpl3Only; longDescription = '' GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common GPS log file formats. ''; - homepage = "https://www.gpxsee.org/"; - changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ womfoo sikmir ]; - platforms = platforms.unix; - broken = isQt6 && stdenv.isDarwin; + maintainers = with lib.maintainers; [ womfoo sikmir ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff deleted file mode 100644 index 757d9b8c65..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/fix-qttranslations-path.diff +++ /dev/null @@ -1,18 +0,0 @@ -diff --git i/src/GUI/app.cpp w/src/GUI/app.cpp -index 37e9d3f..d4a065c 100644 ---- i/src/GUI/app.cpp -+++ w/src/GUI/app.cpp -@@ -35,11 +35,10 @@ App::App(int &argc, char **argv) : QApplication(argc, argv) - installTranslator(gpxsee); - - QTranslator *qt = new QTranslator(this); --#if defined(Q_OS_WIN32) || defined(Q_OS_MAC) -+#if defined(Q_OS_WIN32) - if (qt->load(QLocale::system(), "qt", "_", ProgramPaths::translationsDir())) - #else // Q_OS_WIN32 || Q_OS_MAC -- if (qt->load(QLocale::system(), "qt", "_", QLibraryInfo::location( -- QLibraryInfo::TranslationsPath))) -+ if (qt->load(QLocale::system(), "qt", "_", QLatin1String("@qttranslations@/translations"))) - #endif // Q_OS_WIN32 || Q_OS_MAC - installTranslator(qt); - diff --git a/third_party/nixpkgs/pkgs/applications/misc/gradience/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gradience/default.nix index 7624080971..fcb7d10c01 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gradience/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gradience/default.nix @@ -6,6 +6,7 @@ , ninja , pkg-config , glib +, glib-networking , desktop-file-utils , gettext , librsvg @@ -50,6 +51,7 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ + glib-networking libadwaita libportal libportal-gtk4 diff --git a/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix index 709393f305..2d557f81c7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.6.4"; + version = "3.7.0"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-3fZA0U7dobr4Zsudin9OmwcYUw8gdltUWFTVe2l8ILw="; + sha256 = "sha256-trdxRqQ/S7b02CPX/iZj/lDSNEtS9HqVYd77bHduOKo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gremlin-server/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gremlin-server/default.nix index 70068ec21f..82b7bf1e9f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gremlin-server/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gremlin-server/default.nix @@ -1,10 +1,10 @@ { fetchzip, lib, stdenv, makeWrapper, openjdk }: stdenv.mkDerivation rec { pname = "gremlin-server"; - version = "3.5.2"; + version = "3.7.0"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-server-${version}-bin.zip"; - sha256 = "sha256-XFI2PQnvIPYjkJhm73TPSpMqH4+/Qv5RxS5iWkfuBg0="; + sha256 = "sha256-cS7R7Raz5tkrr5DNeW7jbEYDee2OgE4htTXJRnqXlqI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/grsync/default.nix b/third_party/nixpkgs/pkgs/applications/misc/grsync/default.nix index 3a6a717b6e..856eeea21f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/grsync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/grsync/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, dee, gtk3, intltool, libdbusmenu-gtk3, libunity, pkg-config, rsync }: stdenv.mkDerivation rec { - version = "1.3.0"; + version = "1.3.1"; pname = "grsync"; src = fetchurl { url = "mirror://sourceforge/grsync/grsync-${version}.tar.gz"; - sha256 = "sha256-t8fGpi4FMC2DF8OHQefXHvmrRjnuW/8mIqODsgQ6Nfw="; + sha256 = "sha256-M8wOJdqmLlunCRyuo8g6jcdNxddyHEUB00nyEMSzxtM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix index 73bc11d494..bf47ee1899 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-eemPsrSFwgUR1Jz7283jjwMkoJR38QiaiilI9G0IQuo="; }; - vendorSha256 = "sha256-6b4H8YAY8d/qIGnnGPYZoXne1LXHLsc0OEq0lCeqivo="; + vendorHash = "sha256-6b4H8YAY8d/qIGnnGPYZoXne1LXHLsc0OEq0lCeqivo="; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix index b43d888fed..96315bb50c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix @@ -34,5 +34,6 @@ buildGoModule rec { changelog = "https://github.com/charmbracelet/gum/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ maaslalani ]; + mainProgram = "gum"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix b/third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix new file mode 100644 index 0000000000..129de17fb1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "harsh"; + version = "0.8.29"; + + src = fetchFromGitHub { + owner = "wakatara"; + repo = pname; + rev = "v${version}"; + hash = "sha256-LftLlKevxvjxnRUMaRXnh3TXQSauvnfuX6voglwZmZE="; + }; + + vendorHash = "sha256-zkz7X/qj8FwtQZXGuq4Oaoe5G9a4AJE1kv3j7wwQEp4="; + + meta = with lib; { + description = "CLI habit tracking for geeks"; + homepage = "https://github.com/wakatara/harsh"; + changelog = "https://github.com/wakatara/harsh/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ laurailway ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/hivemind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hivemind/default.nix index 0562e1d52d..adc6aa3642 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hivemind/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hivemind/default.nix @@ -12,9 +12,10 @@ buildGoModule rec { owner = "DarthSim"; repo = "hivemind"; rev = "v${version}"; - sha256 = "YUR9OwRuH1xSPs8iTsSIjLCt2TyYH357IAYULGTyYUc="; + hash = "sha256-YUR9OwRuH1xSPs8iTsSIjLCt2TyYH357IAYULGTyYUc="; }; - vendorSha256 = "KweFhT8Zueg45Q/vw3kNET35hB+0WbUPfz0FYaAiIA8="; + + vendorHash = "sha256-KweFhT8Zueg45Q/vw3kNET35hB+0WbUPfz0FYaAiIA8="; meta = with lib; { homepage = "https://github.com/DarthSim/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix index 38965da9db..f2be253e3f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/holochain-launcher/default.nix @@ -8,15 +8,18 @@ , webkitgtk , libappindicator , wrapGAppsHook +, shared-mime-info +, glib-networking }: stdenv.mkDerivation rec { name = "holochain-launcher"; - version = "0.9.4"; + version = "0.11.0"; + prerelease = "beta-2"; src = fetchurl { - url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher_${version}_amd64.deb"; - sha256 = "sha256-qTzm4pwhYbEN96a/Dz/JcJcZ2OobyQJRNC2yH4CbhzQ="; + url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher-${prerelease}_${version}_amd64.deb"; + sha256 = "sha256-yxovSsPyIzFONa1ACeLkZqDCElDI3uTm81YOYW0/FXE="; }; nativeBuildInputs = [ @@ -29,16 +32,25 @@ stdenv.mkDerivation rec { openssl webkitgtk libappindicator + + glib-networking ]; unpackCmd = "dpkg-deb -x $curSrc source"; installPhase = '' mv usr $out + mv $out/bin/holochain-launcher-${prerelease} $out/bin/holochain-launcher ''; preFixup = '' patchelf --add-needed "libappindicator3.so" "$out/bin/holochain-launcher" + + # without this the DevTools will just display an unparsed HTML file (see https://github.com/tauri-apps/tauri/issues/5711#issuecomment-1336409601) + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + --set WEBKIT_DISABLE_COMPOSITING_MODE 1 + ) ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/huggle/default.nix b/third_party/nixpkgs/pkgs/applications/misc/huggle/default.nix index a136f1f678..3a6f25ede6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/huggle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/huggle/default.nix @@ -40,9 +40,10 @@ stdenv.mkDerivation rec { substituteInPlace src/CMakeLists.txt --replace '@libirc_includes@' '${libirc.out}' ''; + cmakeBuildType = "None"; + cmakeFlags = [ "-S" "/build/source/src" - "-DCMAKE_BUILD_TYPE=None" "-DINSTALL_DATA_DIR=bin" "-DQT5_BUILD=ON" "-DWEB_ENGINE=ON" diff --git a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix index cdf75cb75c..a88cf10f15 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.117.0"; + version = "0.119.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-WxYTlEqTWY78lHd+qEvmbRmbC6Ewph9U84SjvrlqgtY="; + hash = "sha256-QumHL3S57Xm6N3u4VakNzRGmUi0RT8lVXG1K5/Dsq4A="; }; - vendorHash = "sha256-yjARpHewjCm2W/08xu7O/PlE9jIOgYmunEyGEfTHNQs="; + vendorHash = "sha256-KbGZ7MSioP82UNgmeKFdgCBkTIqL0fV5QhzrcxYyl4k="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix index 874bffbef3..0798aadf2f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hyprland-autoname-workspaces/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprland-autoname-workspaces"; - version = "1.1.7"; + version = "1.1.11"; src = fetchFromGitHub { owner = "hyprland-community"; repo = "hyprland-autoname-workspaces"; - rev = "v${version}"; - hash = "sha256-OtKPJZI0YKi98HUY4IDU8LRg6dTaD68OgVi9FzfjDbA="; + rev = version; + hash = "sha256-x9MXp2MZtrnVI3W+6xo34uUHuRnpVeXS+3vbyti1p24="; }; - cargoHash = "sha256-ueT85rKa2PGvp/R/ZXkDGUFIXyYNpDErg4W8WcXAPIw="; + cargoHash = "sha256-mSUtFZvq5+rumefJ6I9C6YzRzu64oJ/bTwaa+rrFlL4="; meta = with lib; { description = "Automatically rename workspaces with icons of started applications"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hyprnome/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hyprnome/default.nix new file mode 100644 index 0000000000..906bc00dce --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/hyprnome/default.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "hyprnome"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "donovanglover"; + repo = "hyprnome"; + rev = version; + hash = "sha256-jb21hnPSzrCTuW7Yhs6jFzS2WUVQjkn6nCCi6LvoTGA="; + }; + + cargoHash = "sha256-QM5v2hKP3E9W3Aek6kFyFFNAp9s0oTFb4CEtxEHyny0="; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installManPage man/hyprnome.1 + + installShellCompletion --cmd hyprnome \ + --bash <(cat completions/hyprnome.bash) \ + --fish <(cat completions/hyprnome.fish) \ + --zsh <(cat completions/_hyprnome) + ''; + + meta = with lib; { + description = "GNOME-like workspace switching in Hyprland"; + homepage = "https://github.com/donovanglover/hyprnome"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ donovanglover ]; + mainProgram = "hyprnome"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix index 833ea7203d..91256c8027 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/iptsd/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "iptsd"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "linux-surface"; repo = pname; rev = "v${version}"; - hash = "sha256-06KGMXkp5lR05iNQOll1h0q+Z+XWMberqG1C9Cs7VfA="; + hash = "sha256-qBABt0qEePGrZH4khnikvStrSi/OVmP3yVMJZbEd36M="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix index 205ef83820..1a2304d340 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jetbrains-toolbox/default.nix @@ -10,11 +10,11 @@ }: let pname = "jetbrains-toolbox"; - version = "2.0.2.16660"; + version = "2.0.4.17212"; src = fetchzip { url = "https://download.jetbrains.com/toolbox/jetbrains-toolbox-${version}.tar.gz"; - sha256 = "sha256-iz9bUkeQZs0k3whRZuIl/KtSn7KlTq1urQ2I+D292MM="; + sha256 = "sha256-lnTYLZJBiM8nnUvMqtcp/i/VNek/9zlxYyZFa+hew5g="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index fb4e484dc5..840eb846c2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,29 +2,28 @@ let pname = "joplin-desktop"; - version = "2.11.11"; - name = "${pname}-${version}"; + version = "2.12.18"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; suffix = { - x86_64-linux = "AppImage"; - x86_64-darwin = "dmg"; - aarch64-darwin = "dmg"; + x86_64-linux = ".AppImage"; + x86_64-darwin = ".dmg"; + aarch64-darwin = "-arm64.dmg"; }.${system} or throwSystem; src = fetchurl { - url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; + url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}"; sha256 = { - x86_64-linux = "sha256-r64+y+LfMrJnUdabVdak5+LQB50YLOuMXftlZ4s3C/w="; - x86_64-darwin = "sha256-/dvaYHa7PT6FA63kmtjrErJZI9O+hIlKvHnf5RnfeZg="; - aarch64-darwin = "sha256-/dvaYHa7PT6FA63kmtjrErJZI9O+hIlKvHnf5RnfeZg="; + x86_64-linux = "1fwcqgqni7d9x0prdy3p8ccc5lzgn57rhph4498vs1q40kyq8823"; + x86_64-darwin = "sha256-atd7nkefLvilTq39nTLbXQhm1zzBCHOLL7MRJwlTSMk="; + aarch64-darwin = "sha256-xiWXD+ULSVJ80uruYz0uRFkDRT1QOUd6FSWDKK9yLMc="; }.${system} or throwSystem; }; appimageContents = appimageTools.extractType2 { - inherit name src; + inherit pname version src; }; meta = with lib; { @@ -43,7 +42,7 @@ let }; linux = appimageTools.wrapType2 rec { - inherit name src meta; + inherit pname version src meta; profile = '' export LC_ALL=C.UTF-8 @@ -52,7 +51,7 @@ let multiArch = false; # no 32bit needed extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; extraInstallCommands = '' - mv $out/bin/{${name},${pname}} + mv $out/bin/{${pname}-${version},${pname}} source "${makeWrapper}/nix-support/setup-hook" wrapProgram $out/bin/${pname} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}" @@ -65,7 +64,7 @@ let }; darwin = stdenv.mkDerivation { - inherit name src meta; + inherit pname version src meta; nativeBuildInputs = [ undmg ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix index 3a920d1915..3eff3c3d79 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18789"; + version = "18822"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-0NuCdGqDNY+UCXv9AhX4oT0WJbxMc5ghkL0YvqVWXOs="; + hash = "sha256-pzB12lkcWGJ7sVdcfJZC2MnUowfWdElxny0pSQ5vjlw="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-f8VoPMF7cR6idzadkXC6/oUfzq4dnKb3UPa2JjsRNsw="; + hash = "sha256-MFiWbEU8C6Jvq9wkIKANQeqJh2/yC3y40ANnGEl4IF0="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix index f507658d15..40ece54ab1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.15.84961"; + version = "0.15.89752"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "sha256-ay2YEtvGF93QAcpszxIiKRkrHGE02u80ujhMT39KD7Y="; + sha256 = "sha256-vYI9jbY2npPrmP0lMRSbLneVbQvQVsL0plM5jOvtdzA="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jquake/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jquake/default.nix index 36b301dc43..ce0ea2ec1c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jquake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jquake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jquake"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { url = "https://github.com/fleneindre/fleneindre.github.io/raw/master/downloads/JQuake_${version}_linux.zip"; - sha256 = "sha256-oIYkYmI8uG4zjnm1Jq1mzIcSwRlKbWJqvACygQyp9sA="; + sha256 = "sha256-Q9R5Qhk8Qodw2d99nL2aG5WGpIyvKmjzfkRK7xJzoc0="; }; nativeBuildInputs = [ unzip copyDesktopItems ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix index 985ce9c1d1..8dacbf8145 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "jrnl"; - version = "3.3"; + version = "4.0.1"; format = "pyproject"; src = fetchFromGitHub { owner = "jrnl-org"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-e2w0E8t6s0OWx2ROme2GdyzWhmCc6hnMfSdLTZqt3bg="; + hash = "sha256-NpI19NQxfDiqcfFI9kMqfMboI4fQTqCG7AoG9o8YoEI="; }; nativeBuildInputs = with python3.pkgs; [ @@ -42,17 +42,6 @@ python3.pkgs.buildPythonApplication rec { toml ]; - # Upstream expects a old pytest-bdd version - # Once it changes we should update here too - # https://github.com/jrnl-org/jrnl/blob/develop/poetry.lock#L732 - disabledTests = [ - "bdd" - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'rich = "^12.2.0"' 'rich = ">=12.2.0, <14.0.0"' - ''; preCheck = '' export HOME=$(mktemp -d); @@ -63,9 +52,11 @@ python3.pkgs.buildPythonApplication rec { ]; meta = with lib; { + changelog = "https://github.com/jrnl-org/jrnl/releases/tag/v${version}"; description = "Simple command line journal application that stores your journal in a plain text file"; homepage = "https://jrnl.sh/"; license = licenses.gpl3Only; maintainers = with maintainers; [ bryanasdev000 zalakain ]; + mainProgram = "jrnl"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/kaufkauflist/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kaufkauflist/default.nix index 1d72341a39..8950a3017c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kaufkauflist/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kaufkauflist/default.nix @@ -1,33 +1,39 @@ -{ lib, buildPackages, buildGoModule, fetchFromGitHub, esbuild, buildNpmPackage, fetchFromGitea }: +{ lib +, buildPackages +, fetchFromGitHub +, buildNpmPackage +, fetchFromGitea +, nix-update-script +}: let esbuild' = buildPackages.esbuild.override { buildGoModule = args: buildPackages.buildGoModule (args // rec { - version = "0.17.19"; + version = "0.18.20"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-PLC7OJLSOiDq4OjvrdfCawZPfbfuZix4Waopzrj8qsU="; + hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); }; in buildNpmPackage rec { pname = "kaufkauflist"; - version = "2.2.0"; + version = "3.0.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "annaaurora"; repo = "kaufkauflist"; rev = "v${version}"; - hash = "sha256-a7C4yHTHPhL5/p1/XsrMA0PnbIzer6FShDiwUMOg69Y="; + hash = "sha256-W/FlHLZYYG/s9NdAqm0OJHlpTZtEG4iaegc4iOnAwWk="; }; - npmDepsHash = "sha256-uQ4XoaR3JjvPm8EQ2pnDM+x4zjVn4PEHq7BRqVbvFyw="; + npmDepsHash = "sha256-d1mvC72ugmKLNStoemUr8ISCUYjyo9EDWdWUCD1FMiM="; - ESBUILD_BINARY_PATH = "${lib.getExe esbuild'}"; + ESBUILD_BINARY_PATH = lib.getExe esbuild'; postInstall = '' mkdir -p $out/share/kaufkauflist $out/share/pocketbase @@ -35,8 +41,7 @@ in buildNpmPackage rec { cp -v pb_schema.json $out/share/pocketbase/ ''; - # Uncomment this when nix-update-script supports Gitea. - #passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { }; meta = with lib; { homepage = "https://codeberg.org/annaaurora/kaufkauflist"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix index bde5bd4b44..d9f6e5913f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepass/default.nix @@ -4,11 +4,11 @@ let inherit (builtins) add length readFile replaceStrings unsafeDiscardStringContext toString map; in buildDotnetPackage rec { pname = "keepass"; - version = "2.53.1"; + version = "2.54"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - hash = "sha256-R7KWxlxrhl55nOaDNYwA/cJJl+kd5ZYy6eZVqyrxxnM="; + hash = "sha256-fDXT4XxoJfPV8tU8uL94bnL//zKlvXGS9EzNls52kJg="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch b/third_party/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch index 5d367b0a82..b574716b0f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/keepass/fix-paths.patch @@ -53,44 +53,43 @@ index af02803..8a32c9d 100644 int iSep = str.IndexOf(':'); diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs -index ab49ee2..7f6c50f 100644 --- a/KeePass/Util/ClipboardUtil.Unix.cs +++ b/KeePass/Util/ClipboardUtil.Unix.cs -@@ -62,7 +62,7 @@ namespace KeePass.Util - // "-out -selection clipboard"); - // if(str != null) return str; +@@ -65,7 +65,7 @@ + // "-out -selection clipboard"); + // if(str != null) return str; -- string str = NativeLib.RunConsoleApp("xsel", -+ string str = NativeLib.RunConsoleApp("@xsel@", - "--output --clipboard", null, XSelFlags); - if(str != null) return str; - -@@ -83,10 +83,10 @@ namespace KeePass.Util - if(string.IsNullOrEmpty(str)) - { - // xsel with an empty input can hang, thus use --clear -- if(NativeLib.RunConsoleApp("xsel", "--clear --primary", -+ if(NativeLib.RunConsoleApp("@xsel@", "--clear --primary", - null, XSelFlags) != null) +- string str = NativeLib.RunConsoleApp("xsel", ++ string str = NativeLib.RunConsoleApp("@xsel@", + "--output --clipboard", null, XSelFlags); + if(str != null) return str; + } +@@ -93,10 +93,10 @@ + if(string.IsNullOrEmpty(str)) { -- NativeLib.RunConsoleApp("xsel", "--clear --clipboard", -+ NativeLib.RunConsoleApp("@xsel@", "--clear --clipboard", - null, XSelFlags); + // xsel with an empty input can hang, thus use --clear +- if(NativeLib.RunConsoleApp("xsel", "--clear --primary", ++ if(NativeLib.RunConsoleApp("@xsel@", "--clear --primary", + null, XSelFlags) != null) + { +- NativeLib.RunConsoleApp("xsel", "--clear --clipboard", ++ NativeLib.RunConsoleApp("@xsel@", "--clear --clipboard", + null, XSelFlags); + return; + } +@@ -107,10 +107,10 @@ + } + + // xsel does not support --primary and --clipboard together +- if(NativeLib.RunConsoleApp("xsel", "--input --primary", ++ if(NativeLib.RunConsoleApp("@xsel@", "--input --primary", + str, XSelFlags) != null) + { +- NativeLib.RunConsoleApp("xsel", "--input --clipboard", ++ NativeLib.RunConsoleApp("@xsel@", "--input --clipboard", + str, XSelFlags); return; } -@@ -97,10 +97,10 @@ namespace KeePass.Util - } - - // xsel does not support --primary and --clipboard together -- if(NativeLib.RunConsoleApp("xsel", "--input --primary", -+ if(NativeLib.RunConsoleApp("@xsel@", "--input --primary", - str, XSelFlags) != null) - { -- NativeLib.RunConsoleApp("xsel", "--input --clipboard", -+ NativeLib.RunConsoleApp("@xsel@", "--input --clipboard", - str, XSelFlags); - return; - } diff --git a/KeePassLib/Native/ClipboardU.cs b/KeePassLib/Native/ClipboardU.cs index 291c51d..3c76380 100644 --- a/KeePassLib/Native/ClipboardU.cs diff --git a/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix index 277a1b99cc..762434ef12 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keepassxc/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.7.5"; + version = "2.7.6"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "sha256-OBEjczUIkY3pQXJfsuNj9Bm2TIbVWEHqMSolQnSfvLE="; + hash = "sha256-xgrkMz7BCBxjfxHsAz/CFLv1d175LnrAJIOZMM3GmU0="; }; env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang (toString [ @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://keepassxc.org/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jonafato srapenne ]; + maintainers = with maintainers; [ jonafato srapenne blankparticle ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/keyleds/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keyleds/default.nix index c48b30b34d..a759b8e393 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keyleds/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keyleds/default.nix @@ -52,9 +52,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=MinSizeRel" - ]; + cmakeBuildType = "MinSizeRel"; meta = { homepage = "https://github.com/keyleds/keyleds"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/khard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/khard/default.nix index f80164026b..ff1bb3aa2e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/khard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/khard/default.nix @@ -10,10 +10,15 @@ python3.pkgs.buildPythonApplication rec { }; SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ - python3.pkgs.setuptools-scm + nativeBuildInputs = with python3.pkgs; [ + setuptools-scm + sphinxHook + sphinx-autoapi + sphinx-autodoc-typehints ]; + sphinxBuilders = [ "man" ]; + propagatedBuildInputs = with python3.pkgs; [ atomicwrites configobj @@ -40,5 +45,6 @@ python3.pkgs.buildPythonApplication rec { description = "Console carddav client"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ matthiasbeyer ]; + mainProgram = "khard"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/kile-wl/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/kile-wl/Cargo.lock new file mode 100644 index 0000000000..0ce38b8408 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/kile-wl/Cargo.lock @@ -0,0 +1,295 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cc" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading", +] + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[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", +] + +[[package]] +name = "kile" +version = "0.1.0" +dependencies = [ + "kilexpr", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "kilexpr" +version = "0.1.0" +source = "git+https://gitlab.com/snakedye/kilexpr#d7b58f2c9fd771b175d410c0b7f870f647a4fbbb" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "libloading" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +dependencies = [ + "cfg-if", + "windows-sys", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags", + "cfg-if", + "libc", + "memoffset", + "static_assertions", +] + +[[package]] +name = "pkg-config" +version = "0.3.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "proc-macro2" +version = "1.0.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.28.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "smallvec" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "unicode-ident" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[package]] +name = "wayland-backend" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b48e27457e8da3b2260ac60d0a94512f5cba36448679f3747c0865b7893ed8" +dependencies = [ + "cc", + "downcast-rs", + "io-lifetimes", + "nix", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489c9654770f674fc7e266b3c579f4053d7551df0ceb392f153adb1f9ed06ac8" +dependencies = [ + "bitflags", + "nix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9b873b257fbc32ec909c0eb80dea312076a67014e65e245f5eb69a6b8ab330e" +dependencies = [ + "proc-macro2", + "quick-xml", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b2a02ac608e07132978689a6f9bf4214949c85998c247abadd4f4129b1aa06" +dependencies = [ + "dlib", + "log", + "pkg-config", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" + +[[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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[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.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" diff --git a/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix index 0da4889ebd..33423f474a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kile-wl/default.nix @@ -1,28 +1,26 @@ -{ lib, fetchFromGitLab, unstableGitUpdater, rustPlatform, scdoc }: +{ lib, fetchFromGitLab, unstableGitUpdater, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "kile-wl"; - version = "unstable-2021-09-30"; + version = "unstable-2023-07-23"; src = fetchFromGitLab { owner = "snakedye"; repo = "kile"; - rev = "b543d435b92498b72609a05048bc368837a7b455"; - sha256 = "sha256-+SjdhSRT6TGbwvgZti8t9wYJx8LEtY3pleDZx/AEkio="; + rev = "c24208761d04e0a74d203fc1dcd2f7fed68da388"; + sha256 = "sha256-4iclNVd7nm6LkgvsHwWaWyi1bZL/A+bbT5OSXn70bLs="; }; passthru.updateScript = unstableGitUpdater { url = "https://gitlab.com/snakedye/kile.git"; }; - cargoSha256 = "sha256-W7rq42Pz+l4TSsR/h2teRTbl3A1zjOcIx6wqgnwyQNA="; - - nativeBuildInputs = [ scdoc ]; - - postInstall = '' - mkdir -p $out/share/man - scdoc < doc/kile.1.scd > $out/share/man/kile.1 - ''; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "kilexpr-0.1.0" = "sha256-Bw6vYtzhheAJ8NLQtr3gLjZ9/5ajuABURRYDnVF9W1Y="; + }; + }; meta = with lib; { description = "A tiling layout generator for river"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/kiln/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kiln/default.nix index 8a64668393..ed9575ffa0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kiln/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kiln/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ scdoc installShellFiles ]; - vendorSha256 = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE="; + vendorHash = "sha256-C1ueL/zmPzFbpNo5BF56/t74nwCUvb2Vu1exssPqOPE="; postInstall = '' scdoc < docs/kiln.1.scd > docs/kiln.1 diff --git a/third_party/nixpkgs/pkgs/applications/misc/kiwix/lib.nix b/third_party/nixpkgs/pkgs/applications/misc/kiwix/lib.nix index 144d83f6c1..aa9117997c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kiwix/lib.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kiwix/lib.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libkiwix"; - version = "12.0.0"; + version = "12.1.1"; src = fetchFromGitHub { owner = "kiwix"; repo = pname; rev = version; - sha256 = "sha256-4FxLxJxVhqbeNqX4vorHkROUuRURvE6AXlteIZCEBtc="; + sha256 = "sha256-hcwLxfn1fiUAiwsnIddv4HukvVrFePtx7sDQUD1lGUA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix index 9a535dfa8b..6306400a3c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.28.10"; + version = "0.28.11"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - hash = "sha256-CDaLKBDm4slUMZ8OWm/wNub4P8LY26P8G8oIxwzJyXY="; + hash = "sha256-PEWb2QBWK3XMuOAkSI2nAk6UJronG+3+NBU92uWO5LQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/konsave/default.nix b/third_party/nixpkgs/pkgs/applications/misc/konsave/default.nix new file mode 100644 index 0000000000..75950d28e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/konsave/default.nix @@ -0,0 +1,27 @@ +{ lib, python3Packages, fetchPypi }: + +python3Packages.buildPythonApplication rec { + pname = "konsave"; + version = "2.2.0"; + + src = fetchPypi { + inherit version; + pname = "Konsave"; + hash = "sha256-tWarqT2jFgCuSsa2NwMHRaR3/wj0khiRHidvRNMwM8M="; + }; + + nativeBuildInputs = with python3Packages; [ setuptools-scm ]; + propagatedBuildInputs = with python3Packages; [ pyyaml setuptools ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + meta = with lib; { + description = "Save Linux Customization"; + maintainers = with maintainers; [ MoritzBoehme ]; + homepage = "https://github.com/Prayag2/konsave"; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix index 430a0da171..9031b7d6d5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kratos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kratos"; - version = "0.10.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ory"; repo = "kratos"; rev = "v${version}"; - hash = "sha256-Ld2N7w9jQLkzCww1Sex5nEBZf6e9XIUnbfPOjcFAYQA="; + hash = "sha256-KDpc0zc65rvvpPojghFEujoS0aewyjv7B/bmpC2i1dA="; }; - vendorSha256 = "sha256-9zXoJ+c1aPWDqasechC4ModWE0+sfMqZzp/Pph/mYcs="; + vendorHash = "sha256-Y/Sd2hu1bPUb0TQRD1pANz+rtqKcHBXvjKpYwKgxHMQ="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/kuro/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kuro/default.nix index 96763f5179..50a773b5c5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kuro/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kuro/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchYarnDeps , makeWrapper , makeDesktopItem , copyDesktopItems @@ -19,8 +20,11 @@ mkYarnPackage rec { }; packageJSON = ./package.json; - yarnLock = ./yarn.lock; - yarnNix = ./yarn.nix; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-GTiNv7u1QK/wjQgpka7REuoLn2wjZG59kYJQaZZPycI="; + }; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -34,7 +38,7 @@ mkYarnPackage rec { yarn --offline run electron-builder \ --dir \ - -c.electronDist=${electron}/lib/electron \ + -c.electronDist=${electron}/libexec/electron \ -c.electronVersion=${electron.version} popd diff --git a/third_party/nixpkgs/pkgs/applications/misc/kuro/yarn.lock b/third_party/nixpkgs/pkgs/applications/misc/kuro/yarn.lock deleted file mode 100644 index 32ae3b6e81..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/kuro/yarn.lock +++ /dev/null @@ -1,5757 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"7zip-bin@~5.1.1": - version "5.1.1" - resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" - integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== - -"@babel/code-frame@^7.0.0": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789" - integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg== - dependencies: - "@babel/highlight" "^7.16.7" - -"@babel/helper-validator-identifier@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad" - integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw== - -"@babel/helper-validator-identifier@^7.19.1": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" - integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== - -"@babel/highlight@^7.16.7": - version "7.17.12" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.12.tgz#257de56ee5afbd20451ac0a75686b6b404257351" - integrity sha512-7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg== - dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/runtime@^7.7.2": - version "7.18.3" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4" - integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug== - dependencies: - regenerator-runtime "^0.13.4" - -"@csstools/selector-specificity@^2.0.1": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz#1bfafe4b7ed0f3e4105837e056e0a89b108ebe36" - integrity sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg== - -"@develar/schema-utils@~2.6.5": - version "2.6.5" - resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6" - integrity sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig== - dependencies: - ajv "^6.12.0" - ajv-keywords "^3.4.1" - -"@electron/get@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e" - integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g== - dependencies: - 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" - optionalDependencies: - global-agent "^3.0.0" - -"@electron/universal@1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339" - integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ== - dependencies: - "@malept/cross-spawn-promise" "^1.1.0" - asar "^3.1.0" - debug "^4.3.1" - dir-compare "^2.4.0" - fs-extra "^9.0.1" - minimatch "^3.0.4" - plist "^3.0.4" - -"@eslint/eslintrc@^1.3.3", "@eslint/eslintrc@^1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e" - integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA== - dependencies: - ajv "^6.12.4" - debug "^4.3.2" - espree "^9.4.0" - globals "^13.19.0" - ignore "^5.2.0" - import-fresh "^3.2.1" - js-yaml "^4.1.0" - minimatch "^3.1.2" - strip-json-comments "^3.1.1" - -"@humanwhocodes/config-array@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" - integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== - dependencies: - "@humanwhocodes/object-schema" "^1.2.1" - debug "^4.1.1" - minimatch "^3.0.5" - -"@humanwhocodes/module-importer@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" - integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== - -"@humanwhocodes/object-schema@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" - integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== - -"@jimp/bmp@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.14.0.tgz#6df246026554f276f7b354047c6fff9f5b2b5182" - integrity sha512-5RkX6tSS7K3K3xNEb2ygPuvyL9whjanhoaB/WmmXlJS6ub4DjTqrapu8j4qnIWmO4YYtFeTbDTXV6v9P1yMA5A== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - bmp-js "^0.1.0" - -"@jimp/core@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.14.0.tgz#870c9ca25b40be353ebda1d2abb48723d9010055" - integrity sha512-S62FcKdtLtj3yWsGfJRdFXSutjvHg7aQNiFogMbwq19RP4XJWqS2nOphu7ScB8KrSlyy5nPF2hkWNhLRLyD82w== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - any-base "^1.1.0" - buffer "^5.2.0" - exif-parser "^0.1.12" - file-type "^9.0.0" - load-bmfont "^1.3.1" - mkdirp "^0.5.1" - phin "^2.9.1" - pixelmatch "^4.0.2" - tinycolor2 "^1.4.1" - -"@jimp/custom@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.14.0.tgz#1dbbf0094df7403f4e03bc984ed92e7458842f74" - integrity sha512-kQJMeH87+kWJdVw8F9GQhtsageqqxrvzg7yyOw3Tx/s7v5RToe8RnKyMM+kVtBJtNAG+Xyv/z01uYQ2jiZ3GwA== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/core" "^0.14.0" - -"@jimp/gif@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.14.0.tgz#db159f57c3cfd1566bbe8b124958791998614960" - integrity sha512-DHjoOSfCaCz72+oGGEh8qH0zE6pUBaBxPxxmpYJjkNyDZP7RkbBkZJScIYeQ7BmJxmGN4/dZn+MxamoQlr+UYg== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - gifwrap "^0.9.2" - omggif "^1.0.9" - -"@jimp/jpeg@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.14.0.tgz#8a687a6a653bbbae38c522edef8f84bb418d9461" - integrity sha512-561neGbr+87S/YVQYnZSTyjWTHBm9F6F1obYHiyU3wVmF+1CLbxY3FQzt4YolwyQHIBv36Bo0PY2KkkU8BEeeQ== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - jpeg-js "^0.4.0" - -"@jimp/plugin-blit@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.14.0.tgz#5eb374be1201313b2113899fb842232d8fcfd345" - integrity sha512-YoYOrnVHeX3InfgbJawAU601iTZMwEBZkyqcP1V/S33Qnz9uzH1Uj1NtC6fNgWzvX6I4XbCWwtr4RrGFb5CFrw== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-blur@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.14.0.tgz#fe07e4932d5a2f5d8c9831e245561553224bfc60" - integrity sha512-9WhZcofLrT0hgI7t0chf7iBQZib//0gJh9WcQMUt5+Q1Bk04dWs8vTgLNj61GBqZXgHSPzE4OpCrrLDBG8zlhQ== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-circle@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.14.0.tgz#82c0e904a34e90fa672fb9c286bc892e92088ddf" - integrity sha512-o5L+wf6QA44tvTum5HeLyLSc5eVfIUd5ZDVi5iRfO4o6GT/zux9AxuTSkKwnjhsG8bn1dDmywAOQGAx7BjrQVA== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-color@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.14.0.tgz#772bd2d80a88bc66ea1331d010207870f169a74b" - integrity sha512-JJz512SAILYV0M5LzBb9sbOm/XEj2fGElMiHAxb7aLI6jx+n0agxtHpfpV/AePTLm1vzzDxx6AJxXbKv355hBQ== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - tinycolor2 "^1.4.1" - -"@jimp/plugin-contain@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.14.0.tgz#c68115420d182e696f81bbe76fb5e704909b2b6a" - integrity sha512-RX2q233lGyaxiMY6kAgnm9ScmEkNSof0hdlaJAVDS1OgXphGAYAeSIAwzESZN4x3ORaWvkFefeVH9O9/698Evg== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-cover@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.14.0.tgz#4755322589c5885e44e14e31b86b542e907297ce" - integrity sha512-0P/5XhzWES4uMdvbi3beUgfvhn4YuQ/ny8ijs5kkYIw6K8mHcl820HahuGpwWMx56DJLHRl1hFhJwo9CeTRJtQ== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-crop@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.14.0.tgz#4cbd856ca84ffc37230fad2534906f2f75aa3057" - integrity sha512-Ojtih+XIe6/XSGtpWtbAXBozhCdsDMmy+THUJAGu2x7ZgKrMS0JotN+vN2YC3nwDpYkM+yOJImQeptSfZb2Sug== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-displace@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.14.0.tgz#b0e6a57d00cb1f893f541413fe9d737d23c3b70c" - integrity sha512-c75uQUzMgrHa8vegkgUvgRL/PRvD7paFbFJvzW0Ugs8Wl+CDMGIPYQ3j7IVaQkIS+cAxv+NJ3TIRBQyBrfVEOg== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-dither@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.14.0.tgz#9185ec4c38e02edc9e5831f5d709f6ba891e1b93" - integrity sha512-g8SJqFLyYexXQQsoh4dc1VP87TwyOgeTElBcxSXX2LaaMZezypmxQfLTzOFzZoK8m39NuaoH21Ou1Ftsq7LzVQ== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-fisheye@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.14.0.tgz#9f26346cf2fbc660cc2008cd7fd30a83b5029e78" - integrity sha512-BFfUZ64EikCaABhCA6mR3bsltWhPpS321jpeIQfJyrILdpFsZ/OccNwCgpW1XlbldDHIoNtXTDGn3E+vCE7vDg== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-flip@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.14.0.tgz#7966d6aa3b5fe1aa4d2d561ff12b8ef5ccb9b071" - integrity sha512-WtL1hj6ryqHhApih+9qZQYA6Ye8a4HAmdTzLbYdTMrrrSUgIzFdiZsD0WeDHpgS/+QMsWwF+NFmTZmxNWqKfXw== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-gaussian@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.14.0.tgz#452bc1971a4467ad9b984aa67f4c200bf941bb65" - integrity sha512-uaLwQ0XAQoydDlF9tlfc7iD9drYPriFe+jgYnWm8fbw5cN+eOIcnneEX9XCOOzwgLPkNCxGox6Kxjn8zY6GxtQ== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-invert@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.14.0.tgz#cd31a555860e9f821394936d15af161c09c42921" - integrity sha512-UaQW9X9vx8orQXYSjT5VcITkJPwDaHwrBbxxPoDG+F/Zgv4oV9fP+udDD6qmkgI9taU+44Fy+zm/J/gGcMWrdg== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-mask@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.14.0.tgz#52619643ac6222f85e6b27dee33c771ca3a6a4c9" - integrity sha512-tdiGM69OBaKtSPfYSQeflzFhEpoRZ+BvKfDEoivyTjauynbjpRiwB1CaiS8En1INTDwzLXTT0Be9SpI3LkJoEA== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-normalize@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.14.0.tgz#bf39e356b6d473f582ce95633ad49c9cdb82492b" - integrity sha512-AfY8sqlsbbdVwFGcyIPy5JH/7fnBzlmuweb+Qtx2vn29okq6+HelLjw2b+VT2btgGUmWWHGEHd86oRGSoWGyEQ== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-print@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.14.0.tgz#1c43c2a92a7adc05b464863882cb89ce486d63e6" - integrity sha512-MwP3sH+VS5AhhSTXk7pui+tEJFsxnTKFY3TraFJb8WFbA2Vo2qsRCZseEGwpTLhENB7p/JSsLvWoSSbpmxhFAQ== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - load-bmfont "^1.4.0" - -"@jimp/plugin-resize@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.14.0.tgz#ef7fc6c2e45f8bcab62456baf8fd3bc415b02b64" - integrity sha512-qFeMOyXE/Bk6QXN0GQo89+CB2dQcXqoxUcDb2Ah8wdYlKqpi53skABkgVy5pW3EpiprDnzNDboMltdvDslNgLQ== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-rotate@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.14.0.tgz#3632bc159bf1c3b9ec9f459d9c05d02a11781ee7" - integrity sha512-aGaicts44bvpTcq5Dtf93/8TZFu5pMo/61lWWnYmwJJU1RqtQlxbCLEQpMyRhKDNSfPbuP8nyGmaqXlM/82J0Q== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-scale@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.14.0.tgz#d30f0cd1365b8e68f43fa423300ae7f124e9bf10" - integrity sha512-ZcJk0hxY5ZKZDDwflqQNHEGRblgaR+piePZm7dPwPUOSeYEH31P0AwZ1ziceR74zd8N80M0TMft+e3Td6KGBHw== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-shadow@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.14.0.tgz#471fdb9f109ff2d9e20d533d45e1e18e0b48c749" - integrity sha512-p2igcEr/iGrLiTu0YePNHyby0WYAXM14c5cECZIVnq/UTOOIQ7xIcWZJ1lRbAEPxVVXPN1UibhZAbr3HAb5BjQ== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugin-threshold@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.14.0.tgz#ebd72721c7d1d518c5bb6e494e55d97ac3351d3b" - integrity sha512-N4BlDgm/FoOMV/DQM2rSpzsgqAzkP0DXkWZoqaQrlRxQBo4zizQLzhEL00T/YCCMKnddzgEhnByaocgaaa0fKw== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - -"@jimp/plugins@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.14.0.tgz#41dba85f15ab8dadb4162100eb54e5f27b93ee2c" - integrity sha512-vDO3XT/YQlFlFLq5TqNjQkISqjBHT8VMhpWhAfJVwuXIpilxz5Glu4IDLK6jp4IjPR6Yg2WO8TmRY/HI8vLrOw== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/plugin-blit" "^0.14.0" - "@jimp/plugin-blur" "^0.14.0" - "@jimp/plugin-circle" "^0.14.0" - "@jimp/plugin-color" "^0.14.0" - "@jimp/plugin-contain" "^0.14.0" - "@jimp/plugin-cover" "^0.14.0" - "@jimp/plugin-crop" "^0.14.0" - "@jimp/plugin-displace" "^0.14.0" - "@jimp/plugin-dither" "^0.14.0" - "@jimp/plugin-fisheye" "^0.14.0" - "@jimp/plugin-flip" "^0.14.0" - "@jimp/plugin-gaussian" "^0.14.0" - "@jimp/plugin-invert" "^0.14.0" - "@jimp/plugin-mask" "^0.14.0" - "@jimp/plugin-normalize" "^0.14.0" - "@jimp/plugin-print" "^0.14.0" - "@jimp/plugin-resize" "^0.14.0" - "@jimp/plugin-rotate" "^0.14.0" - "@jimp/plugin-scale" "^0.14.0" - "@jimp/plugin-shadow" "^0.14.0" - "@jimp/plugin-threshold" "^0.14.0" - timm "^1.6.1" - -"@jimp/png@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.14.0.tgz#0f2dddb5125c0795ca7e67c771204c5437fcda4b" - integrity sha512-0RV/mEIDOrPCcNfXSPmPBqqSZYwGADNRVUTyMt47RuZh7sugbYdv/uvKmQSiqRdR0L1sfbCBMWUEa5G/8MSbdA== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/utils" "^0.14.0" - pngjs "^3.3.3" - -"@jimp/tiff@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.14.0.tgz#a5b25bbe7c43fc3b07bad4e2ab90e0e164c1967f" - integrity sha512-zBYDTlutc7j88G/7FBCn3kmQwWr0rmm1e0FKB4C3uJ5oYfT8645lftUsvosKVUEfkdmOaMAnhrf4ekaHcb5gQw== - dependencies: - "@babel/runtime" "^7.7.2" - utif "^2.0.1" - -"@jimp/types@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.14.0.tgz#ef681ff702883c5f105b5e4e30d49abf39ee9e34" - integrity sha512-hx3cXAW1KZm+b+XCrY3LXtdWy2U+hNtq0rPyJ7NuXCjU7lZR3vIkpz1DLJ3yDdS70hTi5QDXY3Cd9kd6DtloHQ== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/bmp" "^0.14.0" - "@jimp/gif" "^0.14.0" - "@jimp/jpeg" "^0.14.0" - "@jimp/png" "^0.14.0" - "@jimp/tiff" "^0.14.0" - timm "^1.6.1" - -"@jimp/utils@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.14.0.tgz#296254e63118554c62c31c19ac6b8c4bfe6490e5" - integrity sha512-MY5KFYUru0y74IsgM/9asDwb3ERxWxXEu3CRCZEvE7DtT86y1bR1XgtlSliMrptjz4qbivNGMQSvUBpEFJDp1A== - dependencies: - "@babel/runtime" "^7.7.2" - regenerator-runtime "^0.13.3" - -"@malept/cross-spawn-promise@^1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" - integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== - dependencies: - cross-spawn "^7.0.1" - -"@malept/flatpak-bundler@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" - integrity sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q== - dependencies: - debug "^4.1.1" - fs-extra "^9.0.0" - lodash "^4.17.15" - tmp-promise "^3.0.2" - -"@nodelib/fs.scandir@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" - integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== - dependencies: - "@nodelib/fs.stat" "2.0.5" - run-parallel "^1.1.9" - -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" - integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== - -"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" - integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== - dependencies: - "@nodelib/fs.scandir" "2.1.5" - fastq "^1.6.0" - -"@sindresorhus/is@^4.0.0": - version "4.6.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" - integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== - -"@szmarczak/http-timer@^4.0.5": - version "4.0.6" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" - integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w== - dependencies: - defer-to-connect "^2.0.0" - -"@tootallnate/once@2": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" - integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== - -"@types/cacheable-request@^6.0.1": - version "6.0.3" - resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183" - integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw== - dependencies: - "@types/http-cache-semantics" "*" - "@types/keyv" "^3.1.4" - "@types/node" "*" - "@types/responselike" "^1.0.0" - -"@types/debug@^4.1.6": - version "4.1.7" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" - integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg== - dependencies: - "@types/ms" "*" - -"@types/eslint@^7.2.13": - version "7.29.0" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz#e56ddc8e542815272720bb0b4ccc2aff9c3e1c78" - integrity sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*": - version "0.0.51" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" - integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== - -"@types/fs-extra@^9.0.11": - version "9.0.13" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" - integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== - dependencies: - "@types/node" "*" - -"@types/glob@^7.1.1": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" - integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== - dependencies: - "@types/minimatch" "*" - "@types/node" "*" - -"@types/http-cache-semantics@*": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" - integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== - -"@types/json-schema@*", "@types/json-schema@^7.0.9": - version "7.0.11" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" - integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== - -"@types/json5@^0.0.29": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" - integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== - -"@types/keyv@^3.1.4": - version "3.1.4" - resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6" - integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg== - dependencies: - "@types/node" "*" - -"@types/minimatch@*": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" - integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== - -"@types/minimist@^1.2.0", "@types/minimist@^1.2.2": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" - integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== - -"@types/ms@*": - version "0.7.31" - resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" - integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== - -"@types/node@*": - version "18.11.18" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f" - integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA== - -"@types/node@16.9.1": - version "16.9.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708" - integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g== - -"@types/node@^16.11.26": - version "16.11.41" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.41.tgz#88eb485b1bfdb4c224d878b7832239536aa2f813" - integrity sha512-mqoYK2TnVjdkGk8qXAVGc/x9nSaTpSrFaGFm43BUH3IdoBV0nta6hYaGmdOvIMlbHJbUEVen3gvwpwovAZKNdQ== - -"@types/normalize-package-data@^2.4.0", "@types/normalize-package-data@^2.4.1": - version "2.4.1" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" - integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== - -"@types/parse-json@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" - integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== - -"@types/plist@^3.0.1": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01" - integrity sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw== - dependencies: - "@types/node" "*" - xmlbuilder ">=11.0.1" - -"@types/responselike@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" - integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== - dependencies: - "@types/node" "*" - -"@types/semver@^7.3.12": - version "7.3.13" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91" - integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw== - -"@types/verror@^1.10.3": - version "1.10.5" - resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz#2a1413aded46e67a1fe2386800e291123ed75eb1" - integrity sha512-9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw== - -"@types/yargs-parser@*": - version "21.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" - integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== - -"@types/yargs@^17.0.1": - version "17.0.10" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz#591522fce85d8739bca7b8bb90d048e4478d186a" - integrity sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA== - dependencies: - "@types/yargs-parser" "*" - -"@types/yauzl@^2.9.1": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" - integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw== - dependencies: - "@types/node" "*" - -"@typescript-eslint/eslint-plugin@^5.43.0": - version "5.53.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.53.0.tgz#24b8b4a952f3c615fe070e3c461dd852b5056734" - integrity sha512-alFpFWNucPLdUOySmXCJpzr6HKC3bu7XooShWM+3w/EL6J2HIoB2PFxpLnq4JauWVk6DiVeNKzQlFEaE+X9sGw== - dependencies: - "@typescript-eslint/scope-manager" "5.53.0" - "@typescript-eslint/type-utils" "5.53.0" - "@typescript-eslint/utils" "5.53.0" - debug "^4.3.4" - grapheme-splitter "^1.0.4" - ignore "^5.2.0" - natural-compare-lite "^1.4.0" - regexpp "^3.2.0" - semver "^7.3.7" - tsutils "^3.21.0" - -"@typescript-eslint/parser@^5.43.0": - version "5.53.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.53.0.tgz#a1f2b9ae73b83181098747e96683f1b249ecab52" - integrity sha512-MKBw9i0DLYlmdOb3Oq/526+al20AJZpANdT6Ct9ffxcV8nKCHz63t/S0IhlTFNsBIHJv+GY5SFJ0XfqVeydQrQ== - dependencies: - "@typescript-eslint/scope-manager" "5.53.0" - "@typescript-eslint/types" "5.53.0" - "@typescript-eslint/typescript-estree" "5.53.0" - debug "^4.3.4" - -"@typescript-eslint/scope-manager@5.53.0": - version "5.53.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.53.0.tgz#42b54f280e33c82939275a42649701024f3fafef" - integrity sha512-Opy3dqNsp/9kBBeCPhkCNR7fmdSQqA+47r21hr9a14Bx0xnkElEQmhoHga+VoaoQ6uDHjDKmQPIYcUcKJifS7w== - dependencies: - "@typescript-eslint/types" "5.53.0" - "@typescript-eslint/visitor-keys" "5.53.0" - -"@typescript-eslint/type-utils@5.53.0": - version "5.53.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.53.0.tgz#41665449935ba9b4e6a1ba6e2a3f4b2c31d6cf97" - integrity sha512-HO2hh0fmtqNLzTAme/KnND5uFNwbsdYhCZghK2SoxGp3Ifn2emv+hi0PBUjzzSh0dstUIFqOj3bp0AwQlK4OWw== - dependencies: - "@typescript-eslint/typescript-estree" "5.53.0" - "@typescript-eslint/utils" "5.53.0" - debug "^4.3.4" - tsutils "^3.21.0" - -"@typescript-eslint/types@5.53.0": - version "5.53.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.53.0.tgz#f79eca62b97e518ee124086a21a24f3be267026f" - integrity sha512-5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A== - -"@typescript-eslint/typescript-estree@5.53.0": - version "5.53.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.53.0.tgz#bc651dc28cf18ab248ecd18a4c886c744aebd690" - integrity sha512-eKmipH7QyScpHSkhbptBBYh9v8FxtngLquq292YTEQ1pxVs39yFBlLC1xeIZcPPz1RWGqb7YgERJRGkjw8ZV7w== - dependencies: - "@typescript-eslint/types" "5.53.0" - "@typescript-eslint/visitor-keys" "5.53.0" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - semver "^7.3.7" - tsutils "^3.21.0" - -"@typescript-eslint/utils@5.53.0": - version "5.53.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.53.0.tgz#e55eaad9d6fffa120575ffaa530c7e802f13bce8" - integrity sha512-VUOOtPv27UNWLxFwQK/8+7kvxVC+hPHNsJjzlJyotlaHjLSIgOCKj9I0DBUjwOOA64qjBwx5afAPjksqOxMO0g== - dependencies: - "@types/json-schema" "^7.0.9" - "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.53.0" - "@typescript-eslint/types" "5.53.0" - "@typescript-eslint/typescript-estree" "5.53.0" - eslint-scope "^5.1.1" - eslint-utils "^3.0.0" - semver "^7.3.7" - -"@typescript-eslint/visitor-keys@5.53.0": - version "5.53.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.53.0.tgz#8a5126623937cdd909c30d8fa72f79fa56cc1a9f" - integrity sha512-JqNLnX3leaHFZEN0gCh81sIvgrp/2GOACZNgO4+Tkf64u51kTpAyWFOY8XHx8XuXr3N2C9zgPPHtcpMg6z1g0w== - dependencies: - "@typescript-eslint/types" "5.53.0" - eslint-visitor-keys "^3.3.0" - -acorn-jsx@^5.3.2: - version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" - integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== - -acorn@^8.7.1: - version "8.7.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" - integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== - -acorn@^8.8.0: - version "8.8.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" - integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== - -agent-base@6: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - -ajv-formats@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" - integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== - dependencies: - ajv "^8.0.0" - -ajv-keywords@^3.4.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== - -ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.3, ajv@^6.12.4: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - 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" - -ajv@^8.0.0, ajv@^8.0.1, ajv@^8.6.3: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" - integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - -ansi-escapes@^4.2.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" - integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== - dependencies: - type-fest "^0.21.3" - -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA== - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA== - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -any-base@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz#ae101a62bc08a597b4c9ab5b7089d456630549fe" - integrity sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg== - -app-builder-bin@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" - integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== - -app-builder-lib@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8" - integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA== - dependencies: - "7zip-bin" "~5.1.1" - "@develar/schema-utils" "~2.6.5" - "@electron/universal" "1.2.1" - "@malept/flatpak-bundler" "^0.4.0" - async-exit-hook "^2.0.1" - bluebird-lst "^1.0.9" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - chromium-pickle-js "^0.2.0" - debug "^4.3.4" - ejs "^3.1.7" - electron-osx-sign "^0.6.0" - electron-publish "23.6.0" - form-data "^4.0.0" - fs-extra "^10.1.0" - hosted-git-info "^4.1.0" - is-ci "^3.0.0" - isbinaryfile "^4.0.10" - js-yaml "^4.1.0" - lazy-val "^1.0.5" - minimatch "^3.1.2" - read-config-file "6.2.0" - sanitize-filename "^1.6.3" - semver "^7.3.7" - tar "^6.1.11" - temp-file "^3.4.0" - -applescript@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/applescript/-/applescript-1.0.0.tgz#bb87af568cad034a4e48c4bdaf6067a3a2701317" - integrity sha512-yvtNHdWvtbYEiIazXAdp/NY+BBb65/DAseqlNiJQjOx9DynuzOYDbVLBJvuc0ve0VL9x6B3OHF6eH52y9hCBtQ== - -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - -args@^2.3.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/args/-/args-2.6.1.tgz#b2590ed4168cd31b62444199bdc5166bb1920c2f" - integrity sha512-6gqHZwB7mIn1YnijODwDlAuDgadJvDy1rVM+8E4tbAIPIhL53/J5hDomxgLPZ/1Som+eRKRDmUnuo9ezUpzmRw== - dependencies: - camelcase "4.1.0" - chalk "1.1.3" - minimist "1.2.0" - pkginfo "0.4.0" - string-similarity "1.1.0" - -array-find@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/array-find/-/array-find-1.0.0.tgz#6c8e286d11ed768327f8e62ecee87353ca3e78b8" - integrity sha512-kO/vVCacW9mnpn3WPWbTVlEnOabK2L7LWi2HViURtCM46y1zb6I8UMjx4LgbiqadTgHnLInUronwn3ampNTJtQ== - -array-includes@^3.1.4: - version "3.1.5" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb" - integrity sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.19.5" - get-intrinsic "^1.1.1" - is-string "^1.0.7" - -array-union@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" - integrity sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng== - dependencies: - array-uniq "^1.0.1" - -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== - -array-uniq@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q== - -array.prototype.flat@^1.2.5: - version "1.3.0" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz#0b0c1567bf57b38b56b4c97b8aa72ab45e4adc7b" - integrity sha512-12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.2" - es-shim-unscopables "^1.0.0" - -arrify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA== - -arrify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-3.0.0.tgz#ccdefb8eaf2a1d2ab0da1ca2ce53118759fd46bc" - integrity sha512-tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw== - -asar@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473" - integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ== - dependencies: - chromium-pickle-js "^0.2.0" - commander "^5.0.0" - glob "^7.1.6" - minimatch "^3.0.4" - optionalDependencies: - "@types/glob" "^7.1.1" - -asn1@~0.2.3: - version "0.2.6" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d" - integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ== - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== - -astral-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" - integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== - -async-exit-hook@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" - integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw== - -async@^3.2.3: - version "3.2.4" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" - integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== - -at-least-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" - integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== - -atomically@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/atomically/-/atomically-1.7.0.tgz#c07a0458432ea6dbc9a3506fffa424b48bccaafe" - integrity sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w== - -auto-launch@^5.0.1: - version "5.0.5" - resolved "https://registry.yarnpkg.com/auto-launch/-/auto-launch-5.0.5.tgz#d14bd002b1ef642f85e991a6195ff5300c8ad3c0" - integrity sha512-ppdF4mihhYzMYLuCcx9H/c5TUOCev8uM7en53zWVQhyYAJrurd2bFZx3qQVeJKF2jrc7rsPRNN5cD+i23l6PdA== - dependencies: - applescript "^1.0.0" - mkdirp "^0.5.1" - path-is-absolute "^1.0.0" - untildify "^3.0.2" - winreg "1.2.4" - -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA== - -aws4@^1.8.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" - integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -balanced-match@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9" - integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA== - -base64-js@^1.3.1, base64-js@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w== - dependencies: - tweetnacl "^0.14.3" - -bluebird-lst@^1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" - integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw== - dependencies: - bluebird "^3.5.5" - -bluebird@^3.5.0, bluebird@^3.5.5: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== - -bmp-js@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.1.0.tgz#e05a63f796a6c1ff25f4771ec7adadc148c07233" - integrity sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw== - -boolean@^3.0.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" - integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== - dependencies: - balanced-match "^1.0.0" - -braces@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -buffer-alloc-unsafe@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" - integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== - -buffer-alloc@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" - integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== - dependencies: - buffer-alloc-unsafe "^1.1.0" - buffer-fill "^1.0.0" - -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== - -buffer-equal@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b" - integrity sha512-RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA== - -buffer-equal@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" - integrity sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ== - -buffer-fill@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" - integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ== - -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== - -buffer@^5.1.0, buffer@^5.2.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - -builder-util-runtime@9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60" - integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw== - dependencies: - debug "^4.3.4" - sax "^1.2.4" - -builder-util@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9" - integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ== - dependencies: - "7zip-bin" "~5.1.1" - "@types/debug" "^4.1.6" - "@types/fs-extra" "^9.0.11" - app-builder-bin "4.0.0" - bluebird-lst "^1.0.9" - builder-util-runtime "9.1.1" - chalk "^4.1.1" - cross-spawn "^7.0.3" - debug "^4.3.4" - fs-extra "^10.0.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" - 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" - -builtin-modules@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6" - integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw== - -builtins@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9" - integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ== - dependencies: - semver "^7.0.0" - -cacheable-lookup@^5.0.3: - version "5.0.4" - resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" - integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== - -cacheable-request@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27" - integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew== - dependencies: - 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@^1.0.0, call-bind@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" - -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== - -camelcase-keys@^6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0" - integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg== - dependencies: - camelcase "^5.3.1" - map-obj "^4.0.0" - quick-lru "^4.0.1" - -camelcase-keys@^8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-8.0.2.tgz#a7140ba7c797aea32161d4ce5cdbda11d09eb414" - integrity sha512-qMKdlOfsjlezMqxkUGGMaWWs17i2HoL15tM+wtx8ld4nLrUwU58TFdvyGOz/piNP842KeO8yXvggVQSdQ828NA== - dependencies: - camelcase "^7.0.0" - map-obj "^4.3.0" - quick-lru "^6.1.1" - type-fest "^2.13.0" - -camelcase@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - integrity sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw== - -camelcase@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a" - integrity sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg== - -camelcase@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -camelcase@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-7.0.1.tgz#f02e50af9fd7782bc8b88a3558c32fd3a388f048" - integrity sha512-xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw== - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== - -chalk@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A== - dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" - -chalk@^2.0.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== - -chromium-pickle-js@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" - integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== - -ci-info@^3.2.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.2.tgz#6d2967ffa407466481c6c90b6e16b3098f080128" - integrity sha512-xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg== - -ci-info@^3.4.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" - integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== - -clean-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/clean-regexp/-/clean-regexp-1.0.0.tgz#8df7c7aae51fd36874e8f8d05b9180bc11a3fed7" - integrity sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw== - dependencies: - escape-string-regexp "^1.0.5" - -cli-truncate@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" - integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== - dependencies: - slice-ansi "^3.0.0" - string-width "^4.2.0" - -cliui@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - integrity sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w== - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" - -cliui@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" - integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.1" - wrap-ansi "^7.0.0" - -clone-regexp@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-2.2.0.tgz#7d65e00885cd8796405c35a737e7a86b7429e36f" - integrity sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q== - dependencies: - is-regexp "^2.0.0" - -clone-response@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3" - integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA== - dependencies: - mimic-response "^1.0.0" - -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA== - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -colord@^2.9.2: - version "2.9.2" - resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1" - integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ== - -colors@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" - integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw== - -combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -commander@2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - integrity sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A== - dependencies: - graceful-readlink ">= 1.0.0" - -commander@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" - integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== - -common-path-prefix@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0" - integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w== - -compare-version@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" - integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A== - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - -concat-stream@^1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" - integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - -conf@^10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/conf/-/conf-10.2.0.tgz#838e757be963f1a2386dfe048a98f8f69f7b55d6" - integrity sha512-8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg== - dependencies: - 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" - -confusing-browser-globals@1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81" - integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA== - -core-util-is@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== - -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - -cosmiconfig@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" - integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== - dependencies: - "@types/parse-json" "^4.0.0" - import-fresh "^3.2.1" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.10.0" - -cosmiconfig@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6" - integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA== - dependencies: - "@types/parse-json" "^4.0.0" - import-fresh "^3.2.1" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.10.0" - -crc@^3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" - integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== - dependencies: - buffer "^5.1.0" - -cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -css-functions-list@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.1.0.tgz#cf5b09f835ad91a00e5959bcfc627cd498e1321b" - integrity sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w== - -cssesc@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" - integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g== - dependencies: - assert-plus "^1.0.0" - -debounce-fn@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-4.0.0.tgz#ed76d206d8a50e60de0dd66d494d82835ffe61c7" - integrity sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ== - dependencies: - mimic-fn "^3.0.0" - -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -debug@^2.6.8, debug@^2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@^3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - -decamelize-keys@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" - integrity sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg== - dependencies: - decamelize "^1.1.0" - map-obj "^1.0.0" - -decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== - -decamelize@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-6.0.0.tgz#8cad4d916fde5c41a264a43d0ecc56fe3d31749e" - integrity sha512-Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA== - -decompress-response@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" - integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== - dependencies: - mimic-response "^3.1.0" - -deep-is@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" - integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== - -defer-to-connect@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" - integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== - -define-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== - -define-lazy-prop@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f" - integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg== - -define-properties@^1.1.3, define-properties@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" - integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== - dependencies: - has-property-descriptors "^1.0.0" - object-keys "^1.1.1" - -del@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5" - integrity sha512-7yjqSoVSlJzA4t/VUwazuEagGeANEKB3f/aNI//06pfKgwoCb7f6Q1gETN1sZzYaj6chTQ0AhIwDiPdfOjko4A== - dependencies: - globby "^6.1.0" - is-path-cwd "^1.0.0" - is-path-in-cwd "^1.0.0" - p-map "^1.1.1" - pify "^3.0.0" - rimraf "^2.2.8" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== - -detect-node@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" - integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== - -dir-compare@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" - integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA== - dependencies: - buffer-equal "1.0.0" - colors "1.0.3" - commander "2.9.0" - minimatch "3.0.4" - -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== - dependencies: - path-type "^4.0.0" - -dmg-builder@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948" - integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA== - dependencies: - app-builder-lib "23.6.0" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - fs-extra "^10.0.0" - iconv-lite "^0.6.2" - js-yaml "^4.1.0" - optionalDependencies: - dmg-license "^1.0.11" - -dmg-license@^1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a" - integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q== - dependencies: - "@types/plist" "^3.0.1" - "@types/verror" "^1.10.3" - ajv "^6.10.0" - crc "^3.8.0" - iconv-corefoundation "^1.1.7" - plist "^3.0.4" - smart-buffer "^4.0.2" - verror "^1.10.0" - -doctrine@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" - integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== - dependencies: - esutils "^2.0.2" - -doctrine@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" - integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== - dependencies: - esutils "^2.0.2" - -dom-walk@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" - integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w== - -dot-prop@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083" - integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA== - dependencies: - is-obj "^2.0.0" - -dotenv-expand@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" - integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== - -dotenv@^9.0.2: - version "9.0.2" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" - integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== - -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw== - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - -ejs@^3.1.7: - version "3.1.8" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" - integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== - dependencies: - jake "^10.8.5" - -electron-builder@^23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz#c79050cbdce90ed96c5feb67c34e9e0a21b5331b" - integrity sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw== - dependencies: - "@types/yargs" "^17.0.1" - app-builder-lib "23.6.0" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - chalk "^4.1.1" - dmg-builder "23.6.0" - fs-extra "^10.0.0" - is-ci "^3.0.0" - lazy-val "^1.0.5" - read-config-file "6.2.0" - simple-update-notifier "^1.0.7" - yargs "^17.5.1" - -electron-context-menu@^3.6.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.1.tgz#42f117e15309687b22283e6f8f7a0d95a19afe84" - integrity sha512-lcpO6tzzKUROeirhzBjdBWNqayEThmdW+2I2s6H6QMrwqTVyT3EK47jW3Nxm60KTxl5/bWfEoIruoUNn57/QkQ== - dependencies: - cli-truncate "^2.1.0" - electron-dl "^3.2.1" - electron-is-dev "^2.0.0" - -electron-debug@^1.4.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/electron-debug/-/electron-debug-1.5.0.tgz#d88c02146efb7fc5ae1b21eac56fbe4987eae50c" - integrity sha512-23CLHQXW+gMgdlJbeW1EinPX7DpwuLtfdzSuFL0OnsqEhKGJVJufAZTyq2hc3sr+R53rr3P+mJiYoR5VzAHKJQ== - dependencies: - electron-is-dev "^0.3.0" - electron-localshortcut "^3.0.0" - -electron-dl@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/electron-dl/-/electron-dl-2.0.0.tgz#54ffd6850bc1681949405497e0351fde824ba7a6" - integrity sha512-crv64+Z2ZCsHCoJHBBOypDKx8cy+4jTGMc5/rDDzIajihDN/wITkJOdb6XG8b43YlWr3NS1/r6j+IdwaFNmMiQ== - dependencies: - ext-name "^5.0.0" - pupa "^2.0.1" - unused-filename "^2.1.0" - -electron-dl@^3.2.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.3.1.tgz#14164595bebcc636c671eb791b2a3265003f76c4" - integrity sha512-kmcSYZyHVEHHHFKlZWW58GiCmu2NSu3Rdwnl3+/fr/ftQYHJULVf1QkrCBPFE2bp/Ly113Za7c8wJZs1nBy04A== - dependencies: - ext-name "^5.0.0" - pupa "^2.0.1" - unused-filename "^2.1.0" - -electron-icon-maker@^0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/electron-icon-maker/-/electron-icon-maker-0.0.5.tgz#8b24230df07de61292b7804311fa99e147c1d53d" - integrity sha512-xuNGe26K7jL7p7A7HhZNJFdjuxnPhu8cH0q6PExkG6ifFX6UbsCMUkxvUAh6PGeLOCSG21wEt9i2jPkiZ3ZItg== - dependencies: - args "^2.3.0" - icon-gen "2.0.0" - jimp "^0.14.0" - -electron-is-accelerator@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b" - integrity sha512-fLGSAjXZtdn1sbtZxx52+krefmtNuVwnJCV2gNiVt735/ARUboMl8jnNC9fZEqQdlAv2ZrETfmBUsoQci5evJA== - -electron-is-dev@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe" - integrity sha512-jLttuuq8QK67n3mXmIe9pkrO7IH3LGIk12xJkhTmc852U2sCJaRAOpRGPSh+1Xnzck5v9escd9YXzuze9nGejg== - -electron-is-dev@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-2.0.0.tgz#833487a069b8dad21425c67a19847d9064ab19bd" - integrity sha512-3X99K852Yoqu9AcW50qz3ibYBWY79/pBhlMCab8ToEWS48R0T9tyxRiQhwylE7zQdXrMnx2JKqUJyMPmt5FBqA== - -electron-localshortcut@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-3.2.1.tgz#cfc83a3eff5e28faf98ddcc87f80a2ce4f623cd3" - integrity sha512-DWvhKv36GsdXKnaFFhEiK8kZZA+24/yFLgtTwJJHc7AFgDjNRIBJZ/jq62Y/dWv9E4ypYwrVWN2bVrCYw1uv7Q== - dependencies: - debug "^4.0.1" - electron-is-accelerator "^0.1.0" - keyboardevent-from-electron-accelerator "^2.0.0" - keyboardevents-areequal "^0.2.1" - -electron-osx-sign@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8" - integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg== - dependencies: - bluebird "^3.5.0" - compare-version "^0.1.2" - debug "^2.6.8" - isbinaryfile "^3.0.2" - minimist "^1.2.0" - plist "^3.0.1" - -electron-publish@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9" - integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg== - dependencies: - "@types/fs-extra" "^9.0.11" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - chalk "^4.1.1" - fs-extra "^10.0.0" - lazy-val "^1.0.5" - mime "^2.5.2" - -electron-store@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-8.1.0.tgz#46a398f2bd9aa83c4a9daaae28380e2b3b9c7597" - integrity sha512-2clHg/juMjOH0GT9cQ6qtmIvK183B39ZXR0bUoPwKwYHJsEF3quqyDzMFUAu+0OP8ijmN2CbPRAelhNbWUbzwA== - dependencies: - conf "^10.2.0" - type-fest "^2.17.0" - -electron@^22.1.0: - version "22.1.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-22.1.0.tgz#b1636d25420d152d82c2558c799b91960fa1b0c5" - integrity sha512-wz5s4N6V7zyKm4YQmXJImFoxO1Doai32ShYm0FzOLPBMwLMdQBV+REY+j1opRx0KJ9xJEIdjYgcA8OSw6vx3pA== - dependencies: - "@electron/get" "^2.0.0" - "@types/node" "^16.11.26" - extract-zip "^2.0.1" - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -end-of-stream@^1.1.0: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - -enhance-visitors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/enhance-visitors/-/enhance-visitors-1.0.0.tgz#aa945d05da465672a1ebd38fee2ed3da8518e95a" - integrity sha512-+29eJLiUixTEDRaZ35Vu8jP3gPLNcQQkQkOQjLp2X+6cZGGPDD/uasbFzvLsJKnGZnvmyZ0srxudwOtskHeIDA== - dependencies: - lodash "^4.13.1" - -enhanced-resolve@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz#4d6e689b3725f86090927ccc86cd9f1635b89e2e" - integrity sha512-kxpoMgrdtkXZ5h0SeraBS1iRntpTpQ3R8ussdb38+UAFnMGX5DDyJXePm+OCHOcoXvHDw7mc2erbJBpDnl7TPw== - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.2.0" - tapable "^0.1.8" - -env-editor@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/env-editor/-/env-editor-1.1.0.tgz#bd510b6cb1528a64b17273aaeba272c050e786e9" - integrity sha512-7AXskzN6T7Q9TFcKAGJprUbpQa4i1VsAetO9rdBqbGMGlragTziBgWt4pVYJMBWHQlLoX0buy6WFikzPH4Qjpw== - -env-paths@^2.2.0, env-paths@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" - integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== - -error-ex@^1.2.0, error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5: - version "1.20.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814" - integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA== - dependencies: - call-bind "^1.0.2" - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - function.prototype.name "^1.1.5" - get-intrinsic "^1.1.1" - get-symbol-description "^1.0.0" - has "^1.0.3" - has-property-descriptors "^1.0.0" - has-symbols "^1.0.3" - internal-slot "^1.0.3" - is-callable "^1.2.4" - is-negative-zero "^2.0.2" - is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" - is-string "^1.0.7" - is-weakref "^1.0.2" - object-inspect "^1.12.0" - object-keys "^1.1.1" - object.assign "^4.1.2" - regexp.prototype.flags "^1.4.3" - string.prototype.trimend "^1.0.5" - string.prototype.trimstart "^1.0.5" - unbox-primitive "^1.0.2" - -es-shim-unscopables@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" - integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w== - dependencies: - has "^1.0.3" - -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - -es6-error@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" - integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== - -es6-promise@^4.0.3: - version "4.2.8" - resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a" - integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w== - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-goat@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" - integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== - -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -eslint-config-prettier@^8.5.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" - integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== - -eslint-config-xo-typescript@^0.55.0: - version "0.55.1" - resolved "https://registry.yarnpkg.com/eslint-config-xo-typescript/-/eslint-config-xo-typescript-0.55.1.tgz#8b0e776af47fad68ac4eb3a7385b7d3b46133b83" - integrity sha512-iXua+7n9fOp7LzGzvXlcZG0w6cdtscjASGTrAHMj0Rn9voayxF2oRoMIK1QS6ZJb4fMVEQZdU2D6gTKmWhcCQQ== - -eslint-config-xo@^0.43.1: - version "0.43.1" - resolved "https://registry.yarnpkg.com/eslint-config-xo/-/eslint-config-xo-0.43.1.tgz#c2ac8993f6e429048c813f599265d1636a0bc060" - integrity sha512-azv1L2PysRA0NkZOgbndUpN+581L7wPqkgJOgxxw3hxwXAbJgD6Hqb/SjHRiACifXt/AvxCzE/jIKFAlI7XjvQ== - dependencies: - confusing-browser-globals "1.0.11" - -eslint-formatter-pretty@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/eslint-formatter-pretty/-/eslint-formatter-pretty-4.1.0.tgz#7a6877c14ffe2672066c853587d89603e97c7708" - integrity sha512-IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ== - dependencies: - "@types/eslint" "^7.2.13" - ansi-escapes "^4.2.1" - chalk "^4.1.0" - eslint-rule-docs "^1.1.5" - log-symbols "^4.0.0" - plur "^4.0.0" - string-width "^4.2.0" - supports-hyperlinks "^2.0.0" - -eslint-import-resolver-node@^0.3.6: - version "0.3.6" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" - integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== - dependencies: - debug "^3.2.7" - resolve "^1.20.0" - -eslint-import-resolver-webpack@^0.13.2: - version "0.13.2" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.2.tgz#fc813df0d08b9265cc7072d22393bda5198bdc1e" - integrity sha512-XodIPyg1OgE2h5BDErz3WJoK7lawxKTJNhgPNafRST6csC/MZC+L5P6kKqsZGRInpbgc02s/WZMrb4uGJzcuRg== - dependencies: - array-find "^1.0.0" - debug "^3.2.7" - enhanced-resolve "^0.9.1" - find-root "^1.1.0" - has "^1.0.3" - interpret "^1.4.0" - is-core-module "^2.7.0" - is-regex "^1.1.4" - lodash "^4.17.21" - resolve "^1.20.0" - semver "^5.7.1" - -eslint-module-utils@^2.7.3: - version "2.7.3" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee" - integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ== - dependencies: - debug "^3.2.7" - find-up "^2.1.0" - -eslint-plugin-ava@^13.2.0: - version "13.2.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-ava/-/eslint-plugin-ava-13.2.0.tgz#a8e88fe62a259e11e0744d74aaff83f8ec4dbbe0" - integrity sha512-i5B5izsEdERKQLruk1nIWzTTE7C26/ju8qQf7JeyRv32XT2lRMW0zMFZNhIrEf5/5VvpSz2rqrV7UcjClGbKsw== - dependencies: - enhance-visitors "^1.0.0" - eslint-utils "^3.0.0" - espree "^9.0.0" - espurify "^2.1.1" - import-modules "^2.1.0" - micro-spelling-correcter "^1.1.1" - pkg-dir "^5.0.0" - resolve-from "^5.0.0" - -eslint-plugin-es@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz#f0822f0c18a535a97c3e714e89f88586a7641ec9" - integrity sha512-GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ== - dependencies: - eslint-utils "^2.0.0" - regexpp "^3.0.0" - -eslint-plugin-eslint-comments@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz#9e1cd7b4413526abb313933071d7aba05ca12ffa" - integrity sha512-0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ== - dependencies: - escape-string-regexp "^1.0.5" - ignore "^5.0.5" - -eslint-plugin-import@^2.26.0: - version "2.26.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b" - integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA== - dependencies: - array-includes "^3.1.4" - array.prototype.flat "^1.2.5" - debug "^2.6.9" - doctrine "^2.1.0" - eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.7.3" - has "^1.0.3" - is-core-module "^2.8.1" - is-glob "^4.0.3" - minimatch "^3.1.2" - object.values "^1.1.5" - resolve "^1.22.0" - tsconfig-paths "^3.14.1" - -eslint-plugin-n@^15.5.1: - version "15.6.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-15.6.1.tgz#f7e77f24abb92a550115cf11e29695da122c398c" - integrity sha512-R9xw9OtCRxxaxaszTQmQAlPgM+RdGjaL1akWuY/Fv9fRAi8Wj4CUKc6iYVG8QNRjRuo8/BqVYIpfqberJUEacA== - dependencies: - builtins "^5.0.1" - eslint-plugin-es "^4.1.0" - eslint-utils "^3.0.0" - ignore "^5.1.1" - is-core-module "^2.11.0" - minimatch "^3.1.2" - resolve "^1.22.1" - semver "^7.3.8" - -eslint-plugin-no-use-extend-native@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-no-use-extend-native/-/eslint-plugin-no-use-extend-native-0.5.0.tgz#d6855e3a823a819b467cf7df56adca57de741bf9" - integrity sha512-dBNjs8hor8rJgeXLH4HTut5eD3RGWf9JUsadIfuL7UosVQ/dnvOKwxEcRrXrFxrMZ8llUVWT+hOimxJABsAUzQ== - dependencies: - is-get-set-prop "^1.0.0" - is-js-type "^2.0.0" - is-obj-prop "^1.0.0" - is-proto-prop "^2.0.0" - -eslint-plugin-prettier@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b" - integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ== - dependencies: - prettier-linter-helpers "^1.0.0" - -eslint-plugin-unicorn@^44.0.2: - version "44.0.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-44.0.2.tgz#6324a001c0a5e2ac00fb51b30db27d14c6c36ab3" - integrity sha512-GLIDX1wmeEqpGaKcnMcqRvMVsoabeF0Ton0EX4Th5u6Kmf7RM9WBl705AXFEsns56ESkEs0uyelLuUTvz9Tr0w== - dependencies: - "@babel/helper-validator-identifier" "^7.19.1" - ci-info "^3.4.0" - clean-regexp "^1.0.0" - eslint-utils "^3.0.0" - esquery "^1.4.0" - indent-string "^4.0.0" - is-builtin-module "^3.2.0" - lodash "^4.17.21" - pluralize "^8.0.0" - read-pkg-up "^7.0.1" - regexp-tree "^0.1.24" - safe-regex "^2.1.1" - semver "^7.3.7" - strip-indent "^3.0.0" - -eslint-rule-docs@^1.1.5: - version "1.1.235" - resolved "https://registry.yarnpkg.com/eslint-rule-docs/-/eslint-rule-docs-1.1.235.tgz#be6ef1fc3525f17b3c859ae2997fedadc89bfb9b" - integrity sha512-+TQ+x4JdTnDoFEXXb3fDvfGOwnyNV7duH8fXWTPD1ieaBmB8omj7Gw/pMBBu4uI2uJCCU8APDaQJzWuXnTsH4A== - -eslint-scope@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - -eslint-scope@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" - integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== - dependencies: - esrecurse "^4.3.0" - estraverse "^5.2.0" - -eslint-utils@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" - integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== - dependencies: - eslint-visitor-keys "^1.1.0" - -eslint-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" - integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== - dependencies: - eslint-visitor-keys "^2.0.0" - -eslint-visitor-keys@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" - integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== - -eslint-visitor-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" - integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== - -eslint-visitor-keys@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" - integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== - -eslint@^8.27.0: - version "8.34.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.34.0.tgz#fe0ab0ef478104c1f9ebc5537e303d25a8fb22d6" - integrity sha512-1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg== - dependencies: - "@eslint/eslintrc" "^1.4.1" - "@humanwhocodes/config-array" "^0.11.8" - "@humanwhocodes/module-importer" "^1.0.1" - "@nodelib/fs.walk" "^1.2.8" - ajv "^6.10.0" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.3.2" - doctrine "^3.0.0" - escape-string-regexp "^4.0.0" - eslint-scope "^7.1.1" - eslint-utils "^3.0.0" - eslint-visitor-keys "^3.3.0" - espree "^9.4.0" - esquery "^1.4.0" - esutils "^2.0.2" - fast-deep-equal "^3.1.3" - file-entry-cache "^6.0.1" - find-up "^5.0.0" - glob-parent "^6.0.2" - globals "^13.19.0" - grapheme-splitter "^1.0.4" - ignore "^5.2.0" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - is-path-inside "^3.0.3" - js-sdsl "^4.1.4" - js-yaml "^4.1.0" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" - lodash.merge "^4.6.2" - minimatch "^3.1.2" - natural-compare "^1.4.0" - optionator "^0.9.1" - regexpp "^3.2.0" - strip-ansi "^6.0.1" - strip-json-comments "^3.1.0" - text-table "^0.2.0" - -esm-utils@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/esm-utils/-/esm-utils-4.1.1.tgz#c7df7fe93f76adbfb5f919df36d8cf5b72689489" - integrity sha512-cTy4OQgEP/yc7RY3s6EgwMGZ10gAPhCLE9FcrQ6/5bhf37o9PZCFSjzQR1tYb4GaKAEMaW1UmDcMZR13H4p6LQ== - dependencies: - import-meta-resolve "2.2.0" - url-or-path "2.1.0" - -espree@^9.0.0: - version "9.3.2" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596" - integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA== - dependencies: - acorn "^8.7.1" - acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.3.0" - -espree@^9.4.0: - version "9.4.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd" - integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg== - dependencies: - acorn "^8.8.0" - acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.3.0" - -espurify@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/espurify/-/espurify-2.1.1.tgz#afb043f22fac908d991dd25f7bf40bcf03935b9c" - integrity sha512-zttWvnkhcDyGOhSH4vO2qCBILpdCMv/MX8lp4cqgRkQoDRGK2oZxi2GfWhlP2dIXmk7BaKeOTuzbHhyC68o8XQ== - -esquery@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" - integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== - dependencies: - estraverse "^5.1.0" - -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - -estraverse@^5.1.0, estraverse@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== - -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - -execa@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - 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" - -execall@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz#16a06b5fe5099df7d00be5d9c06eecded1663b45" - integrity sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow== - dependencies: - clone-regexp "^2.1.0" - -exif-parser@^0.1.12: - version "0.1.12" - resolved "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz#58a9d2d72c02c1f6f02a0ef4a9166272b7760922" - integrity sha512-c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw== - -ext-list@^2.0.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37" - integrity sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA== - dependencies: - mime-db "^1.28.0" - -ext-name@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz#70781981d183ee15d13993c8822045c506c8f0a6" - integrity sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ== - dependencies: - ext-list "^2.0.0" - sort-keys-length "^1.0.0" - -extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - -extract-zip@^1.6.5: - version "1.7.0" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" - integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== - dependencies: - concat-stream "^1.6.2" - debug "^2.6.9" - mkdirp "^0.5.4" - yauzl "^2.10.0" - -extract-zip@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" - integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== - dependencies: - debug "^4.1.1" - get-stream "^5.1.0" - yauzl "^2.10.0" - optionalDependencies: - "@types/yauzl" "^2.9.1" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g== - -extsprintf@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" - integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== - -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-diff@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" - integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== - -fast-glob@^3.2.11, fast-glob@^3.2.9: - version "3.2.11" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9" - integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew== - dependencies: - "@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@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fast-levenshtein@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== - -fastest-levenshtein@^1.0.12: - version "1.0.14" - resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.14.tgz#9054384e4b7a78c88d01a4432dc18871af0ac859" - integrity sha512-tFfWHjnuUfKE186Tfgr+jtaFc0mZTApEgKDOeyN+FwOqRkO/zK/3h1AiRd8u8CY53owL3CUmGr/oI9p/RdyLTA== - -fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== - dependencies: - reusify "^1.0.4" - -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== - dependencies: - pend "~1.2.0" - -file-entry-cache@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" - integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== - dependencies: - flat-cache "^3.0.4" - -file-type@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-9.0.0.tgz#a68d5ad07f486414dfb2c8866f73161946714a18" - integrity sha512-Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw== - -file-url@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/file-url/-/file-url-2.0.2.tgz#e951784d79095127d3713029ab063f40818ca2ae" - integrity sha512-x3989K8a1jM6vulMigE8VngH7C5nci0Ks5d9kVjUXmNF28gmiZUNujk5HjwaS8dAzN2QmUfX56riJKgN00dNRw== - -filelist@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" - integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== - dependencies: - minimatch "^5.0.1" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -find-cache-dir@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-4.0.0.tgz#a30ee0448f81a3990708f6453633c733e2f6eec2" - integrity sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg== - dependencies: - common-path-prefix "^3.0.0" - pkg-dir "^7.0.0" - -find-root@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" - integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== - -find-up@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" - integrity sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA== - dependencies: - path-exists "^2.0.0" - pinkie-promise "^2.0.0" - -find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - integrity sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ== - dependencies: - locate-path "^2.0.0" - -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== - dependencies: - locate-path "^3.0.0" - -find-up@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -find-up@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - -find-up@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790" - integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw== - dependencies: - locate-path "^7.1.0" - path-exists "^5.0.0" - -flat-cache@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" - integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== - dependencies: - flatted "^3.1.0" - rimraf "^3.0.2" - -flatted@^3.1.0: - version "3.2.5" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3" - integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg== - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== - -form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - -fs-extra@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" - integrity sha512-VerQV6vEKuhDWD2HGOybV6v5I73syoc/cXAbKlgTC7M/oFVEtklWlp9QH2Ijw3IaWDOQcMkldSPa7zXy79Z/UQ== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^2.1.0" - klaw "^1.0.0" - -fs-extra@^10.0.0, fs-extra@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" - integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^9.0.0, fs-extra@^9.0.1: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-minipass@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" - integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== - dependencies: - minipass "^3.0.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -function.prototype.name@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" - integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.0" - functions-have-names "^1.2.2" - -functions-have-names@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" - integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== - -get-caller-file@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" - integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598" - integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.3" - -get-set-props@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/get-set-props/-/get-set-props-0.1.0.tgz#998475c178445686d0b32246da5df8dbcfbe8ea3" - integrity sha512-7oKuKzAGKj0ag+eWZwcGw2fjiZ78tXnXQoBgY0aU7ZOxTu4bB7hSuQSDgtKy978EDH062P5FmD2EWiDpQS9K9Q== - -get-stdin@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" - integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== - -get-stdin@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-9.0.0.tgz#3983ff82e03d56f1b2ea0d3e60325f39d703a575" - integrity sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA== - -get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== - dependencies: - pump "^3.0.0" - -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - -get-symbol-description@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" - integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" - -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng== - dependencies: - assert-plus "^1.0.0" - -gifwrap@^0.9.2: - version "0.9.4" - resolved "https://registry.yarnpkg.com/gifwrap/-/gifwrap-0.9.4.tgz#f4eb6169ba027d61df64aafbdcb1f8ae58ccc0c5" - integrity sha512-MDMwbhASQuVeD4JKd1fKgNgCRL3fGqMM4WaqpNhWO0JiMOAjbQdumbs4BbBZEy9/M00EHEjKN3HieVhCUlwjeQ== - dependencies: - image-q "^4.0.0" - omggif "^1.0.10" - -glob-parent@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - -glob-parent@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" - integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== - dependencies: - is-glob "^4.0.3" - -glob@^7.0.3, glob@^7.1.3, glob@^7.1.6: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - 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" - -global-agent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" - integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== - 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" - -global-modules@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" - integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== - dependencies: - global-prefix "^3.0.0" - -global-prefix@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" - integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== - dependencies: - ini "^1.3.5" - kind-of "^6.0.2" - which "^1.3.1" - -global@~4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" - integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w== - dependencies: - min-document "^2.19.0" - process "^0.11.10" - -globals@^13.19.0: - version "13.20.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82" - integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ== - dependencies: - type-fest "^0.20.2" - -globalthis@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" - integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== - dependencies: - define-properties "^1.1.3" - -globby@^11.1.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" - integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== - 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" - -globby@^13.1.2: - version "13.1.3" - resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.3.tgz#f62baf5720bcb2c1330c8d4ef222ee12318563ff" - integrity sha512-8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw== - dependencies: - dir-glob "^3.0.1" - fast-glob "^3.2.11" - ignore "^5.2.0" - merge2 "^1.4.1" - slash "^4.0.0" - -globby@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" - integrity sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw== - dependencies: - array-union "^1.0.1" - glob "^7.0.3" - object-assign "^4.0.1" - pify "^2.0.0" - pinkie-promise "^2.0.0" - -globjoin@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" - integrity sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg== - -got@^11.8.5: - version "11.8.6" - resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" - integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== - dependencies: - "@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@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== - -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w== - -grapheme-splitter@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" - integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== - -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q== - -har-validator@~5.1.3: - version "5.1.5" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" - integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== - dependencies: - ajv "^6.12.3" - har-schema "^2.0.0" - -hard-rejection@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" - integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== - -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg== - dependencies: - ansi-regex "^2.0.0" - -has-bigints@^1.0.1, has-bigints@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" - integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-property-descriptors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" - integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== - dependencies: - get-intrinsic "^1.1.1" - -has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== - -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== - dependencies: - has-symbols "^1.0.2" - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -hasha@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz#78d7cbfc1e6d66303fe79837365984517b2f6ee1" - integrity sha512-jZ38TU/EBiGKrmyTNNZgnvCZHNowiRI4+w/I9noMlekHTZH3KyGgvJLmhSgykeAQ9j2SYPDosM0Bg3wHfzibAQ== - dependencies: - is-stream "^1.0.1" - pinkie-promise "^2.0.0" - -hosted-git-info@^2.1.4: - version "2.8.9" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" - integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== - -hosted-git-info@^4.0.1, hosted-git-info@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" - integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== - dependencies: - lru-cache "^6.0.0" - -hosted-git-info@^5.0.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.2.1.tgz#0ba1c97178ef91f3ab30842ae63d6a272341156f" - integrity sha512-xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw== - dependencies: - lru-cache "^7.5.1" - -html-tags@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961" - integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg== - -http-cache-semantics@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" - integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== - -http-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" - integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== - dependencies: - "@tootallnate/once" "2" - agent-base "6" - debug "4" - -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ== - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -http2-wrapper@^1.0.0-beta.5.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" - integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== - dependencies: - quick-lru "^5.1.1" - resolve-alpn "^1.0.0" - -https-proxy-agent@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" - integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== - dependencies: - agent-base "6" - debug "4" - -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - -icon-gen@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/icon-gen/-/icon-gen-2.0.0.tgz#2ba21902305ebafc3e500e505c5d3076dc4fb91a" - integrity sha512-Asj0rWMoFDY3AHLsZdx8UgHX7AIh/9u5ZTXYWJYH+2n8HqHQr655ATdoa1yQLidmm2fnTYlob+Rm4zzrjWr5Bw== - dependencies: - del "^3.0.0" - mkdirp "^0.5.1" - pngjs-nozlib "^1.0.0" - svg2png "4.1.1" - uuid "^3.3.2" - -iconv-corefoundation@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" - integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ== - dependencies: - cli-truncate "^2.1.0" - node-addon-api "^1.6.3" - -iconv-lite@^0.6.2: - version "0.6.3" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" - integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== - dependencies: - safer-buffer ">= 2.1.2 < 3.0.0" - -ieee754@^1.1.13: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -ignore@^5.0.5, ignore@^5.1.1, ignore@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" - integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== - -image-q@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/image-q/-/image-q-4.0.0.tgz#31e075be7bae3c1f42a85c469b4732c358981776" - integrity sha512-PfJGVgIfKQJuq3s0tTDOKtztksibuUEbJQIYT3by6wctQo+Rdlh7ef4evJ5NCdxY4CfMbvFkocEwbl4BF8RlJw== - dependencies: - "@types/node" "16.9.1" - -import-fresh@^3.0.0, import-fresh@^3.2.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" - integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -import-lazy@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" - integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== - -import-meta-resolve@2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/import-meta-resolve/-/import-meta-resolve-2.2.0.tgz#701aa29a044954bd135214049294745ac70dd607" - integrity sha512-CpPOtiCHxP9HdtDM5F45tNiAe66Cqlv3f5uHoJjt+KlaLrUh9/Wz9vepADZ78SlqEo62aDWZtj9ydMGXV+CPnw== - -import-modules@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/import-modules/-/import-modules-2.1.0.tgz#abe7df297cb6c1f19b57246eb8b8bd9664b6d8c2" - integrity sha512-8HEWcnkbGpovH9yInoisxaSoIg9Brbul+Ju3Kqe2UsYDUBJD/iQjSgEj0zPcTDPKfPp2fs5xlv1i+JSye/m1/A== - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== - -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - -indent-string@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-5.0.0.tgz#4fd2980fccaf8622d14c64d694f4cf33c81951a5" - integrity sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.3, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -ini@^1.3.5: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - -internal-slot@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" - integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== - dependencies: - get-intrinsic "^1.1.0" - has "^1.0.3" - side-channel "^1.0.4" - -interpret@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" - integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== - -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - integrity sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ== - -irregular-plurals@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-3.3.0.tgz#67d0715d4361a60d9fd9ee80af3881c631a31ee2" - integrity sha512-MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g== - -is-absolute@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" - integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA== - dependencies: - is-relative "^1.0.0" - is-windows "^1.0.1" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== - -is-bigint@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" - integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== - dependencies: - has-bigints "^1.0.1" - -is-boolean-object@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" - integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-builtin-module@^3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169" - integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A== - dependencies: - builtin-modules "^3.3.0" - -is-callable@^1.1.4, is-callable@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" - integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== - -is-ci@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" - integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== - dependencies: - ci-info "^3.2.0" - -is-core-module@^2.11.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" - integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== - dependencies: - has "^1.0.3" - -is-core-module@^2.5.0, is-core-module@^2.7.0, is-core-module@^2.8.1, is-core-module@^2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" - integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== - dependencies: - has "^1.0.3" - -is-date-object@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== - dependencies: - has-tostringtag "^1.0.0" - -is-docker@^2.0.0, is-docker@^2.1.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw== - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-function@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz#4f097f30abf6efadac9833b17ca5dc03f8144e08" - integrity sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ== - -is-get-set-prop@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-get-set-prop/-/is-get-set-prop-1.0.0.tgz#2731877e4d78a6a69edcce6bb9d68b0779e76312" - integrity sha512-DvAYZ1ZgGUz4lzxKMPYlt08qAUqyG9ckSg2pIjfvcQ7+pkVNUHk8yVLXOnCLe5WKXhLop8oorWFBJHpwWQpszQ== - dependencies: - get-set-props "^0.1.0" - lowercase-keys "^1.0.0" - -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== - dependencies: - is-extglob "^2.1.1" - -is-js-type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-js-type/-/is-js-type-2.0.0.tgz#73617006d659b4eb4729bba747d28782df0f7e22" - integrity sha512-Aj13l47+uyTjlQNHtXBV8Cji3jb037vxwMWCgopRR8h6xocgBGW3qG8qGlIOEmbXQtkKShKuBM9e8AA1OeQ+xw== - dependencies: - js-types "^1.0.0" - -is-negated-glob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2" - integrity sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug== - -is-negative-zero@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" - integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== - -is-number-object@^1.0.4: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" - integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== - dependencies: - has-tostringtag "^1.0.0" - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-obj-prop@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-obj-prop/-/is-obj-prop-1.0.0.tgz#b34de79c450b8d7c73ab2cdf67dc875adb85f80e" - integrity sha512-5Idb61slRlJlsAzi0Wsfwbp+zZY+9LXKUAZpvT/1ySw+NxKLRWfa0Bzj+wXI3fX5O9hiddm5c3DAaRSNP/yl2w== - dependencies: - lowercase-keys "^1.0.0" - obj-props "^1.0.0" - -is-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" - integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== - -is-path-cwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" - integrity sha512-cnS56eR9SPAscL77ik76ATVqoPARTqPIVkMDVxRaWH06zT+6+CzIroYRJ0VVvm0Z1zfAvxvz9i/D3Ppjaqt5Nw== - -is-path-in-cwd@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52" - integrity sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ== - dependencies: - is-path-inside "^1.0.0" - -is-path-inside@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" - integrity sha512-qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g== - dependencies: - path-is-inside "^1.0.1" - -is-path-inside@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - -is-plain-obj@^1.0.0, is-plain-obj@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== - -is-plain-object@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" - integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== - -is-proto-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-proto-prop/-/is-proto-prop-2.0.0.tgz#99ab2863462e44090fd083efd1929058f9d935e1" - integrity sha512-jl3NbQ/fGLv5Jhan4uX+Ge9ohnemqyblWVVCpAvtTQzNFvV2xhJq+esnkIbYQ9F1nITXoLfDDQLp7LBw/zzncg== - dependencies: - lowercase-keys "^1.0.0" - proto-props "^2.0.0" - -is-regex@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-regexp@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz#cd734a56864e23b956bf4e7c66c396a4c0b22c2d" - integrity sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA== - -is-relative@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" - integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== - dependencies: - is-unc-path "^1.0.0" - -is-shared-array-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" - integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== - dependencies: - call-bind "^1.0.2" - -is-stream@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== - -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - -is-string@^1.0.5, is-string@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" - integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== - dependencies: - has-tostringtag "^1.0.0" - -is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" - integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== - dependencies: - has-symbols "^1.0.2" - -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== - -is-unc-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" - integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ== - dependencies: - unc-path-regex "^0.1.2" - -is-unicode-supported@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" - integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== - -is-utf8@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" - integrity sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q== - -is-weakref@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" - integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== - dependencies: - call-bind "^1.0.2" - -is-windows@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - -is-wsl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== - dependencies: - is-docker "^2.0.0" - -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== - -isbinaryfile@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" - integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== - dependencies: - buffer-alloc "^1.2.0" - -isbinaryfile@^4.0.10: - version "4.0.10" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" - integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== - -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g== - -jake@^10.8.5: - version "10.8.5" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" - integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== - dependencies: - async "^3.2.3" - chalk "^4.0.2" - filelist "^1.0.1" - minimatch "^3.0.4" - -jimp@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.14.0.tgz#fde55f69bdb918c1b01ac633d89a25853af85625" - integrity sha512-8BXU+J8+SPmwwyq9ELihpSV4dWPTiOKBWCEgtkbnxxAVMjXdf3yGmyaLSshBfXc8sP/JQ9OZj5R8nZzz2wPXgA== - dependencies: - "@babel/runtime" "^7.7.2" - "@jimp/custom" "^0.14.0" - "@jimp/plugins" "^0.14.0" - "@jimp/types" "^0.14.0" - regenerator-runtime "^0.13.3" - -jpeg-js@^0.4.0: - version "0.4.4" - resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa" - integrity sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg== - -js-sdsl@^4.1.4: - version "4.3.0" - resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz#aeefe32a451f7af88425b11fdb5f58c90ae1d711" - integrity sha512-mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ== - -js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-types@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/js-types/-/js-types-1.0.0.tgz#d242e6494ed572ad3c92809fc8bed7f7687cbf03" - integrity sha512-bfwqBW9cC/Lp7xcRpug7YrXm0IVw+T9e3g4mCYnv0Pjr3zIzU9PCQElYU9oSGAWzXlbdl9X5SAMPejO9sxkeUw== - -js-yaml@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg== - -json-buffer@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" - integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== - -json-parse-even-better-errors@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - -json-schema-typed@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.3.tgz#23ff481b8b4eebcd2ca123b4fa0409e66469a2d9" - integrity sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A== - -json-schema@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" - integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== - -json-stable-stringify-without-jsonify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== - -json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== - -json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== - dependencies: - minimist "^1.2.0" - -json5@^2.2.0, json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== - -jsonfile@^2.1.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" - integrity sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw== - optionalDependencies: - graceful-fs "^4.1.6" - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== - optionalDependencies: - graceful-fs "^4.1.6" - -jsonfile@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" - integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== - dependencies: - universalify "^2.0.0" - optionalDependencies: - graceful-fs "^4.1.6" - -jsprim@^1.2.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb" - integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw== - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.4.0" - verror "1.10.0" - -kew@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b" - integrity sha512-IG6nm0+QtAMdXt9KvbgbGdvY50RSrw+U4sGZg+KlrSKPJEwVE5JVoI3d7RWfSMdBQneRheeAOj3lIjX5VL/9RQ== - -keyboardevent-from-electron-accelerator@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-2.0.0.tgz#ace21b1aa4e47148815d160057f9edb66567c50c" - integrity sha512-iQcmNA0M4ETMNi0kG/q0h/43wZk7rMeKYrXP7sqKIJbHkTU8Koowgzv+ieR/vWJbOwxx5nDC3UnudZ0aLSu4VA== - -keyboardevents-areequal@^0.2.1: - version "0.2.2" - resolved "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz#88191ec738ce9f7591c25e9056de928b40277194" - integrity sha512-Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw== - -keyv@^4.0.0: - version "4.5.2" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56" - integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g== - dependencies: - json-buffer "3.0.1" - -kind-of@^6.0.2, kind-of@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - -klaw@^1.0.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" - integrity sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw== - optionalDependencies: - graceful-fs "^4.1.9" - -known-css-properties@^0.25.0: - version "0.25.0" - resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.25.0.tgz#6ebc4d4b412f602e5cfbeb4086bd544e34c0a776" - integrity sha512-b0/9J1O9Jcyik1GC6KC42hJ41jKwdO/Mq8Mdo5sYN+IuRTXs2YFHZC3kZSx6ueusqa95x3wLYe/ytKjbAfGixA== - -lazy-val@^1.0.4, lazy-val@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" - integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== - -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - integrity sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw== - dependencies: - invert-kv "^1.0.0" - -levn@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" - integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== - dependencies: - prelude-ls "^1.2.1" - type-check "~0.4.0" - -line-column-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/line-column-path/-/line-column-path-3.0.0.tgz#c873b42feb57f5f97bc72af30d21581076b3119e" - integrity sha512-Atocnm7Wr9nuvAn97yEPQa3pcQI5eLQGBz+m6iTb+CVw+IOzYB9MrYK7jI7BfC9ISnT4Fu0eiwhAScV//rp4Hw== - dependencies: - type-fest "^2.0.0" - -lines-and-columns@^1.1.6: - version "1.2.4" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" - integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== - -load-bmfont@^1.3.1, load-bmfont@^1.4.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/load-bmfont/-/load-bmfont-1.4.1.tgz#c0f5f4711a1e2ccff725a7b6078087ccfcddd3e9" - integrity sha512-8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA== - dependencies: - buffer-equal "0.0.1" - mime "^1.3.4" - parse-bmfont-ascii "^1.0.3" - parse-bmfont-binary "^1.0.5" - parse-bmfont-xml "^1.1.4" - phin "^2.9.1" - xhr "^2.0.1" - xtend "^4.0.0" - -load-json-file@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0" - integrity sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A== - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - pinkie-promise "^2.0.0" - strip-bom "^2.0.0" - -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - integrity sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA== - dependencies: - p-locate "^2.0.0" - path-exists "^3.0.0" - -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== - dependencies: - p-locate "^5.0.0" - -locate-path@^7.1.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.1.1.tgz#8e1e5a75c7343770cef02ff93c4bf1f0aa666374" - integrity sha512-vJXaRMJgRVD3+cUZs3Mncj2mxpt5mP0EmNOsxRSZRMlbqjvxzDEOIUWXGmavo0ZC9+tNZCBLQ66reA11nbpHZg== - dependencies: - p-locate "^6.0.0" - -lodash-es@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" - integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== - -lodash.merge@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - -lodash.truncate@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" - integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw== - -lodash@^4.13.1, lodash@^4.17.15, lodash@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -log-symbols@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" - integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== - dependencies: - chalk "^4.1.0" - is-unicode-supported "^0.1.0" - -lowercase-keys@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== - -lowercase-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" - integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -lru-cache@^7.5.1: - version "7.17.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.17.0.tgz#00c7ba5919e5ea7c69ff94ddabbf32cb09ab805c" - integrity sha512-zSxlVVwOabhVyTi6E8gYv2cr6bXK+8ifYz5/uyJb9feXX6NACVDwY4p5Ut3WC3Ivo/QhpARHU3iujx2xGAYHbQ== - -map-obj@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" - integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg== - -map-obj@^4.0.0, map-obj@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" - integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== - -matcher@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" - integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== - dependencies: - escape-string-regexp "^4.0.0" - -mathml-tag-names@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" - integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== - -memory-fs@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290" - integrity sha512-+y4mDxU4rvXXu5UDSGCGNiesFmwCHuefGMoPCO1WYucNYj7DsLqrFaa2fXVI0H+NNiPTwwzKwspn9yTZqUGqng== - -meow@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-11.0.0.tgz#273a19c12d49d013c56effe9f011994022887157" - integrity sha512-Cl0yeeIrko6d94KpUo1M+0X1sB14ikoaqlIGuTH1fW4I+E3+YljL54/hb/BWmVfrV9tTV9zU04+xjw08Fh2WkA== - dependencies: - "@types/minimist" "^1.2.2" - camelcase-keys "^8.0.2" - decamelize "^6.0.0" - decamelize-keys "^1.1.0" - hard-rejection "^2.1.0" - minimist-options "4.1.0" - normalize-package-data "^4.0.1" - read-pkg-up "^9.1.0" - redent "^4.0.0" - trim-newlines "^4.0.2" - type-fest "^3.1.0" - yargs-parser "^21.1.1" - -meow@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364" - integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ== - dependencies: - "@types/minimist" "^1.2.0" - camelcase-keys "^6.2.2" - decamelize "^1.2.0" - 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" - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - -merge2@^1.3.0, merge2@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== - -micro-spelling-correcter@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/micro-spelling-correcter/-/micro-spelling-correcter-1.1.1.tgz#805a06a26ccfcad8f3e5c6a1ac5ff29d4530166e" - integrity sha512-lkJ3Rj/mtjlRcHk6YyCbvZhyWTOzdBvTHsxMmZSk5jxN1YyVSQ+JETAom55mdzfcyDrY/49Z7UCW760BK30crg== - -micromatch@^4.0.4, micromatch@^4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== - dependencies: - braces "^3.0.2" - picomatch "^2.3.1" - -mime-db@1.52.0, mime-db@^1.28.0: - version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" - integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== - -mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== - dependencies: - mime-db "1.52.0" - -mime@^1.3.4: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - -mime@^2.5.2: - version "2.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" - integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mimic-fn@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74" - integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ== - -mimic-response@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" - integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== - -mimic-response@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" - integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== - -min-document@^2.19.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" - integrity sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ== - dependencies: - dom-walk "^0.1.0" - -min-indent@^1.0.0, min-indent@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" - integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== - -minimatch@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" - integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== - dependencies: - brace-expansion "^2.0.1" - -minimist-options@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" - integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A== - dependencies: - arrify "^1.0.1" - is-plain-obj "^1.1.0" - kind-of "^6.0.3" - -minimist@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw== - -minimist@^1.2.0, minimist@^1.2.6: - version "1.2.6" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== - -minipass@^3.0.0: - version "3.3.3" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.3.tgz#fd1f0e6c06449c10dadda72618b59c00f3d6378d" - integrity sha512-N0BOsdFAlNRfmwMhjAsLVWOk7Ljmeb39iqFlsV1At+jqRhSUP9yeof8FyJu4imaJiSUp8vQebWD/guZwGQC8iA== - dependencies: - yallist "^4.0.0" - -minizlib@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" - integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== - dependencies: - minipass "^3.0.0" - yallist "^4.0.0" - -mkdirp@^0.5.1, mkdirp@^0.5.4: - version "0.5.6" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" - integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== - dependencies: - minimist "^1.2.6" - -mkdirp@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - -modify-filename@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/modify-filename/-/modify-filename-1.1.0.tgz#9a2dec83806fbb2d975f22beec859ca26b393aa1" - integrity sha512-EickqnKq3kVVaZisYuCxhtKbZjInCuwgwZWyAmRIp1NTMhri7r3380/uqwrUHfaDiPzLVTuoNy4whX66bxPVog== - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -nanoid@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" - integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== - -natural-compare-lite@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4" - integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g== - -natural-compare@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== - -node-addon-api@^1.6.3: - version "1.7.2" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" - integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== - -normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" - integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== - dependencies: - hosted-git-info "^2.1.4" - resolve "^1.10.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-package-data@^3.0.0, normalize-package-data@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" - integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== - dependencies: - hosted-git-info "^4.0.1" - is-core-module "^2.5.0" - semver "^7.3.4" - validate-npm-package-license "^3.0.1" - -normalize-package-data@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.1.tgz#b46b24e0616d06cadf9d5718b29b6d445a82a62c" - integrity sha512-EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg== - dependencies: - hosted-git-info "^5.0.0" - is-core-module "^2.8.1" - semver "^7.3.5" - validate-npm-package-license "^3.0.4" - -normalize-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -normalize-url@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" - integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== - -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== - -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== - -obj-props@^1.0.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/obj-props/-/obj-props-1.4.0.tgz#9a9beebb6faf8b287ff7dc1cd133a4247dc85641" - integrity sha512-p7p/7ltzPDiBs6DqxOrIbtRdwxxVRBj5ROukeNb9RgA+fawhrz5n2hpNz8DDmYR//tviJSj7nUnlppGmONkjiQ== - -object-assign@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== - -object-inspect@^1.12.0, object-inspect@^1.9.0: - version "1.12.2" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" - integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== - -object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - -object.assign@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" - integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - has-symbols "^1.0.1" - object-keys "^1.1.1" - -object.values@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" - integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - -omggif@^1.0.10, omggif@^1.0.9: - version "1.0.10" - resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.10.tgz#ddaaf90d4a42f532e9e7cb3a95ecdd47f17c7b19" - integrity sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw== - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== - dependencies: - wrappy "1" - -onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -open-editor@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/open-editor/-/open-editor-4.0.0.tgz#881900b3c5540eaeef5b880abd05638ee82ca81f" - integrity sha512-5mKZ98iFdkivozt5XTCOspoKbL3wtYu6oOoVxfWQ0qUX9NYsK8pdkHE7VUHXr+CwyC3nf6mV0S5FPsMS65innw== - dependencies: - env-editor "^1.0.0" - execa "^5.1.1" - line-column-path "^3.0.0" - open "^8.4.0" - -open@^8.4.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== - dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" - -optionator@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" - integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== - dependencies: - deep-is "^0.1.3" - fast-levenshtein "^2.0.6" - levn "^0.4.1" - prelude-ls "^1.2.1" - type-check "^0.4.0" - word-wrap "^1.2.3" - -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - integrity sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g== - dependencies: - lcid "^1.0.0" - -p-cancelable@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" - integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg== - -p-limit@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" - integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== - dependencies: - p-try "^1.0.0" - -p-limit@^2.0.0, p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-limit@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644" - integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ== - dependencies: - yocto-queue "^1.0.0" - -p-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - integrity sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg== - dependencies: - p-limit "^1.1.0" - -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== - dependencies: - p-limit "^2.0.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== - dependencies: - p-limit "^3.0.2" - -p-locate@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f" - integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw== - dependencies: - p-limit "^4.0.0" - -p-map@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" - integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA== - -p-try@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww== - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -pako@^1.0.5: - version "1.0.11" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" - integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== - -parent-module@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" - integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== - dependencies: - callsites "^3.0.0" - -parse-bmfont-ascii@^1.0.3: - version "1.0.6" - resolved "https://registry.yarnpkg.com/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz#11ac3c3ff58f7c2020ab22769079108d4dfa0285" - integrity sha512-U4RrVsUFCleIOBsIGYOMKjn9PavsGOXxbvYGtMOEfnId0SVNsgehXh1DxUdVPLoxd5mvcEtvmKs2Mmf0Mpa1ZA== - -parse-bmfont-binary@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz#d038b476d3e9dd9db1e11a0b0e53a22792b69006" - integrity sha512-GxmsRea0wdGdYthjuUeWTMWPqm2+FAd4GI8vCvhgJsFnoGhTrLhXDDupwTo7rXVAgaLIGoVHDZS9p/5XbSqeWA== - -parse-bmfont-xml@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz#015319797e3e12f9e739c4d513872cd2fa35f389" - integrity sha512-bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ== - dependencies: - xml-parse-from-string "^1.0.0" - xml2js "^0.4.5" - -parse-headers@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.5.tgz#069793f9356a54008571eb7f9761153e6c770da9" - integrity sha512-ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA== - -parse-json@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - integrity sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ== - dependencies: - error-ex "^1.2.0" - -parse-json@^5.0.0, parse-json@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== - 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" - -path-exists@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" - integrity sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ== - dependencies: - pinkie-promise "^2.0.0" - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ== - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-exists@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7" - integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== - -path-is-inside@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53" - integrity sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w== - -path-key@^3.0.0, path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== - -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -path-type@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441" - integrity sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg== - dependencies: - graceful-fs "^4.1.2" - pify "^2.0.0" - pinkie-promise "^2.0.0" - -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== - -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== - -phantomjs-prebuilt@^2.1.14: - version "2.1.16" - resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz#efd212a4a3966d3647684ea8ba788549be2aefef" - integrity sha512-PIiRzBhW85xco2fuj41FmsyuYHKjKuXWmhjy3A/Y+CMpN/63TV+s9uzfVhsUwFe0G77xWtHBG8xmXf5BqEUEuQ== - dependencies: - es6-promise "^4.0.3" - extract-zip "^1.6.5" - fs-extra "^1.0.0" - hasha "^2.2.0" - kew "^0.7.0" - progress "^1.1.8" - request "^2.81.0" - request-progress "^2.0.1" - which "^1.2.10" - -phin@^2.9.1: - version "2.9.3" - resolved "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz#f9b6ac10a035636fb65dfc576aaaa17b8743125c" - integrity sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA== - -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== - -picomatch@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== - -pify@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== - -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg== - -pinkie-promise@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" - integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw== - dependencies: - pinkie "^2.0.0" - -pinkie@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" - integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg== - -pixelmatch@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz#8f47dcec5011b477b67db03c243bc1f3085e8854" - integrity sha512-J8B6xqiO37sU/gkcMglv6h5Jbd9xNER7aHzpfRdNmV4IbQBzBpe4l9XmbG+xPF/znacgu2jfEw+wHffaq/YkXA== - dependencies: - pngjs "^3.0.0" - -pkg-dir@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz#a02d6aebe6ba133a928f74aec20bafdfe6b8e760" - integrity sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA== - dependencies: - find-up "^5.0.0" - -pkg-dir@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-7.0.0.tgz#8f0c08d6df4476756c5ff29b3282d0bab7517d11" - integrity sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA== - dependencies: - find-up "^6.3.0" - -pkg-up@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" - integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== - dependencies: - find-up "^3.0.0" - -pkginfo@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.0.tgz#349dbb7ffd38081fcadc0853df687f0c7744cd65" - integrity sha512-PvRaVdb+mc4R87WFh2Xc7t41brwIgRFSNoDmRyG0cAov6IfnFARp0GHxU8wP5Uh4IWduQSJsRPSwaKDjgMremg== - -plist@^3.0.1, plist@^3.0.4: - version "3.0.5" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz#2cbeb52d10e3cdccccf0c11a63a85d830970a987" - integrity sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA== - dependencies: - base64-js "^1.5.1" - xmlbuilder "^9.0.7" - -plur@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/plur/-/plur-4.0.0.tgz#729aedb08f452645fe8c58ef115bf16b0a73ef84" - integrity sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg== - dependencies: - irregular-plurals "^3.2.0" - -pluralize@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" - integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA== - -pn@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" - integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA== - -pngjs-nozlib@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/pngjs-nozlib/-/pngjs-nozlib-1.0.0.tgz#9e64d602cfe9cce4d9d5997d0687429a73f0b7d7" - integrity sha512-N1PggqLp9xDqwAoKvGohmZ3m4/N9xpY0nDZivFqQLcpLHmliHnCp9BuNCsOeqHWMuEEgFjpEaq9dZq6RZyy0fA== - -pngjs@^3.0.0, pngjs@^3.3.3: - version "3.4.0" - resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f" - integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w== - -postcss-media-query-parser@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" - integrity sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig== - -postcss-resolve-nested-selector@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e" - integrity sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw== - -postcss-safe-parser@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1" - integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ== - -postcss-selector-parser@^6.0.10: - version "6.0.10" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d" - integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - -postcss-value-parser@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" - integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== - -postcss@^8.4.14: - version "8.4.14" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" - integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig== - dependencies: - nanoid "^3.3.4" - picocolors "^1.0.0" - source-map-js "^1.0.2" - -prelude-ls@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" - integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== - -prettier-linter-helpers@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" - integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== - dependencies: - fast-diff "^1.1.2" - -prettier@^2.7.1: - version "2.8.4" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.4.tgz#34dd2595629bfbb79d344ac4a91ff948694463c3" - integrity sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw== - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - -process@^0.11.10: - version "0.11.10" - resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" - integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== - -progress@^1.1.8: - version "1.1.8" - resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" - integrity sha512-UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw== - -progress@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" - integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== - -proto-props@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/proto-props/-/proto-props-2.0.0.tgz#8ac6e6dec658545815c623a3bc81580deda9a181" - integrity sha512-2yma2tog9VaRZY2mn3Wq51uiSW4NcPYT1cQdBagwyrznrilKSZwIZ0UG3ZPL/mx+axEns0hE35T5ufOYZXEnBQ== - -psl@^1.1.28: - version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" - integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - -pupa@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" - integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== - dependencies: - escape-goat "^2.0.0" - -qs@~6.5.2: - version "6.5.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" - integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== - -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== - -quick-lru@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" - integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== - -quick-lru@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" - integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== - -quick-lru@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-6.1.1.tgz#f8e5bf9010376c126c80c1a62827a526c0e60adf" - integrity sha512-S27GBT+F0NTRiehtbrgaSE1idUAJ5bX8dPAQTdylEyNlrdcH5X4Lz7Edz3DYzecbsCluD5zO8ZNEe04z3D3u6Q== - -read-config-file@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" - integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg== - dependencies: - 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-up@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" - integrity sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A== - dependencies: - find-up "^1.0.0" - read-pkg "^1.0.0" - -read-pkg-up@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" - integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== - dependencies: - find-up "^4.1.0" - read-pkg "^5.2.0" - type-fest "^0.8.1" - -read-pkg-up@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-9.1.0.tgz#38ca48e0bc6c6b260464b14aad9bcd4e5b1fbdc3" - integrity sha512-vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg== - dependencies: - find-up "^6.3.0" - read-pkg "^7.1.0" - type-fest "^2.5.0" - -read-pkg@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28" - integrity sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ== - dependencies: - load-json-file "^1.0.0" - normalize-package-data "^2.3.2" - path-type "^1.0.0" - -read-pkg@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" - integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== - dependencies: - "@types/normalize-package-data" "^2.4.0" - normalize-package-data "^2.5.0" - parse-json "^5.0.0" - type-fest "^0.6.0" - -read-pkg@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-7.1.0.tgz#438b4caed1ad656ba359b3e00fd094f3c427a43e" - integrity sha512-5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg== - dependencies: - "@types/normalize-package-data" "^2.4.1" - normalize-package-data "^3.0.2" - parse-json "^5.2.0" - type-fest "^2.0.0" - -readable-stream@^2.2.2: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - 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" - -redent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" - integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== - dependencies: - indent-string "^4.0.0" - strip-indent "^3.0.0" - -redent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-4.0.0.tgz#0c0ba7caabb24257ab3bb7a4fd95dd1d5c5681f9" - integrity sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag== - dependencies: - indent-string "^5.0.0" - strip-indent "^4.0.0" - -regenerator-runtime@^0.13.3, regenerator-runtime@^0.13.4: - version "0.13.9" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" - integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== - -regexp-tree@^0.1.24, regexp-tree@~0.1.1: - version "0.1.24" - resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.24.tgz#3d6fa238450a4d66e5bc9c4c14bb720e2196829d" - integrity sha512-s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw== - -regexp.prototype.flags@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" - integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - functions-have-names "^1.2.2" - -regexpp@^3.0.0, regexpp@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" - integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== - -request-progress@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08" - integrity sha512-dxdraeZVUNEn9AvLrxkgB2k6buTlym71dJk1fk4v8j3Ou3RKNm07BcgbHdj2lLgYGfqX71F+awb1MR+tWPFJzA== - dependencies: - throttleit "^1.0.0" - -request@^2.81.0: - version "2.88.2" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.3" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.5.0" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== - -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -require-main-filename@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" - integrity sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug== - -resolve-alpn@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" - integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== - -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" - integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== - -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -resolve@^1.10.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1: - version "1.22.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" - integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== - dependencies: - is-core-module "^2.9.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -responselike@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" - integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw== - dependencies: - lowercase-keys "^2.0.0" - -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== - -rimraf@^2.2.8: - version "2.7.1" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" - integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== - dependencies: - glob "^7.1.3" - -rimraf@^3.0.0, rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -roarr@^2.15.3: - version "2.15.4" - resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" - integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== - dependencies: - 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-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" - -safe-buffer@^5.0.1, safe-buffer@^5.1.2: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-regex@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-2.1.1.tgz#f7128f00d056e2fe5c11e81a1324dd974aadced2" - integrity sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A== - dependencies: - regexp-tree "~0.1.1" - -"safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -sanitize-filename@^1.6.3: - version "1.6.3" - resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" - integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== - dependencies: - truncate-utf8-bytes "^1.0.0" - -sax@>=0.6.0, sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== - -"semver@2 || 3 || 4 || 5", semver@^5.7.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7: - version "7.3.7" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" - integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== - dependencies: - lru-cache "^6.0.0" - -semver@^7.3.8: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== - dependencies: - lru-cache "^6.0.0" - -semver@~7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" - integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== - -serialize-error@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" - integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== - dependencies: - type-fest "^0.13.1" - -set-blocking@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== - dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" - -signal-exit@^3.0.3, signal-exit@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== - -simple-update-notifier@^1.0.7: - version "1.1.0" - resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82" - integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg== - dependencies: - semver "~7.0.0" - -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - -slash@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" - integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== - -slash@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-5.0.0.tgz#8c18a871096b71ee0e002976a4fe3374991c3074" - integrity sha512-n6KkmvKS0623igEVj3FF0OZs1gYYJ0o0Hj939yc1fyxl2xt+xYpLnzJB6xBSqOfV9ZFLEWodBBN/heZJahuIJQ== - -slice-ansi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" - integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -slice-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" - integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -smart-buffer@^4.0.2: - version "4.2.0" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" - integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== - -sort-keys-length@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188" - integrity sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw== - dependencies: - sort-keys "^1.0.0" - -sort-keys@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" - integrity sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg== - dependencies: - is-plain-obj "^1.0.0" - -source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== - -source-map-support@^0.5.19: - version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map@^0.6.0: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -spdx-correct@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" - integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" - integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== - -spdx-expression-parse@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.11" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95" - integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g== - -sprintf-js@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" - integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== - -sshpk@^1.7.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5" - integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ== - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - -stat-mode@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" - integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== - -string-similarity@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-1.1.0.tgz#3c66498858a465ec7c40c7d81739bbd995904914" - integrity sha512-x+Ul/yDujT1PIgcKuP6NP71VgoB+NKY8ccoH2nrfnFcYH2gtoRE0XLpUaHBIx4ZdpIWnYzWAsjp2QO+ZRC3Fjg== - dependencies: - lodash "^4.13.1" - -string-width@^1.0.1, string-width@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw== - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string.prototype.trimend@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0" - integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.19.5" - -string.prototype.trimstart@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef" - integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.19.5" - -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-bom@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" - integrity sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g== - dependencies: - is-utf8 "^0.2.0" - -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA== - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - -strip-indent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" - integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ== - dependencies: - min-indent "^1.0.0" - -strip-indent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-4.0.0.tgz#b41379433dd06f5eae805e21d631e07ee670d853" - integrity sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA== - dependencies: - min-indent "^1.0.1" - -strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -style-search@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902" - integrity sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg== - -stylelint@^14.9.1: - version "14.9.1" - resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.9.1.tgz#6494ed38f148b1e75b402d678a3b6a8aae86dfda" - integrity sha512-RdAkJdPiLqHawCSnu21nE27MjNXaVd4WcOHA4vK5GtIGjScfhNnaOuWR2wWdfKFAvcWQPOYe311iveiVKSmwsA== - dependencies: - "@csstools/selector-specificity" "^2.0.1" - balanced-match "^2.0.0" - colord "^2.9.2" - cosmiconfig "^7.0.1" - css-functions-list "^3.1.0" - debug "^4.3.4" - execall "^2.0.0" - fast-glob "^3.2.11" - fastest-levenshtein "^1.0.12" - file-entry-cache "^6.0.1" - get-stdin "^8.0.0" - global-modules "^2.0.0" - globby "^11.1.0" - globjoin "^0.1.4" - html-tags "^3.2.0" - ignore "^5.2.0" - import-lazy "^4.0.0" - imurmurhash "^0.1.4" - is-plain-object "^5.0.0" - known-css-properties "^0.25.0" - mathml-tag-names "^2.1.3" - meow "^9.0.0" - micromatch "^4.0.5" - normalize-path "^3.0.0" - picocolors "^1.0.0" - postcss "^8.4.14" - postcss-media-query-parser "^0.2.3" - postcss-resolve-nested-selector "^0.1.1" - postcss-safe-parser "^6.0.0" - postcss-selector-parser "^6.0.10" - 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 "^2.2.0" - svg-tags "^1.0.0" - table "^6.8.0" - v8-compile-cache "^2.3.0" - write-file-atomic "^4.0.1" - -sumchecker@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" - integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg== - dependencies: - debug "^4.1.0" - -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g== - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.0.0, supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-hyperlinks@^2.0.0, supports-hyperlinks@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" - integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== - dependencies: - has-flag "^4.0.0" - supports-color "^7.0.0" - -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== - -svg-tags@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" - integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA== - -svg2png@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/svg2png/-/svg2png-4.1.1.tgz#6b9e0398aa418778b6436e127a2fb7f00d499c28" - integrity sha512-9tOp9Ugjlunuf1ugqkhiYboTmTaTI7p48dz5ZjNA5NQJ5xS1NLTZZ1tF8vkJOIBb/ZwxGJsKZvRWqVpo4q9z9Q== - dependencies: - file-url "^2.0.0" - phantomjs-prebuilt "^2.1.14" - pn "^1.0.0" - yargs "^6.5.0" - -table@^6.8.0: - version "6.8.0" - resolved "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz#87e28f14fa4321c3377ba286f07b79b281a3b3ca" - integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA== - dependencies: - ajv "^8.0.1" - lodash.truncate "^4.4.2" - slice-ansi "^4.0.0" - string-width "^4.2.3" - strip-ansi "^6.0.1" - -tapable@^0.1.8: - version "0.1.10" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4" - integrity sha512-jX8Et4hHg57mug1/079yitEKWGB3LCwoxByLsNim89LABq8NqgiX+6iYVOsq0vX8uJHkU+DZ5fnq95f800bEsQ== - -tar@^6.1.11: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^3.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - -temp-file@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" - integrity sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg== - dependencies: - async-exit-hook "^2.0.1" - fs-extra "^10.0.0" - -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== - -throttleit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c" - integrity sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g== - -timm@^1.6.1: - version "1.7.1" - resolved "https://registry.yarnpkg.com/timm/-/timm-1.7.1.tgz#96bab60c7d45b5a10a8a4d0f0117c6b7e5aff76f" - integrity sha512-IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw== - -tinycolor2@^1.4.1: - version "1.4.2" - resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803" - integrity sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA== - -tmp-promise@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" - integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ== - dependencies: - tmp "^0.2.0" - -tmp@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== - dependencies: - rimraf "^3.0.0" - -to-absolute-glob@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b" - integrity sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA== - dependencies: - is-absolute "^1.0.0" - is-negated-glob "^1.0.0" - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - -trim-newlines@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" - integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== - -trim-newlines@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.0.2.tgz#d6aaaf6a0df1b4b536d183879a6b939489808c7c" - integrity sha512-GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew== - -truncate-utf8-bytes@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" - integrity sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ== - dependencies: - utf8-byte-length "^1.0.1" - -tsconfig-paths@^3.14.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" - integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ== - dependencies: - "@types/json5" "^0.0.29" - json5 "^1.0.1" - minimist "^1.2.6" - strip-bom "^3.0.0" - -tslib@^1.8.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tsutils@^3.21.0: - version "3.21.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" - integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== - dependencies: - tslib "^1.8.1" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w== - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== - -type-check@^0.4.0, type-check@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" - integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== - dependencies: - prelude-ls "^1.2.1" - -type-fest@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" - integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== - -type-fest@^0.18.0: - version "0.18.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" - integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw== - -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== - -type-fest@^0.21.3: - version "0.21.3" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" - integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== - -type-fest@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" - integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== - -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - -type-fest@^2.0.0: - version "2.13.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.13.1.tgz#621c84220df0e01a8469002594fc005714f0cfba" - integrity sha512-hXYyrPFwETT2swFLHeoKtJrvSF/ftG/sA15/8nGaLuaDGfVAaq8DYFpu4yOyV4tzp082WqnTEoMsm3flKMI2FQ== - -type-fest@^2.13.0, type-fest@^2.5.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" - integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA== - -type-fest@^2.17.0: - version "2.18.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.18.1.tgz#a94f068c60b5a2d6beccccffa711210d7dd99b38" - integrity sha512-UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ== - -type-fest@^3.1.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.6.0.tgz#827c36c0e7fcff0cb2d55d091a5c4cf586432b8a" - integrity sha512-RqTRtKTzvPpNdDUp1dVkKQRunlPITk4mXeqFlAZoJsS+fLRn8AdPK0TcQDumGayhU7fjlBfiBjsq3pe3rIfXZQ== - -typedarray@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== - -typescript@^4.9.3: - version "4.9.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" - integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== - -unbox-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" - integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== - dependencies: - call-bind "^1.0.2" - has-bigints "^1.0.2" - has-symbols "^1.0.3" - which-boxed-primitive "^1.0.2" - -unc-path-regex@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" - integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== - -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -universalify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" - integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== - -untildify@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz#1e7b42b140bcfd922b22e70ca1265bfe3634c7c9" - integrity sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA== - -unused-filename@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/unused-filename/-/unused-filename-2.1.0.tgz#33719c4e8d9644f32d2dec1bc8525c6aaeb4ba51" - integrity sha512-BMiNwJbuWmqCpAM1FqxCTD7lXF97AvfQC8Kr/DIeA6VtvhJaMDupZ82+inbjl5yVP44PcxOuCSxye1QMS0wZyg== - dependencies: - modify-filename "^1.1.0" - path-exists "^4.0.0" - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -url-or-path@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/url-or-path/-/url-or-path-2.1.0.tgz#8bb39a2a2b7e8f2e31c7883d8207b0cbd07acb9f" - integrity sha512-dsBD6GbytSMj9YDb3jVzSRENwFh50oUORnWBeSHfo0Lnwv2KMm/J4npyGy1P9rivUPsUGLjTA53XqAFqpe0nww== - -utf8-byte-length@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" - integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA== - -utif@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/utif/-/utif-2.0.1.tgz#9e1582d9bbd20011a6588548ed3266298e711759" - integrity sha512-Z/S1fNKCicQTf375lIP9G8Sa1H/phcysstNrrSdZKj1f9g58J4NMgb5IgiEZN9/nLMPDwF0W7hdOe9Qq2IYoLg== - dependencies: - pako "^1.0.5" - -util-deprecate@^1.0.2, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== - -uuid@^3.3.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - -v8-compile-cache@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" - integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== - -validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw== - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -verror@^1.10.0: - version "1.10.1" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb" - integrity sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg== - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -which-boxed-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" - integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== - 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" - -which-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" - integrity sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ== - -which@^1.2.10, which@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -which@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -winreg@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz#ba065629b7a925130e15779108cf540990e98d1b" - integrity sha512-IHpzORub7kYlb8A43Iig3reOvlcBJGX9gZ0WycHhghHtA65X0LYnMRuJs+aH1abVnMJztQkvQNlltnbPi5aGIA== - -word-wrap@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" - integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== - -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - integrity sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw== - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== - -write-file-atomic@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f" - integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ== - dependencies: - imurmurhash "^0.1.4" - signal-exit "^3.0.7" - -xhr@^2.0.1: - version "2.6.0" - resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.6.0.tgz#b69d4395e792b4173d6b7df077f0fc5e4e2b249d" - integrity sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA== - dependencies: - global "~4.4.0" - is-function "^1.0.1" - parse-headers "^2.0.0" - xtend "^4.0.0" - -xml-parse-from-string@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz#a9029e929d3dbcded169f3c6e28238d95a5d5a28" - integrity sha512-ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g== - -xml2js@^0.4.5: - version "0.4.23" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" - integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug== - dependencies: - sax ">=0.6.0" - xmlbuilder "~11.0.0" - -xmlbuilder@>=11.0.1: - version "15.1.1" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" - integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== - -xmlbuilder@^9.0.7: - version "9.0.7" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" - integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ== - -xmlbuilder@~11.0.0: - version "11.0.1" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" - integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== - -xo@^0.53.1: - version "0.53.1" - resolved "https://registry.yarnpkg.com/xo/-/xo-0.53.1.tgz#23f35b007d50bbcd863cb9afbceff41aa9beb8ce" - integrity sha512-/2R8SPehv1UhiIqJ9uSvrAjslcoygICNsUlEb/Zf2V6rMtr7YCoggc6hlt6b/kbncpR989Roqt6AvEO779dFxw== - dependencies: - "@eslint/eslintrc" "^1.3.3" - "@typescript-eslint/eslint-plugin" "^5.43.0" - "@typescript-eslint/parser" "^5.43.0" - arrify "^3.0.0" - cosmiconfig "^7.1.0" - define-lazy-prop "^3.0.0" - eslint "^8.27.0" - eslint-config-prettier "^8.5.0" - eslint-config-xo "^0.43.1" - eslint-config-xo-typescript "^0.55.0" - eslint-formatter-pretty "^4.1.0" - eslint-import-resolver-webpack "^0.13.2" - eslint-plugin-ava "^13.2.0" - eslint-plugin-eslint-comments "^3.2.0" - eslint-plugin-import "^2.26.0" - eslint-plugin-n "^15.5.1" - eslint-plugin-no-use-extend-native "^0.5.0" - eslint-plugin-prettier "^4.2.1" - eslint-plugin-unicorn "^44.0.2" - esm-utils "^4.1.0" - find-cache-dir "^4.0.0" - find-up "^6.3.0" - get-stdin "^9.0.0" - globby "^13.1.2" - imurmurhash "^0.1.4" - json-stable-stringify-without-jsonify "^1.0.1" - json5 "^2.2.1" - lodash-es "^4.17.21" - meow "^11.0.0" - micromatch "^4.0.5" - open-editor "^4.0.0" - prettier "^2.7.1" - semver "^7.3.8" - slash "^5.0.0" - to-absolute-glob "^2.0.2" - typescript "^4.9.3" - -xtend@^4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - -y18n@^3.2.1: - version "3.2.2" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" - integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ== - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yaml@^1.10.0: - version "1.10.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" - integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== - -yargs-parser@^20.2.3: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yargs-parser@^21.1.1: - version "21.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - -yargs-parser@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c" - integrity sha512-+QQWqC2xeL0N5/TE+TY6OGEqyNRM+g2/r712PDNYgiCdXYCApXf1vzfmDSLBxfGRwV+moTq/V8FnMI24JCm2Yg== - dependencies: - camelcase "^3.0.0" - -yargs@^17.5.1: - version "17.6.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" - integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== - dependencies: - 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@^6.5.0: - version "6.6.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" - integrity sha512-6/QWTdisjnu5UHUzQGst+UOEuEVwIzFVGBjq3jMTFNs5WJQsH/X6nMURSaScIdF5txylr1Ao9bvbWiKi2yXbwA== - dependencies: - camelcase "^3.0.0" - cliui "^3.2.0" - decamelize "^1.1.1" - get-caller-file "^1.0.1" - os-locale "^1.4.0" - read-pkg-up "^1.0.1" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^1.0.2" - which-module "^1.0.0" - y18n "^3.2.1" - yargs-parser "^4.2.0" - -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== - -yocto-queue@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251" - integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g== diff --git a/third_party/nixpkgs/pkgs/applications/misc/kuro/yarn.nix b/third_party/nixpkgs/pkgs/applications/misc/kuro/yarn.nix deleted file mode 100644 index 25689796a4..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/kuro/yarn.nix +++ /dev/null @@ -1,6485 +0,0 @@ -{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { - offline_cache = linkFarm "offline" packages; - packages = [ - { - name = "7zip_bin___7zip_bin_5.1.1.tgz"; - path = fetchurl { - name = "7zip_bin___7zip_bin_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz"; - sha512 = "sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ=="; - }; - } - { - name = "_babel_code_frame___code_frame_7.16.7.tgz"; - path = fetchurl { - name = "_babel_code_frame___code_frame_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz"; - sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; - }; - } - { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz"; - path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; - sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; - }; - } - { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; - path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; - sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; - }; - } - { - name = "_babel_highlight___highlight_7.17.12.tgz"; - path = fetchurl { - name = "_babel_highlight___highlight_7.17.12.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.17.12.tgz"; - sha512 = "7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg=="; - }; - } - { - name = "_babel_runtime___runtime_7.18.3.tgz"; - path = fetchurl { - name = "_babel_runtime___runtime_7.18.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.3.tgz"; - sha512 = "38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug=="; - }; - } - { - name = "_csstools_selector_specificity___selector_specificity_2.0.2.tgz"; - path = fetchurl { - name = "_csstools_selector_specificity___selector_specificity_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz"; - sha512 = "IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg=="; - }; - } - { - name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; - path = fetchurl { - name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; - url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz"; - sha512 = "0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig=="; - }; - } - { - name = "_electron_get___get_2.0.2.tgz"; - path = fetchurl { - name = "_electron_get___get_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz"; - sha512 = "eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g=="; - }; - } - { - name = "_electron_universal___universal_1.2.1.tgz"; - path = fetchurl { - name = "_electron_universal___universal_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz"; - sha512 = "7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ=="; - }; - } - { - name = "_eslint_eslintrc___eslintrc_1.4.1.tgz"; - path = fetchurl { - name = "_eslint_eslintrc___eslintrc_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz"; - sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA=="; - }; - } - { - name = "_humanwhocodes_config_array___config_array_0.11.8.tgz"; - path = fetchurl { - name = "_humanwhocodes_config_array___config_array_0.11.8.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz"; - sha512 = "UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g=="; - }; - } - { - name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz"; - path = fetchurl { - name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"; - sha512 = "bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="; - }; - } - { - name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; - path = fetchurl { - name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; - sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; - }; - } - { - name = "_jimp_bmp___bmp_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_bmp___bmp_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.14.0.tgz"; - sha512 = "5RkX6tSS7K3K3xNEb2ygPuvyL9whjanhoaB/WmmXlJS6ub4DjTqrapu8j4qnIWmO4YYtFeTbDTXV6v9P1yMA5A=="; - }; - } - { - name = "_jimp_core___core_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_core___core_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/core/-/core-0.14.0.tgz"; - sha512 = "S62FcKdtLtj3yWsGfJRdFXSutjvHg7aQNiFogMbwq19RP4XJWqS2nOphu7ScB8KrSlyy5nPF2hkWNhLRLyD82w=="; - }; - } - { - name = "_jimp_custom___custom_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_custom___custom_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.14.0.tgz"; - sha512 = "kQJMeH87+kWJdVw8F9GQhtsageqqxrvzg7yyOw3Tx/s7v5RToe8RnKyMM+kVtBJtNAG+Xyv/z01uYQ2jiZ3GwA=="; - }; - } - { - name = "_jimp_gif___gif_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_gif___gif_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.14.0.tgz"; - sha512 = "DHjoOSfCaCz72+oGGEh8qH0zE6pUBaBxPxxmpYJjkNyDZP7RkbBkZJScIYeQ7BmJxmGN4/dZn+MxamoQlr+UYg=="; - }; - } - { - name = "_jimp_jpeg___jpeg_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_jpeg___jpeg_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.14.0.tgz"; - sha512 = "561neGbr+87S/YVQYnZSTyjWTHBm9F6F1obYHiyU3wVmF+1CLbxY3FQzt4YolwyQHIBv36Bo0PY2KkkU8BEeeQ=="; - }; - } - { - name = "_jimp_plugin_blit___plugin_blit_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_blit___plugin_blit_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.14.0.tgz"; - sha512 = "YoYOrnVHeX3InfgbJawAU601iTZMwEBZkyqcP1V/S33Qnz9uzH1Uj1NtC6fNgWzvX6I4XbCWwtr4RrGFb5CFrw=="; - }; - } - { - name = "_jimp_plugin_blur___plugin_blur_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_blur___plugin_blur_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.14.0.tgz"; - sha512 = "9WhZcofLrT0hgI7t0chf7iBQZib//0gJh9WcQMUt5+Q1Bk04dWs8vTgLNj61GBqZXgHSPzE4OpCrrLDBG8zlhQ=="; - }; - } - { - name = "_jimp_plugin_circle___plugin_circle_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_circle___plugin_circle_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.14.0.tgz"; - sha512 = "o5L+wf6QA44tvTum5HeLyLSc5eVfIUd5ZDVi5iRfO4o6GT/zux9AxuTSkKwnjhsG8bn1dDmywAOQGAx7BjrQVA=="; - }; - } - { - name = "_jimp_plugin_color___plugin_color_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_color___plugin_color_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.14.0.tgz"; - sha512 = "JJz512SAILYV0M5LzBb9sbOm/XEj2fGElMiHAxb7aLI6jx+n0agxtHpfpV/AePTLm1vzzDxx6AJxXbKv355hBQ=="; - }; - } - { - name = "_jimp_plugin_contain___plugin_contain_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_contain___plugin_contain_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.14.0.tgz"; - sha512 = "RX2q233lGyaxiMY6kAgnm9ScmEkNSof0hdlaJAVDS1OgXphGAYAeSIAwzESZN4x3ORaWvkFefeVH9O9/698Evg=="; - }; - } - { - name = "_jimp_plugin_cover___plugin_cover_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_cover___plugin_cover_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.14.0.tgz"; - sha512 = "0P/5XhzWES4uMdvbi3beUgfvhn4YuQ/ny8ijs5kkYIw6K8mHcl820HahuGpwWMx56DJLHRl1hFhJwo9CeTRJtQ=="; - }; - } - { - name = "_jimp_plugin_crop___plugin_crop_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_crop___plugin_crop_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.14.0.tgz"; - sha512 = "Ojtih+XIe6/XSGtpWtbAXBozhCdsDMmy+THUJAGu2x7ZgKrMS0JotN+vN2YC3nwDpYkM+yOJImQeptSfZb2Sug=="; - }; - } - { - name = "_jimp_plugin_displace___plugin_displace_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_displace___plugin_displace_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.14.0.tgz"; - sha512 = "c75uQUzMgrHa8vegkgUvgRL/PRvD7paFbFJvzW0Ugs8Wl+CDMGIPYQ3j7IVaQkIS+cAxv+NJ3TIRBQyBrfVEOg=="; - }; - } - { - name = "_jimp_plugin_dither___plugin_dither_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_dither___plugin_dither_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.14.0.tgz"; - sha512 = "g8SJqFLyYexXQQsoh4dc1VP87TwyOgeTElBcxSXX2LaaMZezypmxQfLTzOFzZoK8m39NuaoH21Ou1Ftsq7LzVQ=="; - }; - } - { - name = "_jimp_plugin_fisheye___plugin_fisheye_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_fisheye___plugin_fisheye_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.14.0.tgz"; - sha512 = "BFfUZ64EikCaABhCA6mR3bsltWhPpS321jpeIQfJyrILdpFsZ/OccNwCgpW1XlbldDHIoNtXTDGn3E+vCE7vDg=="; - }; - } - { - name = "_jimp_plugin_flip___plugin_flip_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_flip___plugin_flip_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.14.0.tgz"; - sha512 = "WtL1hj6ryqHhApih+9qZQYA6Ye8a4HAmdTzLbYdTMrrrSUgIzFdiZsD0WeDHpgS/+QMsWwF+NFmTZmxNWqKfXw=="; - }; - } - { - name = "_jimp_plugin_gaussian___plugin_gaussian_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_gaussian___plugin_gaussian_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.14.0.tgz"; - sha512 = "uaLwQ0XAQoydDlF9tlfc7iD9drYPriFe+jgYnWm8fbw5cN+eOIcnneEX9XCOOzwgLPkNCxGox6Kxjn8zY6GxtQ=="; - }; - } - { - name = "_jimp_plugin_invert___plugin_invert_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_invert___plugin_invert_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.14.0.tgz"; - sha512 = "UaQW9X9vx8orQXYSjT5VcITkJPwDaHwrBbxxPoDG+F/Zgv4oV9fP+udDD6qmkgI9taU+44Fy+zm/J/gGcMWrdg=="; - }; - } - { - name = "_jimp_plugin_mask___plugin_mask_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_mask___plugin_mask_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.14.0.tgz"; - sha512 = "tdiGM69OBaKtSPfYSQeflzFhEpoRZ+BvKfDEoivyTjauynbjpRiwB1CaiS8En1INTDwzLXTT0Be9SpI3LkJoEA=="; - }; - } - { - name = "_jimp_plugin_normalize___plugin_normalize_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_normalize___plugin_normalize_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.14.0.tgz"; - sha512 = "AfY8sqlsbbdVwFGcyIPy5JH/7fnBzlmuweb+Qtx2vn29okq6+HelLjw2b+VT2btgGUmWWHGEHd86oRGSoWGyEQ=="; - }; - } - { - name = "_jimp_plugin_print___plugin_print_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_print___plugin_print_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.14.0.tgz"; - sha512 = "MwP3sH+VS5AhhSTXk7pui+tEJFsxnTKFY3TraFJb8WFbA2Vo2qsRCZseEGwpTLhENB7p/JSsLvWoSSbpmxhFAQ=="; - }; - } - { - name = "_jimp_plugin_resize___plugin_resize_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_resize___plugin_resize_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.14.0.tgz"; - sha512 = "qFeMOyXE/Bk6QXN0GQo89+CB2dQcXqoxUcDb2Ah8wdYlKqpi53skABkgVy5pW3EpiprDnzNDboMltdvDslNgLQ=="; - }; - } - { - name = "_jimp_plugin_rotate___plugin_rotate_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_rotate___plugin_rotate_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.14.0.tgz"; - sha512 = "aGaicts44bvpTcq5Dtf93/8TZFu5pMo/61lWWnYmwJJU1RqtQlxbCLEQpMyRhKDNSfPbuP8nyGmaqXlM/82J0Q=="; - }; - } - { - name = "_jimp_plugin_scale___plugin_scale_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_scale___plugin_scale_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.14.0.tgz"; - sha512 = "ZcJk0hxY5ZKZDDwflqQNHEGRblgaR+piePZm7dPwPUOSeYEH31P0AwZ1ziceR74zd8N80M0TMft+e3Td6KGBHw=="; - }; - } - { - name = "_jimp_plugin_shadow___plugin_shadow_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_shadow___plugin_shadow_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.14.0.tgz"; - sha512 = "p2igcEr/iGrLiTu0YePNHyby0WYAXM14c5cECZIVnq/UTOOIQ7xIcWZJ1lRbAEPxVVXPN1UibhZAbr3HAb5BjQ=="; - }; - } - { - name = "_jimp_plugin_threshold___plugin_threshold_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugin_threshold___plugin_threshold_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.14.0.tgz"; - sha512 = "N4BlDgm/FoOMV/DQM2rSpzsgqAzkP0DXkWZoqaQrlRxQBo4zizQLzhEL00T/YCCMKnddzgEhnByaocgaaa0fKw=="; - }; - } - { - name = "_jimp_plugins___plugins_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_plugins___plugins_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.14.0.tgz"; - sha512 = "vDO3XT/YQlFlFLq5TqNjQkISqjBHT8VMhpWhAfJVwuXIpilxz5Glu4IDLK6jp4IjPR6Yg2WO8TmRY/HI8vLrOw=="; - }; - } - { - name = "_jimp_png___png_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_png___png_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/png/-/png-0.14.0.tgz"; - sha512 = "0RV/mEIDOrPCcNfXSPmPBqqSZYwGADNRVUTyMt47RuZh7sugbYdv/uvKmQSiqRdR0L1sfbCBMWUEa5G/8MSbdA=="; - }; - } - { - name = "_jimp_tiff___tiff_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_tiff___tiff_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.14.0.tgz"; - sha512 = "zBYDTlutc7j88G/7FBCn3kmQwWr0rmm1e0FKB4C3uJ5oYfT8645lftUsvosKVUEfkdmOaMAnhrf4ekaHcb5gQw=="; - }; - } - { - name = "_jimp_types___types_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_types___types_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/types/-/types-0.14.0.tgz"; - sha512 = "hx3cXAW1KZm+b+XCrY3LXtdWy2U+hNtq0rPyJ7NuXCjU7lZR3vIkpz1DLJ3yDdS70hTi5QDXY3Cd9kd6DtloHQ=="; - }; - } - { - name = "_jimp_utils___utils_0.14.0.tgz"; - path = fetchurl { - name = "_jimp_utils___utils_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.14.0.tgz"; - sha512 = "MY5KFYUru0y74IsgM/9asDwb3ERxWxXEu3CRCZEvE7DtT86y1bR1XgtlSliMrptjz4qbivNGMQSvUBpEFJDp1A=="; - }; - } - { - name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; - path = fetchurl { - name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz"; - sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ=="; - }; - } - { - name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; - path = fetchurl { - name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz"; - sha512 = "9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q=="; - }; - } - { - name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; - path = fetchurl { - name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; - sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; - }; - } - { - name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; - path = fetchurl { - name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; - sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; - }; - } - { - name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; - path = fetchurl { - name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; - sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; - }; - } - { - name = "_sindresorhus_is___is_4.6.0.tgz"; - path = fetchurl { - name = "_sindresorhus_is___is_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz"; - sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; - }; - } - { - name = "_szmarczak_http_timer___http_timer_4.0.6.tgz"; - path = fetchurl { - name = "_szmarczak_http_timer___http_timer_4.0.6.tgz"; - url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz"; - sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; - }; - } - { - name = "_tootallnate_once___once_2.0.0.tgz"; - path = fetchurl { - name = "_tootallnate_once___once_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz"; - sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; - }; - } - { - name = "_types_cacheable_request___cacheable_request_6.0.3.tgz"; - path = fetchurl { - name = "_types_cacheable_request___cacheable_request_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz"; - sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="; - }; - } - { - name = "_types_debug___debug_4.1.7.tgz"; - path = fetchurl { - name = "_types_debug___debug_4.1.7.tgz"; - url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz"; - sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; - }; - } - { - name = "_types_eslint___eslint_7.29.0.tgz"; - path = fetchurl { - name = "_types_eslint___eslint_7.29.0.tgz"; - url = "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.29.0.tgz"; - sha512 = "VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng=="; - }; - } - { - name = "_types_estree___estree_0.0.51.tgz"; - path = fetchurl { - name = "_types_estree___estree_0.0.51.tgz"; - url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz"; - sha512 = "CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="; - }; - } - { - name = "_types_fs_extra___fs_extra_9.0.13.tgz"; - path = fetchurl { - name = "_types_fs_extra___fs_extra_9.0.13.tgz"; - url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz"; - sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; - }; - } - { - name = "_types_glob___glob_7.2.0.tgz"; - path = fetchurl { - name = "_types_glob___glob_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz"; - sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; - }; - } - { - name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz"; - path = fetchurl { - name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz"; - sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; - }; - } - { - name = "_types_json_schema___json_schema_7.0.11.tgz"; - path = fetchurl { - name = "_types_json_schema___json_schema_7.0.11.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz"; - sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; - }; - } - { - name = "_types_json5___json5_0.0.29.tgz"; - path = fetchurl { - name = "_types_json5___json5_0.0.29.tgz"; - url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; - sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="; - }; - } - { - name = "_types_keyv___keyv_3.1.4.tgz"; - path = fetchurl { - name = "_types_keyv___keyv_3.1.4.tgz"; - url = "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz"; - sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; - }; - } - { - name = "_types_minimatch___minimatch_3.0.5.tgz"; - path = fetchurl { - name = "_types_minimatch___minimatch_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz"; - sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; - }; - } - { - name = "_types_minimist___minimist_1.2.2.tgz"; - path = fetchurl { - name = "_types_minimist___minimist_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz"; - sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; - }; - } - { - name = "_types_ms___ms_0.7.31.tgz"; - path = fetchurl { - name = "_types_ms___ms_0.7.31.tgz"; - url = "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz"; - sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; - }; - } - { - name = "_types_node___node_18.11.18.tgz"; - path = fetchurl { - name = "_types_node___node_18.11.18.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz"; - sha512 = "DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA=="; - }; - } - { - name = "_types_node___node_16.9.1.tgz"; - path = fetchurl { - name = "_types_node___node_16.9.1.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz"; - sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g=="; - }; - } - { - name = "_types_node___node_16.11.41.tgz"; - path = fetchurl { - name = "_types_node___node_16.11.41.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.11.41.tgz"; - sha512 = "mqoYK2TnVjdkGk8qXAVGc/x9nSaTpSrFaGFm43BUH3IdoBV0nta6hYaGmdOvIMlbHJbUEVen3gvwpwovAZKNdQ=="; - }; - } - { - name = "_types_normalize_package_data___normalize_package_data_2.4.1.tgz"; - path = fetchurl { - name = "_types_normalize_package_data___normalize_package_data_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"; - sha512 = "Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="; - }; - } - { - name = "_types_parse_json___parse_json_4.0.0.tgz"; - path = fetchurl { - name = "_types_parse_json___parse_json_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; - }; - } - { - name = "_types_plist___plist_3.0.2.tgz"; - path = fetchurl { - name = "_types_plist___plist_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz"; - sha512 = "ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw=="; - }; - } - { - name = "_types_responselike___responselike_1.0.0.tgz"; - path = fetchurl { - name = "_types_responselike___responselike_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz"; - sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; - }; - } - { - name = "_types_semver___semver_7.3.13.tgz"; - path = fetchurl { - name = "_types_semver___semver_7.3.13.tgz"; - url = "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz"; - sha512 = "21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw=="; - }; - } - { - name = "_types_verror___verror_1.10.5.tgz"; - path = fetchurl { - name = "_types_verror___verror_1.10.5.tgz"; - url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.5.tgz"; - sha512 = "9UjMCHK5GPgQRoNbqdLIAvAy0EInuiqbW0PBMtVP6B5B2HQJlvoJHM+KodPZMEjOa5VkSc+5LH7xy+cUzQdmHw=="; - }; - } - { - name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; - path = fetchurl { - name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"; - sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; - }; - } - { - name = "_types_yargs___yargs_17.0.10.tgz"; - path = fetchurl { - name = "_types_yargs___yargs_17.0.10.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.10.tgz"; - sha512 = "gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA=="; - }; - } - { - name = "_types_yauzl___yauzl_2.10.0.tgz"; - path = fetchurl { - name = "_types_yauzl___yauzl_2.10.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz"; - sha512 = "Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw=="; - }; - } - { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.53.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.53.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.53.0.tgz"; - sha512 = "alFpFWNucPLdUOySmXCJpzr6HKC3bu7XooShWM+3w/EL6J2HIoB2PFxpLnq4JauWVk6DiVeNKzQlFEaE+X9sGw=="; - }; - } - { - name = "_typescript_eslint_parser___parser_5.53.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_parser___parser_5.53.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.53.0.tgz"; - sha512 = "MKBw9i0DLYlmdOb3Oq/526+al20AJZpANdT6Ct9ffxcV8nKCHz63t/S0IhlTFNsBIHJv+GY5SFJ0XfqVeydQrQ=="; - }; - } - { - name = "_typescript_eslint_scope_manager___scope_manager_5.53.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_scope_manager___scope_manager_5.53.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.53.0.tgz"; - sha512 = "Opy3dqNsp/9kBBeCPhkCNR7fmdSQqA+47r21hr9a14Bx0xnkElEQmhoHga+VoaoQ6uDHjDKmQPIYcUcKJifS7w=="; - }; - } - { - name = "_typescript_eslint_type_utils___type_utils_5.53.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_type_utils___type_utils_5.53.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.53.0.tgz"; - sha512 = "HO2hh0fmtqNLzTAme/KnND5uFNwbsdYhCZghK2SoxGp3Ifn2emv+hi0PBUjzzSh0dstUIFqOj3bp0AwQlK4OWw=="; - }; - } - { - name = "_typescript_eslint_types___types_5.53.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_types___types_5.53.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.53.0.tgz"; - sha512 = "5kcDL9ZUIP756K6+QOAfPkigJmCPHcLN7Zjdz76lQWWDdzfOhZDTj1irs6gPBKiXx5/6O3L0+AvupAut3z7D2A=="; - }; - } - { - name = "_typescript_eslint_typescript_estree___typescript_estree_5.53.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_5.53.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.53.0.tgz"; - sha512 = "eKmipH7QyScpHSkhbptBBYh9v8FxtngLquq292YTEQ1pxVs39yFBlLC1xeIZcPPz1RWGqb7YgERJRGkjw8ZV7w=="; - }; - } - { - name = "_typescript_eslint_utils___utils_5.53.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_utils___utils_5.53.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.53.0.tgz"; - sha512 = "VUOOtPv27UNWLxFwQK/8+7kvxVC+hPHNsJjzlJyotlaHjLSIgOCKj9I0DBUjwOOA64qjBwx5afAPjksqOxMO0g=="; - }; - } - { - name = "_typescript_eslint_visitor_keys___visitor_keys_5.53.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_5.53.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.53.0.tgz"; - sha512 = "JqNLnX3leaHFZEN0gCh81sIvgrp/2GOACZNgO4+Tkf64u51kTpAyWFOY8XHx8XuXr3N2C9zgPPHtcpMg6z1g0w=="; - }; - } - { - name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; - path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; - sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; - }; - } - { - name = "acorn___acorn_8.7.1.tgz"; - path = fetchurl { - name = "acorn___acorn_8.7.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz"; - sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; - }; - } - { - name = "acorn___acorn_8.8.2.tgz"; - path = fetchurl { - name = "acorn___acorn_8.8.2.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz"; - sha512 = "xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw=="; - }; - } - { - name = "agent_base___agent_base_6.0.2.tgz"; - path = fetchurl { - name = "agent_base___agent_base_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; - sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; - }; - } - { - name = "ajv_formats___ajv_formats_2.1.1.tgz"; - path = fetchurl { - name = "ajv_formats___ajv_formats_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz"; - sha512 = "Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA=="; - }; - } - { - name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; - path = fetchurl { - name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; - sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; - }; - } - { - name = "ajv___ajv_6.12.6.tgz"; - path = fetchurl { - name = "ajv___ajv_6.12.6.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; - sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; - }; - } - { - name = "ajv___ajv_8.11.0.tgz"; - path = fetchurl { - name = "ajv___ajv_8.11.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz"; - sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; - }; - } - { - name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; - path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; - sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; - }; - } - { - name = "ansi_regex___ansi_regex_2.1.1.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="; - }; - } - { - name = "ansi_regex___ansi_regex_5.0.1.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; - }; - } - { - name = "ansi_styles___ansi_styles_2.2.1.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha512 = "kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA=="; - }; - } - { - name = "ansi_styles___ansi_styles_3.2.1.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; - }; - } - { - name = "ansi_styles___ansi_styles_4.3.0.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; - }; - } - { - name = "any_base___any_base_1.1.0.tgz"; - path = fetchurl { - name = "any_base___any_base_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/any-base/-/any-base-1.1.0.tgz"; - sha512 = "uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg=="; - }; - } - { - name = "app_builder_bin___app_builder_bin_4.0.0.tgz"; - path = fetchurl { - name = "app_builder_bin___app_builder_bin_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz"; - sha512 = "xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA=="; - }; - } - { - name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; - path = fetchurl { - name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz"; - sha512 = "dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA=="; - }; - } - { - name = "applescript___applescript_1.0.0.tgz"; - path = fetchurl { - name = "applescript___applescript_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/applescript/-/applescript-1.0.0.tgz"; - sha512 = "yvtNHdWvtbYEiIazXAdp/NY+BBb65/DAseqlNiJQjOx9DynuzOYDbVLBJvuc0ve0VL9x6B3OHF6eH52y9hCBtQ=="; - }; - } - { - name = "argparse___argparse_2.0.1.tgz"; - path = fetchurl { - name = "argparse___argparse_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; - sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; - }; - } - { - name = "args___args_2.6.1.tgz"; - path = fetchurl { - name = "args___args_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/args/-/args-2.6.1.tgz"; - sha512 = "6gqHZwB7mIn1YnijODwDlAuDgadJvDy1rVM+8E4tbAIPIhL53/J5hDomxgLPZ/1Som+eRKRDmUnuo9ezUpzmRw=="; - }; - } - { - name = "array_find___array_find_1.0.0.tgz"; - path = fetchurl { - name = "array_find___array_find_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/array-find/-/array-find-1.0.0.tgz"; - sha512 = "kO/vVCacW9mnpn3WPWbTVlEnOabK2L7LWi2HViURtCM46y1zb6I8UMjx4LgbiqadTgHnLInUronwn3ampNTJtQ=="; - }; - } - { - name = "array_includes___array_includes_3.1.5.tgz"; - path = fetchurl { - name = "array_includes___array_includes_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz"; - sha512 = "iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ=="; - }; - } - { - name = "array_union___array_union_1.0.2.tgz"; - path = fetchurl { - name = "array_union___array_union_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz"; - sha512 = "Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng=="; - }; - } - { - name = "array_union___array_union_2.1.0.tgz"; - path = fetchurl { - name = "array_union___array_union_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; - sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; - }; - } - { - name = "array_uniq___array_uniq_1.0.3.tgz"; - path = fetchurl { - name = "array_uniq___array_uniq_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz"; - sha512 = "MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q=="; - }; - } - { - name = "array.prototype.flat___array.prototype.flat_1.3.0.tgz"; - path = fetchurl { - name = "array.prototype.flat___array.prototype.flat_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.0.tgz"; - sha512 = "12IUEkHsAhA4DY5s0FPgNXIdc8VRSqD9Zp78a5au9abH/SOBrsp082JOWFNTjkMozh8mqcdiKuaLGhPeYztxSw=="; - }; - } - { - name = "arrify___arrify_1.0.1.tgz"; - path = fetchurl { - name = "arrify___arrify_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz"; - sha512 = "3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA=="; - }; - } - { - name = "arrify___arrify_3.0.0.tgz"; - path = fetchurl { - name = "arrify___arrify_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/arrify/-/arrify-3.0.0.tgz"; - sha512 = "tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw=="; - }; - } - { - name = "asar___asar_3.1.0.tgz"; - path = fetchurl { - name = "asar___asar_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz"; - sha512 = "vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ=="; - }; - } - { - name = "asn1___asn1_0.2.6.tgz"; - path = fetchurl { - name = "asn1___asn1_0.2.6.tgz"; - url = "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz"; - sha512 = "ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="; - }; - } - { - name = "assert_plus___assert_plus_1.0.0.tgz"; - path = fetchurl { - name = "assert_plus___assert_plus_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; - sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; - }; - } - { - name = "astral_regex___astral_regex_2.0.0.tgz"; - path = fetchurl { - name = "astral_regex___astral_regex_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; - sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; - }; - } - { - name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; - path = fetchurl { - name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz"; - sha512 = "NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw=="; - }; - } - { - name = "async___async_3.2.4.tgz"; - path = fetchurl { - name = "async___async_3.2.4.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz"; - sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; - }; - } - { - name = "asynckit___asynckit_0.4.0.tgz"; - path = fetchurl { - name = "asynckit___asynckit_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; - }; - } - { - name = "at_least_node___at_least_node_1.0.0.tgz"; - path = fetchurl { - name = "at_least_node___at_least_node_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; - sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; - }; - } - { - name = "atomically___atomically_1.7.0.tgz"; - path = fetchurl { - name = "atomically___atomically_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/atomically/-/atomically-1.7.0.tgz"; - sha512 = "Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w=="; - }; - } - { - name = "auto_launch___auto_launch_5.0.5.tgz"; - path = fetchurl { - name = "auto_launch___auto_launch_5.0.5.tgz"; - url = "https://registry.yarnpkg.com/auto-launch/-/auto-launch-5.0.5.tgz"; - sha512 = "ppdF4mihhYzMYLuCcx9H/c5TUOCev8uM7en53zWVQhyYAJrurd2bFZx3qQVeJKF2jrc7rsPRNN5cD+i23l6PdA=="; - }; - } - { - name = "aws_sign2___aws_sign2_0.7.0.tgz"; - path = fetchurl { - name = "aws_sign2___aws_sign2_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha512 = "08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="; - }; - } - { - name = "aws4___aws4_1.11.0.tgz"; - path = fetchurl { - name = "aws4___aws4_1.11.0.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz"; - sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; - }; - } - { - name = "balanced_match___balanced_match_1.0.2.tgz"; - path = fetchurl { - name = "balanced_match___balanced_match_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; - sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; - }; - } - { - name = "balanced_match___balanced_match_2.0.0.tgz"; - path = fetchurl { - name = "balanced_match___balanced_match_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz"; - sha512 = "1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA=="; - }; - } - { - name = "base64_js___base64_js_1.5.1.tgz"; - path = fetchurl { - name = "base64_js___base64_js_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; - sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; - }; - } - { - name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; - path = fetchurl { - name = "bcrypt_pbkdf___bcrypt_pbkdf_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha512 = "qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w=="; - }; - } - { - name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; - path = fetchurl { - name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz"; - sha512 = "7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw=="; - }; - } - { - name = "bluebird___bluebird_3.7.2.tgz"; - path = fetchurl { - name = "bluebird___bluebird_3.7.2.tgz"; - url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; - sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; - }; - } - { - name = "bmp_js___bmp_js_0.1.0.tgz"; - path = fetchurl { - name = "bmp_js___bmp_js_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.1.0.tgz"; - sha512 = "vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw=="; - }; - } - { - name = "boolean___boolean_3.2.0.tgz"; - path = fetchurl { - name = "boolean___boolean_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz"; - sha512 = "d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw=="; - }; - } - { - name = "brace_expansion___brace_expansion_1.1.11.tgz"; - path = fetchurl { - name = "brace_expansion___brace_expansion_1.1.11.tgz"; - url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - } - { - name = "brace_expansion___brace_expansion_2.0.1.tgz"; - path = fetchurl { - name = "brace_expansion___brace_expansion_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz"; - sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; - }; - } - { - name = "braces___braces_3.0.2.tgz"; - path = fetchurl { - name = "braces___braces_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; - sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; - }; - } - { - name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; - path = fetchurl { - name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; - sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="; - }; - } - { - name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; - path = fetchurl { - name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; - sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="; - }; - } - { - name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; - path = fetchurl { - name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; - url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha512 = "VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="; - }; - } - { - name = "buffer_equal___buffer_equal_0.0.1.tgz"; - path = fetchurl { - name = "buffer_equal___buffer_equal_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz"; - sha512 = "RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA=="; - }; - } - { - name = "buffer_equal___buffer_equal_1.0.0.tgz"; - path = fetchurl { - name = "buffer_equal___buffer_equal_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; - sha512 = "tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ=="; - }; - } - { - name = "buffer_fill___buffer_fill_1.0.0.tgz"; - path = fetchurl { - name = "buffer_fill___buffer_fill_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz"; - sha512 = "T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ=="; - }; - } - { - name = "buffer_from___buffer_from_1.1.2.tgz"; - path = fetchurl { - name = "buffer_from___buffer_from_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; - sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; - }; - } - { - name = "buffer___buffer_5.7.1.tgz"; - path = fetchurl { - name = "buffer___buffer_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; - sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; - }; - } - { - name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; - path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz"; - sha512 = "azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw=="; - }; - } - { - name = "builder_util___builder_util_23.6.0.tgz"; - path = fetchurl { - name = "builder_util___builder_util_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz"; - sha512 = "QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ=="; - }; - } - { - name = "builtin_modules___builtin_modules_3.3.0.tgz"; - path = fetchurl { - name = "builtin_modules___builtin_modules_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz"; - sha512 = "zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw=="; - }; - } - { - name = "builtins___builtins_5.0.1.tgz"; - path = fetchurl { - name = "builtins___builtins_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz"; - sha512 = "qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ=="; - }; - } - { - name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz"; - path = fetchurl { - name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz"; - url = "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz"; - sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="; - }; - } - { - name = "cacheable_request___cacheable_request_7.0.2.tgz"; - path = fetchurl { - name = "cacheable_request___cacheable_request_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz"; - sha512 = "pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew=="; - }; - } - { - name = "call_bind___call_bind_1.0.2.tgz"; - path = fetchurl { - name = "call_bind___call_bind_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; - sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; - }; - } - { - name = "callsites___callsites_3.1.0.tgz"; - path = fetchurl { - name = "callsites___callsites_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; - sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; - }; - } - { - name = "camelcase_keys___camelcase_keys_6.2.2.tgz"; - path = fetchurl { - name = "camelcase_keys___camelcase_keys_6.2.2.tgz"; - url = "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz"; - sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; - }; - } - { - name = "camelcase_keys___camelcase_keys_8.0.2.tgz"; - path = fetchurl { - name = "camelcase_keys___camelcase_keys_8.0.2.tgz"; - url = "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-8.0.2.tgz"; - sha512 = "qMKdlOfsjlezMqxkUGGMaWWs17i2HoL15tM+wtx8ld4nLrUwU58TFdvyGOz/piNP842KeO8yXvggVQSdQ828NA=="; - }; - } - { - name = "camelcase___camelcase_4.1.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz"; - sha512 = "FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw=="; - }; - } - { - name = "camelcase___camelcase_3.0.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz"; - sha512 = "4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg=="; - }; - } - { - name = "camelcase___camelcase_5.3.1.tgz"; - path = fetchurl { - name = "camelcase___camelcase_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; - sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; - }; - } - { - name = "camelcase___camelcase_7.0.1.tgz"; - path = fetchurl { - name = "camelcase___camelcase_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-7.0.1.tgz"; - sha512 = "xlx1yCK2Oc1APsPXDL2LdlNP6+uu8OCDdhOBSVT279M/S+y75O30C2VuD8T2ogdePBBl7PfPF4504tnLgX3zfw=="; - }; - } - { - name = "caseless___caseless_0.12.0.tgz"; - path = fetchurl { - name = "caseless___caseless_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz"; - sha512 = "4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="; - }; - } - { - name = "chalk___chalk_1.1.3.tgz"; - path = fetchurl { - name = "chalk___chalk_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; - sha512 = "U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A=="; - }; - } - { - name = "chalk___chalk_2.4.2.tgz"; - path = fetchurl { - name = "chalk___chalk_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; - }; - } - { - name = "chalk___chalk_4.1.2.tgz"; - path = fetchurl { - name = "chalk___chalk_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; - sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; - }; - } - { - name = "chownr___chownr_2.0.0.tgz"; - path = fetchurl { - name = "chownr___chownr_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; - sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; - }; - } - { - name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; - path = fetchurl { - name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; - sha512 = "1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw=="; - }; - } - { - name = "ci_info___ci_info_3.3.2.tgz"; - path = fetchurl { - name = "ci_info___ci_info_3.3.2.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.2.tgz"; - sha512 = "xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg=="; - }; - } - { - name = "ci_info___ci_info_3.8.0.tgz"; - path = fetchurl { - name = "ci_info___ci_info_3.8.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz"; - sha512 = "eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw=="; - }; - } - { - name = "clean_regexp___clean_regexp_1.0.0.tgz"; - path = fetchurl { - name = "clean_regexp___clean_regexp_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/clean-regexp/-/clean-regexp-1.0.0.tgz"; - sha512 = "GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw=="; - }; - } - { - name = "cli_truncate___cli_truncate_2.1.0.tgz"; - path = fetchurl { - name = "cli_truncate___cli_truncate_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz"; - sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; - }; - } - { - name = "cliui___cliui_3.2.0.tgz"; - path = fetchurl { - name = "cliui___cliui_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz"; - sha512 = "0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w=="; - }; - } - { - name = "cliui___cliui_8.0.1.tgz"; - path = fetchurl { - name = "cliui___cliui_8.0.1.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz"; - sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; - }; - } - { - name = "clone_regexp___clone_regexp_2.2.0.tgz"; - path = fetchurl { - name = "clone_regexp___clone_regexp_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-2.2.0.tgz"; - sha512 = "beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q=="; - }; - } - { - name = "clone_response___clone_response_1.0.3.tgz"; - path = fetchurl { - name = "clone_response___clone_response_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz"; - sha512 = "ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA=="; - }; - } - { - name = "code_point_at___code_point_at_1.1.0.tgz"; - path = fetchurl { - name = "code_point_at___code_point_at_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; - sha512 = "RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA=="; - }; - } - { - name = "color_convert___color_convert_1.9.3.tgz"; - path = fetchurl { - name = "color_convert___color_convert_1.9.3.tgz"; - url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; - }; - } - { - name = "color_convert___color_convert_2.0.1.tgz"; - path = fetchurl { - name = "color_convert___color_convert_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; - sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; - }; - } - { - name = "color_name___color_name_1.1.3.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; - }; - } - { - name = "color_name___color_name_1.1.4.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; - }; - } - { - name = "colord___colord_2.9.2.tgz"; - path = fetchurl { - name = "colord___colord_2.9.2.tgz"; - url = "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz"; - sha512 = "Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ=="; - }; - } - { - name = "colors___colors_1.0.3.tgz"; - path = fetchurl { - name = "colors___colors_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz"; - sha512 = "pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw=="; - }; - } - { - name = "combined_stream___combined_stream_1.0.8.tgz"; - path = fetchurl { - name = "combined_stream___combined_stream_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; - }; - } - { - name = "commander___commander_2.9.0.tgz"; - path = fetchurl { - name = "commander___commander_2.9.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz"; - sha512 = "bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A=="; - }; - } - { - name = "commander___commander_5.1.0.tgz"; - path = fetchurl { - name = "commander___commander_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz"; - sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; - }; - } - { - name = "common_path_prefix___common_path_prefix_3.0.0.tgz"; - path = fetchurl { - name = "common_path_prefix___common_path_prefix_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz"; - sha512 = "QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w=="; - }; - } - { - name = "compare_version___compare_version_0.1.2.tgz"; - path = fetchurl { - name = "compare_version___compare_version_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz"; - sha512 = "pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A=="; - }; - } - { - name = "concat_map___concat_map_0.0.1.tgz"; - path = fetchurl { - name = "concat_map___concat_map_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; - }; - } - { - name = "concat_stream___concat_stream_1.6.2.tgz"; - path = fetchurl { - name = "concat_stream___concat_stream_1.6.2.tgz"; - url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; - }; - } - { - name = "conf___conf_10.2.0.tgz"; - path = fetchurl { - name = "conf___conf_10.2.0.tgz"; - url = "https://registry.yarnpkg.com/conf/-/conf-10.2.0.tgz"; - sha512 = "8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg=="; - }; - } - { - name = "confusing_browser_globals___confusing_browser_globals_1.0.11.tgz"; - path = fetchurl { - name = "confusing_browser_globals___confusing_browser_globals_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz"; - sha512 = "JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA=="; - }; - } - { - name = "core_util_is___core_util_is_1.0.2.tgz"; - path = fetchurl { - name = "core_util_is___core_util_is_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; - sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; - }; - } - { - name = "core_util_is___core_util_is_1.0.3.tgz"; - path = fetchurl { - name = "core_util_is___core_util_is_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; - sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; - }; - } - { - name = "cosmiconfig___cosmiconfig_7.0.1.tgz"; - path = fetchurl { - name = "cosmiconfig___cosmiconfig_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; - sha512 = "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; - }; - } - { - name = "cosmiconfig___cosmiconfig_7.1.0.tgz"; - path = fetchurl { - name = "cosmiconfig___cosmiconfig_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz"; - sha512 = "AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA=="; - }; - } - { - name = "crc___crc_3.8.0.tgz"; - path = fetchurl { - name = "crc___crc_3.8.0.tgz"; - url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; - sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; - }; - } - { - name = "cross_spawn___cross_spawn_7.0.3.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; - }; - } - { - name = "css_functions_list___css_functions_list_3.1.0.tgz"; - path = fetchurl { - name = "css_functions_list___css_functions_list_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.1.0.tgz"; - sha512 = "/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w=="; - }; - } - { - name = "cssesc___cssesc_3.0.0.tgz"; - path = fetchurl { - name = "cssesc___cssesc_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz"; - sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; - }; - } - { - name = "dashdash___dashdash_1.14.1.tgz"; - path = fetchurl { - name = "dashdash___dashdash_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz"; - sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; - }; - } - { - name = "debounce_fn___debounce_fn_4.0.0.tgz"; - path = fetchurl { - name = "debounce_fn___debounce_fn_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-4.0.0.tgz"; - sha512 = "8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ=="; - }; - } - { - name = "debug___debug_4.3.4.tgz"; - path = fetchurl { - name = "debug___debug_4.3.4.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; - }; - } - { - name = "debug___debug_2.6.9.tgz"; - path = fetchurl { - name = "debug___debug_2.6.9.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; - }; - } - { - name = "debug___debug_3.2.7.tgz"; - path = fetchurl { - name = "debug___debug_3.2.7.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz"; - sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; - }; - } - { - name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; - path = fetchurl { - name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; - sha512 = "ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg=="; - }; - } - { - name = "decamelize___decamelize_1.2.0.tgz"; - path = fetchurl { - name = "decamelize___decamelize_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; - sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; - }; - } - { - name = "decamelize___decamelize_6.0.0.tgz"; - path = fetchurl { - name = "decamelize___decamelize_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/decamelize/-/decamelize-6.0.0.tgz"; - sha512 = "Fv96DCsdOgB6mdGl67MT5JaTNKRzrzill5OH5s8bjYJXVlcXyPYGyPsUkWyGV5p1TXI5esYIYMMeDJL0hEIwaA=="; - }; - } - { - name = "decompress_response___decompress_response_6.0.0.tgz"; - path = fetchurl { - name = "decompress_response___decompress_response_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz"; - sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; - }; - } - { - name = "deep_is___deep_is_0.1.4.tgz"; - path = fetchurl { - name = "deep_is___deep_is_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; - sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; - }; - } - { - name = "defer_to_connect___defer_to_connect_2.0.1.tgz"; - path = fetchurl { - name = "defer_to_connect___defer_to_connect_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz"; - sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; - }; - } - { - name = "define_lazy_prop___define_lazy_prop_2.0.0.tgz"; - path = fetchurl { - name = "define_lazy_prop___define_lazy_prop_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"; - sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; - }; - } - { - name = "define_lazy_prop___define_lazy_prop_3.0.0.tgz"; - path = fetchurl { - name = "define_lazy_prop___define_lazy_prop_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz"; - sha512 = "N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg=="; - }; - } - { - name = "define_properties___define_properties_1.1.4.tgz"; - path = fetchurl { - name = "define_properties___define_properties_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz"; - sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; - }; - } - { - name = "del___del_3.0.0.tgz"; - path = fetchurl { - name = "del___del_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz"; - sha512 = "7yjqSoVSlJzA4t/VUwazuEagGeANEKB3f/aNI//06pfKgwoCb7f6Q1gETN1sZzYaj6chTQ0AhIwDiPdfOjko4A=="; - }; - } - { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; - path = fetchurl { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; - }; - } - { - name = "detect_node___detect_node_2.1.0.tgz"; - path = fetchurl { - name = "detect_node___detect_node_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz"; - sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; - }; - } - { - name = "dir_compare___dir_compare_2.4.0.tgz"; - path = fetchurl { - name = "dir_compare___dir_compare_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz"; - sha512 = "l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA=="; - }; - } - { - name = "dir_glob___dir_glob_3.0.1.tgz"; - path = fetchurl { - name = "dir_glob___dir_glob_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; - sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; - }; - } - { - name = "dmg_builder___dmg_builder_23.6.0.tgz"; - path = fetchurl { - name = "dmg_builder___dmg_builder_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz"; - sha512 = "jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA=="; - }; - } - { - name = "dmg_license___dmg_license_1.0.11.tgz"; - path = fetchurl { - name = "dmg_license___dmg_license_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz"; - sha512 = "ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q=="; - }; - } - { - name = "doctrine___doctrine_2.1.0.tgz"; - path = fetchurl { - name = "doctrine___doctrine_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; - sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; - }; - } - { - name = "doctrine___doctrine_3.0.0.tgz"; - path = fetchurl { - name = "doctrine___doctrine_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; - sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; - }; - } - { - name = "dom_walk___dom_walk_0.1.2.tgz"; - path = fetchurl { - name = "dom_walk___dom_walk_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz"; - sha512 = "6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="; - }; - } - { - name = "dot_prop___dot_prop_6.0.1.tgz"; - path = fetchurl { - name = "dot_prop___dot_prop_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz"; - sha512 = "tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA=="; - }; - } - { - name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; - path = fetchurl { - name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; - sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; - }; - } - { - name = "dotenv___dotenv_9.0.2.tgz"; - path = fetchurl { - name = "dotenv___dotenv_9.0.2.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz"; - sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="; - }; - } - { - name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; - path = fetchurl { - name = "ecc_jsbn___ecc_jsbn_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha512 = "eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw=="; - }; - } - { - name = "ejs___ejs_3.1.8.tgz"; - path = fetchurl { - name = "ejs___ejs_3.1.8.tgz"; - url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz"; - sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; - }; - } - { - name = "electron_builder___electron_builder_23.6.0.tgz"; - path = fetchurl { - name = "electron_builder___electron_builder_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz"; - sha512 = "y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw=="; - }; - } - { - name = "electron_context_menu___electron_context_menu_3.6.1.tgz"; - path = fetchurl { - name = "electron_context_menu___electron_context_menu_3.6.1.tgz"; - url = "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.1.tgz"; - sha512 = "lcpO6tzzKUROeirhzBjdBWNqayEThmdW+2I2s6H6QMrwqTVyT3EK47jW3Nxm60KTxl5/bWfEoIruoUNn57/QkQ=="; - }; - } - { - name = "electron_debug___electron_debug_1.5.0.tgz"; - path = fetchurl { - name = "electron_debug___electron_debug_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/electron-debug/-/electron-debug-1.5.0.tgz"; - sha512 = "23CLHQXW+gMgdlJbeW1EinPX7DpwuLtfdzSuFL0OnsqEhKGJVJufAZTyq2hc3sr+R53rr3P+mJiYoR5VzAHKJQ=="; - }; - } - { - name = "electron_dl___electron_dl_2.0.0.tgz"; - path = fetchurl { - name = "electron_dl___electron_dl_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/electron-dl/-/electron-dl-2.0.0.tgz"; - sha512 = "crv64+Z2ZCsHCoJHBBOypDKx8cy+4jTGMc5/rDDzIajihDN/wITkJOdb6XG8b43YlWr3NS1/r6j+IdwaFNmMiQ=="; - }; - } - { - name = "electron_dl___electron_dl_3.3.1.tgz"; - path = fetchurl { - name = "electron_dl___electron_dl_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.3.1.tgz"; - sha512 = "kmcSYZyHVEHHHFKlZWW58GiCmu2NSu3Rdwnl3+/fr/ftQYHJULVf1QkrCBPFE2bp/Ly113Za7c8wJZs1nBy04A=="; - }; - } - { - name = "electron_icon_maker___electron_icon_maker_0.0.5.tgz"; - path = fetchurl { - name = "electron_icon_maker___electron_icon_maker_0.0.5.tgz"; - url = "https://registry.yarnpkg.com/electron-icon-maker/-/electron-icon-maker-0.0.5.tgz"; - sha512 = "xuNGe26K7jL7p7A7HhZNJFdjuxnPhu8cH0q6PExkG6ifFX6UbsCMUkxvUAh6PGeLOCSG21wEt9i2jPkiZ3ZItg=="; - }; - } - { - name = "electron_is_accelerator___electron_is_accelerator_0.1.2.tgz"; - path = fetchurl { - name = "electron_is_accelerator___electron_is_accelerator_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz"; - sha512 = "fLGSAjXZtdn1sbtZxx52+krefmtNuVwnJCV2gNiVt735/ARUboMl8jnNC9fZEqQdlAv2ZrETfmBUsoQci5evJA=="; - }; - } - { - name = "electron_is_dev___electron_is_dev_0.3.0.tgz"; - path = fetchurl { - name = "electron_is_dev___electron_is_dev_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-0.3.0.tgz"; - sha512 = "jLttuuq8QK67n3mXmIe9pkrO7IH3LGIk12xJkhTmc852U2sCJaRAOpRGPSh+1Xnzck5v9escd9YXzuze9nGejg=="; - }; - } - { - name = "electron_is_dev___electron_is_dev_2.0.0.tgz"; - path = fetchurl { - name = "electron_is_dev___electron_is_dev_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-2.0.0.tgz"; - sha512 = "3X99K852Yoqu9AcW50qz3ibYBWY79/pBhlMCab8ToEWS48R0T9tyxRiQhwylE7zQdXrMnx2JKqUJyMPmt5FBqA=="; - }; - } - { - name = "electron_localshortcut___electron_localshortcut_3.2.1.tgz"; - path = fetchurl { - name = "electron_localshortcut___electron_localshortcut_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/electron-localshortcut/-/electron-localshortcut-3.2.1.tgz"; - sha512 = "DWvhKv36GsdXKnaFFhEiK8kZZA+24/yFLgtTwJJHc7AFgDjNRIBJZ/jq62Y/dWv9E4ypYwrVWN2bVrCYw1uv7Q=="; - }; - } - { - name = "electron_osx_sign___electron_osx_sign_0.6.0.tgz"; - path = fetchurl { - name = "electron_osx_sign___electron_osx_sign_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz"; - sha512 = "+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg=="; - }; - } - { - name = "electron_publish___electron_publish_23.6.0.tgz"; - path = fetchurl { - name = "electron_publish___electron_publish_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz"; - sha512 = "jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg=="; - }; - } - { - name = "electron_store___electron_store_8.1.0.tgz"; - path = fetchurl { - name = "electron_store___electron_store_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/electron-store/-/electron-store-8.1.0.tgz"; - sha512 = "2clHg/juMjOH0GT9cQ6qtmIvK183B39ZXR0bUoPwKwYHJsEF3quqyDzMFUAu+0OP8ijmN2CbPRAelhNbWUbzwA=="; - }; - } - { - name = "electron___electron_22.1.0.tgz"; - path = fetchurl { - name = "electron___electron_22.1.0.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-22.1.0.tgz"; - sha512 = "wz5s4N6V7zyKm4YQmXJImFoxO1Doai32ShYm0FzOLPBMwLMdQBV+REY+j1opRx0KJ9xJEIdjYgcA8OSw6vx3pA=="; - }; - } - { - name = "emoji_regex___emoji_regex_8.0.0.tgz"; - path = fetchurl { - name = "emoji_regex___emoji_regex_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; - }; - } - { - name = "end_of_stream___end_of_stream_1.4.4.tgz"; - path = fetchurl { - name = "end_of_stream___end_of_stream_1.4.4.tgz"; - url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; - }; - } - { - name = "enhance_visitors___enhance_visitors_1.0.0.tgz"; - path = fetchurl { - name = "enhance_visitors___enhance_visitors_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/enhance-visitors/-/enhance-visitors-1.0.0.tgz"; - sha512 = "+29eJLiUixTEDRaZ35Vu8jP3gPLNcQQkQkOQjLp2X+6cZGGPDD/uasbFzvLsJKnGZnvmyZ0srxudwOtskHeIDA=="; - }; - } - { - name = "enhanced_resolve___enhanced_resolve_0.9.1.tgz"; - path = fetchurl { - name = "enhanced_resolve___enhanced_resolve_0.9.1.tgz"; - url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz"; - sha512 = "kxpoMgrdtkXZ5h0SeraBS1iRntpTpQ3R8ussdb38+UAFnMGX5DDyJXePm+OCHOcoXvHDw7mc2erbJBpDnl7TPw=="; - }; - } - { - name = "env_editor___env_editor_1.1.0.tgz"; - path = fetchurl { - name = "env_editor___env_editor_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/env-editor/-/env-editor-1.1.0.tgz"; - sha512 = "7AXskzN6T7Q9TFcKAGJprUbpQa4i1VsAetO9rdBqbGMGlragTziBgWt4pVYJMBWHQlLoX0buy6WFikzPH4Qjpw=="; - }; - } - { - name = "env_paths___env_paths_2.2.1.tgz"; - path = fetchurl { - name = "env_paths___env_paths_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz"; - sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; - }; - } - { - name = "error_ex___error_ex_1.3.2.tgz"; - path = fetchurl { - name = "error_ex___error_ex_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; - sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; - }; - } - { - name = "es_abstract___es_abstract_1.20.1.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.20.1.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz"; - sha512 = "WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA=="; - }; - } - { - name = "es_shim_unscopables___es_shim_unscopables_1.0.0.tgz"; - path = fetchurl { - name = "es_shim_unscopables___es_shim_unscopables_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz"; - sha512 = "Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w=="; - }; - } - { - name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; - path = fetchurl { - name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; - }; - } - { - name = "es6_error___es6_error_4.1.1.tgz"; - path = fetchurl { - name = "es6_error___es6_error_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz"; - sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="; - }; - } - { - name = "es6_promise___es6_promise_4.2.8.tgz"; - path = fetchurl { - name = "es6_promise___es6_promise_4.2.8.tgz"; - url = "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz"; - sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w=="; - }; - } - { - name = "escalade___escalade_3.1.1.tgz"; - path = fetchurl { - name = "escalade___escalade_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; - }; - } - { - name = "escape_goat___escape_goat_2.1.1.tgz"; - path = fetchurl { - name = "escape_goat___escape_goat_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; - sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; - }; - } - { - name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; - path = fetchurl { - name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; - }; - } - { - name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; - path = fetchurl { - name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; - }; - } - { - name = "eslint_config_prettier___eslint_config_prettier_8.5.0.tgz"; - path = fetchurl { - name = "eslint_config_prettier___eslint_config_prettier_8.5.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz"; - sha512 = "obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q=="; - }; - } - { - name = "eslint_config_xo_typescript___eslint_config_xo_typescript_0.55.1.tgz"; - path = fetchurl { - name = "eslint_config_xo_typescript___eslint_config_xo_typescript_0.55.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-xo-typescript/-/eslint-config-xo-typescript-0.55.1.tgz"; - sha512 = "iXua+7n9fOp7LzGzvXlcZG0w6cdtscjASGTrAHMj0Rn9voayxF2oRoMIK1QS6ZJb4fMVEQZdU2D6gTKmWhcCQQ=="; - }; - } - { - name = "eslint_config_xo___eslint_config_xo_0.43.1.tgz"; - path = fetchurl { - name = "eslint_config_xo___eslint_config_xo_0.43.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-xo/-/eslint-config-xo-0.43.1.tgz"; - sha512 = "azv1L2PysRA0NkZOgbndUpN+581L7wPqkgJOgxxw3hxwXAbJgD6Hqb/SjHRiACifXt/AvxCzE/jIKFAlI7XjvQ=="; - }; - } - { - name = "eslint_formatter_pretty___eslint_formatter_pretty_4.1.0.tgz"; - path = fetchurl { - name = "eslint_formatter_pretty___eslint_formatter_pretty_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-formatter-pretty/-/eslint-formatter-pretty-4.1.0.tgz"; - sha512 = "IsUTtGxF1hrH6lMWiSl1WbGaiP01eT6kzywdY1U+zLc0MP+nwEnUiS9UI8IaOTUhTeQJLlCEWIbXINBH4YJbBQ=="; - }; - } - { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.6.tgz"; - path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.6.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz"; - sha512 = "0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw=="; - }; - } - { - name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.13.2.tgz"; - path = fetchurl { - name = "eslint_import_resolver_webpack___eslint_import_resolver_webpack_0.13.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-webpack/-/eslint-import-resolver-webpack-0.13.2.tgz"; - sha512 = "XodIPyg1OgE2h5BDErz3WJoK7lawxKTJNhgPNafRST6csC/MZC+L5P6kKqsZGRInpbgc02s/WZMrb4uGJzcuRg=="; - }; - } - { - name = "eslint_module_utils___eslint_module_utils_2.7.3.tgz"; - path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.7.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz"; - sha512 = "088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ=="; - }; - } - { - name = "eslint_plugin_ava___eslint_plugin_ava_13.2.0.tgz"; - path = fetchurl { - name = "eslint_plugin_ava___eslint_plugin_ava_13.2.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-ava/-/eslint-plugin-ava-13.2.0.tgz"; - sha512 = "i5B5izsEdERKQLruk1nIWzTTE7C26/ju8qQf7JeyRv32XT2lRMW0zMFZNhIrEf5/5VvpSz2rqrV7UcjClGbKsw=="; - }; - } - { - name = "eslint_plugin_es___eslint_plugin_es_4.1.0.tgz"; - path = fetchurl { - name = "eslint_plugin_es___eslint_plugin_es_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-4.1.0.tgz"; - sha512 = "GILhQTnjYE2WorX5Jyi5i4dz5ALWxBIdQECVQavL6s7cI76IZTDWleTHkxz/QT3kvcs2QlGHvKLYsSlPOlPXnQ=="; - }; - } - { - name = "eslint_plugin_eslint_comments___eslint_plugin_eslint_comments_3.2.0.tgz"; - path = fetchurl { - name = "eslint_plugin_eslint_comments___eslint_plugin_eslint_comments_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.2.0.tgz"; - sha512 = "0jkOl0hfojIHHmEHgmNdqv4fmh7300NdpA9FFpF7zaoLvB/QeXOGNLIo86oAveJFrfB1p05kC8hpEMHM8DwWVQ=="; - }; - } - { - name = "eslint_plugin_import___eslint_plugin_import_2.26.0.tgz"; - path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.26.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz"; - sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="; - }; - } - { - name = "eslint_plugin_n___eslint_plugin_n_15.6.1.tgz"; - path = fetchurl { - name = "eslint_plugin_n___eslint_plugin_n_15.6.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-n/-/eslint-plugin-n-15.6.1.tgz"; - sha512 = "R9xw9OtCRxxaxaszTQmQAlPgM+RdGjaL1akWuY/Fv9fRAi8Wj4CUKc6iYVG8QNRjRuo8/BqVYIpfqberJUEacA=="; - }; - } - { - name = "eslint_plugin_no_use_extend_native___eslint_plugin_no_use_extend_native_0.5.0.tgz"; - path = fetchurl { - name = "eslint_plugin_no_use_extend_native___eslint_plugin_no_use_extend_native_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-no-use-extend-native/-/eslint-plugin-no-use-extend-native-0.5.0.tgz"; - sha512 = "dBNjs8hor8rJgeXLH4HTut5eD3RGWf9JUsadIfuL7UosVQ/dnvOKwxEcRrXrFxrMZ8llUVWT+hOimxJABsAUzQ=="; - }; - } - { - name = "eslint_plugin_prettier___eslint_plugin_prettier_4.2.1.tgz"; - path = fetchurl { - name = "eslint_plugin_prettier___eslint_plugin_prettier_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz"; - sha512 = "f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ=="; - }; - } - { - name = "eslint_plugin_unicorn___eslint_plugin_unicorn_44.0.2.tgz"; - path = fetchurl { - name = "eslint_plugin_unicorn___eslint_plugin_unicorn_44.0.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-44.0.2.tgz"; - sha512 = "GLIDX1wmeEqpGaKcnMcqRvMVsoabeF0Ton0EX4Th5u6Kmf7RM9WBl705AXFEsns56ESkEs0uyelLuUTvz9Tr0w=="; - }; - } - { - name = "eslint_rule_docs___eslint_rule_docs_1.1.235.tgz"; - path = fetchurl { - name = "eslint_rule_docs___eslint_rule_docs_1.1.235.tgz"; - url = "https://registry.yarnpkg.com/eslint-rule-docs/-/eslint-rule-docs-1.1.235.tgz"; - sha512 = "+TQ+x4JdTnDoFEXXb3fDvfGOwnyNV7duH8fXWTPD1ieaBmB8omj7Gw/pMBBu4uI2uJCCU8APDaQJzWuXnTsH4A=="; - }; - } - { - name = "eslint_scope___eslint_scope_5.1.1.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; - sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; - }; - } - { - name = "eslint_scope___eslint_scope_7.1.1.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz"; - sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw=="; - }; - } - { - name = "eslint_utils___eslint_utils_2.1.0.tgz"; - path = fetchurl { - name = "eslint_utils___eslint_utils_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; - sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; - }; - } - { - name = "eslint_utils___eslint_utils_3.0.0.tgz"; - path = fetchurl { - name = "eslint_utils___eslint_utils_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz"; - sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; - }; - } - { - name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; - path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; - sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; - }; - } - { - name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; - path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; - sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; - }; - } - { - name = "eslint_visitor_keys___eslint_visitor_keys_3.3.0.tgz"; - path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"; - sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; - }; - } - { - name = "eslint___eslint_8.34.0.tgz"; - path = fetchurl { - name = "eslint___eslint_8.34.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-8.34.0.tgz"; - sha512 = "1Z8iFsucw+7kSqXNZVslXS8Ioa4u2KM7GPwuKtkTFAqZ/cHMcEaR+1+Br0wLlot49cNxIiZk5wp8EAbPcYZxTg=="; - }; - } - { - name = "esm_utils___esm_utils_4.1.1.tgz"; - path = fetchurl { - name = "esm_utils___esm_utils_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/esm-utils/-/esm-utils-4.1.1.tgz"; - sha512 = "cTy4OQgEP/yc7RY3s6EgwMGZ10gAPhCLE9FcrQ6/5bhf37o9PZCFSjzQR1tYb4GaKAEMaW1UmDcMZR13H4p6LQ=="; - }; - } - { - name = "espree___espree_9.3.2.tgz"; - path = fetchurl { - name = "espree___espree_9.3.2.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz"; - sha512 = "D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA=="; - }; - } - { - name = "espree___espree_9.4.1.tgz"; - path = fetchurl { - name = "espree___espree_9.4.1.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz"; - sha512 = "XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg=="; - }; - } - { - name = "espurify___espurify_2.1.1.tgz"; - path = fetchurl { - name = "espurify___espurify_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/espurify/-/espurify-2.1.1.tgz"; - sha512 = "zttWvnkhcDyGOhSH4vO2qCBILpdCMv/MX8lp4cqgRkQoDRGK2oZxi2GfWhlP2dIXmk7BaKeOTuzbHhyC68o8XQ=="; - }; - } - { - name = "esquery___esquery_1.4.0.tgz"; - path = fetchurl { - name = "esquery___esquery_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; - sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; - }; - } - { - name = "esrecurse___esrecurse_4.3.0.tgz"; - path = fetchurl { - name = "esrecurse___esrecurse_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; - sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; - }; - } - { - name = "estraverse___estraverse_4.3.0.tgz"; - path = fetchurl { - name = "estraverse___estraverse_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; - sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; - }; - } - { - name = "estraverse___estraverse_5.3.0.tgz"; - path = fetchurl { - name = "estraverse___estraverse_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz"; - sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; - }; - } - { - name = "esutils___esutils_2.0.3.tgz"; - path = fetchurl { - name = "esutils___esutils_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - } - { - name = "execa___execa_5.1.1.tgz"; - path = fetchurl { - name = "execa___execa_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz"; - sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; - }; - } - { - name = "execall___execall_2.0.0.tgz"; - path = fetchurl { - name = "execall___execall_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/execall/-/execall-2.0.0.tgz"; - sha512 = "0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow=="; - }; - } - { - name = "exif_parser___exif_parser_0.1.12.tgz"; - path = fetchurl { - name = "exif_parser___exif_parser_0.1.12.tgz"; - url = "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz"; - sha512 = "c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw=="; - }; - } - { - name = "ext_list___ext_list_2.2.2.tgz"; - path = fetchurl { - name = "ext_list___ext_list_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz"; - sha512 = "u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA=="; - }; - } - { - name = "ext_name___ext_name_5.0.0.tgz"; - path = fetchurl { - name = "ext_name___ext_name_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz"; - sha512 = "yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ=="; - }; - } - { - name = "extend___extend_3.0.2.tgz"; - path = fetchurl { - name = "extend___extend_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz"; - sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; - }; - } - { - name = "extract_zip___extract_zip_1.7.0.tgz"; - path = fetchurl { - name = "extract_zip___extract_zip_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz"; - sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; - }; - } - { - name = "extract_zip___extract_zip_2.0.1.tgz"; - path = fetchurl { - name = "extract_zip___extract_zip_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; - sha512 = "GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg=="; - }; - } - { - name = "extsprintf___extsprintf_1.3.0.tgz"; - path = fetchurl { - name = "extsprintf___extsprintf_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz"; - sha512 = "11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="; - }; - } - { - name = "extsprintf___extsprintf_1.4.1.tgz"; - path = fetchurl { - name = "extsprintf___extsprintf_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz"; - sha512 = "Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA=="; - }; - } - { - name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; - path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; - }; - } - { - name = "fast_diff___fast_diff_1.2.0.tgz"; - path = fetchurl { - name = "fast_diff___fast_diff_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz"; - sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; - }; - } - { - name = "fast_glob___fast_glob_3.2.11.tgz"; - path = fetchurl { - name = "fast_glob___fast_glob_3.2.11.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz"; - sha512 = "xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew=="; - }; - } - { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; - path = fetchurl { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; - }; - } - { - name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; - path = fetchurl { - name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; - }; - } - { - name = "fastest_levenshtein___fastest_levenshtein_1.0.14.tgz"; - path = fetchurl { - name = "fastest_levenshtein___fastest_levenshtein_1.0.14.tgz"; - url = "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.14.tgz"; - sha512 = "tFfWHjnuUfKE186Tfgr+jtaFc0mZTApEgKDOeyN+FwOqRkO/zK/3h1AiRd8u8CY53owL3CUmGr/oI9p/RdyLTA=="; - }; - } - { - name = "fastq___fastq_1.13.0.tgz"; - path = fetchurl { - name = "fastq___fastq_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz"; - sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; - }; - } - { - name = "fd_slicer___fd_slicer_1.1.0.tgz"; - path = fetchurl { - name = "fd_slicer___fd_slicer_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; - sha512 = "cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g=="; - }; - } - { - name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; - path = fetchurl { - name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; - sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; - }; - } - { - name = "file_type___file_type_9.0.0.tgz"; - path = fetchurl { - name = "file_type___file_type_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/file-type/-/file-type-9.0.0.tgz"; - sha512 = "Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw=="; - }; - } - { - name = "file_url___file_url_2.0.2.tgz"; - path = fetchurl { - name = "file_url___file_url_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/file-url/-/file-url-2.0.2.tgz"; - sha512 = "x3989K8a1jM6vulMigE8VngH7C5nci0Ks5d9kVjUXmNF28gmiZUNujk5HjwaS8dAzN2QmUfX56riJKgN00dNRw=="; - }; - } - { - name = "filelist___filelist_1.0.4.tgz"; - path = fetchurl { - name = "filelist___filelist_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz"; - sha512 = "w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q=="; - }; - } - { - name = "fill_range___fill_range_7.0.1.tgz"; - path = fetchurl { - name = "fill_range___fill_range_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; - }; - } - { - name = "find_cache_dir___find_cache_dir_4.0.0.tgz"; - path = fetchurl { - name = "find_cache_dir___find_cache_dir_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-4.0.0.tgz"; - sha512 = "9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg=="; - }; - } - { - name = "find_root___find_root_1.1.0.tgz"; - path = fetchurl { - name = "find_root___find_root_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz"; - sha512 = "NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="; - }; - } - { - name = "find_up___find_up_1.1.2.tgz"; - path = fetchurl { - name = "find_up___find_up_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz"; - sha512 = "jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA=="; - }; - } - { - name = "find_up___find_up_2.1.0.tgz"; - path = fetchurl { - name = "find_up___find_up_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz"; - sha512 = "NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ=="; - }; - } - { - name = "find_up___find_up_3.0.0.tgz"; - path = fetchurl { - name = "find_up___find_up_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz"; - sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg=="; - }; - } - { - name = "find_up___find_up_4.1.0.tgz"; - path = fetchurl { - name = "find_up___find_up_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; - }; - } - { - name = "find_up___find_up_5.0.0.tgz"; - path = fetchurl { - name = "find_up___find_up_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz"; - sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; - }; - } - { - name = "find_up___find_up_6.3.0.tgz"; - path = fetchurl { - name = "find_up___find_up_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz"; - sha512 = "v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw=="; - }; - } - { - name = "flat_cache___flat_cache_3.0.4.tgz"; - path = fetchurl { - name = "flat_cache___flat_cache_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; - sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; - }; - } - { - name = "flatted___flatted_3.2.5.tgz"; - path = fetchurl { - name = "flatted___flatted_3.2.5.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz"; - sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; - }; - } - { - name = "forever_agent___forever_agent_0.6.1.tgz"; - path = fetchurl { - name = "forever_agent___forever_agent_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz"; - sha512 = "j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="; - }; - } - { - name = "form_data___form_data_4.0.0.tgz"; - path = fetchurl { - name = "form_data___form_data_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz"; - sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; - }; - } - { - name = "form_data___form_data_2.3.3.tgz"; - path = fetchurl { - name = "form_data___form_data_2.3.3.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz"; - sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; - }; - } - { - name = "fs_extra___fs_extra_1.0.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz"; - sha512 = "VerQV6vEKuhDWD2HGOybV6v5I73syoc/cXAbKlgTC7M/oFVEtklWlp9QH2Ijw3IaWDOQcMkldSPa7zXy79Z/UQ=="; - }; - } - { - name = "fs_extra___fs_extra_10.1.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz"; - sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; - }; - } - { - name = "fs_extra___fs_extra_8.1.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; - sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; - }; - } - { - name = "fs_extra___fs_extra_9.1.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; - sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; - }; - } - { - name = "fs_minipass___fs_minipass_2.1.0.tgz"; - path = fetchurl { - name = "fs_minipass___fs_minipass_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; - sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; - }; - } - { - name = "fs.realpath___fs.realpath_1.0.0.tgz"; - path = fetchurl { - name = "fs.realpath___fs.realpath_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - } - { - name = "function_bind___function_bind_1.1.1.tgz"; - path = fetchurl { - name = "function_bind___function_bind_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; - }; - } - { - name = "function.prototype.name___function.prototype.name_1.1.5.tgz"; - path = fetchurl { - name = "function.prototype.name___function.prototype.name_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; - sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; - }; - } - { - name = "functions_have_names___functions_have_names_1.2.3.tgz"; - path = fetchurl { - name = "functions_have_names___functions_have_names_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz"; - sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; - }; - } - { - name = "get_caller_file___get_caller_file_1.0.3.tgz"; - path = fetchurl { - name = "get_caller_file___get_caller_file_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; - sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w=="; - }; - } - { - name = "get_caller_file___get_caller_file_2.0.5.tgz"; - path = fetchurl { - name = "get_caller_file___get_caller_file_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; - }; - } - { - name = "get_intrinsic___get_intrinsic_1.1.2.tgz"; - path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz"; - sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; - }; - } - { - name = "get_set_props___get_set_props_0.1.0.tgz"; - path = fetchurl { - name = "get_set_props___get_set_props_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/get-set-props/-/get-set-props-0.1.0.tgz"; - sha512 = "7oKuKzAGKj0ag+eWZwcGw2fjiZ78tXnXQoBgY0aU7ZOxTu4bB7hSuQSDgtKy978EDH062P5FmD2EWiDpQS9K9Q=="; - }; - } - { - name = "get_stdin___get_stdin_8.0.0.tgz"; - path = fetchurl { - name = "get_stdin___get_stdin_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz"; - sha512 = "sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg=="; - }; - } - { - name = "get_stdin___get_stdin_9.0.0.tgz"; - path = fetchurl { - name = "get_stdin___get_stdin_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-stdin/-/get-stdin-9.0.0.tgz"; - sha512 = "dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA=="; - }; - } - { - name = "get_stream___get_stream_5.2.0.tgz"; - path = fetchurl { - name = "get_stream___get_stream_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; - sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; - }; - } - { - name = "get_stream___get_stream_6.0.1.tgz"; - path = fetchurl { - name = "get_stream___get_stream_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz"; - sha512 = "ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="; - }; - } - { - name = "get_symbol_description___get_symbol_description_1.0.0.tgz"; - path = fetchurl { - name = "get_symbol_description___get_symbol_description_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; - sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; - }; - } - { - name = "getpass___getpass_0.1.7.tgz"; - path = fetchurl { - name = "getpass___getpass_0.1.7.tgz"; - url = "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz"; - sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; - }; - } - { - name = "gifwrap___gifwrap_0.9.4.tgz"; - path = fetchurl { - name = "gifwrap___gifwrap_0.9.4.tgz"; - url = "https://registry.yarnpkg.com/gifwrap/-/gifwrap-0.9.4.tgz"; - sha512 = "MDMwbhASQuVeD4JKd1fKgNgCRL3fGqMM4WaqpNhWO0JiMOAjbQdumbs4BbBZEy9/M00EHEjKN3HieVhCUlwjeQ=="; - }; - } - { - name = "glob_parent___glob_parent_5.1.2.tgz"; - path = fetchurl { - name = "glob_parent___glob_parent_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; - sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; - }; - } - { - name = "glob_parent___glob_parent_6.0.2.tgz"; - path = fetchurl { - name = "glob_parent___glob_parent_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz"; - sha512 = "XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="; - }; - } - { - name = "glob___glob_7.2.3.tgz"; - path = fetchurl { - name = "glob___glob_7.2.3.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; - }; - } - { - name = "global_agent___global_agent_3.0.0.tgz"; - path = fetchurl { - name = "global_agent___global_agent_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz"; - sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; - }; - } - { - name = "global_modules___global_modules_2.0.0.tgz"; - path = fetchurl { - name = "global_modules___global_modules_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; - sha512 = "NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A=="; - }; - } - { - name = "global_prefix___global_prefix_3.0.0.tgz"; - path = fetchurl { - name = "global_prefix___global_prefix_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz"; - sha512 = "awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg=="; - }; - } - { - name = "global___global_4.4.0.tgz"; - path = fetchurl { - name = "global___global_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz"; - sha512 = "wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w=="; - }; - } - { - name = "globals___globals_13.20.0.tgz"; - path = fetchurl { - name = "globals___globals_13.20.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz"; - sha512 = "Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ=="; - }; - } - { - name = "globalthis___globalthis_1.0.3.tgz"; - path = fetchurl { - name = "globalthis___globalthis_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz"; - sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; - }; - } - { - name = "globby___globby_11.1.0.tgz"; - path = fetchurl { - name = "globby___globby_11.1.0.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz"; - sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; - }; - } - { - name = "globby___globby_13.1.3.tgz"; - path = fetchurl { - name = "globby___globby_13.1.3.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-13.1.3.tgz"; - sha512 = "8krCNHXvlCgHDpegPzleMq07yMYTO2sXKASmZmquEYWEmCx6J5UTRbp5RwMJkTJGtcQ44YpiUYUiN0b9mzy8Bw=="; - }; - } - { - name = "globby___globby_6.1.0.tgz"; - path = fetchurl { - name = "globby___globby_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz"; - sha512 = "KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw=="; - }; - } - { - name = "globjoin___globjoin_0.1.4.tgz"; - path = fetchurl { - name = "globjoin___globjoin_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz"; - sha512 = "xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg=="; - }; - } - { - name = "got___got_11.8.6.tgz"; - path = fetchurl { - name = "got___got_11.8.6.tgz"; - url = "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz"; - sha512 = "6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g=="; - }; - } - { - name = "graceful_fs___graceful_fs_4.2.10.tgz"; - path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.10.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; - }; - } - { - name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; - path = fetchurl { - name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha512 = "8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w=="; - }; - } - { - name = "grapheme_splitter___grapheme_splitter_1.0.4.tgz"; - path = fetchurl { - name = "grapheme_splitter___grapheme_splitter_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"; - sha512 = "bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="; - }; - } - { - name = "har_schema___har_schema_2.0.0.tgz"; - path = fetchurl { - name = "har_schema___har_schema_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz"; - sha512 = "Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="; - }; - } - { - name = "har_validator___har_validator_5.1.5.tgz"; - path = fetchurl { - name = "har_validator___har_validator_5.1.5.tgz"; - url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; - sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; - }; - } - { - name = "hard_rejection___hard_rejection_2.1.0.tgz"; - path = fetchurl { - name = "hard_rejection___hard_rejection_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz"; - sha512 = "VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA=="; - }; - } - { - name = "has_ansi___has_ansi_2.0.0.tgz"; - path = fetchurl { - name = "has_ansi___has_ansi_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; - sha512 = "C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg=="; - }; - } - { - name = "has_bigints___has_bigints_1.0.2.tgz"; - path = fetchurl { - name = "has_bigints___has_bigints_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz"; - sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; - }; - } - { - name = "has_flag___has_flag_3.0.0.tgz"; - path = fetchurl { - name = "has_flag___has_flag_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; - }; - } - { - name = "has_flag___has_flag_4.0.0.tgz"; - path = fetchurl { - name = "has_flag___has_flag_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; - }; - } - { - name = "has_property_descriptors___has_property_descriptors_1.0.0.tgz"; - path = fetchurl { - name = "has_property_descriptors___has_property_descriptors_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; - }; - } - { - name = "has_symbols___has_symbols_1.0.3.tgz"; - path = fetchurl { - name = "has_symbols___has_symbols_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz"; - sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; - }; - } - { - name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; - path = fetchurl { - name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; - }; - } - { - name = "has___has_1.0.3.tgz"; - path = fetchurl { - name = "has___has_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; - }; - } - { - name = "hasha___hasha_2.2.0.tgz"; - path = fetchurl { - name = "hasha___hasha_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz"; - sha512 = "jZ38TU/EBiGKrmyTNNZgnvCZHNowiRI4+w/I9noMlekHTZH3KyGgvJLmhSgykeAQ9j2SYPDosM0Bg3wHfzibAQ=="; - }; - } - { - name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; - path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; - sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; - }; - } - { - name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; - path = fetchurl { - name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; - sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; - }; - } - { - name = "hosted_git_info___hosted_git_info_5.2.1.tgz"; - path = fetchurl { - name = "hosted_git_info___hosted_git_info_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-5.2.1.tgz"; - sha512 = "xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw=="; - }; - } - { - name = "html_tags___html_tags_3.2.0.tgz"; - path = fetchurl { - name = "html_tags___html_tags_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/html-tags/-/html-tags-3.2.0.tgz"; - sha512 = "vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg=="; - }; - } - { - name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; - path = fetchurl { - name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; - sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; - }; - } - { - name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; - path = fetchurl { - name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; - sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; - }; - } - { - name = "http_signature___http_signature_1.2.0.tgz"; - path = fetchurl { - name = "http_signature___http_signature_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz"; - sha512 = "CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ=="; - }; - } - { - name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; - path = fetchurl { - name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz"; - sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg=="; - }; - } - { - name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; - path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; - sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; - }; - } - { - name = "human_signals___human_signals_2.1.0.tgz"; - path = fetchurl { - name = "human_signals___human_signals_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz"; - sha512 = "B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw=="; - }; - } - { - name = "icon_gen___icon_gen_2.0.0.tgz"; - path = fetchurl { - name = "icon_gen___icon_gen_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/icon-gen/-/icon-gen-2.0.0.tgz"; - sha512 = "Asj0rWMoFDY3AHLsZdx8UgHX7AIh/9u5ZTXYWJYH+2n8HqHQr655ATdoa1yQLidmm2fnTYlob+Rm4zzrjWr5Bw=="; - }; - } - { - name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; - path = fetchurl { - name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz"; - sha512 = "T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ=="; - }; - } - { - name = "iconv_lite___iconv_lite_0.6.3.tgz"; - path = fetchurl { - name = "iconv_lite___iconv_lite_0.6.3.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; - }; - } - { - name = "ieee754___ieee754_1.2.1.tgz"; - path = fetchurl { - name = "ieee754___ieee754_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; - sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; - }; - } - { - name = "ignore___ignore_5.2.0.tgz"; - path = fetchurl { - name = "ignore___ignore_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz"; - sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; - }; - } - { - name = "image_q___image_q_4.0.0.tgz"; - path = fetchurl { - name = "image_q___image_q_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/image-q/-/image-q-4.0.0.tgz"; - sha512 = "PfJGVgIfKQJuq3s0tTDOKtztksibuUEbJQIYT3by6wctQo+Rdlh7ef4evJ5NCdxY4CfMbvFkocEwbl4BF8RlJw=="; - }; - } - { - name = "import_fresh___import_fresh_3.3.0.tgz"; - path = fetchurl { - name = "import_fresh___import_fresh_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; - sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; - }; - } - { - name = "import_lazy___import_lazy_4.0.0.tgz"; - path = fetchurl { - name = "import_lazy___import_lazy_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz"; - sha512 = "rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw=="; - }; - } - { - name = "import_meta_resolve___import_meta_resolve_2.2.0.tgz"; - path = fetchurl { - name = "import_meta_resolve___import_meta_resolve_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/import-meta-resolve/-/import-meta-resolve-2.2.0.tgz"; - sha512 = "CpPOtiCHxP9HdtDM5F45tNiAe66Cqlv3f5uHoJjt+KlaLrUh9/Wz9vepADZ78SlqEo62aDWZtj9ydMGXV+CPnw=="; - }; - } - { - name = "import_modules___import_modules_2.1.0.tgz"; - path = fetchurl { - name = "import_modules___import_modules_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-modules/-/import-modules-2.1.0.tgz"; - sha512 = "8HEWcnkbGpovH9yInoisxaSoIg9Brbul+Ju3Kqe2UsYDUBJD/iQjSgEj0zPcTDPKfPp2fs5xlv1i+JSye/m1/A=="; - }; - } - { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - path = fetchurl { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; - }; - } - { - name = "indent_string___indent_string_4.0.0.tgz"; - path = fetchurl { - name = "indent_string___indent_string_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; - sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; - }; - } - { - name = "indent_string___indent_string_5.0.0.tgz"; - path = fetchurl { - name = "indent_string___indent_string_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/indent-string/-/indent-string-5.0.0.tgz"; - sha512 = "m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg=="; - }; - } - { - name = "inflight___inflight_1.0.6.tgz"; - path = fetchurl { - name = "inflight___inflight_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - } - { - name = "inherits___inherits_2.0.4.tgz"; - path = fetchurl { - name = "inherits___inherits_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - } - { - name = "ini___ini_1.3.8.tgz"; - path = fetchurl { - name = "ini___ini_1.3.8.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; - sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; - }; - } - { - name = "internal_slot___internal_slot_1.0.3.tgz"; - path = fetchurl { - name = "internal_slot___internal_slot_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; - }; - } - { - name = "interpret___interpret_1.4.0.tgz"; - path = fetchurl { - name = "interpret___interpret_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz"; - sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="; - }; - } - { - name = "invert_kv___invert_kv_1.0.0.tgz"; - path = fetchurl { - name = "invert_kv___invert_kv_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz"; - sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ=="; - }; - } - { - name = "irregular_plurals___irregular_plurals_3.3.0.tgz"; - path = fetchurl { - name = "irregular_plurals___irregular_plurals_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-3.3.0.tgz"; - sha512 = "MVBLKUTangM3EfRPFROhmWQQKRDsrgI83J8GS3jXy+OwYqiR2/aoWndYQ5416jLE3uaGgLH7ncme3X9y09gZ3g=="; - }; - } - { - name = "is_absolute___is_absolute_1.0.0.tgz"; - path = fetchurl { - name = "is_absolute___is_absolute_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz"; - sha512 = "dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA=="; - }; - } - { - name = "is_arrayish___is_arrayish_0.2.1.tgz"; - path = fetchurl { - name = "is_arrayish___is_arrayish_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; - }; - } - { - name = "is_bigint___is_bigint_1.0.4.tgz"; - path = fetchurl { - name = "is_bigint___is_bigint_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz"; - sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; - }; - } - { - name = "is_boolean_object___is_boolean_object_1.1.2.tgz"; - path = fetchurl { - name = "is_boolean_object___is_boolean_object_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; - sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; - }; - } - { - name = "is_builtin_module___is_builtin_module_3.2.1.tgz"; - path = fetchurl { - name = "is_builtin_module___is_builtin_module_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz"; - sha512 = "BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A=="; - }; - } - { - name = "is_callable___is_callable_1.2.4.tgz"; - path = fetchurl { - name = "is_callable___is_callable_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz"; - sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; - }; - } - { - name = "is_ci___is_ci_3.0.1.tgz"; - path = fetchurl { - name = "is_ci___is_ci_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz"; - sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ=="; - }; - } - { - name = "is_core_module___is_core_module_2.11.0.tgz"; - path = fetchurl { - name = "is_core_module___is_core_module_2.11.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz"; - sha512 = "RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw=="; - }; - } - { - name = "is_core_module___is_core_module_2.9.0.tgz"; - path = fetchurl { - name = "is_core_module___is_core_module_2.9.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz"; - sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; - }; - } - { - name = "is_date_object___is_date_object_1.0.5.tgz"; - path = fetchurl { - name = "is_date_object___is_date_object_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz"; - sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; - }; - } - { - name = "is_docker___is_docker_2.2.1.tgz"; - path = fetchurl { - name = "is_docker___is_docker_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz"; - sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; - }; - } - { - name = "is_extglob___is_extglob_2.1.1.tgz"; - path = fetchurl { - name = "is_extglob___is_extglob_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; - sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; - }; - } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha512 = "1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw=="; - }; - } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; - }; - } - { - name = "is_function___is_function_1.0.2.tgz"; - path = fetchurl { - name = "is_function___is_function_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-function/-/is-function-1.0.2.tgz"; - sha512 = "lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="; - }; - } - { - name = "is_get_set_prop___is_get_set_prop_1.0.0.tgz"; - path = fetchurl { - name = "is_get_set_prop___is_get_set_prop_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-get-set-prop/-/is-get-set-prop-1.0.0.tgz"; - sha512 = "DvAYZ1ZgGUz4lzxKMPYlt08qAUqyG9ckSg2pIjfvcQ7+pkVNUHk8yVLXOnCLe5WKXhLop8oorWFBJHpwWQpszQ=="; - }; - } - { - name = "is_glob___is_glob_4.0.3.tgz"; - path = fetchurl { - name = "is_glob___is_glob_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz"; - sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; - }; - } - { - name = "is_js_type___is_js_type_2.0.0.tgz"; - path = fetchurl { - name = "is_js_type___is_js_type_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-js-type/-/is-js-type-2.0.0.tgz"; - sha512 = "Aj13l47+uyTjlQNHtXBV8Cji3jb037vxwMWCgopRR8h6xocgBGW3qG8qGlIOEmbXQtkKShKuBM9e8AA1OeQ+xw=="; - }; - } - { - name = "is_negated_glob___is_negated_glob_1.0.0.tgz"; - path = fetchurl { - name = "is_negated_glob___is_negated_glob_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz"; - sha512 = "czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug=="; - }; - } - { - name = "is_negative_zero___is_negative_zero_2.0.2.tgz"; - path = fetchurl { - name = "is_negative_zero___is_negative_zero_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; - sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; - }; - } - { - name = "is_number_object___is_number_object_1.0.7.tgz"; - path = fetchurl { - name = "is_number_object___is_number_object_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz"; - sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; - }; - } - { - name = "is_number___is_number_7.0.0.tgz"; - path = fetchurl { - name = "is_number___is_number_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; - sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; - }; - } - { - name = "is_obj_prop___is_obj_prop_1.0.0.tgz"; - path = fetchurl { - name = "is_obj_prop___is_obj_prop_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-obj-prop/-/is-obj-prop-1.0.0.tgz"; - sha512 = "5Idb61slRlJlsAzi0Wsfwbp+zZY+9LXKUAZpvT/1ySw+NxKLRWfa0Bzj+wXI3fX5O9hiddm5c3DAaRSNP/yl2w=="; - }; - } - { - name = "is_obj___is_obj_2.0.0.tgz"; - path = fetchurl { - name = "is_obj___is_obj_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; - sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; - }; - } - { - name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; - path = fetchurl { - name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; - sha512 = "cnS56eR9SPAscL77ik76ATVqoPARTqPIVkMDVxRaWH06zT+6+CzIroYRJ0VVvm0Z1zfAvxvz9i/D3Ppjaqt5Nw=="; - }; - } - { - name = "is_path_in_cwd___is_path_in_cwd_1.0.1.tgz"; - path = fetchurl { - name = "is_path_in_cwd___is_path_in_cwd_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz"; - sha512 = "FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ=="; - }; - } - { - name = "is_path_inside___is_path_inside_1.0.1.tgz"; - path = fetchurl { - name = "is_path_inside___is_path_inside_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz"; - sha512 = "qhsCR/Esx4U4hg/9I19OVUAJkGWtjRYHMRgUMZE2TDdj+Ag+kttZanLupfddNyglzz50cUlmWzUaI37GDfNx/g=="; - }; - } - { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - path = fetchurl { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; - }; - } - { - name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; - path = fetchurl { - name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha512 = "yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="; - }; - } - { - name = "is_plain_object___is_plain_object_5.0.0.tgz"; - path = fetchurl { - name = "is_plain_object___is_plain_object_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz"; - sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; - }; - } - { - name = "is_proto_prop___is_proto_prop_2.0.0.tgz"; - path = fetchurl { - name = "is_proto_prop___is_proto_prop_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-proto-prop/-/is-proto-prop-2.0.0.tgz"; - sha512 = "jl3NbQ/fGLv5Jhan4uX+Ge9ohnemqyblWVVCpAvtTQzNFvV2xhJq+esnkIbYQ9F1nITXoLfDDQLp7LBw/zzncg=="; - }; - } - { - name = "is_regex___is_regex_1.1.4.tgz"; - path = fetchurl { - name = "is_regex___is_regex_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz"; - sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; - }; - } - { - name = "is_regexp___is_regexp_2.1.0.tgz"; - path = fetchurl { - name = "is_regexp___is_regexp_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-2.1.0.tgz"; - sha512 = "OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA=="; - }; - } - { - name = "is_relative___is_relative_1.0.0.tgz"; - path = fetchurl { - name = "is_relative___is_relative_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz"; - sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; - }; - } - { - name = "is_shared_array_buffer___is_shared_array_buffer_1.0.2.tgz"; - path = fetchurl { - name = "is_shared_array_buffer___is_shared_array_buffer_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"; - sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; - }; - } - { - name = "is_stream___is_stream_1.1.0.tgz"; - path = fetchurl { - name = "is_stream___is_stream_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; - sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="; - }; - } - { - name = "is_stream___is_stream_2.0.1.tgz"; - path = fetchurl { - name = "is_stream___is_stream_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz"; - sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; - }; - } - { - name = "is_string___is_string_1.0.7.tgz"; - path = fetchurl { - name = "is_string___is_string_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz"; - sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; - }; - } - { - name = "is_symbol___is_symbol_1.0.4.tgz"; - path = fetchurl { - name = "is_symbol___is_symbol_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz"; - sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; - }; - } - { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - path = fetchurl { - name = "is_typedarray___is_typedarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; - }; - } - { - name = "is_unc_path___is_unc_path_1.0.0.tgz"; - path = fetchurl { - name = "is_unc_path___is_unc_path_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz"; - sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; - }; - } - { - name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; - path = fetchurl { - name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; - sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; - }; - } - { - name = "is_utf8___is_utf8_0.2.1.tgz"; - path = fetchurl { - name = "is_utf8___is_utf8_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz"; - sha512 = "rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q=="; - }; - } - { - name = "is_weakref___is_weakref_1.0.2.tgz"; - path = fetchurl { - name = "is_weakref___is_weakref_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz"; - sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; - }; - } - { - name = "is_windows___is_windows_1.0.2.tgz"; - path = fetchurl { - name = "is_windows___is_windows_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"; - sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; - }; - } - { - name = "is_wsl___is_wsl_2.2.0.tgz"; - path = fetchurl { - name = "is_wsl___is_wsl_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; - sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; - }; - } - { - name = "isarray___isarray_1.0.0.tgz"; - path = fetchurl { - name = "isarray___isarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; - }; - } - { - name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; - path = fetchurl { - name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz"; - sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; - }; - } - { - name = "isbinaryfile___isbinaryfile_4.0.10.tgz"; - path = fetchurl { - name = "isbinaryfile___isbinaryfile_4.0.10.tgz"; - url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz"; - sha512 = "iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw=="; - }; - } - { - name = "isexe___isexe_2.0.0.tgz"; - path = fetchurl { - name = "isexe___isexe_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; - }; - } - { - name = "isstream___isstream_0.1.2.tgz"; - path = fetchurl { - name = "isstream___isstream_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz"; - sha512 = "Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="; - }; - } - { - name = "jake___jake_10.8.5.tgz"; - path = fetchurl { - name = "jake___jake_10.8.5.tgz"; - url = "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz"; - sha512 = "sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw=="; - }; - } - { - name = "jimp___jimp_0.14.0.tgz"; - path = fetchurl { - name = "jimp___jimp_0.14.0.tgz"; - url = "https://registry.yarnpkg.com/jimp/-/jimp-0.14.0.tgz"; - sha512 = "8BXU+J8+SPmwwyq9ELihpSV4dWPTiOKBWCEgtkbnxxAVMjXdf3yGmyaLSshBfXc8sP/JQ9OZj5R8nZzz2wPXgA=="; - }; - } - { - name = "jpeg_js___jpeg_js_0.4.4.tgz"; - path = fetchurl { - name = "jpeg_js___jpeg_js_0.4.4.tgz"; - url = "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz"; - sha512 = "WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg=="; - }; - } - { - name = "js_sdsl___js_sdsl_4.3.0.tgz"; - path = fetchurl { - name = "js_sdsl___js_sdsl_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.3.0.tgz"; - sha512 = "mifzlm2+5nZ+lEcLJMoBK0/IH/bDg8XnJfd/Wq6IP+xoCjLZsTOnV2QpxlVbX9bMnkl5PdEjNtBJ9Cj1NjifhQ=="; - }; - } - { - name = "js_tokens___js_tokens_4.0.0.tgz"; - path = fetchurl { - name = "js_tokens___js_tokens_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; - }; - } - { - name = "js_types___js_types_1.0.0.tgz"; - path = fetchurl { - name = "js_types___js_types_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/js-types/-/js-types-1.0.0.tgz"; - sha512 = "bfwqBW9cC/Lp7xcRpug7YrXm0IVw+T9e3g4mCYnv0Pjr3zIzU9PCQElYU9oSGAWzXlbdl9X5SAMPejO9sxkeUw=="; - }; - } - { - name = "js_yaml___js_yaml_4.1.0.tgz"; - path = fetchurl { - name = "js_yaml___js_yaml_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; - sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; - }; - } - { - name = "jsbn___jsbn_0.1.1.tgz"; - path = fetchurl { - name = "jsbn___jsbn_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz"; - sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; - }; - } - { - name = "json_buffer___json_buffer_3.0.1.tgz"; - path = fetchurl { - name = "json_buffer___json_buffer_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz"; - sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="; - }; - } - { - name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; - path = fetchurl { - name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; - sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; - }; - } - { - name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; - path = fetchurl { - name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; - }; - } - { - name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; - path = fetchurl { - name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; - sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; - }; - } - { - name = "json_schema_typed___json_schema_typed_7.0.3.tgz"; - path = fetchurl { - name = "json_schema_typed___json_schema_typed_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.3.tgz"; - sha512 = "7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A=="; - }; - } - { - name = "json_schema___json_schema_0.4.0.tgz"; - path = fetchurl { - name = "json_schema___json_schema_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz"; - sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; - }; - } - { - name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; - path = fetchurl { - name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; - }; - } - { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; - path = fetchurl { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; - }; - } - { - name = "json5___json5_1.0.1.tgz"; - path = fetchurl { - name = "json5___json5_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; - sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; - }; - } - { - name = "json5___json5_2.2.1.tgz"; - path = fetchurl { - name = "json5___json5_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; - }; - } - { - name = "jsonfile___jsonfile_2.4.0.tgz"; - path = fetchurl { - name = "jsonfile___jsonfile_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz"; - sha512 = "PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw=="; - }; - } - { - name = "jsonfile___jsonfile_4.0.0.tgz"; - path = fetchurl { - name = "jsonfile___jsonfile_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha512 = "m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg=="; - }; - } - { - name = "jsonfile___jsonfile_6.1.0.tgz"; - path = fetchurl { - name = "jsonfile___jsonfile_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; - sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; - }; - } - { - name = "jsprim___jsprim_1.4.2.tgz"; - path = fetchurl { - name = "jsprim___jsprim_1.4.2.tgz"; - url = "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz"; - sha512 = "P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw=="; - }; - } - { - name = "kew___kew_0.7.0.tgz"; - path = fetchurl { - name = "kew___kew_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz"; - sha512 = "IG6nm0+QtAMdXt9KvbgbGdvY50RSrw+U4sGZg+KlrSKPJEwVE5JVoI3d7RWfSMdBQneRheeAOj3lIjX5VL/9RQ=="; - }; - } - { - name = "keyboardevent_from_electron_accelerator___keyboardevent_from_electron_accelerator_2.0.0.tgz"; - path = fetchurl { - name = "keyboardevent_from_electron_accelerator___keyboardevent_from_electron_accelerator_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-2.0.0.tgz"; - sha512 = "iQcmNA0M4ETMNi0kG/q0h/43wZk7rMeKYrXP7sqKIJbHkTU8Koowgzv+ieR/vWJbOwxx5nDC3UnudZ0aLSu4VA=="; - }; - } - { - name = "keyboardevents_areequal___keyboardevents_areequal_0.2.2.tgz"; - path = fetchurl { - name = "keyboardevents_areequal___keyboardevents_areequal_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/keyboardevents-areequal/-/keyboardevents-areequal-0.2.2.tgz"; - sha512 = "Nv+Kr33T0mEjxR500q+I6IWisOQ0lK1GGOncV0kWE6n4KFmpcu7RUX5/2B0EUtX51Cb0HjZ9VJsSY3u4cBa0kw=="; - }; - } - { - name = "keyv___keyv_4.5.2.tgz"; - path = fetchurl { - name = "keyv___keyv_4.5.2.tgz"; - url = "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz"; - sha512 = "5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g=="; - }; - } - { - name = "kind_of___kind_of_6.0.3.tgz"; - path = fetchurl { - name = "kind_of___kind_of_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; - sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; - }; - } - { - name = "klaw___klaw_1.3.1.tgz"; - path = fetchurl { - name = "klaw___klaw_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz"; - sha512 = "TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw=="; - }; - } - { - name = "known_css_properties___known_css_properties_0.25.0.tgz"; - path = fetchurl { - name = "known_css_properties___known_css_properties_0.25.0.tgz"; - url = "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.25.0.tgz"; - sha512 = "b0/9J1O9Jcyik1GC6KC42hJ41jKwdO/Mq8Mdo5sYN+IuRTXs2YFHZC3kZSx6ueusqa95x3wLYe/ytKjbAfGixA=="; - }; - } - { - name = "lazy_val___lazy_val_1.0.5.tgz"; - path = fetchurl { - name = "lazy_val___lazy_val_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz"; - sha512 = "0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="; - }; - } - { - name = "lcid___lcid_1.0.0.tgz"; - path = fetchurl { - name = "lcid___lcid_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz"; - sha512 = "YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw=="; - }; - } - { - name = "levn___levn_0.4.1.tgz"; - path = fetchurl { - name = "levn___levn_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; - sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; - }; - } - { - name = "line_column_path___line_column_path_3.0.0.tgz"; - path = fetchurl { - name = "line_column_path___line_column_path_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/line-column-path/-/line-column-path-3.0.0.tgz"; - sha512 = "Atocnm7Wr9nuvAn97yEPQa3pcQI5eLQGBz+m6iTb+CVw+IOzYB9MrYK7jI7BfC9ISnT4Fu0eiwhAScV//rp4Hw=="; - }; - } - { - name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; - path = fetchurl { - name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; - sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; - }; - } - { - name = "load_bmfont___load_bmfont_1.4.1.tgz"; - path = fetchurl { - name = "load_bmfont___load_bmfont_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/load-bmfont/-/load-bmfont-1.4.1.tgz"; - sha512 = "8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA=="; - }; - } - { - name = "load_json_file___load_json_file_1.1.0.tgz"; - path = fetchurl { - name = "load_json_file___load_json_file_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz"; - sha512 = "cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A=="; - }; - } - { - name = "locate_path___locate_path_2.0.0.tgz"; - path = fetchurl { - name = "locate_path___locate_path_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz"; - sha512 = "NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA=="; - }; - } - { - name = "locate_path___locate_path_3.0.0.tgz"; - path = fetchurl { - name = "locate_path___locate_path_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz"; - sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A=="; - }; - } - { - name = "locate_path___locate_path_5.0.0.tgz"; - path = fetchurl { - name = "locate_path___locate_path_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; - }; - } - { - name = "locate_path___locate_path_6.0.0.tgz"; - path = fetchurl { - name = "locate_path___locate_path_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz"; - sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; - }; - } - { - name = "locate_path___locate_path_7.1.1.tgz"; - path = fetchurl { - name = "locate_path___locate_path_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-7.1.1.tgz"; - sha512 = "vJXaRMJgRVD3+cUZs3Mncj2mxpt5mP0EmNOsxRSZRMlbqjvxzDEOIUWXGmavo0ZC9+tNZCBLQ66reA11nbpHZg=="; - }; - } - { - name = "lodash_es___lodash_es_4.17.21.tgz"; - path = fetchurl { - name = "lodash_es___lodash_es_4.17.21.tgz"; - url = "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz"; - sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; - }; - } - { - name = "lodash.merge___lodash.merge_4.6.2.tgz"; - path = fetchurl { - name = "lodash.merge___lodash.merge_4.6.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; - sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; - }; - } - { - name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; - path = fetchurl { - name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; - sha512 = "jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="; - }; - } - { - name = "lodash___lodash_4.17.21.tgz"; - path = fetchurl { - name = "lodash___lodash_4.17.21.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; - sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; - }; - } - { - name = "log_symbols___log_symbols_4.1.0.tgz"; - path = fetchurl { - name = "log_symbols___log_symbols_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz"; - sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; - }; - } - { - name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; - path = fetchurl { - name = "lowercase_keys___lowercase_keys_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz"; - sha512 = "G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA=="; - }; - } - { - name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; - path = fetchurl { - name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; - sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; - }; - } - { - name = "lru_cache___lru_cache_6.0.0.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - } - { - name = "lru_cache___lru_cache_7.17.0.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.17.0.tgz"; - sha512 = "zSxlVVwOabhVyTi6E8gYv2cr6bXK+8ifYz5/uyJb9feXX6NACVDwY4p5Ut3WC3Ivo/QhpARHU3iujx2xGAYHbQ=="; - }; - } - { - name = "map_obj___map_obj_1.0.1.tgz"; - path = fetchurl { - name = "map_obj___map_obj_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz"; - sha512 = "7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="; - }; - } - { - name = "map_obj___map_obj_4.3.0.tgz"; - path = fetchurl { - name = "map_obj___map_obj_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz"; - sha512 = "hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="; - }; - } - { - name = "matcher___matcher_3.0.0.tgz"; - path = fetchurl { - name = "matcher___matcher_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz"; - sha512 = "OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng=="; - }; - } - { - name = "mathml_tag_names___mathml_tag_names_2.1.3.tgz"; - path = fetchurl { - name = "mathml_tag_names___mathml_tag_names_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz"; - sha512 = "APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg=="; - }; - } - { - name = "memory_fs___memory_fs_0.2.0.tgz"; - path = fetchurl { - name = "memory_fs___memory_fs_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz"; - sha512 = "+y4mDxU4rvXXu5UDSGCGNiesFmwCHuefGMoPCO1WYucNYj7DsLqrFaa2fXVI0H+NNiPTwwzKwspn9yTZqUGqng=="; - }; - } - { - name = "meow___meow_11.0.0.tgz"; - path = fetchurl { - name = "meow___meow_11.0.0.tgz"; - url = "https://registry.yarnpkg.com/meow/-/meow-11.0.0.tgz"; - sha512 = "Cl0yeeIrko6d94KpUo1M+0X1sB14ikoaqlIGuTH1fW4I+E3+YljL54/hb/BWmVfrV9tTV9zU04+xjw08Fh2WkA=="; - }; - } - { - name = "meow___meow_9.0.0.tgz"; - path = fetchurl { - name = "meow___meow_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz"; - sha512 = "+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ=="; - }; - } - { - name = "merge_stream___merge_stream_2.0.0.tgz"; - path = fetchurl { - name = "merge_stream___merge_stream_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; - sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; - }; - } - { - name = "merge2___merge2_1.4.1.tgz"; - path = fetchurl { - name = "merge2___merge2_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; - sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; - }; - } - { - name = "micro_spelling_correcter___micro_spelling_correcter_1.1.1.tgz"; - path = fetchurl { - name = "micro_spelling_correcter___micro_spelling_correcter_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/micro-spelling-correcter/-/micro-spelling-correcter-1.1.1.tgz"; - sha512 = "lkJ3Rj/mtjlRcHk6YyCbvZhyWTOzdBvTHsxMmZSk5jxN1YyVSQ+JETAom55mdzfcyDrY/49Z7UCW760BK30crg=="; - }; - } - { - name = "micromatch___micromatch_4.0.5.tgz"; - path = fetchurl { - name = "micromatch___micromatch_4.0.5.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz"; - sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; - }; - } - { - name = "mime_db___mime_db_1.52.0.tgz"; - path = fetchurl { - name = "mime_db___mime_db_1.52.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz"; - sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; - }; - } - { - name = "mime_types___mime_types_2.1.35.tgz"; - path = fetchurl { - name = "mime_types___mime_types_2.1.35.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz"; - sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; - }; - } - { - name = "mime___mime_1.6.0.tgz"; - path = fetchurl { - name = "mime___mime_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz"; - sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; - }; - } - { - name = "mime___mime_2.6.0.tgz"; - path = fetchurl { - name = "mime___mime_2.6.0.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz"; - sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; - }; - } - { - name = "mimic_fn___mimic_fn_2.1.0.tgz"; - path = fetchurl { - name = "mimic_fn___mimic_fn_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; - }; - } - { - name = "mimic_fn___mimic_fn_3.1.0.tgz"; - path = fetchurl { - name = "mimic_fn___mimic_fn_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz"; - sha512 = "Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ=="; - }; - } - { - name = "mimic_response___mimic_response_1.0.1.tgz"; - path = fetchurl { - name = "mimic_response___mimic_response_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; - sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; - }; - } - { - name = "mimic_response___mimic_response_3.1.0.tgz"; - path = fetchurl { - name = "mimic_response___mimic_response_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz"; - sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; - }; - } - { - name = "min_document___min_document_2.19.0.tgz"; - path = fetchurl { - name = "min_document___min_document_2.19.0.tgz"; - url = "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz"; - sha512 = "9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ=="; - }; - } - { - name = "min_indent___min_indent_1.0.1.tgz"; - path = fetchurl { - name = "min_indent___min_indent_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz"; - sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; - }; - } - { - name = "minimatch___minimatch_3.0.4.tgz"; - path = fetchurl { - name = "minimatch___minimatch_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; - }; - } - { - name = "minimatch___minimatch_3.1.2.tgz"; - path = fetchurl { - name = "minimatch___minimatch_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz"; - sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; - }; - } - { - name = "minimatch___minimatch_5.1.0.tgz"; - path = fetchurl { - name = "minimatch___minimatch_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz"; - sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; - }; - } - { - name = "minimist_options___minimist_options_4.1.0.tgz"; - path = fetchurl { - name = "minimist_options___minimist_options_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz"; - sha512 = "Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A=="; - }; - } - { - name = "minimist___minimist_1.2.0.tgz"; - path = fetchurl { - name = "minimist___minimist_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; - sha512 = "7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw=="; - }; - } - { - name = "minimist___minimist_1.2.6.tgz"; - path = fetchurl { - name = "minimist___minimist_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz"; - sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; - }; - } - { - name = "minipass___minipass_3.3.3.tgz"; - path = fetchurl { - name = "minipass___minipass_3.3.3.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-3.3.3.tgz"; - sha512 = "N0BOsdFAlNRfmwMhjAsLVWOk7Ljmeb39iqFlsV1At+jqRhSUP9yeof8FyJu4imaJiSUp8vQebWD/guZwGQC8iA=="; - }; - } - { - name = "minizlib___minizlib_2.1.2.tgz"; - path = fetchurl { - name = "minizlib___minizlib_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; - sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; - }; - } - { - name = "mkdirp___mkdirp_0.5.6.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_0.5.6.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz"; - sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; - }; - } - { - name = "mkdirp___mkdirp_1.0.4.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; - sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; - }; - } - { - name = "modify_filename___modify_filename_1.1.0.tgz"; - path = fetchurl { - name = "modify_filename___modify_filename_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/modify-filename/-/modify-filename-1.1.0.tgz"; - sha512 = "EickqnKq3kVVaZisYuCxhtKbZjInCuwgwZWyAmRIp1NTMhri7r3380/uqwrUHfaDiPzLVTuoNy4whX66bxPVog=="; - }; - } - { - name = "ms___ms_2.0.0.tgz"; - path = fetchurl { - name = "ms___ms_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; - }; - } - { - name = "ms___ms_2.1.2.tgz"; - path = fetchurl { - name = "ms___ms_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - } - { - name = "ms___ms_2.1.3.tgz"; - path = fetchurl { - name = "ms___ms_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; - sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; - }; - } - { - name = "nanoid___nanoid_3.3.4.tgz"; - path = fetchurl { - name = "nanoid___nanoid_3.3.4.tgz"; - url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz"; - sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; - }; - } - { - name = "natural_compare_lite___natural_compare_lite_1.4.0.tgz"; - path = fetchurl { - name = "natural_compare_lite___natural_compare_lite_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"; - sha512 = "Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g=="; - }; - } - { - name = "natural_compare___natural_compare_1.4.0.tgz"; - path = fetchurl { - name = "natural_compare___natural_compare_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; - sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; - }; - } - { - name = "node_addon_api___node_addon_api_1.7.2.tgz"; - path = fetchurl { - name = "node_addon_api___node_addon_api_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz"; - sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg=="; - }; - } - { - name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; - path = fetchurl { - name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; - sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; - }; - } - { - name = "normalize_package_data___normalize_package_data_3.0.3.tgz"; - path = fetchurl { - name = "normalize_package_data___normalize_package_data_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz"; - sha512 = "p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA=="; - }; - } - { - name = "normalize_package_data___normalize_package_data_4.0.1.tgz"; - path = fetchurl { - name = "normalize_package_data___normalize_package_data_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-4.0.1.tgz"; - sha512 = "EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg=="; - }; - } - { - name = "normalize_path___normalize_path_3.0.0.tgz"; - path = fetchurl { - name = "normalize_path___normalize_path_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; - }; - } - { - name = "normalize_url___normalize_url_6.1.0.tgz"; - path = fetchurl { - name = "normalize_url___normalize_url_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz"; - sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; - }; - } - { - name = "npm_run_path___npm_run_path_4.0.1.tgz"; - path = fetchurl { - name = "npm_run_path___npm_run_path_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz"; - sha512 = "S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw=="; - }; - } - { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; - path = fetchurl { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha512 = "4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ=="; - }; - } - { - name = "oauth_sign___oauth_sign_0.9.0.tgz"; - path = fetchurl { - name = "oauth_sign___oauth_sign_0.9.0.tgz"; - url = "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz"; - sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; - }; - } - { - name = "obj_props___obj_props_1.4.0.tgz"; - path = fetchurl { - name = "obj_props___obj_props_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/obj-props/-/obj-props-1.4.0.tgz"; - sha512 = "p7p/7ltzPDiBs6DqxOrIbtRdwxxVRBj5ROukeNb9RgA+fawhrz5n2hpNz8DDmYR//tviJSj7nUnlppGmONkjiQ=="; - }; - } - { - name = "object_assign___object_assign_4.1.1.tgz"; - path = fetchurl { - name = "object_assign___object_assign_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; - sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; - }; - } - { - name = "object_inspect___object_inspect_1.12.2.tgz"; - path = fetchurl { - name = "object_inspect___object_inspect_1.12.2.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz"; - sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; - }; - } - { - name = "object_keys___object_keys_1.1.1.tgz"; - path = fetchurl { - name = "object_keys___object_keys_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - } - { - name = "object.assign___object.assign_4.1.2.tgz"; - path = fetchurl { - name = "object.assign___object.assign_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz"; - sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; - }; - } - { - name = "object.values___object.values_1.1.5.tgz"; - path = fetchurl { - name = "object.values___object.values_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz"; - sha512 = "QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg=="; - }; - } - { - name = "omggif___omggif_1.0.10.tgz"; - path = fetchurl { - name = "omggif___omggif_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/omggif/-/omggif-1.0.10.tgz"; - sha512 = "LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw=="; - }; - } - { - name = "once___once_1.4.0.tgz"; - path = fetchurl { - name = "once___once_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - } - { - name = "onetime___onetime_5.1.2.tgz"; - path = fetchurl { - name = "onetime___onetime_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; - sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; - }; - } - { - name = "open_editor___open_editor_4.0.0.tgz"; - path = fetchurl { - name = "open_editor___open_editor_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/open-editor/-/open-editor-4.0.0.tgz"; - sha512 = "5mKZ98iFdkivozt5XTCOspoKbL3wtYu6oOoVxfWQ0qUX9NYsK8pdkHE7VUHXr+CwyC3nf6mV0S5FPsMS65innw=="; - }; - } - { - name = "open___open_8.4.0.tgz"; - path = fetchurl { - name = "open___open_8.4.0.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz"; - sha512 = "XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q=="; - }; - } - { - name = "optionator___optionator_0.9.1.tgz"; - path = fetchurl { - name = "optionator___optionator_0.9.1.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; - sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; - }; - } - { - name = "os_locale___os_locale_1.4.0.tgz"; - path = fetchurl { - name = "os_locale___os_locale_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz"; - sha512 = "PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g=="; - }; - } - { - name = "p_cancelable___p_cancelable_2.1.1.tgz"; - path = fetchurl { - name = "p_cancelable___p_cancelable_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz"; - sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; - }; - } - { - name = "p_limit___p_limit_1.3.0.tgz"; - path = fetchurl { - name = "p_limit___p_limit_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz"; - sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q=="; - }; - } - { - name = "p_limit___p_limit_2.3.0.tgz"; - path = fetchurl { - name = "p_limit___p_limit_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; - sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; - }; - } - { - name = "p_limit___p_limit_3.1.0.tgz"; - path = fetchurl { - name = "p_limit___p_limit_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; - sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; - }; - } - { - name = "p_limit___p_limit_4.0.0.tgz"; - path = fetchurl { - name = "p_limit___p_limit_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz"; - sha512 = "5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ=="; - }; - } - { - name = "p_locate___p_locate_2.0.0.tgz"; - path = fetchurl { - name = "p_locate___p_locate_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz"; - sha512 = "nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg=="; - }; - } - { - name = "p_locate___p_locate_3.0.0.tgz"; - path = fetchurl { - name = "p_locate___p_locate_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz"; - sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ=="; - }; - } - { - name = "p_locate___p_locate_4.1.0.tgz"; - path = fetchurl { - name = "p_locate___p_locate_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; - }; - } - { - name = "p_locate___p_locate_5.0.0.tgz"; - path = fetchurl { - name = "p_locate___p_locate_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz"; - sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; - }; - } - { - name = "p_locate___p_locate_6.0.0.tgz"; - path = fetchurl { - name = "p_locate___p_locate_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz"; - sha512 = "wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw=="; - }; - } - { - name = "p_map___p_map_1.2.0.tgz"; - path = fetchurl { - name = "p_map___p_map_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz"; - sha512 = "r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA=="; - }; - } - { - name = "p_try___p_try_1.0.0.tgz"; - path = fetchurl { - name = "p_try___p_try_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz"; - sha512 = "U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww=="; - }; - } - { - name = "p_try___p_try_2.2.0.tgz"; - path = fetchurl { - name = "p_try___p_try_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; - sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; - }; - } - { - name = "pako___pako_1.0.11.tgz"; - path = fetchurl { - name = "pako___pako_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz"; - sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; - }; - } - { - name = "parent_module___parent_module_1.0.1.tgz"; - path = fetchurl { - name = "parent_module___parent_module_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; - sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; - }; - } - { - name = "parse_bmfont_ascii___parse_bmfont_ascii_1.0.6.tgz"; - path = fetchurl { - name = "parse_bmfont_ascii___parse_bmfont_ascii_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz"; - sha512 = "U4RrVsUFCleIOBsIGYOMKjn9PavsGOXxbvYGtMOEfnId0SVNsgehXh1DxUdVPLoxd5mvcEtvmKs2Mmf0Mpa1ZA=="; - }; - } - { - name = "parse_bmfont_binary___parse_bmfont_binary_1.0.6.tgz"; - path = fetchurl { - name = "parse_bmfont_binary___parse_bmfont_binary_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz"; - sha512 = "GxmsRea0wdGdYthjuUeWTMWPqm2+FAd4GI8vCvhgJsFnoGhTrLhXDDupwTo7rXVAgaLIGoVHDZS9p/5XbSqeWA=="; - }; - } - { - name = "parse_bmfont_xml___parse_bmfont_xml_1.1.4.tgz"; - path = fetchurl { - name = "parse_bmfont_xml___parse_bmfont_xml_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz"; - sha512 = "bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ=="; - }; - } - { - name = "parse_headers___parse_headers_2.0.5.tgz"; - path = fetchurl { - name = "parse_headers___parse_headers_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.5.tgz"; - sha512 = "ft3iAoLOB/MlwbNXgzy43SWGP6sQki2jQvAyBg/zDFAgr9bfNWZIUj42Kw2eJIl8kEi4PbgE6U1Zau/HwI75HA=="; - }; - } - { - name = "parse_json___parse_json_2.2.0.tgz"; - path = fetchurl { - name = "parse_json___parse_json_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz"; - sha512 = "QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ=="; - }; - } - { - name = "parse_json___parse_json_5.2.0.tgz"; - path = fetchurl { - name = "parse_json___parse_json_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; - sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; - }; - } - { - name = "path_exists___path_exists_2.1.0.tgz"; - path = fetchurl { - name = "path_exists___path_exists_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz"; - sha512 = "yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ=="; - }; - } - { - name = "path_exists___path_exists_3.0.0.tgz"; - path = fetchurl { - name = "path_exists___path_exists_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz"; - sha512 = "bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="; - }; - } - { - name = "path_exists___path_exists_4.0.0.tgz"; - path = fetchurl { - name = "path_exists___path_exists_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; - sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; - }; - } - { - name = "path_exists___path_exists_5.0.0.tgz"; - path = fetchurl { - name = "path_exists___path_exists_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz"; - sha512 = "RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ=="; - }; - } - { - name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; - path = fetchurl { - name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; - }; - } - { - name = "path_is_inside___path_is_inside_1.0.2.tgz"; - path = fetchurl { - name = "path_is_inside___path_is_inside_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz"; - sha512 = "DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w=="; - }; - } - { - name = "path_key___path_key_3.1.1.tgz"; - path = fetchurl { - name = "path_key___path_key_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; - sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; - }; - } - { - name = "path_parse___path_parse_1.0.7.tgz"; - path = fetchurl { - name = "path_parse___path_parse_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; - sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; - }; - } - { - name = "path_type___path_type_1.1.0.tgz"; - path = fetchurl { - name = "path_type___path_type_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz"; - sha512 = "S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg=="; - }; - } - { - name = "path_type___path_type_4.0.0.tgz"; - path = fetchurl { - name = "path_type___path_type_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; - sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; - }; - } - { - name = "pend___pend_1.2.0.tgz"; - path = fetchurl { - name = "pend___pend_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; - sha512 = "F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="; - }; - } - { - name = "performance_now___performance_now_2.1.0.tgz"; - path = fetchurl { - name = "performance_now___performance_now_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; - sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; - }; - } - { - name = "phantomjs_prebuilt___phantomjs_prebuilt_2.1.16.tgz"; - path = fetchurl { - name = "phantomjs_prebuilt___phantomjs_prebuilt_2.1.16.tgz"; - url = "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz"; - sha512 = "PIiRzBhW85xco2fuj41FmsyuYHKjKuXWmhjy3A/Y+CMpN/63TV+s9uzfVhsUwFe0G77xWtHBG8xmXf5BqEUEuQ=="; - }; - } - { - name = "phin___phin_2.9.3.tgz"; - path = fetchurl { - name = "phin___phin_2.9.3.tgz"; - url = "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz"; - sha512 = "CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA=="; - }; - } - { - name = "picocolors___picocolors_1.0.0.tgz"; - path = fetchurl { - name = "picocolors___picocolors_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz"; - sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; - }; - } - { - name = "picomatch___picomatch_2.3.1.tgz"; - path = fetchurl { - name = "picomatch___picomatch_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz"; - sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; - }; - } - { - name = "pify___pify_2.3.0.tgz"; - path = fetchurl { - name = "pify___pify_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; - sha512 = "udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="; - }; - } - { - name = "pify___pify_3.0.0.tgz"; - path = fetchurl { - name = "pify___pify_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz"; - sha512 = "C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="; - }; - } - { - name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; - path = fetchurl { - name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha512 = "0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw=="; - }; - } - { - name = "pinkie___pinkie_2.0.4.tgz"; - path = fetchurl { - name = "pinkie___pinkie_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"; - sha512 = "MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg=="; - }; - } - { - name = "pixelmatch___pixelmatch_4.0.2.tgz"; - path = fetchurl { - name = "pixelmatch___pixelmatch_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz"; - sha512 = "J8B6xqiO37sU/gkcMglv6h5Jbd9xNER7aHzpfRdNmV4IbQBzBpe4l9XmbG+xPF/znacgu2jfEw+wHffaq/YkXA=="; - }; - } - { - name = "pkg_dir___pkg_dir_5.0.0.tgz"; - path = fetchurl { - name = "pkg_dir___pkg_dir_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-5.0.0.tgz"; - sha512 = "NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA=="; - }; - } - { - name = "pkg_dir___pkg_dir_7.0.0.tgz"; - path = fetchurl { - name = "pkg_dir___pkg_dir_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-7.0.0.tgz"; - sha512 = "Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA=="; - }; - } - { - name = "pkg_up___pkg_up_3.1.0.tgz"; - path = fetchurl { - name = "pkg_up___pkg_up_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz"; - sha512 = "nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA=="; - }; - } - { - name = "pkginfo___pkginfo_0.4.0.tgz"; - path = fetchurl { - name = "pkginfo___pkginfo_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.0.tgz"; - sha512 = "PvRaVdb+mc4R87WFh2Xc7t41brwIgRFSNoDmRyG0cAov6IfnFARp0GHxU8wP5Uh4IWduQSJsRPSwaKDjgMremg=="; - }; - } - { - name = "plist___plist_3.0.5.tgz"; - path = fetchurl { - name = "plist___plist_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/plist/-/plist-3.0.5.tgz"; - sha512 = "83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA=="; - }; - } - { - name = "plur___plur_4.0.0.tgz"; - path = fetchurl { - name = "plur___plur_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/plur/-/plur-4.0.0.tgz"; - sha512 = "4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg=="; - }; - } - { - name = "pluralize___pluralize_8.0.0.tgz"; - path = fetchurl { - name = "pluralize___pluralize_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz"; - sha512 = "Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA=="; - }; - } - { - name = "pn___pn_1.1.0.tgz"; - path = fetchurl { - name = "pn___pn_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz"; - sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="; - }; - } - { - name = "pngjs_nozlib___pngjs_nozlib_1.0.0.tgz"; - path = fetchurl { - name = "pngjs_nozlib___pngjs_nozlib_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/pngjs-nozlib/-/pngjs-nozlib-1.0.0.tgz"; - sha512 = "N1PggqLp9xDqwAoKvGohmZ3m4/N9xpY0nDZivFqQLcpLHmliHnCp9BuNCsOeqHWMuEEgFjpEaq9dZq6RZyy0fA=="; - }; - } - { - name = "pngjs___pngjs_3.4.0.tgz"; - path = fetchurl { - name = "pngjs___pngjs_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz"; - sha512 = "NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w=="; - }; - } - { - name = "postcss_media_query_parser___postcss_media_query_parser_0.2.3.tgz"; - path = fetchurl { - name = "postcss_media_query_parser___postcss_media_query_parser_0.2.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz"; - sha512 = "3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig=="; - }; - } - { - name = "postcss_resolve_nested_selector___postcss_resolve_nested_selector_0.1.1.tgz"; - path = fetchurl { - name = "postcss_resolve_nested_selector___postcss_resolve_nested_selector_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz"; - sha512 = "HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw=="; - }; - } - { - name = "postcss_safe_parser___postcss_safe_parser_6.0.0.tgz"; - path = fetchurl { - name = "postcss_safe_parser___postcss_safe_parser_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz"; - sha512 = "FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ=="; - }; - } - { - name = "postcss_selector_parser___postcss_selector_parser_6.0.10.tgz"; - path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.10.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz"; - sha512 = "IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w=="; - }; - } - { - name = "postcss_value_parser___postcss_value_parser_4.2.0.tgz"; - path = fetchurl { - name = "postcss_value_parser___postcss_value_parser_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"; - sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="; - }; - } - { - name = "postcss___postcss_8.4.14.tgz"; - path = fetchurl { - name = "postcss___postcss_8.4.14.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz"; - sha512 = "E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig=="; - }; - } - { - name = "prelude_ls___prelude_ls_1.2.1.tgz"; - path = fetchurl { - name = "prelude_ls___prelude_ls_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; - sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; - }; - } - { - name = "prettier_linter_helpers___prettier_linter_helpers_1.0.0.tgz"; - path = fetchurl { - name = "prettier_linter_helpers___prettier_linter_helpers_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; - sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; - }; - } - { - name = "prettier___prettier_2.8.4.tgz"; - path = fetchurl { - name = "prettier___prettier_2.8.4.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-2.8.4.tgz"; - sha512 = "vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw=="; - }; - } - { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - path = fetchurl { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; - }; - } - { - name = "process___process_0.11.10.tgz"; - path = fetchurl { - name = "process___process_0.11.10.tgz"; - url = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz"; - sha512 = "cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="; - }; - } - { - name = "progress___progress_1.1.8.tgz"; - path = fetchurl { - name = "progress___progress_1.1.8.tgz"; - url = "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz"; - sha512 = "UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw=="; - }; - } - { - name = "progress___progress_2.0.3.tgz"; - path = fetchurl { - name = "progress___progress_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; - sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; - }; - } - { - name = "proto_props___proto_props_2.0.0.tgz"; - path = fetchurl { - name = "proto_props___proto_props_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/proto-props/-/proto-props-2.0.0.tgz"; - sha512 = "2yma2tog9VaRZY2mn3Wq51uiSW4NcPYT1cQdBagwyrznrilKSZwIZ0UG3ZPL/mx+axEns0hE35T5ufOYZXEnBQ=="; - }; - } - { - name = "psl___psl_1.8.0.tgz"; - path = fetchurl { - name = "psl___psl_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; - sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; - }; - } - { - name = "pump___pump_3.0.0.tgz"; - path = fetchurl { - name = "pump___pump_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; - }; - } - { - name = "punycode___punycode_2.1.1.tgz"; - path = fetchurl { - name = "punycode___punycode_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; - }; - } - { - name = "pupa___pupa_2.1.1.tgz"; - path = fetchurl { - name = "pupa___pupa_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz"; - sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; - }; - } - { - name = "qs___qs_6.5.3.tgz"; - path = fetchurl { - name = "qs___qs_6.5.3.tgz"; - url = "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz"; - sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; - }; - } - { - name = "queue_microtask___queue_microtask_1.2.3.tgz"; - path = fetchurl { - name = "queue_microtask___queue_microtask_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"; - sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; - }; - } - { - name = "quick_lru___quick_lru_4.0.1.tgz"; - path = fetchurl { - name = "quick_lru___quick_lru_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz"; - sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; - }; - } - { - name = "quick_lru___quick_lru_5.1.1.tgz"; - path = fetchurl { - name = "quick_lru___quick_lru_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz"; - sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; - }; - } - { - name = "quick_lru___quick_lru_6.1.1.tgz"; - path = fetchurl { - name = "quick_lru___quick_lru_6.1.1.tgz"; - url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-6.1.1.tgz"; - sha512 = "S27GBT+F0NTRiehtbrgaSE1idUAJ5bX8dPAQTdylEyNlrdcH5X4Lz7Edz3DYzecbsCluD5zO8ZNEe04z3D3u6Q=="; - }; - } - { - name = "read_config_file___read_config_file_6.2.0.tgz"; - path = fetchurl { - name = "read_config_file___read_config_file_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz"; - sha512 = "gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg=="; - }; - } - { - name = "read_pkg_up___read_pkg_up_1.0.1.tgz"; - path = fetchurl { - name = "read_pkg_up___read_pkg_up_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; - sha512 = "WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A=="; - }; - } - { - name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; - path = fetchurl { - name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; - sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; - }; - } - { - name = "read_pkg_up___read_pkg_up_9.1.0.tgz"; - path = fetchurl { - name = "read_pkg_up___read_pkg_up_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-9.1.0.tgz"; - sha512 = "vaMRR1AC1nrd5CQM0PhlRsO5oc2AAigqr7cCrZ/MW/Rsaflz4RlgzkpL4qoU/z1F6wrbd85iFv1OQj/y5RdGvg=="; - }; - } - { - name = "read_pkg___read_pkg_1.1.0.tgz"; - path = fetchurl { - name = "read_pkg___read_pkg_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz"; - sha512 = "7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ=="; - }; - } - { - name = "read_pkg___read_pkg_5.2.0.tgz"; - path = fetchurl { - name = "read_pkg___read_pkg_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; - sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; - }; - } - { - name = "read_pkg___read_pkg_7.1.0.tgz"; - path = fetchurl { - name = "read_pkg___read_pkg_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-7.1.0.tgz"; - sha512 = "5iOehe+WF75IccPc30bWTbpdDQLOCc3Uu8bi3Dte3Eueij81yx1Mrufk8qBx/YAbR4uL1FdUr+7BKXDwEtisXg=="; - }; - } - { - name = "readable_stream___readable_stream_2.3.7.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_2.3.7.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; - }; - } - { - name = "redent___redent_3.0.0.tgz"; - path = fetchurl { - name = "redent___redent_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz"; - sha512 = "6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg=="; - }; - } - { - name = "redent___redent_4.0.0.tgz"; - path = fetchurl { - name = "redent___redent_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/redent/-/redent-4.0.0.tgz"; - sha512 = "tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag=="; - }; - } - { - name = "regenerator_runtime___regenerator_runtime_0.13.9.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.9.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; - sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; - }; - } - { - name = "regexp_tree___regexp_tree_0.1.24.tgz"; - path = fetchurl { - name = "regexp_tree___regexp_tree_0.1.24.tgz"; - url = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.24.tgz"; - sha512 = "s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw=="; - }; - } - { - name = "regexp.prototype.flags___regexp.prototype.flags_1.4.3.tgz"; - path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; - sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; - }; - } - { - name = "regexpp___regexpp_3.2.0.tgz"; - path = fetchurl { - name = "regexpp___regexpp_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; - sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; - }; - } - { - name = "request_progress___request_progress_2.0.1.tgz"; - path = fetchurl { - name = "request_progress___request_progress_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz"; - sha512 = "dxdraeZVUNEn9AvLrxkgB2k6buTlym71dJk1fk4v8j3Ou3RKNm07BcgbHdj2lLgYGfqX71F+awb1MR+tWPFJzA=="; - }; - } - { - name = "request___request_2.88.2.tgz"; - path = fetchurl { - name = "request___request_2.88.2.tgz"; - url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; - sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; - }; - } - { - name = "require_directory___require_directory_2.1.1.tgz"; - path = fetchurl { - name = "require_directory___require_directory_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; - sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; - }; - } - { - name = "require_from_string___require_from_string_2.0.2.tgz"; - path = fetchurl { - name = "require_from_string___require_from_string_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; - sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; - }; - } - { - name = "require_main_filename___require_main_filename_1.0.1.tgz"; - path = fetchurl { - name = "require_main_filename___require_main_filename_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha512 = "IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug=="; - }; - } - { - name = "resolve_alpn___resolve_alpn_1.2.1.tgz"; - path = fetchurl { - name = "resolve_alpn___resolve_alpn_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz"; - sha512 = "0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="; - }; - } - { - name = "resolve_from___resolve_from_4.0.0.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; - sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; - }; - } - { - name = "resolve_from___resolve_from_5.0.0.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; - sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; - }; - } - { - name = "resolve___resolve_1.22.1.tgz"; - path = fetchurl { - name = "resolve___resolve_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz"; - sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; - }; - } - { - name = "responselike___responselike_2.0.1.tgz"; - path = fetchurl { - name = "responselike___responselike_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz"; - sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="; - }; - } - { - name = "reusify___reusify_1.0.4.tgz"; - path = fetchurl { - name = "reusify___reusify_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; - sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; - }; - } - { - name = "rimraf___rimraf_2.7.1.tgz"; - path = fetchurl { - name = "rimraf___rimraf_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz"; - sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; - }; - } - { - name = "rimraf___rimraf_3.0.2.tgz"; - path = fetchurl { - name = "rimraf___rimraf_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; - sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; - }; - } - { - name = "roarr___roarr_2.15.4.tgz"; - path = fetchurl { - name = "roarr___roarr_2.15.4.tgz"; - url = "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz"; - sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; - }; - } - { - name = "run_parallel___run_parallel_1.2.0.tgz"; - path = fetchurl { - name = "run_parallel___run_parallel_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; - sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; - }; - } - { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; - }; - } - { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; - }; - } - { - name = "safe_regex___safe_regex_2.1.1.tgz"; - path = fetchurl { - name = "safe_regex___safe_regex_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-2.1.1.tgz"; - sha512 = "rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A=="; - }; - } - { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - path = fetchurl { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - } - { - name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; - path = fetchurl { - name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; - url = "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz"; - sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; - }; - } - { - name = "sax___sax_1.2.4.tgz"; - path = fetchurl { - name = "sax___sax_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; - }; - } - { - name = "semver_compare___semver_compare_1.0.0.tgz"; - path = fetchurl { - name = "semver_compare___semver_compare_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; - sha512 = "YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="; - }; - } - { - name = "semver___semver_5.7.1.tgz"; - path = fetchurl { - name = "semver___semver_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; - }; - } - { - name = "semver___semver_6.3.0.tgz"; - path = fetchurl { - name = "semver___semver_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; - }; - } - { - name = "semver___semver_7.3.7.tgz"; - path = fetchurl { - name = "semver___semver_7.3.7.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz"; - sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; - }; - } - { - name = "semver___semver_7.3.8.tgz"; - path = fetchurl { - name = "semver___semver_7.3.8.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz"; - sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; - }; - } - { - name = "semver___semver_7.0.0.tgz"; - path = fetchurl { - name = "semver___semver_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; - sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; - }; - } - { - name = "serialize_error___serialize_error_7.0.1.tgz"; - path = fetchurl { - name = "serialize_error___serialize_error_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz"; - sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; - }; - } - { - name = "set_blocking___set_blocking_2.0.0.tgz"; - path = fetchurl { - name = "set_blocking___set_blocking_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; - sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; - }; - } - { - name = "shebang_command___shebang_command_2.0.0.tgz"; - path = fetchurl { - name = "shebang_command___shebang_command_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; - sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; - }; - } - { - name = "shebang_regex___shebang_regex_3.0.0.tgz"; - path = fetchurl { - name = "shebang_regex___shebang_regex_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; - }; - } - { - name = "side_channel___side_channel_1.0.4.tgz"; - path = fetchurl { - name = "side_channel___side_channel_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz"; - sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; - }; - } - { - name = "signal_exit___signal_exit_3.0.7.tgz"; - path = fetchurl { - name = "signal_exit___signal_exit_3.0.7.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz"; - sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; - }; - } - { - name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz"; - path = fetchurl { - name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz"; - sha512 = "VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg=="; - }; - } - { - name = "slash___slash_3.0.0.tgz"; - path = fetchurl { - name = "slash___slash_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; - sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; - }; - } - { - name = "slash___slash_4.0.0.tgz"; - path = fetchurl { - name = "slash___slash_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz"; - sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; - }; - } - { - name = "slash___slash_5.0.0.tgz"; - path = fetchurl { - name = "slash___slash_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/slash/-/slash-5.0.0.tgz"; - sha512 = "n6KkmvKS0623igEVj3FF0OZs1gYYJ0o0Hj939yc1fyxl2xt+xYpLnzJB6xBSqOfV9ZFLEWodBBN/heZJahuIJQ=="; - }; - } - { - name = "slice_ansi___slice_ansi_3.0.0.tgz"; - path = fetchurl { - name = "slice_ansi___slice_ansi_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz"; - sha512 = "pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="; - }; - } - { - name = "slice_ansi___slice_ansi_4.0.0.tgz"; - path = fetchurl { - name = "slice_ansi___slice_ansi_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; - sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; - }; - } - { - name = "smart_buffer___smart_buffer_4.2.0.tgz"; - path = fetchurl { - name = "smart_buffer___smart_buffer_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; - sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; - }; - } - { - name = "sort_keys_length___sort_keys_length_1.0.1.tgz"; - path = fetchurl { - name = "sort_keys_length___sort_keys_length_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz"; - sha512 = "GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw=="; - }; - } - { - name = "sort_keys___sort_keys_1.1.2.tgz"; - path = fetchurl { - name = "sort_keys___sort_keys_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz"; - sha512 = "vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg=="; - }; - } - { - name = "source_map_js___source_map_js_1.0.2.tgz"; - path = fetchurl { - name = "source_map_js___source_map_js_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz"; - sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; - }; - } - { - name = "source_map_support___source_map_support_0.5.21.tgz"; - path = fetchurl { - name = "source_map_support___source_map_support_0.5.21.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz"; - sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; - }; - } - { - name = "source_map___source_map_0.6.1.tgz"; - path = fetchurl { - name = "source_map___source_map_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; - }; - } - { - name = "spdx_correct___spdx_correct_3.1.1.tgz"; - path = fetchurl { - name = "spdx_correct___spdx_correct_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; - sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; - }; - } - { - name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; - path = fetchurl { - name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; - sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; - }; - } - { - name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; - path = fetchurl { - name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; - sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; - }; - } - { - name = "spdx_license_ids___spdx_license_ids_3.0.11.tgz"; - path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.11.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"; - sha512 = "Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="; - }; - } - { - name = "sprintf_js___sprintf_js_1.1.2.tgz"; - path = fetchurl { - name = "sprintf_js___sprintf_js_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz"; - sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; - }; - } - { - name = "sshpk___sshpk_1.17.0.tgz"; - path = fetchurl { - name = "sshpk___sshpk_1.17.0.tgz"; - url = "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz"; - sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; - }; - } - { - name = "stat_mode___stat_mode_1.0.0.tgz"; - path = fetchurl { - name = "stat_mode___stat_mode_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz"; - sha512 = "jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg=="; - }; - } - { - name = "string_similarity___string_similarity_1.1.0.tgz"; - path = fetchurl { - name = "string_similarity___string_similarity_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/string-similarity/-/string-similarity-1.1.0.tgz"; - sha512 = "x+Ul/yDujT1PIgcKuP6NP71VgoB+NKY8ccoH2nrfnFcYH2gtoRE0XLpUaHBIx4ZdpIWnYzWAsjp2QO+ZRC3Fjg=="; - }; - } - { - name = "string_width___string_width_1.0.2.tgz"; - path = fetchurl { - name = "string_width___string_width_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; - sha512 = "0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw=="; - }; - } - { - name = "string_width___string_width_4.2.3.tgz"; - path = fetchurl { - name = "string_width___string_width_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; - sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; - }; - } - { - name = "string.prototype.trimend___string.prototype.trimend_1.0.5.tgz"; - path = fetchurl { - name = "string.prototype.trimend___string.prototype.trimend_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; - sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; - }; - } - { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.5.tgz"; - path = fetchurl { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; - sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; - }; - } - { - name = "string_decoder___string_decoder_1.1.1.tgz"; - path = fetchurl { - name = "string_decoder___string_decoder_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; - }; - } - { - name = "strip_ansi___strip_ansi_3.0.1.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="; - }; - } - { - name = "strip_ansi___strip_ansi_6.0.1.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; - }; - } - { - name = "strip_bom___strip_bom_2.0.0.tgz"; - path = fetchurl { - name = "strip_bom___strip_bom_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz"; - sha512 = "kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g=="; - }; - } - { - name = "strip_bom___strip_bom_3.0.0.tgz"; - path = fetchurl { - name = "strip_bom___strip_bom_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz"; - sha512 = "vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="; - }; - } - { - name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; - path = fetchurl { - name = "strip_final_newline___strip_final_newline_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; - sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; - }; - } - { - name = "strip_indent___strip_indent_3.0.0.tgz"; - path = fetchurl { - name = "strip_indent___strip_indent_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz"; - sha512 = "laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ=="; - }; - } - { - name = "strip_indent___strip_indent_4.0.0.tgz"; - path = fetchurl { - name = "strip_indent___strip_indent_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-4.0.0.tgz"; - sha512 = "mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA=="; - }; - } - { - name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; - path = fetchurl { - name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; - sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; - }; - } - { - name = "style_search___style_search_0.1.0.tgz"; - path = fetchurl { - name = "style_search___style_search_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz"; - sha512 = "Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg=="; - }; - } - { - name = "stylelint___stylelint_14.9.1.tgz"; - path = fetchurl { - name = "stylelint___stylelint_14.9.1.tgz"; - url = "https://registry.yarnpkg.com/stylelint/-/stylelint-14.9.1.tgz"; - sha512 = "RdAkJdPiLqHawCSnu21nE27MjNXaVd4WcOHA4vK5GtIGjScfhNnaOuWR2wWdfKFAvcWQPOYe311iveiVKSmwsA=="; - }; - } - { - name = "sumchecker___sumchecker_3.0.1.tgz"; - path = fetchurl { - name = "sumchecker___sumchecker_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz"; - sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg=="; - }; - } - { - name = "supports_color___supports_color_2.0.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; - sha512 = "KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g=="; - }; - } - { - name = "supports_color___supports_color_5.5.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; - }; - } - { - name = "supports_color___supports_color_7.2.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; - sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; - }; - } - { - name = "supports_hyperlinks___supports_hyperlinks_2.2.0.tgz"; - path = fetchurl { - name = "supports_hyperlinks___supports_hyperlinks_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz"; - sha512 = "6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ=="; - }; - } - { - name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; - path = fetchurl { - name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; - sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; - }; - } - { - name = "svg_tags___svg_tags_1.0.0.tgz"; - path = fetchurl { - name = "svg_tags___svg_tags_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz"; - sha512 = "ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA=="; - }; - } - { - name = "svg2png___svg2png_4.1.1.tgz"; - path = fetchurl { - name = "svg2png___svg2png_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/svg2png/-/svg2png-4.1.1.tgz"; - sha512 = "9tOp9Ugjlunuf1ugqkhiYboTmTaTI7p48dz5ZjNA5NQJ5xS1NLTZZ1tF8vkJOIBb/ZwxGJsKZvRWqVpo4q9z9Q=="; - }; - } - { - name = "table___table_6.8.0.tgz"; - path = fetchurl { - name = "table___table_6.8.0.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.8.0.tgz"; - sha512 = "s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA=="; - }; - } - { - name = "tapable___tapable_0.1.10.tgz"; - path = fetchurl { - name = "tapable___tapable_0.1.10.tgz"; - url = "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz"; - sha512 = "jX8Et4hHg57mug1/079yitEKWGB3LCwoxByLsNim89LABq8NqgiX+6iYVOsq0vX8uJHkU+DZ5fnq95f800bEsQ=="; - }; - } - { - name = "tar___tar_6.1.11.tgz"; - path = fetchurl { - name = "tar___tar_6.1.11.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz"; - sha512 = "an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA=="; - }; - } - { - name = "temp_file___temp_file_3.4.0.tgz"; - path = fetchurl { - name = "temp_file___temp_file_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz"; - sha512 = "C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg=="; - }; - } - { - name = "text_table___text_table_0.2.0.tgz"; - path = fetchurl { - name = "text_table___text_table_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; - sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; - }; - } - { - name = "throttleit___throttleit_1.0.0.tgz"; - path = fetchurl { - name = "throttleit___throttleit_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz"; - sha512 = "rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g=="; - }; - } - { - name = "timm___timm_1.7.1.tgz"; - path = fetchurl { - name = "timm___timm_1.7.1.tgz"; - url = "https://registry.yarnpkg.com/timm/-/timm-1.7.1.tgz"; - sha512 = "IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw=="; - }; - } - { - name = "tinycolor2___tinycolor2_1.4.2.tgz"; - path = fetchurl { - name = "tinycolor2___tinycolor2_1.4.2.tgz"; - url = "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.4.2.tgz"; - sha512 = "vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="; - }; - } - { - name = "tmp_promise___tmp_promise_3.0.3.tgz"; - path = fetchurl { - name = "tmp_promise___tmp_promise_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz"; - sha512 = "RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ=="; - }; - } - { - name = "tmp___tmp_0.2.1.tgz"; - path = fetchurl { - name = "tmp___tmp_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz"; - sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; - }; - } - { - name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz"; - path = fetchurl { - name = "to_absolute_glob___to_absolute_glob_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz"; - sha512 = "rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA=="; - }; - } - { - name = "to_regex_range___to_regex_range_5.0.1.tgz"; - path = fetchurl { - name = "to_regex_range___to_regex_range_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; - }; - } - { - name = "tough_cookie___tough_cookie_2.5.0.tgz"; - path = fetchurl { - name = "tough_cookie___tough_cookie_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz"; - sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; - }; - } - { - name = "trim_newlines___trim_newlines_3.0.1.tgz"; - path = fetchurl { - name = "trim_newlines___trim_newlines_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz"; - sha512 = "c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="; - }; - } - { - name = "trim_newlines___trim_newlines_4.0.2.tgz"; - path = fetchurl { - name = "trim_newlines___trim_newlines_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.0.2.tgz"; - sha512 = "GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew=="; - }; - } - { - name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; - path = fetchurl { - name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; - sha512 = "95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ=="; - }; - } - { - name = "tsconfig_paths___tsconfig_paths_3.14.1.tgz"; - path = fetchurl { - name = "tsconfig_paths___tsconfig_paths_3.14.1.tgz"; - url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"; - sha512 = "fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ=="; - }; - } - { - name = "tslib___tslib_1.14.1.tgz"; - path = fetchurl { - name = "tslib___tslib_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; - sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; - }; - } - { - name = "tsutils___tsutils_3.21.0.tgz"; - path = fetchurl { - name = "tsutils___tsutils_3.21.0.tgz"; - url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz"; - sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; - }; - } - { - name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; - path = fetchurl { - name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="; - }; - } - { - name = "tweetnacl___tweetnacl_0.14.5.tgz"; - path = fetchurl { - name = "tweetnacl___tweetnacl_0.14.5.tgz"; - url = "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; - }; - } - { - name = "type_check___type_check_0.4.0.tgz"; - path = fetchurl { - name = "type_check___type_check_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; - sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; - }; - } - { - name = "type_fest___type_fest_0.13.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.13.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz"; - sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; - }; - } - { - name = "type_fest___type_fest_0.18.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.18.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz"; - sha512 = "OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw=="; - }; - } - { - name = "type_fest___type_fest_0.20.2.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.20.2.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; - }; - } - { - name = "type_fest___type_fest_0.21.3.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.21.3.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz"; - sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; - }; - } - { - name = "type_fest___type_fest_0.6.0.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; - sha512 = "q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="; - }; - } - { - name = "type_fest___type_fest_0.8.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.8.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; - sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; - }; - } - { - name = "type_fest___type_fest_2.13.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_2.13.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-2.13.1.tgz"; - sha512 = "hXYyrPFwETT2swFLHeoKtJrvSF/ftG/sA15/8nGaLuaDGfVAaq8DYFpu4yOyV4tzp082WqnTEoMsm3flKMI2FQ=="; - }; - } - { - name = "type_fest___type_fest_2.19.0.tgz"; - path = fetchurl { - name = "type_fest___type_fest_2.19.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz"; - sha512 = "RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="; - }; - } - { - name = "type_fest___type_fest_2.18.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_2.18.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-2.18.1.tgz"; - sha512 = "UKCINsd4qiATXD6OIlnQw9t1ux/n2ld+Nl0kzPbCONhCaUIS/BhJbNw14w6584HCQWf3frBK8vmWnGZq/sbPHQ=="; - }; - } - { - name = "type_fest___type_fest_3.6.0.tgz"; - path = fetchurl { - name = "type_fest___type_fest_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-3.6.0.tgz"; - sha512 = "RqTRtKTzvPpNdDUp1dVkKQRunlPITk4mXeqFlAZoJsS+fLRn8AdPK0TcQDumGayhU7fjlBfiBjsq3pe3rIfXZQ=="; - }; - } - { - name = "typedarray___typedarray_0.0.6.tgz"; - path = fetchurl { - name = "typedarray___typedarray_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; - }; - } - { - name = "typescript___typescript_4.9.5.tgz"; - path = fetchurl { - name = "typescript___typescript_4.9.5.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz"; - sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; - }; - } - { - name = "unbox_primitive___unbox_primitive_1.0.2.tgz"; - path = fetchurl { - name = "unbox_primitive___unbox_primitive_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz"; - sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; - }; - } - { - name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; - path = fetchurl { - name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; - sha512 = "eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg=="; - }; - } - { - name = "universalify___universalify_0.1.2.tgz"; - path = fetchurl { - name = "universalify___universalify_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; - sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; - }; - } - { - name = "universalify___universalify_2.0.0.tgz"; - path = fetchurl { - name = "universalify___universalify_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; - }; - } - { - name = "untildify___untildify_3.0.3.tgz"; - path = fetchurl { - name = "untildify___untildify_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/untildify/-/untildify-3.0.3.tgz"; - sha512 = "iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA=="; - }; - } - { - name = "unused_filename___unused_filename_2.1.0.tgz"; - path = fetchurl { - name = "unused_filename___unused_filename_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/unused-filename/-/unused-filename-2.1.0.tgz"; - sha512 = "BMiNwJbuWmqCpAM1FqxCTD7lXF97AvfQC8Kr/DIeA6VtvhJaMDupZ82+inbjl5yVP44PcxOuCSxye1QMS0wZyg=="; - }; - } - { - name = "uri_js___uri_js_4.4.1.tgz"; - path = fetchurl { - name = "uri_js___uri_js_4.4.1.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; - sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; - }; - } - { - name = "url_or_path___url_or_path_2.1.0.tgz"; - path = fetchurl { - name = "url_or_path___url_or_path_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/url-or-path/-/url-or-path-2.1.0.tgz"; - sha512 = "dsBD6GbytSMj9YDb3jVzSRENwFh50oUORnWBeSHfo0Lnwv2KMm/J4npyGy1P9rivUPsUGLjTA53XqAFqpe0nww=="; - }; - } - { - name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; - path = fetchurl { - name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; - sha512 = "4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA=="; - }; - } - { - name = "utif___utif_2.0.1.tgz"; - path = fetchurl { - name = "utif___utif_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/utif/-/utif-2.0.1.tgz"; - sha512 = "Z/S1fNKCicQTf375lIP9G8Sa1H/phcysstNrrSdZKj1f9g58J4NMgb5IgiEZN9/nLMPDwF0W7hdOe9Qq2IYoLg=="; - }; - } - { - name = "util_deprecate___util_deprecate_1.0.2.tgz"; - path = fetchurl { - name = "util_deprecate___util_deprecate_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; - }; - } - { - name = "uuid___uuid_3.4.0.tgz"; - path = fetchurl { - name = "uuid___uuid_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; - sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; - }; - } - { - name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; - path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; - sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; - }; - } - { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - path = fetchurl { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; - }; - } - { - name = "verror___verror_1.10.0.tgz"; - path = fetchurl { - name = "verror___verror_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz"; - sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; - }; - } - { - name = "verror___verror_1.10.1.tgz"; - path = fetchurl { - name = "verror___verror_1.10.1.tgz"; - url = "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz"; - sha512 = "veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg=="; - }; - } - { - name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; - path = fetchurl { - name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; - sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; - }; - } - { - name = "which_module___which_module_1.0.0.tgz"; - path = fetchurl { - name = "which_module___which_module_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz"; - sha512 = "F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ=="; - }; - } - { - name = "which___which_1.3.1.tgz"; - path = fetchurl { - name = "which___which_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; - sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; - }; - } - { - name = "which___which_2.0.2.tgz"; - path = fetchurl { - name = "which___which_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; - sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; - }; - } - { - name = "winreg___winreg_1.2.4.tgz"; - path = fetchurl { - name = "winreg___winreg_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz"; - sha512 = "IHpzORub7kYlb8A43Iig3reOvlcBJGX9gZ0WycHhghHtA65X0LYnMRuJs+aH1abVnMJztQkvQNlltnbPi5aGIA=="; - }; - } - { - name = "word_wrap___word_wrap_1.2.3.tgz"; - path = fetchurl { - name = "word_wrap___word_wrap_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; - sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; - }; - } - { - name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha512 = "vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw=="; - }; - } - { - name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; - }; - } - { - name = "wrappy___wrappy_1.0.2.tgz"; - path = fetchurl { - name = "wrappy___wrappy_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - } - { - name = "write_file_atomic___write_file_atomic_4.0.1.tgz"; - path = fetchurl { - name = "write_file_atomic___write_file_atomic_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz"; - sha512 = "nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ=="; - }; - } - { - name = "xhr___xhr_2.6.0.tgz"; - path = fetchurl { - name = "xhr___xhr_2.6.0.tgz"; - url = "https://registry.yarnpkg.com/xhr/-/xhr-2.6.0.tgz"; - sha512 = "/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA=="; - }; - } - { - name = "xml_parse_from_string___xml_parse_from_string_1.0.1.tgz"; - path = fetchurl { - name = "xml_parse_from_string___xml_parse_from_string_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz"; - sha512 = "ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g=="; - }; - } - { - name = "xml2js___xml2js_0.4.23.tgz"; - path = fetchurl { - name = "xml2js___xml2js_0.4.23.tgz"; - url = "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz"; - sha512 = "ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug=="; - }; - } - { - name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; - path = fetchurl { - name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; - url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz"; - sha512 = "yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="; - }; - } - { - name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; - path = fetchurl { - name = "xmlbuilder___xmlbuilder_9.0.7.tgz"; - url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz"; - sha512 = "7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ=="; - }; - } - { - name = "xmlbuilder___xmlbuilder_11.0.1.tgz"; - path = fetchurl { - name = "xmlbuilder___xmlbuilder_11.0.1.tgz"; - url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz"; - sha512 = "fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="; - }; - } - { - name = "xo___xo_0.53.1.tgz"; - path = fetchurl { - name = "xo___xo_0.53.1.tgz"; - url = "https://registry.yarnpkg.com/xo/-/xo-0.53.1.tgz"; - sha512 = "/2R8SPehv1UhiIqJ9uSvrAjslcoygICNsUlEb/Zf2V6rMtr7YCoggc6hlt6b/kbncpR989Roqt6AvEO779dFxw=="; - }; - } - { - name = "xtend___xtend_4.0.2.tgz"; - path = fetchurl { - name = "xtend___xtend_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; - sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; - }; - } - { - name = "y18n___y18n_3.2.2.tgz"; - path = fetchurl { - name = "y18n___y18n_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz"; - sha512 = "uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="; - }; - } - { - name = "y18n___y18n_5.0.8.tgz"; - path = fetchurl { - name = "y18n___y18n_5.0.8.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; - sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; - }; - } - { - name = "yallist___yallist_4.0.0.tgz"; - path = fetchurl { - name = "yallist___yallist_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; - sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; - }; - } - { - name = "yaml___yaml_1.10.2.tgz"; - path = fetchurl { - name = "yaml___yaml_1.10.2.tgz"; - url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz"; - sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; - }; - } - { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; - }; - } - { - name = "yargs_parser___yargs_parser_21.1.1.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_21.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz"; - sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="; - }; - } - { - name = "yargs_parser___yargs_parser_4.2.1.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz"; - sha512 = "+QQWqC2xeL0N5/TE+TY6OGEqyNRM+g2/r712PDNYgiCdXYCApXf1vzfmDSLBxfGRwV+moTq/V8FnMI24JCm2Yg=="; - }; - } - { - name = "yargs___yargs_17.6.2.tgz"; - path = fetchurl { - name = "yargs___yargs_17.6.2.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz"; - sha512 = "1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw=="; - }; - } - { - name = "yargs___yargs_6.6.0.tgz"; - path = fetchurl { - name = "yargs___yargs_6.6.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz"; - sha512 = "6/QWTdisjnu5UHUzQGst+UOEuEVwIzFVGBjq3jMTFNs5WJQsH/X6nMURSaScIdF5txylr1Ao9bvbWiKi2yXbwA=="; - }; - } - { - name = "yauzl___yauzl_2.10.0.tgz"; - path = fetchurl { - name = "yauzl___yauzl_2.10.0.tgz"; - url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; - sha512 = "p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g=="; - }; - } - { - name = "yocto_queue___yocto_queue_0.1.0.tgz"; - path = fetchurl { - name = "yocto_queue___yocto_queue_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; - sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; - }; - } - { - name = "yocto_queue___yocto_queue_1.0.0.tgz"; - path = fetchurl { - name = "yocto_queue___yocto_queue_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz"; - sha512 = "9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g=="; - }; - } - ]; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/lemonade/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lemonade/default.nix index b428d59aaa..68622718e0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lemonade/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lemonade/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { }) ]; - vendorSha256 = "sha256-wjQfTKVNmehu4aU5425gS0YWKj53dosVSTLgdu9KjKc="; + vendorHash = "sha256-wjQfTKVNmehu4aU5425gS0YWKj53dosVSTLgdu9KjKc="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix index 87aa894540..9d87de5432 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/limesctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "limesctl"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "sapcc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/9focZIm6tVnkAGIZYTJ9uewXKLv/x74LEMUZbXInb0="; + sha256 = "sha256-TR3cFIGU5hmZuzlYUJX+84vb8gmErSIZizK9J5Ieagk="; }; - vendorHash = "sha256-Zc8X29tsSsM/tkSYvplF1LxBS76eSs+cm5Li3OE/3o8="; + vendorHash = null; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix index 6eda1feff2..4dfcdc5879 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: let in { pname = "logseq"; - version = "0.9.14"; + version = "0.9.18"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - hash = "sha256-UFl+AqfG0OzT+lHC6Sq+gUQTyvzUQP6Enh+rLSq3Xhc="; + hash = "sha256-+2BnVW0qWSJ/PIY3zl1c9qzcP9DZVp6E9B7AI6LqibE="; name = "${pname}-${version}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lunatask/default.nix index 3d1340a057..87a130ae98 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 = "1.6.4"; + version = "1.7.7"; pname = "lunatask"; src = fetchurl { url = "https://lunatask.app/download/Lunatask-${version}.AppImage"; - sha256 = "sha256-rvjjzVgtDNryj7GO+ZfK92nZvWRnRPFoy9hEIGjviqQ="; + sha256 = "sha256-3WiJR+gwudeLs6Mn75SJP4BZ6utwxvvRLOHe/W+1Pfs="; }; appimageContents = appimageTools.extractType2 { @@ -17,9 +17,11 @@ in appimageTools.wrapType2 rec { inherit pname version src; extraInstallCommands = '' - install -m 444 -D ${appimageContents}/lunatask.desktop $out/share/applications/lunatask.desktop - install -m 444 -D ${appimageContents}/lunatask.png $out/share/icons/hicolor/0x0/apps/lunatask.png - substituteInPlace $out/share/applications/lunatask.desktop \ + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/${pname}.png $out/share/icons/hicolor/512x512/apps/${pname}.png + substituteInPlace $out/share/applications/${pname}.desktop \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix index ca93cf7bf2..7f78b60f45 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lutris/fhsenv.nix @@ -51,7 +51,7 @@ in buildFHSEnv { fluidsynth hidapi mesa libdrm # MAME - qt48 fontconfig SDL2_ttf + fontconfig SDL2_ttf # Mednafen freeglut mesa_glu @@ -65,9 +65,6 @@ in buildFHSEnv { # Mupen64Plus boost dash - # Osmose - qt4 - # Overwatch 2 libunwind diff --git a/third_party/nixpkgs/pkgs/applications/misc/madonctl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/madonctl/default.nix index df783aa36a..0e204ea838 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/madonctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/madonctl/default.nix @@ -32,6 +32,6 @@ buildGoModule rec { description = "CLI for the Mastodon social network API"; homepage = "https://github.com/McKael/madonctl"; license = licenses.mit; - maintainers = with maintainers; [ aaronjheng ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/mainsail/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mainsail/default.nix index dd7aae237a..48fbce686f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mainsail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mainsail/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "mainsail"; - version = "2.6.2"; + version = "2.7.1"; src = fetchzip { url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip"; - hash = "sha256-/ej26rLze/QaxGDtU4XhaejlkbkzZfzB+ib2I+3W8Ho="; + hash = "sha256-j2ri7PyQGzRlhpgE9qKneX00HwlDmIi2JUremz446wk="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mangal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mangal/default.nix index 26e735039b..6edc9da4f6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mangal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mangal/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; proxyVendor = true; - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/markmind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/markmind/default.nix deleted file mode 100644 index e44b7fe54a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/markmind/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron }: - -stdenv.mkDerivation rec { - pname = "markmind"; - version = "1.3.1"; - - src = fetchurl { - url = "https://github.com/MarkMindCkm/Mark-Mind/releases/download/v${version}/Mark.Mind-${version}.AppImage"; - sha256 = "sha256-iOJ0IOIzleA69rv94Qd35rMbHc+XSi8OPatf2V6sYrI="; - }; - - appimageContents = appimageTools.extractType2 { - name = "markmind-${version}"; - inherit src; - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin $out/share/markmind $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/markmind - cp -a ${appimageContents}/mind.desktop $out/share/applications/markmind.desktop - cp -a ${appimageContents}/usr/share/icons $out/share - substituteInPlace $out/share/applications/markmind.desktop \ - --replace 'Exec=AppRun' 'Exec=markmind' - - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron}/bin/electron $out/bin/markmind \ - --add-flags $out/share/markmind/resources/app.asar - ''; - - meta = with lib; { - description = "Mind map and outliner editor"; - homepage = "https://github.com/MarkMindCkm/Mark-Mind"; - license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/matcha-rss-digest/default.nix b/third_party/nixpkgs/pkgs/applications/misc/matcha-rss-digest/default.nix new file mode 100644 index 0000000000..d25824fefc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/matcha-rss-digest/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "matcha-rss-digest"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "piqoni"; + repo = "matcha"; + rev = "v${version}"; + hash = "sha256-aW/a1rfq/pjRpJzoEfuj0JMnyFwQKPL1+Wxvh7wVbho="; + }; + + vendorHash = "sha256-bwl4/4yYm8TC3D+FgyXzhQg8SdNHyXQM9YCn8p8+DF0="; + + meta = with lib; { + homepage = "https://github.com/piqoni/matcha"; + description = "Daily digest generator from a list of RSS feeds"; + license = licenses.mit; + mainProgram = "matcha"; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix index 4aebb67ac9..a830bffd7d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix @@ -6,11 +6,11 @@ let in stdenv.mkDerivation rec { pname = "mediainfo-gui"; - version = "23.04"; + version = "23.07"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "sha256-Uiut1rHk6LV+giW6e0nvgn35ffTLaLbU/HkQ92xf32k="; + hash = "sha256-ttfanimZX9NKIhAIJbhD50wyx7xnrbARZrG+7epJ9dA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmediainfo wxGTK32 desktop-file-utils libSM imagemagick ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - sourceRoot = "./MediaInfo/Project/GNU/GUI/"; + sourceRoot = "MediaInfo/Project/GNU/GUI"; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix index ffa7f68378..b93c552e19 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "mediainfo"; - version = "23.06"; + version = "23.07"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "sha256-TJd+6wzoN4co5k7yTyf+YrLFEW+/BUHIJKRDCfgP+Io="; + hash = "sha256-ttfanimZX9NKIhAIJbhD50wyx7xnrbARZrG+7epJ9dA="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libzen libmediainfo zlib ]; - sourceRoot = "./MediaInfo/Project/GNU/CLI/"; + sourceRoot = "MediaInfo/Project/GNU/CLI"; configureFlags = [ "--with-libmediainfo=${libmediainfo}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/merkaartor/default.nix b/third_party/nixpkgs/pkgs/applications/misc/merkaartor/default.nix index c8ac515571..9d474ca91f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/merkaartor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/merkaartor/default.nix @@ -5,7 +5,6 @@ , qmake , qttools , wrapQtAppsHook -, qttranslations , gdal , proj , qtsvg @@ -48,7 +47,6 @@ stdenv.mkDerivation rec { ''; qmakeFlags = [ - "TRANSDIR_SYSTEM=${qttranslations}/translations" "USEWEBENGINE=1" ] ++ lib.optional withGeoimage "GEOIMAGE=1" ++ lib.optional withGpsdlib "GPSDLIB=1" diff --git a/third_party/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix b/third_party/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix index 8d88612b72..88df68f559 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.5.0"; + version = "2.5.4"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = pname; rev = "v${version}"; - hash = "sha256-15qs2EsvEmQQPsarozP4HVpa0/3YJBSZ9M+1s/w5LaA="; + hash = "sha256-2+ZY+ca/CTIdCiFrBOkMWKflzKjSYJ8yfwFkULNg7Xk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix index 78eec56b60..6f3687b228 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.15.2"; + version = "1.15.6"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "sha256-aMKu59IWHjK6NlaIZgbpKPISsvGub2tQxEdvogx2XCY="; + sha256 = "sha256-vxUZo68QdeuFlQxLldWplmeGtyX2NHo3AJZmt+JLCF4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock index 3dbc6596dd..825c48cb48 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/mission-center/Cargo.lock @@ -52,6 +52,44 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "atomic-waker" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" + [[package]] name = "autocfg" version = "1.1.0" @@ -85,6 +123,21 @@ dependencies = [ "generic-array", ] +[[package]] +name = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "log", +] + [[package]] name = "bumpalo" version = "3.13.0" @@ -125,11 +178,11 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cairo-rs" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3603c4028a5e368d09b51c8b624b9a46edcd7c3778284077a6125af73c9f0a" +checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.3", "cairo-sys-rs", "glib", "libc 0.2.147", @@ -139,9 +192,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "691d0c66b1fb4881be80a760cb8fe76ea97218312f9dfe2c9cc0f496ca279cb1" +checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff" dependencies = [ "glib-sys", "libc 0.2.147", @@ -182,6 +235,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils 0.8.16", +] + [[package]] name = "const-random" version = "0.1.15" @@ -422,6 +484,12 @@ dependencies = [ "libc 0.2.147", ] +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + [[package]] name = "fallible-iterator" version = "0.2.0" @@ -434,6 +502,15 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + [[package]] name = "field-offset" version = "0.3.6" @@ -476,6 +553,21 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + [[package]] name = "futures-macro" version = "0.3.28" @@ -542,11 +634,10 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695d6bc846438c5708b07007537b9274d883373dd30858ca881d7d71b5540717" +checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" dependencies = [ - "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", @@ -556,9 +647,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9285ec3c113c66d7d0ab5676599176f1f42f4944ca1b581852215bf5694870cb" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", "glib-sys", @@ -569,11 +660,10 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" +checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk4-sys", @@ -585,9 +675,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" +checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -643,11 +733,10 @@ dependencies = [ [[package]] name = "gio" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6973e92937cf98689b6a054a9e56c657ed4ff76de925e36fc331a15f0c5d30a" +checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524" dependencies = [ - "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", @@ -663,9 +752,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ccf87c30a12c469b6d958950f6a9c09f2be20b7773f7e70d20b867fdf2628c3" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", @@ -696,11 +785,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fad45ba8d4d2cea612b432717e834f48031cd8853c8aaf43b2c79fec8d144b" +checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.3", "futures-channel", "futures-core", "futures-executor", @@ -719,24 +808,23 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eca5c79337338391f1ab8058d6698125034ce8ef31b72a442437fa6c8580de26" +checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" dependencies = [ - "anyhow", "heck", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.23", ] [[package]] name = "glib-sys" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d80aa6ea7bba0baac79222204aa786a6293078c210abe69ef1336911d4bdc4f0" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc 0.2.147", "system-deps", @@ -744,9 +832,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd34c3317740a6358ec04572c1bcfd3ac0b5b6529275fae255b237b314bb8062" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", "libc 0.2.147", @@ -755,9 +843,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def4bb01265b59ed548b05455040d272d989b3012c42d4c1bbd39083cb9b40d9" +checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" dependencies = [ "glib", "graphene-sys", @@ -766,9 +854,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1856fc817e6a6675e36cea0bd9a3afe296f5d9709d1e2d3182803ac77f0ab21d" +checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" dependencies = [ "glib-sys", "libc 0.2.147", @@ -778,11 +866,10 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" +checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk4", "glib", @@ -794,9 +881,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" +checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -810,11 +897,10 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" +checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -827,15 +913,14 @@ dependencies = [ "gtk4-macros", "gtk4-sys", "libc 0.2.147", - "once_cell", "pango", ] [[package]] name = "gtk4-macros" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f" +checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", "proc-macro-crate", @@ -847,9 +932,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" +checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -955,6 +1040,32 @@ dependencies = [ "web-sys", ] +[[package]] +name = "interprocess" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb" +dependencies = [ + "blocking", + "cfg-if 1.0.0", + "futures-core", + "futures-io", + "intmap", + "libc 0.2.147", + "once_cell", + "rustc_version 0.4.0", + "spinning", + "thiserror", + "to_method", + "winapi", +] + +[[package]] +name = "intmap" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" + [[package]] name = "io-lifetimes" version = "1.0.11" @@ -1004,11 +1115,10 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libadwaita" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab9c0843f9f23ff25634df2743690c3a1faffe0a190e60c490878517eb81abf" +checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" dependencies = [ - "bitflags 1.3.2", "gdk-pixbuf", "gdk4", "gio", @@ -1021,9 +1131,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4231cb2499a9f0c4cdfa4885414b33e39901ddcac61150bc0bb4ff8a57ede404" +checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" dependencies = [ "gdk4-sys", "gio-sys", @@ -1091,6 +1201,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "log" version = "0.4.19" @@ -1153,8 +1273,9 @@ dependencies = [ [[package]] name = "missioncenter" -version = "0.2.5" +version = "0.3.2" dependencies = [ + "arrayvec 0.7.4", "drm", "egl", "errno-sys", @@ -1162,6 +1283,7 @@ dependencies = [ "gettext-rs", "gl", "gtk4", + "interprocess", "lazy_static", "libadwaita", "libc 0.2.147", @@ -1182,8 +1304,10 @@ dependencies = [ "serde", "serde_json", "sha2", + "shared_memory_extended", "sysinfo", "textdistance", + "thiserror", ] [[package]] @@ -1306,11 +1430,10 @@ dependencies = [ [[package]] name = "pango" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35be456fc620e61f62dff7ff70fbd54dcbaf0a4b920c0f16de1107c47d921d48" +checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" dependencies = [ - "bitflags 1.3.2", "gio", "glib", "libc 0.2.147", @@ -1320,9 +1443,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da69f9f3850b0d8990d462f8c709561975e95f689c1cdf0fecdebde78b35195" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ "glib-sys", "gobject-sys", @@ -1330,6 +1453,12 @@ dependencies = [ "system-deps", ] +[[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + [[package]] name = "pathfinder_canvas" version = "0.5.0" @@ -1354,7 +1483,7 @@ name = "pathfinder_content" version = "0.5.0" source = "git+https://github.com/servo/pathfinder?rev=21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062#21ec6fa933547636bc6c5ee8f0dd4a0ea3fcd062" dependencies = [ - "arrayvec", + "arrayvec 0.5.2", "bitflags 1.3.2", "image", "log", @@ -1501,6 +1630,12 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + [[package]] name = "proc-macro-crate" version = "1.3.1" @@ -1568,6 +1703,36 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc 0.2.147", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + [[package]] name = "raw-cpuid" version = "11.0.1" @@ -1763,6 +1928,19 @@ dependencies = [ "digest", ] +[[package]] +name = "shared_memory_extended" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004d7ece9a3be64f85471d50967710b0a146144225bed5f0abd0514a3bed086f" +dependencies = [ + "cfg-if 1.0.0", + "libc 0.2.147", + "nix", + "rand", + "win-sys", +] + [[package]] name = "slab" version = "0.4.8" @@ -1778,6 +1956,15 @@ version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +[[package]] +name = "spinning" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d4f0e86297cad2658d92a707320d87bf4e6ae1050287f51d19b67ef3f153a7b" +dependencies = [ + "lock_api", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -1880,6 +2067,12 @@ dependencies = [ "crunchy", ] +[[package]] +name = "to_method" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" + [[package]] name = "toml" version = "0.7.6" @@ -1956,6 +2149,12 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -2079,6 +2278,15 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "win-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b7b128a98c1cfa201b09eb49ba285887deb3cbe7466a98850eb1adabb452be5" +dependencies = [ + "windows", +] + [[package]] name = "winapi" version = "0.3.9" @@ -2101,6 +2309,19 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" +dependencies = [ + "windows_aarch64_msvc 0.34.0", + "windows_i686_gnu 0.34.0", + "windows_i686_msvc 0.34.0", + "windows_x86_64_gnu 0.34.0", + "windows_x86_64_msvc 0.34.0", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -2117,12 +2338,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", + "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", - "windows_x86_64_msvc", + "windows_x86_64_msvc 0.48.0", ] [[package]] @@ -2131,24 +2352,48 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" + [[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.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" + [[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.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" + [[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.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" + [[package]] name = "windows_x86_64_gnu" version = "0.48.0" @@ -2161,6 +2406,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +[[package]] +name = "windows_x86_64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" + [[package]] name = "windows_x86_64_msvc" version = "0.48.0" diff --git a/third_party/nixpkgs/pkgs/applications/misc/mission-center/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mission-center/default.nix index 3c4a81a509..71055e6946 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mission-center/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mission-center/default.nix @@ -36,19 +36,19 @@ let nvtop = fetchFromGitHub { owner = "Syllo"; repo = "nvtop"; - rev = "9a8458b541a195a0c5cadafb66e240962c852b39"; - hash = "sha256-iFBZbESRTuwgLSUuHnjcXwmpvdeQrd3oUJd7BRyxu84="; + rev = "be47f8c560487efc6e6a419d59c69bfbdb819324"; + hash = "sha256-MdaZYLxCuVX4LvbwBYNfHHoJWqZAy4J8NBK7Guh2whc="; }; in stdenv.mkDerivation rec { pname = "mission-center"; - version = "0.2.5"; + version = "0.3.2"; src = fetchFromGitLab { owner = "mission-center-devs"; repo = "mission-center"; rev = "v${version}"; - hash = "sha256-f6GkwF+3USl60pUxxTu90KzdsfxBiAkiqnBSTTmC2Lc="; + hash = "sha256-KuaVivW/i+1Pw6ShpvBYbwPMUHsEJ7FR80is0DBMbXM="; }; cargoDeps = symlinkJoin { @@ -57,11 +57,11 @@ stdenv.mkDerivation rec { (rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "pathfinder_canvas-0.5.0" = "sha256-k2Sj69hWA0UzRfv91aG1TAygVIuOX3gmipcDbuZxxc8="; + "pathfinder_canvas-0.5.0" = "sha256-k2Sj69hWA0UzRfv91aG1TAygVIuOX3gmipcDbuZxxc8="; }; }) (rustPlatform.importCargoLock { - lockFile = ./proxy-Cargo.lock; + lockFile = ./gatherer-Cargo.lock; }) ]; }; @@ -111,7 +111,10 @@ stdenv.mkDerivation rec { done cd ../.. patchShebangs data/hwdb/generate_hwdb.py - sed -i 's|cmd.arg("dmidecode")|cmd.arg("${dmidecode}/bin/dmidecode")|g' src/sys_info_v2/mem_info.rs + ''; + + postInstall = '' + wrapProgram $out/bin/missioncenter --prefix PATH : $out/bin:${dmidecode}/bin ''; meta = with lib; { @@ -120,5 +123,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ GaetanLepage ]; platforms = platforms.linux; + mainProgram = "missioncenter"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock new file mode 100644 index 0000000000..cc5dd212ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/mission-center/gatherer-Cargo.lock @@ -0,0 +1,658 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "anyhow" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + +[[package]] +name = "atomic-waker" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[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 = "blocking" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "log", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-random" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +dependencies = [ + "getrandom", + "once_cell", + "proc-macro-hack", + "tiny-keccak", +] + +[[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 = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "dlv-list" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" +dependencies = [ + "const-random", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + +[[package]] +name = "futures-core" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" + +[[package]] +name = "futures-io" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" + +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + +[[package]] +name = "gatherer" +version = "0.3.2" +dependencies = [ + "anyhow", + "arrayvec", + "interprocess", + "lazy_static", + "libc", + "num_cpus", + "raw-cpuid", + "rust-ini", + "rustbus", + "shared_memory_extended", + "thiserror", +] + +[[package]] +name = "getrandom" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" + +[[package]] +name = "hermit-abi" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "interprocess" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb" +dependencies = [ + "blocking", + "cfg-if", + "futures-core", + "futures-io", + "intmap", + "libc", + "once_cell", + "rustc_version", + "spinning", + "thiserror", + "to_method", + "winapi", +] + +[[package]] +name = "intmap" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.147" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" + +[[package]] +name = "lock_api" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "nix" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset", + "pin-utils", + "static_assertions", +] + +[[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 = "once_cell" +version = "1.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" + +[[package]] +name = "ordered-multimap" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" +dependencies = [ + "dlv-list", + "hashbrown", +] + +[[package]] +name = "parking" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" + +[[package]] +name = "pin-project-lite" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[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.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "raw-cpuid" +version = "11.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d86a7c4638d42c44551f4791a20e687dbb4c3de1f33c43dd71e355cd429def1" +dependencies = [ + "bitflags 2.4.0", +] + +[[package]] +name = "rust-ini" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" +dependencies = [ + "cfg-if", + "ordered-multimap", +] + +[[package]] +name = "rustbus" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "208e43f29ba67bb31fc726854383be3c358e48df918a0d2d2a7efb710ea3575b" +dependencies = [ + "nix", + "rustbus_derive", + "thiserror", +] + +[[package]] +name = "rustbus_derive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dcb6a55a8a297bb62066b114624aac082ac1a330d90a0d5b336645208e29ae2" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "semver" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" + +[[package]] +name = "shared_memory_extended" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "004d7ece9a3be64f85471d50967710b0a146144225bed5f0abd0514a3bed086f" +dependencies = [ + "cfg-if", + "libc", + "nix", + "rand", + "win-sys", +] + +[[package]] +name = "spinning" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d4f0e86297cad2658d92a707320d87bf4e6ae1050287f51d19b67ef3f153a7b" +dependencies = [ + "lock_api", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[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.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "thiserror" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.27", +] + +[[package]] +name = "tiny-keccak" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +dependencies = [ + "crunchy", +] + +[[package]] +name = "to_method" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" + +[[package]] +name = "unicode-ident" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[package]] +name = "waker-fn" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "win-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b7b128a98c1cfa201b09eb49ba285887deb3cbe7466a98850eb1adabb452be5" +dependencies = [ + "windows", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +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" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" + +[[package]] +name = "windows_i686_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" + +[[package]] +name = "windows_i686_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" diff --git a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix index 390bc01413..2e2a02dc5d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4910"; + version = "4912"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-t4SyvDvwNdqKh95MRmHxlX6q84dN0y4ANPIXqS7ynBA="; + sha256 = "sha256-4A6N0bhRLKgpLXUSN1iAmIC4YX+BaiUow2YQqnxguRM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix index 74ab67739d..ed08ee5c09 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "mob"; - version = "4.4.5"; + version = "4.4.6"; src = fetchFromGitHub { owner = "remotemobprogramming"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/Kr5K0QkjARWKR8YhDsOQ2CoUzUu5LWUq6smhB0yDCM="; + sha256 = "sha256-UunFfP0Rn4t8lSJiubbqZ0bImK9OhIdC0gSGbkg6Ohw="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix index f51d9a329c..faa6c2180f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "1.01.0"; + version = "1.02.0"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6vqYyAJ9p0ey49kc2Tp/HZVv0mePARX2dcmcIG4bcNQ="; + sha256 = "sha256-URGAhd7u1DrGReQAwsX9LMj7Jq1GsILzP8fVFnA74O4="; }; outputs = [ "out" "udev" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix index 51cd4df77b..854d8d17b5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "moonlight-embedded"; - version = "2.5.3"; + version = "2.6.0"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "sha256-TUS0eTlQA7O59EvJHrQkqDQexv84ucza6kE4t98AGPs="; + sha256 = "sha256-BZYFN6X6UNllwlovnpEwDSocA5ZfSDUOyr8JTg4z9ak="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mop/default.nix index e07fce7975..ddd02d45df 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mop/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-oe8RG8E7xcp3ZqdDXYvpOVF3AfeSBFMherHD1YYFE/M="; }; - vendorSha256 = "sha256-kLQH7mMmBSsS9av+KnnEuBwiH6hzBOSozrn+1X+8774="; + vendorHash = "sha256-kLQH7mMmBSsS9av+KnnEuBwiH6hzBOSozrn+1X+8774="; preConfigure = '' for i in *.go **/*.go; do diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch b/third_party/nixpkgs/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch index 26ed3aec9f..771ad05835 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/mupdf/0001-Use-command-v-in-favor-of-which.patch @@ -1,25 +1,13 @@ -From b2935ed7e2962d73f3b493c38c0bb1e8659c0a60 Mon Sep 17 00:00:00 2001 -From: toonn -Date: Tue, 8 Mar 2022 23:59:19 +0100 -Subject: [PATCH 1/2] Use command -v in favor of which +Use command -v in favor of which ---- - Makerules | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makerules b/Makerules -index 0fdaecb..6d52cca 100644 --- a/Makerules +++ b/Makerules -@@ -145,7 +145,7 @@ else ifeq ($(OS),MACOS) - LD = xcrun ld - RANLIB = xcrun ranlib - -- ifeq (, $(shell which pkg-config)) -+ ifeq (, $(shell command -v pkg-config)) +@@ -170,7 +170,7 @@ + ifneq ($(ARCHFLAGS),) + $(warning "MacOS with ARCHFLAGS set. Assuming we are building for arm64, and setting HAVE_LIBCRYPTO to no.") + HAVE_LIBCRYPTO := no +- else ifeq (, $(shell which pkg-config)) ++ else ifeq (, $(shell command -v pkg-config)) $(warning "No pkg-config found, install it for proper integration of libcrypto") else HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes) --- -2.17.2 (Apple Git-113) - diff --git a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix index d00b9103d8..606649d5bb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mupdf/default.nix @@ -27,6 +27,12 @@ , freeglut , libGLU , xcbuild +, gitUpdater + +# for passthru.tests +, cups-filters +, python3 +, zathura }: let @@ -47,12 +53,12 @@ let in stdenv.mkDerivation rec { - version = "1.22.1"; + version = "1.23.0"; pname = "mupdf"; src = fetchurl { url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz"; - sha256 = "sha256-1i88DkVuu8QucfWkfw+M0SzsK/Co1yt541+jWmU4slo="; + sha256 = "sha256-3kFAaS5pMULDEeAwrBVuOO4XXXq2wb4QxcmuljhGFk4="; }; patches = [ ./0001-Use-command-v-in-favor-of-which.patch @@ -146,9 +152,22 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + tests = { + inherit cups-filters zathura; + inherit (python3.pkgs) pikepdf pymupdf; + }; + + updateScript = gitUpdater { + url = "https://git.ghostscript.com/mupdf.git"; + ignoredVersions = ".rc.*"; + }; + }; + meta = with lib; { homepage = "https://mupdf.com"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; + changelog = "https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=${version}"; license = licenses.agpl3Plus; maintainers = with maintainers; [ vrthra fpletz ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/misc/navipowm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/navipowm/default.nix deleted file mode 100644 index 4ae3cdeebd..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/navipowm/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchurl, qt4, qmake4Hook }: -stdenv.mkDerivation rec { - pname = "navipowm"; - version = "0.2.4"; - - src = fetchurl { - url = "mirror://sourceforge/navipowm/NaviPOWM-${version}.tar.gz"; - sha256 = "1kdih8kwpgcgfh6l6njkr9gq2j5hv39xvzmzgvhip553kn6bss7b"; - }; - - preConfigure = '' - cd Qt/KDevelop - ''; - - installPhase = '' - mkdir -p $out/bin $out/share/navipowm-${version}/Icons - cp bin/NaviPOWM $out/bin - cp ../../common/Config/navipowm.ini $out/share/navipowm-${version} - cp ../../common/Images/* $out/share/navipowm-${version} - ''; - - buildInputs = [ qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; - - meta = { - homepage = "https://navipowm.sourceforge.net/"; - description = "Car navigation system"; - license = lib.licenses.gpl2; - maintainers = with lib.maintainers; [ ]; - platforms = with lib.platforms; linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/nimbo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nimbo/default.nix index ffc01c747f..d028f205f3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nimbo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nimbo/default.nix @@ -7,19 +7,22 @@ python3.pkgs.buildPythonApplication rec { pname = "nimbo"; - version = "0.2.4"; + version = "0.3.0"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = "nimbo-sh"; repo = pname; rev = "v${version}"; - sha256 = "1fs28s9ynfxrb4rzba6cmik0kl0q0vkpb4zdappsq62jqf960k24"; + sha256 = "YC5T02Sw22Uczufbyts8l99oCQW4lPq0gPMRXCoKsvw="; }; + # Rich + Colorama are added in `propagatedBuildInputs` postPatch = '' substituteInPlace setup.py \ - --replace "awscli>=1.19<2.0" "" + --replace "awscli>=1.19<2.0" "" \ + --replace "colorama==0.4.3" "" \ + --replace "rich>=10.1.0" "" ''; nativeBuildInputs = [ installShellFiles ]; @@ -31,6 +34,8 @@ python3.pkgs.buildPythonApplication rec { click pyyaml pydantic + rich + colorama ]; # nimbo tests require an AWS instance diff --git a/third_party/nixpkgs/pkgs/applications/misc/nut/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nut/default.nix index 275d6bd3d8..5596fc6010 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nut/default.nix @@ -57,6 +57,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Add `cgi-bin` to the default list to avoid pulling in whole + # of `gcc` into build closure. + stripDebugList = [ "cgi-bin" "lib" "lib32" "lib64" "libexec" "bin" "sbin" ]; + postInstall = '' substituteInPlace $out/lib/systemd/system-shutdown/nutshutdown \ --replace /bin/sleep "${coreutils}/bin/sleep" \ diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix index 4dec8077d9..0c30fac6a5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-bar/default.nix @@ -1,4 +1,11 @@ -{ lib, buildGoModule, fetchFromGitHub, pkg-config, gtk3, gtk-layer-shell }: +{ lib +, buildGoModule +, fetchFromGitHub +, librsvg +, pkg-config +, gtk3 +, gtk-layer-shell +, wrapGAppsHook }: buildGoModule rec { pname = "nwg-bar"; @@ -19,9 +26,9 @@ buildGoModule rec { vendorHash = "sha256-mqcXhnja8ed7vXIqOKBsNrcbrcaycTQXG1jqdc6zcyI="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ gtk3 gtk-layer-shell ]; + buildInputs = [ gtk3 gtk-layer-shell librsvg ]; preInstall = '' mkdir -p $out/share/nwg-bar diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-dock-hyprland/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-dock-hyprland/default.nix index b953a0376f..676af3ec58 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-dock-hyprland/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-dock-hyprland/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.1.4"; + version = "0.1.7"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aPCz9m2Qnge8XhEbvpXb2U/eT5xvJkaSoorkkoY3gp0="; + sha256 = "sha256-Lekvk3tQfeOR+Ltbc5b7TMiUZpktZ2nvCtUncrFb+Kc="; }; - vendorHash = "sha256-GhcrIVnZRbiGTfeUAWvslOVWDZmoL0ZRnjgTtQgxe2Q="; + vendorHash = "sha256-5fN/6HASfTMb80YYAIoWRqnRGMvvX4d8C2UvOc0jQU0="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-dock/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-dock/default.nix index 1156bd4a94..b2154db0d7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-dock/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-dock/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nwg-dock"; - version = "0.3.6"; + version = "0.3.9"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Nh6VAgQIGxNxkWnNieRope5Hj3RL0uSFuOLqg+/oucw="; + sha256 = "sha256-/iUtVym+fNnbBeLlrYIiO5tV9eeAVBh6Nw+d3GCJ/F8="; }; - vendorHash = "sha256-k/2JD25ZmVI3G9GqJnI9vz5WtRc2vo4nfAiGUt6IPyU="; + vendorHash = "sha256-GW+shKOCwU8yprEfBeAPx1RDgjA7cZZzXDG112bdZ6k="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix index ad2850910c..6e7af27f3b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "nwg-drawer"; - version = "0.3.8"; + version = "0.3.9"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-34C0JmsPuDqR3QGmGf14naGOu9xPtPbpdWUvkbilkqs="; + sha256 = "sha256-RCryDei8Tw1f+7y8iIDC3mASv5nwq4qrWRc4CudS/Cg="; }; - vendorHash = "sha256-RehZ86XuFs1kbm9V3cgPz1SPG3izK7/6fHQjPTHOYZs="; + vendorHash = "sha256-YwXX3srQdCicJlstodqOsL+dwBNVyJx/SwC2dMOUBh4="; buildInputs = [ cairo gtk3 gtk-layer-shell ]; nativeBuildInputs = [ pkg-config wrapGAppsHook gobject-introspection ]; @@ -45,6 +45,7 @@ buildGoModule rec { homepage = "https://github.com/nwg-piotr/nwg-drawer"; license = licenses.mit; platforms = platforms.linux; + mainProgram = "nwg-drawer"; maintainers = with maintainers; [ plabadens ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-look/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-look/default.nix new file mode 100644 index 0000000000..864e94d4e0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-look/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchFromGitHub +, substituteAll +, buildGoModule +, go +, glib +, pkg-config +, cairo +, gtk3 +, xcur2png +, libX11 +, zlib +}: + +buildGoModule rec { + pname = "nwg-look"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "nwg-piotr"; + repo = "nwg-look"; + rev = "v${version}"; + hash = "sha256-wUI58qYkVYgES87HQ4octciDlOJ10oJldbUkFgxRUd4="; + }; + + vendorHash = "sha256-dev+TV6FITd29EfknwHDNI0gLao7gsC95Mg+3qQs93E="; + + # Replace /usr/ directories with the packages output location + # This means it references the correct path + patches = [ ./fix-paths.patch ]; + + postPatch = '' + substituteInPlace main.go tools.go --replace '@out@' $out + ''; + + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + cairo + xcur2png + libX11.dev + zlib + gtk3 + ]; + + CGO_ENABLED = 1; + + postInstall = '' + mkdir -p $out/share + mkdir -p $out/share/nwg-look/langs + mkdir -p $out/share/applications + mkdir -p $out/share/pixmaps + cp stuff/main.glade $out/share/nwg-look/ + cp langs/* $out/share/nwg-look/langs + cp stuff/nwg-look.desktop $out/share/applications + cp stuff/nwg-look.svg $out/share/pixmaps + ''; + + meta = with lib; { + homepage = "https://github.com/nwg-piotr/nwg-look"; + description = "Nwg-look is a GTK3 settings editor, designed to work properly in wlroots-based Wayland environment."; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ max-amb ]; + mainProgram = "nwg-look"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-look/fix-paths.patch b/third_party/nixpkgs/pkgs/applications/misc/nwg-look/fix-paths.patch new file mode 100644 index 0000000000..3b56e00522 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-look/fix-paths.patch @@ -0,0 +1,35 @@ +diff --git a/main.go b/main.go +index 23c4756..c52e9c3 100644 +--- a/main.go ++++ b/main.go +@@ -335,7 +335,7 @@ func main() { + + gtkSettings, _ = gtk.SettingsGetDefault() + +- builder, _ := gtk.BuilderNewFromFile("/usr/share/nwg-look/main.glade") ++ builder, _ := gtk.BuilderNewFromFile("@out@/share/nwg-look/main.glade") + win, _ := getWindow(builder, "window") + + win.Connect("destroy", func() { +diff --git a/tools.go b/tools.go +index e6e7665..59d6f35 100644 +--- a/tools.go ++++ b/tools.go +@@ -1034,7 +1034,7 @@ func getDataDirs() []string { + if os.Getenv("XDG_DATA_DIRS") != "" { + xdgDataDirs = os.Getenv("XDG_DATA_DIRS") + } else { +- xdgDataDirs = "/usr/local/share/:/usr/share/" ++ xdgDataDirs = "@out@/local/share/:@out@/share/" + } + + for _, d := range strings.Split(xdgDataDirs, ":") { +@@ -1280,7 +1280,7 @@ func detectLang() string { + } + + func loadVocabulary(lang string) map[string]string { +- langsDir := "/usr/share/nwg-look/langs/" ++ langsDir := "@out@/share/nwg-look/langs/" + enUSFile := filepath.Join(langsDir, "en_US.json") + if pathExists(enUSFile) { + log.Infof(">>> Loading basic lang from '%s'", enUSFile) diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-look/go.mod b/third_party/nixpkgs/pkgs/applications/misc/nwg-look/go.mod new file mode 100644 index 0000000000..0446058e56 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-look/go.mod @@ -0,0 +1,10 @@ +module github.com/nwg-piotr/nwg-look + +go 1.20 + +require ( + github.com/gotk3/gotk3 v0.6.2 + github.com/sirupsen/logrus v1.9.3 +) + +require golang.org/x/sys v0.6.0 // indirect diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix index 98609665c4..a911873dee 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-menu/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-M948RGU9/PwUtFRmf1Po7KlrGxqRPiOZKfS1Vv3vqW8="; }; - vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; + vendorHash = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix index 167e9a83d9..a4d333e594 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.9.11"; + version = "0.9.13"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "v${version}"; - hash = "sha256-4/R/x3iQ6nsG5OLy/FMA24uxS3xKD/2901gBNe6lkk4="; + hash = "sha256-dP/FbMrjPextwedQeLJHM6f/a+EuZ+hQSLrH/rF2XOg="; }; # No tests diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 1fdc5dd43d..78967c55a5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -12,25 +12,25 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "1.3.7"; + version = "1.4.14"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; homepage = "https://obsidian.md"; downloadPage = "https://github.com/obsidianmd/obsidian-releases/releases"; license = licenses.obsidian; - maintainers = with maintainers; [ atila conradmearns zaninime qbit ]; + maintainers = with maintainers; [ atila conradmearns zaninime qbit kashw2 ]; }; filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "sha256-jHsrSYBHJBMyChGsgXHxH/S7wdI1CMonzid8WenNSmI=" else "sha256-8Qi12d4oZ2R6INYZH/qNUBDexft53uy9Uug7UoArwYw="; + hash = if stdenv.isDarwin then "sha256-5cVKlZJDtXOkil+RohijCcqyJVTrysmqyTvJR0dDAuc=" else "sha256-qFSQer37Nkh3A3oVAFP/0qXzPWJ7SqY2GYA6b1iaYmE="; }; icon = fetchurl { url = "https://obsidian.md/images/obsidian-logo-gradient.svg"; - sha256 = "100j8fcrc5q8zv525siapminffri83s2khs2hw4kdxwrdjwh36qi"; + hash = "sha256-EZsBuWyZ9zYJh0LDKfRAMTtnY70q6iLK/ggXlplDEoA="; }; desktopItem = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix index fffc7d4419..5f5c2b897a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/octoprint/default.nix @@ -100,7 +100,7 @@ let filetype flask flask-babel - flask_assets + flask-assets flask-login flask-limiter frozendict diff --git a/third_party/nixpkgs/pkgs/applications/misc/omegat.nix b/third_party/nixpkgs/pkgs/applications/misc/omegat.nix index 24fd239997..da4de96fbc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/omegat.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/omegat.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip, jdk, makeWrapper}: stdenv.mkDerivation { - version = "4.3.0"; + version = "6.0.0"; pname = "omegat"; src = fetchurl { # their zip has repeated files or something, so no fetchzip - url = "mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%204.3.0/OmegaT_4.3.0_Without_JRE.zip"; - sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs"; + url = "mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%206.0.0/OmegaT_6.0.0_Without_JRE.zip"; + sha256 = "sha256-dsbT5iuZBudUL4Kw4rdvi4y98mcvnYNj9jRvC5wJoYI="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/openrgb-plugins/effects/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openrgb-plugins/effects/default.nix index 05cdd0ce5c..01ff200715 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openrgb-plugins/effects/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openrgb-plugins/effects/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , qtbase , openrgb , glib @@ -13,24 +12,16 @@ stdenv.mkDerivation rec { pname = "openrgb-plugin-effects"; - version = "0.8"; + version = "0.9"; src = fetchFromGitLab { owner = "OpenRGBDevelopers"; repo = "OpenRGBEffectsPlugin"; rev = "release_${version}"; - hash = "sha256-2F6yeLWgR0wCwIj75+d1Vdk45osqYwRdenK21lcRoOg="; + hash = "sha256-8BnHifcFf7ESJgJi/q3ca38zuIVa++BoGlkWxj7gpog="; fetchSubmodules = true; }; - patches = [ - # Add install rule - (fetchpatch { - url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBEffectsPlugin/-/commit/75f1b3617d9cabfb3b04a7afc75ce0c1b8514bc0.patch"; - hash = "sha256-X+zMNE3OCZNmUb68S4683r/RbE+CDrI/Jv4BMWPI47E="; - }) - ]; - postPatch = '' # Use the source of openrgb from nixpkgs instead of the submodule rm -r OpenRGB diff --git a/third_party/nixpkgs/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix index 539c203325..5d0c4e9661 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openrgb-plugins/hardwaresync/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , qtbase , openrgb , glib @@ -14,28 +13,15 @@ stdenv.mkDerivation rec { pname = "openrgb-plugin-hardwaresync"; - version = "0.8"; + version = "0.9"; src = fetchFromGitLab { owner = "OpenRGBDevelopers"; repo = "OpenRGBHardwareSyncPlugin"; rev = "release_${version}"; - hash = "sha256-P+IitP8pQLUkBdMfcNw4fOggqyFfg6lNlnSfUGjddzo="; + hash = "sha256-3sQFiqmXhuavce/6v3XBpp6PAduY7t440nXfbfCX9a0="; }; - patches = [ - (fetchpatch { - name = "use-pkgconfig"; - url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/df2869d679ea43119fb9b174cd0b2cb152022685.patch"; - hash = "sha256-oBtrHwpvB8Z3xYi4ucDSuw+5WijPEbgBW7vLGELFjfw="; - }) - (fetchpatch { - name = "add-install-rule"; - url = "https://gitlab.com/OpenRGBDevelopers/OpenRGBHardwareSyncPlugin/-/commit/bfbaa0a32ed05112e0cc8b6b2a8229945596e522.patch"; - hash = "sha256-76UMMzeXnyQRCEE1tGPNR5XSHTT480rQDnJ9hWhfIqY="; - }) - ]; - postPatch = '' # Use the source of openrgb from nixpkgs instead of the submodule rmdir OpenRGB diff --git a/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix index 41d855cd33..e0832ff245 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openrgb"; - version = "0.8"; + version = "0.9"; src = fetchFromGitLab { owner = "CalcProgrammer1"; repo = "OpenRGB"; rev = "release_${version}"; - sha256 = "sha256-46dL1D5oVlw6mNuFDCbbrUDmq42yFXV/qFJ1JnPT5/s="; + sha256 = "sha256-XBLj4EfupyeVHRc0pVI7hrXFoCNJ7ak2yO0QSfhBsGU="; }; nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/openring/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openring/default.nix index 3a3db0242b..e311dfbb3b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/openring/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/openring/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-BY2AtgZXzPLqHk3hd6D+XXbrwvWS9DNTKwLqsua/3uw="; }; - vendorSha256 = "sha256-BbBTmkGyLrIWphXC+dBaHaVzHuXRZ+4N/Jt2k3nF7Z4="; + vendorHash = "sha256-BbBTmkGyLrIWphXC+dBaHaVzHuXRZ+4N/Jt2k3nF7Z4="; # The package has no tests. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/opentrack/default.nix b/third_party/nixpkgs/pkgs/applications/misc/opentrack/default.nix index b4c455c0ce..84edbc567b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/opentrack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/opentrack/default.nix @@ -46,7 +46,6 @@ in dontWrapQtApps = true; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RELEASE" "-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a" "-DSDK_XPLANE=${xplaneSdk}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix index e9a526a1f6..0634c03e7b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix @@ -1,6 +1,6 @@ { lib, mkDerivation, fetchFromGitHub , cmake, gcc-arm-embedded, python3Packages -, qtbase, qtmultimedia, qttranslations, SDL, gtest +, qtbase, qtmultimedia, qttools, SDL, gtest , dfu-util, avrdude }: @@ -15,9 +15,9 @@ mkDerivation rec { sha256 = "sha256-F3zykJhKuIpLQSTjn7mcdjEmgRAlwCZpkTaKQR9ve3g="; }; - nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow ]; + nativeBuildInputs = [ cmake gcc-arm-embedded python3Packages.pillow qttools ]; - buildInputs = [ qtbase qtmultimedia qttranslations SDL ]; + buildInputs = [ qtbase qtmultimedia SDL ]; postPatch = '' sed -i companion/src/burnconfigdialog.cpp \ @@ -27,7 +27,6 @@ mkDerivation rec { cmakeFlags = [ "-DGTEST_ROOT=${gtest.src}/googletest" - "-DQT_TRANSLATIONS_DIR=${qttranslations}/translations" # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed. #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude" diff --git a/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix index 1471afed1d..0e06c8a6fb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/oranda/default.nix @@ -2,34 +2,28 @@ , rustPlatform , fetchFromGitHub , pkg-config +, tailwindcss , oniguruma , stdenv , darwin -, tailwindcss }: rustPlatform.buildRustPackage rec { pname = "oranda"; - version = "0.3.1"; + version = "0.4.1"; src = fetchFromGitHub { owner = "axodotdev"; repo = "oranda"; rev = "v${version}"; - hash = "sha256-v/4FPDww142V5mx+pHhaHkDiIUN70dwei8mTeZELztc="; + hash = "sha256-k4xrgRanQmkjmXGvfeaGU61+GP8asYPq4RQrao3rd4Q="; }; - cargoHash = "sha256-Q5EY9PB50DxFXFTPiv3RktI37b2TCDqLVNISxixnspY="; - - patches = [ - # oranda-generate-css which is used in the build script tries to download - # tailwindcss from the internet, so we have to patch it to use the - # tailwindcss from nixpkgs - ./tailwind.patch - ]; + cargoHash = "sha256-CLMhzPM11LnQdCVD66xC4Fk+8LnfRfFzk3FwQeXboes="; nativeBuildInputs = [ pkg-config + tailwindcss ]; buildInputs = [ @@ -46,7 +40,7 @@ rustPlatform.buildRustPackage rec { env = { RUSTONIG_SYSTEM_LIBONIG = true; - TAILWINDCSS = lib.getExe tailwindcss; + ORANDA_USE_TAILWIND_BINARY = true; } // lib.optionalAttrs stdenv.isDarwin { # without this, tailwindcss fails with OpenSSL configuration error OPENSSL_CONF = ""; diff --git a/third_party/nixpkgs/pkgs/applications/misc/oranda/tailwind.patch b/third_party/nixpkgs/pkgs/applications/misc/oranda/tailwind.patch deleted file mode 100644 index 6a1ffb3c95..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/oranda/tailwind.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- a/generate-css/src/lib.rs -+++ b/generate-css/src/lib.rs -@@ -28,48 +28,7 @@ pub fn default_css_output_dir() -> Utf8PathBuf { - } - - pub fn build_css(dist_dir: &Utf8Path) -> Result<()> { -- // Fetch our cache dir -- let project_dir = ProjectDirs::from("dev", "axo", "oranda") -- .expect("Unable to create cache dir for downloading Tailwind!"); -- let cache_dir = project_dir.cache_dir(); -- // Figure out our target "double" (tailwind has weird naming around this) -- let double = match (env::consts::OS, env::consts::ARCH) { -- ("linux", "x86_64") => "linux-x64", -- ("linux", "aarch64") => "linux-arm64", -- ("linux", "arm") => "linux-armv7", -- ("macos", "x86_64") => "macos-x64", -- ("macos", "aarch64") => "macos-arm64", -- ("windows", "x86_64") => "windows-x64.exe", -- ("windows", "aarch64") => "windows-arm64.exe", -- _ => "linux-x64", -- }; -- let mut binary_path = Utf8PathBuf::from(cache_dir.display().to_string()); -- LocalAsset::create_dir_all(&binary_path)?; -- binary_path.push(format!("tailwindcss-{double}")); -- if !binary_path.exists() { -- // Fetch the binary from GitHub if it doesn't exist -- tracing::info!("Fetching Tailwind binary from GitHub release..."); -- let url = format!( -- "https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-{double}" -- ); -- let handle = tokio::runtime::Handle::current(); -- let response = handle.block_on(reqwest::get(url))?; -- let bytes = handle.block_on(response.bytes())?; -- let file = LocalAsset::new(&binary_path, Vec::from(bytes))?; -- file.write( -- binary_path -- .parent() -- .expect("Tailwind binary path has no parent!?"), -- )?; -- -- // On non-Windows platforms, we need to mark the file as executable -- #[cfg(target_family = "unix")] -- { -- use std::os::unix::prelude::PermissionsExt; -- let user_execute = std::fs::Permissions::from_mode(0o755); -- std::fs::set_permissions(&binary_path, user_execute)?; -- } -- } -+ let binary_path = env!("TAILWINDCSS"); - - tracing::info!("Building oranda CSS using Tailwind..."); - let css_src_path = manifest_dir().join(CSS_SRC_PATH); diff --git a/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix index 236a3190c8..e5bd2f46ab 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix @@ -1,5 +1,4 @@ { lib -, mkDerivation , stdenv , fetchFromGitHub , cmake @@ -8,6 +7,7 @@ , which , python3 , rsync +, wrapQtAppsHook , qtbase , qtsvg , libGLU @@ -19,15 +19,22 @@ , nix-update-script }: -mkDerivation rec { +let + world_feed_integration_tests_data = fetchFromGitHub { + owner = "organicmaps"; + repo = "world_feed_integration_tests_data"; + rev = "3b66e59eaae85ebc583ce20baa3bdf27811349c4"; + hash = "sha256-wOZKqwYxJLllyxCr44rAcropKhohLUIVCtsR5tz9TRw="; + }; +in stdenv.mkDerivation rec { pname = "organicmaps"; - version = "2023.06.04-13"; + version = "2023.08.18-8"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - hash = "sha256-HoEOKN99ClR1sa8YFZcS9XomtXnTRdAXS0iQEdDrhvc="; + hash = "sha256-vdleO4jNKibyDlqrfZsOCScpQ9zreuYSw2BSoNpmeLY="; fetchSubmodules = true; }; @@ -40,6 +47,9 @@ mkDerivation rec { # TODO use system boost instead, see https://github.com/organicmaps/organicmaps/issues/5345 patchShebangs 3party/boost/tools/build/src/engine/build.sh + + # Prefetch test data, or the build system will try to fetch it with git. + ln -s ${world_feed_integration_tests_data} data/world_feed_integration_tests_data ''; nativeBuildInputs = [ @@ -49,6 +59,7 @@ mkDerivation rec { which python3 rsync + wrapQtAppsHook ]; # Most dependencies are vendored @@ -76,7 +87,7 @@ mkDerivation rec { meta = with lib; { # darwin: "invalid application of 'sizeof' to a function type" - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; homepage = "https://organicmaps.app/"; description = "Detailed Offline Maps for Travellers, Tourists, Hikers and Cyclists"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix b/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix index 00d157eb25..cf7c419e40 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/osmium-tool/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "sha256-xV/1LFby0L/o648XEQQ9gS9/eHssWhMIG7R1E8bfIDU="; + sha256 = "sha256-DObqbzdPA4RlrlcZhqA0MQtWBE+D6GRD1pd9U4DARIk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/Cargo.lock index 8c32ad4b65..128ab926d1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -58,24 +58,23 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" +checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" [[package]] name = "anstyle-parse" @@ -97,9 +96,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" dependencies = [ "anstyle", "windows-sys 0.48.0", @@ -107,9 +106,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "async-stream" @@ -130,7 +129,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -165,9 +164,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -186,9 +185,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "bincode" @@ -207,9 +206,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "block" @@ -254,7 +253,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" dependencies = [ "memchr", - "regex-automata 0.3.3", + "regex-automata 0.3.7", "serde", ] @@ -321,11 +320,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -356,9 +356,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", "target-lexicon", @@ -387,9 +387,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.19" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" dependencies = [ "clap_builder", "clap_derive", @@ -398,9 +398,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" dependencies = [ "anstream", "anstyle", @@ -410,36 +410,36 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.3.2" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc443334c81a804575546c5a8a79b4913b50e28d69232903604cada1de817ce" +checksum = "586a385f7ef2f8b4d86bddaa0c094794e7ccbfe5ffef1f434fe928143fc783a5" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" [[package]] name = "clap_mangen" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f2e32b579dae093c2424a8b7e2bea09c89da01e1ce5065eb2f0a6f1cc15cc1f" +checksum = "cf8e5f34d85d9e0bbe2491d100a7a7c1007bb2467b518080bfe311e8947197a9" dependencies = [ "clap", "roff", @@ -639,7 +639,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -673,7 +673,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -684,7 +684,16 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.27", + "syn 2.0.29", +] + +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +dependencies = [ + "serde", ] [[package]] @@ -815,9 +824,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -830,9 +839,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -876,21 +885,21 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -992,7 +1001,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -1167,9 +1176,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" @@ -1254,9 +1263,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aca8bbd8e0707c1887a8bbb7e6b40e228f251ff5d62c8220a4a7a53c73aff006" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", "bstr", @@ -1333,9 +1342,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -1439,9 +1448,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 = "hyper" @@ -1460,7 +1469,7 @@ dependencies = [ "httpdate", "itoa 1.0.9", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1562,9 +1571,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -1592,13 +1601,14 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", + "serde", ] [[package]] name = "indicatif" -version = "0.17.5" +version = "0.17.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057" +checksum = "0b297dc40733f23a0e52728a58fa9489a5b7638a324932de16b41adc3ef80730" dependencies = [ "console", "instant", @@ -1763,9 +1773,9 @@ dependencies = [ [[package]] name = "kqueue" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" dependencies = [ "kqueue-sys", "libc", @@ -1773,9 +1783,9 @@ dependencies = [ [[package]] name = "kqueue-sys" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" dependencies = [ "bitflags 1.3.2", "libc", @@ -1816,9 +1826,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" @@ -1832,9 +1842,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ "serde", ] @@ -2016,18 +2026,19 @@ dependencies = [ [[package]] name = "notify" -version = "6.0.1" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "filetime", "inotify", "kqueue", "libc", + "log", "mio", "walkdir", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -2101,6 +2112,15 @@ dependencies = [ "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 = "number_prefix" version = "0.4.0" @@ -2136,9 +2156,9 @@ checksum = "99e1d07c6eab1ce8b6382b8e3c7246fe117ff3f8b34be065f5ebace6749fe845" [[package]] name = "objc2" -version = "0.3.0-beta.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef3a6024722b4230242a53e5b5759ce117548983696b8e4b7bc2fd1f8fce621e" +checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" dependencies = [ "objc-sys", "objc2-encode", @@ -2146,9 +2166,9 @@ dependencies = [ [[package]] name = "objc2-encode" -version = "2.0.0-pre.4" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f8f7297b786454a87e392631e2b2754ed59a7b413effa8521225d93f46b2192" +checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" [[package]] name = "objc_exception" @@ -2170,9 +2190,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -2206,11 +2226,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cfg-if", "foreign-types", "libc", @@ -2227,7 +2247,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -2238,9 +2258,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" dependencies = [ "cc", "libc", @@ -2273,7 +2293,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owmods_cli" -version = "0.10.0" +version = "0.11.2" dependencies = [ "anyhow", "clap", @@ -2288,7 +2308,7 @@ dependencies = [ [[package]] name = "owmods_core" -version = "0.10.0" +version = "0.11.2" dependencies = [ "anyhow", "directories", @@ -2297,6 +2317,7 @@ dependencies = [ "lazy_static", "log", "opener", + "regex", "reqwest", "serde", "serde_json", @@ -2305,6 +2326,7 @@ dependencies = [ "tokio", "tokio-test", "typeshare", + "unicode-normalization", "uuid", "version-compare 0.1.1", "zip", @@ -2312,7 +2334,7 @@ dependencies = [ [[package]] name = "owmods_gui" -version = "0.10.0" +version = "0.11.2" dependencies = [ "anyhow", "log", @@ -2376,7 +2398,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -2491,9 +2513,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2513,7 +2535,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "indexmap 1.9.3", "line-wrap", "quick-xml", @@ -2523,9 +2545,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2536,9 +2558,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e" +checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" [[package]] name = "ppv-lite86" @@ -2612,9 +2634,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2737,14 +2759,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.3", - "regex-syntax 0.7.4", + "regex-automata 0.3.7", + "regex-syntax 0.7.5", ] [[package]] @@ -2758,13 +2780,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] @@ -2775,17 +2797,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "bytes", "encoding_rs", "futures-core", @@ -2820,7 +2842,7 @@ dependencies = [ "wasm-streams", "web-sys", "webpki-roots", - "winreg 0.10.1", + "winreg 0.50.0", ] [[package]] @@ -2885,11 +2907,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.4" +version = "0.38.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", "linux-raw-sys", @@ -2898,9 +2920,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.5" +version = "0.21.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" +checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" dependencies = [ "log", "ring", @@ -2914,14 +2936,14 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", ] [[package]] name = "rustls-webpki" -version = "0.101.2" +version = "0.101.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" dependencies = [ "ring", "untrusted", @@ -3039,29 +3061,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.177" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ba2516aa6bf82e0b19ca8b50019d52df58455d3cf9bdaf6315225fdd0c560a" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.177" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "401797fe7833d72109fedec6bfcbe67c0eed9b99772f26eb8afd261f0abc6fd3" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa 1.0.9", "ryu", @@ -3076,7 +3098,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3102,14 +3124,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.1.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e47d95bc83ed33b2ecf84f4187ad1ab9685d18ff28db000c99deac8ce180e3" +checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "chrono", "hex", "indexmap 1.9.3", + "indexmap 2.0.0", "serde", "serde_json", "serde_with_macros", @@ -3118,14 +3141,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.1.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65" +checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3197,15 +3220,15 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[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", ] @@ -3226,6 +3249,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "soup2" version = "0.2.1" @@ -3320,9 +3353,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -3361,7 +3394,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ - "cfg-expr 0.15.3", + "cfg-expr 0.15.4", "heck 0.4.1", "pkg-config", "toml 0.7.6", @@ -3417,9 +3450,9 @@ dependencies = [ [[package]] name = "tao-macros" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b27a4bcc5eb524658234589bdffc7e7bfb996dbae6ce9393bfd39cb4159b445" +checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" dependencies = [ "proc-macro2", "quote", @@ -3428,9 +3461,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -3439,9 +3472,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.10" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tauri" @@ -3450,7 +3483,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e" dependencies = [ "anyhow", - "base64 0.21.2", + "base64 0.21.3", "bytes", "cocoa", "dirs-next", @@ -3522,7 +3555,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54ad2d49fdeab4a08717f5b49a163bdc72efc3b1950b6758245fcde79b645e1a" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "brotli", "ico", "json-patch", @@ -3558,9 +3591,9 @@ dependencies = [ [[package]] name = "tauri-plugin-deep-link" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a3ae55bcfe692e5361edc4708bd9f415270cc02e1cdba8ab7768566208b4e2" +checksum = "4536f5f6602e8fdfaa7b3b185076c2a0704f8eb7015f4e58461eb483ec3ed1f8" dependencies = [ "dirs", "interprocess", @@ -3578,7 +3611,7 @@ version = "0.1.0" source = "git+https://github.com/tauri-apps/plugins-workspace?branch=dev#dce0f02bc571128308c30278cde3233f341e6a50" dependencies = [ "bincode", - "bitflags 2.3.3", + "bitflags 2.4.0", "log", "serde", "serde_json", @@ -3668,9 +3701,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.7.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", @@ -3698,22 +3731,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3728,11 +3761,14 @@ dependencies = [ [[package]] name = "time" -version = "0.3.23" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ + "deranged", "itoa 1.0.9", + "libc", + "num_threads", "serde", "time-core", "time-macros", @@ -3746,9 +3782,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -3776,11 +3812,10 @@ checksum = "c7c4ceeeca15c8384bbc3e011dbd8fccb7f068a440b752b7d9b32ceb0ca0e2e8" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -3788,7 +3823,7 @@ dependencies = [ "num_cpus", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] @@ -3801,7 +3836,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3837,9 +3872,9 @@ dependencies = [ [[package]] name = "tokio-test" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" +checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719" dependencies = [ "async-stream", "bytes", @@ -3931,7 +3966,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -4191,7 +4226,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -4225,7 +4260,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4238,9 +4273,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -4306,24 +4341,11 @@ dependencies = [ "system-deps 6.1.1", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "webpki-roots" -version = "0.22.6" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" -dependencies = [ - "webpki", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "webview2-com" @@ -4427,7 +4449,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -4486,7 +4508,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -4506,17 +4528,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 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.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]] @@ -4533,9 +4555,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -4557,9 +4579,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -4581,9 +4603,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -4605,9 +4627,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -4629,9 +4651,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -4641,9 +4663,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -4665,28 +4687,19 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.1" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b5872fa2e10bd067ae946f927e726d7d603eaeb6e02fa6a350e0722d2b8c11" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - [[package]] name = "winreg" version = "0.11.0" @@ -4768,16 +4781,16 @@ dependencies = [ [[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] [[package]] name = "xtask" -version = "0.10.0" +version = "0.11.2" dependencies = [ "anyhow", "clap", diff --git a/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/default.nix index 3a1c224c2c..f0e325677a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "owmods-cli"; - version = "0.10.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "ow-mods"; repo = "ow-mod-man"; rev = "cli_v${version}"; - hash = "sha256-kumYLlp2LRqTQz23N9lriJJf7x2pPXbqqUvkiAhyMDY="; + hash = "sha256-kjHGuVYX9pKy2I+m347cEdPj6MjCDz8vz2Cnce9+z90="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/update.sh b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/update.sh new file mode 100755 index 0000000000..4848dc3210 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/owmods-cli/update.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix-prefetch nix-prefetch-github jq wget + +#modified version of https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/servers/readarr/update.sh +set -e + +dirname="$(dirname "$0")" + +updateHash() +{ + version=$1 + + url="https://github.com/ow-mods/ow-mod-man/releases/cli_v$version" + prefetchJson=$(nix-prefetch-github ow-mods ow-mod-man --rev cli_v$version) + sha256="$(echo $prefetchJson | jq -r ".sha256")" + echo "sha256=${sha256}" + + sed -i "s/hash = \"[a-zA-Z0-9\/+-=]*\";/hash = \"sha256-$sha256\";/g" "$dirname/default.nix" + + #downloads and replaces .lock file + wget https://raw.githubusercontent.com/ow-mods/ow-mod-man/cli_v$version/Cargo.lock -q -O $dirname/Cargo.lock + +} + +updateVersion() +{ + sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix" +} + +latestTag=$(curl https://api.github.com/repos/ow-mods/ow-mod-man/releases | jq -r ".[0].tag_name") +latestVersion="$(expr $latestTag : 'gui_v\(.*\)')" +echo "latest version: ${latestVersion}" + +echo "updating..." +updateVersion $latestVersion + +updateHash $latestVersion +echo "updated cli" diff --git a/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix index e380cab6d4..bac74b0ffe 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/oxker/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "oxker"; - version = "0.3.1"; + version = "0.3.2"; src = fetchCrate { inherit pname version; - sha256 = "sha256-35MHq2G2L7yfz+W9uUaRb8fpEp/h0bt2HtK615XwZG8="; + sha256 = "sha256-HFZSIzP3G6f78gTOpzZFG5ZAo5Lo6VuxQe6xMvCVfss="; }; - cargoHash = "sha256-goIb8BoHSF0g/OWmeZtha+qKlcvLTqwMmYcD2uYUI7E="; + cargoHash = "sha256-ZsqxlwgXqw9eUEjw1DLBMz05V/y/ZbcrCL6I8TcnnDs="; meta = with lib; { description = "A simple tui to view & control docker containers"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix b/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix index a2b403f60f..7f09f3b616 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/p2pool/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "p2pool"; - version = "3.5"; + version = "3.7"; src = fetchFromGitHub { owner = "SChernykh"; repo = "p2pool"; rev = "v${version}"; - sha256 = "sha256-qwdEmDfH+TE0WF2HIVCn23RlzelLBvCOu9VKpScdO68="; + sha256 = "sha256-WGavhxCGM10LXKvrXT3A2SOMSJRuoA/wAlEj7NFs8Ok="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pagefind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pagefind/default.nix new file mode 100644 index 0000000000..1b7505dc36 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/pagefind/default.nix @@ -0,0 +1,110 @@ +{ lib +, callPackage +, rustPlatform +, fetchFromGitHub +, fetchNpmDeps +, npmHooks +, binaryen +, gzip +, nodejs +, rustc-wasm32 +, wasm-bindgen-cli +, wasm-pack +}: + +let + + wasm-bindgen-84 = wasm-bindgen-cli.override { + version = "0.2.84"; + hash = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk="; + cargoHash = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50="; + }; + +in + +rustPlatform.buildRustPackage rec { + pname = "pagefind"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "cloudcannon"; + repo = "pagefind"; + rev = "refs/tags/v${version}"; + hash = "sha256-vQbLaZug3gySMIbMdNqU7XcL4GZ7XqZ3ZkwdDBC5T9o="; + }; + + cargoHash = "sha256-ubuzO/67HguWPqd3y/IapO07L2pg2Q4vo1yTpEthdoU="; + + env.npmDeps_web_js = fetchNpmDeps { + name = "npm-deps-web-js"; + src = "${src}/pagefind_web_js"; + hash = "sha256-pGE4lUFZ4dA++8kBklcMBoaN/1Z92dfOzQKhukbuEyc="; + }; + env.npmDeps_ui_default = fetchNpmDeps { + name = "npm-deps-ui-default"; + src = "${src}/pagefind_ui/default"; + hash = "sha256-voCs49JneWYE1W9U7aB6G13ypH6JqathVDeF58V57U8="; + }; + env.npmDeps_ui_modular = fetchNpmDeps { + name = "npm-deps-ui-modular"; + src = "${src}/pagefind_ui/modular"; + hash = "sha256-O0RqZUsRFtByxMQdwNGNcN38Rh+sDqqNo9YlBcrnsF4="; + }; + + postPatch = '' + # Tricky way to run npmConfigHook multiple times + ( + local postPatchHooks=() # written to by npmConfigHook + source ${npmHooks.npmConfigHook}/nix-support/setup-hook + npmRoot=pagefind_web_js npmDeps=$npmDeps_web_js npmConfigHook + npmRoot=pagefind_ui/default npmDeps=$npmDeps_ui_default npmConfigHook + npmRoot=pagefind_ui/modular npmDeps=$npmDeps_ui_modular npmConfigHook + ) + ''; + + nativeBuildInputs = [ + binaryen + gzip + nodejs + rustc-wasm32 + rustc-wasm32.llvmPackages.lld + wasm-bindgen-84 + wasm-pack + ]; + + # build wasm and js assets + # based on "test-and-build" in https://github.com/CloudCannon/pagefind/blob/main/.github/workflows/release.yml + preBuild = '' + export HOME=$(mktemp -d) + ( + cd pagefind_web_js + npm run build-coupled + ) + + ( + cd pagefind_web + export RUSTFLAGS="-C linker=lld" + bash ./local_build.sh + ) + + ( + cd pagefind_ui/default + npm run build + ) + + ( + cd pagefind_ui/modular + npm run build + ) + ''; + + buildFeatures = [ "extended" ]; + + meta = with lib; { + description = "Generate low-bandwidth search index for your static website"; + homepage = "https://pagefind.app/"; + license = licenses.mit; + maintainers = with maintainers; [ pbsds ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/parsec/bin.nix b/third_party/nixpkgs/pkgs/applications/misc/parsec/bin.nix index 7aae31152f..f631312b6f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/parsec/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/parsec/bin.nix @@ -1,13 +1,25 @@ -{ stdenvNoCC, stdenv +{ stdenvNoCC +, stdenv , lib -, dpkg, autoPatchelfHook, makeWrapper +, dpkg +, autoPatchelfHook +, makeWrapper , fetchurl -, alsa-lib, openssl, udev +, alsa-lib +, openssl +, udev , libglvnd -, libX11, libXcursor, libXi, libXrandr +, libX11 +, libXcursor +, libXi +, libXrandr +, libXfixes , libpulseaudio , libva , ffmpeg +, libpng +, libjpeg8 +, curl }: stdenvNoCC.mkDerivation { @@ -15,7 +27,7 @@ stdenvNoCC.mkDerivation { version = "150_86e"; src = fetchurl { - url = "https://web.archive.org/web/20230124210253/https://builds.parsecgaming.com/package/parsec-linux.deb"; + url = "https://web.archive.org/web/20230531105208/https://builds.parsec.app/package/parsec-linux.deb"; sha256 = "sha256-wwBy86TdrHaH9ia40yh24yd5G84WTXREihR+9I6o6uU="; }; @@ -44,10 +56,14 @@ stdenvNoCC.mkDerivation { libpulseaudio libva ffmpeg + libpng + libjpeg8 + curl libX11 libXcursor libXi libXrandr + libXfixes ]; prepareParsec = '' @@ -74,6 +90,19 @@ stdenvNoCC.mkDerivation { runHook postInstall ''; + # Only the main binary needs to be patched, the wrapper script handles + # everything else. The libraries in `share/parsec/skel` would otherwise + # contain dangling references when copied out of the nix store. + dontAutoPatchelf = true; + + fixupPhase = '' + runHook preFixup + + autoPatchelf $out/bin + + runHook postFixup + ''; + meta = with lib; { homepage = "https://parsecgaming.com/"; changelog = "https://parsec.app/changelog"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/passky-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/passky-desktop/default.nix index 97df6ba94d..927035ed81 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/passky-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/passky-desktop/default.nix @@ -1,59 +1,70 @@ -{ lib, stdenv, fetchurl, appimageTools, undmg }: +{ lib +, stdenv +, fetchFromGitHub +, electron_22 +, makeWrapper +, makeDesktopItem +, copyDesktopItems +}: -let +stdenv.mkDerivation rec { pname = "passky-desktop"; - version = "7.1.0"; + version = "8.1.1"; - srcs = { - x86_64-linux = fetchurl { - url = "https://github.com/Rabbit-Company/Passky-Desktop/releases/download/v${version}/Passky-${version}.AppImage"; - sha256 = "1xnhrmmm018mmyzjq05mhbf673f0n81fh1k3kbfarbgk2kbwpq6y"; - }; - x86_64-darwin = fetchurl { - url = "https://github.com/Rabbit-Company/Passky-Desktop/releases/download/v${version}/Passky-${version}.dmg"; - sha256 = "0mm7hk4v7zvpjdqyw3nhk33x72j0gh3f59bx3q18azlm4dr61r2d"; - }; + src = fetchFromGitHub { + owner = "Rabbit-Company"; + repo = "Passky-Desktop"; + rev = "refs/tags/v${version}"; + sha256 = "1ma8s1bngjdzclcc4m5pcmavk38sidaskmz7dgfnv84y35si18dr"; }; - src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - appimageContents = appimageTools.extract { inherit pname version src; }; + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/passky + cp -r "." "$out/share/passky/electron" + + local resolution + for icon in $out/share/passky/electron/images/icons/icon*.png; do + resolution=''${icon%".png"} + resolution=''${resolution##*/icon-} + mkdir -p "$out/share/icons/hicolor/''${resolution}/apps" + ln -s "$icon" "$out/share/icons/hicolor/''${resolution}/apps/passky.png" + done + + mkdir "$out/share/applications" + makeWrapper ${electron_22}/bin/electron "$out/bin/passky" \ + --add-flags "$out/share/passky/electron/" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + + runHook postInstall + ''; + + desktopItems = [ + ( + makeDesktopItem { + name = "Passky"; + type = "Application"; + desktopName = "passky"; + comment = "Simple, modern, open source and secure password manager."; + icon = "passky"; + exec = "passky %U"; + categories = [ "Utility" ]; + startupWMClass = "Passky"; + } + ) + ]; + meta = with lib; { + description = "A simple, modern, lightweight, open source and secure password manager"; homepage = "https://passky.org"; downloadPage = "https://github.com/Rabbit-Company/Passky-Desktop/releases"; + changelog = "https://github.com/Rabbit-Company/Passky-Desktop/releases/tag/v${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ akkesm ]; - platforms = builtins.attrNames srcs; + mainProgram = "passky"; + platforms = platforms.unix; }; - - linux = appimageTools.wrapType2 { - inherit pname version src meta; - - extraInstallCommands = '' - mv $out/bin/${pname}-${version} $out/bin/${pname} - - install -D ${appimageContents}/passky.desktop \ - $out/share/applications/${pname}.desktop - - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - - cp -r ${appimageContents}/usr/share/icons $out/share - ''; - }; - - darwin = stdenv.mkDerivation { - inherit pname version src meta; - - nativeBuildInputs = [ undmg ]; - - sourceRoot = "."; - - installPhase = '' - mkdir -p $out/Applications - cp -r *.app $out/Applications - ''; - }; -in -if stdenv.isDarwin - then darwin - else linux +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/perkeep/default.nix b/third_party/nixpkgs/pkgs/applications/misc/perkeep/default.nix index 2b14079ae6..da67c39ab5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/perkeep/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/perkeep/default.nix @@ -3,12 +3,12 @@ let gouiJS = fetchurl { url = "https://storage.googleapis.com/perkeep-release/gopherjs/goui.js"; - sha256 = "0xbkdpd900gnmzj8p0x38dn4sv170pdvgzcvzsq70s80p6ykkh6g"; + hash = "sha256-z8A5vbkAaXCw/pv9t9sFJ2xNbEOjg4vkr/YBkNptc3U="; }; publisherJS = fetchurl { url = "https://storage.googleapis.com/perkeep-release/gopherjs/publisher.js"; - sha256 = "09hd7p0xscqnh612jbrjvh3njmlm4292zd5sbqx2lg0aw688q8p2"; + hash = "sha256-4iKMkOEKPCo6Xrq0L5IglVZpB9wyLymCgRYz3cE9DSY="; }; packages = [ @@ -19,7 +19,8 @@ let "perkeep.org/cmd/pk-mount" ]; -in buildGoModule rec { +in +buildGoModule rec { pname = "perkeep"; version = "0.11"; @@ -27,10 +28,10 @@ in buildGoModule rec { owner = "perkeep"; repo = "perkeep"; rev = version; - sha256 = "07j5gplk4kcrbazyg4m4bwggzlz5gk89h90r14jvfcpms7v5nrll"; + hash = "sha256-lGZb9tH1MrclCRkkmNB85dP/Hl+kkue/WplNMul9RR4="; }; - vendorSha256 = "1af9a6r9qfrak0n5xyv9z8n7gn7xw2sdjn4s9bwwidkrdm81iq6b"; + vendorHash = "sha256-y+AYUG15tsj5SppY2bTg/dh3LPpp+14smCo7nLJRyak="; deleteVendor = true; # Vendor is out of sync with go.mod buildPhase = '' @@ -54,6 +55,6 @@ in buildGoModule rec { description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; homepage = "https://perkeep.org"; license = licenses.asl20; - maintainers = with maintainers; [ cstrahan danderson kalbasit ]; + maintainers = with maintainers; [ danderson kalbasit ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch b/third_party/nixpkgs/pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch deleted file mode 100644 index 4555f8a870..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/phoc/0001-handle-outputs-that-arent-in-the-layout.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/types/wlr_output_layout.c b/types/wlr_output_layout.c -index eb672f06..f0f546da 100644 ---- a/types/wlr_output_layout.c -+++ b/types/wlr_output_layout.c -@@ -242,6 +242,9 @@ bool wlr_output_layout_contains_point(struct wlr_output_layout *layout, - if (reference) { - struct wlr_output_layout_output *l_output = - wlr_output_layout_get(layout, reference); -+ if (!l_output) { -+ return false; -+ } - struct wlr_box *box = output_layout_output_get_box(l_output); - return wlr_box_contains_point(box, lx, ly); - } else { \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix b/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix index babd3578d2..db53bf937a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/phoc/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchFromGitLab +, fetchurl , fetchpatch , meson , ninja @@ -16,6 +16,8 @@ , libdrm , libxkbcommon , wlroots +, xorg +, nixosTests }: let @@ -25,43 +27,19 @@ let # https://source.puri.sm/Librem5/phosh/-/issues/422 (fetchpatch { name = "0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch"; - url = "https://source.puri.sm/Librem5/wlroots/-/commit/4f66b0931aaaee65367102e9c4ccb736097412c7.patch"; - hash = "sha256-2Vy5a4lWh8FP2PN6xRIZv6IlUuLZibT0MYW+EyvVULs="; + url = "https://gitlab.gnome.org/World/Phosh/phoc/-/raw/acb17171267ae0934f122af294d628ad68b09f88/subprojects/packagefiles/wlroots/0001-Revert-layer-shell-error-on-0-dimension-without-anch.patch"; + hash = "sha256-uNJaYwkZImkzNUEqyLCggbXAoIRX5h2eJaGbSHj1B+o="; }) - - # xdg-activation: Deduplicate token creation code - (fetchpatch { - name = "xdg-activation-deduplicate-token-creation-code.patch"; - url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/dd03d839ab56c3e5d7c607a8d76e58e0b75edb85.patch"; - sha256 = "sha256-mxt68MISC24xpaBtVSc1F2W4cyNs5wQowtbUQH9Eqr8="; - }) - - # seat: Allow to cancel touches - (fetchpatch { - name = "seat-Allow-to-cancel-touches.patch"; - url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/17b2b06633729f1826715c1d0b84614aa3cedb3a.patch"; - sha256 = "sha256-BAeXa3ZB5TXnlq0ZP2+rZlVXEPWpLP4Wi4TLwoXjkz4="; - }) - - # From - # https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/13fcdba75cf5f21cfd49c1a05f4fa62f77619b40 - # which has been merged upstream, but doesn't cleanly apply on to the - # latest released version. - ./0001-handle-outputs-that-arent-in-the-layout.patch ]; }); in stdenv.mkDerivation rec { pname = "phoc"; - version = "0.27.0"; + version = "0.31.0"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - group = "World"; - owner = "Phosh"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-4/Fxo72KXLy3gxXMS+PrTUbZl0EFt2GPMXg8+/fE7MY="; - fetchSubmodules = true; + src = fetchurl { + # This tarball includes the meson wrapped subproject 'gmobile'. + url = "https://storage.puri.sm/releases/phoc/phoc-${version}.tar.xz"; + hash = "sha256-P7Bs9JMv6KNKo4d2ID0/Ba4+Nel6DMn8o4I7EDvY4vY="; }; nativeBuildInputs = [ @@ -83,6 +61,7 @@ in stdenv.mkDerivation rec { gnome.mutter wayland phocWlroots + xorg.xcbutilwm ]; mesonFlags = ["-Dembed-wlroots=disabled"]; @@ -92,6 +71,8 @@ in stdenv.mkDerivation rec { patchShebangs build-aux/post_install.py ''; + passthru.tests.phosh = nixosTests.phosh; + meta = with lib; { description = "Wayland compositor for mobile phones like the Librem 5"; homepage = "https://gitlab.gnome.org/World/Phosh/phoc"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pomotroid/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pomotroid/default.nix deleted file mode 100644 index dfe76aa92f..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/pomotroid/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv, lib, fetchurl, makeWrapper, makeDesktopItem, copyDesktopItems, electron }: - -let - version = "0.13.0"; - appIcon = fetchurl { - url = "https://raw.githubusercontent.com/Splode/pomotroid/v${version}/static/icon.png"; - sha256 = "sha256-BEPoOBErw5ZCeK4rtdxdwZZLimbpglu1Cu++4xzuVUs="; - }; - -in stdenv.mkDerivation rec { - pname = "pomotroid"; - inherit version; - - src = fetchurl { - url = "https://github.com/Splode/pomotroid/releases/download/v${version}/${pname}-${version}-linux.tar.gz"; - sha256 = "sha256-AwpVnvwWQd/cgmZvtr5NprnLyeXz6ym4Fywc808tcSc="; - }; - - nativeBuildInputs = [ - makeWrapper - copyDesktopItems - ]; - - desktopItems = [ - (makeDesktopItem { - name = pname; - exec = "pomotroid"; - icon = "pomotroid"; - comment = meta.description; - desktopName = "Pomotroid"; - genericName = "Pomodoro Application"; - }) - ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/opt/pomotroid $out/share/pomotroid $out/share/pixmaps - - cp -r ./ $out/opt/pomotroid - mv $out/opt/pomotroid/{locales,resources} $out/share/pomotroid - cp ${appIcon} $out/share/pixmaps/pomotroid.png - - makeWrapper ${electron}/bin/electron $out/bin/pomotroid \ - --add-flags $out/share/pomotroid/resources/app.asar - - runHook postInstall - ''; - - meta = with lib; { - description = "Simple and visually-pleasing Pomodoro timer"; - homepage = "https://splode.github.io/pomotroid"; - license = licenses.mit; - maintainers = with maintainers; [ wolfangaukang ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock index 09971788db..3c025d6e88 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/pot/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -18,10 +18,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "aho-corasick" -version = "1.0.2" +name = "aes" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +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", + "const-random", + "getrandom 0.2.10", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] @@ -41,6 +65,12 @@ dependencies = [ "alloc-no-stdlib", ] +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + [[package]] name = "android-tzdata" version = "0.1.1" @@ -58,24 +88,23 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arboard" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" +checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc" dependencies = [ "clipboard-win", - "core-graphics", + "core-graphics 0.22.3", "image", "log", "objc", "objc-foundation", "objc_id", - "once_cell", "parking_lot", "thiserror", "winapi", @@ -118,7 +147,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] @@ -149,17 +178,17 @@ dependencies = [ "log", "parking", "polling", - "rustix", + "rustix 0.37.23", "slab", - "socket2", + "socket2 0.4.9", "waker-fn", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -177,7 +206,7 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "rustix", + "rustix 0.37.23", "signal-hook", "windows-sys 0.48.0", ] @@ -190,7 +219,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -201,13 +230,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.71" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a564d521dd56509c4c47480d00b80ee55f7e385ae48db5744c67ad50c92d2ebf" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -217,7 +246,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" dependencies = [ "atk-sys", - "bitflags", + "bitflags 1.3.2", "glib", "libc", ] @@ -234,6 +263,15 @@ dependencies = [ "system-deps 6.1.1", ] +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + [[package]] name = "atomic-waker" version = "1.1.1" @@ -259,9 +297,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -280,9 +318,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bit_field" @@ -296,6 +340,15 @@ 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" +dependencies = [ + "serde", +] + [[package]] name = "block" version = "0.1.6" @@ -321,7 +374,7 @@ dependencies = [ "async-lock", "async-task", "atomic-waker", - "fastrand", + "fastrand 1.9.0", "futures-lite", "log", ] @@ -349,9 +402,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05" +checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" dependencies = [ "memchr", "serde", @@ -363,6 +416,16 @@ version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +[[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 = "bytecount" version = "0.6.3" @@ -390,13 +453,34 @@ dependencies = [ "serde", ] +[[package]] +name = "bzip2" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +dependencies = [ + "bzip2-sys", + "libc", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "cairo-rs" version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-sys-rs", "glib", "libc", @@ -425,10 +509,23 @@ dependencies = [ ] [[package]] -name = "cc" -version = "1.0.79" +name = "castaway" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" +dependencies = [ + "rustversion", +] + +[[package]] +name = "cc" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "jobserver", + "libc", +] [[package]] name = "cesu8" @@ -458,9 +555,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", "target-lexicon", @@ -474,15 +571,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "95ed24df0632f708f5f6d8082675bef2596f7084dee3dd55f632290bf35bfe0f" dependencies = [ "android-tzdata", "iana-time-zone", + "js-sys", "num-traits", "serde", - "winapi", + "time 0.1.45", + "wasm-bindgen", + "windows-targets 0.48.5", ] [[package]] @@ -491,6 +591,16 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cca491388666e04d7248af3f60f0c40cfb0991c72205595d7c396e3510207d1a" +[[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 = "clipboard-win" version = "4.5.0" @@ -508,12 +618,12 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "cocoa-foundation", "core-foundation", - "core-graphics", - "foreign-types", + "core-graphics 0.22.3", + "foreign-types 0.3.2", "libc", "objc", ] @@ -524,11 +634,11 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-foundation", "core-graphics-types", - "foreign-types", + "foreign-types 0.3.2", "libc", "objc", ] @@ -549,6 +659,19 @@ dependencies = [ "memchr", ] +[[package]] +name = "compact_str" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +dependencies = [ + "castaway", + "cfg-if", + "itoa 1.0.9", + "ryu", + "static_assertions", +] + [[package]] name = "concurrent-queue" version = "2.2.0" @@ -558,6 +681,40 @@ 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 = "const-random" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +dependencies = [ + "const-random-macro", + "proc-macro-hack", +] + +[[package]] +name = "const-random-macro" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +dependencies = [ + "getrandom 0.2.10", + "once_cell", + "proc-macro-hack", + "tiny-keccak", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + [[package]] name = "convert_case" version = "0.4.0" @@ -586,10 +743,23 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-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", ] @@ -599,7 +769,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "libc", ] @@ -613,6 +783,21 @@ 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.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + [[package]] name = "crc32fast" version = "1.3.2" @@ -656,6 +841,16 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.16" @@ -705,7 +900,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -739,7 +934,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -750,7 +945,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -764,6 +959,26 @@ dependencies = [ "winapi", ] +[[package]] +name = "der" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c" +dependencies = [ + "const-oid", + "pem-rfc7468", + "zeroize", +] + +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +dependencies = [ + "serde", +] + [[package]] name = "derivative" version = "2.2.0" @@ -806,7 +1021,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", + "const-oid", "crypto-common", + "subtle", +] + +[[package]] +name = "digest_auth" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3054f4e81d395e50822796c5e99ca522e6ba7be98947d6d4b0e5e61640bdb894" +dependencies = [ + "digest", + "hex", + "md-5", + "rand 0.8.5", + "sha2", ] [[package]] @@ -879,18 +1109,24 @@ checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" [[package]] name = "display-info" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06d9c500164fbeb11a2d7dc1df709882dad868a56240c5c972b460b3e6058d42" +checksum = "4f9fb6a73233755f827129d80a80a6a16448122040537c881248a09d5c80ab6b" dependencies = [ "anyhow", - "core-graphics", + "core-graphics 0.23.1", "fxhash", "widestring", "windows 0.48.0", "xcb", ] +[[package]] +name = "dotenvy" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" + [[package]] name = "downcast-rs" version = "1.2.0" @@ -920,21 +1156,24 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +dependencies = [ + "serde", +] [[package]] name = "embed-resource" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7f1e82a60222fc67bfd50d752a9c89da5cce4c39ed39decc84a443b07bbd69a" +checksum = "fd0a2c9b742a980060d22545a7a83b573acd6b73045b9de6370c9530ce652f27" dependencies = [ "cc", "rustc_version", "toml 0.7.6", "vswhom", - "winreg 0.11.0", + "winreg 0.51.0", ] [[package]] @@ -945,23 +1184,24 @@ checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] [[package]] name = "enigo" -version = "0.1.2" -source = "git+https://github.com/enigo-rs/enigo?rev=c53be78#c53be78a4cdbd2d19ccda59f990050d8591bb969" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "802e4b2ae123615659085369b453cba87c5562e46ed8050a909fee18a9bc3157" dependencies = [ - "core-graphics", + "core-graphics 0.23.1", "libc", "objc", "pkg-config", - "windows 0.48.0", + "windows 0.51.1", ] [[package]] @@ -982,7 +1222,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -993,9 +1233,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" dependencies = [ "errno-dragonfly", "libc", @@ -1022,6 +1262,17 @@ dependencies = [ "str-buf", ] +[[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + [[package]] name = "event-listener" version = "2.5.3" @@ -1053,6 +1304,12 @@ dependencies = [ "instant", ] +[[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" @@ -1062,6 +1319,15 @@ 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" @@ -1074,16 +1340,22 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "windows-sys 0.48.0", ] +[[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + [[package]] name = "fixedbitset" version = "0.4.2" @@ -1092,9 +1364,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide", @@ -1110,7 +1382,7 @@ dependencies = [ "futures-sink", "nanorand", "pin-project", - "spin", + "spin 0.9.8", ] [[package]] @@ -1125,7 +1397,28 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared", + "foreign-types-shared 0.1.1", +] + +[[package]] +name = "foreign-types" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" +dependencies = [ + "foreign-types-macros", + "foreign-types-shared 0.3.1", +] + +[[package]] +name = "foreign-types-macros" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.29", ] [[package]] @@ -1134,6 +1427,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "foreign-types-shared" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" + [[package]] name = "form_urlencoded" version = "1.2.0" @@ -1143,6 +1442,25 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fraction" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678" +dependencies = [ + "lazy_static", + "num", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + [[package]] name = "futf" version = "0.1.5" @@ -1160,6 +1478,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -1179,6 +1498,17 @@ dependencies = [ "futures-util", ] +[[package]] +name = "futures-intrusive" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot", +] + [[package]] name = "futures-io" version = "0.3.28" @@ -1191,7 +1521,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -1208,7 +1538,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -1255,7 +1585,7 @@ version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk-sys", @@ -1271,7 +1601,7 @@ version = "0.15.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gdk-pixbuf-sys", "gio", "glib", @@ -1404,9 +1734,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" @@ -1414,7 +1744,7 @@ version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-io", @@ -1444,7 +1774,7 @@ version = "0.15.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "futures-channel", "futures-core", "futures-executor", @@ -1491,9 +1821,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1391ab1f92ffcc08911957149833e682aa3fe252b9f45f966d2ef972274c97df" +checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" dependencies = [ "aho-corasick", "bstr", @@ -1520,7 +1850,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" dependencies = [ "atk", - "bitflags", + "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", @@ -1570,9 +1900,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.20" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ "bytes", "fnv", @@ -1607,6 +1937,19 @@ name = "hashbrown" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.0", +] [[package]] name = "heck" @@ -1622,6 +1965,9 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] [[package]] name = "hermit-abi" @@ -1635,6 +1981,33 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hkdf" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +dependencies = [ + "hmac", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys 0.48.0", +] + [[package]] name = "html5ever" version = "0.25.2" @@ -1685,9 +2058,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 = "hyper" @@ -1706,7 +2079,7 @@ dependencies = [ "httpdate", "itoa 1.0.9", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1794,9 +2167,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.24.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" dependencies = [ "bytemuck", "byteorder", @@ -1811,6 +2184,25 @@ dependencies = [ "tiff", ] +[[package]] +name = "include_dir" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "indexmap" version = "1.9.3" @@ -1830,6 +2222,7 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", + "serde", ] [[package]] @@ -1841,6 +2234,35 @@ dependencies = [ "cfb", ] +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[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" @@ -1867,6 +2289,24 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +[[package]] +name = "itertools" +version = "0.10.5" +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", +] + [[package]] name = "itoa" version = "0.4.8" @@ -1885,7 +2325,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf053e7843f2812ff03ef5afe34bb9c06ffee120385caad4f6b9967fcd37d41c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "glib", "javascriptcore-rs-sys", ] @@ -1922,6 +2362,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" +[[package]] +name = "jobserver" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +dependencies = [ + "libc", +] + [[package]] name = "jpeg-decoder" version = "0.3.0" @@ -1952,6 +2401,26 @@ dependencies = [ "treediff", ] +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + [[package]] name = "kuchiki" version = "0.8.1" @@ -1969,6 +2438,9 @@ 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 = "lebe" @@ -1996,7 +2468,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" dependencies = [ "gtk-sys", - "libloading", + "libloading 0.7.4", "once_cell", ] @@ -2016,6 +2488,15 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "libloader" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d39e73d63036eb973937a3d247e8c9799b1cd0e131079ae8aba294cb0328073" +dependencies = [ + "libloading 0.7.4", +] + [[package]] name = "libloading" version = "0.7.4" @@ -2026,6 +2507,33 @@ dependencies = [ "winapi", ] +[[package]] +name = "libloading" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" + +[[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" @@ -2035,12 +2543,222 @@ dependencies = [ "safemem", ] +[[package]] +name = "lingua" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dc858be45965c868f5fa4a3c57d61842ff8aa2f2b1308eea14babbee5ef2478" +dependencies = [ + "ahash", + "brotli", + "compact_str", + "fraction", + "include_dir", + "itertools 0.10.5", + "lingua-arabic-language-model", + "lingua-chinese-language-model", + "lingua-english-language-model", + "lingua-french-language-model", + "lingua-german-language-model", + "lingua-hindi-language-model", + "lingua-indonesian-language-model", + "lingua-italian-language-model", + "lingua-japanese-language-model", + "lingua-korean-language-model", + "lingua-malay-language-model", + "lingua-mongolian-language-model", + "lingua-portuguese-language-model", + "lingua-russian-language-model", + "lingua-spanish-language-model", + "lingua-thai-language-model", + "lingua-turkish-language-model", + "lingua-vietnamese-language-model", + "maplit", + "once_cell", + "rayon", + "regex", + "serde", + "serde-wasm-bindgen", + "serde_json", + "strum", + "strum_macros", + "wasm-bindgen", +] + +[[package]] +name = "lingua-arabic-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ada75100728990b05bacaec7693efebf0c8b911599ac0c082cb4ed576bf494d" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-chinese-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45a1e3a38a0920f6ddbd9b6a79a8c04cd927142713b595ba32be6b811603f7c6" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-english-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbd066693abb10083bb5b5fc1c494dda357170265021ad873ef582211817b8a8" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-french-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba406de05309b212790036e576aee4b1a71ce62b77fbd084df5bc8d7c624866f" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-german-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dd4041d542b6512d415c0ea6979333e5e88698b966dda7b9bf06029bf690a13" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-hindi-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f63659e514fa8c706d2ed0d7a04b98adb05b8c8d4bc37e3d12edb9d35ce24fd0" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-indonesian-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc06b8937f6adaad76b28fd009cbfaa6f876ebe5fa887d96dccd1dff2d21d9ad" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-italian-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6e138047ac4d681e419e37ad9e383878652ac19e67056ff16085d4cc82e590" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-japanese-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b34b94aa96a1bc0838ddda2c7912d0ebd7256bb21e7a2974e4dd8b186df501a8" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-korean-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35c47aa5e5dc8d029967375081aabda462faf10b070aefc1a175ea7f42f5267c" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-malay-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "771c6b7ab2865e2563e1ce19bf06611aad674c3f0a180ec43c03a9883e49c8aa" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-mongolian-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f53de502920af44b5d8ec7787895c0a81b0f5f43e3f3c2b80a240f2b605122c1" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-portuguese-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9df0be307b3f5e24e10e76a7841302c0ff4a6ebf818a11d3a3c5c4cecfcfe58b" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-russian-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dea97d6643e90ee4fc0043c728f0c06cdd9e69d4970fd1983e5c59b3448a676e" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-spanish-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d45be9bede9b9d6d53b6e06047822a18dbd83e5d515736afecd85c1e71cc6070" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-thai-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "194b09209fc63d986d8ef9505689756eff1935fa52fd91031b60e7d546ca3c76" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-turkish-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b517e12fe94ce80e7f8f380fdd2c0223bcfe351c0898c9a83f56f78b3afad81" +dependencies = [ + "include_dir", +] + +[[package]] +name = "lingua-vietnamese-language-model" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07d08afaf263906aa3f2bfaffaf52eecd368992685e2468f1ba7f85f3e41fd49" +dependencies = [ + "include_dir", +] + [[package]] name = "linux-raw-sys" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +[[package]] +name = "linux-raw-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" + [[package]] name = "lock_api" version = "0.4.10" @@ -2053,9 +2771,12 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +dependencies = [ + "value-bag", +] [[package]] name = "loom" @@ -2080,25 +2801,15 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "mac-notification-sys" -version = "0.5.6" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5" +checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" dependencies = [ "cc", "dirs-next", "objc-foundation", "objc_id", - "time", -] - -[[package]] -name = "macos-accessibility-client" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edf7710fbff50c24124331760978fb9086d6de6288dcdb38b25a97f8b1bdebbb" -dependencies = [ - "core-foundation", - "core-foundation-sys", + "time 0.3.28", ] [[package]] @@ -2110,6 +2821,12 @@ dependencies = [ "libc", ] +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + [[package]] name = "markup5ever" version = "0.10.1" @@ -2140,10 +2857,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] -name = "memchr" -version = "2.5.0" +name = "md-5" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +dependencies = [ + "digest", +] + +[[package]] +name = "memchr" +version = "2.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e" [[package]] name = "memoffset" @@ -2217,6 +2943,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", + "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.48.0", ] @@ -2227,7 +2954,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffd272ac3ad817af3d158eecd4d4ba6f92a1fa5f7255e3c0d63b72d4dac12edd" dependencies = [ - "core-graphics", + "core-graphics 0.22.3", "winapi", "x11-dl", ] @@ -2265,7 +2992,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", "ndk-sys", "num_enum", @@ -2299,7 +3026,7 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.6.5", @@ -2307,15 +3034,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", - "static_assertions", ] [[package]] @@ -2335,10 +3061,41 @@ dependencies = [ ] [[package]] -name = "notify-rust" -version = "4.8.0" +name = "notify" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bfa211d18e360f08e36c364308f394b5eb23a6629150690e109a916dc6f610e" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.0", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "serde", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "notify-debouncer-mini" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e55ee272914f4563a2f8b8553eb6811f3c0caea81c756346bad15b7e3ef969f0" +dependencies = [ + "crossbeam-channel", + "notify", + "serde", +] + +[[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", @@ -2357,6 +3114,57 @@ dependencies = [ "winapi", ] +[[package]] +name = "num" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-bigint-dig" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" +dependencies = [ + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.5", + "smallvec", + "zeroize", +] + +[[package]] +name = "num-complex" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" +dependencies = [ + "num-traits", +] + [[package]] name = "num-integer" version = "0.1.45" @@ -2368,10 +3176,10 @@ dependencies = [ ] [[package]] -name = "num-rational" -version = "0.4.1" +name = "num-iter" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ "autocfg", "num-integer", @@ -2379,12 +3187,25 @@ dependencies = [ ] [[package]] -name = "num-traits" -version = "0.2.15" +name = "num-rational" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg", + "num-bigint", + "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]] @@ -2418,6 +3239,15 @@ dependencies = [ "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" @@ -2459,9 +3289,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -2484,13 +3314,13 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cfg-if", - "foreign-types", + "foreign-types 0.3.2", "libc", "once_cell", "openssl-macros", @@ -2505,7 +3335,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -2516,9 +3346,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" dependencies = [ "cc", "libc", @@ -2542,6 +3372,17 @@ dependencies = [ "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" @@ -2564,7 +3405,7 @@ version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", "glib", "libc", "once_cell", @@ -2609,15 +3450,53 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] +[[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 = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + [[package]] name = "pathdiff" version = "0.2.1" 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", + "hmac", + "password-hash", + "sha2", +] + +[[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" @@ -2626,12 +3505,12 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 1.9.3", + "indexmap 2.0.0", ] [[package]] @@ -2734,29 +3613,29 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2764,6 +3643,27 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs1" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" +dependencies = [ + "der", + "pkcs8", + "spki", +] + +[[package]] +name = "pkcs8" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.27" @@ -2776,21 +3676,21 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "indexmap 1.9.3", "line-wrap", "quick-xml 0.29.0", "serde", - "time", + "time 0.3.28", ] [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", @@ -2804,7 +3704,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "concurrent-queue", "libc", @@ -2817,14 +3717,17 @@ dependencies = [ name = "pot" version = "0.0.0" dependencies = [ - "base64 0.21.2", - "core-graphics", + "arboard", + "base64 0.21.3", "dirs 5.0.1", - "dunce", "image", - "macos-accessibility-client", + "libloader", + "libloading 0.8.0", + "lingua", + "log", "mouse_position", "once_cell", + "reqwest_dav", "screenshots", "selection", "serde", @@ -2832,11 +3735,17 @@ dependencies = [ "tauri", "tauri-build", "tauri-plugin-autostart", + "tauri-plugin-fs-watch", + "tauri-plugin-log", "tauri-plugin-single-instance", + "tauri-plugin-sql", + "tauri-plugin-store", + "thiserror", "tiny_http", - "toml 0.7.6", + "walkdir", "window-shadows", "windows 0.44.0", + "zip", ] [[package]] @@ -2938,9 +3847,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.31" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -3060,7 +3969,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3069,7 +3978,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3085,14 +3994,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.3", - "regex-syntax 0.7.4", + "regex-automata 0.3.7", + "regex-syntax 0.7.5", ] [[package]] @@ -3106,13 +4015,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] @@ -3123,17 +4032,17 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.18" +version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" +checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "bytes", "encoding_rs", "futures-core", @@ -3164,7 +4073,25 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "winreg 0.10.1", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest_dav" +version = "0.1.3" +source = "git+https://github.com/pot-app/reqwest_dav.git#241363249e0fb2a12912ec04400fc55c93b4a079" +dependencies = [ + "async-trait", + "chrono", + "digest_auth", + "http", + "reqwest", + "serde", + "serde-xml-rs", + "serde_derive", + "serde_json", + "tokio", + "url", ] [[package]] @@ -3191,6 +4118,43 @@ dependencies = [ "windows 0.37.0", ] +[[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", + "web-sys", + "winapi", +] + +[[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" @@ -3212,14 +4176,57 @@ version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", "windows-sys 0.48.0", ] +[[package]] +name = "rustix" +version = "0.38.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed6248e1caa625eb708e266e06159f135e8c26f2bb7ceb72dc4b2766d0340964" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.5", + "windows-sys 0.48.0", +] + +[[package]] +name = "rustls" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +dependencies = [ + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +dependencies = [ + "base64 0.21.3", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -3270,11 +4277,12 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "screenshots" -version = "0.6.0" -source = "git+https://github.com/pot-app/screenshots-rs#f19fde2ced8306f2bb5113c11002f24d710c6914" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa2e9c30ca7f738a53367336d820f4a9af213c706ea55266d608d38e3b5cbff" dependencies = [ "anyhow", - "core-graphics", + "core-graphics 0.22.3", "dbus", "display-info", "fxhash", @@ -3286,12 +4294,22 @@ dependencies = [ ] [[package]] -name = "security-framework" -version = "2.9.1" +name = "sct" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "bitflags", + "ring", + "untrusted", +] + +[[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", @@ -3300,9 +4318,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -3310,8 +4328,9 @@ dependencies = [ [[package]] name = "selection" -version = "0.1.0" -source = "git+https://github.com/pot-app/Selection#8b44b68fbfe614aff190610ec03d52b6f3b57f19" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09de39c8f10d37a7b9c2a9cb224dbe4535525cbe17ccf37c21419123ab54a197" dependencies = [ "arboard", "enigo", @@ -3326,7 +4345,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cssparser", "derive_more", "fxhash", @@ -3351,29 +4370,52 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.171" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] -name = "serde_derive" -version = "1.0.171" +name = "serde-wasm-bindgen" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" +dependencies = [ + "js-sys", + "serde", + "wasm-bindgen", +] + +[[package]] +name = "serde-xml-rs" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb3aa78ecda1ebc9ec9847d5d3aba7d618823446a049ba2491940506da6e2782" +dependencies = [ + "log", + "serde", + "thiserror", + "xml-rs", +] + +[[package]] +name = "serde_derive" +version = "1.0.188" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa 1.0.9", "ryu", @@ -3382,13 +4424,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.14" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d89a8107374290037607734c0b73a85db7ed80cae314b3c5791f192a496e731" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -3414,30 +4456,31 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.1.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e47d95bc83ed33b2ecf84f4187ad1ab9685d18ff28db000c99deac8ce180e3" +checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "chrono", "hex", "indexmap 1.9.3", + "indexmap 2.0.0", "serde", "serde_json", "serde_with_macros", - "time", + "time 0.3.28", ] [[package]] name = "serde_with_macros" -version = "3.1.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea3cee93715c2e266b9338b7544da68a9f24e227722ba482bd1c024367c77c65" +checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -3504,10 +4547,20 @@ dependencies = [ ] [[package]] -name = "signal-hook" -version = "0.3.16" +name = "shared_child" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b824b6e687aff278cdbf3b36f07aa52d4bd4099699324d5da86a2ebce3aa00b3" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +dependencies = [ + "libc", + "winapi", +] + +[[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", @@ -3523,22 +4576,32 @@ dependencies = [ ] [[package]] -name = "simd-adler32" -version = "0.3.5" +name = "signature" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +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.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[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", ] @@ -3559,13 +4622,23 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +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", + "bitflags 1.3.2", "gio", "glib", "libc", @@ -3579,7 +4652,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "009ef427103fcb17f802871647a7fa6c60cbb654b4c4e4c0ac60a31c5f6dc9cf" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gio-sys", "glib-sys", "gobject-sys", @@ -3587,6 +4660,12 @@ dependencies = [ "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" @@ -3596,6 +4675,229 @@ 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 = "sqlformat" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" +dependencies = [ + "itertools 0.11.0", + "nom", + "unicode_categories", +] + +[[package]] +name = "sqlx" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +dependencies = [ + "sqlx-core", + "sqlx-macros", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", +] + +[[package]] +name = "sqlx-core" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +dependencies = [ + "ahash", + "atoi", + "byteorder", + "bytes", + "crc", + "crossbeam-queue", + "dotenvy", + "either", + "event-listener", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-io", + "futures-util", + "hashlink", + "hex", + "indexmap 2.0.0", + "log", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rustls", + "rustls-pemfile", + "serde", + "serde_json", + "sha2", + "smallvec", + "sqlformat", + "thiserror", + "time 0.3.28", + "tokio", + "tokio-stream", + "tracing", + "url", + "webpki-roots", +] + +[[package]] +name = "sqlx-macros" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +dependencies = [ + "proc-macro2", + "quote", + "sqlx-core", + "sqlx-macros-core", + "syn 1.0.109", +] + +[[package]] +name = "sqlx-macros-core" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +dependencies = [ + "dotenvy", + "either", + "heck 0.4.1", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core", + "sqlx-mysql", + "sqlx-postgres", + "sqlx-sqlite", + "syn 1.0.109", + "tempfile", + "tokio", + "url", +] + +[[package]] +name = "sqlx-mysql" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" +dependencies = [ + "atoi", + "base64 0.21.3", + "bitflags 2.4.0", + "byteorder", + "bytes", + "crc", + "digest", + "dotenvy", + "either", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "generic-array", + "hex", + "hkdf", + "hmac", + "itoa 1.0.9", + "log", + "md-5", + "memchr", + "once_cell", + "percent-encoding", + "rand 0.8.5", + "rsa", + "serde", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time 0.3.28", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-postgres" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +dependencies = [ + "atoi", + "base64 0.21.3", + "bitflags 2.4.0", + "byteorder", + "crc", + "dotenvy", + "etcetera", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "hex", + "hkdf", + "hmac", + "home", + "itoa 1.0.9", + "log", + "md-5", + "memchr", + "once_cell", + "rand 0.8.5", + "serde", + "serde_json", + "sha1", + "sha2", + "smallvec", + "sqlx-core", + "stringprep", + "thiserror", + "time 0.3.28", + "tracing", + "whoami", +] + +[[package]] +name = "sqlx-sqlite" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +dependencies = [ + "atoi", + "flume", + "futures-channel", + "futures-core", + "futures-executor", + "futures-intrusive", + "futures-util", + "libsqlite3-sys", + "log", + "percent-encoding", + "serde", + "sqlx-core", + "time 0.3.28", + "tracing", + "url", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -3649,12 +4951,48 @@ dependencies = [ "quote", ] +[[package]] +name = "stringprep" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" +dependencies = [ + "finl_unicode", + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "strsim" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strum" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" + +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", +] + +[[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" @@ -3668,15 +5006,28 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.26" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" 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 = "system-deps" version = "5.0.0" @@ -3696,7 +5047,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ - "cfg-expr 0.15.3", + "cfg-expr 0.15.4", "heck 0.4.1", "pkg-config", "toml 0.7.6", @@ -3709,12 +5060,12 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6d198e01085564cea63e976ad1566c1ba2c2e4cc79578e35d9f05521505e31" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "cc", "cocoa", "core-foundation", - "core-graphics", + "core-graphics 0.22.3", "crossbeam-channel", "dirs-next", "dispatch", @@ -3754,9 +5105,9 @@ dependencies = [ [[package]] name = "tao-macros" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b27a4bcc5eb524658234589bdffc7e7bfb996dbae6ce9393bfd39cb4159b445" +checksum = "ec114582505d158b669b136e6851f85840c109819d77c42bb7c0709f727d18c2" dependencies = [ "proc-macro2", "quote", @@ -3765,9 +5116,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.39" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec96d2ffad078296368d46ff1cb309be1c23c513b4ab0e22a45de0185275ac96" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -3776,9 +5127,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.9" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tauri" @@ -3787,7 +5138,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fbe522898e35407a8e60dc3870f7579fea2fc262a6a6072eccdd37ae1e1d91e" dependencies = [ "anyhow", - "base64 0.21.2", + "base64 0.21.3", "bytes", "cocoa", "dirs-next", @@ -3806,6 +5157,8 @@ dependencies = [ "objc", "once_cell", "open", + "os_info", + "os_pipe", "percent-encoding", "rand 0.8.5", "raw-window-handle", @@ -3817,7 +5170,9 @@ dependencies = [ "serde_json", "serde_repr", "serialize-to-javascript", + "shared_child", "state", + "sys-locale", "tar", "tauri-macros", "tauri-runtime", @@ -3825,7 +5180,7 @@ dependencies = [ "tauri-utils", "tempfile", "thiserror", - "time", + "time 0.3.28", "tokio", "url", "uuid", @@ -3858,7 +5213,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54ad2d49fdeab4a08717f5b49a163bdc72efc3b1950b6758245fcde79b645e1a" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "brotli", "ico", "json-patch", @@ -3873,7 +5228,7 @@ dependencies = [ "sha2", "tauri-utils", "thiserror", - "time", + "time 0.3.28", "uuid", "walkdir", ] @@ -3895,7 +5250,7 @@ dependencies = [ [[package]] name = "tauri-plugin-autostart" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#51f20b438e42050cdbfd6c6dc72dbc985a31bbc1" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" dependencies = [ "auto-launch", "log", @@ -3905,10 +5260,39 @@ dependencies = [ "thiserror", ] +[[package]] +name = "tauri-plugin-fs-watch" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" +dependencies = [ + "log", + "notify", + "notify-debouncer-mini", + "serde", + "serde_json", + "tauri", + "thiserror", +] + +[[package]] +name = "tauri-plugin-log" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" +dependencies = [ + "byte-unit", + "fern", + "log", + "serde", + "serde_json", + "serde_repr", + "tauri", + "time 0.3.28", +] + [[package]] name = "tauri-plugin-single-instance" version = "0.0.0" -source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#51f20b438e42050cdbfd6c6dc72dbc985a31bbc1" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" dependencies = [ "log", "serde", @@ -3919,6 +5303,34 @@ dependencies = [ "zbus", ] +[[package]] +name = "tauri-plugin-sql" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" +dependencies = [ + "futures-core", + "log", + "serde", + "serde_json", + "sqlx", + "tauri", + "thiserror", + "time 0.3.28", + "tokio", +] + +[[package]] +name = "tauri-plugin-store" +version = "0.0.0" +source = "git+https://github.com/tauri-apps/plugins-workspace?branch=v1#5b814f56e6368fdec46c4ddb04a07e0923ff995a" +dependencies = [ + "log", + "serde", + "serde_json", + "tauri", + "thiserror", +] + [[package]] name = "tauri-runtime" version = "0.14.0" @@ -4011,15 +5423,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.6.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ - "autocfg", "cfg-if", - "fastrand", + "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix", + "rustix 0.38.10", "windows-sys 0.48.0", ] @@ -4042,22 +5453,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.43" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.43" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -4072,9 +5483,9 @@ dependencies = [ [[package]] name = "tiff" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211" dependencies = [ "flate2", "jpeg-decoder", @@ -4083,11 +5494,25 @@ dependencies = [ [[package]] name = "time" -version = "0.3.23" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +dependencies = [ + "deranged", "itoa 1.0.9", + "libc", + "num_threads", "serde", "time-core", "time-macros", @@ -4101,13 +5526,22 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.10" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96ba15a897f3c86766b757e5ac7221554c6750054d74d5b28844fce5fb36a6c4" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" 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 = "tiny_http" version = "0.12.0" @@ -4137,18 +5571,17 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.3", "windows-sys 0.48.0", ] @@ -4162,6 +5595,17 @@ dependencies = [ "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", + "tokio", +] + [[package]] name = "tokio-util" version = "0.7.8" @@ -4232,6 +5676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -4245,7 +5690,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", ] [[package]] @@ -4334,9 +5779,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -4369,10 +5814,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] -name = "url" -version = "2.4.0" +name = "unicode_categories" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" + +[[package]] +name = "untrusted" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -4386,6 +5843,12 @@ 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.4.1" @@ -4401,6 +5864,12 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "value-bag" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" + [[package]] name = "vcpkg" version = "0.2.15" @@ -4476,6 +5945,12 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -4503,7 +5978,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", "wasm-bindgen-shared", ] @@ -4537,7 +6012,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.26", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4550,9 +6025,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" dependencies = [ "futures-util", "js-sys", @@ -4567,7 +6042,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" dependencies = [ - "bitflags", + "bitflags 1.3.2", "downcast-rs", "libc", "nix 0.24.3", @@ -4594,7 +6069,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "wayland-client", "wayland-commons", "wayland-scanner", @@ -4636,7 +6111,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8f859735e4a452aeb28c6c56a852967a8a76c8eb1cc32dbf931ad28a13d6370" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cairo-rs", "gdk", "gdk-sys", @@ -4661,7 +6136,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d76ca6ecc47aeba01ec61e480139dda143796abcae6f83bcddf50d6b5b1dcf3" dependencies = [ "atk-sys", - "bitflags", + "bitflags 1.3.2", "cairo-sys-rs", "gdk-pixbuf-sys", "gdk-sys", @@ -4677,6 +6152,15 @@ dependencies = [ "system-deps 6.1.1", ] +[[package]] +name = "webpki-roots" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" +dependencies = [ + "rustls-webpki", +] + [[package]] name = "webview2-com" version = "0.19.1" @@ -4721,6 +6205,12 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +[[package]] +name = "whoami" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50" + [[package]] name = "widestring" version = "1.0.2" @@ -4821,7 +6311,17 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", + "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]] @@ -4834,6 +6334,15 @@ dependencies = [ "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" @@ -4865,13 +6374,22 @@ dependencies = [ "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.1", + "windows-targets 0.48.5", ] [[package]] @@ -4891,17 +6409,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 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.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]] @@ -4918,9 +6436,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -4942,9 +6460,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -4966,9 +6484,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -4990,9 +6508,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -5014,9 +6532,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -5026,9 +6544,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -5050,15 +6568,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.0" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -5074,12 +6592,22 @@ dependencies = [ [[package]] name = "winreg" -version = "0.11.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if", - "winapi", + "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]] @@ -5109,7 +6637,7 @@ dependencies = [ "base64 0.13.1", "block", "cocoa", - "core-graphics", + "core-graphics 0.22.3", "crossbeam-channel", "dunce", "gdk", @@ -5192,20 +6720,20 @@ dependencies = [ [[package]] name = "xattr" -version = "0.2.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] [[package]] name = "xcb" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b90c622d513012e7419594a2138953603c63848cb189041e7b5dc04d3895da5" +checksum = "fb3acf6b0945550d37d3a683b8f7de9d9f66b2c14dc390313b34d7ac6f1b4089" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "quick-xml 0.28.2", ] @@ -5216,15 +6744,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" dependencies = [ - "nix 0.26.2", + "nix 0.26.4", "winapi", ] [[package]] name = "xml-rs" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a56c84a8ccd4258aed21c92f70c0f6dea75356b6892ae27c24139da456f9336" +checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" [[package]] name = "zbus" @@ -5250,7 +6778,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "nix 0.26.2", + "nix 0.26.4", "once_cell", "ordered-stream", "rand 0.8.5", @@ -5292,15 +6820,60 @@ dependencies = [ "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 = [ + "aes", "byteorder", + "bzip2", + "constant_time_eq", "crc32fast", "crossbeam-utils", + "flate2", + "hmac", + "pbkdf2", + "sha1", + "time 0.3.28", + "zstd", +] + +[[package]] +name = "zstd" +version = "0.11.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" +dependencies = [ + "zstd-safe", +] + +[[package]] +name = "zstd-safe" +version = "5.0.2+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-sys" +version = "2.0.8+zstd.1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +dependencies = [ + "cc", + "libc", + "pkg-config", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix index 941796315c..bb907e30df 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pot/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "pot"; - version = "1.10.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "pot-app"; repo = "pot-desktop"; rev = version; - hash = "sha256-v5yx8pE8+m+5CDy7X3CwitYhFQMX8Ynt8Y2k1lEZKpg="; + hash = "sha256-n12uO5QbD/HgD5Rq5d+TQ8j8Gn5hl6wTi27TqFmunIM="; }; sourceRoot = "${src.name}/src-tauri"; @@ -37,10 +37,6 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \ --replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" - - chmod -R +w .. - # Disable auto update check by default - sed -i -e '/auto_check/s/true/false/' src/main.rs ../src/windows/Config/index.jsx ''; pnpm-deps = stdenvNoCC.mkDerivation { @@ -70,17 +66,15 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashMode = "recursive"; - outputHash = "sha256-HJdVAjvHmhvztJMR9rVniWl12sGQYTyZojEYaoKnn5M="; + outputHash = "sha256-/5bB4czTPS3ZM9f7NBIHbwd95BqY2dRwKaBOWVsef04="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { - "tauri-plugin-single-instance-0.0.0" = "sha256-Wb08d5Cpi8YhtngbnQ3ziy+zAwg5ZY+2xKejgE2oCNE="; - "tauri-plugin-autostart-0.0.0" = "sha256-Wb08d5Cpi8YhtngbnQ3ziy+zAwg5ZY+2xKejgE2oCNE="; - "enigo-0.1.2" = "sha256-99VJ0WYD8jV6CYUZ1bpYJBwIE2iwOZ9SjOvyA2On12Q="; - "selection-0.1.0" = "sha256-V4vixiyKqhpZeTXiFw0HKz5xr0zHd4DkC/hovJ8Y2a8="; - "screenshots-0.6.0" = "sha256-NHs7gqplg/eSUWYojayxeJtX7T4f8mt+akahi9LeukU="; + # All other crates in the same workspace reuse this hash. + "tauri-plugin-autostart-0.0.0" = "sha256-7Qi07yRb+ww569+sEXFIwAtS8jbUNQx6LsrUnMl5YOo="; + "reqwest_dav-0.1.3" = "sha256-nWOH1SOoNA2o2lmGAIEJj3OLOlP39FjlXqK8LPZ95hI="; }; }; @@ -105,12 +99,12 @@ stdenv.mkDerivation rec { ESBUILD_BINARY_PATH = "${lib.getExe (esbuild.override { buildGoModule = args: buildGoModule (args // rec { - version = "0.17.19"; + version = "0.18.20"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-PLC7OJLSOiDq4OjvrdfCawZPfbfuZix4Waopzrj8qsU="; + hash = "sha256-mED3h+mY+4H465m02ewFK/BgA1i/PQ+ksUNxBlgpUoI="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; }); @@ -119,6 +113,7 @@ stdenv.mkDerivation rec { preBuild = '' export HOME=$(mktemp -d) pnpm config set store-dir ${pnpm-deps} + chmod +w .. pnpm install --offline --frozen-lockfile --no-optional --ignore-script chmod -R +w ../node_modules pnpm rebuild diff --git a/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix b/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix index b05d6d482a..2878b04844 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/privacyidea/default.nix @@ -7,6 +7,8 @@ let outputs = lib.filter (x: x != "doc") outputs; }; + # Follow issue below for Python 3.11 support + # https://github.com/privacyidea/privacyidea/issues/3593 python3' = python310.override { packageOverrides = self: super: { django = super.django_3; @@ -20,11 +22,20 @@ let }; doCheck = false; }); + # version 3.3.0+ does not support SQLAlchemy 1.3 + factory_boy = super.factory_boy.overridePythonAttrs (oldAttrs: rec { + version = "3.2.1"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-qY0newwEfHXrbkq4UIp/gfsD0sshmG9ieRNUbveipV4="; + }; + postPatch = ""; + }); # fails with `no tests ran in 1.75s` alembic = super.alembic.overridePythonAttrs (lib.const { doCheck = false; }); - flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec { + flask-migrate = super.flask-migrate.overridePythonAttrs (oldAttrs: rec { version = "2.7.0"; src = fetchPypi { pname = "Flask-Migrate"; @@ -180,6 +191,7 @@ in python3'.pkgs.buildPythonPackage rec { pname = "privacyIDEA"; version = "3.8.1"; + format = "setuptools"; src = fetchFromGitHub { owner = pname; @@ -198,8 +210,8 @@ python3'.pkgs.buildPythonPackage rec { ]; propagatedBuildInputs = with python3'.pkgs; [ - cryptography pyrad pymysql python-dateutil flask-versioned flask_script - defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow + cryptography pyrad pymysql python-dateutil flask-versioned flask-script + defusedxml croniter flask-migrate pyjwt configobj sqlsoup pillow python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 pydash ecdsa google-auth importlib-metadata argon2-cffi bcrypt segno diff --git a/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix b/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix index 0e90ad933d..8ec268c212 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/process-compose/default.nix @@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config"; in buildGoModule rec { pname = "process-compose"; - version = "0.60.0"; + version = "0.65.1"; src = fetchFromGitHub { owner = "F1bonacc1"; repo = pname; rev = "v${version}"; - hash = "sha256-BsDel6F09HP5Oz2p0DDXKuS7Id5XPhZZxEzwu76vVwk="; + hash = "sha256-wlsZV9yE9486EBbIwVOcA4KBf9tfI0Ao1JSIPjJAcEU="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/protonup-qt/default.nix b/third_party/nixpkgs/pkgs/applications/misc/protonup-qt/default.nix index f52b268149..cce3aaf774 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/protonup-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/protonup-qt/default.nix @@ -1,10 +1,10 @@ { appimageTools, fetchurl, lib }: let pname = "protonup-qt"; - version = "2.8.0"; + version = "2.8.2"; src = fetchurl { url = "https://github.com/DavidoTek/ProtonUp-Qt/releases/download/v${version}/ProtonUp-Qt-${version}-x86_64.AppImage"; - hash = "sha256-o3Tsrdrj5qDcTqhdgdf4Lcpp9zfBQY+/l3Ohm1A/pm4="; + hash = "sha256-y7PoYbZBwkohqVEb/vGE0B8TTCtMncZIozABs0KJpL0="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix index 6b1f95d0bd..fb796eb95d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/default.nix @@ -67,9 +67,9 @@ let }); wxGTK-override' = if wxGTK-override == null then wxGTK-prusa else wxGTK-override; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "prusa-slicer"; - version = "2.6.0"; + version = "2.6.1"; nativeBuildInputs = [ cmake @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { xorg.libX11 ] ++ lib.optionals withSystemd [ systemd - ] ++ nativeCheckInputs; + ] ++ finalAttrs.nativeCheckInputs; doCheck = true; nativeCheckInputs = [ gtest ]; @@ -166,8 +166,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - hash = "sha256-6AZdwNcgddHePyB0bNS7xGmpz38uzhAwUxgo48OQLuU="; - rev = "version_${version}"; + hash = "sha256-t5lnBL7SZVfyR680ZK29YXgE3pag+uVv4+BGJZq40/A="; + rev = "version_${finalAttrs.version}"; }; cmakeFlags = [ @@ -201,4 +201,4 @@ stdenv.mkDerivation rec { } // lib.optionalAttrs (stdenv.isDarwin) { mainProgram = "PrusaSlicer"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/pysentation/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pysentation/default.nix new file mode 100644 index 0000000000..c02fec3c01 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/pysentation/default.nix @@ -0,0 +1,39 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "pysentation"; + version = "1.0.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "mimseyedi"; + repo = "pysentation"; + rev = "v${version}"; + hash = "sha256-TwHDXWgGWuQVgatBDc1iympnb6dy4xYThLR5MouEZHA="; + }; + + nativeBuildInputs = [ + python3.pkgs.setuptools + python3.pkgs.wheel + ]; + + propagatedBuildInputs = with python3.pkgs; [ + click + getkey + rich + ]; + + pythonImportsCheck = [ "pysentation" ]; + + meta = with lib; { + description = "A CLI for displaying Python presentations"; + homepage = "https://github.com/mimseyedi/pysentation"; + changelog = "https://github.com/mimseyedi/pysentation/releases/tag/${src.rev}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "pysentation"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix index 683f0eb5a8..c7cfbbbb65 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.28.1.0"; + version = "3.28.2.2"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-NizAUyj6YbfjxXDQkVaqzkp11WMJlt4FMr72i3Cn564="; + sha256 = "sha256-0iH+fuh7jurk7FmEdTig+Tfm7ts3b2Azqv6T5kUNpg4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/qmetro/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qmetro/default.nix deleted file mode 100644 index 2678f744f8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/qmetro/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, qmake4Hook, unzip, qt4 }: - -stdenv.mkDerivation rec { - pname = "qmetro"; - version = "0.7.1"; - - src = fetchurl { - url = "mirror://sourceforge/qmetro/qmetro-${version}.zip"; - sha256 = "1zdj87lzcr43gr2h05g17z31pd22n5kxdwbvx7rx656rmhv0sjq5"; - }; - - nativeBuildInputs = [ qmake4Hook unzip ]; - - buildInputs = [ qt4 ]; - - postPatch = '' - sed -e 's#Exec=/usr/bin/qmetro#Exec=qmetro#' -i rc/qmetro.desktop - echo 'LIBS += -lz' >> qmetro.pro - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://sourceforge.net/projects/qmetro/"; - description = "Worldwide transit maps viewer"; - license = licenses.gpl3; - - maintainers = with maintainers; [ orivej ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix index 2da548619b..b09e0fe047 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/remarkable/rmapi/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-7pwCd9tey7w5B8UgsMLHegPqmmY1prLM+Sk9o42X9lY="; }; - vendorSha256 = "sha256-Id2RaiSxthyR6egDQz2zulbSZ4STRTaA3yQIr6Mx9kg="; + vendorHash = "sha256-Id2RaiSxthyR6egDQz2zulbSZ4STRTaA3yQIr6Mx9kg="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix b/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix index 75804968f5..42d5535f55 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/remnote/default.nix @@ -1,19 +1,52 @@ -{ lib, fetchurl, appimageTools }: +{ lib, stdenv, fetchurl, appimageTools, makeDesktopItem }: -appimageTools.wrapType2 rec { +stdenv.mkDerivation (finalAttrs: let + inherit (finalAttrs) pname version src appexec icon desktopItem; + +in +{ pname = "remnote"; - version = "1.12.9"; + version = "1.12.43"; src = fetchurl { url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage"; - sha256 = "sha256-ZBo7yxbTS+2pWecbPGxp0UMy16HRMwuuUUejb6DUHic="; + hash = "sha256-3GNp+0ZUZbUcBkE8DbIEDRYlWfG3HDTTS6wK3u42jJg="; }; + appexec = appimageTools.wrapType2 { + inherit pname version src; + }; + icon = fetchurl { + url = "https://www.remnote.io/icon.png"; + hash = "sha256-r5D7fNefKPdjtmV7f/88Gn3tqeEG8LGuD4nHI/sCk94="; + }; + desktopItem = makeDesktopItem { + type = "Application"; + name = "remnote"; + desktopName = "RemNote"; + comment = "Spaced Repetition"; + icon = "remnote"; + exec = "remnote %u"; + categories = [ "Office" ]; + mimeTypes = [ "x-scheme-handler/remnote" "x-scheme-handler/rn" ]; + }; + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + installPhase = '' + runHook preInstall + install -D ${appexec}/bin/remnote-${version} $out/bin/remnote + install -D "${desktopItem}/share/applications/"* -t $out/share/applications/ + install -D ${icon} $out/share/pixmaps/remnote.png + + runHook postInstall + ''; meta = with lib; { description = "A note-taking application focused on learning and productivity"; homepage = "https://remnote.com/"; maintainers = with maintainers; [ max-niederman jgarcia ]; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; + mainProgram = "remnote"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/rescuetime/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rescuetime/default.nix index ea97f8305f..22a1964e46 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rescuetime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rescuetime/default.nix @@ -52,7 +52,7 @@ in mkDerivation rec { meta = with lib; { description = "Helps you understand your daily habits so you can focus and be more productive"; homepage = "https://www.rescuetime.com"; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/resp-app/default.nix b/third_party/nixpkgs/pkgs/applications/misc/resp-app/default.nix index e9781d40db..b95bc98fdd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/resp-app/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/resp-app/default.nix @@ -98,6 +98,6 @@ mkDerivation rec { homepage = "https://resp.app/"; license = licenses.gpl3Only; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/retool/default.nix b/third_party/nixpkgs/pkgs/applications/misc/retool/default.nix new file mode 100644 index 0000000000..8d78111209 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/retool/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, python3 +, fetchFromGitHub +, qt6 +}: + +python3.pkgs.buildPythonApplication { + pname = "retool"; + version = "unstable-2023-08-24"; + + format = "pyproject"; + disabled = python3.pkgs.pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "unexpectedpanda"; + repo = "retool"; + rev = "d8acdb960d35b5a6b01d7dc66b7e40b3ec451301"; + hash = "sha256-6y/7RR7O2xYKXdxaFtkRfnSlwygp/LRDUozUJo6ue7s="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + qt6.wrapQtAppsHook + ]; + + pythonRelaxDeps = true; + + # ERROR: Could not find a version that satisfies the requirement PySide6 (from retool) (from versions: none) + # ERROR: No matching distribution found for PySide6 + pythonRemoveDeps = [ "PySide6" ]; + + buildInputs = [ + qt6.qtbase + ] ++ + lib.optionals (stdenv.isLinux) [ + qt6.qtwayland + ]; + + propagatedBuildInputs = with python3.pkgs; [ + alive-progress + lxml + psutil + validators + pyside6 + strictyaml + ]; + + # Upstream has no tests + doCheck = false; + + meta = with lib; { + description = "A better filter tool for Redump and No-Intro dats"; + homepage = "https://github.com/unexpectedpanda/retool"; + license = licenses.bsd3; + maintainers = with maintainers; [ thiagokokada ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/rlaunch/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rlaunch/default.nix index 9b00abd14c..15f26a24d6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rlaunch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rlaunch/default.nix @@ -7,25 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rlaunch"; - version = "1.3.13"; + version = "1.3.14"; src = fetchFromGitHub { owner = "PonasKovas"; repo = pname; rev = version; - sha256 = "1w8qvny72l5358wnk4dmqnrv4mrpzxrzf49svav9grzxzzf8mqy2"; + hash = "sha256-PyCR/ob947W+6T56y1se74aNy1avJDb2ELyv2aGf1og="; }; - cargoSha256 = "00lnw48kn97gp45lylv5c6v6pil74flzpsq9k69xgvvjq9yqjzrx"; - - patches = [ - # Fixes "error[E0308]: mismatched types; expected `u8`, found `i8`" on aarch64 - # Remove with next version update - (fetchpatch { - url = "https://github.com/PonasKovas/rlaunch/commit/f78f36876bba45fe4e7310f58086ddc63f27a57e.patch"; - hash = "sha256-rTS1khw1zt3i1AJ11BhAILcmaohAwVc7Qfl6Fc76Kvs="; - }) - ]; + cargoHash = "sha256-/a1SjGDcauOy1vmXvmWBZmag8G+T2au+Z7b0y1Vj3C8="; # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath. postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/rust-traverse/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rust-traverse/default.nix new file mode 100644 index 0000000000..7d0e072ee3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/rust-traverse/default.nix @@ -0,0 +1,47 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, bzip2 +, zstd +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "rust-traverse"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "dmcg310"; + repo = "Rust-Traverse"; + rev = "v${version}"; + hash = "sha256-OcCWmBNDo4AA5Pk5TQqb8hen9LlHaY09Wrm4BkrU7qA="; + }; + + cargoHash = "sha256-aZ0KewzeC6o+wW2EejodHnOPbuTLjRufEYGWDyoqkq0="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + bzip2 + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk_11_0.frameworks.Foundation + ]; + + env = { + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + + meta = with lib; { + description = "Terminal based file explorer"; + homepage = "https://github.com/dmcg310/Rust-Traverse"; + changelog = "https://github.com/dmcg310/Rust-Traverse/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "rt"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/safecloset/default.nix b/third_party/nixpkgs/pkgs/applications/misc/safecloset/default.nix new file mode 100644 index 0000000000..bf3e8866f7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/safecloset/default.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, stdenv +, darwin +, xorg +}: + +rustPlatform.buildRustPackage rec { + pname = "safecloset"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "Canop"; + repo = "safecloset"; + rev = "v${version}"; + hash = "sha256-ZvJbPbKS7HZ9R4Z9bMrXVjKtIdKE5dkp115dmHv7uJY="; + }; + + cargoHash = "sha256-vyn/rcptkJLjXg8qjAnzc2bDjz2r0LsGa8toyybgdbM="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + ] ++ lib.optionals stdenv.isLinux [ + xorg.libxcb + ]; + + checkFlags = [ + # skip flaky test + "--skip=timer::timer_tests::test_timer_reset" + ]; + + meta = with lib; { + description = "Cross-platform secure TUI secret locker"; + homepage = "https://github.com/Canop/safecloset"; + changelog = "https://github.com/Canop/safecloset/blob/${src.rev}/CHANGELOG.md"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "safecloset"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/sampler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sampler/default.nix index bea2297709..e5e090e7da 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sampler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sampler/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch, darwin, libiconv, alsa-lib, stdenv }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, darwin, alsa-lib, stdenv }: buildGoModule rec { pname = "sampler"; @@ -8,18 +8,18 @@ buildGoModule rec { owner = "sqshq"; repo = pname; rev = "v${version}"; - sha256 = "1lanighxhnn28dfzils7i55zgxbw2abd6y723mq7x9wg1aa2bd0z"; + hash = "sha256-H7QllAqPp35wHeJ405YSfPX3S4lH0/hdQ8Ja2OGLVtE="; }; patches = [ # fix build with go 1.17 (fetchpatch { url = "https://github.com/sqshq/sampler/commit/97a4a0ebe396a780d62f50f112a99b27044e832b.patch"; - sha256 = "1czns7jc85mzdf1mg874jimls8x32l35x3lysxfgfah7cvvwznbk"; + hash = "sha256-c9nP92YHKvdc156OXgYVoyNNa5TkoFeDa78WxOTR9rM="; }) ]; - vendorSha256 = "02cfzqadpsk2vkzsp7ciji9wisjza0yp35pw42q44navhbzcb4ji"; + vendorHash = "sha256-UZLF/oJbWUKwIPyWcT1QX+rIU5SRnav/3GLq2xT+jgk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/semver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/semver/default.nix index 5453467b9e..cdafd32027 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/semver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/semver/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0v3j7rw917wnmp4lyjscqzk4qf4azfiz70ynbq3wl4gwp1m783vv"; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ git ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/senv/default.nix b/third_party/nixpkgs/pkgs/applications/misc/senv/default.nix index c2ab9ad29d..b45085610d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/senv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/senv/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-TjlIX8FPNiPDQo41pIt04cki/orc+v30pV3o2bQQhAQ="; }; - vendorSha256 = "sha256-zOWX0AiLAs1FtOn+VtRexfn6oOmJT1PoTPHkcpwvxRY="; + vendorHash = "sha256-zOWX0AiLAs1FtOn+VtRexfn6oOmJT1PoTPHkcpwvxRY="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix index 7c6f9249a2..b5898c48cd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix @@ -1,4 +1,31 @@ -{ stdenv, lib, fetchurl, buildFHSEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, libxkbcommon, libxshmfence, at-spi2-atk, icu, openssl, zlib }: +{ stdenv +, lib +, fetchurl +, buildFHSEnv +, makeDesktopItem +, makeWrapper +, alsa-lib +, at-spi2-atk +, cairo +, cups +, dbus +, expat +, gdk-pixbuf +, glib +, gtk3 +, mesa +, nss +, nspr +, libdrm +, xorg +, libxkbcommon +, libxshmfence +, pango +, systemd +, icu +, openssl +, zlib +}: let pname = "sidequest"; version = "0.10.33"; @@ -21,20 +48,46 @@ nativeBuildInputs = [ makeWrapper ]; - buildCommand = '' + installPhase = '' mkdir -p "$out/lib/SideQuest" "$out/bin" tar -xJf "$src" -C "$out/lib/SideQuest" --strip-components 1 ln -s "$out/lib/SideQuest/sidequest" "$out/bin" + ''; - fixupPhase - - # mkdir -p "$out/share/applications" - # ln -s "${desktopItem}/share/applications/*" "$out/share/applications" - + postFixup = let + libPath = lib.makeLibraryPath [ + alsa-lib + at-spi2-atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + mesa + nss + nspr + libdrm + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXrandr + xorg.libxshmfence + libxkbcommon + xorg.libxkbfile + pango + stdenv.cc.cc.lib + systemd + ]; + in '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}/lib:${lib.makeLibraryPath [libuuid at-spi2-atk]}:$out/lib/SideQuest" \ + --set-rpath "${libPath}:$out/lib/SideQuest" \ "$out/lib/SideQuest/sidequest" ''; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix b/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix index 35f1533935..82008de957 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/simplenote/default.nix @@ -1,5 +1,4 @@ -{ atomEnv -, autoPatchelfHook +{ autoPatchelfHook , dpkg , fetchurl , makeDesktopItem @@ -7,7 +6,13 @@ , lib , stdenv , udev +, alsa-lib +, mesa +, nss +, nspr +, systemd , wrapGAppsHook +, xorg }: let @@ -40,9 +45,7 @@ let inherit pname version meta; src = fetchurl { - url = - "https://github.com/Automattic/simplenote-electron/releases/download/" - + "v${version}/Simplenote-linux-${version}-amd64.deb"; + url = "https://github.com/Automattic/simplenote-electron/releases/download/v${version}/Simplenote-linux-${version}-amd64.deb"; inherit sha256; }; @@ -61,6 +64,7 @@ let dontPatchELF = true; dontWrapGApps = true; + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron nativeBuildInputs = [ autoPatchelfHook dpkg @@ -68,7 +72,16 @@ let wrapGAppsHook ]; - buildInputs = atomEnv.packages; + buildInputs = [ + alsa-lib + mesa + xorg.libXScrnSaver + xorg.libXtst + nss + nspr + stdenv.cc.cc + systemd + ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix index df2c7b77ae..329bf2aada 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix @@ -2,6 +2,7 @@ , stdenv , installShellFiles , fetchFromGitHub +, fetchurl , freetype , gumbo , harfbuzz @@ -26,6 +27,15 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-GFZaTXJhoBB+rSe7Qk6H6FZJVXr3nO9XgM+LAbS4te4="; }; + patches = [ + # Fixed compatibility with mupdf-0.23.0 + # https://github.com/ahrm/sioyek/issues/804 + (fetchurl { + url = "https://git.alpinelinux.org/aports/plain/community/sioyek/mupdf-0.23.0.patch?id=86e913eccf19b97a16f25d9b6cdf0f50232f1226"; + hash = "sha256-sEqhpk7/h6g/fIhbu5LgpKKnbnIFLInrTP1k+/GhrXE="; + }) + ]; + buildInputs = [ gumbo harfbuzz diff --git a/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix b/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix index d347bb3af5..43e41b253b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/skytemple/default.nix @@ -10,13 +10,13 @@ python3Packages.buildPythonApplication rec { pname = "skytemple"; - version = "1.4.7"; + version = "1.5.5"; src = fetchFromGitHub { owner = "SkyTemple"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NK0yLxs7/pVpl9LCz6ggYsaUDuEAj6edBEPC+4yCxNM="; + hash = "sha256-7sv0TzYMQLEaohy45JPPiK2wS3x4sXaevT/BfHaSbWw="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix b/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix index c6c73115eb..55229c206f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { go ]; - vendorSha256 = "sha256-c3YCf22L5+rTmH5ePeJ0/goRj5rKY6v+Zon3183MhMY="; + vendorHash = "sha256-c3YCf22L5+rTmH5ePeJ0/goRj5rKY6v+Zon3183MhMY="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/misc/slweb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/slweb/default.nix index 1fcee352bd..1c6931fadc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/slweb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/slweb/default.nix @@ -2,29 +2,35 @@ , stdenv , fetchFromSourcehut , redo-apenwarr +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "slweb"; - version = "0.6.7"; + version = "0.6.11"; src = fetchFromSourcehut { owner = "~strahinja"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Y7w3yVqA8MNJJ3OcGaeziydZyzF0bap41Il6eE/Hu40="; + repo = "slweb"; + rev = "v${finalAttrs.version}"; + hash = "sha256-+bKapK/s1pmo1NRRslf7V4ogWTtchFNWpzi+S8YG6+4="; }; nativeBuildInputs = [ redo-apenwarr ]; installPhase = '' runHook preInstall + export FALLBACKVER=${finalAttrs.version} PREFIX=$out redo install runHook postInstall ''; enableParallelBuilding = true; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + meta = with lib; { description = "A static website generator which aims at being simplistic"; homepage = "https://strahinja.srht.site/slweb/"; @@ -32,4 +38,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/default.nix b/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/default.nix index 81e54007b8..c1a896d88e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/default.nix @@ -14,17 +14,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "smb3-foundry"; - version = "1.2"; + version = "1.3.1"; src = fetchFromGitHub { owner = "mchlnix"; repo = "SMB3-Foundry"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-iqqIyGp/sqWgShxk52omVcn7Q3WL2hK8sTLH4dashLE="; + hash = "sha256-8cf7VhvC372Cqi94n2FSHcoCGblpZoZvBXcXq5jU6CY="; }; - patches = [ ./fix-relative-dirs.patch ]; - nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -42,11 +40,12 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "https://github.com/mchlnix/SMB3-Foundry"; - description = "A modern Super Mario Bros. 3 Level Editor"; changelog = "https://github.com/mchlnix/SMB3-Foundry/releases/tag/${finalAttrs.version}"; + description = "A modern Super Mario Bros. 3 Level Editor"; + homepage = "https://github.com/mchlnix/SMB3-Foundry"; license = lib.licenses.gpl3Only; - platforms = lib.platforms.unix; + mainProgram = "smb3-foundry"; maintainers = with lib.maintainers; [ tomasajt ]; + platforms = lib.platforms.unix; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch b/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch deleted file mode 100644 index d49ddde897..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/smb3-foundry/fix-relative-dirs.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/foundry/gui/WarningList.py b/foundry/gui/WarningList.py -index ace83d7..46012df 100644 ---- a/foundry/gui/WarningList.py -+++ b/foundry/gui/WarningList.py -@@ -5,6 +5,7 @@ from PySide6.QtCore import QEvent, QRect, Qt, Signal, SignalInstance - from PySide6.QtGui import QCursor, QFocusEvent - from PySide6.QtWidgets import QLabel, QVBoxLayout, QWidget - -+from foundry import root_dir - from foundry.game import GROUND - from foundry.game.ObjectDefinitions import GeneratorType - from foundry.game.gfx.objects import EnemyItem -@@ -216,7 +217,7 @@ class WarningList(QWidget): - return [enemy for enemy in self.level_ref.level.enemies if enemy.type == enemy_id] - - def _build_enemy_clan_dict(self): -- with open("data/enemy_data.json", "r") as enemy_data_file: -+ with open(root_dir.joinpath("data", "enemy_data.json"), "r") as enemy_data_file: - enemy_data = json.loads(enemy_data_file.read()) - - self._enemy_dict.clear() -diff --git a/smb3parse/util/parser/__init__.py b/smb3parse/util/parser/__init__.py -index ecef169..8bba57e 100644 ---- a/smb3parse/util/parser/__init__.py -+++ b/smb3parse/util/parser/__init__.py -@@ -302,7 +302,7 @@ def gen_levels_in_rom( - - print("---------------------", level_count, "------------------------") - -- level_data = pathlib.Path("data/levels.dat") -+ level_data = pathlib.Path(__file__).parent.parent.parent.joinpath("data", "levels.dat") - - missing = 0 - levels: dict[int, set[int]] = defaultdict(set) diff --git a/third_party/nixpkgs/pkgs/applications/misc/snagboot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/snagboot/default.nix index 35ac8b28aa..61c906ec46 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/snagboot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/snagboot/default.nix @@ -10,27 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snagboot"; - version = "1.1"; + version = "1.2"; format = "pyproject"; src = fetchFromGitHub { owner = "bootlin"; repo = "snagboot"; rev = "v${version}"; - hash = "sha256-MU6LzjH6s2MS7T3u1OUeJ5ZmWgL0otA/q0ylwTNH4fA="; - }; - - passthru = { - updateScript = gitUpdater { - rev-prefix = "v"; - ignoredVersions = ".(rc|beta).*"; - }; - - tests.version = testers.testVersion { - package = snagboot; - command = "snagrecover --version"; - version = "v${version}"; - }; + hash = "sha256-OuHY5+2puZAERtwmXduUW5Wjus6KeQLJLcGcl48umLA="; }; nativeBuildInputs = [ @@ -69,6 +56,19 @@ python3.pkgs.buildPythonApplication rec { # There are no tests doCheck = false; + passthru = { + updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = ".(rc|beta).*"; + }; + + tests.version = testers.testVersion { + package = snagboot; + command = "snagrecover --version"; + version = "v${version}"; + }; + }; + meta = { homepage = "https://github.com/bootlin/snagboot"; description = "Generic recovery and reflashing tool for embedded platforms"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix b/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix index 8f2437e9de..9ee3ff6f38 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/snapmaker-luban/default.nix @@ -2,17 +2,17 @@ , alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups , gtk3, nss, glib, dbus, nspr, gdk-pixbuf, libdrm, mesa , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext -, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, pango +, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, pango , gcc-unwrapped, udev }: stdenv.mkDerivation rec { pname = "snapmaker-luban"; - version = "4.8.0"; + version = "4.9.1"; src = fetchurl { url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz"; - sha256 = "sha256-uY8MlLIZrbds5/QdYZFTLSSis0BwRU19XfLiBX+2VCY="; + sha256 = "sha256-qLeF1trBrp53xkiAhybPTHUKuXYHQYfZ3tsmPPJlvUM="; }; nativeBuildInputs = [ @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { libXScrnSaver libXtst libxcb + libxshmfence mesa # Required for libgbm nspr nss @@ -42,7 +43,7 @@ stdenv.mkDerivation rec { libPath = lib.makeLibraryPath [ stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups - gdk-pixbuf glib gtk3 libX11 libXcomposite + gdk-pixbuf glib gtk3 libX11 libXcomposite libxshmfence libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst nspr nss libxcb pango libXScrnSaver udev ]; @@ -93,5 +94,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.simonkampe ]; platforms = [ "x86_64-linux" ]; + knownVulnerabilities = [ "CVE-2023-5217" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix index e30bce8b37..a6ce353694 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.22.2"; + version = "2.24.2"; src = fetchFromGitHub { owner = "spicetify"; repo = "spicetify-cli"; rev = "v${version}"; - hash = "sha256-86ktRfBY7q83KGrc/JF1gIcIJxuScqIr27QPcl1U8vc="; + hash = "sha256-jzEtXmlpt6foldLW57ZcpevX8CDc+c8iIynT5nOD9qY="; }; - vendorHash = "sha256-+3PeugLSpybbjNSyFMWBGBX6QDaM41eH0ifPO39YfA0="; + vendorHash = "sha256-rMMTUT7HIgYvxGcqR02VmxOh1ihE6xuIboDsnuOo09g="; ldflags = [ "-s -w" diff --git a/third_party/nixpkgs/pkgs/applications/misc/sqliteman/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sqliteman/default.nix deleted file mode 100644 index 556c635e60..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/sqliteman/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake, qt4, qscintilla-qt4 }: - -stdenv.mkDerivation rec { - pname = "sqliteman"; - version = "1.2.0"; - - src = fetchFromGitHub { - repo = "sqliteman"; - owner = "pvanek"; - rev = version; - sha256 = "1blzyh1646955d580f71slgdvz0nqx0qacryx0jc9w02yrag17cs"; - }; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 qscintilla-qt4 ]; - - prePatch = '' - sed -i 's,m_file(0),m_file(QString()),' Sqliteman/sqliteman/main.cpp - ''; - - preConfigure = '' - cd Sqliteman - sed -i 's,/usr/include/Qsci,${qscintilla-qt4}/include/Qsci,' cmake/modules/FindQScintilla.cmake - sed -i 's,PATHS ''${QT_LIBRARY_DIR},PATHS ${qscintilla-qt4}/libs,' cmake/modules/FindQScintilla.cmake - ''; - - meta = with lib; { - description = "A simple but powerful Sqlite3 GUI database manager"; - homepage = "http://sqliteman.yarpen.cz/"; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = [ maintainers.eikek ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/sqls/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sqls/default.nix index 6ac9275570..53785539ad 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sqls/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sqls/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-xtvm/NVL98dRzQL1id/WwT/NdsnB7qTRVR7jfrRsabY="; }; - vendorSha256 = "sha256-sowzyhvNr7Ek3ex4BP415HhHSKnqPHy5EbnECDVZOGw="; + vendorHash = "sha256-sowzyhvNr7Ek3ex4BP415HhHSKnqPHy5EbnECDVZOGw="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.revision=${src.rev}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/stepreduce/default.nix b/third_party/nixpkgs/pkgs/applications/misc/stepreduce/default.nix new file mode 100644 index 0000000000..11e1df4cce --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/stepreduce/default.nix @@ -0,0 +1,31 @@ +{ lib +, stdenv +, fetchFromGitLab +}: + +stdenv.mkDerivation rec { + pname = "stepreduce"; + version = "unstable-2020-04-30"; + + src = fetchFromGitLab { + owner = "sethhillbrand"; + repo = "stepreduce"; + rev = "e89091c33b67e2a18584e1fe3560bfd48ae98773"; + hash = "sha256-bCseBQ6J3sWFt0kzaRkV11lwzOGvNPebvQ6w4OJaMBs="; + }; + + installPhase = '' + runHook preInstall + + install -Dm755 stepreduce $out/bin/stepreduce + + runHook prostInstall + ''; + + meta = with lib; { + description = "Reduces STEP file size by removing redundancy"; + homepage = "https://gitlab.com/sethhillbrand/stepreduce"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ evils ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/stog/default.nix b/third_party/nixpkgs/pkgs/applications/misc/stog/default.nix index c840bbfe5b..17affeb3bb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/stog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/stog/default.nix @@ -1,4 +1,4 @@ -{ lib, buildDunePackage, fetchFromGitLab, ocaml +{ lib, buildDunePackage, fetchFromGitLab, fetchpatch, ocaml , fmt, lwt_ppx, menhir, ocf_ppx, ppx_blob, xtmpl_ppx , dune-build-info, dune-site, higlo, logs, lwt, ocf, ptime, uri, uutf, xtmpl }: @@ -10,7 +10,6 @@ else buildDunePackage rec { pname = "stog"; version = "0.20.0"; - duneVersion = "3"; minimalOCamlVersion = "4.12"; src = fetchFromGitLab { domain = "framagit.org"; @@ -20,6 +19,12 @@ buildDunePackage rec { sha256 = "sha256:0krj5w4y05bcfx7hk9blmap8avl31gp7yi01lpqzs6ync23mvm0x"; }; + # Compatibility with higlo 0.9 + patches = fetchpatch { + url = "https://framagit.org/zoggy/stog/-/commit/ea0546ab4cda8cc5c4c820ebaf2e3dfddc2ab101.patch"; + hash = "sha256-86GRHF9OjfcalGfA0Om2wXH99j4THCs9a4+o5ghuiJc="; + }; + nativeBuildInputs = [ menhir ]; buildInputs = [ fmt lwt_ppx ocf_ppx ppx_blob xtmpl_ppx ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix index 1c1aa80de7..f46be1a243 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix @@ -1,48 +1,47 @@ { lib , python3Packages , fetchFromGitHub -, fetchpatch , copyDesktopItems -, wrapQtAppsHook , writeText , makeDesktopItem +, wrapGAppsHook , xvfb-run -, qt5 +, qt6 }: python3Packages.buildPythonApplication rec { pname = "streamdeck-ui"; - version = "2.0.6"; + version = "3.1.0"; src = fetchFromGitHub { - repo = pname; - owner = "timothycrosley"; + repo = "streamdeck-linux-gui"; + owner = "streamdeck-linux-gui"; rev = "v${version}"; - sha256 = "sha256-5dk+5oefg5R68kv038gsZ2p5ixmpj/vBLBp/V7Sdos8="; + sha256 = "sha256-AIE9j022L4WSlHBAu3TT5uE4Ilgk/jYSmU03K8Hs8xY="; }; patches = [ - (fetchpatch { - name = "use-poetry-core.patch"; - url = "https://github.com/timothycrosley/streamdeck-ui/commit/e271656c1f47b1619d1b942e2ebb01ab2d6a68a9.patch"; - hash = "sha256-wqYwX6eSqMnW6OG7wSprD62Dz818ayFduVrqW9E/ays="; - }) - (fetchpatch { - name = "update-python-xlib-0.33.patch"; - url = "https://github.com/timothycrosley/streamdeck-ui/commit/07d7fdd33085b413dd26b02d8a02820edad2d568.patch"; - hash = "sha256-PylTrbfB8RJ0+kbgJlRdcvfdahGoob8LabwhuFNsUpY="; - }) + # nixpkgs has a newer pillow version + ./update-pillow.patch ]; - desktopItems = [ (makeDesktopItem { - name = "streamdeck-ui"; - desktopName = "Stream Deck UI"; - icon = "streamdeck-ui"; - exec = "streamdeck --no-ui"; - comment = "UI for the Elgato Stream Deck"; - categories = [ "Utility" ]; - noDisplay = true; - }) ]; + desktopItems = let + common = { + name = "streamdeck-ui"; + desktopName = "Stream Deck UI"; + icon = "streamdeck-ui"; + exec = "streamdeck"; + comment = "UI for the Elgato Stream Deck"; + categories = [ "Utility" ]; + }; + in builtins.map makeDesktopItem [ + common + (common // { + name = "${common.name}-noui"; + exec = "${common.exec} --no-ui"; + noDisplay = true; + }) + ]; postInstall = let @@ -51,6 +50,10 @@ python3Packages.buildPythonApplication rec { ''; in '' + mkdir -p $out/lib/systemd/user + substitute scripts/streamdeck.service $out/lib/systemd/user/streamdeck.service \ + --replace '' $out/bin/streamdeck + mkdir -p "$out/etc/udev/rules.d" cp ${writeText "70-streamdeck.rules" udevRules} $out/etc/udev/rules.d/70-streamdeck.rules @@ -59,14 +62,16 @@ python3Packages.buildPythonApplication rec { ''; dontWrapQtApps = true; - makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ]; + dontWrapGApps = true; + makeWrapperArgs = [ "\${qtWrapperArgs[@]}" "\${gappsWrapperArgs[@]}"]; format = "pyproject"; nativeBuildInputs = [ python3Packages.poetry-core copyDesktopItems - wrapQtAppsHook + qt6.wrapQtAppsHook + wrapGAppsHook ]; propagatedBuildInputs = with python3Packages; [ @@ -75,33 +80,27 @@ python3Packages.buildPythonApplication rec { cairosvg pillow pynput - pyside2 + pyside6 streamdeck xlib ] ++ lib.optionals stdenv.isLinux [ - qt5.qtwayland + qt6.qtwayland ]; nativeCheckInputs = [ xvfb-run python3Packages.pytest - python3Packages.hypothesis-auto ]; - # Ignored tests are not in a running or passing state. - # Fixes have been merged upstream but not yet released. - # Revisit these ignored tests on each update. checkPhase = '' - xvfb-run pytest tests \ - --ignore=tests/test_api.py \ - --ignore=tests/test_filter.py \ - --ignore=tests/test_stream_deck_monitor.py + xvfb-run pytest tests ''; meta = with lib; { description = "Linux compatible UI for the Elgato Stream Deck"; - homepage = "https://timothycrosley.github.io/streamdeck-ui/"; + homepage = "https://streamdeck-linux-gui.github.io/streamdeck-linux-gui/"; license = licenses.mit; + mainProgram = "streamdeck"; maintainers = with maintainers; [ majiir ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/update-pillow.patch b/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/update-pillow.patch new file mode 100644 index 0000000000..8894558662 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/update-pillow.patch @@ -0,0 +1,13 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 0aff29e..4371616 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -14,7 +14,7 @@ packages = [ + [tool.poetry.dependencies] + python = ">=3.8,<3.12" + streamdeck = "^0.9.3" +-pillow = "^9.4.0" ++pillow = "^10.0.0" + pynput = "^1.7.6" + pyside6 = "^6.4.2" + CairoSVG = "^2.5.2" diff --git a/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix index 71c174a07e..f824011f1b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "sunwait"; - version = "2020-10-26"; + version = "0.9.1"; src = fetchFromGitHub { owner = "risacher"; repo = "sunwait"; - rev = "102cb417ecbb7a3757ba9ee4b94d6db3225124c4"; - sha256 = "0cs8rdcnzsl10zia2k49a6c2z6gvp5rnf31sgn3hn5c7kgy7l3ax"; + rev = finalAttrs.version; + hash = "sha256-v2cNjecJ4SstOsvDe/Lu0oOyBd8I8LMHZIH+f9ZC7Fc="; }; makeFlags = [ "C=${stdenv.cc.targetPrefix}c++" ]; @@ -17,11 +17,12 @@ stdenv.mkDerivation { install -Dm755 sunwait -t $out/bin ''; - meta = with lib; { + meta = { description = "Calculates sunrise or sunset times with civil, nautical, astronomical and custom twilights"; homepage = "https://github.com/risacher/sunwait"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; - platforms = platforms.all; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ eclairevoyant ]; + mainProgram = "sunwait"; + platforms = lib.platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix index 174b95df67..525e25ae7e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sway-launcher-desktop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sway-launcher-desktop"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Biont"; repo = "sway-launcher-desktop"; rev = "v${version}"; - sha256 = "HCGUFXrj6b9Pb6b5y9yupBumFLQyH1QVMrfoBM4HbMg="; + hash = "sha256-lv1MLPJsJJjm6RLzZXWEz1JO/4EXTQ8wj225Di+98G4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch b/third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch new file mode 100644 index 0000000000..61fcda5593 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/001-backport-pr296.patch @@ -0,0 +1,50 @@ +diff --git a/src/functions.vala b/src/functions.vala +index cf7fefc..9b4d82a 100644 +--- a/src/functions.vala ++++ b/src/functions.vala +@@ -102,10 +102,7 @@ namespace SwayNotificationCenter { + + public static string get_style_path (owned string ? custom_path, + bool only_system = false) { +- string[] paths = { +- // Fallback location. Specified in postinstall.py +- "/usr/local/etc/xdg/swaync/style.css" +- }; ++ string[] paths = {}; + if (custom_path != null && custom_path.length > 0) { + // Replaces the home directory relative path with a absolute path + if (custom_path.get (0) == '~') { +@@ -123,7 +120,9 @@ namespace SwayNotificationCenter { + paths += Path.build_path (Path.DIR_SEPARATOR.to_string (), + path, "swaync/style.css"); + } +- ++ // Fallback location. Specified in postinstall.py. Mostly for Debian ++ paths += "/usr/local/etc/xdg/swaync/style.css"; ++ + string path = ""; + foreach (string try_path in paths) { + if (File.new_for_path (try_path).query_exists ()) { +@@ -140,10 +139,7 @@ namespace SwayNotificationCenter { + } + + public static string get_config_path (owned string ? custom_path) { +- string[] paths = { +- // Fallback location. Specified in postinstall.py +- "/usr/local/etc/xdg/swaync/config.json" +- }; ++ string[] paths = {}; + if (custom_path != null && custom_path.length > 0) { + // Replaces the home directory relative path with a absolute path + if (custom_path.get (0) == '~') { +@@ -158,7 +154,9 @@ namespace SwayNotificationCenter { + paths += Path.build_path (Path.DIR_SEPARATOR.to_string (), + path, "swaync/config.json"); + } +- ++ // Fallback location. Specified in postinstall.py. Mostly for Debian ++ paths += "/usr/local/etc/xdg/swaync/config.json"; ++ + string path = ""; + foreach (string try_path in paths) { + if (File.new_for_path (try_path).query_exists ()) { diff --git a/third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix index 639edced0f..065ed941c3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/swaynotificationcenter/default.nix @@ -37,6 +37,10 @@ stdenv.mkDerivation (finalAttrs: rec { hash = "sha256-mwwSTs4d9jUXUy33nSYJCRFlpH6naCmbRUSpfVacMBE="; }; + patches = [ + ./001-backport-pr296.patch + ]; + nativeBuildInputs = [ bash-completion # cmake # currently conflicts with meson @@ -70,6 +74,8 @@ stdenv.mkDerivation (finalAttrs: rec { postPatch = '' chmod +x build-aux/meson/postinstall.py patchShebangs build-aux/meson/postinstall.py + + substituteInPlace src/functions.vala --replace /usr/local/etc $out/etc ''; passthru.tests.version = testers.testVersion { diff --git a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index a9ff5818fb..93d539b9f4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -11,11 +11,14 @@ , qtutilities , qtforkawesome , boost +, wrapQtAppsHook , cmake , kio , plasma-framework , qttools , iconv +, cppunit +, syncthing , webviewSupport ? true , jsSupport ? true , kioPluginSupport ? stdenv.isLinux @@ -29,15 +32,15 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ , autostartExecPath ? "syncthingtray" }: -mkDerivation rec { - version = "1.4.5"; +stdenv.mkDerivation (finalAttrs: { + version = "1.4.7"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; - rev = "v${version}"; - sha256 = "sha256-EizKDw5Fv2qXxmiCx4NAvwxBZ+qhTIx4NMZedZ9OuyA="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-ddOyAyvFifsdNMbwcMZTyhA+5pvz6/Eu/VoBmdsHi54="; }; buildInputs = [ @@ -54,20 +57,34 @@ mkDerivation rec { ; nativeBuildInputs = [ + wrapQtAppsHook cmake qttools + # Although these are test dependencies, we add them anyway so that we test + # whether the test units compile. On Darwin we don't run the tests but we + # still build them. + cppunit + syncthing ] ++ lib.optionals plasmoidSupport [ extra-cmake-modules ] ; - # No tests are available by upstream, but we test --help anyway - # Don't test on Darwin because output is .app + # syncthing server seems to hang on darwin, causing tests to fail. + doCheck = !stdenv.isDarwin; + preCheck = '' + export QT_QPA_PLATFORM=offscreen + export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" + ''; + # don't test --help on Darwin because output is .app doInstallCheck = !stdenv.isDarwin; installCheckPhase = '' - $out/bin/syncthingtray --help | grep ${version} + $out/bin/syncthingtray --help | grep ${finalAttrs.version} ''; cmakeFlags = [ + "-DBUILD_TESTING=ON" + # See https://github.com/Martchus/syncthingtray/issues/208 + "-DEXCLUDE_TESTS_FROM_ALL=OFF" "-DAUTOSTART_EXEC_PATH=${autostartExecPath}" # See https://github.com/Martchus/syncthingtray/issues/42 "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/${qtbase.qtPluginPrefix}" @@ -85,4 +102,4 @@ mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux ++ platforms.darwin; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/tabula-java/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tabula-java/default.nix index ebd266e666..f8d3cc3c54 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tabula-java/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tabula-java/default.nix @@ -1,24 +1,37 @@ -{ stdenv, lib, fetchurl, jre, makeWrapper }: +{ lib +, maven +, fetchFromGitHub +, makeWrapper +, jre +}: -stdenv.mkDerivation rec { +maven.buildMavenPackage rec { pname = "tabula-java"; version = "1.0.5"; - src = fetchurl { - url = "https://github.com/tabulapdf/tabula-java/releases/download/v${version}/tabula-${version}-jar-with-dependencies.jar"; - sha256 = "sha256-IWHj//ZZOdfOCBJHnPnKNoYNtWl/f8H6ARYe1AkqB0U="; + src = fetchFromGitHub { + owner = "tabulapdf"; + repo = "tabula-java"; + rev = "v${version}"; + hash = "sha256-lg8/diyGhfkUU0w7PEOlxb1WNpJZVDDllxMMsTIU/Cw="; }; + mvnHash = "sha256-yULCBHgctZZU3Deod+nQujssmUy+kgdFdgE3NUuFhOw="; + mvnParameters = "compile assembly:single -Dmaven.test.skip=true"; + nativeBuildInputs = [ makeWrapper ]; - dontUnpack = true; - dontBuild = true; - installPhase = '' - mkdir -pv $out/share/tabula-java - cp -v $src $out/share/tabula-java/tabula-java.jar + runHook preInstall - makeWrapper ${jre}/bin/java $out/bin/tabula-java --add-flags "-jar $out/share/tabula-java/tabula-java.jar" + mkdir -p $out/{bin,lib} + cp target/tabula-${version}-jar-with-dependencies.jar $out/lib/tabula.jar + + makeWrapper ${jre}/bin/java $out/bin/tabula-java \ + --add-flags "-cp $out/lib/tabula.jar" \ + --add-flags "technology.tabula.CommandLineApp" + + runHook postInstall ''; meta = with lib; { @@ -29,7 +42,6 @@ stdenv.mkDerivation rec { programmatically extract tables from PDFs. ''; homepage = "https://tabula.technology/"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; maintainers = [ maintainers.jakewaksbaum ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/common.nix b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/common.nix index 7a280285ac..fe52c50a1f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/common.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tandoor-recipes/common.nix @@ -1,15 +1,15 @@ { lib, fetchFromGitHub }: rec { - version = "1.5.4"; + version = "1.5.6"; src = fetchFromGitHub { owner = "TandoorRecipes"; repo = "recipes"; rev = version; - hash = "sha256-cVrgmRDzuLzl2+4UcrLRdrP6ZFWMkavu9OEogNas2fA="; + hash = "sha256-3sitrTaIRKmjx+5vWOQXE0/Gu0jJ8VCpOq2cZZVLrbk="; }; - yarnHash = "sha256-0u9P/OsoThP8gonrzcnO5zhIboWMI1mTsXHlbt7l9oE="; + yarnHash = "sha256-mZ8beCF+3mnpgKED0fP96RBbGbKNNXqEJkGSjgrEGBc="; meta = with lib; { homepage = "https://tandoor.dev/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tasktimer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tasktimer/default.nix index 34ba140331..18439e02e2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tasktimer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tasktimer/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-CAqOsxmJxDgQRMx8cN23TajHd6BNiCFraFvhf5kKnzc="; }; - vendorSha256 = "sha256-Tk0yI/WFr0FV0AxJDStlP3XLem3v78ueuXyadhrLAog="; + vendorHash = "sha256-Tk0yI/WFr0FV0AxJDStlP3XLem3v78ueuXyadhrLAog="; postInstall = '' mv $out/bin/tasktimer $out/bin/tt diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix index f05ff81a16..153ea4d6d5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.25.1"; + version = "0.25.4"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-m/VExBibScZt8zlxbTSQtZdbcc1EBZ+k0DXu+pXFUnA="; + sha256 = "sha256-M8tiEUPfP5EWfPp7i6r0lpHC5ZUsEYeEKVz5gUpe4+A="; }; - cargoHash = "sha256-DFf4leS8/891YzZCkkd/rU+cUm94nOnXYDZgJK+NoCY="; + cargoHash = "sha256-B5peoyT/+miHXyoRGFLUv9qFzZZFsExrI46Zy0K7NL4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/teleprompter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/teleprompter/default.nix index 7e4ac3a570..9e4f711d12 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/teleprompter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/teleprompter/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, electron_10, makeDesktopItem, makeWrapper, nodePackages, autoPatchelfHook}: +{ lib, stdenv, fetchurl, electron_10, makeDesktopItem, makeWrapper, asar, autoPatchelfHook}: let electron = electron_10; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { dontBuild = true; dontStrip = true; - nativeBuildInputs = [ autoPatchelfHook makeWrapper nodePackages.asar ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper asar ]; installPhase = '' mkdir -p $out/bin $out/opt/teleprompter $out/share/applications asar e resources/app.asar $out/opt/teleprompter/resources/app.asar.unpacked diff --git a/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix index 2ec1097338..6e9d2e6cc1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tellico/default.nix @@ -34,11 +34,6 @@ mkDerivation rec { hash = "sha256-opg4FbfOM48eqWQUJnMHH7KSo6x4S2DHd7ucPw6iTzg="; }; - postPatch = '' - substituteInPlace src/gui/imagewidget.h \ - --replace ksane_version.h KF5/ksane_version.h - ''; - nativeBuildInputs = [ cmake extra-cmake-modules diff --git a/third_party/nixpkgs/pkgs/applications/misc/terminal-notifier/default.nix b/third_party/nixpkgs/pkgs/applications/misc/terminal-notifier/default.nix index cde53ef416..19370fae01 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/terminal-notifier/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/terminal-notifier/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; homepage = "https://github.com/julienXX/terminal-notifier"; license = licenses.mit; platforms = platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix index b44b4bd0a7..f0b4d20b1a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/terminal-parrot/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "jmhobbs"; repo = "terminal-parrot"; rev = version; - sha256 = "1b4vr4s1zpkpf5kc1r2kdlp3hf88qp1f7h05g8kd62zf4sfbj722"; + hash = "sha256-Qhy5nCbuC9MmegXA48LFCDk4Lm1T5MBmcXfeHzTJm6w="; }; - vendorSha256 = "1qalnhhq3fmyzj0hkzc5gk9wbypr558mz3ik5msw7fid68k2i48c"; + vendorHash = "sha256-DJEoJjItusN1LTOOX1Ep+frF03yF/QmB/L66gSG0VOE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix index 9840da035e..4aee5fccfb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/terminal-typeracer/default.nix @@ -1,7 +1,9 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitLab , rustPlatform , pkg-config +, libgit2 , openssl , sqlite , libiconv @@ -10,20 +12,24 @@ rustPlatform.buildRustPackage rec { pname = "terminal-typeracer"; - version = "2.0.8"; + version = "2.1.3"; src = fetchFromGitLab { owner = "ttyperacer"; repo = pname; rev = "v${version}"; - sha256 = "Fb2MCQaQaJseXa8Csesz1s5Yel4wcSMxfMeKSW7rlU4="; + hash = "sha256-S3OW6KihRd6ReTWUXRb1OWC7+YoxehjFRBxcnJVgImU="; }; - cargoSha256 = "sha256-SAVDSUm2jpDwTfwo4L6MVUKzBxZvCfjn4UNIGUJziSY="; + cargoHash = "sha256-OwbFIbKB/arj+3gq2tfEq8yTKSUPBQNYJNzrWvDv4A4="; - buildInputs = [ openssl sqlite ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libgit2 openssl sqlite ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + + OPENSSL_NO_VENDOR = 1; + LIBGIT2_NO_VENDOR = 1; + meta = with lib; { description = "An open source terminal based version of Typeracer written in rust"; homepage = "https://gitlab.com/ttyperacer/terminal-typeracer"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/timew-sync-server/default.nix b/third_party/nixpkgs/pkgs/applications/misc/timew-sync-server/default.nix index 8fb6bb3a10..04c9cfad1a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/timew-sync-server/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/timew-sync-server/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "timewarrior-synchronize"; repo = pname; rev = "v${version}"; - sha256 = "GaDcnPJBcDJ3AQaHzifDgdl0QT4GSbAOIqp4RrAcO3M="; + hash = "sha256-GaDcnPJBcDJ3AQaHzifDgdl0QT4GSbAOIqp4RrAcO3M="; }; - vendorSha256 = "iROqiRWkHG6N6kivUmgmu6sg14JDdG4f98BdR7CL1gs="; + vendorHash = "sha256-iROqiRWkHG6N6kivUmgmu6sg14JDdG4f98BdR7CL1gs="; meta = with lib; { homepage = "https://github.com/timewarrior-synchronize/timew-sync-server"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/timewarrior/default.nix b/third_party/nixpkgs/pkgs/applications/misc/timewarrior/default.nix index 026f5ae501..640a367b8b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/timewarrior/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/timewarrior/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "timewarrior"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "GothenburgBitFactory"; repo = "timewarrior"; rev = "v${version}"; - sha256 = "sha256-qD49NExR0OZ6hgt5ejGiltxF9xkmseJjhJNzEGofnhw="; + sha256 = "sha256-0obIMnPBvMO30o+qXqwtINNRobBR6cFO65B/xjVt+2w="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tomato-c/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tomato-c/default.nix new file mode 100644 index 0000000000..9f87712399 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/tomato-c/default.nix @@ -0,0 +1,67 @@ +{ lib +, stdenv +, fetchFromGitHub +, libnotify +, makeWrapper +, mpv +, ncurses +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tomato-c"; + version = "unstable-2023-08-21"; + + src = fetchFromGitHub { + owner = "gabrielzschmitz"; + repo = "Tomato.C"; + rev = "6e43e85aa15f3d96811311a3950eba8ce9715634"; + hash = "sha256-RpKkQ7xhM2XqfZdXra0ju0cTBL3Al9NMVQ/oleFydDs="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace "sudo " "" + substituteInPlace notify.c \ + --replace "/usr/local" "${placeholder "out"}" + substituteInPlace util.c \ + --replace "/usr/local" "${placeholder "out"}" + substituteInPlace tomato.desktop \ + --replace "/usr/local" "${placeholder "out"}" + ''; + + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + + buildInputs = [ + libnotify + mpv + ncurses + ]; + + installFlags = [ + "PREFIX=${placeholder "out"}" + "CPPFLAGS=$NIX_CFLAGS_COMPILE" + "LDFLAGS=$NIX_LDFLAGS" + ]; + + postFixup = '' + for file in $out/bin/*; do + wrapProgram $file \ + --prefix PATH : ${lib.makeBinPath [ libnotify mpv ]} + done + ''; + + strictDeps = true; + + meta = { + homepage = "https://github.com/gabrielzschmitz/Tomato.C"; + description = " A pomodoro timer written in pure C"; + license = with lib.licenses; [ gpl3Plus ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + mainProgram = "tomato"; + platforms = lib.platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix index 3d85939b37..0faa36302f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/toot/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, python3Packages, nixosTests }: python3Packages.buildPythonApplication rec { pname = "toot"; @@ -20,6 +20,8 @@ python3Packages.buildPythonApplication rec { py.test ''; + passthru.tests.toot = nixosTests.pleroma; + meta = with lib; { description = "Mastodon CLI interface"; homepage = "https://github.com/ihabunek/toot"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/translatelocally/default.nix b/third_party/nixpkgs/pkgs/applications/misc/translatelocally/default.nix new file mode 100644 index 0000000000..81aa9ec91b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/translatelocally/default.nix @@ -0,0 +1,62 @@ +{ lib, stdenv, fetchFromGitHub +, cmake, qt6, libarchive, pcre2, protobuf, gperftools, blas +}: + +let + rev = "f8a2dba0a63989c6b3a7be36f736ed478cad1dd2"; + +in stdenv.mkDerivation (finalAttrs: { + pname = "translatelocally"; + version = "unstable-2023-08-25"; + + src = fetchFromGitHub { + owner = "XapaJIaMnu"; + repo = "translateLocally"; + inherit rev; + hash = "sha256-uUdDi0CwCR/FQjw5D2s088d/Tp7NQOI0ia30oOhlGoc="; + fetchSubmodules = true; + }; + + patches = [ + ./version_without_git.patch + ]; + + postPatch = '' + echo '#define GIT_REVISION "${rev} ${finalAttrs.version}"' > \ + 3rd_party/bergamot-translator/3rd_party/marian-dev/src/common/git_revision.h + ''; + + nativeBuildInputs = [ + cmake + protobuf + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + qt6.qttools + qt6.qtbase + qt6.qtsvg + libarchive + pcre2 + protobuf + gperftools # provides tcmalloc + blas + ]; + + cmakeFlags = [ + "-DBLAS_LIBRARIES=-lblas" + "-DCBLAS_LIBRARIES=-lcblas" + ]; + + meta = with lib; { + mainProgram = "translateLocally"; + homepage = "https://translatelocally.com/"; + description = "Fast and secure translation on your local machine, powered by marian and Bergamot."; + license = licenses.mit; + maintainers = with maintainers; [ pacien ]; + platforms = platforms.linux; + + # https://github.com/XapaJIaMnu/translateLocally/issues/150 + broken = stdenv.isAarch64; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/misc/translatelocally/version_without_git.patch b/third_party/nixpkgs/pkgs/applications/misc/translatelocally/version_without_git.patch new file mode 100644 index 0000000000..9d7e618e3e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/translatelocally/version_without_git.patch @@ -0,0 +1,66 @@ +Submodule 3rd_party/bergamot-translator contains modified content +Submodule 3rd_party/marian-dev contains modified content +diff --git a/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake b/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake +index 31352565..d90a366d 100644 +--- a/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake ++++ b/3rd_party/bergamot-translator/3rd_party/marian-dev/cmake/GetVersionFromFile.cmake +@@ -22,10 +22,8 @@ else() + endif() + + # Get current commit SHA from git +-execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- OUTPUT_VARIABLE PROJECT_VERSION_GIT_SHA +- OUTPUT_STRIP_TRAILING_WHITESPACE) ++# (dummy value for nix package without the .git) ++set(PROJECT_VERSION_GIT_SHA 000000000000) + + # Get partial versions into a list + string(REGEX MATCHALL "-.*$|[0-9]+" PROJECT_PARTIAL_VERSION_LIST +diff --git a/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt b/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt +index 76aa0e2b..ca982bd3 100644 +--- a/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt ++++ b/3rd_party/bergamot-translator/3rd_party/marian-dev/src/CMakeLists.txt +@@ -149,23 +149,8 @@ target_compile_options(marian PRIVATE ${ALL_WARNINGS}) + # + # We set MARIAN_GIT_DIR to the appropriate path, depending on whether + # ${CMAKE_CURRENT_SOURCE_DIR}/../.git is a directory or file. +-set(MARIAN_GIT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../.git) +-if(NOT IS_DIRECTORY ${MARIAN_GIT_DIR}) # i.e., it's a submodule +- file(READ ${MARIAN_GIT_DIR} MARIAN_GIT_DIR) +- string(REGEX REPLACE "gitdir: (.*)\n" "\\1" MARIAN_GIT_DIR ${MARIAN_GIT_DIR}) +- if(NOT IS_ABSOLUTE ${MARIAN_GIT_DIR}) +- get_filename_component(MARIAN_GIT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${MARIAN_GIT_DIR}" ABSOLUTE) +- endif() +-endif(NOT IS_DIRECTORY ${MARIAN_GIT_DIR}) +- +-add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/common/git_revision.h +- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +- COMMAND git log -1 --pretty=format:\#define\ GIT_REVISION\ \"\%h\ \%ai\" > ${CMAKE_CURRENT_SOURCE_DIR}/common/git_revision.h +- DEPENDS ${MARIAN_GIT_DIR}/logs/HEAD +- VERBATIM +-) +-add_custom_target(marian_version DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/common/git_revision.h) +-add_dependencies(marian marian_version) # marian must depend on it so that it gets created first ++# (generated by nix package instead) ++ + # make sure all local dependencies are installed first before this is built + add_dependencies(marian 3rd_party_installs) + +diff --git a/cmake/GetVersionFromFile.cmake b/cmake/GetVersionFromFile.cmake +index 83b7975..71cd861 100644 +--- a/cmake/GetVersionFromFile.cmake ++++ b/cmake/GetVersionFromFile.cmake +@@ -23,10 +23,8 @@ else() + endif() + + # Get current commit SHA from git +-execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- OUTPUT_VARIABLE PROJECT_VERSION_GIT_SHA +- OUTPUT_STRIP_TRAILING_WHITESPACE) ++# (dummy value for nix package without the .git) ++set(PROJECT_VERSION_GIT_SHA 000000000000) + + # Get partial versions into a list + string(REGEX MATCHALL "-.*$|[0-9]+" PROJECT_PARTIAL_VERSION_LIST diff --git a/third_party/nixpkgs/pkgs/applications/misc/tsukae/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tsukae/default.nix index 893f35f6e4..0a01758b2c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tsukae/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tsukae/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-1y/WYLW6/HMGmuaX2wOlQbwYn0LcgQCMb4qw8BtCgxQ="; }; - vendorSha256 = "sha256-Q0WOzyJGnTXTmj7ZPKyVSnWuWb4bbDjDpgftQ1Opf/I="; + vendorHash = "sha256-Q0WOzyJGnTXTmj7ZPKyVSnWuWb4bbDjDpgftQ1Opf/I="; meta = with lib; { description = "Show off your most used shell commands."; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix index f970fe3776..795253aeda 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ttdl/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "ttdl"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "VladimirMarkelov"; repo = "ttdl"; rev = "v${version}"; - sha256 = "sha256-er2IDPVFbcuT0COBCpBymNVBKtETdWjzR2330WUBp6U="; + sha256 = "sha256-twl72feo1PpWZbs50a962pvvD5YUHfZRW9OjY/meYVo="; }; - cargoHash = "sha256-WcqkvnXRgsDJM7p2WGa5lmeeuwNwBy2ZQATVkTHRX7Q="; + cargoHash = "sha256-ZoVPC/PyMm+yuDYhVFykIBk0T5RNLAfmIT36Tl/dxCo="; meta = with lib; { description = "A CLI tool to manage todo lists in todo.txt format"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix index 6bf83be757..cd741b8338 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tty-share/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; # Upstream has a `./vendor` directory with all deps which we rely upon. - vendorSha256 = null; + vendorHash = null; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix index 7ccc562bb0..cdb348c08c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ttyper"; - version = "1.2.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "max-niederman"; repo = pname; rev = "v${version}"; - hash = "sha256-5U6+16gy5s+1zDSxy6rMheZFAbpiya3uxvr21VaHDZQ="; + hash = "sha256-kMJcZ9U2pUXFza66fpK07IHbRc5ZQ49+bytgty94o/s="; }; - cargoHash = "sha256-O5fPV20OSEMv7Yw982ZorhN7y3NTzrprS79n2ID0LwU="; + cargoHash = "sha256-pmPT8GREXKun5uyGx+b6IATp/cKziZTL7YcYwKEo/NU="; meta = with lib; { description = "Terminal-based typing test"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix index 6d2ba9e3f5..6af6ef09df 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tuba/default.nix @@ -13,6 +13,7 @@ , json-glib , glib , glib-networking +, gobject-introspection , gtksourceview5 , libxml2 , libgee @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { python3 wrapGAppsHook4 desktop-file-utils + gobject-introspection ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix index ca61f0aede..39b674d4c3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tui-journal/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "tui-journal"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "AmmarAbouZor"; repo = "tui-journal"; rev = "v${version}"; - hash = "sha256-DKactqPyZTDmD4F15wKHvwuzsZUj6y1MJuPyASnia/c="; + hash = "sha256-UK9Pq+QNEk+AeG5/ohyCiL+lSpENQfiR/Qm0nQGJGrg="; }; - cargoHash = "sha256-dLyI2cmIz1ucKdhAEs3Nz1tamcJUDZtdv4Fk/Wo+Zxs="; + cargoHash = "sha256-TpNnb3usDkNlcejlSkXb5R1fgVlKNYBFAWi1fEn9uzI="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/default.nix index e3ebd4143e..83821b29e6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tvbrowser/default.nix @@ -75,6 +75,7 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryBytecode fromSource ]; license = licenses.gpl3Plus; platforms = platforms.linux; + mainProgram = "tvbrowser"; maintainers = with maintainers; [ jfrankenau yarny ]; longDescription = '' TV-Browser shows TV program data arranged like in printed diff --git a/third_party/nixpkgs/pkgs/applications/misc/ubpm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ubpm/default.nix index a9053374c7..6e0d7f7f25 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ubpm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ubpm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitea, qmake, qttools, qtbase, qtserialport -, qtconnectivity, qtcharts, qttranslations, wrapQtAppsHook }: +, qtconnectivity, qtcharts, wrapQtAppsHook }: stdenv.mkDerivation (finalAttrs: { pname = "ubpm"; @@ -15,7 +15,6 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace sources/mainapp/mainapp.pro \ - --replace '$$[QT_INSTALL_TRANSLATIONS]' '${qttranslations}/translations' \ --replace 'INSTALLDIR = /tmp/ubpm.AppDir' "INSTALLDIR = $out" \ --replace '/usr/bin' '/bin' \ --replace 'INSTALLS += target translations themes devices help lin' 'INSTALLS += target translations themes devices help' @@ -40,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { # *.so plugins are being wrapped automatically which breaks them dontWrapQtApps = true; - buildInputs = [ qtbase qtserialport qtconnectivity qtcharts qttranslations ]; + buildInputs = [ qtbase qtserialport qtconnectivity qtcharts ]; meta = with lib; { homepage = "https://codeberg.org/LazyT/ubpm"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix b/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix index e28eb1e2ce..e4e3166952 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/udiskie/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { pname = "udiskie"; - version = "2.4.2"; + version = "2.5.0"; format = "setuptools"; @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { owner = "coldfix"; repo = "udiskie"; rev = "v${version}"; - hash = "sha256-lQMJVSY3JeZYYOFDyV29Ye2j8r+ngE/ta2wQYipy4hU="; + hash = "sha256-wIXh7dzygjzSXo51LBt1BW+sar6qUELWC6oTGPDGgcE="; }; patches = [ @@ -63,6 +63,10 @@ python3.pkgs.buildPythonApplication rec { postInstall = '' installManPage doc/udiskie.8 + + installShellCompletion \ + --bash completions/bash/* \ + --zsh completions/zsh/* ''; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/ultralist/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ultralist/default.nix index af2b6be2b2..4ca7283631 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ultralist/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ultralist/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-GGBW6rpwv1bVbLTD//cU8jNbq/27Ls0su7DymCJTSmY="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Simple GTD-style todo list for the command line"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/uni/default.nix b/third_party/nixpkgs/pkgs/applications/misc/uni/default.nix index 61ea657878..5f7db6f85b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/uni/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/uni/default.nix @@ -1,4 +1,7 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "uni"; @@ -7,17 +10,22 @@ buildGoModule rec { src = fetchFromGitHub { owner = "arp242"; repo = "uni"; - rev = "v${version}"; - sha256 = "kWiglMuJdcD7z2MDfz1MbItB8r9BJ7LUqfPfJa8QkLA="; + rev = "refs/tags/v${version}"; + hash = "sha256-kWiglMuJdcD7z2MDfz1MbItB8r9BJ7LUqfPfJa8QkLA="; }; - vendorSha256 = "6HNFCUSJA6oduCx/SCUQQeCHGS7ohaWRunixdwMurBw="; + vendorHash = "sha256-6HNFCUSJA6oduCx/SCUQQeCHGS7ohaWRunixdwMurBw="; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X=main.version=${version}" + ]; meta = with lib; { homepage = "https://github.com/arp242/uni"; description = "Query the Unicode database from the commandline, with good support for emojis"; + changelog = "https://github.com/arp242/uni/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ chvp ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix index ad45adbe0a..66a9eedeff 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix @@ -10,28 +10,29 @@ buildGoModule rec { pname = "usql"; - version = "0.14.10"; + version = "0.15.1"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-4T8h4KPouhjGaeeThCULilzmPs2CVGBpiqXYmtSkCO4="; + hash = "sha256-thpVcJ1HRhoOAli7829zM4fermEcS9FwzKX7ZjHGhZg="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-a+hcd0vQ0jt3Dp+YnMORe6yIohbmpN22sOUJ6G1i4P4="; + vendorHash = "sha256-S7fahA+ykviQoWc7p0CcTGfouswxQNBn4HH+tbl0fbI="; proxyVendor = true; - # Exclude broken impala & hive driver + # Exclude broken genji, hive & impala drivers (bad group) # These drivers break too often and are not used. # # See https://github.com/xo/usql/pull/347 # excludedPackages = [ - "impala" + "genji" "hive" + "impala" ]; # These tags and flags are copied from build-release.sh @@ -72,6 +73,7 @@ buildGoModule rec { homepage = "https://github.com/xo/usql"; changelog = "https://github.com/xo/usql/releases/tag/v${version}"; license = licenses.mit; + mainProgram = "usql"; maintainers = with maintainers; [ georgyo anthonyroussel ]; platforms = with platforms; linux ++ darwin; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix b/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix index 1b8f78cd61..e60803e5b6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/valent/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "valent"; - version = "unstable-2023-07-31"; + version = "unstable-2023-08-26"; src = fetchFromGitHub { owner = "andyholmes"; repo = "valent"; - rev = "698f39b496957d50c68437f16e74a7ac41eb5147"; + rev = "89d1e5a0312a0371bfcd9a95486805917c3729c0"; fetchSubmodules = true; - hash = "sha256-AdW6oMRVIgat8XlH342PEwe6BfkzKVLSadGOTLGwzwo="; + hash = "sha256-28l+SkjVQkOA/5f5nT5BbqIV2BrMLmSK/YtDGYl1xjQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/valentina/default.nix b/third_party/nixpkgs/pkgs/applications/misc/valentina/default.nix index f5cd55c534..09b3eabf18 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/valentina/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/valentina/default.nix @@ -1,32 +1,27 @@ -{ lib, stdenv, fetchFromGitLab, substituteAll, installShellFiles +{ lib, stdenv, fetchFromGitLab, installShellFiles , qmake, qttools -, qtsvg, qttranslations, qtxmlpatterns +, qtsvg, qtxmlpatterns , wrapQtAppsHook +, autoPatchelfHook }: stdenv.mkDerivation rec { pname = "valentina"; - version = "0.7.51"; + version = "0.7.52"; src = fetchFromGitLab { owner = "smart-pattern"; repo = "valentina"; rev = "v${version}"; - hash = "sha256-N9fC2tCP4TVNncatHaz5W5Mp3jOmAcEWYCl30+0myaE="; + hash = "sha256-DmNRBxqyBvDTdA7Sz9X04Dhejtxx7tOVpST+SkUNguM="; }; - patches = (substituteAll { - # See https://github.com/NixOS/nixpkgs/issues/86054 - src = ./fix-qttranslations-path.patch; - inherit qttranslations; - }); - postPatch = '' substituteInPlace src/app/translations.pri \ --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev qttools}/bin/lrelease' ''; - nativeBuildInputs = [ qmake qttools wrapQtAppsHook installShellFiles ]; + nativeBuildInputs = [ qmake qttools wrapQtAppsHook installShellFiles autoPatchelfHook ]; buildInputs = [ qtsvg qtxmlpatterns ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/valentina/fix-qttranslations-path.patch b/third_party/nixpkgs/pkgs/applications/misc/valentina/fix-qttranslations-path.patch deleted file mode 100644 index de3fe05cc8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/valentina/fix-qttranslations-path.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff --git i/src/libs/vmisc/vabstractapplication.cpp w/src/libs/vmisc/vabstractapplication.cpp -index b64817bab..5f9aa3518 100644 ---- i/src/libs/vmisc/vabstractapplication.cpp -+++ w/src/libs/vmisc/vabstractapplication.cpp -@@ -221,26 +221,26 @@ void VAbstractApplication::LoadTranslation(const QString &locale) - ClearTranslation(); - - qtTranslator = new QTranslator(this); --#if defined(Q_OS_WIN) || defined(Q_OS_MAC) -+#if defined(Q_OS_WIN) - qtTranslator->load("qt_" + locale, translationsPath(locale)); - #else -- qtTranslator->load("qt_" + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); -+ qtTranslator->load("qt_" + locale, QLatin1String("@qttranslations@/translations")); - #endif - installTranslator(qtTranslator); - - qtxmlTranslator = new QTranslator(this); --#if defined(Q_OS_WIN) || defined(Q_OS_MAC) -+#if defined(Q_OS_WIN) - qtxmlTranslator->load("qtxmlpatterns_" + locale, translationsPath(locale)); - #else -- qtxmlTranslator->load("qtxmlpatterns_" + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); -+ qtxmlTranslator->load("qtxmlpatterns_" + locale, QLatin1String("@qttranslations@/translations")); - #endif - installTranslator(qtxmlTranslator); - - qtBaseTranslator = new QTranslator(this); --#if defined(Q_OS_WIN) || defined(Q_OS_MAC) -+#if defined(Q_OS_WIN) - qtBaseTranslator->load("qtbase_" + locale, translationsPath(locale)); - #else -- qtBaseTranslator->load("qtbase_" + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)); -+ qtBaseTranslator->load("qtbase_" + locale, QLatin1String("@qttranslations@/translations")); - #endif - installTranslator(qtBaseTranslator); - diff --git a/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix index 5add364c76..cbbe3408d4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wallust/default.nix @@ -1,26 +1,29 @@ { lib , fetchFromGitea , rustPlatform +, nix-update-script }: rustPlatform.buildRustPackage rec { pname = "wallust"; - version = "2.6.1"; + version = "2.7.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "explosion-mental"; repo = pname; rev = version; - hash = "sha256-xcsOOA6esvIhzeka8E9OvCT8aXMWWSHO4lNLtaocTSo="; + hash = "sha256-WhL2HWM1onRrCqWJPLnAVMd/f/xfLrK3mU8jFSLFjAM="; }; - cargoSha256 = "sha256-YDIBn2fjlvNTYwMVn/MkID/EMmzz4oLieVgG2R95q4M="; + cargoSha256 = "sha256-pR2vdqMGJZ6zvXwwKUIPjb/lWzVgYqQ7C7/sk/+usc4="; + + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A better pywal"; homepage = "https://codeberg.org/explosion-mental/wallust"; license = licenses.mit; - maintainers = with maintainers; [onemoresuza iynaix]; + maintainers = with maintainers; [ onemoresuza iynaix ]; downloadPage = "https://codeberg.org/explosion-mental/wallust/releases/tag/${version}"; platforms = platforms.unix; mainProgram = "wallust"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/watchmate/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/watchmate/Cargo.lock index 2e0ae13192..df3bf599d4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/watchmate/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/misc/watchmate/Cargo.lock @@ -1054,9 +1054,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.2" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e47dca53cb1a8ae3006e869b5711ae7370180db537f6d98e3bcaf23fabfd911f" +checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" dependencies = [ "bitflags", "cairo-rs", @@ -1108,6 +1108,24 @@ dependencies = [ "system-deps", ] +[[package]] +name = "gvdb" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6fc5915836ff1779eb9455810dad729811334b1026d4316eaf89c3a415e32ea" +dependencies = [ + "byteorder", + "flate2", + "lazy_static", + "memmap2", + "quick-xml", + "safe-transmute", + "serde", + "serde_json", + "walkdir", + "zvariant", +] + [[package]] name = "h2" version = "0.3.16" @@ -1473,6 +1491,15 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +[[package]] +name = "memmap2" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" +dependencies = [ + "libc", +] + [[package]] name = "memoffset" version = "0.7.1" @@ -1842,6 +1869,16 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "quick-xml" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "quote" version = "1.0.26" @@ -1920,9 +1957,9 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "relm4" -version = "0.6.0-alpha.2" +version = "0.6.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc5e3ddd682eeb0ca33da36b821fc907017c6d7758b09ce280247b0b0ea8cd" +checksum = "f169f698ce2e487eed2306898fcf262224a287d0e81480db4190e74cfec412cf" dependencies = [ "async-trait", "flume", @@ -1938,9 +1975,9 @@ dependencies = [ [[package]] name = "relm4-components" -version = "0.6.0-alpha.2" +version = "0.6.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26bc1784d641cd5d97ac4d26c56f68699aaa4518b7c827c295c1515ddafa96e4" +checksum = "734838f188ee58954351c75175cb5ba6e9e67f90576b7fb90b928b2cb6043e1d" dependencies = [ "once_cell", "relm4", @@ -1948,10 +1985,20 @@ dependencies = [ ] [[package]] -name = "relm4-macros" -version = "0.6.0-alpha.2" +name = "relm4-icons" +version = "0.6.0-beta.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8525ce12dcd7d2a9e9070d84b8b885600eccd0a143df6712ce34a87d001a8b7" +checksum = "b7123701f31271a2e33a53270a6e73010356d99cff1b97c89276299609af3303" +dependencies = [ + "gtk4", + "gvdb", +] + +[[package]] +name = "relm4-macros" +version = "0.6.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fa06febb3685960e7c1c44e21e44a3829325940b31d1e91391a43c32020c201" dependencies = [ "proc-macro2", "quote", @@ -2030,6 +2077,21 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +[[package]] +name = "safe-transmute" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98a01dab6acf992653be49205bdd549f32f17cb2803e8eacf1560bf97259aae8" + +[[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.21" @@ -2602,6 +2664,16 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +[[package]] +name = "walkdir" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.0" @@ -2701,6 +2773,7 @@ dependencies = [ "log", "relm4", "relm4-components", + "relm4-icons", "version-compare", ] diff --git a/third_party/nixpkgs/pkgs/applications/misc/watchmate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/watchmate/default.nix index db1faf2463..b78d7f5277 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/watchmate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/watchmate/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "watchmate"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "azymohliad"; repo = "watchmate"; rev = "v${version}"; - hash = "sha256-+E1tyDfFSu3J89fXd75bdYxh+Z1zTwKL6AmMTNQBEYY="; + hash = "sha256-4L9mfZWphwXON8VgRcGrz+k62wyPzd1phtRu9HQnVdE="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix index 6b087c26b9..d2e49ee8fb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/waybar/default.nix @@ -44,6 +44,7 @@ , cavaSupport ? true , evdevSupport ? true +, experimentalPatches ? true , hyprlandSupport ? true , inputSupport ? true , jackSupport ? true @@ -162,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { "tests" = runTests; "upower_glib" = upowerSupport; "wireplumber" = wireplumberSupport; - }); + }) ++ lib.optional experimentalPatches (lib.mesonBool "experimental" true); preFixup = lib.optionalString withMediaPlayer '' cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py diff --git a/third_party/nixpkgs/pkgs/applications/misc/waylock/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waylock/default.nix index ba2a97534d..9445ed8f1f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/waylock/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/waylock/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: { description = "A small screenlocker for Wayland compositors"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ jordanisaacs ]; + mainProgram = "waylock"; platforms = lib.platforms.linux; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/misc/waypaper/default.nix b/third_party/nixpkgs/pkgs/applications/misc/waypaper/default.nix index 86c23400f1..b17e8b974e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/waypaper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/waypaper/default.nix @@ -2,19 +2,19 @@ , python3 , fetchFromGitHub , gobject-introspection -, gtk3 , wrapGAppsHook +, killall }: python3.pkgs.buildPythonApplication rec { pname = "waypaper"; - version = "1.5"; + version = "1.9"; src = fetchFromGitHub { owner = "anufrievroman"; repo = "waypaper"; rev = "refs/tags/${version}"; - hash = "sha256-lK4TygR9cwEHcnrC0E5vE7Jor6afEiM9TmEgGXj+hNA="; + hash = "sha256-6hv+f2fbrbLodJIRHl5MYTkiZ51iZOAK42Vg73zSw/E="; }; nativeBuildInputs = [ @@ -22,8 +22,9 @@ python3.pkgs.buildPythonApplication rec { wrapGAppsHook ]; - propagatedBuildInputs = with python3.pkgs; [ - pygobject3 + propagatedBuildInputs = [ + python3.pkgs.pygobject3 + killall ]; # has no tests diff --git a/third_party/nixpkgs/pkgs/applications/misc/whalebird/default.nix b/third_party/nixpkgs/pkgs/applications/misc/whalebird/default.nix index 36868690d8..ce7d178f1c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/whalebird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/whalebird/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl -, autoPatchelfHook, makeDesktopItem, copyDesktopItems, makeWrapper, gnugrep, nodePackages +, autoPatchelfHook, makeDesktopItem, copyDesktopItems, makeWrapper, gnugrep, asar , electron, python3, alsa-lib, gtk3, libdbusmenu, libxshmfence, mesa, nss }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { makeWrapper copyDesktopItems gnugrep - nodePackages.asar + asar ]; buildInputs = [ alsa-lib gtk3 libdbusmenu libxshmfence mesa nss ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/wofi-emoji/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wofi-emoji/default.nix index eab1baedca..f759ee34fb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wofi-emoji/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wofi-emoji/default.nix @@ -1,19 +1,18 @@ { stdenv, lib, fetchurl, fetchFromGitHub, jq, wofi, wtype, wl-clipboard }: let emojiJSON = fetchurl { - url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.6/dist/emoji-en-US.json"; - sha256 = "sha256-wf7zsIEbX/diLwmVvnN2Goxh2V5D3Z6nbEMSb5pSGt0="; -}; + url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.10/dist/emoji-en-US.json"; + hash = "sha256-UhAB5hVp5vV2d1FjIb2TBd2FJ6OPBbiP31HGAEDQFnA=";}; in stdenv.mkDerivation rec { pname = "wofi-emoji"; - version = "unstable-2022-08-19"; + version = "unstable-2023-06-19"; src = fetchFromGitHub { - owner = "dln"; + owner = "Zeioth"; repo = pname; - rev = "c5ecb4f0f164aedb046f52b5eacac889609c8522"; - sha256 = "1wq276bhf9x24ds13b2dwa69cjnr207p6977hr4bsnczryg609rh"; + rev = "796d688b71ac9fa1e5b2c1b9a3fa11dba801b02b"; + hash = "sha256-HBsqekNuKqxaKaSeLboukLm4Lkg9JakPO7uN3Z8QBC8="; }; nativeBuildInputs = [ jq ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/workrave/default.nix b/third_party/nixpkgs/pkgs/applications/misc/workrave/default.nix index c9bb4131c5..7d85f9c7a2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/workrave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/workrave/default.nix @@ -35,14 +35,14 @@ stdenv.mkDerivation rec { pname = "workrave"; - version = "1.10.51.1"; + version = "1.10.52"; src = fetchFromGitHub { repo = "workrave"; owner = "rcaelers"; rev = with lib; "v" + concatStringsSep "_" (splitVersion version); - sha256 = "sha256-rx3k4U5igRYxzuVke+x926K1Pso32iGob4Ccp0jdKds="; + sha256 = "sha256-U39zr8XGIDbyY480bla2yTaRQLP3wMrL8RLWjlTa5uY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix b/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix index 1f9c048e71..17f03c787d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/writefreely/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-GnuqYgiwXdKM+os5RzuUYe9ADOhZaxou5dD7GCEE1Ns="; }; - vendorSha256 = "sha256-IBer+8FP+IWWJPnaugr8zzQA9mSVFzP0Nofgl/PhtzQ="; + vendorHash = "sha256-IBer+8FP+IWWJPnaugr8zzQA9mSVFzP0Nofgl/PhtzQ="; nativeBuildInputs = [ go-bindata ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix index 4e4a849881..54775719a2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wttrbar/default.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage rec { pname = "wttrbar"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "bjesus"; repo = "wttrbar"; rev = version; - hash = "sha256-RQeRDu8x6OQAD7VYT7FwBfj8gxn1nj6hP60oCIiuAgg="; + hash = "sha256-697LoXu6x8ODQa7tG/NqpSqnLJgM765wBFFnKyul7uI="; }; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; - cargoHash = "sha256-hJCEA6m/iZuSjWRbbaoJ5ryG0z5U/IWhbEvNAohFyjg="; + cargoHash = "sha256-sxZ4R7QXQSuNFNRuOI/omON6QmQ0DTKQvjHy1BcvXAA="; meta = { description = "A simple but detailed weather indicator for Waybar using wttr.in"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xchm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xchm/default.nix index 32b53a663d..e5b3100dac 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xchm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xchm/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "xchm"; - version = "1.35"; + version = "1.36"; src = fetchFromGitHub { owner = "rzvncj"; repo = "xCHM"; rev = version; - sha256 = "sha256-ZJvlllhF7KPz+v6KEVPyJjiz+4LHM2Br/oqI54a2Ews="; + sha256 = "sha256-+RbFE/jOD8sofHMCFgTIfgokrXYqDbCSSnN6SdEZ/b0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/xlights/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xlights/default.nix new file mode 100644 index 0000000000..459a7fd2d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/xlights/default.nix @@ -0,0 +1,19 @@ +{ lib, appimageTools, fetchurl }: + +appimageTools.wrapType2 rec { + pname = "xlights"; + version = "2023.13"; + + src = fetchurl { + url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage"; + hash = "sha256-vNauKG7F7AiSMZrkMPwR9C+Mshot4NOf4oIdEr5Pu3Q="; + }; + + meta = with lib; { + description = "xLights is a sequencer for Lights. xLights has usb and E1.31 drivers. You can create sequences in this object oriented program. You can create playlists, schedule them, test your hardware, convert between different sequencers."; + homepage = "https://xlights.org"; + license = licenses.gpl3; + maintainers = with maintainers; [ kashw2 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix index 812ecfb16d..2a6ac97c9c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -59,6 +59,9 @@ stdenv.mkDerivation rec { runHook postInstall ''; + # https://github.com/NixOS/nixpkgs/issues/245534 + hardeningDisable = [ "fortify" ]; + meta = with lib; { description = "Monero (XMR) CPU miner"; homepage = "https://github.com/xmrig/xmrig"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix index be5d08f6ef..99d8225f26 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.19.3-mo1"; + version = "6.20.0-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-0yH+EFhzhDS/75AIjMiFbkQuHfPaJRzdr7n4/WBkeNM="; + sha256 = "sha256-yHAipyZJXwH21u4YwjUqDCsXHVrI+eSnp4Iqt3AZC9A="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/yambar-hyprland-wses/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yambar-hyprland-wses/default.nix new file mode 100644 index 0000000000..e64e8e13de --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/yambar-hyprland-wses/default.nix @@ -0,0 +1,27 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "yambar-hyprland-wses"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "jonhoo"; + repo = "yambar-hyprland-wses"; + rev = "v${version}"; + hash = "sha256-furHj1AAFgNiNHP9RBsVrIvrDckSKU8FXilzH9TQ99c="; + }; + + cargoHash = "sha256-/ewEgrBxRw5Xii5PX1GLKzBrZjgnzYc/Hz+M1pJpncQ="; + + meta = { + description = "Enable Yambar to show Hyprland workspaces"; + homepage = "https://github.com/jonhoo/yambar-hyprland-wses"; + license = with lib.licenses; [ asl20 mit ]; + maintainers = with lib.maintainers; [ ludovicopiero ]; + mainProgram = "yambar-hyprland-wses"; + platforms = lib.platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/yate/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yate/default.nix index 872592a043..07857fbf5e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, qt4, openssl, pkg-config }: +{ stdenv, fetchurl, lib, openssl, pkg-config }: stdenv.mkDerivation rec { pname = "yate"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { # TODO zaptel ? postgres ? nativeBuildInputs = [ pkg-config ]; - buildInputs = [ qt4 openssl ]; + buildInputs = [ openssl ]; # /dev/null is used when linking which is a impure path for the wrapper postPatch = diff --git a/third_party/nixpkgs/pkgs/applications/misc/ydict/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ydict/default.nix index 078d6abccf..93b06323e0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ydict/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ydict/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-qrGOrqI+PXsDNCmgcCPDNn6qUYu2emhYSkYsz4sj27M="; }; - vendorSha256 = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs="; + vendorHash = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix index b6dfbafb1c..14f50e3be2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yewtube/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yewtube"; - version = "2.10.4"; + version = "2.10.5"; src = fetchFromGitHub { owner = "mps-youtube"; repo = "yewtube"; rev = "refs/tags/v${version}"; - hash = "sha256-v0ePyY+7GUlnv1WLKn7GuIv+A2QdXObRnTyMkk5hI1U="; + hash = "sha256-a7ySRHSRHmQePaVV7HnCk8QsiAQfN4nCVRdamPMUHGo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix index 326e03721e..9082fb1178 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/default.nix @@ -1,5 +1,6 @@ { lib -, flutter37 +, writeText +, flutter , python3 , fetchFromGitHub , pcre2 @@ -11,7 +12,7 @@ , removeReferencesTo }: -flutter37.buildFlutterApplication rec { +flutter.buildFlutterApplication rec { pname = "yubioath-flutter"; version = "6.2.0"; @@ -24,10 +25,16 @@ flutter37.buildFlutterApplication rec { passthru.helper = python3.pkgs.callPackage ./helper.nix { inherit src version meta; }; + pubspecLockFile = ./pubspec.lock; depsListFile = ./deps.json; - vendorHash = "sha256-q/dNj9Pu7zg0HkV2QkXBbXiTsljsSJOqXhvAQlnoLlA="; + vendorHash = "sha256-RV7NoXJnd1jYGcU5YE0VV7VlMM7bz2JTMJTImOY3m38="; postPatch = '' + rm -f pubspec.lock + ln -s "${writeText "${pname}-overrides.yaml" (builtins.toJSON { + dependency_overrides.intl = "^0.18.1"; + })}" pubspec_overrides.yaml + substituteInPlace linux/CMakeLists.txt \ --replace "../build/linux/helper" "${passthru.helper}/libexec/helper" ''; @@ -63,9 +70,6 @@ flutter37.buildFlutterApplication rec { substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \ --replace "@EXEC_PATH/authenticator" "$out/bin/yubioath-flutter" \ --replace "@EXEC_PATH/linux_support/com.yubico.yubioath.png" "$out/share/icons/com.yubico.yubioath.png" - - # Remove unnecessary references to Flutter. - remove-references-to -t ${flutter37.unwrapped} $out/app/data/flutter_assets/shaders/ink_sparkle.frag ''; nativeBuildInputs = [ @@ -80,11 +84,6 @@ flutter37.buildFlutterApplication rec { libappindicator ]; - disallowedReferences = [ - flutter37 - flutter37.unwrapped - ]; - meta = with lib; { description = "Yubico Authenticator for Desktop"; homepage = "https://github.com/Yubico/yubioath-flutter"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/deps.json b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/deps.json index 6d7414da34..5754c1e0b2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/deps.json +++ b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/deps.json @@ -39,7 +39,7 @@ }, { "name": "json_serializable", - "version": "6.6.1", + "version": "6.7.1", "kind": "dev", "source": "hosted", "dependencies": [ @@ -59,7 +59,7 @@ }, { "name": "source_helper", - "version": "1.3.3", + "version": "1.3.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -70,7 +70,7 @@ }, { "name": "source_gen", - "version": "1.2.7", + "version": "1.4.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -86,7 +86,7 @@ }, { "name": "yaml", - "version": "3.1.1", + "version": "3.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -106,7 +106,7 @@ }, { "name": "source_span", - "version": "1.9.1", + "version": "1.10.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -124,21 +124,21 @@ }, { "name": "path", - "version": "1.8.2", + "version": "1.8.3", "kind": "direct", "source": "hosted", "dependencies": [] }, { "name": "collection", - "version": "1.17.0", + "version": "1.17.2", "kind": "direct", "source": "hosted", "dependencies": [] }, { "name": "glob", - "version": "2.1.1", + "version": "2.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -161,14 +161,14 @@ }, { "name": "meta", - "version": "1.8.0", + "version": "1.9.1", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "async", - "version": "2.10.0", + "version": "2.11.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -178,7 +178,7 @@ }, { "name": "dart_style", - "version": "2.2.4", + "version": "2.3.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -191,7 +191,7 @@ }, { "name": "pub_semver", - "version": "2.1.3", + "version": "2.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -201,14 +201,14 @@ }, { "name": "args", - "version": "2.4.0", + "version": "2.4.2", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "analyzer", - "version": "5.6.0", + "version": "6.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -228,7 +228,7 @@ }, { "name": "watcher", - "version": "1.0.2", + "version": "1.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -247,7 +247,7 @@ }, { "name": "crypto", - "version": "3.0.2", + "version": "3.0.3", "kind": "direct", "source": "hosted", "dependencies": [ @@ -256,7 +256,7 @@ }, { "name": "typed_data", - "version": "1.3.1", + "version": "1.3.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -274,7 +274,7 @@ }, { "name": "_fe_analyzer_shared", - "version": "54.0.0", + "version": "64.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -283,7 +283,7 @@ }, { "name": "build", - "version": "2.3.1", + "version": "2.4.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -294,19 +294,20 @@ "glob", "logging", "meta", + "package_config", "path" ] }, { "name": "logging", - "version": "1.1.1", + "version": "1.2.0", "kind": "direct", "source": "hosted", "dependencies": [] }, { "name": "pubspec_parse", - "version": "1.2.1", + "version": "1.2.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -319,7 +320,7 @@ }, { "name": "json_annotation", - "version": "4.8.0", + "version": "4.8.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -328,7 +329,7 @@ }, { "name": "checked_yaml", - "version": "2.0.2", + "version": "2.0.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -352,7 +353,7 @@ }, { "name": "freezed", - "version": "2.3.2", + "version": "2.4.2", "kind": "dev", "source": "hosted", "dependencies": [ @@ -368,7 +369,7 @@ }, { "name": "freezed_annotation", - "version": "2.2.0", + "version": "2.4.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -379,13 +380,13 @@ }, { "name": "build_runner", - "version": "2.3.3", + "version": "2.4.6", "kind": "dev", "source": "hosted", "dependencies": [ + "analyzer", "args", "async", - "analyzer", "build", "build_config", "build_daemon", @@ -421,7 +422,7 @@ }, { "name": "web_socket_channel", - "version": "2.3.0", + "version": "2.4.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -466,7 +467,7 @@ }, { "name": "shelf_web_socket", - "version": "1.0.3", + "version": "1.0.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -477,7 +478,7 @@ }, { "name": "shelf", - "version": "1.4.0", + "version": "1.4.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -520,7 +521,7 @@ }, { "name": "js", - "version": "0.6.5", + "version": "0.6.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -549,7 +550,7 @@ }, { "name": "graphs", - "version": "2.2.0", + "version": "2.3.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -568,7 +569,7 @@ }, { "name": "code_builder", - "version": "4.4.0", + "version": "4.5.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -581,17 +582,47 @@ }, { "name": "matcher", - "version": "0.12.13", + "version": "0.12.16", "kind": "transitive", "source": "hosted", "dependencies": [ + "async", "meta", - "stack_trace" + "stack_trace", + "term_glyph", + "test_api" + ] + }, + { + "name": "test_api", + "version": "0.6.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "async", + "boolean_selector", + "collection", + "meta", + "source_span", + "stack_trace", + "stream_channel", + "string_scanner", + "term_glyph" + ] + }, + { + "name": "boolean_selector", + "version": "2.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "source_span", + "string_scanner" ] }, { "name": "built_value", - "version": "8.4.3", + "version": "8.6.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -617,7 +648,7 @@ }, { "name": "build_runner_core", - "version": "7.2.7", + "version": "7.2.10", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -633,8 +664,8 @@ "json_annotation", "logging", "meta", - "path", "package_config", + "path", "pool", "timing", "watcher", @@ -643,7 +674,7 @@ }, { "name": "build_resolvers", - "version": "2.2.0", + "version": "2.2.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -654,8 +685,8 @@ "crypto", "graphs", "logging", - "path", "package_config", + "path", "pool", "pub_semver", "stream_transform", @@ -664,7 +695,7 @@ }, { "name": "build_daemon", - "version": "3.1.1", + "version": "4.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -683,7 +714,7 @@ }, { "name": "flutter_lints", - "version": "2.0.1", + "version": "2.0.2", "kind": "dev", "source": "hosted", "dependencies": [ @@ -692,7 +723,7 @@ }, { "name": "lints", - "version": "2.0.1", + "version": "2.1.1", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -705,6 +736,7 @@ "dependencies": [ "flutter", "test_api", + "matcher", "path", "fake_async", "clock", @@ -714,40 +746,38 @@ "boolean_selector", "characters", "collection", - "js", - "matcher", "material_color_utilities", "meta", "source_span", "stream_channel", "string_scanner", - "term_glyph" + "term_glyph", + "web" ] }, + { + "name": "web", + "version": "0.1.4-beta", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, { "name": "material_color_utilities", - "version": "0.2.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "characters", - "version": "1.2.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "boolean_selector", - "version": "2.1.1", + "version": "0.5.0", "kind": "transitive", "source": "hosted", "dependencies": [ - "source_span", - "string_scanner" + "collection" ] }, + { + "name": "characters", + "version": "1.3.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, { "name": "vector_math", "version": "2.1.4", @@ -772,24 +802,6 @@ "collection" ] }, - { - "name": "test_api", - "version": "0.4.16", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "async", - "boolean_selector", - "collection", - "meta", - "source_span", - "stack_trace", - "stream_channel", - "string_scanner", - "term_glyph", - "matcher" - ] - }, { "name": "flutter", "version": "0.0.0", @@ -798,10 +810,10 @@ "dependencies": [ "characters", "collection", - "js", "material_color_utilities", "meta", "vector_math", + "web", "sky_engine" ] }, @@ -823,16 +835,13 @@ "flutter_test", "path", "vm_service", - "archive", "async", "boolean_selector", "characters", "clock", "collection", - "crypto", "fake_async", "file", - "js", "matcher", "material_color_utilities", "meta", @@ -843,18 +852,17 @@ "sync_http", "term_glyph", "test_api", - "typed_data", "vector_math", + "web", "webdriver" ] }, { "name": "webdriver", - "version": "3.0.1", + "version": "3.0.2", "kind": "transitive", "source": "hosted", "dependencies": [ - "archive", "matcher", "path", "stack_trace", @@ -868,19 +876,9 @@ "source": "hosted", "dependencies": [] }, - { - "name": "archive", - "version": "3.3.2", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "crypto", - "path" - ] - }, { "name": "vm_service", - "version": "9.4.0", + "version": "11.7.1", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -899,14 +897,11 @@ "meta", "vm_service", "webdriver", - "archive", "async", "boolean_selector", "characters", "clock", "collection", - "crypto", - "js", "matcher", "material_color_utilities", "platform", @@ -918,8 +913,8 @@ "sync_http", "term_glyph", "test_api", - "typed_data", - "vector_math" + "vector_math", + "web" ] }, { @@ -1001,9 +996,31 @@ "flutter" ] }, + { + "name": "archive", + "version": "3.3.7", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "crypto", + "path", + "pointycastle" + ] + }, + { + "name": "pointycastle", + "version": "3.7.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "convert", + "js" + ] + }, { "name": "file_picker", - "version": "5.2.7", + "version": "5.3.4", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1018,7 +1035,7 @@ }, { "name": "win32", - "version": "3.1.3", + "version": "5.0.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1027,14 +1044,14 @@ }, { "name": "ffi", - "version": "2.0.1", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "plugin_platform_interface", - "version": "2.1.4", + "version": "2.1.5", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1043,7 +1060,7 @@ }, { "name": "flutter_plugin_android_lifecycle", - "version": "2.0.7", + "version": "2.0.15", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1057,17 +1074,17 @@ "source": "sdk", "dependencies": [ "flutter", - "js", "characters", "collection", "material_color_utilities", "meta", - "vector_math" + "vector_math", + "web" ] }, { "name": "vector_graphics_compiler", - "version": "1.1.4", + "version": "1.1.7", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1080,14 +1097,14 @@ }, { "name": "vector_graphics_codec", - "version": "1.1.4", + "version": "1.1.7", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "xml", - "version": "6.2.2", + "version": "6.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1098,7 +1115,7 @@ }, { "name": "petitparser", - "version": "5.1.0", + "version": "5.4.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1117,7 +1134,7 @@ }, { "name": "vector_graphics", - "version": "1.1.4", + "version": "1.1.7", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1127,7 +1144,7 @@ }, { "name": "path_provider", - "version": "2.0.14", + "version": "2.1.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1141,7 +1158,7 @@ }, { "name": "path_provider_windows", - "version": "2.1.4", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1154,7 +1171,7 @@ }, { "name": "path_provider_platform_interface", - "version": "2.0.6", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1165,7 +1182,7 @@ }, { "name": "path_provider_linux", - "version": "2.1.9", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1178,18 +1195,17 @@ }, { "name": "xdg_directories", - "version": "1.0.0", + "version": "1.0.2", "kind": "transitive", "source": "hosted", "dependencies": [ "meta", - "path", - "process" + "path" ] }, { "name": "path_provider_foundation", - "version": "2.1.1", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1199,7 +1215,7 @@ }, { "name": "path_provider_android", - "version": "2.0.22", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1209,7 +1225,7 @@ }, { "name": "url_launcher", - "version": "6.1.10", + "version": "6.1.12", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1225,7 +1241,7 @@ }, { "name": "url_launcher_windows", - "version": "3.0.4", + "version": "3.0.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1235,7 +1251,7 @@ }, { "name": "url_launcher_platform_interface", - "version": "2.1.2", + "version": "2.1.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1245,7 +1261,7 @@ }, { "name": "url_launcher_web", - "version": "2.0.15", + "version": "2.0.18", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1256,7 +1272,7 @@ }, { "name": "url_launcher_macos", - "version": "3.0.3", + "version": "3.0.6", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1266,7 +1282,7 @@ }, { "name": "url_launcher_linux", - "version": "3.0.3", + "version": "3.0.5", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1276,7 +1292,7 @@ }, { "name": "url_launcher_ios", - "version": "6.1.1", + "version": "6.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1286,7 +1302,7 @@ }, { "name": "url_launcher_android", - "version": "6.0.24", + "version": "6.0.38", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1296,7 +1312,7 @@ }, { "name": "desktop_drop", - "version": "0.4.1", + "version": "0.4.3", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1317,7 +1333,7 @@ }, { "name": "screen_retriever", - "version": "0.1.6", + "version": "0.1.9", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1336,7 +1352,7 @@ }, { "name": "window_manager", - "version": "0.3.2", + "version": "0.3.6", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1381,7 +1397,7 @@ }, { "name": "shared_preferences", - "version": "2.1.0", + "version": "2.2.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1396,7 +1412,7 @@ }, { "name": "shared_preferences_windows", - "version": "2.2.0", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1410,7 +1426,7 @@ }, { "name": "shared_preferences_platform_interface", - "version": "2.2.0", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1420,7 +1436,7 @@ }, { "name": "shared_preferences_web", - "version": "2.1.0", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1431,7 +1447,7 @@ }, { "name": "shared_preferences_linux", - "version": "2.2.0", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1445,7 +1461,7 @@ }, { "name": "shared_preferences_foundation", - "version": "2.2.0", + "version": "2.3.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1455,7 +1471,7 @@ }, { "name": "shared_preferences_android", - "version": "2.1.0", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1465,11 +1481,12 @@ }, { "name": "intl", - "version": "0.17.0", + "version": "0.18.1", "kind": "direct", "source": "hosted", "dependencies": [ "clock", + "meta", "path" ] }, @@ -1484,11 +1501,11 @@ "characters", "clock", "collection", - "js", "material_color_utilities", "meta", "path", - "vector_math" + "vector_math", + "web" ] } ] diff --git a/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/pubspec.lock b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/pubspec.lock new file mode 100644 index 0000000000..524d76f7f2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/yubioath-flutter/pubspec.lock @@ -0,0 +1,997 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051 + url: "https://pub.dev" + source: hosted + version: "64.0.0" + analyzer: + dependency: transitive + description: + name: analyzer + sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893" + url: "https://pub.dev" + source: hosted + version: "6.2.0" + archive: + dependency: "direct main" + description: + name: archive + sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a" + url: "https://pub.dev" + source: hosted + version: "3.3.7" + args: + dependency: transitive + description: + name: args + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" + source: hosted + version: "2.4.2" + async: + dependency: "direct main" + description: + name: async + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" + source: hosted + version: "2.11.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + build: + dependency: transitive + description: + name: build + sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + build_config: + dependency: transitive + description: + name: build_config + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + url: "https://pub.dev" + source: hosted + version: "1.1.1" + build_daemon: + dependency: transitive + description: + name: build_daemon + sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65" + url: "https://pub.dev" + source: hosted + version: "4.0.0" + build_resolvers: + dependency: transitive + description: + name: build_resolvers + sha256: "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20" + url: "https://pub.dev" + source: hosted + version: "2.2.1" + build_runner: + dependency: "direct dev" + description: + name: build_runner + sha256: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b" + url: "https://pub.dev" + source: hosted + version: "2.4.6" + build_runner_core: + dependency: transitive + description: + name: build_runner_core + sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41" + url: "https://pub.dev" + source: hosted + version: "7.2.10" + built_collection: + dependency: transitive + description: + name: built_collection + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" + source: hosted + version: "5.1.1" + built_value: + dependency: transitive + description: + name: built_value + sha256: ff627b645b28fb8bdb69e645f910c2458fd6b65f6585c3a53e0626024897dedf + url: "https://pub.dev" + source: hosted + version: "8.6.2" + characters: + dependency: transitive + description: + name: characters + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" + source: hosted + version: "1.3.0" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + url: "https://pub.dev" + source: hosted + version: "2.0.3" + clock: + dependency: transitive + description: + name: clock + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" + source: hosted + version: "1.1.1" + code_builder: + dependency: transitive + description: + name: code_builder + sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189" + url: "https://pub.dev" + source: hosted + version: "4.5.0" + collection: + dependency: "direct main" + description: + name: collection + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + url: "https://pub.dev" + source: hosted + version: "1.17.2" + convert: + dependency: transitive + description: + name: convert + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" + source: hosted + version: "3.1.1" + cross_file: + dependency: transitive + description: + name: cross_file + sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9" + url: "https://pub.dev" + source: hosted + version: "0.3.3+4" + crypto: + dependency: "direct main" + description: + name: crypto + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + url: "https://pub.dev" + source: hosted + version: "3.0.3" + dart_style: + dependency: transitive + description: + name: dart_style + sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55" + url: "https://pub.dev" + source: hosted + version: "2.3.2" + desktop_drop: + dependency: "direct main" + description: + name: desktop_drop + sha256: ebba9c9cb0b54385998a977d741cc06fd8324878c08d5a36e9da61cd56b04cc6 + url: "https://pub.dev" + source: hosted + version: "0.4.3" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" + source: hosted + version: "1.3.1" + ffi: + dependency: transitive + description: + name: ffi + sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + file: + dependency: transitive + description: + name: file + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" + source: hosted + version: "6.1.4" + file_picker: + dependency: "direct main" + description: + name: file_picker + sha256: bdfa035a974a0c080576c4c8ed01cdf9d1b406a04c7daa05443ef0383a97bedc + url: "https://pub.dev" + source: hosted + version: "5.3.4" + fixnum: + dependency: transitive + description: + name: fixnum + sha256: "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_driver: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4" + url: "https://pub.dev" + source: hosted + version: "2.0.2" + flutter_localizations: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_plugin_android_lifecycle: + dependency: transitive + description: + name: flutter_plugin_android_lifecycle + sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360" + url: "https://pub.dev" + source: hosted + version: "2.0.15" + flutter_riverpod: + dependency: "direct main" + description: + name: flutter_riverpod + sha256: b3c3a8a9714b7f88dd2a41e1efbc47f76d620b06ab427c62ae7bc82298cd7dbb + url: "https://pub.dev" + source: hosted + version: "2.3.2" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + freezed: + dependency: "direct dev" + description: + name: freezed + sha256: "83462cfc33dc9680533a7f3a4a6ab60aa94f287db5f4ee6511248c22833c497f" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + freezed_annotation: + dependency: "direct main" + description: + name: freezed_annotation + sha256: c3fd9336eb55a38cc1bbd79ab17573113a8deccd0ecbbf926cca3c62803b5c2d + url: "https://pub.dev" + source: hosted + version: "2.4.1" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + url: "https://pub.dev" + source: hosted + version: "3.2.0" + fuchsia_remote_debug_protocol: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + glob: + dependency: transitive + description: + name: glob + sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + graphs: + dependency: transitive + description: + name: graphs + sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19 + url: "https://pub.dev" + source: hosted + version: "2.3.1" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" + source: hosted + version: "3.2.1" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + integration_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + intl: + dependency: "direct main" + description: + name: intl + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + url: "https://pub.dev" + source: hosted + version: "0.18.1" + io: + dependency: transitive + description: + name: io + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + js: + dependency: transitive + description: + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" + source: hosted + version: "0.6.7" + json_annotation: + dependency: "direct main" + description: + name: json_annotation + sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467 + url: "https://pub.dev" + source: hosted + version: "4.8.1" + json_serializable: + dependency: "direct dev" + description: + name: json_serializable + sha256: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969 + url: "https://pub.dev" + source: hosted + version: "6.7.1" + lints: + dependency: transitive + description: + name: lints + sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + local_notifier: + dependency: "direct main" + description: + name: local_notifier + sha256: cc855aa6362c8840e3d3b35b1c3b058a3a8becdb2b03d5a9aa3f3a1e861f0a03 + url: "https://pub.dev" + source: hosted + version: "0.1.5" + logging: + dependency: "direct main" + description: + name: logging + sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + matcher: + dependency: transitive + description: + name: matcher + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" + source: hosted + version: "0.12.16" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + url: "https://pub.dev" + source: hosted + version: "0.5.0" + menu_base: + dependency: transitive + description: + name: menu_base + sha256: "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405" + url: "https://pub.dev" + source: hosted + version: "0.1.1" + meta: + dependency: transitive + description: + name: meta + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + mime: + dependency: transitive + description: + name: mime + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + url: "https://pub.dev" + source: hosted + version: "1.0.4" + package_config: + dependency: transitive + description: + name: package_config + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + path: + dependency: "direct main" + description: + name: path + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" + source: hosted + version: "1.8.3" + path_parsing: + dependency: transitive + description: + name: path_parsing + sha256: e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf + url: "https://pub.dev" + source: hosted + version: "1.0.1" + path_provider: + dependency: "direct main" + description: + name: path_provider + sha256: "909b84830485dbcd0308edf6f7368bc8fd76afa26a270420f34cabea2a6467a0" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + sha256: "5d44fc3314d969b84816b569070d7ace0f1dea04bd94a83f74c4829615d22ad8" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + path_provider_foundation: + dependency: transitive + description: + name: path_provider_foundation + sha256: "1b744d3d774e5a879bb76d6cd1ecee2ba2c6960c03b1020cd35212f6aa267ac5" + url: "https://pub.dev" + source: hosted + version: "2.3.0" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3 + url: "https://pub.dev" + source: hosted + version: "2.2.0" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84 + url: "https://pub.dev" + source: hosted + version: "2.1.0" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da + url: "https://pub.dev" + source: hosted + version: "2.2.0" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + url: "https://pub.dev" + source: hosted + version: "5.4.0" + platform: + dependency: transitive + description: + name: platform + sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + url: "https://pub.dev" + source: hosted + version: "3.1.0" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd" + url: "https://pub.dev" + source: hosted + version: "2.1.5" + pointycastle: + dependency: transitive + description: + name: pointycastle + sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" + url: "https://pub.dev" + source: hosted + version: "3.7.3" + pool: + dependency: transitive + description: + name: pool + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" + source: hosted + version: "1.5.1" + process: + dependency: transitive + description: + name: process + sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + url: "https://pub.dev" + source: hosted + version: "4.2.4" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + pubspec_parse: + dependency: transitive + description: + name: pubspec_parse + sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + url: "https://pub.dev" + source: hosted + version: "1.2.3" + qrscanner_zxing: + dependency: "direct main" + description: + path: "android/flutter_plugins/qrscanner_zxing" + relative: true + source: path + version: "1.0.0" + riverpod: + dependency: transitive + description: + name: riverpod + sha256: b0fbf7927333c5c318f7e2c22c8b4fd2542ba294de0373e80ecdb34e0dcd8dc4 + url: "https://pub.dev" + source: hosted + version: "2.3.2" + screen_retriever: + dependency: "direct main" + description: + name: screen_retriever + sha256: "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90" + url: "https://pub.dev" + source: hosted + version: "0.1.9" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1" + url: "https://pub.dev" + source: hosted + version: "2.2.0" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076 + url: "https://pub.dev" + source: hosted + version: "2.2.0" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: d29753996d8eb8f7619a1f13df6ce65e34bc107bef6330739ed76f18b22310ef + url: "https://pub.dev" + source: hosted + version: "2.3.3" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1" + url: "https://pub.dev" + source: hosted + version: "2.3.0" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1" + url: "https://pub.dev" + source: hosted + version: "2.3.0" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a" + url: "https://pub.dev" + source: hosted + version: "2.2.0" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d + url: "https://pub.dev" + source: hosted + version: "2.3.0" + shelf: + dependency: transitive + description: + name: shelf + sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4 + url: "https://pub.dev" + source: hosted + version: "1.4.1" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + shortid: + dependency: transitive + description: + name: shortid + sha256: d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb + url: "https://pub.dev" + source: hosted + version: "0.1.2" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + source_gen: + dependency: transitive + description: + name: source_gen + sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + source_helper: + dependency: transitive + description: + name: source_helper + sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd" + url: "https://pub.dev" + source: hosted + version: "1.3.4" + source_span: + dependency: transitive + description: + name: source_span + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" + source: hosted + version: "1.11.0" + state_notifier: + dependency: transitive + description: + name: state_notifier + sha256: "8fe42610f179b843b12371e40db58c9444f8757f8b69d181c97e50787caed289" + url: "https://pub.dev" + source: hosted + version: "0.7.2+1" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + stream_transform: + dependency: transitive + description: + name: stream_transform + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + sync_http: + dependency: transitive + description: + name: sync_http + sha256: "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961" + url: "https://pub.dev" + source: hosted + version: "0.3.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + test_api: + dependency: transitive + description: + name: test_api + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + url: "https://pub.dev" + source: hosted + version: "0.6.0" + timing: + dependency: transitive + description: + name: timing + sha256: "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32" + url: "https://pub.dev" + source: hosted + version: "1.0.1" + tray_manager: + dependency: "direct main" + description: + name: tray_manager + sha256: b1975a05e0c6999e983cf9a58a6a098318c896040ccebac5398a3cc9e43b9c69 + url: "https://pub.dev" + source: hosted + version: "0.2.0" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" + source: hosted + version: "1.3.2" + url_launcher: + dependency: "direct main" + description: + name: url_launcher + sha256: "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e" + url: "https://pub.dev" + source: hosted + version: "6.1.12" + url_launcher_android: + dependency: transitive + description: + name: url_launcher_android + sha256: "3dd2388cc0c42912eee04434531a26a82512b9cb1827e0214430c9bcbddfe025" + url: "https://pub.dev" + source: hosted + version: "6.0.38" + url_launcher_ios: + dependency: transitive + description: + name: url_launcher_ios + sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2" + url: "https://pub.dev" + source: hosted + version: "6.1.4" + url_launcher_linux: + dependency: transitive + description: + name: url_launcher_linux + sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5" + url: "https://pub.dev" + source: hosted + version: "3.0.5" + url_launcher_macos: + dependency: transitive + description: + name: url_launcher_macos + sha256: "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1" + url: "https://pub.dev" + source: hosted + version: "3.0.6" + url_launcher_platform_interface: + dependency: transitive + description: + name: url_launcher_platform_interface + sha256: bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea + url: "https://pub.dev" + source: hosted + version: "2.1.3" + url_launcher_web: + dependency: transitive + description: + name: url_launcher_web + sha256: cc26720eefe98c1b71d85f9dc7ef0cada5132617046369d9dc296b3ecaa5cbb4 + url: "https://pub.dev" + source: hosted + version: "2.0.18" + url_launcher_windows: + dependency: transitive + description: + name: url_launcher_windows + sha256: "7967065dd2b5fccc18c653b97958fdf839c5478c28e767c61ee879f4e7882422" + url: "https://pub.dev" + source: hosted + version: "3.0.7" + uuid: + dependency: transitive + description: + name: uuid + sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + url: "https://pub.dev" + source: hosted + version: "3.0.7" + vector_graphics: + dependency: "direct main" + description: + name: vector_graphics + sha256: "670f6e07aca990b4a2bcdc08a784193c4ccdd1932620244c3a86bb72a0eac67f" + url: "https://pub.dev" + source: hosted + version: "1.1.7" + vector_graphics_codec: + dependency: transitive + description: + name: vector_graphics_codec + sha256: "7451721781d967db9933b63f5733b1c4533022c0ba373a01bdd79d1a5457f69f" + url: "https://pub.dev" + source: hosted + version: "1.1.7" + vector_graphics_compiler: + dependency: "direct main" + description: + name: vector_graphics_compiler + sha256: "80a13c613c8bde758b1464a1755a7b3a8f2b6cec61fbf0f5a53c94c30f03ba2e" + url: "https://pub.dev" + source: hosted + version: "1.1.7" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f + url: "https://pub.dev" + source: hosted + version: "11.7.1" + watcher: + dependency: transitive + description: + name: watcher + sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + url: "https://pub.dev" + source: hosted + version: "2.4.0" + webdriver: + dependency: transitive + description: + name: webdriver + sha256: "3c923e918918feeb90c4c9fdf1fe39220fa4c0e8e2c0fffaded174498ef86c49" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + win32: + dependency: transitive + description: + name: win32 + sha256: "9e82a402b7f3d518fb9c02d0e9ae45952df31b9bf34d77baf19da2de03fc2aaa" + url: "https://pub.dev" + source: hosted + version: "5.0.7" + window_manager: + dependency: "direct main" + description: + name: window_manager + sha256: "6ee795be9124f90660ea9d05e581a466de19e1c89ee74fc4bf528f60c8600edd" + url: "https://pub.dev" + source: hosted + version: "0.3.6" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: f0c26453a2d47aa4c2570c6a033246a3fc62da2fe23c7ffdd0a7495086dc0247 + url: "https://pub.dev" + source: hosted + version: "1.0.2" + xml: + dependency: transitive + description: + name: xml + sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + url: "https://pub.dev" + source: hosted + version: "6.3.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" + source: hosted + version: "3.1.2" +sdks: + dart: ">=3.1.0-185.0.dev <4.0.0" + flutter: ">=3.10.0" diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix index 25856f0e58..002c753caf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix index 57f33559c6..e482241bbd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix index 151a63af33..180001b52a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; license = licenses.zlib; platforms = platforms.unix; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix index ca5a4684a4..9a76eed6df 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , rustPlatform , cmake , pkg-config @@ -26,6 +27,14 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-AAub8UwAvX3zNX+SM/T9biyNxFTgfqUQG/MUGfwWuno="; + patches = [ + (fetchpatch { + name = "CVE-2023-40274.patch"; + url = "https://github.com/getzola/zola/commit/fe1967fb0fe063b1cee1ad48820870ab2ecc0e5b.patch"; + hash = "sha256-B/SVGhVX5hAbvMhBYO+mU5+xdZXU2JyS4uKmOj+aZuI="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/networking/alpnpass/default.nix b/third_party/nixpkgs/pkgs/applications/networking/alpnpass/default.nix index 1d24c80287..81bdc29a54 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/alpnpass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/alpnpass/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { hash = "sha256-hNZqGTV17rFSKLhZzNqH2E4SSb6Jhk7YQ4TN0HnE+9g="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Inspect the plaintext payload inside of proxied TLS connections"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix index 2acf0f010c..bd810cfe73 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix @@ -86,11 +86,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-TjwVUBSBYo67lJyTXeee1bSaCnYLGE/MKSt+YEV+/Hw="; + sha256 = "sha256-5xbwBCLTlZ0cE273n3ErykZSEr59dZjQWhVTK91W9a4="; }; # just patch interpreter diff --git a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix index 8a13341b11..7e79064833 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.10.5"; + version = "1.10.11"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-mGie45sIvl8BjBB4JJF/U/OJ7naT6iWjo3l50qZvyaY="; + hash = "sha256-6eebc8+SsonTngOIM5C+cxqzhFSLK5wLB/sBhVQuTQ4="; }; - vendorHash = "sha256-/pNXCRHtoaJvgYsSMyYB05IKH4wG7hTlEHjuoOuifQ0="; + vendorHash = "sha256-sBoH/0SQtHO/fgyfve4bpy74GIS8qWr6KcIQyOnkgkI="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; @@ -40,6 +40,6 @@ buildGoModule rec { homepage = "https://github.com/ava-labs/avalanchego"; changelog = "https://github.com/ava-labs/avalanchego/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ urandom ]; + maintainers = with maintainers; [ urandom qjoly ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/bee/bee.nix b/third_party/nixpkgs/pkgs/applications/networking/bee/bee.nix index fd6177c464..f2fe81e837 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/bee/bee.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/bee/bee.nix @@ -9,14 +9,14 @@ let rev = "824636a2c2629c329ab10275cef6a0b7395343ad"; goVersionString = "g" + builtins.substring 0 7 rev; # this seems to be some kind of standard of git describe... sha256 = "0ly1yqjq29arbak8lchdradf39l5bmxpbfir6ljjc7nyqdxz0sxg"; - vendorSha256 = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA="; + vendorHash = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA="; }; release = rec { pname = "bee"; version = "0.5.0"; rev = "refs/tags/v${version}"; sha256 = "sha256-3Oy9RhgMPRFjUs3Dj8XUhAqoxx5BTi32OiK4Y8YEG2Q="; - vendorSha256 = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA="; + vendorHash = "sha256-w5ZijaK8Adt1ZHPMmXqRWq0v0jdprRKRu03rePtZLXA="; }; "0.5.0" = release; "0.4.1" = rec { @@ -24,14 +24,14 @@ let version = "0.4.1"; rev = "refs/tags/v${version}"; sha256 = "1bmgbav52pcb5p7cgq9756512fzfqhjybyr0dv538plkqx47mpv7"; - vendorSha256 = "0j393va4jrg9q3wlc9mgkbpgnn2w2s3k2hcn8phzj8d5fl4n4v2h"; + vendorHash = "sha256-UGxiCXWlIfnhRZZBMYcWXFj77pqvJkb5wOllSdQeaUg="; }; }.${version}; in buildGoModule { - inherit (versionSpec) pname version vendorSha256; + inherit (versionSpec) pname version vendorHash; src = fetchFromGitHub { owner = "ethersphere"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/blocky/default.nix b/third_party/nixpkgs/pkgs/applications/networking/blocky/default.nix index b18fa340b8..bd07776c7d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/blocky/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/blocky/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "blocky"; - version = "0.21"; + version = "0.22"; src = fetchFromGitHub { owner = "0xERR0R"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+88QMASMEY1pJuejFUqqW1Ky7TpoSwCzUy1oueL7FKU="; + hash = "sha256-iU7fpTn8sPtglZfqLJ6fVYbHtYp0jqItSpJsvN4iKE8="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorSha256 = "sha256-EsANifwaEi5PdY0Y2QZjD55sZqsqYWrC5Vh4uxpTs5A="; + vendorHash = "sha256-PnqpDAbHCs1wFudYy+nyG+p/E6ig7ZuhbuU4CFFoiyk="; ldflags = [ "-s" "-w" "-X github.com/0xERR0R/blocky/util.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/breitbandmessung/default.nix b/third_party/nixpkgs/pkgs/applications/networking/breitbandmessung/default.nix index 22ffc8903c..09ec430e65 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/breitbandmessung/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/breitbandmessung/default.nix @@ -1,11 +1,11 @@ { lib , stdenv , fetchurl +, asar , dpkg , electron_24 , makeWrapper , nixosTests -, nodePackages , undmg }: @@ -22,9 +22,9 @@ let }; nativeBuildInputs = [ + asar dpkg makeWrapper - nodePackages.asar ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/third_party/nixpkgs/pkgs/applications/networking/brig/default.nix b/third_party/nixpkgs/pkgs/applications/networking/brig/default.nix index d049ed4e38..23370866e7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/brig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/brig/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "0gi39jmnzqrgj146yw8lcmgmvzx7ii1dgw4iqig7kx8c0jiqi600"; }; - vendorSha256 = null; + vendorHash = null; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix index 0422ea5976..7fd29f1a39 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/amfora/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-93xNzYPoy8VsbY2JyvDXt4J/gIbI2wzrCD83JUaP150="; }; - vendorSha256 = "sha256-XtiGj2Tr6sSBduIjBspeZpYaSTd6x6EVf3VEVMXDAD0="; + vendorHash = "sha256-XtiGj2Tr6sSBduIjBspeZpYaSTd6x6EVf3VEVMXDAD0="; postInstall = lib.optionalString (!stdenv.isDarwin) '' sed -i "s:amfora:$out/bin/amfora:" amfora.desktop diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix index 983f8ac1ee..96a968a50f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/bombadillo/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = null; + vendorHash = null; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index 9c8f07d792..2121e74d36 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -40,6 +40,7 @@ , udev , wayland , xdg-utils +, coreutils , xorg , zlib @@ -91,11 +92,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.57.47"; + version = "1.58.137"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-u2xC+Q6tcg989S0zM2flRRiCu7kLSv1/y3N2EvFxiwM="; + sha256 = "sha256-6vsdQU9NbEKFp/1A0bNQvutF4I+vI0zfrx70QvU1KV4="; }; dontConfigure = true; @@ -171,7 +172,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : ${rpath} --prefix PATH : ${binpath} - --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} + --suffix PATH : ${lib.makeBinPath [ xdg-utils coreutils ]} ${optionalString (enableFeatures != []) '' --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}" ''} 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 6d24f18ec9..562fbbbb30 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -12,7 +12,6 @@ , python3, perl , which , llvmPackages_attrName -, rustc , libuuid , overrideCC # postPatch: @@ -251,14 +250,20 @@ let fi done - # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.): - substituteInPlace native_client/SConstruct --replace "#! -*- python -*-" "" + if [[ -e native_client/SConstruct ]]; then + # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.): + substituteInPlace native_client/SConstruct --replace "#! -*- python -*-" "" + fi if [ -e third_party/harfbuzz-ng/src/src/update-unicode-tables.make ]; then substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" fi - chmod -x third_party/webgpu-cts/src/tools/run_deno - chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno + if [ -e third_party/webgpu-cts/src/tools/run_deno ]; then + chmod -x third_party/webgpu-cts/src/tools/run_deno + fi + if [ -e third_party/dawn/third_party/webgpu-cts/tools/run_deno ]; then + chmod -x third_party/dawn/third_party/webgpu-cts/tools/run_deno + fi # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ @@ -294,6 +299,12 @@ let # We need the fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1254408: base64 --decode ${clangFormatPython3} > buildtools/linux64/clang-format + # Add final newlines to scripts that do not end with one. + # This is a temporary workaround until https://github.com/NixOS/nixpkgs/pull/255463 (or similar) has been merged, + # as patchShebangs hard-crashes when it encounters files that contain only a shebang and do not end with a final + # newline. + find . -type f -perm -0100 -exec sed -i -e '$a\' {} + + patchShebangs . # Link to our own Node.js and Java (required during the build): mkdir -p third_party/node/linux/node-linux-x64/bin @@ -382,7 +393,7 @@ let # Use nixpkgs Rust compiler instead of the one shipped by Chromium. # We do intentionally not set rustc_version as nixpkgs will never do incremental # rebuilds, thus leaving this empty is fine. - rust_sysroot_absolute = "${rustc}"; + rust_sysroot_absolute = "${buildPackages.rustc}"; # Building with rust is disabled for now - this matches the flags in other major distributions. enable_rust = false; } // lib.optionalAttrs (!(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) { 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 6419fa6a14..5677bc37e8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -6,10 +6,12 @@ , libva, pipewire, wayland , gcc, nspr, nss, runCommand , lib, libkrb5 +, electron-source # for warnObsoleteVersionConditional # package customization # Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" +, upstream-info ? (import ./upstream-info.nix).${channel} , proprietaryCodecs ? true , enableWideVine ? false , ungoogled ? false # Whether to build chromium or ungoogled-chromium @@ -28,14 +30,12 @@ let llvmPackages_attrName = "llvmPackages_16"; stdenv = pkgs.${llvmPackages_attrName}.stdenv; - upstream-info = (import ./upstream-info.nix).${channel}; - # Helper functions for changes that depend on specific versions: warnObsoleteVersionConditional = min-version: result: - let ungoogled-version = (import ./upstream-info.nix).ungoogled-chromium.version; + let min-supported-version = (lib.head (lib.attrValues electron-source)).unwrapped.info.chromium.version; in lib.warnIf - (lib.versionAtLeast ungoogled-version min-version) - "chromium: ungoogled version ${ungoogled-version} is newer than a conditional bounded at ${min-version}. You can safely delete it." + (lib.versionAtLeast min-supported-version min-version) + "chromium: min-supported-version ${min-supported-version} is newer than a conditional bounded at ${min-version}. You can safely delete it." result; chromiumVersionAtLeast = min-version: let result = lib.versionAtLeast upstream-info.version min-version; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml index 8578089ae4..76a992fef3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml @@ -4,7 +4,6 @@ clang_use_chrome_plugins=false disable_fieldtrial_testing_config=true enable_hangout_services_extension=false enable_mdns=false -enable_mse_mpeg2ts_stream_parser=true enable_nacl=false enable_reading_list=false enable_remoting=false 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 9083103561..604b64548d 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 @@ -2,64 +2,64 @@ beta = { deps = { gn = { - rev = "4bd1a77e67958fb7f6739bd4542641646f264e5d"; - sha256 = "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw"; + rev = "811d332bd90551342c5cbd39e133aa276022d7f8"; + sha256 = "0jlg3d31p346na6a3yk0x29pm6b7q03ck423n5n6mi8nv4ybwajq"; url = "https://gn.googlesource.com/gn"; - version = "2023-06-09"; + version = "2023-08-01"; }; }; - sha256 = "0r5m2bcrh2zpl2m8wnzyl4afh8s0dh2m2fnfjf50li94694vy4jz"; - sha256bin64 = "047wsszg4c23vxq93a335iymiqpy7lw5izzz4f0zk1a4sijafd59"; - version = "116.0.5845.50"; + sha256 = "1wf0j189cxpayy6ffmj5j6h5yg3amivryilimjc2ap0jkyj4xrbi"; + sha256bin64 = "11w1di146mjb9ql30df9yk9x4b9amc6514jzyfbf09mqsrw88dvr"; + version = "117.0.5938.22"; }; dev = { deps = { gn = { - rev = "fae280eabe5d31accc53100137459ece19a7a295"; - sha256 = "02javy4jsllwl4mxl2zmg964jvzw800w6gbmr5z6jdkip24fw0kj"; + rev = "cc56a0f98bb34accd5323316e0292575ff17a5d4"; + sha256 = "1ly7z48v147bfdb1kqkbc98myxpgqq3g6vgr8bjx1ikrk17l82ab"; url = "https://gn.googlesource.com/gn"; - version = "2023-07-12"; + version = "2023-08-10"; }; }; - sha256 = "0pyf3k58m26lkc6v6mqpwvhyaj6bbyywl4c17cxb5zmzc1zmc5ia"; - sha256bin64 = "10w5dm68aaffgdq0xqi4ans2w7byisqqld09pz5vpk350gy16fjh"; - version = "117.0.5897.3"; + sha256 = "1z01b6w4sgndrlcd26jgimk3rhv3wzpn67nv1fd5ln7dwfwkyq20"; + sha256bin64 = "11y09hsy7y1vg65xfilq44ffsmn15dqy80fa57psj1kin4a52v2x"; + version = "118.0.5966.0"; }; stable = { chromedriver = { - sha256_darwin = "1c41cb7zh13ny4xvpwy7703cnjrkmqxd3n8zpja7n6a38mi8mgsk"; + sha256_darwin = "06yhmapflj5m40952zcrq97qlj3crbbffaspiz87w0syxnw9avq1"; sha256_darwin_aarch64 = - "1kliszw10jnnlhzi8jrdzjq0r7vfn6ksk1spsh2rfn2hmghccv2d"; - sha256_linux = "1797qmb213anvp9lmrkj6wmfdwkdfswmshmk1816zankw5dl883j"; - version = "115.0.5790.98"; + "07dkpaqildzsrwbgjgxw5imbbz2pjvyq3n1wiw94lfjqbd9jrkbz"; + sha256_linux = "0lqng6g722apxa9k596f42f6bw323q4b29vrkcs1lh86skgikdgj"; + version = "117.0.5938.149"; }; deps = { gn = { - rev = "4bd1a77e67958fb7f6739bd4542641646f264e5d"; - sha256 = "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw"; + rev = "811d332bd90551342c5cbd39e133aa276022d7f8"; + sha256 = "0jlg3d31p346na6a3yk0x29pm6b7q03ck423n5n6mi8nv4ybwajq"; url = "https://gn.googlesource.com/gn"; - version = "2023-06-09"; + version = "2023-08-01"; }; }; - sha256 = "108wrm64pig0v24n44zd52jfzsy2kda84r5k8abfvg4sjlm0bh8y"; - sha256bin64 = "1sr7wfssayw94x8bfn7bk03040221npj7612ccxgzdgr4x5i4adl"; - version = "116.0.5845.96"; + sha256 = "1pyrqxzxxibz0yp218kw6z186x8y6kd5a1l0mcbhj70rpm9cimyx"; + sha256bin64 = "1zly8dpxmhyqdsqd381r0yzjrf8nkfigfjhabm3dbf1ih7qma40z"; + version = "117.0.5938.149"; }; ungoogled-chromium = { deps = { gn = { - rev = "4bd1a77e67958fb7f6739bd4542641646f264e5d"; - sha256 = "14h9jqspb86sl5lhh6q0kk2rwa9zcak63f8drp7kb3r4dx08vzsw"; + rev = "811d332bd90551342c5cbd39e133aa276022d7f8"; + sha256 = "0jlg3d31p346na6a3yk0x29pm6b7q03ck423n5n6mi8nv4ybwajq"; url = "https://gn.googlesource.com/gn"; - version = "2023-06-09"; + version = "2023-08-01"; }; ungoogled-patches = { - rev = "116.0.5845.96-1"; - sha256 = "14smm0vmqzn2664qdbv7asm8n2gg88zcvwrjpsn54qwk0njv7zlr"; + rev = "117.0.5938.149-1"; + sha256 = "0kzbnymbp7snxmg3adpl16anyhs2rxk0iqy5dda8dx5rv9s8i0x0"; }; }; - sha256 = "108wrm64pig0v24n44zd52jfzsy2kda84r5k8abfvg4sjlm0bh8y"; - sha256bin64 = "1sr7wfssayw94x8bfn7bk03040221npj7612ccxgzdgr4x5i4adl"; - version = "116.0.5845.96"; + sha256 = "1pyrqxzxxibz0yp218kw6z186x8y6kd5a1l0mcbhj70rpm9cimyx"; + sha256bin64 = "1zly8dpxmhyqdsqd381r0yzjrf8nkfigfjhabm3dbf1ih7qma40z"; + version = "117.0.5938.149"; }; } 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 d54896f48d..fcba949283 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,1015 +1,1025 @@ { - version = "117.0b9"; + version = "119.0b6"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ach/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ach/firefox-119.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "e19ea948b8cd242ad411cd5bd774810e444a1862acc4b182595761b76dc3e331"; + sha256 = "ab53e56f2114c4fed251117c93e781a8ffe37ca09a78bbdc56ece3f277f745cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/af/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/af/firefox-119.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "26dcb5dc2d4c4cd02d49e09c0a7b4424ed30989a99a510289da3eb10258ebed9"; + sha256 = "5f91af053d41eb6143313069d5a0ac796b5d6cbbe1e5e3d7d0ac543bf39487de"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/an/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/an/firefox-119.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "a6949c98003a34b2ead5d48f8b2d498dc9cfa98082fbb6aee8384fe806ed6ace"; + sha256 = "1d336edaa437b2cbfafcba0d27f51492166299bfea14cfd00f4e7d983924e729"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ar/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ar/firefox-119.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "bc3b20d46348dec75b734f2d6c57c7a393d18a78bb0597ae5a8e02faadc67d40"; + sha256 = "bde5b7f115ce1575c5da5b1e6d086568815330e54d14d3eb8010e2aa8a633cde"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ast/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ast/firefox-119.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "e7f25756d30cd6dfe6b1b308435346d5cc7f033ff25b50251b6c2b604890b2fa"; + sha256 = "0859bffdcf5381b68640401a26960d231675b4534bd9d83884c8f7542ff48205"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/az/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/az/firefox-119.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "6672ea753d7191a86fc91749669e33e1fc91f5630b921493849748ef0be2803a"; + sha256 = "ca3d38e0315fdb8524524d6ccfafd56ed735307071076e40596d17082d4c9b22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/be/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/be/firefox-119.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "2d6cc0283f67dd2292442bdd5c561713c94cfa0b0c81b9344ac397b2b90a820d"; + sha256 = "fb7dfb212e6d24874614771301f5fe45c7a370be1cdea06c18e06237bdd0b58a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/bg/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/bg/firefox-119.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "ec2fef76d9d9930645e4872811e511a2a359c0c5999da554bd7259706ab9d117"; + sha256 = "30f4f07e61fc50a889f0ed24de875fa2bc4457413b100cfab72c62b5f023718a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/bn/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/bn/firefox-119.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "425a0a430c9060a69362c7f30df9eb7f4a1190cf04e443d4753016a219ab2d59"; + sha256 = "58a8f4ea9ac3c34b69892a19a570d12a69074a6011fca7d3fe57485a9f601be8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/br/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/br/firefox-119.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "d6d353aaac00ad97b668b31ff490b927d2280e43fc53efe72334c56ad3bcf8b3"; + sha256 = "e9a45bcebebf39cf37f216ac79002993812912253559404648ea78e4c1fad6ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/bs/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/bs/firefox-119.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "57db2821c658971c5de8f882bd5396f83434983bb09aa7e66fb9f4b3b86c73d5"; + sha256 = "0c224de8786ac18d8b590cba66a7078f90c001b16c02f14907b9bbcf03670104"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ca-valencia/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ca-valencia/firefox-119.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "22e17ff840c87b00a988890d80efe30ea6c0a120a1ae618cd9b60c1e586e9d2f"; + sha256 = "c5504da29820ad468bcdc3b5d7242eec7d60dbf2435b974a3d96cc51ac8da1e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ca/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ca/firefox-119.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "d4ca47d7191503a04bf402a1c85214280454bcfaeda47e7482c90e38d1d78f76"; + sha256 = "aa75df2625a82f66b797778f69894f32fc605c1cdd432b00efd2540e3b273220"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/cak/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/cak/firefox-119.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "d239df72ca8af252b357ca19c4feda31e6dde67fb8421714b124e10831fc0623"; + sha256 = "5344d1e38a89c8c90731fed48deb7fcf0b0d18613db86d73f247225f15d8208f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/cs/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/cs/firefox-119.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "1f0e87b2611a8fee96a8b4e8bf2e83eab2f178b86a21ed319eb43397d296edb7"; + sha256 = "adab1705be9c7c0ad4b1cd42291b93b8fc27d56afc8f46ca8137b838a2271c0a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/cy/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/cy/firefox-119.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0142fc360c7ef75d5b5b607bab84f923d0b7608f1d0725798a1d26fc1af2cb8f"; + sha256 = "0f27d7cf339372a304a6d87fd1c09fd7d896e04c1f7fcb7505a19040ce08244c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/da/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/da/firefox-119.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "df492bd754486a93a65cf5ddba7af6bfeeaa4869a6fe66fb20815efbd31ba26e"; + sha256 = "5db5bee56304d38be35448bfa9d1ed83fc7b033cf09293e74686b908345cb7f3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/de/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/de/firefox-119.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "aea983ca7af76798edaf37842a216310397e29741c4b29ae4792d23a4cb422d5"; + sha256 = "0c6e88bb3a8e797e2f3bbbe5bdb06285ba1537ce08c569002839d0aff39ca4a5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/dsb/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/dsb/firefox-119.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "b23f2bcc821ff15ce47818a8a1aec52882ebfa1498a471eabb1477a5c082e4f5"; + sha256 = "bfaa67ff178b467386d97d7158ff27d725213d277407c68385bd61b42254774c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/el/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/el/firefox-119.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "abd14944865c96873b91a98bc8027de6f4b2a2c6e86ae900a0127b770560ef89"; + sha256 = "8bd5509649f16833d133f4da7ca27df508f2b78bd2f2ee6716691ca32f03426d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/en-CA/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/en-CA/firefox-119.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "13fc57abc3ba40daebf7fcdcf52402ed28a99caa957b9061fa05902ac533caca"; + sha256 = "dc9598bc78929e48a6903c3dd85c058824ce6249bdc8958b83979a3291f6c078"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/en-GB/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/en-GB/firefox-119.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "8da8f64b7aad126abacdb467e7368fc2b71aa27c83d5a913183b8bd96c010fc3"; + sha256 = "2d75187cd53f66be8620744ad14b002e3a359d12b5a12efc9c72c337b574057c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/en-US/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/en-US/firefox-119.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "318449489fce07793f3960bacaabb966610b1552985fe63355fdba710a258cdc"; + sha256 = "2640312b24f2938b0251c1cc018d0f85a1b91aaa688638556140ffe7ed5ff682"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/eo/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/eo/firefox-119.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "c000198e0a032887a2827081d4577800697f1817bbda5adc7f00d8a3c58d2209"; + sha256 = "f52a3ff12f69cf2a7e2443f003ccad1ebf2fcc32303d829c5a4131e067dd99f8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/es-AR/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/es-AR/firefox-119.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "e0cf69ccf6c390b5540ffa68e12022991650a738ac354643a1ea1ceadaefccdc"; + sha256 = "40581ea9878db00ccc1e97b46791f7476293024841158127feeb69cb10dca511"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/es-CL/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/es-CL/firefox-119.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "bd8900e5ab75b92ccec495bd86953e9cc01f0143dcc753125c2257421542fa97"; + sha256 = "22bda55625d59fa7812ad1d81676a7be08e6dc9ef00dd653365d25dbd3914802"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/es-ES/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/es-ES/firefox-119.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "c3722460d38a89ad2ae394ca7cb75ec60c099a0af823cf58cabf8e2cce471e5a"; + sha256 = "4195ebc7f41753c02abffcf12847969853bf169c4f1925cc6d16db88341a8dc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/es-MX/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/es-MX/firefox-119.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "a7b20aeb2bda525ea6cf3c32658ec064f8a2ccdcf62062bae95955352008b2bf"; + sha256 = "4248baccf81d3376913a415b9154d52171158136af2a7c72e8891f0fc441501e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/et/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/et/firefox-119.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "e6d3bdf8af680f18e094ec2282b8de16a6723c9b9c1b1afc9a20dbb82053aded"; + sha256 = "b6387c5743a550635e9526cf055a7562f259d0117970809b9b11c3ae88a1c08e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/eu/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/eu/firefox-119.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "d00c4996c1880e2ebe5553426a6c9813d5b51117ab5f40ae0850eefa9a97f6a5"; + sha256 = "46a649181d6c97d938ded928be22447d9810a792ce218ff7dddd683a0f5b4eeb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/fa/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/fa/firefox-119.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "8ca66ccfff7a34fb6af033254339f1fe52f06a8d575bb85ea6027df64a274eba"; + sha256 = "a789b8b2c68d2f3fe41c1257ac741d2d3ff55d68011e01eed7b19dce80989d41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ff/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ff/firefox-119.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "6f55156cb4d82b365b290283762eb281ae7f42d38acd7dda355b7edf1ac85fd5"; + sha256 = "7625b0cda8b5d2c5ca673a477d9f69fb90c5a7c15949cb048cdf11a2922e68c4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/fi/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/fi/firefox-119.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "c63eb46fb2c2ce816aabe3013ffa762bcb005535d0189954bebee3923145e411"; + sha256 = "a871ad53724e11e40eb3d66b21483fd744b2404615f9bcc655c0e7dc8e9883a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/fr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/fr/firefox-119.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "8fe9a7ab288623437ad51c3321e57a6ef6e271be220efe2cb361d38d5c89bd11"; + sha256 = "cda3709cc13eaf59ff4657ac5c8f66145092bf59c4daa09392ddd5d9d596584f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/fur/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/fur/firefox-119.0b6.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "b2c551a6ab7706e80873cec526c142a38fcaef77b2394eb95e752fe912411f5b"; + sha256 = "9acabfb02291d58f7e99d4e34ed744102b191f3f22dac1a1e3363eb68052ef95"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/fy-NL/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/fy-NL/firefox-119.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "4833ab76eca8f34d572f766e0979bfc041bd088c48b3c0c8cf6122d9cd67cb94"; + sha256 = "a30c0b8888b5feafcadc2ced7e12cbe924f1d1af61c00005b990d46b13da583b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ga-IE/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ga-IE/firefox-119.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7c6a59d29f4912809bb628ed5e287a28ba6ce1c04e118e65812474addbcbd124"; + sha256 = "002f16c18ed429aa6c09d6ff3767caa6b500a398706a3ba6f4c384416c050643"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/gd/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/gd/firefox-119.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "336e2900b52f12a22e91c24d36982c6ac3de757a1389c0133b53aa9c75f0d17c"; + sha256 = "6193316d09dbb8e510b8641499f3f3723a25cc57cdcb009661180663ec19de0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/gl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/gl/firefox-119.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "151b6931c9caadf0b2a4a5fb5e1ff5832da2d0eb19f044cfc7277b56d9a9f992"; + sha256 = "ab142c65d545338e1db668f9e5313bc19fe8260a4010458ac024c4a654c262f6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/gn/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/gn/firefox-119.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "0daa46c6f526255cb8e15646c4cfa00ded07c8bba7d35fc93c69c26ab100faaa"; + sha256 = "9a9bd45fd1612fadc467adfc4391adb559f0886dc5e5c58e1c9489b756621409"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/gu-IN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/gu-IN/firefox-119.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "511b4352928b907078b78160272144b33d1a25f2420eeee7d7e333ecb33782bc"; + sha256 = "36e72934f547e0b585d7ecf651173d55244bc1549e2539f2133be75c55b28677"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/he/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/he/firefox-119.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "4dbe8f5a912652a4a35bc121af8ba9e3bed841f92e5cac53a35734989d8a11fa"; + sha256 = "16d25845f30fb410d966b4a6f0100d49033a6c7f7fac17bfaee4c59681973011"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/hi-IN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/hi-IN/firefox-119.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "533196690a2f36ea24bcd01811df0b0063215ccd6f182e5a789207241f5288bf"; + sha256 = "baa04788253d2e1bc833295edd0468c73f3628f76f0642c48a5486945c41c743"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/hr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/hr/firefox-119.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "1101aeaf1e6019604212b71efb3a8c2ca01f0e55f12c6991bdbe221c92cfb550"; + sha256 = "13e68c8f205f924a6ebba66ff16d79fdfa9cd8914386d7184f5a389af3753c9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/hsb/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/hsb/firefox-119.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "59b1ae8f709b056a0cf2f7f0ceb3d268e65627f8eca6755e2b823b3f29000e02"; + sha256 = "bd7c988e1aa6458f73f28eb46136600a5df5a382f3d5451c784c0f6e42a3b5a4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/hu/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/hu/firefox-119.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "920b6321470afb3b41625422a070bf0ebbfec30c32872a7db3732895ffc088a0"; + sha256 = "0dae4dd735e4b5eb1600515a40c836aef05730a8993f8060d7f8f40f23903ebe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/hy-AM/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/hy-AM/firefox-119.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "6cf5e2afd6148ed1fe48d0e111d08e42791c0aaa8e9334a62b4c1fe98d9f7965"; + sha256 = "cbde4751c8c42126f7af27ac45037245ddef38f835496d66675ca1aa0c7c25ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ia/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ia/firefox-119.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "6050b3e6832ed9562fd67a5e27fae4db09ca064e82096ca7c8cd0160940ca4cc"; + sha256 = "e5484ffe781d2e71b9ce44830f1318dbccc32f8165f432d501100fb9f78d9334"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/id/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/id/firefox-119.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "786f125d61952a0c0b95b7d5458400b2ad39f995f1f79af7883a49679e3f5097"; + sha256 = "35d1130859de3a82b88a77686f7caa5e8362ac574e6662377f28ff296947008b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/is/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/is/firefox-119.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "dcd8dc576286e95c8072660421a40683f602feebd15b8a960bf9e568fbc98e9e"; + sha256 = "eaddbbf9cbbb1d9b006aa7b24ab5ed735e5a0939ebd268423a47ef9f9fdecc37"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/it/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/it/firefox-119.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "6a5afd1e53aec3d7f64477962d255087dc0cd8229bbf533bfc28fd3f26f3b538"; + sha256 = "c2fd4eadc15dea50fce40bfecaacffe930b8292f04ebec2fda8fe6cd094afa9e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ja/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ja/firefox-119.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1b6346961cf259d1e21ebf8e52606302ee79add217ab1d87906012be739dbd0f"; + sha256 = "6755b5e46dbf3b2069d01dc17b9c5ad20ed445a84785d020771f5871198faaf8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ka/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ka/firefox-119.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "44341e828a8e7f68844e22edc26268dda43a0efea4eed337daebaf04da414a0f"; + sha256 = "cc6080cfc1b8d4865dfc5222ad8d2a7dbd3745563b82fbf6edf14647ff832754"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/kab/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/kab/firefox-119.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "918313481806004162514ef794fd8ce99761217c8132bc443f89810c581b41df"; + sha256 = "82e6383d1ae3708077525d6af18b54d653be90c08e1d8b43801d83696e086c65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/kk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/kk/firefox-119.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4644acb50984008a6efb97fc3493a8d01f14a8fb07d11a2a57ba19c85f620ca7"; + sha256 = "8afbc941c1afd7bf46ef07cbd5590ce75f95634febfde46f739326c7c344976e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/km/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/km/firefox-119.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "95d0c82527b7480c1a63fe4c3522d7e3f10b837ca1cd2602c32294ab6e9e9857"; + sha256 = "ea40ac277a502b7d2ffe6f0c95ebca551b360c78377ecf78e7dde8e30d5d3771"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/kn/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/kn/firefox-119.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "9e3644c49c039ee7e51000925073ac0a907579a9f96ef31b9889f6198310b2a3"; + sha256 = "3ebe329a34c386f5abacc1a71c6d4d857bc29c8afd4d6738278441b3fb176b52"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ko/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ko/firefox-119.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "7f3a933d16023cafefbb2414d28561001024000a27dad2057ced06b7fa937904"; + sha256 = "fd4fc4cb9576e4f27c5baa59b5a8e650e9a09dd581191eda2b2fa43cdeb59d4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/lij/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/lij/firefox-119.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "9ed4026b6ad2d094790c0d33d74157e8ac3c83ffbdacd039077457dfc3262750"; + sha256 = "bc0a41f902ef8d45475a0ea4a9612e00ce28c1e3af1e4ac6d279be2e1e0f546a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/lt/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/lt/firefox-119.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "071c312ecb952de23cb0ecb507f5542227a060d1f2bdfa516ec2036b8a9321ea"; + sha256 = "77a14c250a4d48e63a1131c59a966f815468644966b74bf9dfdb9b0a800acac4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/lv/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/lv/firefox-119.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "de01d7b64f9dbd3608bcde1f5660e1a84514b9f34f67488e4776741abc0658f7"; + sha256 = "7739bb320f0378ffce06823ea99b2b059138ab74396dacb3f9a8146e5a679d28"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/mk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/mk/firefox-119.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "9a1214e5cf15c62dc4b1a3eef602930bdec4f9b986ea61efc44a02d7f2babf8d"; + sha256 = "31c6da50ec3c216e47ff4560854300d7c5f49f187fd00af4f5b95a560b4644da"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/mr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/mr/firefox-119.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "b2f070d12485897eef0f09783cf32392ff35f50968bd10210838084a352f5d5f"; + sha256 = "ae6b36ba25e4926ca5308eb9e49349220cbfe67f628a2ff97299cc1c07508eed"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ms/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ms/firefox-119.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "7dc82e63bd47b2283a4a958970326cf81874c301252d0b60d54b8e514eeab4a0"; + sha256 = "1b461db57a22f2af0f4d2371f2749f63b49ab8bcde5eb03bd01000bc1922963f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/my/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/my/firefox-119.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "c3155b4e73b576267acd36a115305072bfe45bea8fca50d2a13c5d8837ed0f25"; + sha256 = "cb896c973fced6499d0b5d0a88ab359de0be926d6b3e675d552a9401fc514a0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/nb-NO/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/nb-NO/firefox-119.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "56a353649b5fd8f796bf6c3061c74d3e876b2e61524959b312837c0caf8c8145"; + sha256 = "cc9e3f2dfc121d6bbc5ec8eb7978ba0e0e6804dcef632919229c122f0f4898f5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ne-NP/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ne-NP/firefox-119.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "9feec9991aaec1277d38f72e007db1b011e7f780c24d591c34c4e0fea31de6d3"; + sha256 = "db1ae6bbf74c07945b0550b4e857f46c50a450c649d95fc638ee79c6f4b9d5fe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/nl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/nl/firefox-119.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "9d8f33dcab64573e5f8940453af11d3979b9408e22746f890111994a8529ced7"; + sha256 = "ff66018baa06511ab0b4542ee7daf02b92a3226b384826c93c7faf3547400f00"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/nn-NO/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/nn-NO/firefox-119.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "8c7c4f3e098f6ba9a5dba1e851454d47591bd72fee8c98d1fa7ed6bbc86c1400"; + sha256 = "998be79bccce541901e08e1ffde2589690f35611874d4a3381e30eade8b0df96"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/oc/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/oc/firefox-119.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "085c5342330dcacd0365f2351301610f0c19a4db19e02909072bc05c2cd28780"; + sha256 = "bb1affd0f6033be6f2b948cbe45d6f0a0c72a0c7d2830d559049cd42a8556891"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/pa-IN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/pa-IN/firefox-119.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "990f8a522cf945f2df0c5871c7ae5d85127dbf11b71eed729d29158bac758872"; + sha256 = "b6188b8e74b61bf41ce13c11c6e6edb256ed3b580bc81a5503759c39ae8e2975"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/pl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/pl/firefox-119.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "dd66208140c5d201edf9fe6f62aa25ab2e74bdf6ac436be879c7f5a6d5bc8e0d"; + sha256 = "42640c440031befd0f108c94a47fea434915b2737a90fec11bc37b9352d9d150"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/pt-BR/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/pt-BR/firefox-119.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "88df6ab659d04038a9a813d4aa643c0d682bdf15461a07852b9d14b81d1de726"; + sha256 = "6c99453ea5f33f548f07612a4e1dcfe660317d7a31889fbad58b36450bb50adb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/pt-PT/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/pt-PT/firefox-119.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "2cc07afba5589c53418ab2e1cdc7116e8981f836c603d593414eb8ed2a624a97"; + sha256 = "4f0305d3da737fafc9a424df8db0aa25a1e99135aaef8fc340743324b36de894"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/rm/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/rm/firefox-119.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "95b454d55cb97b9fcd1eaa6394ecb21bde84b54df71785e2a8f4857433c0f1c2"; + sha256 = "a13c0cad16dfb0181d5804e42e9f5a9b9aa65f31f125b71461bca8000cc6f2e7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ro/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ro/firefox-119.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "663f5c776fbdde59fd40ef66f632b37254d5f5ccc7ade3265ebe50add714c419"; + sha256 = "6927bac6ef5d53d606e1cf14d0bace2e084b917e58ec6ea146ac038890076418"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ru/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ru/firefox-119.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "defadc275f951108a3d4f54a98acf9f8a3e9fac2dc60b4a27822dca3ff026146"; + sha256 = "8d707f8fa2cc6fee8ead1cbb9d7585c3d0c33bb1add1b286f0a4955949b2dfb9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/sc/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sat/firefox-119.0b6.tar.bz2"; + locale = "sat"; + arch = "linux-x86_64"; + sha256 = "d61dc0c76152c83437096365ae8f162ae62c0304f8e277ca1629d87521153ebb"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sc/firefox-119.0b6.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "90b937b1427bf9c0cc3951710769f7c68902c796fff6f0bad99994b232a6b3d0"; + sha256 = "605072564b0b751f9c586df8cf21814002ca378d20b0b2bcfcc6747685e61f36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/sco/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sco/firefox-119.0b6.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "c78cb614a9e443ac6d452b308c83273703ddc1ba0c4c08032c58bab8fa7a18a1"; + sha256 = "28c4b87d30bc853a3fc210424cfb1527ffbbf75fbca7c374cfd3e006d46ef7ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/si/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/si/firefox-119.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "f62980621795a23a21b9d0de359a854744e490fccd525318cd84aa30f1dac8e1"; + sha256 = "dc5a9baed40c9321dda7aa20b7147ac655760059cc0ca2ea1549c4a29e6035ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/sk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sk/firefox-119.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "464634330b6dab468ea64b624f214fff0a495785f1af81c1a5ae41a15a8eea8a"; + sha256 = "3375a7450b16f27d20a5a4624b6dabb467e3b69689e31289317cae1be3690874"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/sl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sl/firefox-119.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "9567a4a34807de1ba8f7e7d73cb188aea25a229b03a517de43d4575534af9eb4"; + sha256 = "61969bfda32ae873583920b4c3b3a973eb09ccbb561971eb6e6a3a91c6d63dad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/son/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/son/firefox-119.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "1071fc57edde0b198ee832fb20bd68af1f1a2b7b1189794058544d605e69543c"; + sha256 = "5dee7311285b3c7bdaccceb2bd6b82d638621b821f3de5221a25f16a2edb03f4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/sq/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sq/firefox-119.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "2ebca99d9de5171d9531832028bf21a693aa7cabc4337f66f0000d265b4eb573"; + sha256 = "4d48d48f0748057df5ad991a39cbf48688425537655668fc21846db706b3467a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/sr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sr/firefox-119.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "15693037e1ceebd097c9065eeea1b9e2b428ac5abf6b101714dbbf0f92507ddf"; + sha256 = "f7cf2b3e22a209e0e929b4faefd1838851d0defa08ebf805b1ec0b44aa7d271e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/sv-SE/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/sv-SE/firefox-119.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "f711742d5da5526346c8bd602f5c9a6a7f15a91c21af19c1d975a13767d219e4"; + sha256 = "96cabf15eb5d2a2895c1246feb4fc47b95c1322fb8082181679a2cdc6b405678"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/szl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/szl/firefox-119.0b6.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "c6af80c59df44c06178e61a08a6b41fd345d7274e0550fa389f324033e449011"; + sha256 = "09619a0c74615be4dc0cf190758c82051611c4c875da7419c7057cfcb9308a9c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ta/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ta/firefox-119.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "2a3a34c2a5d43b7fc9f04d16dfc37719b70191de741bc6a7d389d3aac208e35e"; + sha256 = "ecbfc6e2f24c250884a959df8b59981a249835b6c1d23b249a6f882f9d916b17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/te/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/te/firefox-119.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "c99fe648506427aafb5e2386ca0458b7dec75dcbae8741816462fed5b0e0f412"; + sha256 = "5f61c2897105ee45ccbdec665edd3d67a73825333a77002a14984c208087af65"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/tg/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/tg/firefox-119.0b6.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "01a7b0ff8305552ee83ce875ad500b32da2460355ddb261d9c94da6a7b523e29"; + sha256 = "b9572b7bd246d2b427da497cc8c3c8bf8a6f3639c71d7720a8a0853861ba9219"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/th/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/th/firefox-119.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "f5a27b14f9824f7bc00c48c08956bf5ded67ef69fe65fbc0cf72b31903935704"; + sha256 = "142df8ad9962021fc75c140b0ece4228807c908f282711860a2b2329c08ab37b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/tl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/tl/firefox-119.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "42f809dc08c2061b289f8e198f1b70eb6cc1ab9f54becbabfaf840096b72c888"; + sha256 = "c3fea25ce49b162ea49a4af6c1039a106eb9342b5d6b7fd4278b836cd37e179e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/tr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/tr/firefox-119.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "00b1b78a75eab4de06a50a435e4fad477ae39d72bbb7f17dacc58cc38a183f4b"; + sha256 = "1563cf5874154e2ef1e2d68e175fb2dc88621a2cad394a1e9461d783d8055e1c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/trs/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/trs/firefox-119.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "880738563209342f0be670ded2ad5ef202c87122af99fad224c81e1d72bbbd26"; + sha256 = "cb41d625ea87c8a32c10677c912acdf7ea124b68e8ed2f24ad0651be905f17dc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/uk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/uk/firefox-119.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "c6918ec42a02d3c0e637e7152fc58bb3aa6b7e4d34ac5c460117dc5e7999d2f5"; + sha256 = "3a35aaf5fd21a472d930670056df4723401242a62ad0281b09fb5b6ba4c57423"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/ur/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/ur/firefox-119.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "150a008ffeff354d7694299f24d56b253bc160910aedf2f47d8ce658938ca732"; + sha256 = "68b55314db43e666fdfe5c99b03f4a4952367f545dda03f6566e5d11c28a8014"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/uz/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/uz/firefox-119.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "805f0838c1fc82e3ef03a3501917c33f1a6ec387f3f655750e3d332351648e26"; + sha256 = "67d721242d4e3c0950786847d22b6caa91d4c91eddd865c1d3f4cce542efd282"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/vi/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/vi/firefox-119.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "661c19c3060f6f24570136a920ab35c0fc8f49c6f82a5699092e6e803a144727"; + sha256 = "d7c5097c32527a55627639945c5565ba368d3d2e00ae2df0c9aa291987985861"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/xh/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/xh/firefox-119.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "1a647232be7f1eeebded132a5af28e3e3473042448c7a2a23e2ca883f5c8751e"; + sha256 = "66059db2521b7a2a293d45db180bc165b38f35ebfc99be836f3cccf21991bfc9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/zh-CN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/zh-CN/firefox-119.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "c70b65fab3d62843bc77a5fd1554668cf6c76e49e2dbbcf0481bbcc0bf263ac6"; + sha256 = "c0f37c0a3c71be9124c98d423b24300f879c42840fcbd0869fc6ef2634ddd018"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-x86_64/zh-TW/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-x86_64/zh-TW/firefox-119.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "c62cef8b756a586bff67fb8a5a62108204e81d4abbbfd2a06808f782c98364dc"; + sha256 = "4c79f290b4f371e1b9fe0943d70af2dad0f0eea44c09ebe8233ceeec63cbd300"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ach/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ach/firefox-119.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "5c90d0d750f67400806b456e7ac7c89db9d3479aacde7932393383b43ebd4eff"; + sha256 = "fc312d3449ca702e20f8068b7c03aa4c99002937c7b9fddaa4ffae84a4f85f0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/af/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/af/firefox-119.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "c26d852598dd754499d2b176811c7eb938e87a56700df35abc253fda7b0de957"; + sha256 = "4709fd5b03033d9f446bcded2881480e3422457c2172177ed93d28d21dee371b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/an/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/an/firefox-119.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "c9cc966e8a91a9fa8a76734d083b0a64baeee5af5041f634b946556eeeeade13"; + sha256 = "ba53b4c50323205533cee64fef138588f95fcc11e109cd69468669ebbdff2c1f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ar/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ar/firefox-119.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "cd59aa66c3f6fe037a462d3b481d34c6abf2208022eda66924fa28d86e5bbb3f"; + sha256 = "8380c9717d94d46d174ebc4dbc0e2bf2e3f3aa87f5f6801fe8c6364fb526e1ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ast/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ast/firefox-119.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "3b33848ee91074b8a5c3cf71a6fc78a9ebcf4aa2338b9d07c6b32dc9a0b1585f"; + sha256 = "1d7ad1f5b3f39324e7ff7d68bfccb45ae01659543c91ed8c4370ce08a68987e1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/az/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/az/firefox-119.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "e3f0765944bc564150b6d21ca0adb797c48fe738f35facc3758723f63fc80e6a"; + sha256 = "3654b54007b638232aeda8f82e308e83902c9bacb5c4400a252628369c914dbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/be/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/be/firefox-119.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "c1fa404a1c9136592459f040b63925e2f1248e1c26a6cb589201db7798808af5"; + sha256 = "6f35eecf5df49a9d9074b064a0ddcf58661671e539a4824facad7b53682e9f0d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/bg/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/bg/firefox-119.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "e18025153cdde0fa2b3463324da62d3369a209b1daa851a16b082842a5ef3050"; + sha256 = "a6ede53f86474c53ae3297b7e9b7ab7c962337b58af577b78fc2ea3bd4e5d3a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/bn/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/bn/firefox-119.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "1eaf39ce865bb9d8c05a5b93cb69326fc8c5911d38b36f11c4357cec094f810a"; + sha256 = "9a3df0e4c2dbda0d50c1a8334158d477ff526cb3c144ecbe977434e238c6eab0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/br/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/br/firefox-119.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "693b6133f478f26822c4045dcb601ec2785fa8b3081ccdce915b5b20a7bfa138"; + sha256 = "103e32e095b38604fd807cd2707ae99190d8a1249bb0cc4da9c15e9426626321"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/bs/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/bs/firefox-119.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "bdf0e7ca85105c45b644b553f638646578ca3fe2266de6c2922e66eb60ad34b4"; + sha256 = "e630bfbd71002f1fd1ebb8f7565c0ba0dc766b0833fe2bec37e7c30cf75be9a1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ca-valencia/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ca-valencia/firefox-119.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "9747432587571854fdf569ed3fa85af07ea4fa261d6875f5111fffb7b5ff91a4"; + sha256 = "f9ff06feb765a9c2d61618e26fc3e8f390db5af179505ccbe09f521152e782a7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ca/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ca/firefox-119.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f0a3da2a340456120d7b2963c66e4b2b67c015cb686c2ce29c4accb1b78ee0fd"; + sha256 = "c8dc0cc2dcfd7e8756d3815f293edb7da61f899197ce13d29f0891f96df68e02"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/cak/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/cak/firefox-119.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "5687abecae8d7207a9da2d15f6593214dbf2735388d50507009c37380c34f4e0"; + sha256 = "d35ed2653628c7ae54a04f2bc441bb5ebac4710efc05d64f3781922b6446a60a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/cs/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/cs/firefox-119.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "b85dd85baee3d80392d2d3c41b9c2e59217c41bdea7599fde4009cbb614bf8d2"; + sha256 = "b8d33dfc6b96297ddd846ff99bd30efee0fa781e3d4e8a0487057a6a3790c3d0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/cy/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/cy/firefox-119.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "c82a87eb07e5b22ea4e04cac6171980f8e9e0bd1173360a5fd460f9c59f97e7c"; + sha256 = "8fdde9c4a36b23354e5f3393f70d10f2b921b363ca499da454d52999d4b410a0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/da/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/da/firefox-119.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "0bcedc1a63eb491d3c145e345bdf9739eb89f5a379da3bc6bd0e0fd713def755"; + sha256 = "c5762e737ad82839721870b46e7626c15f9f99c1bb8f3c7a4766a508a097265f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/de/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/de/firefox-119.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "84f5d9125c8aa42236205a27ccc3ecd8bc2a5986bc2d167e7d83e575cc8994b1"; + sha256 = "cd3d776b5c44d0873f4b8c90bf62c74a9273cf5b03d5ded36547f1d2077b3c3c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/dsb/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/dsb/firefox-119.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "de08ac4f7d33dff1e0f3df7004523599fda74758dd6ff5da1e26db6729d3594e"; + sha256 = "e3e8f5083b0c83d9365605a36d17f10886c64c0f21c19576a3d24a62d2a05c13"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/el/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/el/firefox-119.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "89044e11cfa34cf638ef377349c1a5f8fb2f599255b28afa534694579bffc3d3"; + sha256 = "08807f2915375b628775a4c0987ac934c00d26b1105a8caf3a52ebc026c42a90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/en-CA/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/en-CA/firefox-119.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "de1ce1469644abfaddbe6cc70eefd4dc2cb4233eea4607d812de0a98f4f8528a"; + sha256 = "68797c810dd86008a1e8aec39445264cd69e852bc28c758d94654a276976f2c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/en-GB/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/en-GB/firefox-119.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "7fdee1e5c4890c696f096af8e83e7b68c762e82bca1d712a91f2ed1f966a26e0"; + sha256 = "a1e6c1344bd9bef9a393a023cbb0d6f56283e483203ea03692ea71a9e043caf5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/en-US/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/en-US/firefox-119.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "58d1d632b15533e2678c213b4177903cefbf3e6e0d8a82dfad68eb561a921ab8"; + sha256 = "5eaeace6e8d741b8cdae8c8a98f118caa98f957bafe8d54d536d98cb260fae92"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/eo/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/eo/firefox-119.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "86f353aaf6ab03455797f937ac1b4d9c14bc91f504981a91e6adc665b4821c77"; + sha256 = "21cca62f1324c5c6fb8b03bc670a86ea6f86cd6e91c11c81eb202571d2fcd687"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/es-AR/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/es-AR/firefox-119.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "47b0cd3b502431647e42ad9f73734110c0077149a6cd4c3c3f24bc5ac46b0339"; + sha256 = "955493247481e364722e3bd57333ac8f6754c8bc135b9e0caff78d554a91e441"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/es-CL/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/es-CL/firefox-119.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "625b765e79767e293a8096981e644cf7b12273b9e7ec89b00e13ad9559868b45"; + sha256 = "16d05701b991a91bde3d7542737d64b63a1d184046090158adc5ca683cd34739"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/es-ES/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/es-ES/firefox-119.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "eb47eb4796d5e7e2c08219663734374803e806e2426d9beae51da1e9523241a4"; + sha256 = "b300130904d449c31adde941dbf514fde7f579cfe571744ea3a929915277aaad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/es-MX/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/es-MX/firefox-119.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "2d3d709781e59e33f2f357c66acafb202425b1f385b3f96350eaf0d10e8b5b73"; + sha256 = "44bc3c0cbee194c8235308b5836104a2c5016ac6537bc9dfb741ccb2aef2d854"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/et/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/et/firefox-119.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "37293408da739ab126456554c2b1f5f4592d54ac908df4a5eecdb21e3e76da24"; + sha256 = "536c1c8f97ae1f4f50584e5b7123d04e682196c71ebd4d873e19ab90bc5c8442"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/eu/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/eu/firefox-119.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "f7ec6720efb3684939ab5294b51273c1061cea70758bdeeccf9f7a5897ec49ac"; + sha256 = "d25fb29a7e62691fa070084b93d294587c0cd0a006aeb13d90de29dc7960264f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/fa/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/fa/firefox-119.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "366046846a3db12236f12beb9d3e65b7eb38120aace78b97af612ec77f126e6b"; + sha256 = "8bb9b11ede4518f35df9820040607942581e3793dbccabea0962a1455ed879ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ff/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ff/firefox-119.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "e79eef353f33602950d138045646678517e2712fff3d4f035504377b4abb2b01"; + sha256 = "e4e840fa0c9fb6e09b9d450c9daa03f988529bf833b11ae95af63ae863e2939e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/fi/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/fi/firefox-119.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "89c006d566570c7f813c9bb95851a42df34145f50141811664935ab12386ad76"; + sha256 = "70169b2198ee988736aab5c179fa45e8f517840db179af532810f2bfe20eb162"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/fr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/fr/firefox-119.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "12ad529016b98695aa67dce231e0241e90afdf181a37fe0c09bc7e8087961191"; + sha256 = "201a04c38bad6855ec1e9dca17e7def948d577d48b00f4aa4fa53d97dd5535a9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/fur/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/fur/firefox-119.0b6.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "8f5bd635d630b7498ee2048f3bd3b856db8170eba2f39325615704b082dbdd2c"; + sha256 = "b88b280d2e5247668920a20f0801c24b469e8dad40c911ee6a579b15c0a3c887"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/fy-NL/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/fy-NL/firefox-119.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e8e3a85d5264baac074e03b6fd4eaf193d0a8760be516e832ee96bdeace69b63"; + sha256 = "270fa1ffaefb27f6ccf18205bf4854d8e71c6987edc435275096d4cd63474d84"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ga-IE/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ga-IE/firefox-119.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "010ad07be68bd6e248f2175960d464b4afb9435ed292926913e0669cf4acea83"; + sha256 = "e691dc694afe2bd2330b54e61ec78d4d9231e42eabfc276019d6bd622b5ad4b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/gd/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/gd/firefox-119.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "4fb60fc01d44a1f5d07dc605a3e2f509d6e04a52ae60dcda4204510a05a0e7db"; + sha256 = "922ebba58136ad845f17e347c9fa7dcca6860f721a513502aceed6d33c5c6457"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/gl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/gl/firefox-119.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "30c2748a1a1a9c0d695f9731b2e0b88656753917ff21f0989e5eacf7f16a50a4"; + sha256 = "166f955a682ca4e0b6b6e438c23e4f9cd7b02053811c16d0d98668b35690bfec"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/gn/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/gn/firefox-119.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "b357efa2c9b2ca390c07874f55e658fcf590195a3d8d213763bc41118d808a73"; + sha256 = "909af1ace3ba8275a9d2cbe9e5097595b3809361a50f2c3e2e4040dc2fff71ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/gu-IN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/gu-IN/firefox-119.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "94b57adcf74e60b9504957dc79491438d05db42665a9267970a62b527c31daef"; + sha256 = "12680aed2230f9225b15d78859649d9eaf1b671e5e3fa8ed8f88e7273776bb22"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/he/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/he/firefox-119.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "5f857d71ea34eded7046d05e8925c70ff78c3bbd63f95a3dc57f553ff7a2a327"; + sha256 = "57048b16d6f5db639d23b2937de0c891b06581ef90413c71bc09eadf9ac323b6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/hi-IN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/hi-IN/firefox-119.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "f17dfc782b4c466b9f6e07723f47a594f6e33dedf0f67ca86974c8072a15afe2"; + sha256 = "29b9e04a34acf231de4068c24537e23923a38656d1527c3819a90acbca63a3aa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/hr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/hr/firefox-119.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "b769235d59d395382738c0ca1a59a3ed226ab188bc282b3559cd02927a789560"; + sha256 = "71a1b2425ce2a41bf1d3a64e8bc977509a5c12b0890556604cc3b59dae890099"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/hsb/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/hsb/firefox-119.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "6ac11eddcf3d07769655991329de80c35a3c055d817eb8a40ff9d93f144c400c"; + sha256 = "84a5038ea816f176541caf286a6d3f4d8ceccad6eca2d6efa332ad53748fc6ee"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/hu/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/hu/firefox-119.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "c7e9e814e2c654a12e603678b4f122fc9c527397b2ef92195ec5d1aa685a2105"; + sha256 = "ab3897471971047d71dfc973b38e082a7d436862a1fb7ce9ca309c8778a6ff43"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/hy-AM/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/hy-AM/firefox-119.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "160c24b4f6c70f6b2734f60aaa9a3b5e6e7c7b027dccdd07b26034a8ba6f416d"; + sha256 = "1cddc519b812a7c969b655d28283fad466397406f2bb2b474bc7215d4e3d9f10"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ia/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ia/firefox-119.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "deb0385dc55ca21299d18d962cfcd9f8f080515ef6cef9fd49136be9abd980c8"; + sha256 = "1903a412d67ca3d9e67e6f00e560eba5e9d7e0a823360b2ce7488e17e2a874ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/id/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/id/firefox-119.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c55427ada9fed0527473332e0453651bc95b9c3ff01f80cddc60db494f15c327"; + sha256 = "245549351a02c7a7de3ac777bc4d1bfacf3d2a49a6b9f7a731b91c57a23df5ff"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/is/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/is/firefox-119.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "35c26425b469176ea82d396affef4fe01a6f0ca83ed0da06805adcb08c8224b5"; + sha256 = "23127f8ebafeef2997f53a7d000754a355b7b425cc45c84903c5d041ad6d59ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/it/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/it/firefox-119.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "8285fe9ed2bf62285dbfd73b60017121d30de703537b1cac628c6ac87bfd6bd3"; + sha256 = "197ac9ea0daf18f2b3370c400e89dac8e38a3cbe65c53a1052ded7e4299ca618"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ja/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ja/firefox-119.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "96577f9739f088a578f3bf2ed11081d934af0fef10e418f1bbbb1d0f5dafb6a6"; + sha256 = "e1ec0637713fd35e2240f76b5d07731d24e2e4dba7c6aadb356ba0e0abcde05d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ka/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ka/firefox-119.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "d2379e384dc20e016fce79f597536f07dc2a9580a07541b7cf3e90a543450bbb"; + sha256 = "2a32fccbcee9100aee27a1fdba8a841ac089664c7b9b3f079c0fa03ae6209328"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/kab/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/kab/firefox-119.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "58a599362176a82081236256a3b9c696d400b7360593b8bf12c8d6f577ee283a"; + sha256 = "1f3ea0a86f57ce915c54f161cbc38f58d703a7883c6a12d121a37e3ac19f6d5f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/kk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/kk/firefox-119.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a6b316a0574499525e0a1f8f555b5d6b0e6914eb36a1d5c5bb9a509ec7b01379"; + sha256 = "53a9b09dee48b819d7f215fdb0c589f99b3681a0f50d6a1cac75a5c1b6c54d57"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/km/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/km/firefox-119.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "4a0c1e0c84166bf9e0e9ae51c36d80f3d279d0782b2e039945b1b1107c7b1cba"; + sha256 = "2d2dac4518d81308a9876f2687feb700a301f3caaefa39faefc930a104af7742"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/kn/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/kn/firefox-119.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "aa515bd95233fb91fa83b7b2bb55c08692be440e499793122152d574eaa656e7"; + sha256 = "3b846d085583226674f92ebf10431959d1b0cc26a1f625a7735619ba2082c763"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ko/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ko/firefox-119.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b9c055253b93adf7f88d47e91a680e34b32c51dcf49b3be675be085876d90adb"; + sha256 = "62f1a527a86a4d43bccfa5fe683d66d9317369bea2ce6942cad83ebe4c8c878a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/lij/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/lij/firefox-119.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "6b26a71a8dedea573eaccf3a5c12a8c690a8845f7c0b56e252c20fafea45c04b"; + sha256 = "3cdea51693644417f6d22e887daf21e3bcea623c8a18efac0a38123a43f5b8fb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/lt/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/lt/firefox-119.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "35f54ba4ebb1a10861ceb7a1db3e7aa6075342827f28533859bca3747fb0551c"; + sha256 = "0c03f35039bc822cd8a6c756a31628dfe08b8a713c4ddb322d51146c8fc44d2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/lv/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/lv/firefox-119.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "4643aa3a4b3bc74d3e0408995935c98fe634bf670cbe99e6ae9c9700a26bd427"; + sha256 = "aba840eaaa35a712313204274e34d6e8cf7b7d643649b2a0e2dac81fb78de2c6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/mk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/mk/firefox-119.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "bb8331098d6e06366e1166bda8a089d134e8a11486960c58ac727cf198618299"; + sha256 = "a386ce049ba686c54b4df38debe5c344d114f3c2aa36d8e9220cc77d38b5cbf2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/mr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/mr/firefox-119.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "a4a68222f139b68bf31a8841baa458ea7d97feea5f80afaa14e56d62315e1ff5"; + sha256 = "6439998155e506bcbb80258273e3597480ccb1fa1e520704834d41199d4514d1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ms/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ms/firefox-119.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "a432772632fbbdfe931cf0643d54623e9931be79b222f59b95edd5985c76a961"; + sha256 = "7aba8da30c9f57fb7e8ba0ced67ebf60ef1109edc38677c04a20ead32476f0e4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/my/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/my/firefox-119.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "77544b859b002853e0ff63800d5f814b3c4197c8df28c2043f927befbd9f7b1c"; + sha256 = "eea6b322199d5f976037c8e60b2184a3569b64280460394115766c4378f53adc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/nb-NO/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/nb-NO/firefox-119.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "1dd7b77253f5ec1f4b0b6df962066d592aeff3748f4d31893fa63d11f69854ff"; + sha256 = "837b7330e1b697d71a8714e2da77e8b4e2ea9338abb4c5ed1147f080ef332410"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ne-NP/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ne-NP/firefox-119.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "d81107dc42a31cdd2f49eb6b7e71a81da52eeed5ee95a845e845f749186eadd3"; + sha256 = "4b940aaf89f45ccfedb3a5bbd78001dc5d96a4a1991b1da76d88b8fabe2209c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/nl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/nl/firefox-119.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "192a5483786f909f37d7fb3439e732fccfb15d8e648494412c337711bc86edbb"; + sha256 = "d962d996c3ad87ec4eafee5f17a80b3fea2f131bf3d5e0d3b5362b0520f4f04b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/nn-NO/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/nn-NO/firefox-119.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "270bced4faeb668641a3a2167b97a9c85ca306ca6de118e85a690ea9a964d4cc"; + sha256 = "d08c8b71451bd46ea6ea49379a746f25bcf1fc2e293e3219f9587d8b7f1f76fc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/oc/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/oc/firefox-119.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "3d923f09900ae889254cd512bb4805716c90ea8c3c6c084fb8519a31180e44d6"; + sha256 = "d8feaa3cd6a9afacf360df9a93d9e118dc72231b661d5fe0b909d8013b68a946"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/pa-IN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/pa-IN/firefox-119.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "68bb169e4a79614ae8b4bb7e6cb2c1e06261b45c74b8c18ad85c51aef00dea8d"; + sha256 = "fa4d570b5869afbb4e6201c03828efe19f12e6ca53a95fd120decc8c927eb5bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/pl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/pl/firefox-119.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "553c21f022f59e4b29d4049bb47fc4366a2608e3af2da9ebbd7823c10688d949"; + sha256 = "0537012fcdae800a394f1797325b7e5429d1fc69d9bf79d50f0e42b381f8180b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/pt-BR/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/pt-BR/firefox-119.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "4390eb3bb00c7cfdaa74868caabd7098678e01e650a2e01b98d14eb2f6fd2672"; + sha256 = "dc2e7e220e18dce1b818e29f7cca953331bbfabf6dd6a7e97ceba142eb305c66"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/pt-PT/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/pt-PT/firefox-119.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "c827a674d6e90fe4c607c320bd45aba0e01f8834be8c0d1bb04d6f188dea839c"; + sha256 = "20096e9c5a2077dbbc5b052674d66ff939e93d8199021e96c938b3f73801472e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/rm/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/rm/firefox-119.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "2fdfbd2c213e3b42757b5c6ba52f94b14b7e54433ac4d69143b9fc5b45c9fc11"; + sha256 = "48b6d128c360f00a3d154787f627e9c4a96266d6d08c0124ddbd151eecdd2912"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ro/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ro/firefox-119.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "b8593278a414a159a594eff6752d6ad19a945229538f1f0760f0bb5ffbc47ef0"; + sha256 = "afd4032aae64239ff0193db56ed29f2aa3c380f6bd1c685d844cf87f8ac5316c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ru/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ru/firefox-119.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "91ac0d575d69bcb5f58f5cf1c2353d37434272c588443d63498ad823ad149ef9"; + sha256 = "a6d9849dbe33cf1844243be4008d7db49fd238e4b8e1355eaf212ba5d0c210ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/sc/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sat/firefox-119.0b6.tar.bz2"; + locale = "sat"; + arch = "linux-i686"; + sha256 = "78e73098d936fa2cd0d0239b31c12666a0a00bbb484561807c4f7533a3d37f3c"; + } + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sc/firefox-119.0b6.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "72b10e52652153215373b27e20192cee2a5e11db7492effb6805e55e36b1bfe2"; + sha256 = "6133c94129820c7a7753de9565ea7855efac8702a1638173364d27ea655c162b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/sco/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sco/firefox-119.0b6.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "2cce0e614f7c07396c579a6eb1020bc100795ed2ef3927f984296e316fdab87b"; + sha256 = "509d0894a6629ea6aeb2af56f96b5dd0a4fef5457dfbed1301580cb0c7dc2dfc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/si/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/si/firefox-119.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "49eabec274b3eb580dfa313039b32f82ed2bedc00f2c664b671eb81a72de1a60"; + sha256 = "6d0b0a6df565b0170b6356307b9300c71aa298e34b3057bd4ebdb2a49f9e716f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/sk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sk/firefox-119.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "76d89b309e48b09d7d2002154d09e6556a75269a358478baf858fd13a1014103"; + sha256 = "368d7425c03cea42cb630e4dd3e08e57dda51c6d09a14d02fa7a51817282fe5c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/sl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sl/firefox-119.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "09c6896cedc90f2c14d04bfb8febf5d3a7c6138382271e66ce0747c540f5cd5c"; + sha256 = "4d663f89fde091267522c37ccc3e69e0246367c865a756e9078fae01a52c0f4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/son/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/son/firefox-119.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "eece37277fe17989133ee8ae720134944e5abea01334bc3f83630bd718680996"; + sha256 = "578a4c59edbfb30f0f070026d76bd741ef1af60e4ba09d799a604a8bb770554d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/sq/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sq/firefox-119.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6370928c6c3b6a041a1ae471ec5d4c8c1667c098b17c412f9e839419494126d7"; + sha256 = "6640bc3563f04badbaf6102fa34b6f92caf8a82c3a6a0261e8dcc10212dd6198"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/sr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sr/firefox-119.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "22352689f78718d7d83fda53bc674542136d09df0177b2737d086a274236e73f"; + sha256 = "9aa22e50e4c7f49512572271252b4a9fb0631c0dcf4ebd86eeadd1c3c768e0b7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/sv-SE/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/sv-SE/firefox-119.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "ef740b6453424c5d81d0c3819542dfe6510d9a7f2936d3297a01652e1aeecad7"; + sha256 = "9aafb4a1665481eb4da39857b002e92d98501e0020c592d0870ea6d2b913832f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/szl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/szl/firefox-119.0b6.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "a7109f1df7da2cd8e9c6396ec9041c3462b36463edfccaecb3a3988abae6811e"; + sha256 = "c4667804c8e5f3f803f1c06618aa25e1cb0ffacb0662eba71f163505aa5d921e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ta/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ta/firefox-119.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "9a48cc5d627bd5b95bfc5fa08612d1c94bce6da4e97068608e85a174199655c6"; + sha256 = "ed4744875be84e379a3300789ee1b3f3e0cbfc0dfc4149e0b122a0c96e932e17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/te/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/te/firefox-119.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "c3ef17c7110fe78026dff63bc54c07fc48d45578360ff52a7833a60e5ad0de90"; + sha256 = "3eb90abe5fc026f43a2d262c2396d11c40d64cb2688c8ad311c7e2c8a576254d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/tg/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/tg/firefox-119.0b6.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "65c2fe6a3ae06e6fdd115bfb1cbc2cb7a3cf6e5ef8861ef84112b54df2bef89e"; + sha256 = "07b616e1debafbe9962dd54442da33ee5ec95739568db7dc529fd5ec7aa94c78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/th/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/th/firefox-119.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "97e4dac1d57c6a6b7e607289dd1c209accdfbc9dbd9ad51a1db2c7fa62bb61c0"; + sha256 = "1fc3d9d2eadf9613c275dec758f601df716fe84faad79b7d1a3217c4fabce1d4"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/tl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/tl/firefox-119.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "1d4ad0df7750760d86d5bba1f0fee32b29bfb53f5ea85cb3b026539e1ca1e407"; + sha256 = "357092ab4ce7d275d158fdbc9fb5695b1570cccd5f6a8d39e6cf188fe30fb645"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/tr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/tr/firefox-119.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "6c294b1c9a94c3298a858c8e1e4dfe9756ece4a62da6c17fe260ff9535643c66"; + sha256 = "10e6f7a5543dce902b570a6fe5b9411d8e1755aed3990dc8dee382348532422b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/trs/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/trs/firefox-119.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "813d3a8960c21ea741e07e09ef5a7ce2884b997cd2792ce99654d7d26fea744c"; + sha256 = "fca774899d7abbd453ab32193626ae6f4143c26bf031e506b9a90413ede1f062"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/uk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/uk/firefox-119.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "044a7e998a68fafb2b6a405ca9484cd59bf92304e39b5cb743ac28da21951bd4"; + sha256 = "c5144d3a09aa4e281ac0a0ef1ba4e35375e48aa77a6aa8db3fe25b6fbefb7cf5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/ur/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/ur/firefox-119.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "37ce5d2766192b85256440ff9695229600f4c74976be1f9dea2ec58c0325e466"; + sha256 = "687b8cb4ed66699a590be38ceaeb8a2c5b802cfad8430ae3db98ab0ddbdb7957"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/uz/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/uz/firefox-119.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "f9914ab518c95bc82844442c023c791f81696dc1da2709a519452d3ece3b7153"; + sha256 = "563674323dfd4b333ba695def45413a1d322fe6c3425029e73999380ef8987ae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/vi/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/vi/firefox-119.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "f1ade8da7617109b58abe55385d9ed914a284f7c0418dafb3d8f427c7d0341af"; + sha256 = "4c76121ee4245094f417a70d09add493bfbc8a3020401f26d69638627868d473"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/xh/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/xh/firefox-119.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "7b4076d6f0c143c0157338060a6b7c0106923f622e3dde365b751a9b6b267d56"; + sha256 = "8f7ea99e9587dd8801abf22892fdfd38f4446a8339460b8bb4103d2854c8b00d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/zh-CN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/zh-CN/firefox-119.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "a3c75bf49a0648999eb7ac3b1ce18a8962e30a04a1f41a708e336109f28292dc"; + sha256 = "03bef56655f52b9c40d3ed29052dca62ae83f2668ef860aa745abe3f7d1a4c7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/117.0b9/linux-i686/zh-TW/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/119.0b6/linux-i686/zh-TW/firefox-119.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "b308d0fb15d417935c08c316f9a52abac322c406453ee3a51b1a2bcda9b3396d"; + sha256 = "456d5311fe2a21bbac3bd20f3105635bf468aea86c014bf4fc33508b9faa8298"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix index 31d1ef6920..8130f9f775 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -1,44 +1,13 @@ -{ lib, stdenv, fetchurl, config, wrapGAppsHook +{ lib, stdenv, fetchurl, config, wrapGAppsHook, autoPatchelfHook , alsa-lib -, atk -, cairo , curl -, cups , dbus-glib -, dbus -, fontconfig -, freetype -, gdk-pixbuf -, glib -, glibc , gtk3 -, libkrb5 -, libX11 -, libXScrnSaver -, libxcb -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXinerama -, libXrender -, libXrandr -, libXt , libXtst -, libcanberra -, libnotify -, adwaita-icon-theme -, libGLU, libGL -, nspr -, nss -, pango -, pipewire +, libva , pciutils -, heimdal -, libpulseaudio -, systemd +, pipewire +, adwaita-icon-theme , channel , generated , writeScript @@ -48,16 +17,18 @@ , gnused , gnugrep , gnupg -, ffmpeg , runtimeShell -, mesa # firefox wants gbm for drm+dmabuf , systemLocale ? config.i18n.defaultLocale or "en_US" +, patchelfUnstable # have to use patchelfUnstable to support --no-clobber-old-sections +, makeWrapper }: let inherit (generated) version sources; + binaryName = if channel == "release" then "firefox" else "firefox-${channel}"; + mozillaPlatforms = { i686-linux = "linux-i686"; x86_64-linux = "linux-x86_64"; @@ -88,6 +59,19 @@ let pname = "firefox-${channel}-bin-unwrapped"; + # FIXME: workaround for not being able to pass flags to patchelf + # Remove after https://github.com/NixOS/nixpkgs/pull/256525 + wrappedPatchelf = stdenv.mkDerivation { + pname = "patchelf-wrapped"; + inherit (patchelfUnstable) version; + + nativeBuildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin + makeWrapper ${patchelfUnstable}/bin/patchelf $out/bin/patchelf --append-flags "--no-clobber-old-sections" + ''; + }; in stdenv.mkDerivation { @@ -95,115 +79,54 @@ stdenv.mkDerivation { src = fetchurl { inherit (source) url sha256; }; - libPath = lib.makeLibraryPath - [ stdenv.cc.cc - alsa-lib - atk - cairo - curl - cups - dbus-glib - dbus - fontconfig - freetype - gdk-pixbuf - glib - glibc - gtk3 - libkrb5 - mesa - libX11 - libXScrnSaver - libXcomposite - libXcursor - libxcb - libXdamage - libXext - libXfixes - libXi - libXinerama - libXrender - libXrandr - libXt - libXtst - libcanberra - libnotify - libGLU libGL - nspr - nss - pango - pipewire - pciutils - heimdal - libpulseaudio - systemd - ffmpeg - ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ - stdenv.cc.cc - ]; - - inherit gtk3; - - nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ gtk3 adwaita-icon-theme ]; - - # "strip" after "patchelf" may break binaries. - # See: https://github.com/NixOS/patchelf/issues/10 - dontStrip = true; - dontPatchELF = true; - - postPatch = '' - # Don't download updates from Mozilla directly - echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js - ''; + nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook wrappedPatchelf ]; + buildInputs = [ + gtk3 + adwaita-icon-theme + alsa-lib + dbus-glib + libXtst + ]; + runtimeDependencies = [ + curl + libva.out + pciutils + ]; + appendRunpaths = [ + "${pipewire.lib}/lib" + ]; installPhase = '' - mkdir -p "$prefix/usr/lib/firefox-bin-${version}" - cp -r * "$prefix/usr/lib/firefox-bin-${version}" + mkdir -p "$prefix/lib/firefox-bin-${version}" + cp -r * "$prefix/lib/firefox-bin-${version}" mkdir -p "$out/bin" - ln -s "$prefix/usr/lib/firefox-bin-${version}/firefox" "$out/bin/" - - for executable in \ - firefox firefox-bin plugin-container \ - updater crashreporter webapprt-stub \ - glxtest vaapitest - do - if [ -e "$out/usr/lib/firefox-bin-${version}/$executable" ]; then - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - "$out/usr/lib/firefox-bin-${version}/$executable" - fi - done - - find . -executable -type f -exec \ - patchelf --set-rpath "$libPath" \ - "$out/usr/lib/firefox-bin-${version}/{}" \; - - # wrapFirefox expects "$out/lib" instead of "$out/usr/lib" - ln -s "$out/usr/lib" "$out/lib" - - gappsWrapperArgs+=(--argv0 "$out/bin/.firefox-wrapped") + ln -s "$prefix/lib/firefox-bin-${version}/firefox" "$out/bin/${binaryName}" # See: https://github.com/mozilla/policy-templates/blob/master/README.md mkdir -p "$out/lib/firefox-bin-${version}/distribution"; ln -s ${policiesJson} "$out/lib/firefox-bin-${version}/distribution/policies.json"; ''; - passthru.binaryName = "firefox"; - passthru.libName = "firefox-bin-${version}"; - passthru.execdir = "/bin"; - passthru.ffmpegSupport = true; - passthru.gssSupport = true; - # update with: - # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped - passthru.updateScript = import ./update.nix { - inherit pname channel lib writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; - baseUrl = - if channel == "devedition" - then "https://archive.mozilla.org/pub/devedition/releases/" - else "https://archive.mozilla.org/pub/firefox/releases/"; + passthru = { + inherit binaryName; + libName = "firefox-bin-${version}"; + ffmpegSupport = true; + gssSupport = true; + gtk3 = gtk3; + + # update with: + # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped + updateScript = import ./update.nix { + inherit pname channel lib writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; + baseUrl = + if channel == "devedition" + then "https://archive.mozilla.org/pub/devedition/releases/" + else "https://archive.mozilla.org/pub/firefox/releases/"; + }; }; + meta = with lib; { changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/"; description = "Mozilla Firefox, free web browser (binary package)"; @@ -213,5 +136,6 @@ stdenv.mkDerivation { platforms = builtins.attrNames mozillaPlatforms; hydraPlatforms = []; maintainers = with maintainers; [ taku0 lovesegfault ]; + mainProgram = binaryName; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index b71073e295..bc59c44618 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,1015 +1,1015 @@ { - version = "117.0b9"; + version = "118.0b9"; sources = [ - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ach/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ach/firefox-118.0b9.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "a05e8d7c4ac2ba7709f86bad79fa2d55fa04c8026f852362a3b88675f8bccf9d"; + sha256 = "5acd7d6ddf79c3d6399c9e59a9dbe47e9aa23d6071528ea2ca9bfa3b836518a0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/af/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/af/firefox-118.0b9.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "3b1258411512831755c138804cde9c74b94b9e86ca9dfa95cfa51f204e7a5889"; + sha256 = "dfb8567a0b2376d25c84f640fe2d54afccb35c681f4b03b9b2c265a1b3726247"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/an/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/an/firefox-118.0b9.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "520e33edb226844fe90acbd6726933764e23af775535434083ac2b7d5bb807b1"; + sha256 = "ca3a0f0ef0920f911d71a8c91897b59d6056ad3979d1674e01f8d7efe078a54d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ar/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ar/firefox-118.0b9.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "ce37a0cc69e421b497c3c5174326faf59b69830b5ccf9e1d30d0dfdeb8d6aa87"; + sha256 = "d42b9d642e9f62fac2c5c608851ee012260770d3a120b73501c76f5a8ae8e879"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ast/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ast/firefox-118.0b9.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "7c5418e4ee9316461916b6054d5c5243d99e0aaac14bee6869d792e38087b1df"; + sha256 = "cbde843e9fa68df97d67d8f2fa30a32b1acfd1cf2d721ef9279a094aa4d67fb2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/az/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/az/firefox-118.0b9.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "e24a7fc828605c0fdbc95de172cbcb1e829ed24f84b7149cb0f552ae24b5fb47"; + sha256 = "0f4a8343202eaf372d053453654afd399b85fe670935bc700fa344ccfebeaee4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/be/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/be/firefox-118.0b9.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "fa6ba8d88cdc63ae31bbe49edc7a7f25dbe2217e4b62efcf0e2c1dee8707f811"; + sha256 = "ae6a0e66076aebdfddcfc3d2c4defcc2d681fbd69b54c024d5677ecf5e24b6a0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/bg/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/bg/firefox-118.0b9.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "2fe4352c99cf5986bff999d49791734726b347a7fd2d160a4729ad4902b76f87"; + sha256 = "10fad3cb1a614deaf6169d6ea1574010172e73037c36e5caa19ccad41d347164"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/bn/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/bn/firefox-118.0b9.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a85b8f5c506568dac29dc432b8010f14e5ca2bfdf4808d0687236c00df58345b"; + sha256 = "313ca09b833065db9bcfa270fae044af1961fb8c777d54a0f6fc0d5908c4703a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/br/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/br/firefox-118.0b9.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "a59ae8a5668717889bc337c3baa060e5841b6f50a4ff7e319647efd01eeab53b"; + sha256 = "98be142d1b61a37cfc6d2d47fc8ecadb128b7b464c3c62a4a76b372260c7aec6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/bs/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/bs/firefox-118.0b9.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "5cdc0c4069414feb436e1bf19a4a22fe88d49efcda59ca0a079e806b6a2027b2"; + sha256 = "622ed1af0985ef2ebc4c9cf897a0157b9c933e55f46313b44ca976b156479a6f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ca-valencia/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ca-valencia/firefox-118.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "7bb772c8d07b6b4a835667f5f65b2fc532ae0f2e11852a49b8722abf908e690e"; + sha256 = "f07b40f3ed624eecdeb45b79e9a52dc4204d5fec713001a4b33259ba77b61908"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ca/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ca/firefox-118.0b9.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "fe3c2ec58d4c8da121345cdd7d4f84551b07e3e61938c186162e311760945537"; + sha256 = "90d11280471491175188b4244634d3a604057c6bddbf047917b3a374c97c4053"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/cak/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/cak/firefox-118.0b9.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "106371eb4fa550a65e9f0abf40d33b3020b9b6062e236cb5d6b8be1e33275e91"; + sha256 = "94e9141892331ac3f9fcec1264be65661ceae6234635aa9bb44b4b97be8efb3e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/cs/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/cs/firefox-118.0b9.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "96650d5e0ec7dd19a10af6652801575e96cf257efbe666500de651b63c4dae04"; + sha256 = "b1a976da8655601bc98f1bf33fb8731cf7ae1db6ab068beadaa741e896b3e0b3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/cy/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/cy/firefox-118.0b9.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4351e6f0b4aad524e7faa72c0c416d0385728f0d740aab9e1c4297579f7fe008"; + sha256 = "3dec7296441f4154db622bf3cf3c3af45b6cef1aa4db454c18b76474d4c46475"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/da/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/da/firefox-118.0b9.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "517091c000e25dec2a808f8dfacfc292d7371c1ba2e528d555ea8a70bcad6355"; + sha256 = "1b9d4d7f38e7edbbbf165d5f07c826793834c57b098980bae018614503a4d10f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/de/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/de/firefox-118.0b9.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "4c1cefaae4ef0bd242914dd0082b45f28051d78569b46fadff22af8b6870b046"; + sha256 = "23790fde6591ed8da815d343cdaa2d220d7b764d53de29cf64ca379d3569668a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/dsb/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/dsb/firefox-118.0b9.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "0a72c2e1f2e9e5855994fa258f277608c71800cd2f69dfeed364ecbe32c0897f"; + sha256 = "7d2b8f361397d64d6daf41e8e62d9527fa8fcfe089a3d67d0c2cb8f20aab2d0b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/el/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/el/firefox-118.0b9.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "3e7e9d2b85067bcc67942888de5e86d63ada60e4fd0fe913bde1a33f7674b5f0"; + sha256 = "7abb4568eb97c2a18e1dbee9854494bf77d2ca8c3d657803304a36da50b1b533"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/en-CA/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/en-CA/firefox-118.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "08b8f21d3294b5d96f789e1d028d7ca60f1270f3fc4b6b388e1cdb18d24e7746"; + sha256 = "3fdee20918067d944825c465744fdf2138770a2fb8943c13c3ced16b1f682adc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/en-GB/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/en-GB/firefox-118.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "274bad3906d5bdcd11a4680bdbc4148c04d804391b800c7441f5887e994e6d32"; + sha256 = "12001f0d7bb53972b731bf1915bb5c0adcfd173fdddfb3d1a95024bc083f8f25"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/en-US/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/en-US/firefox-118.0b9.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d0ba03601f16c6349f991354f69988e20fc0b0036d642b317d3a7902b3315903"; + sha256 = "efab41ad6173533258aebc346f8c08e380603c2e9be139ccf3ac0c9e36c64f18"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/eo/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/eo/firefox-118.0b9.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "adc182390ad0dde83460d2d5376ed2c66dfb961173b17667893c1847b064f353"; + sha256 = "9440354ab7ff9c8f6d597667f9826a6ebf14e2ee05fc442844692727e343d6c3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/es-AR/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/es-AR/firefox-118.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "fe57b4abd1c8846b718a4be9dd8df54c77497583d8de94c9634cc2a244910f70"; + sha256 = "2e879fe58cf49cb2705f7fe422fb1d220afd485dd2a71a4ea5a142f0190abeec"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/es-CL/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/es-CL/firefox-118.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "8b5aedb7fd2133d9d7febc0db5139e796d7fc1f3b9d3e6c9cba8dd8bb4f0eed5"; + sha256 = "6b6d5f82c141828eddf1cef087efd08945adbcf43be9ce5bfff6fc9c309b4b7f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/es-ES/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/es-ES/firefox-118.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "1fe3c540d64f7e7f37cc6757b418948b4e61424952622cdd7a963fafc493051a"; + sha256 = "a7105ef1a00786ba489707481c59dea1e7f6f4b9692de03e9d04298e5d189a0e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/es-MX/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/es-MX/firefox-118.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "dbc925dbc82c59e9db70d9ef90155b2e133d9fff46a716fd5d4bd5ae4666a000"; + sha256 = "d5087e0339ef052e81b13835c4fd2a151f9ff45ba917083f137b5ca62c356a3c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/et/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/et/firefox-118.0b9.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "a590e5e00a34572784849b24cbff105b4f7ab31e727580038c23b9b48ac803bd"; + sha256 = "3b364c886030729b2c52befc0377abcdd0069825d3c26a73d16ac0672ca5e0cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/eu/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/eu/firefox-118.0b9.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "0464610926f3ca8feab26a72c9cd14baeadc24fe3c90bc965b382b04ae1d5aab"; + sha256 = "28a7c3f7211c260c76e8b4c473c9a9eaafa2beaa480d26cb1e31e6a888a3d092"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/fa/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/fa/firefox-118.0b9.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "24a45e458727f929f00ebab88b9d90264f038059a9ee283f8a346e63c7ff4219"; + sha256 = "0b2fdea90167e8a44659a6f9a69ab467e4256c203b2ddb7fc736c3d62ccb544a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ff/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ff/firefox-118.0b9.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "3b6c8ee5bdc770d7ce042cd6c678c8099fd5a7215fbb37b9d1cbe4e7336f89e5"; + sha256 = "0e9b071e8d0ba7a741f9d7b2b3e1bb9c805f305eb29524a67f840c12835baacb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/fi/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/fi/firefox-118.0b9.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "8e927e605be834728c951a0d30bcd3dd0d58cd1ce91e2264d31a1c7437ac6d86"; + sha256 = "e5fe1ef5c106d12624b2998c64144449cd49cd81c32b6a63d8941723f9245f97"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/fr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/fr/firefox-118.0b9.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "5b00363817f3a85b631abbc6248454c1ec3991da71bec1a48d2e647338f4da4e"; + sha256 = "ea89e51f4fe8feb7cc8a3ad64a8690af93621798463c4c019c689daf45d36789"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/fur/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/fur/firefox-118.0b9.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "90b067c1eb05862ac6d0695c58ad55f709c30fd957f0676dc06763a94ca84519"; + sha256 = "e5f3f105bafd410c2d2153012c593f6150518927e960e680b6991af92bfb548c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/fy-NL/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/fy-NL/firefox-118.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "773a0fd6330e56760ce3b52e127dc79498f34c09cbe4333c626207db9cc8c329"; + sha256 = "38e335c7fdfa89768ba321edda2bd154811f292e8e95d9138618de6f166e751a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ga-IE/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ga-IE/firefox-118.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "a6093b940c63d74765654b9d8290e5627814889cc8694267f4e34f506a35d9b1"; + sha256 = "0d3c32a94982bdb7989005a3245ca7afa7a5f96336474b5dd4af707ca11382f9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/gd/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/gd/firefox-118.0b9.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a3ec4e217fc22f29945c617278f103fff6291e410f7cd9646a3ab483859a5937"; + sha256 = "1e702f7f0feb04443ed2ee5b4b17c406546e1592ba51fa632a2ddc7171cb8306"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/gl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/gl/firefox-118.0b9.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a7555e3bf2a6c8cdf4c753064562c850387d63ff5bc1d87ab90d35c777a72db6"; + sha256 = "2b37d2e8106072c709030c12652a0293dc26d058e4c761644dceeab9100ab37a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/gn/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/gn/firefox-118.0b9.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "ad94b64291d210511fc82c9d9bb671eaf71817c507eaddcdc01ace63f9703ead"; + sha256 = "e8d83f36e7a5ad7aa452078bb8b289ece91057567ed90ae70de27f0cd8bebc68"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/gu-IN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/gu-IN/firefox-118.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "92fea9860c496f56ede9d35f7a8428670a6f1092b888f6f6f6d7a414262d394f"; + sha256 = "c515ab07a28ea34ba177b2c71f1890db8116c6ffbda2a08a9ddcd7b3c6a93871"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/he/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/he/firefox-118.0b9.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "6fb7841c3e6050e45287497f9b1dc5d9c9bd5846300a1d79fde681d0b0cdeba4"; + sha256 = "ed38173b1d7493de3810972349f1e576f80495d91a552d94febe6febdbb6945c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/hi-IN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/hi-IN/firefox-118.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "b587d4aff15b3fa1e46dce1e683e61b820e64184b6797adfa3a3ca541ee0ad31"; + sha256 = "f7f3c1fc855276817673771c30df8f1f175be7f18c1de0c51158b87dd9620734"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/hr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/hr/firefox-118.0b9.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "165b8c1b499de61c71dbc3a009223f780ac7a71bc89d93546aca6f4ccf799c1c"; + sha256 = "3aeb4da195c933afd2f0ea0f60050d8f4f84f4f50261ac894e4e8eb7eaae93d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/hsb/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/hsb/firefox-118.0b9.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "28a640fc48ec6c495b41d8279ed78cf9fa559b7b29f5dd205f06b18544833152"; + sha256 = "ae0be38cf74813b6d1d5339712e05582441956934fafcca452a0016920f43a38"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/hu/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/hu/firefox-118.0b9.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "cf22e4fc4f6e130832ccf8ad36e63199edf838042aae75a4451c75cb68e89043"; + sha256 = "5b9223dbc3490ac458898d3305a0064ff5aa9015c7fa828596a4a81b7ca67fe3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/hy-AM/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/hy-AM/firefox-118.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "921840ca7c725751b02813ab6ef44bab9e48e2b391d7006a5b5f343e9d6c8539"; + sha256 = "a20abd777fee3aa4b5866d9246dea27015dca40f56e7722c833275eab61971d1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ia/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ia/firefox-118.0b9.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "6c3a7e708233d73baf8bd36d10e1115b233042229a05909cc9ddacfb75043d65"; + sha256 = "8f001a2f83b93850af4f05ce5b5aef4561ab0e9c64a2e1b4f767a898ad514279"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/id/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/id/firefox-118.0b9.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "c00d83fd3b6eb748973773daa14aafad88d9e684f1b6fe0773be1115b4631dd2"; + sha256 = "5373f02b1bdb82d2adb70bf8ae83dbd847446b381d79f2398d4997b2871cf2bf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/is/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/is/firefox-118.0b9.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "920627a49392ae31a8ffa0f86358f4f30166a1caaa99668bd42a03c47e645e1c"; + sha256 = "abf81429df6142b154d43ec5738cce2e37e6d2d7c5400abd608035ca79730220"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/it/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/it/firefox-118.0b9.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "e0c9d7fc3f18d16272bc3c395c8562bf9696780f3ec221ecfe6c6ff29fbad6fd"; + sha256 = "15073bf85562036f526ad6c1aa63ce113b9f2de27745020f255fb825706aeb0b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ja/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ja/firefox-118.0b9.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "71bcc5464de07d8bf87fee95d4f9836dac24d83d8c5b65ab4daa224a70b382ce"; + sha256 = "7a556d1d55c06a91fdaeee5af51e8907edf891020c66c5d31484a8e450cbed5c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ka/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ka/firefox-118.0b9.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "8e871cc321edf8aa24e1a9572b43b17355b68af5b3b29a772bed8945376856bc"; + sha256 = "0f5528182492b1f256a39bb2aea38502e37c61c25719534499d8b81143287356"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/kab/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/kab/firefox-118.0b9.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "a98c1916ebf08f2f24778e650b8c58f0018278eb10d9b6aa333274e320dc3fbe"; + sha256 = "6b51e8cf3a5781802bac7c66d9091b84c538de040e5a658ffe0f2b8bb1e9659a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/kk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/kk/firefox-118.0b9.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "9e2b909d7f238c324cb9d3bb36f72228f0741238d4fdb5cc83fe0742bcfe72f7"; + sha256 = "f9d8d2906874947df31a9b568babc0f0f4470d442f3296ca744c45c0d7c214e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/km/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/km/firefox-118.0b9.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "5e0a31efe09445cda5c78440aa63c979d4585aa17712f3622c495ba05dae9f42"; + sha256 = "afd9c675a86d6d043534c070344d6614831e4abcafd24a98e8d6664da3b853d0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/kn/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/kn/firefox-118.0b9.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "c0dc8e5df23dbf308b128866b8937fdf6788fb61476cdcd84dc898be3d9c9043"; + sha256 = "fe93e6dcca7fcb014c53ebc94a9e3d81f5104cf3af22aad1e59c90b75fc3b838"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ko/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ko/firefox-118.0b9.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "cd6f081960c57d76c76729f4d070c5f47eef5a3f73c60f28f63d7ffc5f244686"; + sha256 = "0ad8b6273fc217d1e1d9975c1b496f9f1416346417bfe5ea2d2a98f60f8f1186"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/lij/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/lij/firefox-118.0b9.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "8fc6f8bb808a0eec15064c0b3d4b5e8d6b75258fe04dc55a6c3405ae1e78e371"; + sha256 = "cb7981d47db571e7490dcfbffa337987dfe51ed243744d95c957be665c505804"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/lt/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/lt/firefox-118.0b9.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "8852c6317c6b83e0c9a6b0739ca1e6e05fde6a5be71f496218407e2427b6481a"; + sha256 = "a5249de84d87e71c729cbf986bb064f61a88839021740bd799e159bb550b1175"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/lv/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/lv/firefox-118.0b9.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "193e5dabd2374bc3364c3b0661d132bdbcdcf3ac7914a2e6cbfdcb715092749f"; + sha256 = "c835237ad71ed561ff882afcc7f4350bc942a44ec65c3eaadc5716a0664a6b93"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/mk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/mk/firefox-118.0b9.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "e301e7e0cb5e97fad6c6cc5992b70291fec9005bfa37bfd885677c0935672bdd"; + sha256 = "178dd017f2770e7770639a2a128411d5ac8dd7d1a46172453598285f714a8132"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/mr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/mr/firefox-118.0b9.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "7f9816f994b13264c8dfb4819d90f883a3ffd2e55d87bb2341ea47090435f561"; + sha256 = "876fb7dfbbfbdd991b42059b95a562f2b3d2e713cdfd30a195bd3606ad79c4e5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ms/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ms/firefox-118.0b9.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "949a5bd903d01dcdfbec4f7b5e674c217b38ab11e4f293fc0e5403e5f2eb580b"; + sha256 = "2bdeb6b26779eee615ef2ee3fcdf79c50d3098dfb5a0a6e71721c21964b18ec0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/my/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/my/firefox-118.0b9.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "746cc180733769f0a1d70e39d812658c5754b043a2a3dd71fd7f07dfc542e5e2"; + sha256 = "50dfce52b2ed41dd399369efb944c2890f1987ddf07e7c7136ee745b9a6cd7cc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/nb-NO/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/nb-NO/firefox-118.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "7e4d60c5856e12918245bd3d3e24b792d70ad7f0fb403a4af0e330572efc56cf"; + sha256 = "6f69c9df74f3e13009469ebeb6d9b4e9a26065cb9cf92b9d9ce71c8243de864c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ne-NP/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ne-NP/firefox-118.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "daa08affd6a94d67ae7ecf49fae4c9ed35d6c167c6192e0b32bf6af7b35e0142"; + sha256 = "6170a932880dc5cc86a5e7f78048e7e3248ff3bd11368c0e6d1c49fcdd7deb6e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/nl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/nl/firefox-118.0b9.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "ae44267233200c9a891ed8dc088acc00391193f1236d4e55e4c1adcb95fcdbfc"; + sha256 = "c47de0754f87bf698c0848f7f9207795cfdfc74a0187dcdcc829a38013bf3fcc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/nn-NO/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/nn-NO/firefox-118.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "4f6b021503024dcf933fa349ccfea80991a944c63a7974f04c4b291963d89d58"; + sha256 = "953ffba4bdf5148162ffb1e3cf3766168c82d73948bd528c88f045b315f051c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/oc/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/oc/firefox-118.0b9.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "3bc6ac2c2425fa800f92abf930427e53a87829db6fd2c48c1dead0dc595991a0"; + sha256 = "a094a3823ae328761228e1e91b9da5fad4cec83b7e50c2b9cf5c9418fda73c12"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/pa-IN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/pa-IN/firefox-118.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "f48a937bc0d474bda0ae847e71b268db5b44bbdaff8b5fbfd4ba26b87d0f696c"; + sha256 = "03185fbdd8df2d3d931801be0fc45b151684cb6816866a7551b22af1a646f722"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/pl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/pl/firefox-118.0b9.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b45951ea4392c79e3f1155edab9a25033ad88056b0be8d9abbfade82f6e2c602"; + sha256 = "ee4f3e2d56e84bd30e6bf1f28fa98a8a70ac9b2ced98a76e0bddcc151b2683c2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/pt-BR/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/pt-BR/firefox-118.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "4ded2fa1e286328ed7fea5df199fa057c43512a6b898a3a1fc1b4e28d68a08ad"; + sha256 = "8df58218e900df226188582aef2c278dcfd30c3f36552bb041fff712681b8df1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/pt-PT/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/pt-PT/firefox-118.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "e8e734c42d0bb5b7f9c62397f06297c644abf935c67c8d8018d3b8d6106b7597"; + sha256 = "6bcebcfda5ac9f1bbed03566caf548218dca309829481e4ee37075ec1a617de0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/rm/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/rm/firefox-118.0b9.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "97d8965cae380edfb161922bd707f444f88318b4eb2bd5db454ec768e938584b"; + sha256 = "506ff87af0f0c8c933182b03a29560dc68e623cfd136b683b8469e6d11e34275"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ro/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ro/firefox-118.0b9.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4efee22083a84e9cc6a3c1e8d5d6bc4e424b03cbad825a6430cde8470fb71ba7"; + sha256 = "11e0d4010e80366863f3897476c26511bac41e4c68e85bcc20044d6a958414ff"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ru/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ru/firefox-118.0b9.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "1cc0c130f1ebc14a586043ba4266c0e6883607c6925ac3a9cff242034cc98194"; + sha256 = "e9f56d75d908f26fed24edf78000912dc897960e2d25aab9df1d7547ce4c8d8c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/sc/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/sc/firefox-118.0b9.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "ab47fcdea50c2084843e71e1288da5a634265620937b7cbfb37446cc997c7be6"; + sha256 = "48adfd528e80ebcc01632c3d3313e5418510d3d72d99a945844e00d247cb60fc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/sco/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/sco/firefox-118.0b9.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "e69aa7eb524209e09738bd1998942a9e211e3a636d72fceb93ed7f8d611c2c19"; + sha256 = "1ed5371e3a04eb40cc6b75097135985586ab26000a1600c28939d424df5f2450"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/si/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/si/firefox-118.0b9.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "fd00b955435fb9db50da8e557d44528ed77649e1e5d01a46371b15d0cc06015b"; + sha256 = "aab2fdeda2ccf3605d51857ecd7005da043b471ef3de91211111c6c04f0a81ed"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/sk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/sk/firefox-118.0b9.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "d3572a09925894a5db8d0e0355eea0f5d7d80486ecbcfb6dbd3428fb3ae108a9"; + sha256 = "b3251ba76819d35b26da24080c049f005d43e63ceb863254a61f4f5feefdaf88"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/sl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/sl/firefox-118.0b9.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "2b13df059fdce5c7703d38860337067ec12bb60de46c17b918544229bad4fb79"; + sha256 = "b40d690aeece4a09d994597879a5625568a8dce44f8c87835256c555acfc40b5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/son/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/son/firefox-118.0b9.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "8b138de11e610bafd104388682fecaf1b757fde9f0723cbed221eb13b8a45929"; + sha256 = "06272721d3e81d27ab3cca0845786ac22dfdd70cf695730ff56c3749b7f94431"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/sq/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/sq/firefox-118.0b9.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "5d3ce0a801f94c895c26db40683c24cd659ef796bdb018abeee4bb8c4651e290"; + sha256 = "29da477b4af2a4e22129331ee8a231bf6104085ecc0918d0fc7870dab0d4a56d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/sr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/sr/firefox-118.0b9.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "50cf4330c28250286356258701ba4c17fa65dd768672e32a2b479d810b0624f6"; + sha256 = "ab7d20c85ed8b79d86042839d0929098882a075db3aef476fab155f2e00723f3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/sv-SE/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/sv-SE/firefox-118.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "15eb734be384c56c79ac0502f2ea5529d3b0e5170097668a21ca275761b6fd07"; + sha256 = "7ad161e52d3902f6991946457b373c576bef6c8e57576a3858f22da6b4d9d961"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/szl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/szl/firefox-118.0b9.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "9b43a26ddc4524df0224c3e223a2d4c5b27bb6851a6ae3999923cd9a4cff8cd2"; + sha256 = "6ddd10980890a1d718fc11dc884080573f7e0bd177dc2434c0d62bc653568315"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ta/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ta/firefox-118.0b9.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "d62f870d8de4087ea2b87568dad650b746a536f53a5bd18c4311f1a38f6d9cae"; + sha256 = "9bff70db3a4e82d1c88ac484269db863db91bdc9acbbc623d421f578df78a173"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/te/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/te/firefox-118.0b9.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "b51489576b5b6f5f06698d83488f243dba1c57cfa2d0298212daa04fb772aefb"; + sha256 = "fb56f9d843379c08a7093c83ffff1d203f6c4893280fe3a61c392ac498a717b4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/tg/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/tg/firefox-118.0b9.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "b21a78eb57e1ff5a794c9ce2f6d0a79c9f652229594c734550896ff12844a5f1"; + sha256 = "5feec8a1ba01e1201301d51a1b55b5a4e77d79511d9a701674fda4e733eb8db9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/th/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/th/firefox-118.0b9.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "7317578f86feaad2e12c3fa0264ea504f1dffd2e7bee89245262981e4cac9aa3"; + sha256 = "5dcac416794969756ea403f6ef76ba8414a43a2f3b8601c5171b12c27597585b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/tl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/tl/firefox-118.0b9.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "2196dfc037f028f948169f29d7ef986a6174dc5aadbcfacd215b5544ec9b4322"; + sha256 = "9a734be40c279c8327df76c91cb1e5c81558c06de63962d8604c4091439440cb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/tr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/tr/firefox-118.0b9.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "4bfe6c3ca0b935c5b4bd06d2ac036d30442f8a830dd491a50ec543ca9bedb207"; + sha256 = "6679603f9baffaab9b5ed34f20d41f9094a764e879d9a6c76bd45857798b4ee4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/trs/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/trs/firefox-118.0b9.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3afa72d5a94324667295b95493d017784e8296603721f69c417126be3a8fdfbb"; + sha256 = "2c61bc81bee412abcd4de08287f36e3326c196513e97cce9be9cf75ec7fb5189"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/uk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/uk/firefox-118.0b9.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "36af5b04934df268eb4a081f37e1e331237c0c7c35c897371355cf1d6f026f89"; + sha256 = "3ced0aa2e9a142ee441d798a47ec9a08e3fa741cbfe9d3f124088ccd05a3d64b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/ur/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/ur/firefox-118.0b9.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "879f300baa247f8b7ea4980e50f8101dcacc7755af58bf432f5b40160095eba8"; + sha256 = "e48e0fb6d5fd25fe3cfbeec26ad1196465c77e699977adaf4d71e19fbe83ff0a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/uz/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/uz/firefox-118.0b9.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "3b0a876a11f2650357411a4f1314968ff49840a8d160160ea2d55e96ecd71733"; + sha256 = "ea0458ae76e50dddd4bb5966846e5cfcabfb2d4cc8884c9a00d234ecda6aef6a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/vi/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/vi/firefox-118.0b9.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "926af924d94fd15993a6c8560121d25ce849ff0960041f6f096f35a9f270f9a7"; + sha256 = "7f67f1a6fd898710900a1b9e1bcd04aa8730249257472265766c5424a1865607"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/xh/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/xh/firefox-118.0b9.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "e3a07b3739083c6f038650f5190c9c17b40ed72fed1a06f63fb4620ed7761bbd"; + sha256 = "5db4ee24e2c2646b7b61e8a453953558e84ff59c51cd70d5937ae3e114d3d8d2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/zh-CN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/zh-CN/firefox-118.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "ddc9b1e9a1feb0a1ae1c78ee03caa99bb5a87490b3fe412307a7a35a8a45f712"; + sha256 = "632595f56ec4cfc803ae94e98f7961823f496553038261800d9d89a344039788"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-x86_64/zh-TW/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-x86_64/zh-TW/firefox-118.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "c8cfa47cb882d4f54f8db09fe056f0e705746c6dc7cb1c30200995b71a28cf25"; + sha256 = "f3ba20b6488df608275882b037de062efe5a69290e1ecd96536caaea0477c871"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ach/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ach/firefox-118.0b9.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "d411dd4cce5a702868bfe7468c46f427c01eedf633d62a1542fe3ca2d06463e2"; + sha256 = "e53aca0cdb3d26a83047e5af4f3d522fa5b7dd3ac6352ac19a0de638d7ba0bd5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/af/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/af/firefox-118.0b9.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "d786873bad30fdc423b506d6581336ff3c9854158f8acb1c3fbc322e9d115e26"; + sha256 = "39f804678212819ff35bfa34ef6c06eebf10c033d72f2cbd272a95d7c05e74ba"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/an/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/an/firefox-118.0b9.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "6fd981d7e5ef3112940dd4f984b8ab84edc9ed72d72b057d8f933a77dd093a22"; + sha256 = "ab1d0ff00c249ca13f2f2404f580604c00b1cddba1190d07c3daac2ca11e747e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ar/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ar/firefox-118.0b9.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "ae2faf4344ae5f2f363126299fff17ee76b1f88a9592a072ba73107b116ca925"; + sha256 = "a9e20580dad651b5f5516d6c62636a25a2d3b5d18152c6fa3e6a139cb68eb8e6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ast/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ast/firefox-118.0b9.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "82d0b00c6ca5b7790a539686d8cb9c866b67db28d975d0f44b31c55e1e818193"; + sha256 = "234c6a23011440288f389287c048552df3e2757e38b3aa3b4a8eef2d65d13cd0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/az/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/az/firefox-118.0b9.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "7b58c2ffa66572dd037a6323938de32a5b75cb32e94f7a4eef536d3731f3ffef"; + sha256 = "c4e8561139014ea6d1a633858c2dc0c503c919634ec435895a87ec53794b9931"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/be/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/be/firefox-118.0b9.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "31cd031897af7a01b934ac7edbcd6893f223ffdaa29b72e91bf686928c7d46ac"; + sha256 = "972ff1a80a47ff5e743d09b96a8baad7a12742a554d10503880b0f4cf887d033"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/bg/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/bg/firefox-118.0b9.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "e515f32360645cfe094c1494b00608f5a12a916271825afbede760354a590389"; + sha256 = "782e776efead868840d137e524b66811db8942354cb690d062c5d2fac19fc20a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/bn/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/bn/firefox-118.0b9.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "f00831ad05d8911ea3d21a977eff4636c253e66971dc8669fc1349e5ef754ac7"; + sha256 = "d30f3ef788be926fb4e89ae167fda01351ca7643ab2b0870edce061ec731cec2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/br/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/br/firefox-118.0b9.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "9c8d76f1f7bb0a0a6ba04b8c42677d4bf640f4fe5d38dfeed6cb035cdb36de46"; + sha256 = "3c9ea3db020b08495449df487711b98601e39cd983a2f0e3f7661371654ce7fe"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/bs/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/bs/firefox-118.0b9.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "fb1f353d0ffbb9c99d5f35e094c24f5736bfe9459566ecd767645c74d0d1bb11"; + sha256 = "8ec9d497c5c1aa8032bfd6eb3b4619716935d67d4054363d1b14f5dac5da832c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ca-valencia/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ca-valencia/firefox-118.0b9.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "0b0127d2dbadc7f917b55afd12cd9789ae7fb106a09d2dcb5ac58aa08bfe2468"; + sha256 = "ab80b0b8cd657917135b7d44b0033daab60827bec9e65661fb9e9a02d4e4225d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ca/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ca/firefox-118.0b9.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "fa7a1e8136c84966b9dd6c16632a354f4b7c8abe69a392f20b9b10dcc54769f9"; + sha256 = "0f5517aa454bf7307ebb2015375f96f56f59e9c24cf7f9735cb6c7619aade466"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/cak/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/cak/firefox-118.0b9.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "33a31b7806e74d4446a2427eb36f07c79771555f630232f1ce461e47d573c8a7"; + sha256 = "f18dc8b6977293f6a82246f34d455567b857edb937fae5109754e780c1991407"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/cs/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/cs/firefox-118.0b9.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "aab3fd8b4af6a5c5241ba7f93b2968b7eebf01081dd1624b10b9d85e2c7d8bed"; + sha256 = "ff20177ebf601903556239f6a2b4414f9f209912f0f6bbf7320e63a09b8c31f6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/cy/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/cy/firefox-118.0b9.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "2c861b38ed625da782cbfda073ba07e7f1f0fd769365ff4bc7e700f2e3bae80b"; + sha256 = "6afb79342ddb53e568598e0dea754e67135ce3cc1eb3f7f4cc5c8f9269218933"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/da/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/da/firefox-118.0b9.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "a741b50e639c95cd036a3f21661d76e8f2fe5834b4299a983d941e45bf997bb1"; + sha256 = "2d56583c30fab008ff132164af35f43d9578bfc1b13e6fa17cd0954e1a480844"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/de/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/de/firefox-118.0b9.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "990934a27097cd590dc01938c76286d45f4f4bfa1d3db4b0adc68964d3ce7e2c"; + sha256 = "6f7f12168bfabe787d36a8ec4d7d5f05c5679543e2f909ae4f4fd0c311ef7c66"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/dsb/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/dsb/firefox-118.0b9.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "6c99d7f0d2f304f887c9fabef713b506615132ee6bfc8c9a7bab21d76c8c304a"; + sha256 = "abcd8efd958fb4cd07d7b6f163851630fccff3abf2e0cbe40430e48ef9c3df2d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/el/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/el/firefox-118.0b9.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "67050027147c8415849d7d962609711e01fccd8470ec909fb1ca0242e7427674"; + sha256 = "f5f2ff34cdfd9cabefd3f068d8086db804b045b242ebea4ad416510e031551e9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/en-CA/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/en-CA/firefox-118.0b9.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "dddbec23c2eeee997b7fd34b96da015b62d1af6a7bc5c815944d21c1fdcc2ae7"; + sha256 = "1645f59cc9db80ed34dbb45c5e1ff9b270160c38b50548b34b580c7e68f45497"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/en-GB/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/en-GB/firefox-118.0b9.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "05120716f45936ab2bd8ced130f66c8350f8d799f33883645eb45011ec92741a"; + sha256 = "5c5b1872e5965fb6c7c52e70af233d1cb39b6b9845129ed6bed19f5a716f69c9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/en-US/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/en-US/firefox-118.0b9.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "93c68950808dfcf21a252d923cad1a0f877995d7b2f54f4563be735bbba627b3"; + sha256 = "a7b405ad4f8d60519efc6f5433318f2f4cac6a898300dd9e06ec9a38a00e7d9f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/eo/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/eo/firefox-118.0b9.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "e36a6dd3a3c9df62aa252141e1cd0af3baa7256ac720b26546bc221feef4d399"; + sha256 = "f88898bf1efcdce421e7f8ab0389ee257d588b7a93362f685cebdf24f2e460b7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/es-AR/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/es-AR/firefox-118.0b9.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "92d3b5e2fbf140439890505a12da03a727de14490553b6aae53dbb5191f5c244"; + sha256 = "50dbdd2d36387e51bf7534a4e661c4b62381ceb2a727e35e2a88bda96679209f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/es-CL/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/es-CL/firefox-118.0b9.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "32b57533484707d84ec85ecd0d4402de0567354c642f0644fb4ac28ececaebd8"; + sha256 = "8796f21f065495a93f853133a208acd2aa91d58e2c9029fb1f8262ed1ee09014"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/es-ES/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/es-ES/firefox-118.0b9.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "54063c5a38f05900314edc1a28e6027a3390be4e7ff0fd5309921510e1109204"; + sha256 = "a551586853ad5923ca09e7d77b69b220779dca77c36e37f5176a4393c65a0032"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/es-MX/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/es-MX/firefox-118.0b9.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "68b018798a31fe7b9b517e3e9defc0b3e044943453abb2349f2f34e0cb0c15fb"; + sha256 = "f7a442484fd8396d7480f2f1b719deac03bac92bd7bfa23692e6590dc6db7cf9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/et/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/et/firefox-118.0b9.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "417571e9a48ed57a07cc900a783e6e5cb8cf60cdbdf87a5ac207f89691f9769b"; + sha256 = "0eb1aad68e73481e6dd4948c3d691aba69d698a9819f4eba8e7e7dfbe9c436ae"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/eu/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/eu/firefox-118.0b9.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "1e819724f54f222080d9e2992bddde4acac7a0d170d51782a74b0aeff7277494"; + sha256 = "b19858b2e0654bc88489cce8a10e6ed31f701ef8aa515390d8c5865315bd81f7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/fa/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/fa/firefox-118.0b9.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "0309a793dea404e71cda07efbf2b9187ae9bf2eb26221e122260a062626bc2fa"; + sha256 = "292424afc766be9006b594ce777cf5f710a445c38410350aabe3e7bb4ce7bca1"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ff/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ff/firefox-118.0b9.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "fd128469008d6056602697ef9b38e31d001369fce49932415532e3c76fb12100"; + sha256 = "e6e69e6d7f8bccb2f4b3d32c5b48c3b1a677a92e0792a31527543bd234169103"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/fi/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/fi/firefox-118.0b9.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "bd5cc2c03863125085bda6d0861dbad78ea31bf8124810d94362420f4d1e3dfe"; + sha256 = "02f5d399cc2e14f08ca2e323b38915aadd686eaf7d5f33a23eaeeae40b864631"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/fr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/fr/firefox-118.0b9.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "6bf2becb00e08706f1ad3f4f145a09498b1ae35bffbf0d59ccb55521f194d08b"; + sha256 = "1b587b32e2d5095907fc8d392f82973075453d9b830de5b28266eba34694d305"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/fur/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/fur/firefox-118.0b9.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "446e430f012b6ca8a98f03d13d5b53dc7daef276046881c1e9497b3709b33ef0"; + sha256 = "e9104d5c05c2728a9027f81d7709401b14d0d3f681b9c917448c5d28fe19c1d8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/fy-NL/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/fy-NL/firefox-118.0b9.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "e0c01a1437cda877328f5c874e2e4ab9d6dd65659af61bac94a8bbbd5836c6e4"; + sha256 = "0bffc1fc0b09c9b4c260e0195f1eb8ec8d0bc198598e1903262c9dbe955d91c0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ga-IE/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ga-IE/firefox-118.0b9.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "631a65cc5551ecf81a3d3f712463b7986707536ff4cb301ac2cb560c38081e5d"; + sha256 = "019b3602f776f2e56f477be73e9f68297fdc63feea906c95c20ec64f008474df"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/gd/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/gd/firefox-118.0b9.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "c4c0818a440820dce72387a20030a2aaed17355418456b698471359ac6b426b6"; + sha256 = "cd96ce395bd3f288052bfa02f13e61c2ea26daee744b255d5ce1c7542244ef7b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/gl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/gl/firefox-118.0b9.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "8ab363cd7ddd0a284081d229b2255aaa5d858e20a5fbaae16dbf8cf71282bda5"; + sha256 = "1d16b36daee3ba95477edf934f44ea52ae4f02edc554a42d6614d1d0b919d695"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/gn/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/gn/firefox-118.0b9.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "51c057a1878bc91e2fba0c6f5ed0b50b3e87deebe3a50ccd4c119b0c58cff6a9"; + sha256 = "0074d580db405791504448fc006848c7ff9530fc1895f8dd95dc69c0c06baae7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/gu-IN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/gu-IN/firefox-118.0b9.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "61168e8593d01ae12cf944ac45c9867ec7793c98003a0ebe0563825d2b087e59"; + sha256 = "86f21ca517c89fab3e1a5703cf880a1a9b79fa0bef16e810f13746e9a59ac698"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/he/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/he/firefox-118.0b9.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "7bb73e1d5f82b407275c22dbf21f2ecb79ad7b795001a6e1c1f14e2bc9c50918"; + sha256 = "704c8c1b12ca2227e4dbd89f51c9fac7a2769f7f0d81ddc11b40e2a8fa869681"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/hi-IN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/hi-IN/firefox-118.0b9.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "0f85fcea31720a4e0aa6309fc04828eba8aa87b4f30629ae540fac15d81da6d7"; + sha256 = "3a2fc246b14ee2d712e7c37e568024bf314ee1dfeef8cdb0f668acc1a9aa7ca9"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/hr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/hr/firefox-118.0b9.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "a95dc868d67fee91f1e15ab968621ccd21e6a031bf514f8524517fef817a239a"; + sha256 = "bb4b8af71da2fb4ee21c9ae79cab7c76f06cb2a2aa63dde5412f905eeda02902"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/hsb/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/hsb/firefox-118.0b9.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "d73d5b07ba38b710c10fb46e317ea38ef056a174d86391ac2be54389cea9fef5"; + sha256 = "2cfc44287cadc041419c487a2dc4809676d54703fd7526b2478f1769cf7295bf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/hu/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/hu/firefox-118.0b9.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "161bc7fd3e133cd5ec67448eff91c5ced82af88248cae62253245dceed77858d"; + sha256 = "3ce46f795d287ec4a8dba73dc3f154fbdbf49e36458bf8f44b8fa889ee8e9f25"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/hy-AM/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/hy-AM/firefox-118.0b9.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "b8814ff41601b8caa937ae9bc097da03b315bee15abc3d72ea3bc95469853e17"; + sha256 = "b5d4b2bf65501a2a062d6d33cb8ec79fa3b1ea96d3dee8276fcfe90466b75f9f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ia/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ia/firefox-118.0b9.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "8c149dedbe3c958389f2587e248c29876862aa694c6d3d6250fdf6be2e74097d"; + sha256 = "57a39b1ee524b64b3fc02bd6022b18b9ccb78c188b6a00c175a9591a9f34cb4c"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/id/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/id/firefox-118.0b9.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c220ad070a631ebc3418669e0b488e250c72a49bddde03c6f0d9df73de4ebebe"; + sha256 = "0e21bec921bca716fac98ac7372bbd0f4e08730038527dd1a3f8d2368649affb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/is/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/is/firefox-118.0b9.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "cba9ad177caf1da9a6713f81daa66507ea855c3f2d03d72c39a810edfffd538a"; + sha256 = "cfec6f29a76b1fdbc24fb2b62878bf219bc62d4ba49b84ac74644d32d663ff40"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/it/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/it/firefox-118.0b9.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "537be1852a91e5596567f0b8ad21547c2099a6dcf73782cc71ee7bc138fb7741"; + sha256 = "8de32508ec96dfb9aeee42b3ddf165d39347af836328dd327fc085ab63ab629e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ja/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ja/firefox-118.0b9.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "7184c38e887b2893078a30ad242f49a1737c11184fc45d25427baad5c05f60b3"; + sha256 = "da471e323d0788b4f9469064231c1a30121e0c372109b4ceefb293f360837c1d"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ka/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ka/firefox-118.0b9.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "cc072c919d3d3401828d57e34f393aa47110dc207a3c42dd0ab60c9173ff35e5"; + sha256 = "48f04b5e1e955ba528e4d31e51dd407e115ccf83da381f22ab6f592232fb1ffd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/kab/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/kab/firefox-118.0b9.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "ef2e248ec97667f45148624ba926827a12ac0e5b1381a9ad0c1fb3ada71627f3"; + sha256 = "23e6959f1f8c5de089ea4dcccbe366d383eff584dd1b5a76ff5c27e58626ea9f"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/kk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/kk/firefox-118.0b9.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "3ac6a2e5e5670396d94f5e5ba22a44165fea2cae55e3724159002869aa713da0"; + sha256 = "d999fa29de25472206bc07d6696e60c6c43d214427cd98bf8a1bb07a063fa550"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/km/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/km/firefox-118.0b9.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "cfd1497a2900aae71f2be4042ee98f5bb8cb9d95548851efe9d70f0655274d7e"; + sha256 = "f8d483c51e862cbc5b79672224fc534adad16875bca2ca2b3cbf56a43acc9114"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/kn/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/kn/firefox-118.0b9.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "8e35b3d4f63b7c86787f8818403f59176ed71dcf19925cfc8462cbbff5d21ee6"; + sha256 = "23c8e223d4285020c2eedbff9a21259c3363b4e36491f628e83b182cf2d359d0"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ko/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ko/firefox-118.0b9.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "a90dca409d744f0f89ba66fd688ba6743fb67b6e9f8274091b40f53b44e06d4c"; + sha256 = "452de5fd6c913659f988ea8e8b8ca10fa3e8738bab9d26bb0452bdbcb56dd81e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/lij/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/lij/firefox-118.0b9.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "546792fab19da50e494a42a0e741e11a36140573b31f132e8dbaaa461bc75973"; + sha256 = "71007a608ebfb0f2937e149123ae1204ceef85d8a129b57d1b89f6cdaacdc7e7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/lt/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/lt/firefox-118.0b9.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "4e45247f439f3c97915b6d8693c39ac210638d7091bcd1bc5e8045ad4439db97"; + sha256 = "5f82e611188581d38c8db1d03a253ab10c3e4805451276e4714635d0fd509fdc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/lv/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/lv/firefox-118.0b9.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "d8849a63c242c064ec82b21993ddfeebb3f3db2f5e3d087772fe8b05562d56fb"; + sha256 = "f7df8dbad4c91aa2d5c402487bc8a266ccd3477b44fc58f860f509aac9e0d78b"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/mk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/mk/firefox-118.0b9.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "d9b8a70413397a10cc0abd6e8b4417e408fcb1bac9099dc95b513bbd82fd08c4"; + sha256 = "ab8b6a5f9ef8bced0591968dc123c89bee4d9a7be29e0387255cb716a460c491"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/mr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/mr/firefox-118.0b9.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "c65b08a0e49cb805e81fb2db302c4a838b2d48a91ed525a58fa9238efcc28426"; + sha256 = "74d9e514e9f6086b30a843b11cd02e872c5d10bb9e991d2e00e67581bd2ca0c7"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ms/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ms/firefox-118.0b9.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "f39b0dffb1a82d40ebcf6f8af43acce04d4f095fa8ba141f12268337653c5208"; + sha256 = "515d770951d7b112be8980b5482b3cac9c1f6b085c6c67056d6310334313a17e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/my/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/my/firefox-118.0b9.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "8a2e90894cea13c53aa6648c60d4353f3c9382d23d2d0a3f830b5e39e6da0218"; + sha256 = "70bc3a89af01cb7fe91a3c8d3e2b51ee8711f205399d829fba0c5f67bdb13259"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/nb-NO/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/nb-NO/firefox-118.0b9.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "8741f3e6e266843da63cbdba6d885837f68f4df50d0754877554f2d993eaa143"; + sha256 = "0d7497ce372be43951963a7708e580476ad9606bd577cfd6b84613ac16ff1ad6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ne-NP/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ne-NP/firefox-118.0b9.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "609d50347e15f6b4e81ba61701b818505737de916093a0ce0084492a2f02d3ad"; + sha256 = "c3ed492f8a4fdfa5c6765003c07654da9d9efeabaaca15f67c84518ba10d04fd"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/nl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/nl/firefox-118.0b9.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "116d00aeafcc49fa14364a5f8dbbb7e289720be0b9f4df8c1eff437f10e28239"; + sha256 = "24077f05377cfbc11521c88f96d81f344b1d83a6dab4103fb2ef0acbe684f2eb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/nn-NO/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/nn-NO/firefox-118.0b9.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a3a48c1bde0cd164002901ceefc4b333d000f65ab49f49818860f9db6476a6c6"; + sha256 = "eabc24681261270677c622be6f4feb412e889fee7e7909e7b1c213f2b5d5f074"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/oc/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/oc/firefox-118.0b9.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "bf9cc26d2a539b65a634be0228e11aee28c9f7f304bcfd57f45f1ee445468c20"; + sha256 = "84249450442b0784f5c1d9ef80148733697fa76a7b7cbd6fff826b17cd587d34"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/pa-IN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/pa-IN/firefox-118.0b9.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "8c8c6bc0110f8c2d316bbf7f34374afeeb774c895773d53285de059ffc9b0258"; + sha256 = "a9a4d9d541a875fcbdf641520f78cbd6a7e195499b860c2b90a24151777af518"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/pl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/pl/firefox-118.0b9.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "8f25f5d420cd4bc5e900fa377696e781619e76bc5b7e2953a2947eb94a75a52a"; + sha256 = "f25078cfc1564938d322dfcf4caa7d53aba151779441058b8d0eac9c24cf36b8"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/pt-BR/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/pt-BR/firefox-118.0b9.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "311cba231371248853349d69c5013ba7758bf894fea12837f5a3a8e77e9b1bf8"; + sha256 = "c257c77acbfacd8d6e665510ebd819d04af274794f7c4279d7a5ae5376548740"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/pt-PT/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/pt-PT/firefox-118.0b9.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "c414d6a806377f5db39b1988d836e2345bfc221c3d244859922c1d4023e780c8"; + sha256 = "8a95dc319c5dd036ba1ed46c51306c2d72e1183b8b9495d2a7a04f2160037262"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/rm/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/rm/firefox-118.0b9.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3dd5da7607276a1b83fb0c1806fd863e7689382b9659b343bbf2b29a3025c1fa"; + sha256 = "213173775951d23ba7ca90d4f5f0e972970f5e70a94797dcfb3a4c431ddb3461"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ro/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ro/firefox-118.0b9.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "1100dd252d13146d1a2f94b805042f72c3b960fc4641df4967df5ca2dcbe4660"; + sha256 = "fd8149548cc99a603565406e0bf18af072406587b8c99a2791e9794db45b37be"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ru/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ru/firefox-118.0b9.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f95a1de532dad35c2f44cf6a1a21edde2d4720359d8998232c146ed61edc83f9"; + sha256 = "ad6ede7fa8d2492dc282672e1fe650e480282f0383e5bf972fa3079d032e7fd4"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/sc/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/sc/firefox-118.0b9.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "9b05809411f85ecc97181a0bdb6ee09893c9eb826636efd1037ddb56e4b5ec02"; + sha256 = "4165fa28ec0395c4c73440d6ac5ccf507fd59170eb69c56d73c58cb194a18b8e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/sco/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/sco/firefox-118.0b9.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "79de8599410868f2b49b266a6391aa2f1d850f6ce07c1a457eaf223f73f2483f"; + sha256 = "0d6b08f75cfcad251ecc4e5057ff6ea36e889607e4073b593e11099ab060e6ad"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/si/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/si/firefox-118.0b9.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "fb9b35a62c7be6e23b485e3cf19a2a82d9cc9b5978df494062ac229e3984df61"; + sha256 = "f13f8fed792e28048d2069fc70373811c520bf21db0404e3a24245f4fc8308db"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/sk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/sk/firefox-118.0b9.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "98756a1606095822517ac859deb7445e233eb4a8eba8e22945a342ffb8cc7abb"; + sha256 = "b4cc004d195f2afd25fc4adffd322a6e969533ec80b4ddaae51f05334968f40e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/sl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/sl/firefox-118.0b9.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "6dd6d7d3efc832a9fec1698ce6387297a402fc626319e2a72260917e437d4efa"; + sha256 = "4d67c69958e4582af0b94dcf9e2c31d83bebae6fa5b0b8679d51ac6c43d7c795"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/son/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/son/firefox-118.0b9.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "5283f5c53f26401a921b0554a28b62818fb3cb6c6227350099caf9f2063258b5"; + sha256 = "bf2485df2689593243794df95d676a6fcdfb9f1d4ce364c84ba9f101b2264eea"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/sq/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/sq/firefox-118.0b9.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "ec881eb32eee79311ef7d82cd1769955e4d47c733e41d29f4a9eda7ada06c26b"; + sha256 = "33bf4a96adb0535524c4e9283d54c9b811eab476562cd56f699ab6ff0579ec0e"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/sr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/sr/firefox-118.0b9.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "69d8bd816a7a1e6c5655ad2dbd32b2a1148883c8f44bdc7c920f2ab2aeb87f8d"; + sha256 = "6730e09e523b515d81977e9d4036b04f0b90ce5523f221775cdae222b926ae0a"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/sv-SE/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/sv-SE/firefox-118.0b9.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "72a08300897cb493943805dfde08d20b95bcbc78751916e00adb4c3001d4db0e"; + sha256 = "637f7691325f447569973e2a9beaa6be4b2dab8bf5b6422e90a158edff00ee92"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/szl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/szl/firefox-118.0b9.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "5a7aa7e98426007860e6598e5b371291bab9bfa1335ca72c617d8a2c461ccf7a"; + sha256 = "a23fc0c34fdf64176dca5f8b23a9a381f71dbae2d8573a0d286f39a61deb94cf"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ta/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ta/firefox-118.0b9.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "09f930b46704e1d862a0a7a7a6f7c63b3331aad448da5b122c6d63cc8d118e21"; + sha256 = "065602a04ff6d4fde955dac629f8495c3b4a7dbe5a05fd2b75b00095ad88f438"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/te/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/te/firefox-118.0b9.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "76fa6b1ecb83360394da3f080aee664c7f4213e2f7eaacc878b959d242d21e48"; + sha256 = "ddff23965ef7bf5430d79a6e9d0c83f420ba7967b4b92729724b74632cb51992"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/tg/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/tg/firefox-118.0b9.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "364627d0ca91937715edc4988d8c27e4dce20c8553e3a44abaa9d768f89d0426"; + sha256 = "377906226c488a24a229aedcdd75d128a413e0b6ca70215507b306ecbe2c93d5"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/th/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/th/firefox-118.0b9.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "74d5562c865b0e8a5bf440be02cfd8188f66364979479daafb54e4831cac72e5"; + sha256 = "9bc4881b5994d938dfda2574b8209f683896aa99d09231163f2500057047c2e3"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/tl/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/tl/firefox-118.0b9.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "b043ee7a54be66e768c082fad308d1de5c5874c292b25e995eba950d0d4c1fe5"; + sha256 = "5173d2b13807be2303ea11e5d32d1c504bc81b8c8db7c74de9f4388ef67f9d53"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/tr/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/tr/firefox-118.0b9.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "80963bc5abbb4636c49523e7dd672f0c51d09774365d52725267d2304174a04a"; + sha256 = "c12a8c580fc75e6827ee94b30f50b66478fa672eb6821f2280589f5afd3c7cd6"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/trs/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/trs/firefox-118.0b9.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "111d4c03145ea20da1f1d0ca4efd9191b26162e74b05ceef44f4cf169cdb07f6"; + sha256 = "f3a63164cb755674c63fe76c86bd7edb075dabacbbb078a96ce2afa36dcaf1dc"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/uk/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/uk/firefox-118.0b9.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "9eec67a8023816ba052204e1271698576c5cef3f8a6ab8c5bfae359f92f45b08"; + sha256 = "f815ef8bcc95eeb3f5ebc7fe7a92406f8f9499b8a691ca07ae69e4fef6a4a051"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/ur/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/ur/firefox-118.0b9.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "287d3f83ecf740c143e6d473dc0f16fd70f39b293c03ab43a1ac5bae2b5d8cb1"; + sha256 = "21665a39565e990ebdd369c88a684b247ccd5a2ff7268d9827c4cced5a1d44cb"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/uz/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/uz/firefox-118.0b9.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "1187f50b549451140aa9831b8f152c552e6a6024634f3d91816f29fb3b01c953"; + sha256 = "e3527a83c2ef6f7fce248bd3eac7a71b53c95e6531ba66ce16d0886de6b52769"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/vi/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/vi/firefox-118.0b9.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "5f65a5d6ebb013941e40b66e353da7fa7714937b260165893c49e353a5a5431c"; + sha256 = "6535325b6f1182f0a67039f5c9ace2f1db8d5cae69ea03868828d75dacdc2df2"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/xh/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/xh/firefox-118.0b9.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "2f41986351c886fc47305743d6b89fdc31d80da17a10b827572b73a5da39ba91"; + sha256 = "8e7d67535c19f672b42195327f85737cae24edf5dd96c2b474028b43860b3a34"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/zh-CN/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/zh-CN/firefox-118.0b9.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "36e350b60a34a8a727d739e5a1cfaed9881530544eadcf5b4dc1bd9ec28e25de"; + sha256 = "24bddfdda2c7eeeaa1d66783cd4fe0b7b47b99d01250a1f6203f5049142be911"; } - { url = "https://archive.mozilla.org/pub/devedition/releases/117.0b9/linux-i686/zh-TW/firefox-117.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/118.0b9/linux-i686/zh-TW/firefox-118.0b9.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "886872206dd40b418eefaf2e2613bbef93e920dbe380322ef6d2500dbd98088f"; + sha256 = "6fbd5d7bd31ac65cfe88e393cdab0ddab6d50c9f9e3718971bb16debf04bd10e"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 1f9572659c..249207f4bf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,1015 +1,1015 @@ { - version = "116.0.3"; + version = "118.0.1"; sources = [ - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ach/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ach/firefox-118.0.1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "e58bf494734c79dac12730e55aaef1c7e7f6c104df71df2f7fd035a6b8e34636"; + sha256 = "57ca2dfedca8ae33cd24c6bf63a747a75f931484dbd22104309d8aec9d655922"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/af/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/af/firefox-118.0.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "64d53abc20409a0733080200b8f2d730436c0f52e317011be0e7243592b9cf15"; + sha256 = "3a67ded092941d1d1d5277bb116e29a6ced5cd7a68ba1c0ccdcb0c053a720f4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/an/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/an/firefox-118.0.1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "ee95034b23fce88a91abd3fe8166b86bafeecbbd89f6fbd7061dfb4f81189951"; + sha256 = "92c26a519176f860af4cedf257bf48324c2f472036366bcdde837f054583ac4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ar/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ar/firefox-118.0.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "b8afc14f06bbd0a939a365010ee284feacfabf8b6dacedca6637950a23dbae1b"; + sha256 = "d7233b314b69bebac80d84a9869eac18fa2f060395815ea8e9fa60c8f7c2cc2e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ast/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ast/firefox-118.0.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "1b39d5239d9313ec0f59e8776df0a71f4cb75fa2c9c1b1f5f9163bcee1aebdb2"; + sha256 = "02d730fcfaa62ab22b070fef1e71fc002fdec6af7cb3d78d4f0f8434706e4a16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/az/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/az/firefox-118.0.1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "0039b81aecd8f2c6e5f73d4d674a61e23040237d329308894e620caa5ecbdc59"; + sha256 = "a6f708dffe6cd42bdc4eaace5e3d602c5817e93e42dfc7d69ed69938670f5343"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/be/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/be/firefox-118.0.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "43151b69ea0a17f1e00b94e520928cb4a8bdadb8104295752c984ea4ef195c22"; + sha256 = "d4f861f6c782b19237c0c1aa9282506b9cd07fdb71a019721cc8e14f01d65351"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/bg/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/bg/firefox-118.0.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "65a17e0f84c423882dfa8be984bb0ef887880fb864141ab5d3268f0b1ce8abf7"; + sha256 = "38cf1ffba2c1247fece1b2da997c8cab9f38d94b825ea3aa08d518fc898c0c7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/bn/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/bn/firefox-118.0.1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "a48c0b931b39506b6c50a20a641a03eed6c0dfffbb37324e97a71ff46c81e934"; + sha256 = "614632a639969e25426a8243f1f93050882796b830459c165e7c31daa8baac05"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/br/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/br/firefox-118.0.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "e14ca09ac70d627557a811948ff843d91df0389dd0b90d2d6a36705f7aaf9706"; + sha256 = "eabda4fb0d8e8278e26b3922f77a7fcce75797447e36edb7d9d065f5fdc65a2f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/bs/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/bs/firefox-118.0.1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "609fcda1c03d135334e3134c69188413deabf743b19cbfe98448669b41377cbd"; + sha256 = "e3744c0b5bbcf15734a53af39da6b281b24fa55156b0523c48a85d0366675a4c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ca-valencia/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ca-valencia/firefox-118.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "f79465efead74697d9abd06f6942d15b6e77bcb7c086005327c73d9c55533eed"; + sha256 = "86d5f1fa6a48ef3e96ea1443beaf456f25233f757d0154ec4d7e388bdc817ba1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ca/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ca/firefox-118.0.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "13103f55c4bc7db872d3fc0f266f86e8aecf18d6fcab4855ca72556c6800f5a3"; + sha256 = "b2ec3b39a96df6bbc8b43e8ea0313c1e11f3f65bdb01f79d23a653d76336b726"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/cak/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/cak/firefox-118.0.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "c033593a669526d3df2dde63f0ed66010bb93418d772471beca49db343be83af"; + sha256 = "471fdf1610fc350b1dbef05c2f31ace65242d6bd143f057aa6d721d893568d0e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/cs/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/cs/firefox-118.0.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "86260a3808095b224ac18f08be5bc5ca3a96ea43e7de9cb6589e74bbb141305a"; + sha256 = "f26a52cd29a308ca7c9b631f2132a3f29061648ed0136ac5be154cd2c486f266"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/cy/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/cy/firefox-118.0.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "ca53c0db2f1c5a1d73b7ee49f31de07b06364c020357eb553a373f30f966a221"; + sha256 = "093a242b307fa1a78eeeb7bbc849c0b9f70006b4e7515e5aea9c5dbb2a3e4857"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/da/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/da/firefox-118.0.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "c9353731d22bd8d558b7f369ce6292388719f77b4d56fb4c534f40c68424e42f"; + sha256 = "a45e5abccf85084991851851687a45f620e96b802367b2305b5b712885f6cd59"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/de/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/de/firefox-118.0.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "d6fc45534c5eff06eb19e3567d5fbcb2bd31cdead619e33370cee5da59db07a9"; + sha256 = "4cfd67a3e0067a0c61dcec66c13e9d87532cd5e509f984f6c1baa7c23e2d86be"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/dsb/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/dsb/firefox-118.0.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "5551ba6593eeefab940f2f10e651eb7cdbc11ec17d5fb9765f2b7561aef68398"; + sha256 = "f97990d46d590c158179f23df9744e0ac2d44aa3e2dc731828b9f10ad217d9c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/el/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/el/firefox-118.0.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "36f42f415e5a53158fffd044f25605da3cf5a6c02cd5e6a65d6a41911b1c5bc6"; + sha256 = "9c578f1c8434f7c0cd3918651cce62322d1a0af3f342f494fa76dcea15523082"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/en-CA/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/en-CA/firefox-118.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "98beb885d18d919fce1fbdc98722b757b92524e3bcf99c2a95173be4dc43d3f6"; + sha256 = "76f6b4d94e3bd1ccbe2c137c9899b84bf76faa00c954951f0596ac27b13c3c85"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/en-GB/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/en-GB/firefox-118.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "c4b101f51a26a1c96ee410e61567a8d325538928876c45ea35388237a7f05a27"; + sha256 = "21123779061219834522dfca02828a8fb6234944002e0ef97e2b4f733e619773"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/en-US/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/en-US/firefox-118.0.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "c13396944d1155a6884de09ff1d382c814658c69dcf23a98035d58bd77cc7c62"; + sha256 = "dfaaf6a2ff0fd4751659b797a688966907ae53bb76837b1aedc8c9c62bd641bd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/eo/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/eo/firefox-118.0.1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "4a79e9167e2d5a341111477f3dd8d9340e509169a311e4631e317f1eb569c51f"; + sha256 = "69ce9ac8c0610ce37ac7858c0b718a84e1a4a6749f5ac7ec69db4729634bb492"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/es-AR/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/es-AR/firefox-118.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "bfd9b8eccfac18de6f2879b8a7d81ddf2f7a40da4ef20dd908cb0e05a99bd241"; + sha256 = "f983c4556bb618cf5e04fe083e55480c5768381ec194c5137e4e2d7e9ba90778"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/es-CL/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/es-CL/firefox-118.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "17137f433dff6c0b09e7ebc00c8c85d643e8803502f832a0b865eeb7bf8be369"; + sha256 = "c6216ab87cc6f63289341c49a97631ed4b4ba881a828d41395186d167d3b897e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/es-ES/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/es-ES/firefox-118.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f8d38cedb7b3d3a8b83ad3bc65ec7abff366147c002808dcc7b7a4ff6f768c44"; + sha256 = "e1e6fd750066192a0014757e4845a4f1a51a75987af5ea26467ecce6e7831022"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/es-MX/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/es-MX/firefox-118.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "8030b3702276ff77b7ec6f2082940fbd2b23ddd150dca1c8bdae0b8e249a81e6"; + sha256 = "f21c46e08b67e362e999875a53d2ac7277acf9f2ec8ac2ef7f9d1abf347713e8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/et/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/et/firefox-118.0.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "341f85e4cf824eeb9eac6ea4e7fef9a80fb2a3cbae77918600e6981393ff7794"; + sha256 = "5a17f44761255c3a16eaadbdf85790775c41e75211a7520a32a6432665b28d30"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/eu/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/eu/firefox-118.0.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "4427ffdb94e8290c9632ec2e9d1757ce6293db3bc987f8f4a4cd936218f7a20a"; + sha256 = "d2f8f6180f7d4aa465df322f01a8e3ca5e61a3e51bdf58a130bc2339598a906e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/fa/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/fa/firefox-118.0.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "0cbb04eebb8c14c33229816d93c18003a96682570cb1a3e10f444d1a46d61eba"; + sha256 = "0b25641300d1adc30592814673a4c085d10581011a91b9c9ccff1db6b0175a17"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ff/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ff/firefox-118.0.1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "de5bb52c5a7c68768f893894424459193387fb3febb04f465152fd9933387e64"; + sha256 = "6433ea78711d7a034a45ce7a1ad358be8cc9bfddccab4c3ebe0e69209dd62f7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/fi/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/fi/firefox-118.0.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "e21b99490814e64852321c40841ffa97fd6ee7969d58c0c879669dc7ac32e672"; + sha256 = "d52abfff6798536bca7d83acd8fa88ca7fed22157e0276aee7fdb65278f27c55"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/fr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/fr/firefox-118.0.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ebe1525839e2dd4f3c8faba63af35cf7e302770c607012a613a96d39b7edb897"; + sha256 = "84fd988369815285286149def490876d00380c2bb2455ac674def76adac8f333"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/fur/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/fur/firefox-118.0.1.tar.bz2"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "d94fc6c51fdd2df37ae716e2c175adc4e984602c821e2c9c7dd1059ca18c057b"; + sha256 = "f6941eee1a8163d7eb48476b0da395a049f91420a94346d7b5050a192bc62faa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/fy-NL/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/fy-NL/firefox-118.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "16f03248f64bd0e91f63a49fd23dcaef9065e78f355178dbf657280d602fbe2d"; + sha256 = "6b5aed85188727af3bff5864f19493d3ea4758bba7de051392b4b5772c5eedae"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ga-IE/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ga-IE/firefox-118.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "ae6112795b46484f01125515f4d89ea36d0da934920e1376dc28c29e569a792d"; + sha256 = "b6424ab6d95c2dec1c75388c685ac6885f39ef0d0a39a5c6b1c105d60a5ea1c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/gd/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/gd/firefox-118.0.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "8bfd80f21846d1d3a822d40625c086a712adbbe68a2acca078977a8ce91357c2"; + sha256 = "44443c7128426113992bb470e67d5121a59e9ade860047b4f903f2125995b8ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/gl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/gl/firefox-118.0.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "ee846d06f20b53334a37ccfea07e65b896dfd4ef39c2389e6e6d66732fd5f393"; + sha256 = "fbc14f0cf6f02cdd0abc2dc7512b36da4151bf48df3d2d025f6ec36d226adce7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/gn/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/gn/firefox-118.0.1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "aa0082fa68756b674dfcb136d31980f01769a66c063765383aebb6f89fa5b40d"; + sha256 = "ba50704fbf51b6ed2f8289dd450c5774b0f53de8b0f1cf09055d337f662b1a68"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/gu-IN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/gu-IN/firefox-118.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "80ad4c62110f453592a1ca8c46aa819fc3775ba5507d1c075fceb5fb89ba7f28"; + sha256 = "29c8c4721305bceaa80bdd2238e41af9e59e193900641863a00b82b467e49c5b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/he/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/he/firefox-118.0.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "12bb6bd4ebcd9e482c1cc627154833a7cc22fd546bfc830f8a1bb020c2cc479b"; + sha256 = "becee2ea0ce9821518b3b18f1b593a9b2143f24438d8674e00fa3ca1a27f79d8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/hi-IN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/hi-IN/firefox-118.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "60da9024dd93fa33207b535a9075590a5a830ad89c2465105417fa66d75d4a31"; + sha256 = "162c19be9f556103d79d81e53adc930311f67d6e445125758fb5661e3e173589"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/hr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/hr/firefox-118.0.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "febfa1a724ff7417d9e1782a13cd5ced8e5247ec8dc4bf417f413cf95e8c2c80"; + sha256 = "5cd7a8a042614f6444d262837ed5793aa5e1e85a0cb1b2be266b0ed463407b90"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/hsb/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/hsb/firefox-118.0.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e89972334f9e2a4144ba60eb4058c8a5c5e6d6f508c5a636e0b8cfcdcbc894b4"; + sha256 = "e86c552bd90768e681e8fa48ae1844d094549359cd12b134588454a3db30aad1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/hu/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/hu/firefox-118.0.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "a2e8d1e678650c41a4c2a74de8a66972ace72d50433aa7e55173dc48e4b99115"; + sha256 = "d27f59da039eab219cf869ccabce2b8b6be8dd41640e542ef0d2e696c16306e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/hy-AM/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/hy-AM/firefox-118.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "6bbb140722a6ed047e3f4e6e2e39244b1a19ed77b50b30ae85e844659936f521"; + sha256 = "e267f621b61c5ca629394f48b707b20a073c3620f6afeeb086983d20d9789173"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ia/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ia/firefox-118.0.1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "09ea62dc460216553563d2c8127d4c14b2d5103d70590cca468909d744e49827"; + sha256 = "39c08d1f7b42abb776eae47fc9e468098cec626cd75dbbd90fe3031eb7900856"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/id/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/id/firefox-118.0.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "00a288b51c8bfbc1c8962ce946021181b625ee9b523be26769b9678bee8f3a7d"; + sha256 = "bb9ea3059f7f7928976fb42412c771c987113e9290a75fd5de8296d27d3e0960"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/is/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/is/firefox-118.0.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "30d148b02f8e45560ea2d54d2167f65c88582a90822019abdd5a86cbbd00bf3a"; + sha256 = "02a84fe761bae4b977cccf31b7183528ca19467db51304afb9086b92d6089a8f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/it/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/it/firefox-118.0.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "263f6f009ec6f6ac7052fa386ce730948a632d288aab0241f274f82a26ede74d"; + sha256 = "7702c2d4ada8f04199a2c777404a265f7d09dd1c95ab9092c1fe1e8f2c36ebb1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ja/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ja/firefox-118.0.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "1425e3a27867a0d071fbd79d622cd26a436f695542a2a15233722c50f60e176d"; + sha256 = "f0f2dd4ce61fcf6e893caf2c8c1b3dda14fab3b61f7742dc642bd677165f1bc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ka/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ka/firefox-118.0.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "56e9d3b0360d5ae8b72859e6947c5e31b505549566379a77c8149af99dc4a39c"; + sha256 = "9fc09ff2f780cd0ba304bda13fbf3073265a5b38655ec7e35808ab21678c74ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/kab/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/kab/firefox-118.0.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "8ca10ad4de568ddafcba08229797ff1fe063f279116e50551d62a1be433b1cfe"; + sha256 = "41a23d0e24ab6239a8cbcc87b71a0d99cbe933ec9990822c7cdfd1309ea15a29"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/kk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/kk/firefox-118.0.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "a8a6eb0946681800156ac52e528176fb46e6e02e5d05c729307b1fd570112e59"; + sha256 = "a90fd47a0dc4e5beaec45155f404ae62bfa9ce1f7bf091d82ff8597780515cfb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/km/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/km/firefox-118.0.1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "84140d4fba75fb66eb6283b20810805c73f1f2e800c5b40de045007f73a14c54"; + sha256 = "017124b2f12d9be14cfa2d71723f76302b233d1b6ebab3ae5bbd7bad84418474"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/kn/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/kn/firefox-118.0.1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "9b31cc9060ff02c505db223199f9b3ea57f06ee28cc72413b588847bb0766ecd"; + sha256 = "40d346c14b1dccc762de644cee7e85ddd8a7725aeebe6dbeb0679a11da83dd58"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ko/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ko/firefox-118.0.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "1276fc57a2236b4c1c2caf1eb7c62c029565ada0edcd26d1e5882d27060a0b1d"; + sha256 = "9048f80c9244c301f010f5b90a58f48c7b150567494b479c7815037bb8d08595"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/lij/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/lij/firefox-118.0.1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "1ff451c3181afe401a4e68eec9a4337fcf1792f5a027534349229f7b00b7c6d5"; + sha256 = "194f89e2ab1c4f9424f273898c3ba9283af5f5b38b633b1123efb8b3a071a770"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/lt/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/lt/firefox-118.0.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4e756737c4b071b17b4a8b76ecce225feb95fc88c5b7d68eedc5489e52453df0"; + sha256 = "a5425acdcf1a2ac0bb8b0226eed96341d9f276d9a4dc358003529f08e7285381"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/lv/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/lv/firefox-118.0.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "ff85d6b1d29d202d90f9fa5fbb4e72f57e312bf743e36f06e696cce59a773345"; + sha256 = "7079c544f4e3b6c3d0f7f1e89fb086581ab7919955b8a05c9ef2ef4e2ea46100"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/mk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/mk/firefox-118.0.1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "374053409274b6348734ff2f4245f2769c1deeef6095159e53b7cead6528010d"; + sha256 = "2764792958ed8eff978186a49f7fd97c0588dccba83b9a5d68c36793e1dd6c3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/mr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/mr/firefox-118.0.1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "23fe68db72deb96b79635b8a62fe3ee81284c21283a1b91a3985ea261b3403ba"; + sha256 = "c455572b46343f1749147801b74970154b76bc102214f21811883869c1b65b33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ms/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ms/firefox-118.0.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "2582c9b05944806d3f6faacc5ca456e2ee40f393f15bc0c690c4a4d92a87f0d4"; + sha256 = "000938ec1fd1804af1f4f311a690dc2f1e425a88a1c05df31779ed2a5c579186"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/my/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/my/firefox-118.0.1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "5955c546552a8d0f1d0cddc172a58c039867dab9384e4ccbe420d5c490a343be"; + sha256 = "07ef309b045af66b7f16dc2b6787e5424b41d61ac87d19a435b54004625240c5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/nb-NO/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/nb-NO/firefox-118.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "20cd48fce68468bb70594e469b7027c7cc8d808ad016e0739dc1eedb11a36a0b"; + sha256 = "c3e1513003648e39417ef6a304a30ae85281865b555506b255bcfa799366a607"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ne-NP/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ne-NP/firefox-118.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "a9e814a04fe6351189342e13ec5aa734bf015307cf70ba46747a06ab230ea151"; + sha256 = "869fb60690023383648425f79fbc9f24bfb4813dd95d176f2a4d17796bf9ee4a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/nl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/nl/firefox-118.0.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "2bf8d9dbd74525627b42549d61940947c9c40a898ef480c53db717af7304f4d9"; + sha256 = "34d9fe25f8667f904b3784aa601a0f65bb63bc22d4c7048de4063db70893b5bf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/nn-NO/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/nn-NO/firefox-118.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "5b70a33221f7d94bc11e22f7c9889ae281868d01688c170cb8689a8dc5024867"; + sha256 = "dd4c36fe148768a71c9786c29800c612aa037346f8f6c39b21dc6da7ac7029ad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/oc/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/oc/firefox-118.0.1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "716ee4c12393943b5ad549c23c9df6c0aecd87c7253286265675881b4affaf22"; + sha256 = "c2a8bcadd2602fd5c44483adfb38372125b2d386719d4943c64b82efe558bb8a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/pa-IN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/pa-IN/firefox-118.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "f8322f3035a20090f923a2057add62ac9259e876830bf47ffd5c0134b32f3724"; + sha256 = "211dc4b245d004ccc0281f4431a58df767b7d1c762d32fa24188d72f2c522808"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/pl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/pl/firefox-118.0.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "6eff160eeed40dce792c87e67c5921ee63fe0fc1d12fb1eb35a197acc4568198"; + sha256 = "13cb01ba5414bfbb669bac781f33e641a870f407d9d4f87cbbb60489594d500a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/pt-BR/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/pt-BR/firefox-118.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "9afec46bf207185475cf5a2744ef3293e62ee688c05cbe160ed0c6cda69f14ce"; + sha256 = "09f462ae3538a828cd98ac2f013b6151065fa8e38c586193b4f37f2b1d71e228"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/pt-PT/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/pt-PT/firefox-118.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "07d7eb2cd3e3520a9fd37007e8cd58a99309a9d460599243df37ebc157cb21d2"; + sha256 = "5001103a4cf5bfb31daedae4eb63dfa5a645c231c35927f7499746935c5ca7f1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/rm/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/rm/firefox-118.0.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a833c9bec47310c1f3b6138dc5535547882fd512746ca05a6237af11d00e2898"; + sha256 = "b07bcb0e7f4111197a98138d4892a420c88b7fa3df8c93e2038046078e82e424"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ro/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ro/firefox-118.0.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "c8144df46c5fde9096fbc242b6a15488bd3d869f2df9555f8730d8c0bf92de63"; + sha256 = "9e249cca7806872a0fe8abfbfda509185591211a48bc28887a669994926b3f13"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ru/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ru/firefox-118.0.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "997cce8d0d989b969c95fbdc78cc246e3c84d2c9e4f6b9aa7d2fc8d2ffde8c1d"; + sha256 = "34e8a96a4642da70170c35ff8101244c17167fc1162d4547bd142e5e2c1b6b63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/sc/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sc/firefox-118.0.1.tar.bz2"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "ac1cd2a690ef1929ec6a746c117d1637a6f1092e60afc0a9efd60875c4bff728"; + sha256 = "f46be537b47b7c119cb0635740ee8d3a0fec34e53516af78fe74e4a8b56fa94c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/sco/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sco/firefox-118.0.1.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "714428793fbf798371afcd81f0067efda933c85ef44b2ee7c53412469bbd8e02"; + sha256 = "386aa79bba02bc4717c6d9d81b0486f561532bad10600de8de2c1cd740efbc07"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/si/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/si/firefox-118.0.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "8c220b5acf88bc19da0293ef6716bcc4aa67c1254dd4c1c9e86ef06300882a29"; + sha256 = "ea5666a749f5d5ba0caffb51f4ba97b0bb0d4c22be2df71af8184d24410531c1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/sk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sk/firefox-118.0.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "7c166eb51d292b3c213579dae2818742a0b4fc0c2a7ebc8bdf0af60ab54f8e78"; + sha256 = "4cc80425dcfdbe66c1843071e24519b51350d2e9de6da372cd4b00fe801896ac"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/sl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sl/firefox-118.0.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "1c4571687ddb884c771b56a01d251ba5ce72a7d72de96d5b8c610e8e3a80be26"; + sha256 = "e0feb4fca0521816739314e42fa3583355f62dc0ba94241e49f2d63f1d41173f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/son/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/son/firefox-118.0.1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "a3b9f99a2fd51c61594bc5f8c98ae998ab1856d759062f851b513548ceab8f11"; + sha256 = "9606cade30e14db9e9f9da4d2044734c09f188634c1d81bb79babe2c7a880aaa"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/sq/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sq/firefox-118.0.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "8d90281990992c9adc3f95a2700a4b3587822dda42b8d3fd2ed1b3492ce0009b"; + sha256 = "f83ab52ef4b1bb643a8c1daf80e19ad6878fbe861e0ca251e0d4507f8c4dd9ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/sr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sr/firefox-118.0.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "886055b59aae66fbaf0a017bc81f6201908b6c084d47db1e6c7298888a4d82e5"; + sha256 = "b9649571a1e768c176af22e010433098b06e9aa3b0ad9341e91b7b9402e5367a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/sv-SE/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/sv-SE/firefox-118.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "64de716379721beeb62aa24f36474949555440eeb5f7cdbcb640379dedb28424"; + sha256 = "7bf8027353c03917d849f715c2e2d9351a2d59a05f39e0375a2671bb48a3cf7d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/szl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/szl/firefox-118.0.1.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "7151b0ad091911c5869bfd995fc0a24a7fa927f495067a56c449ce01f0b66657"; + sha256 = "cc7a90b08c7d8a1cbbae33160b4b63e5b84515642e7b78e8497128ad01189008"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ta/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ta/firefox-118.0.1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ff3ae2a53662b7c6273ca539cca826a361d028f78cb1e6a6aeed6bdff410db42"; + sha256 = "72ee4da1a596e9d44fc7428f800b834d747f82aa716b6db9a7ff6c1fca5c34ab"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/te/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/te/firefox-118.0.1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "3e51c2e834deef3b814b2e9cf6564b0ad5ad7494a2ae654f53ca60fda6a3b24b"; + sha256 = "105a24e8555d0652fb516677f7c4a414155b5710b5abe4c6d4cc4fde3c4538d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/tg/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/tg/firefox-118.0.1.tar.bz2"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "d875bf5c5f5f208de61bd111a87880db8f035b75304d70a316f9010125130434"; + sha256 = "3b20242dafa0af9367237f72805709d5d6bea96cf3743ca9372625d456f4c3fd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/th/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/th/firefox-118.0.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "6db362258ba08ddec07b7d09e2f31f1bf75ac49157c70a1b7eb789857fd97367"; + sha256 = "c5ce04d832063815557389cc1b3c6a57944890dce92b833901ab79f15c918438"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/tl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/tl/firefox-118.0.1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "539c74d8f72c987360ddc26311e78f185ea9bc44ec0a90ca1e3572708a45a976"; + sha256 = "20d7481c7f0eaa5cd080d586320d896bf711952051bc08970a6da098c823e104"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/tr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/tr/firefox-118.0.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "9d247b36f08213d24e51aa94615fefca133657934692dcc5f7cea6aed8f029be"; + sha256 = "2fa9718354408518a0c61cc4d98267934f005a25d18d0691434c0772ebe30f78"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/trs/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/trs/firefox-118.0.1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "3c5b31a23c52f893139bd73ff4f4fa0699c91906df8d2abb0553ea0e5e7cab2e"; + sha256 = "31c488d2dc2becf2c0dc25bbe1fd1ece1e0f75296138ccf9d93acf488791a50d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/uk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/uk/firefox-118.0.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "5bd8973d26a525750cff4971b6b46054ca9a457ade6514669bc8e9675c213e98"; + sha256 = "b7eb792b6b37e91d1512211ca5736ee1bf71d2860f7909d80167ca85258191b2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/ur/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/ur/firefox-118.0.1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "90d2b11e73708c76c91a7184b793f10042977b6b261f5ea8320a871b1fb53354"; + sha256 = "e7845b7621cb024b31fdb212384a21961c7f5c0d18a100116e29c061b6e244a2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/uz/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/uz/firefox-118.0.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "73eb9907a78a9c2707186d57e826f7811f5b1c3526a93bc1fa4ee35bf826ff0a"; + sha256 = "3fff96476de332de060bdb1e511bad5e70d763b38cf6373126bbe43ba239dae8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/vi/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/vi/firefox-118.0.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "0b9cb19172f2f88392159f12be799ccc336b80cfc8665582fb7f18b5a9cbf043"; + sha256 = "5a30899b084364adb01873e42901d1bd4203408c5c734603fd6d367546299ef7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/xh/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/xh/firefox-118.0.1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "506d0814ebf091aea758fd69368b009c62b12a84aa9a3fe10db2375f6164a498"; + sha256 = "d9a5240cb39855653bf90552e96cd989f77b80f79ed14e09dd3c0c748c4f2407"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/zh-CN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/zh-CN/firefox-118.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "78a5c0fa19f3aecbe976f93174cc38226b7d802a17c9a9d8f1840df3b1e4069d"; + sha256 = "64a99e44829eb0b9562770687ce8a62cf614bb5369e4b3accc5aa4792bb9bd33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-x86_64/zh-TW/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-x86_64/zh-TW/firefox-118.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "24e8b5eccb0ff2523ff2d91962fc317b32e2d920e69ab0ef10a202e8d389d11b"; + sha256 = "1962c3814753af75e9426ee7e856a2195b1a1323787f524abfb70f5cbda07839"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ach/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ach/firefox-118.0.1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "1716b85f58ce794e583ec0aac92658def4fa8d816fdaf945b28e82c0e9f3b2ba"; + sha256 = "8f013f3d8c138763e43aa855ce3785b6cb74a02a4bf81ee7b2ec1a006b0462e0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/af/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/af/firefox-118.0.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "79c30a58664355127c4905325f101d05164ccceef72d6769c7320da4815d2715"; + sha256 = "48abe09a5e89e39e1924581f3dfe5ab0953c761fe792c39e30989910da82283f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/an/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/an/firefox-118.0.1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "3496365cece2c843de7dfb4e8022f3c2070c40e2f4d5ff8dd80f6a7b954c8f3d"; + sha256 = "5e14802ef24033286e9ca77e6ca0c44895a21a8b07e89e532c7b6a4c98db6e3b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ar/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ar/firefox-118.0.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d1cb9d90529682d77547ade6c87e3a0e5fc4d470d42339e36bafdafeb6ab226c"; + sha256 = "a822c051bd2b1f14f6fc9816dddaaae73861b35fbf3539cdb2e95bf5c0c0ed16"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ast/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ast/firefox-118.0.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "eb418bc05c8e52faa29016718546aefff18f687bc650ee2deb1567c689cf4f0e"; + sha256 = "39d15f544465b816e0ef88c007dd4049fcf498d74eee2b3495db37c36b844dd5"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/az/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/az/firefox-118.0.1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "7628dccc32e102e254f2796b5a0b1c64a62f632ece86840c8a270d5371c40220"; + sha256 = "20f0043984c4ebadeab243563d8018f434e03c1e756e82cda0c3d5a2032dfd01"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/be/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/be/firefox-118.0.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "b1d25de6e9063c58e2306665a983195b234bf2bf2bd6d78abe7ef6c3f4082793"; + sha256 = "9c7e8e8682ebee619286ba137e7713bf103286a1d87f92f0caa3d510fcab90af"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/bg/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/bg/firefox-118.0.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "ff2f6404fa924a26ebe0a2e6d4857c8634b3f2aa88c0809fd3d322d41208d1d7"; + sha256 = "bcdae2edd650c1a8b02b7650638e059dbc274df564a7c0f495f0042640883fd9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/bn/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/bn/firefox-118.0.1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "dc2a96d60f04fa867082552d48670631b6d39efc49608b965e9d773a6fd95e47"; + sha256 = "3f334f3c99466ad107f4b17a3d45f7318d6a3b6bd2c1290c7da101c82abf0b8d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/br/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/br/firefox-118.0.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "a834327d9c685528b99394cd277d181e47a7020408279fb3cd684e0b35c6653f"; + sha256 = "bd2ee8ad5b0201abc50d39888b83652219c51a29b73dd2a7ce35cd682604ba3f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/bs/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/bs/firefox-118.0.1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "e29b825778112000c9c2f6496df43b62a73c810d34b5ff0213a35ef071f80a7f"; + sha256 = "fcc31e454f02e140511c02dc94d736c96ee268cadeb8582386b468bbce6c39b1"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ca-valencia/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ca-valencia/firefox-118.0.1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "d41578c118058da1affcd0b0960dec1b26791dfdaa6177dcda84a439dedb1bb8"; + sha256 = "4c5886a2be50a26c646d1c5c8e5e8d91139e967d15b8ef73b67f612cdf14b368"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ca/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ca/firefox-118.0.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "c930e97213da4e042a57f67ccd3e417a56a6df2908e92abdeb0f886f402a1b4c"; + sha256 = "be75daddc1c8e47ad47f310a287f9bb203a3bfd19558476e5c971c6169eb1866"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/cak/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/cak/firefox-118.0.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "e533c9819f8b960cb5c129375a0e1bc212da84baa883b892538610bca7ca78d0"; + sha256 = "a25e63e13074e3cfe85f496f63601a5b4ca079007548fe1642da1b40b2d8af14"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/cs/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/cs/firefox-118.0.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "bddebd7955b15b78d92a7604471bcf2b18a05f34c14b6bc9b311a340b8cfab03"; + sha256 = "b3dadc40ff303dacacf7d000eb9275667eb094a0cc77dfef738038b6ae530f63"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/cy/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/cy/firefox-118.0.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "31e3a399b5e7c8589570be5cd6458e857bc46a11ee1798b3e71fb9bb36ad9e2d"; + sha256 = "2d8f8a0374681ed9ce3da91b945cab3f77d2ce4d32b6a3449e9b9f19de64ecdd"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/da/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/da/firefox-118.0.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "3a8b81fe51b906395ad24f2c600db9ac6b914605ce17deec3cc5af5586fccdc2"; + sha256 = "166fcf5df925f70e660d9163995b1265f2323bca1c15bdd5d8fa5fb46d48a231"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/de/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/de/firefox-118.0.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "318597b61eb9f8f3291a39b0a01375b80643904270aa9d5432254e42374aac6f"; + sha256 = "0183fb7a7649c335a3df81498949439fd1011ca062ebde5110f9524d20ede65a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/dsb/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/dsb/firefox-118.0.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "405155927c3bdf2ca61db392f374009b99c9b7dd6201e923f5e9802d36d2f8f7"; + sha256 = "2073788924e4d416eb196525199fe695cf145b5d98944170994986aecef0b0ef"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/el/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/el/firefox-118.0.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "76c2c5c309d83e4d22ecb4c211b9ee4711401295020cb17fc727ce666f461478"; + sha256 = "71242455bd09e3c29df35a393387927e6a5e0012efb8a23cb9b4ef7f367cabf9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/en-CA/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/en-CA/firefox-118.0.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "47dd890bbc9797e17f0e536bc0a461e2a64737602e8f68316725247780b22ccc"; + sha256 = "d9bb5089b09df3f888424481ee0b3acc99fe35b441eac134eda2ad56645d68d7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/en-GB/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/en-GB/firefox-118.0.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "1ea21d24f20c41dc22c3ad8bbe377b98e40eae028aa0296096cc41dd63b5fa81"; + sha256 = "4ec038d3a33ae0bbd8ccf70bb61ffab50fc582b8157a4a3c4f0f700def7f9924"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/en-US/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/en-US/firefox-118.0.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "70b68ad04bbc5a36414111c6e0586a1ddf5c4d0d36d31d22ac0c0c9004e6f672"; + sha256 = "c68b22022a8ed2bb2a1857b70e4b0459a0a773b6781ed0a92921da8611ef8cf6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/eo/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/eo/firefox-118.0.1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "5cddb277d9ef304fd64ee9f4fd518b7a049cbd649cc55817b78c467aa8b21dcb"; + sha256 = "94cb22f3644cf7e1588a2b7c1142cf872cbdbb5bafd542adc87018cd61665f54"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/es-AR/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/es-AR/firefox-118.0.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "1bf6843feed997b1cf84c525c923cbf84ad2605f557c65339a9835c2b9cf7072"; + sha256 = "e4e87c33cb7fb1820fcd576f32264c8709f5a12c1e8c454afcf7768789f191f7"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/es-CL/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/es-CL/firefox-118.0.1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "883ba26892b62a4c306f222dd92f37677edc0f03762cceb08c06a96649ec6d84"; + sha256 = "93573ed0237b3e2e86118d62eb0071eb7edad2f0f77eccd311dece05612b1280"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/es-ES/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/es-ES/firefox-118.0.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "06e077bc28d0c6810c850ec5bab24ac6f4654dd1ef9d9d25c3fb546872081f9f"; + sha256 = "2468ad13eb214da8c615fe80eb2231b51a0c0dacb99913870d8906dceed180bb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/es-MX/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/es-MX/firefox-118.0.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "7ff8f849b60e377dc869fcba113315c03a221c0546424126eaa5c364c8f84091"; + sha256 = "373b189a0de60f3656d9758a6ddf84ccf7bec9a0a577bfed7f11f58faf10587f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/et/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/et/firefox-118.0.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4bb05e6a68bf719e47028dc0d55e55a114b30ded34b1e15e2e718140115bafed"; + sha256 = "9aa31367c675bb7ac1251b626f5b3965114df71798044ecae1669f70a8b1df33"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/eu/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/eu/firefox-118.0.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "9f76ed4acdd899ab7e51d90d6737f1b1067fb9a5b89d5fcee39e04a8bac1d413"; + sha256 = "831b47482c316bf5536d8bc2c14a20cdb39a1690ccb35f19d6db2a20ae99eab9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/fa/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/fa/firefox-118.0.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "23643406ad7fde9603e3315c41960f917eef1b56617260bc586ade266903e818"; + sha256 = "39e8d4c1c873519ea94ccaa2392746d69a5de78d77642b9ef0ff6a9ca3164d6b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ff/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ff/firefox-118.0.1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "ffd0c7691cb88214a6f1d5448d8d43efe19247afcdaaae91c95367a37b471959"; + sha256 = "18582691a78894fa07fd32238c4417e26e92ba1f0d9af6387215d56da0decdc3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/fi/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/fi/firefox-118.0.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "538509336e17d4284e0edf56332e1f4a377c27230fb645d3d4d30b4d4db6955b"; + sha256 = "34bcd002090c12d7976fe28f9125ee79dc1d18c1312394907fafa10cd7c9d86e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/fr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/fr/firefox-118.0.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "24c61635dd056cffe7fee91c969785eb778fed400e5bfec71eb8244eb278333f"; + sha256 = "af448808cca3fa43f2a99a0c1f40d55c1353e994510ddafb96abe7b04fab01a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/fur/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/fur/firefox-118.0.1.tar.bz2"; locale = "fur"; arch = "linux-i686"; - sha256 = "67e90c45e949ff3a5948d8ba99fac7628324a08f78c3387a119c98f3c2c93628"; + sha256 = "4986aa9c0040c8a9d90243c80730f2bc5f4ed774e684486dd142503b69ab163c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/fy-NL/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/fy-NL/firefox-118.0.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "ec378965b25afdd82946962a51eac865559f244b1fd933449b83116270da34cf"; + sha256 = "fa8668765d334bae5314aab82ff80cb6ff27eb59cf25c3cdedf27c3abc708956"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ga-IE/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ga-IE/firefox-118.0.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "1a0e6367851eb480709ba29826738f8e79d6a53a3d0aa23246d8d5eb9eab4c66"; + sha256 = "fcc26e382e7ee584d0690f32fa32bc04982b4ab37bd173ebe4a7a84878716dd8"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/gd/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/gd/firefox-118.0.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "47dcbab2195d25958a3ceffcf21a3d801587e919efbc7b9c4780d2bb72c09541"; + sha256 = "d3c3fd2fa1e40f76e8c3870be3c7a45a4674ea62ccdc66429a38e7bf1c9c657c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/gl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/gl/firefox-118.0.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "e8b89c71f7e6dcb0f3905ad7555023cb7dc418d1dfaccf874101637f727fd8fd"; + sha256 = "7569c06c1ad2bc71431aeac6cc323394f500e340321d139974ee94f076a9b90f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/gn/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/gn/firefox-118.0.1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "cdc86d864b2f73fa3fdebfcb4e90ca503a198d6dc09d4d75b88d69bdad1077f1"; + sha256 = "232fe5dd8b2a4c7510f4b470e9a0347183867045781388bf823635049dddbe4f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/gu-IN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/gu-IN/firefox-118.0.1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "b6bddada2977696674ba53dae823ea1bb8adf12c19715aa14240444c8a31b4c4"; + sha256 = "9732e6c4f7dd8a99200b3f611f69497100b5d931c849dd858bbf3be058d8f5a3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/he/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/he/firefox-118.0.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "10ef13c66e747f6fa0351a27f4ae971cd988cdb3a18c4a64392dd30630a11376"; + sha256 = "fcc77690e2944b6c3123caad0b773fb033b6e98cc006c3e116dc263245fc07df"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/hi-IN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/hi-IN/firefox-118.0.1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "0a725c407171169f4463b7d193531c42954367342dc46cf83f9e6953e73aca9f"; + sha256 = "c9ea5476e0a0590c37314cae49cd6ce7aff8f7889d2458d66b009fb158e6f52c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/hr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/hr/firefox-118.0.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "40f0f5cfe9d9d9ee8e54b55b4a00f3cc2b5a9d92d2171d641d49947fc72aa582"; + sha256 = "39f2808f62451650414d35b641223f8fc2477096f4dfb9fe62beeaa59f7cb04d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/hsb/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/hsb/firefox-118.0.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "c8ccff675194335345c40dd6a129e6989389ea9c269d55695e7640423293a59d"; + sha256 = "0b4dca99c0d1aeff5a681f87fdc9432cd28a90147a1678f13f9d9c1ac826d10e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/hu/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/hu/firefox-118.0.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "f933c78ba41be9da366bf384e49f095d88fffc7f479fdc476c72c43349e82cb1"; + sha256 = "db2e47a87ad306294580502dd823b6645bbb49f44ff26a2e5ed3a5e919db1c86"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/hy-AM/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/hy-AM/firefox-118.0.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "093c6fab65984c3e78dc786de458a96e5ff35afd3014afb6ae23a47b9a8d9fc2"; + sha256 = "fb85e7930f5a0f91946b0780926c7231eb514cd346e13e8b41268a8e17da3a3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ia/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ia/firefox-118.0.1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "df40c6134a0cfbd4886fefa9a38f0406372dac73a002cbde7e1eed8c26869731"; + sha256 = "e3eb266da530e8634209209a934f1f863440fe9b094f47567f1f5619f4c1d551"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/id/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/id/firefox-118.0.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "f2debbb1580bc0b27961aa2d783093cdb0b846be38d1f6f278cfdb7b0aabdf47"; + sha256 = "325a7d2fe7eacebbc441c78ce92acb98f5f0f3fc579b4e3db03f5959775e3467"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/is/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/is/firefox-118.0.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "0aa7d201ede9fe331ad6c3decda81f118c0ce43b8aba5a4f3c2d4cfae8f0d866"; + sha256 = "b952c6d9f62c83bbdf949a7436bd5d8d6ad77eb2dd877eb238a3c1efde041009"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/it/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/it/firefox-118.0.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "85a5bdc459f432d98c3f721bf5ef8a2d2eb910e87f2ef1ae8b154b589d5cad5d"; + sha256 = "e868200b9b8d7493348a38dd57ab10c50965951cf68ea637fa78d02e4cf70e8b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ja/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ja/firefox-118.0.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "68152a0937d64ee43287a69593da4e7c6b9a63a6a710313c6257dcb90774a975"; + sha256 = "1f366580739e430e83b406e79b662c9f63be1566defffe4bed8ed705949bbc93"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ka/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ka/firefox-118.0.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "a375ba1b8ad686883f76e0665733954bbfceda8fc74c5b6a852ab6231b8be97c"; + sha256 = "d44df6d15b7a78cf702eaeab89028961fb03b1af3fca353cb48dab8efea8ae2c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/kab/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/kab/firefox-118.0.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2288ee68797a59c3fdbe980ce25ba3a9e2d2aeffcc594d29ee2aeb5e61fa98e1"; + sha256 = "fe7ca11b6fa0069d18ea3d9e273e90ad736155384c6ad64cc2e99edecc802744"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/kk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/kk/firefox-118.0.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b3752f1d962cc4366134302fc3d38a36c88a107e4e1f316e9fdb22358b7178c2"; + sha256 = "570daa49f4283ac79093e3bc3dcbc31b3d23e38cb3024c43899a51e8892054cb"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/km/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/km/firefox-118.0.1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "e50ba73fa70c144ce4fadcc09c8f1deff13523fe98aeb7985f9e1b693931741d"; + sha256 = "e5ebe59f44d4ba25053796f4fb3ee434123ce828dc2f2615fac72a5df8815e5a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/kn/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/kn/firefox-118.0.1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "dc622a60679c73d729323ad14467bbc4a5ae2872321f9098b24587b07afcabbb"; + sha256 = "aa57e50d7f6906073b7fc3c4a0ce7d416b677d5f7b60c56cbdab3e3b319fabbe"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ko/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ko/firefox-118.0.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "777b4fc7f149b30bbefe1348ded1fde3f3abf7006f36f66cd0fdbca4ba49e13d"; + sha256 = "78c530bc3848ce345dad35e01e1e6d8b13bc0eb1b9194a8feee25bbffb70e709"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/lij/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/lij/firefox-118.0.1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "c8a816cdabeed2aec0e8611c0b27a23cf1f9b6d75cc72137c606db4823db0f9f"; + sha256 = "a6e1fa50349dd5892382b75dc78405d71eb452ba01d919b76c9deb962e5f6e71"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/lt/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/lt/firefox-118.0.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "768e9009b1a088540b28c016ec0a98efd681357db8b6c55653d2eac68b546c3e"; + sha256 = "cf488c96d2ecc211d08cfd7f83def294133c115947290ad4ce7664710f7c0d0f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/lv/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/lv/firefox-118.0.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "cf7c32044bc214b5a07735bd9af22a5693cd311536869684ffc93de0eb2cc596"; + sha256 = "82a9003b38a850a8866a28bafa5ffb7c189b9115cd1feb31b4131d3b69c68b6e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/mk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/mk/firefox-118.0.1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "ab349c928f21107b4256bc5650a19db1c08244849e6a0902a27b27407b287147"; + sha256 = "85f78f5e64f6ac47652fd09cee351c283f2b310b03aa17d40c622bbb3c005f13"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/mr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/mr/firefox-118.0.1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "94d74b8f8f8f0a48ff30a3f13b8179f79784efbb2283a1bfcb56fbfe810ea884"; + sha256 = "75dc12353acd76365b6eef4979b4de8ff586ac81b1fc15b9cd88993d9001b654"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ms/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ms/firefox-118.0.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "dc20619cc0b12d167dc1d7924f9bb923f72483b7f44aa44a026c716bc654768f"; + sha256 = "9380131172dc52cef4babe594d86363f07bfa6efc2d0279c881119ec69a3a956"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/my/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/my/firefox-118.0.1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "b60182878cefc18ef9e937c0e690fb942c873cdf5c2e410f4f0487d0c9f7c596"; + sha256 = "57c7fb3f591ac957c5a6b656e7cb9d113090d67d102a97f3b977dacbd1cb7e8e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/nb-NO/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/nb-NO/firefox-118.0.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "9b72cdb536ef36683d8be285ab970cf96124fd369a39ca8f6209ffd15317b175"; + sha256 = "81814477be0bf7761b4b6f6d14f9083be1f96fa2bfab4a82b223abf5bbea037e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ne-NP/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ne-NP/firefox-118.0.1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "06896b53b1eef92357be9be896934808e377839416068b8c3258cbc10f6955a6"; + sha256 = "4f0a13a980f44823dbce017fd1a6e2b75171206f3bfb2018ef90583fd8b723d9"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/nl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/nl/firefox-118.0.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "a49598230dc30ced33343a1a51cfb6caa96f2441baebd4918947c860b64533b8"; + sha256 = "bd99d32238c48febb7b2a5e557371111f7d1fd879a481d383a4e4b99d8011aa2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/nn-NO/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/nn-NO/firefox-118.0.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "c1b0cb8a0185ad67cffb3ebdffb34ea8e31b4a0aaedb904147793f95c3151bde"; + sha256 = "fa588b2c34eda24f89651eeb65ab646daab0b9ac846ef66d04abcb84d62a2b55"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/oc/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/oc/firefox-118.0.1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "ec8672ce9092a3860ec6a9375b8a086265bc950218521f59ac6e651e611e5479"; + sha256 = "ab378a1241ef3d634bbabca453de5c7ae7240ffdb79e8cd9a36ca84d1dcb4eda"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/pa-IN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/pa-IN/firefox-118.0.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f545b75f5ace74c981a87708194a8defe586c143b16c21f2877e4ae610e4f6b7"; + sha256 = "aea29e94e88ac16e98d5c1c4f8eadf56ba41f5c5e2d6a7640840c69c84423535"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/pl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/pl/firefox-118.0.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "69b2d74f391fcc7aa7dde9f39d79aabc3414430dc6be84497ff29c0f256734ef"; + sha256 = "4a66ec55133f59d612bd8a739dd00ca4e6d5d121aad4e27d65f607b63a3a084e"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/pt-BR/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/pt-BR/firefox-118.0.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "3f029dbd254e889bced0650826c92bd061371a04e830b7681e3e19b7856a5e6f"; + sha256 = "3f3c8ac821c6c10eec513a997f3267f4816ade2dd14f33cf27b31f48d996e452"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/pt-PT/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/pt-PT/firefox-118.0.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "1c09ea0a6b914cb0f0e67331bf171cf630ae9ce085afdfa824860a7ede278ed8"; + sha256 = "be5c2da69f95466931ac1b796d7a40e7e5fe8c4c38f082053cdebf15ac0e3b45"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/rm/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/rm/firefox-118.0.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "3e353cb7dad67f8d4f169480c9e067da03c784ce97487253d2ed5065f39f81d6"; + sha256 = "abc9384641663c1a017ce3e8d05de528a7e0600c6db416390a6d3c663ddcdaf6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ro/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ro/firefox-118.0.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "523ec63a9e1fdeab38d29802e31f2f16002e0ffe2fa1bb9eb9c5452d9f1ebc06"; + sha256 = "b5d974e6714c01eaed4952158c52a910f3115744ade8c56b2c57c6e3a0f87c6d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ru/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ru/firefox-118.0.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "18c45350933963b958e02abb01e1377da88fa4940cbbc9d72218a65ae7ed35c6"; + sha256 = "12dd5c92533652e66c99fcfd818b00591f7ff2113d4c537720b503a692ba7439"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/sc/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sc/firefox-118.0.1.tar.bz2"; locale = "sc"; arch = "linux-i686"; - sha256 = "414a9a4340084f1294477e04977da4f1319d0926e1d42ab2ad29d1c1b40624da"; + sha256 = "30952cdb2f4e00bbbb2502a417b13bfdb200078f26dc56ed84ea45c3bd00aa9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/sco/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sco/firefox-118.0.1.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "5d29a5b8a707918964e60f1de2eb568567547d832dc7c010e51f2170c69c8281"; + sha256 = "8f7ba9ce28ae517841627a2f4594494fbae847e9ab23d0c6c17b15832f01294b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/si/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/si/firefox-118.0.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "24c95b1a63399292c83585e5c1e22a14657b120a1110e0d7f90aba9743008f93"; + sha256 = "c873a26e519132a8d7f6ff253deabfab0e937bb947054b0f1bca2ecdaaafcc7c"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/sk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sk/firefox-118.0.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "5bbde34f11d60796914da10ba759af3a0efe95643122511f5a02d27fc2dcb3c3"; + sha256 = "7d94648ea110b2b4e462ee8b8dc03f2d14d5eb1264b97dbbbc1d69a7fe171d3a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/sl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sl/firefox-118.0.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "859b60c9495bc9fb8f83a1549258d39024658a4a7cfd226b15b0019cb0e11888"; + sha256 = "7a0e3e6d1269934c77ba3e89eb484311e79f7c54921929bf46839c1edbd98a7b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/son/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/son/firefox-118.0.1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "ed3babf5346091dfbc31924be04800bd5bd1a079a89a166d4730a8d1e6d7d731"; + sha256 = "4b8234d05db7af3d301afe1f489876986d325849ffa043d226c923ed089fae2b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/sq/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sq/firefox-118.0.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2e2cd9ae5be81dd9477185e5ccce6fbed3af6615a18ff7f40a598f7e6271a662"; + sha256 = "39f839067a963c3b85706b30c3ba1bd4113518e3c075d758d11669ac745d33ca"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/sr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sr/firefox-118.0.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "856320c8439a6bb11206f53b1ffdc04b3df7b3ca536c7b5534396fd0a7571da8"; + sha256 = "626a7b1e89a9b1bb89a7a94e966647acd6df526de2bea52444bc316515a86a42"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/sv-SE/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/sv-SE/firefox-118.0.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "dadcefa629a6bd750787067c04a7b14aff85b0675536a6a716f775998e067acc"; + sha256 = "e4254eb17fd1769ad253242b3d5e513e72538daa0daf784693b97c01cbca66cf"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/szl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/szl/firefox-118.0.1.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "94ac7b854e7814ab19e07efa226377b8850380f6b5cf958faddfbe1840d09f28"; + sha256 = "32571063b99520a5627dba81e0ce08b35ed08d9e40d060820adaf0b55ba80d41"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ta/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ta/firefox-118.0.1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "9b13901a530210870ef075293f69e966f4366132ac870f51516ff54eb4835d30"; + sha256 = "e5581fde1d1b8287af54306f228466096a5844a5b33947f775476e0cf2a7dc9f"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/te/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/te/firefox-118.0.1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "98e8c6ffaa6a1830e4b38c8f502d2d74ac6373bdd3edb3c193b59883e52f5347"; + sha256 = "300d514bc36af73721bad4f8cddf272b8d82a46ff867130e31bbadca601ada2d"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/tg/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/tg/firefox-118.0.1.tar.bz2"; locale = "tg"; arch = "linux-i686"; - sha256 = "0f37ee3b9812eccc4f29c2f9577867fab6bbc15fe155babc92fefc07b3d51f9f"; + sha256 = "ee30293e209a350065132068459d6c882d045d1e611aa08096d1fb4a2b100e36"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/th/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/th/firefox-118.0.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "cc13c6d6047c281270c3af43b611b2112b7012d868f842049e405cf06ddcab28"; + sha256 = "95647fb5a8d8b2321113398ae2b5ad516be1228751272f356a49abe2206a687b"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/tl/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/tl/firefox-118.0.1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "ca0d479ecf286fc7f5b1abc68d4050a8813769a04de490e0989daab3d0bf8fbf"; + sha256 = "52d9033dd208f11afce6fb77d16bbd705c28b1b893b0c1ceee526e3ba4467de6"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/tr/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/tr/firefox-118.0.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9a04e5b7400f72b56fe130164e84e87b6d0f2e8f7f324da2dee1ed4ce10fc481"; + sha256 = "3c29ea78405aea803b3093bdbe7d4389dd73ebd9665fa9301a76a289c85bb59a"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/trs/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/trs/firefox-118.0.1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "b7a64ef799d4c02e55de858dae0e06cace36c6cd52adbfbe51f3e32bced94f5f"; + sha256 = "cda51b1fc45f59a0e9f3c51ddea94b030d180040b02f26a13baf37601e0bd961"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/uk/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/uk/firefox-118.0.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "89c3fe8a5aabbfc3954db02820a72710d416aa17c68c01563c88a45b38929298"; + sha256 = "2f857d43702fc3af4649e7c22e324b8e7547c66c97d5013d84ee2ea8594e00ce"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/ur/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/ur/firefox-118.0.1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "3da274f7cbc5a865605dab44279d7c4f4451fe095f7986b92691d8f5c488d985"; + sha256 = "4f0bd303ccadb1c8db47f5298642d6fa6f96598f7ad409dc273ae645fc739aad"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/uz/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/uz/firefox-118.0.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "6cfc74ad95cd98ac58ea9306ebb69bcbbb6e6abbd8889c6b13c7ae6235965e1e"; + sha256 = "c419e83710a5d575cf56644a4cbe214b60cf24ea6dac70a6459a3bf8fbacc7c0"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/vi/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/vi/firefox-118.0.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "18ee078a8225ebf4f10bcf816f0b08f3f0b78e9e821439d0f773722383aeb022"; + sha256 = "e00c7460e9e32f24ac1a2d968f6f20d647a1ab13188524d3bd39654172f2e3e3"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/xh/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/xh/firefox-118.0.1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "8a1fcc5d215943b42af218d594d02d053356c4f49acc2e245df543fff4e3c948"; + sha256 = "75d96c526ae353b5b5a63cb14d71ad7fd84256932945766afb3e826b7ee73edc"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/zh-CN/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/zh-CN/firefox-118.0.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "6cd5002cbe6a7c46cf2d4484abd10fb28e0a760a62aac4aada90d0a07e5e592a"; + sha256 = "37b687221c5d2d52dc6b225debc14c6cc842ce91d7e1ad87f8ad56c6ae7801c2"; } - { url = "https://archive.mozilla.org/pub/firefox/releases/116.0.3/linux-i686/zh-TW/firefox-116.0.3.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/118.0.1/linux-i686/zh-TW/firefox-118.0.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "15a5d2f1e89b8f7433e209f1c0b4c00c44ce21a95de7216c56d2ca4a7cc794ac"; + sha256 = "95df34bcb9875d915690043f6dbe71d80a6acba5fb4b0ad5cae7143ca9ef72df"; } ]; } 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 753e1c9d59..bb4b1ba0a8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -469,7 +469,7 @@ buildStdenv.mkDerivation { # icu73 changed how it follows symlinks which breaks in the firefox sandbox # https://bugzilla.mozilla.org/show_bug.cgi?id=1839287 ++ [ (if (lib.versionAtLeast version "115") then icu else icu72) ] - ++ [ (if (lib.versionAtLeast version "103") then nss_latest else nss_esr) ] + ++ [ (if (lib.versionAtLeast version "116") then nss_latest else nss_esr/*3.90*/) ] ++ lib.optional alsaSupport alsa-lib ++ lib.optional jackSupport libjack2 ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed 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 b43aaf450e..d999d64da4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ { firefox = buildMozillaMach rec { pname = "firefox"; - version = "116.0.3"; + version = "118.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "194c50e9ba5a918c37fbef8cd72ffb98e5e9f51955d8172b6666a758b5f20777ca0a7f79dff0328305fb6dafefb102ab002e326f47d0965a4dc6d3e9287c42b9"; + sha512 = "b1efa1afea70434dc2a18d335bb8b526883cde200f1503b8c5fd2e7db8285e6a999cfa3aac354ea1c15a91d13a46d68db37023235314240b59eb8f55e01554ad"; }; meta = { @@ -30,11 +30,11 @@ firefox-beta = buildMozillaMach rec { pname = "firefox-beta"; - version = "117.0b9"; + version = "119.0b4"; applicationName = "Mozilla Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "95e215f4280e177c3f763c6a8ab7ff56d6e0ca4aca2ac5eec8a3be7a461257e3aba236f3d122200e031d8e75ae2486779fb89d398defeefdb52589cb98a131b4"; + sha512 = "7c067d759602608e527d032f7a3772df827a5b5c4270992c05abda726fcd665f4f2c5380e684623ed108364ace4afaed8b5959f75a4b0540edd5ae30422b0e54"; }; meta = { @@ -58,12 +58,12 @@ firefox-devedition = (buildMozillaMach rec { pname = "firefox-devedition"; - version = "117.0b9"; + version = "119.0b4"; applicationName = "Mozilla Firefox Developer Edition"; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "ab034e31467a7c9a57f5c32d486fb69a250d4293513babeeea8ff2042b0eac858be2c46c69469c700a7271f46a0c297ecdaa5ff651434adc8f9c157f80a97e43"; + sha512 = "ded00bc1e090bdca5f32160d980cec47590bb952a6c7f1dc8f4df30fa452cad8c47a3c6d20cf3e8345fd5811777b475354d71d704c866fb49396a83c8a795bcb"; }; meta = { @@ -88,42 +88,13 @@ env.MOZ_REQUIRE_SIGNING = ""; }); - firefox-esr-102 = buildMozillaMach rec { - pname = "firefox-esr-102"; - version = "102.14.0esr"; - applicationName = "Mozilla Firefox ESR"; - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "6cabd474d0f3a768a0f12fa5c9984ed193906b503202010fd1da0e2affa091fcc5c165e6b9c4152d286410d46b72b2ddbf52d323bf5ea542f29e5267a94dfdcd"; - }; - - meta = { - changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/"; - description = "A web browser built from Firefox Extended Support Release source tree"; - homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ hexa ]; - 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". - # not in `badPlatforms` because cross-compilation on 64-bit machine might work. - license = lib.licenses.mpl20; - mainProgram = "firefox"; - }; - tests = [ nixosTests.firefox-esr-102 ]; - updateScript = callPackage ./update.nix { - attrPath = "firefox-esr-102-unwrapped"; - versionPrefix = "102"; - versionSuffix = "esr"; - }; - }; - firefox-esr-115 = buildMozillaMach rec { pname = "firefox-esr-115"; - version = "115.1.0esr"; + version = "115.3.1esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "b2abb706fef2f1aa9451e7ac7c2affa0cc92cf2b0c6629f106a94c62017476380c7b6f406861fa468f60ea898d8402f534ad74844eb3932741fbd981cec66592"; + sha512 = "65cb6fc46bba03eed742bd67f8e36b63b19f2ad7b85d2f503595704a4e88f554758a1e66ba548c8efe97a76322fb2514db72e6ff4bb2992d1aaa86edc3af85f1"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index e909b15f77..6561e51d7d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -84,8 +84,9 @@ let ++ lib.optional sndioSupport sndio ++ lib.optional jackSupport libjack2 ++ lib.optional smartcardSupport opensc - ++ lib.optional (cfg.speechSynthesisSupport or false) speechd - ++ pkcs11Modules; + ++ lib.optional (cfg.speechSynthesisSupport or true) speechd + ++ pkcs11Modules + ++ gtk_modules; gtk_modules = [ libcanberra-gtk3 ]; launcherName = "${applicationName}${nameSuffix}"; @@ -362,7 +363,7 @@ let extraPoliciesFiles=(${builtins.toString extraPoliciesFiles}) for extraPoliciesFile in "''${extraPoliciesFiles[@]}"; do - jq -s '.[0] + .[1]' "$POL_PATH" $extraPoliciesFile > .tmp.json + jq -s '.[0] * .[1]' "$POL_PATH" $extraPoliciesFile > .tmp.json mv .tmp.json "$POL_PATH" done diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix index 3957d4c2a0..342396c6a5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lagrange/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.16.7"; + version = "1.17.0"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${finalAttrs.version}"; - hash = "sha256-d9QmFXDDeYDR1KFtOyQKfaYvex8TFDiYJUrKEp7H5K8="; + hash = "sha256-UoyCsmZKpRkO4bQt6RwRAceu3+JPD8I8qSf9/uU5Vm4="; }; nativeBuildInputs = [ cmake pkg-config zip ]; 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 baa76488f6..f6689f6ae8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/librewolf.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/librewolf.nix @@ -29,9 +29,9 @@ rec { sed -i '/MOZ_NORMANDY/ s/True/False/' browser/moz.configure ''; - extraPrefsFiles = [ "${source}/submodules/settings/librewolf.cfg" ]; + extraPrefsFiles = [ "${src.settings}/librewolf.cfg" ]; - extraPoliciesFiles = [ "${source}/submodules/settings/distribution/policies.json" ]; + extraPoliciesFiles = [ "${src.settings}/distribution/policies.json" ]; extraPassthru = { librewolf = { inherit src extraPatches; }; 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 a22978098c..e4516cb424 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,15 @@ { - "packageVersion": "116.0.2-1", + "packageVersion": "118.0.1-1", "source": { - "rev": "116.0.2-1", - "sha256": "08q50yjb8q168zb2y4iajjqd9ygbpywwr9i4vfn67wchqlsc1mrp" + "rev": "118.0.1-1", + "sha256": "1wdqiif1la97w9b3xsz20xrcg2d1c0j13pdfcj7z23jz8846iqk4" + }, + "settings": { + "rev": "9c862f06f970d69e00c1035e0d4774fb44fd84a6", + "sha256": "0ay58wrhfn0b56748phpn0ahz11ls9y8d2fd1z4zrj6dv398vlmb" }, "firefox": { - "version": "116.0.2", - "sha512": "2c0ae18672fe22c75002744831130e13da764f83726951e5b58cfe74f7f473e22634ce08ebc11a98bac5baec0a4ac099a3a350a8b756af9c5bea6d5f4432da6d" + "version": "118.0.1", + "sha512": "b1efa1afea70434dc2a18d335bb8b526883cde200f1503b8c5fd2e7db8285e6a999cfa3aac354ea1c15a91d13a46d68db37023235314240b59eb8f55e01554ad" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.nix index a2100ac2ab..25a6e46d22 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitLab }: +{ lib, fetchurl, fetchFromGitLab, fetchFromGitea }: let src = lib.importJSON ./src.json; in { @@ -9,6 +9,12 @@ in fetchSubmodules = true; inherit (src.source) rev sha256; }; + settings = fetchFromGitea { + domain = "codeberg.org"; + owner = "librewolf"; + repo = "settings"; + inherit (src.settings) rev sha256; + }; firefox = fetchurl { url = "mirror://mozilla/firefox/releases/${src.firefox.version}/source/firefox-${src.firefox.version}.source.tar.xz"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/update.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/update.nix index b8bc64afaf..2cd36786c7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/update.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/update.nix @@ -57,9 +57,18 @@ writeScript "update-librewolf" '' ffHash=$(grep '\.source\.tar\.xz$' "$HOME"/shasums | grep '^[^ ]*' -o) echo "ffHash=$ffHash" + # upstream does not specify settings rev, so just get the latest. see https://github.com/NixOS/nixpkgs/issues/252276 + settingsRev=$(curl 'https://codeberg.org/api/v1/repos/librewolf/settings/commits?sha=master&limit=1' | jq -r .[0].sha) + echo "settingsRev=$settingsRev" + repoUrl=https://codeberg.org/librewolf/settings + nix-prefetch-git $repoUrl --quiet --rev $settingsRev > $prefetchOut + settingsSha256=$(jq -r .sha256 < $prefetchOut) + jq ".source.rev = \"$latestTag\"" $srcJson | sponge $srcJson jq ".source.sha256 = \"$srcHash\"" $srcJson | sponge $srcJson jq ".firefox.version = \"$ffVersion\"" $srcJson | sponge $srcJson jq ".firefox.sha512 = \"$ffHash\"" $srcJson | sponge $srcJson jq ".packageVersion = \"$lwVersion\"" $srcJson | sponge $srcJson + jq ".settings.rev = \"$settingsRev\"" $srcJson | sponge $srcJson + jq ".settings.sha256 = \"$settingsSha256\"" $srcJson | sponge $srcJson '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix index e2d6854295..0a41ad0feb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix @@ -58,6 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A text-mode web browser"; homepage = "https://lynx.invisible-island.net/"; + mainProgram = "lynx"; maintainers = with maintainers; [ ]; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index 7f72a42ffe..d6898e9d86 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -52,7 +52,8 @@ let in stdenv.mkDerivation rec { - name="${baseName}-${channel}-${version}"; + pname="${baseName}-${channel}"; + inherit version; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/${baseName}-${channel}/${baseName}-${channel}_${version}-${revision}_amd64.deb"; @@ -181,12 +182,14 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}" ''; + passthru.updateScript = ./update.py; + meta = with lib; { homepage = "https://www.microsoft.com/en-us/edge"; description = "The web browser from Microsoft"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ zanculmarktum kuwii ]; + maintainers = with maintainers; [ zanculmarktum kuwii rhysmdnz ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix index f1427bbbf5..821348794b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { stable = import ./browser.nix { channel = "stable"; - version = "115.0.1901.188"; + version = "117.0.2045.47"; revision = "1"; - sha256 = "sha256-mRM3zakYwCptfKWYbiaDnPqv9Vt5WnDA7xIK1rlownU="; + sha256 = "sha256-h4iw+H8f62JEih1tWTpjxNC9+wu3hHQOM2VJid1kHNQ="; }; beta = import ./browser.nix { channel = "beta"; - version = "115.0.1901.165"; + version = "118.0.2088.17"; revision = "1"; - sha256 = "sha256-2DUWkGItissLGtJAMDKHNjMDPhsYNKaQVJ30+tMlkow="; + sha256 = "sha256-3Z37M2ZQRJ5uA7NcinMlF1XEsYVv9A+ppPZZf34ye6Q="; }; dev = import ./browser.nix { channel = "dev"; - version = "116.0.1938.10"; + version = "119.0.2116.0"; revision = "1"; - sha256 = "sha256-NQXaLmX8AtLEWPkkzAA90XfmFflwulxVRHtIJ+nxCk4="; + sha256 = "sha256-raLRFSHZyHaxKi6EG62VIbcW29HTjTnBFw7IJFVbm5I="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py index 0e9bfa8fe8..f32b669f03 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py @@ -8,6 +8,9 @@ from urllib import request from collections import OrderedDict from debian.deb822 import Packages from debian.debian_support import Version +from os.path import abspath, dirname + +PIN_PATH = dirname(abspath(__file__)) + '/default.nix' def packages(): packages_url = 'https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages' @@ -60,7 +63,7 @@ def write_expression(): latest = latest_packages(packages()) channel_strs = nix_expressions(latest) nix_expr = '{\n' + textwrap.indent('\n'.join(channel_strs), ' ') + '\n}\n' - with open('default.nix', 'w') as f: + with open(PIN_PATH, 'w') as f: f.write(nix_expr) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix index 57f8d34816..3b3f292215 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/mullvad-browser/default.nix @@ -78,15 +78,19 @@ let ++ lib.optionals mediaSupport [ ffmpeg ] ); - version = "12.5.2"; + version = "12.5.6"; sources = { x86_64-linux = fetchurl { urls = [ "https://cdn.mullvad.net/browser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" "https://github.com/mullvad/mullvad-browser/releases/download/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" + "https://dist.torproject.org/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" + "https://archive.torproject.org/tor-package-archive/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" + "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" + "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux64-${version}_ALL.tar.xz" ]; - hash = "sha256-sVVgQTpPQFiG1mEIih0CemNV5qjC2l+JTxef37/nC9k="; + hash = "sha256-e7gRkRMipnEG1hMlhs25LUJ5KDGt8qP3wpbSG2K2aK8="; }; }; @@ -225,7 +229,7 @@ stdenv.mkDerivation rec { passthru = { inherit sources; - updateScript = callPackage ../tor-browser-bundle-bin/update.nix { + updateScript = callPackage ../tor-browser/update.nix { inherit pname version meta; baseUrl = "https://cdn.mullvad.net/browser/"; prefix = "mullvad-browser-"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix index 6ed870aa93..ecc75cd5cd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/nyxt/default.nix @@ -3,7 +3,7 @@ , glib, gdk-pixbuf, cairo , mailcap, pango, gtk3 , glib-networking, gsettings-desktop-schemas -, xclip, notify-osd, enchant +, xclip, wl-clipboard, notify-osd, enchant }: stdenv.mkDerivation rec { @@ -41,9 +41,8 @@ stdenv.mkDerivation rec { cp -f $src/assets/nyxt_''${i}x''${i}.png "$out/share/icons/hicolor/''${i}x''${i}/apps/nyxt.png" done - # Need to suffix PATH with xclip to be able to copy/paste in Nyxt even if xclip/xsel/wl-clipboard are not in the user's PATH mkdir -p $out/bin && makeWrapper $src/bin/nyxt $out/bin/nyxt \ - --suffix PATH : ${lib.makeBinPath [ xclip ]} \ + --prefix PATH : ${lib.makeBinPath [ xclip wl-clipboard ]} \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "${GST_PLUGIN_SYSTEM_PATH_1_0}" \ --argv0 nyxt "''${gappsWrapperArgs[@]}" ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix index 7adb6a1130..e1b4fdcfa2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix @@ -32,7 +32,7 @@ in python3Packages.buildPythonPackage rec { pname = "offpunk"; version = "1.10"; - format = "flit"; + format = "pyproject"; disabled = python3Packages.pythonOlder "3.7"; @@ -43,7 +43,7 @@ python3Packages.buildPythonPackage rec { hash = "sha256-+jGKPPnKZHn+l6VAwuae6kICwR7ymkYJjsM2OHQAEmU="; }; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ python3Packages.flit-core installShellFiles ]; propagatedBuildInputs = otherDependencies ++ pythonDependencies; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix index ece75ad872..79020e18b9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -14,22 +14,21 @@ , makeDesktopItem , wrapGAppsHook , testers -, palemoon-bin }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "32.3.1"; + version = "32.4.1"; src = fetchzip { urls = [ - "https://rm-eu.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" - "https://rm-us.palemoon.org/release/palemoon-${version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" + "https://rm-eu.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" + "https://rm-us.palemoon.org/release/palemoon-${finalAttrs.version}.linux-x86_64-gtk${if withGTK3 then "3" else "2"}.tar.xz" ]; hash = if withGTK3 then - "sha256-1JYaxxkqgg/gLdZ+uGDB5BI0NKjHO4huk0b/M9QFuII=" + "sha256-c/rfnMpiLWqlNZppqPRNWXsgAQ1FofAdel5EFnK+mrY=" else - "sha256-p/Lid6Uv3XTEg+43Gke5VLILhzENHoBP6XjGVHy7wCY="; + "sha256-27njFdqq2DUctlz/UOtH5tlOduQNpoapuCYS+48K9dk="; }; preferLocalBuild = true; @@ -53,7 +52,7 @@ stdenv.mkDerivation rec { ]; desktopItems = [(makeDesktopItem rec { - name = pname; + name = "palemoon-bin"; desktopName = "Pale Moon Web Browser"; comment = "Browse the World Wide Web"; keywords = [ @@ -155,7 +154,7 @@ stdenv.mkDerivation rec { ''; passthru.tests.version = testers.testVersion { - package = palemoon-bin; + package = finalAttrs.finalPackage; }; meta = with lib; { @@ -164,6 +163,7 @@ stdenv.mkDerivation rec { longDescription = '' Pale Moon is an Open Source, Goanna-based web browser focusing on efficiency and customization. + Pale Moon offers you a browsing experience in a browser completely built from its own, independently developed source that has been forked off from Firefox/Mozilla code a number of years ago, with carefully selected @@ -186,4 +186,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; hydraPlatforms = []; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix index 617d52788d..21dde7700b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "14.0.1"; + version = "15.0.0"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-UBWd8ApSb5YN5TUqSxv/352+jAwwRjiv/pM1rocqukk="; + sha256 = "sha256-O0VWgx6FKulELZuJgMwFgGSo+EaCqb9dgneF2XFnq7U="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/default.nix similarity index 94% rename from third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix rename to third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/default.nix index ee31f79a57..7de6e40de2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/default.nix @@ -47,7 +47,7 @@ # Hardening , graphene-hardened-malloc # Whether to use graphene-hardened-malloc -, useHardenedMalloc ? true +, useHardenedMalloc ? null # Whether to disable multiprocess support , disableContentSandbox ? false @@ -56,7 +56,10 @@ , extraPrefs ? "" }: -let +lib.warnIf (useHardenedMalloc != null) + "tor-browser: useHardenedMalloc is deprecated and enabling it can cause issues" + +(let libPath = lib.makeLibraryPath libPkgs; libPkgs = [ @@ -89,7 +92,7 @@ let fteLibPath = lib.makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "12.5.2"; + version = "12.5.6"; lang = "ALL"; @@ -101,7 +104,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - hash = "sha256-Mm2/ianon+RtOJqmuZCl+2cPliKiJvIOZ+TyzJ8l5es="; + hash = "sha256-lZlGhyGDT9Vxox3ghfFSIZd3sazNyL23k0UtipaIGR8="; }; i686-linux = fetchurl { @@ -111,7 +114,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - hash = "sha256-mouxVi/Y5duIQXHYd8WcIzLZEXs5FZAt20dFq4vHzso="; + hash = "sha256-3Z3S6P3wkZeC/lhgO7XDdDDQ6cpyOX+e3SBuh47aMl8="; }; }; @@ -129,7 +132,7 @@ let }); in stdenv.mkDerivation rec { - pname = "tor-browser-bundle-bin"; + pname = "tor-browser"; inherit version; src = sources.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}"); @@ -268,7 +271,7 @@ stdenv.mkDerivation rec { GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6 EOF - WRAPPER_LD_PRELOAD=${lib.optionalString useHardenedMalloc + WRAPPER_LD_PRELOAD=${lib.optionalString (useHardenedMalloc == true) "${graphene-hardened-malloc}/lib/libhardened_malloc.so"} WRAPPER_XDG_DATA_DIRS=${lib.concatMapStringsSep ":" (x: "${x}/share") [ @@ -456,25 +459,15 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "Tor Browser Bundle built by torproject.org"; - longDescription = '' - Tor Browser Bundle is a bundle of the Tor daemon, Tor Browser (heavily patched version of - Firefox), several essential extensions for Tor Browser, and some tools that glue those - together with a convenient UI. - - `tor-browser-bundle-bin` package is the official version built by torproject.org patched with - `patchelf` to work under nix and with bundled scripts adapted to the read-only nature of - the `/nix/store`. - ''; + description = "Privacy-focused browser routing traffic through the Tor network"; homepage = "https://www.torproject.org/"; changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}"; platforms = attrNames sources; maintainers = with maintainers; [ felschr panicgh joachifm hax404 ]; - mainProgram = "tor-browser"; # MPL2.0+, GPL+, &c. While it's not entirely clear whether # the compound is "libre" in a strict sense (some components place certain # restrictions on redistribution), it's free enough for our purposes. license = licenses.free; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/update.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/update.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/update.nix rename to third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser/update.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix index ee0492c325..8bb0c21ed2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix @@ -2,20 +2,20 @@ buildNpmPackage rec { pname = "vieb"; - version = "10.2.0"; + version = "10.3.0"; src = fetchFromGitHub { owner = "Jelmerro"; repo = pname; rev = version; - hash = "sha256-eI+doYI5kssuVLNLlAj67CRvBuWQ+TRm0RKXPcW+S8c="; + hash = "sha256-eopsDwgyWshZOppkODGKT8UGnj4vvc7ssEzVAhZeDTA="; }; postPatch = '' sed -i '/"electron"/d' package.json ''; - npmDepsHash = "sha256-Emiw5ZlHh4+YqtW+T3iQW/ldr1Exx/66vsQteCijObQ="; + npmDepsHash = "sha256-9tnLlKzOy8ze4m2beS/pI34IiEa5TdNNr+Rmm2TFgfk="; dontNpmBuild = true; nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index b1301c7b70..a956dee90d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -16,6 +16,7 @@ , enableWidevine ? false, widevine-cdm ? null , commandLineArgs ? "" , pulseSupport ? stdenv.isLinux, libpulseaudio +, kerberosSupport ? true, libkrb5 }: let @@ -23,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.1.3035.302"; + version = "6.2.3105.54"; suffix = { aarch64-linux = "arm64"; @@ -33,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-HWnHuLcJrV4yYt/l0iLl0N2p9v7r5RwQod1s0op52Z4="; - x86_64-linux = "sha256-NPmiatlGK+8GJHwDXyOZ+J1PSN7Oj8sAKfm6r1usI1E="; + aarch64-linux = "sha256-QqdCnwSrqJAEj++xcr3cOkKSbZIFkyvMutxsLNR/Moc="; + x86_64-linux = "sha256-z5/l94MFhpHRLvbUdSwFSSt3n21mPZJzanYugXecLFk="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -57,7 +58,8 @@ in stdenv.mkDerivation rec { libdrm mesa vulkan-loader wayland pipewire ] ++ lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs - ++ lib.optional pulseSupport libpulseaudio; + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional kerberosSupport libkrb5; libPath = lib.makeLibraryPath buildInputs + lib.optionalString (stdenv.is64bit) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix index e4a064e790..5d2ea47b34 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/w3m/default.nix @@ -95,7 +95,7 @@ in stdenv.mkDerivation rec { homepage = "https://w3m.sourceforge.net/"; changelog = "https://github.com/tats/w3m/blob/v${version}/ChangeLog"; description = "A text-mode web browser"; - maintainers = with maintainers; [ cstrahan anthonyroussel ]; + maintainers = with maintainers; [ anthonyroussel ]; platforms = platforms.unix; license = licenses.mit; mainProgram = "w3m"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix index 250355aa42..e062a3d151 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "43.3"; + version = "44.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-GNICAk9SPrLc+zm3tHVwkQdiS20j4MVktGIbNWEEMHs="; + hash = "sha256-mdv/yDUi6tzYc3C7dtmkAWtk4IqzHvOZVO2CA3TP9TE="; }; outputs = [ "out" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix deleted file mode 100644 index 0f5e807d00..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cawbird/default.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, glib -, gtk3 -, json-glib -, sqlite -, libsoup -, liboauth -, gettext -, gspell -, vala -, meson -, ninja -, pkg-config -, dconf -, gst_all_1 -, wrapGAppsHook -, gobject-introspection -, glib-networking -, librest -, python3 -}: - -stdenv.mkDerivation rec { - version = "1.5"; - pname = "cawbird"; - - src = fetchFromGitHub { - owner = "IBBoard"; - repo = "cawbird"; - rev = "v${version}"; - sha256 = "sha256-XFN9gfCoQDmYYysg1yrUoPPE0Ow40LttvV5Ltu0DTfI="; - }; - - nativeBuildInputs = [ - meson - ninja - vala - pkg-config - wrapGAppsHook - python3 - gobject-introspection # for setup hook - ]; - - buildInputs = [ - glib - gtk3 - json-glib - sqlite - libsoup - liboauth - gettext - dconf - gspell - glib-networking - librest - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-bad - (gst-plugins-good.override { - gtkSupport = true; - }) - gst-libav - ]); - - postPatch = '' - chmod +x data/meson_post_install.py # patchShebangs requires executable file - patchShebangs data/meson_post_install.py - ''; - - # supply Twitter API keys - # use keys supplied by @SuperSandro2000, see https://github.com/IBBoard/cawbird/blob/master/README.md#preparation - mesonFlags = [ - "-Dconsumer_key_base64=YnJJNm01SE9PbEkzM3pWenZObVhVSHdlTg==" - "-Dconsumer_secret_base64=YUc1SkcyYzhsenlKT2VOWWhVSXlJMERDaFh0WEswUG9oTEp4TzhZNEdJb1hXN0hhYlY=" - ]; - - meta = with lib; { - description = "Native GTK Twitter client for the Linux desktop"; - longDescription = "Cawbird is a modern, easy and fun Twitter client. Fork of the discontinued Corebird."; - homepage = "https://ibboard.co.uk/cawbird/"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with lib.maintainers; [ jonafato schmittlauch ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix b/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix index f7749946f4..27fa0981f1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/charles/default.nix @@ -57,7 +57,7 @@ let meta = with lib; { description = "Web Debugging Proxy"; homepage = "https://www.charlesproxy.com/"; - maintainers = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ kalbasit kashw2 ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; platforms = platforms.unix; @@ -66,8 +66,8 @@ let in { charles4 = (generic { - version = "4.6.2"; - sha256 = "0r5rann7cq665ih0pa66k52081gylk85ashrwq1khbv2jf80yy52"; + version = "4.6.4"; + sha256 = "KEQYb90kt41dS3TJLZqdaV9P3mQA9UPsEyiFb/knm3w="; platform = "_amd64"; jdk = jdk11; }); diff --git a/third_party/nixpkgs/pkgs/applications/networking/clash-verge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/clash-verge/default.nix index bbe36cb0d6..35a6d4438e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/clash-verge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/clash-verge/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "clash-verge"; - version = "1.3.5"; + version = "1.3.7"; src = fetchurl { url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb"; - hash = "sha256-dMlJ7f1wpaiJrK5Xwx+e1tsWkGG9gJUyiIjhvVCWEJQ="; + hash = "sha256-+RYfGLa4d5JkLWnlYfhjCOSREVJ4ad/R36eSiNj3GIA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index 68dd94b5ca..a83f1e1dfa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2023.7.3"; + version = "2023.8.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = "refs/tags/${version}"; - hash = "sha256-Sv6f12XXVHIi97Ows1hsqAeb4z+ZtVM5B0v0Xz/b5iY="; + hash = "sha256-8khwpGOBSpbAHnKeKFZUrJoE0dgQB3bN6Y/W2gwRfCM="; }; vendorHash = null; @@ -78,7 +78,7 @@ buildGoModule rec { changelog = "https://github.com/cloudflare/cloudflared/releases/tag/${version}"; license = licenses.asl20; platforms = platforms.unix ++ platforms.windows; - maintainers = with maintainers; [ bbigras enorris thoughtpolice piperswe ]; + maintainers = with maintainers; [ bbigras enorris thoughtpolice piperswe qjoly ]; mainProgram = "cloudflared"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/acorn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/acorn/default.nix index c362bb157c..4b6e44ab02 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/acorn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/acorn/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "acorn"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "acorn-io"; repo = pname; rev = "v${version}"; - hash = "sha256-ERB9RwvBcZ+G+UqR0Wv+HCkrc8tJQdamIeg7ZfKx8jQ="; + hash = "sha256-ZS3YxXgMSu8+eRnpqrtaBTQIlSY3cscudcTbztiRsbM="; }; - vendorHash = "sha256-iiyWYGoW0vno/C5qZVvtYypbVpjJwWydMo4+HxXy8IM="; + vendorHash = "sha256-jkkzlMc2y8HvPZjpmRIQz64JK5yjhdoJevE0dclBHvA="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix index 4c5a1b2113..ade1527b6e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-ODcT7dc4xBHOKYTP2pUTq2z3GMUEpZ9OUKKxlbd+Vvk="; + sha256 = "sha256-WJ5vIfQQguwjInS5p+bUYorM90MUAbH8endV/nkgQ00="; }; - vendorHash = "sha256-IxSLlRsOz/Xamguxm+7jy8qAAEZZFm/NHDIBjm5tnCs="; + vendorHash = "sha256-vBSS1KMfloK5pvVc8nHE5B8PsVZTS/iA9GyrLaeR6ps="; # Disable tests since some test fail because of missing test data doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index 4a0f192ea3..e42a4e0c4b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.4.15"; + version = "0.4.16"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-E0Y2GBklUiQBSdrKerFO0B8AAPYnDuxbdRk7uU7cQBI="; + sha256 = "sha256-KxEH6FpCaOVOjdNKn7dYbFlT/W4gA8276Zt3sIs3Tg8="; }; - vendorHash = "sha256-5YGe9OnZhjswLMlXohPGzpebocuJFfBd94cc1y88irs="; + vendorHash = "sha256-3f5eEge5tGko/B7MtPcifoQOkkVr0jjFX5nF6g1kow4="; proxyVendor = true; 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 6c1918aa7b..33ac8cc965 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.8.0"; + version = "2.8.4"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-/BMagPR74pANVYcmvdJZmV4tB48cEyAy0FKtBlpoLDE="; + hash = "sha256-ETvAE9kegqtAduXm9/9fmPgJJ2Xq6ZY5J5iGcjHkyKM="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-xiCgQqP2XF+b2JQTBFqJ3h2klc6GjqyXoNUwatO0Ul8="; + vendorHash = "sha256-4vGBi6P0xSfBheTg2/z28l9H07TasqqM8l6YjGgLhvs="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix index d82c1bce03..269f97ac39 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "arkade"; - version = "0.9.26"; + version = "0.10.10"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-difvEmFfwH7+d2qAcNwTcydP0WHDvHkOSXilaWLrHoM="; + hash = "sha256-Lu/itKaF7mSG/jwg2sA4wNkbzBWdDY4pfwHB0elI1Bc="; }; CGO_ENABLED = 0; nativeBuildInputs = [ installShellFiles ]; - vendorHash = "sha256-bWiBY3Bo/FpipUHhbsbPNLKxvJF7L0tpuPi0Cb0firU="; + vendorHash = null; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/assign-lb-ip/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/assign-lb-ip/default.nix index dadb679cd5..7b85443db3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/assign-lb-ip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/assign-lb-ip/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-Sfi58wcX61HNCmlDoparTqnfsuxu6barSnV0uYlC+ng="; }; - vendorSha256 = "sha256-N78a0pjs2Bg2Bslk/I0ntL88ui4IkRGenL0Pn17Lt/w="; + vendorHash = "sha256-N78a0pjs2Bg2Bslk/I0ntL88ui4IkRGenL0Pn17Lt/w="; meta = with lib; { description = "Assigns loadBalancerIP address to a Kubernetes service for testing purposes"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix index c1e4df0a38..e3bd97e91d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-6NUuKU8KQBfHE6fcN3a9lBcUk7p5I9SuY9g+qJxGXmU="; }; - vendorSha256 = "sha256-vZwADD7fi9ZvJby9Ijdeueid8jRfUyyj6Nu4kgkO5Wo="; + vendorHash = "sha256-vZwADD7fi9ZvJby9Ijdeueid8jRfUyyj6Nu4kgkO5Wo="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/calico/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/calico/default.nix index 17f1331e46..29428d8360 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/calico/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/calico/default.nix @@ -2,16 +2,16 @@ builtins.mapAttrs (pname: { doCheck ? true, mainProgram ? pname, subPackages }: buildGoModule rec { inherit pname; - version = "3.26.1"; + version = "3.26.3"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-QSebSc4V8DFSKufSB6M4YSuwDJ9rn/6IR6Fr38F8BBQ="; + hash = "sha256-KbtQ5oMZ1ygYwbaKpyAKTprPZ6+ikDbGLafwOShVd6w="; }; - vendorHash = "sha256-SuV7OEt0ZlVt0i8L5rgQd0HJn63XuDHi7+pe+bq+6Yw="; + vendorHash = "sha256-1PBdDpc/cvI5uN6/msxXoMXbx7Osgq12W1VqtZ7XtGE="; inherit doCheck subPackages; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix index 69eae1d73d..887d6e6f5c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.14.3"; + version = "0.15.10"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vH+wQ3pPz70jc3QzD/0vbKMqQtYak8UGoQmEgeYbFbk="; + hash = "sha256-iIv4xOqggbMDvscnaaz0QXjeScJ4SzOP0fvfshq+vyE="; }; vendorHash = null; @@ -17,7 +17,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/cilium/cilium-cli/internal/cli/cmd.Version=${version}" + "-X github.com/cilium/cilium-cli/cli.Version=${version}" ]; # Required to workaround install check error: @@ -41,7 +41,7 @@ buildGoModule rec { description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium"; license = licenses.asl20; homepage = "https://www.cilium.io/"; - maintainers = with maintainers; [ humancalico bryanasdev000 ]; + maintainers = with maintainers; [ humancalico bryanasdev000 qjoly ]; mainProgram = "cilium"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix index c552c4ffeb..be63630ab7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.61"; + version = "1.0.66"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Q3GIAbQ1I1qsMc5Is9SkYxc+nGuC6z8zu9cW2shwC6c="; + sha256 = "sha256-17dRFRG3HpYJvqE4+SFI6a6nP6umkKc61rwQu4FiG6Q="; }; - vendorHash = "sha256-Ye01MmYHK2YGFsbELLVaXBeQbFGABS6WQUoH8AldRW0="; + vendorHash = "sha256-AvAS3S7bepaTFPelE+Bj5/UuQIXEDvSAtDuFaPRC9sk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 51b11d0ce9..0371e8c813 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.7.1"; + version = "8.7.3"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-cHiT6Lz3BEn+ENn7NQY0Yw3b7WzcsBOUKVPokSmrZZ8="; + sha256 = "sha256-2ABsxoGRRUfa09tVPmn1IXDR2IXIewg/b/fmQnaKLoY="; }; - vendorHash = "sha256-QDJrfgVAIynLLmQ64II+ZI8rD+qL2J3O19YKMlwUi7M="; + vendorHash = "sha256-k2NI9zyeQM4PJo2wE3WkG5sntJGISwmz4xqQVChu8WQ="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix index 9e89ebee61..af27ec6c93 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - hash = "sha256-rbKPI5hG7R6mRILuvY9BoRDvosw3txFs2q696abrpjY="; + hash = "sha256-mbsmsNwUDjBqEbPuYFWHZPBfqDa92PnpiuD10mLhiEQ="; }; - vendorHash = "sha256-t494o9orCVva81v7t0HfKkL8H3cr26scyFSeYZQyqcM="; + vendorHash = "sha256-FUimSBMZI4BDtNKnlzmxe2HiL7MGIUh7SFC2dwWYT3I="; subPackages = [ "cmd/clusterctl" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix index ab4789741f..8396889f53 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix @@ -1,39 +1,52 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, installShellFiles +, nix-update-script +}: buildGoModule rec { pname = "cmctl"; - version = "1.11.2"; + version = "1.13.1"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; - rev = "4767427a40e0e193c976fd6bc228f50de8950572"; - sha256 = "128s5vd4hp5mr0rnb21grzmijzx0ibpv71as36dcgw7z4v3gq7lx"; + rev = "v${version}"; + hash = "sha256-l0D7uVoYTwiVI+b8yYpsJk/eAG5XYidR9CaQ595aTjw="; }; - vendorSha256 = "sha256-+r0QpD97r6dokUr07Qjb9kvoK+oz2rvml0cIebtYuHg="; + sourceRoot = "${src.name}/cmd/ctl"; - subPackages = [ "cmd/ctl" ]; + vendorHash = "sha256-3Ws2ObyBVYog7oVqHeEgIeWeRQpV1Z+Clilp8wI/PUA="; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X github.com/cert-manager/cert-manager/cmd/ctl/pkg/build.name=cmctl" "-X github.com/cert-manager/cert-manager/cmd/ctl/pkg/build/commands.registerCompletion=true" "-X github.com/cert-manager/cert-manager/pkg/util.AppVersion=v${version}" "-X github.com/cert-manager/cert-manager/pkg/util.AppGitCommit=${src.rev}" ]; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + ]; + + # Trusted by this computer: no: x509: “cert-manager” certificate is not trusted + doCheck = !stdenv.isDarwin; postInstall = '' mv $out/bin/ctl $out/bin/cmctl + '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd cmctl \ --bash <($out/bin/cmctl completion bash) \ --fish <($out/bin/cmctl completion fish) \ --zsh <($out/bin/cmctl completion zsh) ''; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { }; meta = with lib; { description = "A CLI tool for managing cert-manager service on Kubernetes clusters"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/update.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/update.sh deleted file mode 100755 index 16a20edb57..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/update.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnugrep gnused jq - -set -x -eu -o pipefail - -NIXPKGS_PATH="$(git rev-parse --show-toplevel)" -CMCTL_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" - -OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_PATH {}; cmctl.version or (builtins.parseDrvName cmctl.name).version" | tr -d '"')" -LATEST_TAG="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/cert-manager/cert-manager/releases" | jq '.[].tag_name' --raw-output | sed '/-/d' | sort --version-sort -r | head -n 1)" -LATEST_VERSION="${LATEST_TAG:1}" - -if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then - SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/cert-manager/cert-manager/archive/refs/tags/${LATEST_TAG}.tar.gz) - TAG_SHA=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/cert-manager/cert-manager/git/ref/tags/${LATEST_TAG}" | jq -r '.object.sha') - TAG_COMMIT_SHA=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/cert-manager/cert-manager/git/tags/${TAG_SHA}" | jq '.object.sha' --raw-output) - - setKV () { - sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${CMCTL_PATH}/default.nix" - } - - setKV version ${LATEST_VERSION} - setKV sha256 "${SHA256}" - setKV rev ${TAG_COMMIT_SHA} - setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # The same as lib.fakeSha256 - - set +e - VENDOR_SHA256=$(nix-build --no-out-link -A cmctl $NIXPKGS_PATH 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') - set -e - - if [ -n "${VENDOR_SHA256:-}" ]; then - setKV vendorSha256 ${VENDOR_SHA256} - else - echo "Update failed. VENDOR_SHA256 is empty." - exit 1 - fi - - echo "updated cmctl to $LATEST_VERSION, please commit changes." -else - echo "cmctl is already up-to-date at $OLD_VERSION" -fi diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix index 3dcf284021..3368814898 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-g7fVeoqquxPa17AfTu6wnB6PQJDluJ21T3ETrcvWtWg="; }; - vendorSha256 = "sha256-nH/myA/KdTeFXvmBymXITyx5fdCGnWRn6hNRinXc3/s="; + vendorHash = "sha256-nH/myA/KdTeFXvmBymXITyx5fdCGnWRn6hNRinXc3/s="; subPackages = [ "./cnitool" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix index ce6aece378..8421c3157e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/plugins.nix @@ -48,6 +48,6 @@ buildGoModule rec { homepage = "https://www.cni.dev/plugins/"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ] ++ teams.podman.members; + maintainers = with maintainers; [ ] ++ teams.podman.members; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/dnsname-cni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/dnsname-cni/default.nix index 3a543f40dd..3b6edd5752 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/dnsname-cni/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/dnsname-cni/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { wrapProgram $out/bin/dnsname --prefix PATH : ${lib.makeBinPath [ dnsmasq ]} ''; - vendorSha256 = null; + vendorHash = null; subPackages = [ "plugins/meta/dnsname" ]; doCheck = false; # NOTE: requires root privileges diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fetchit/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fetchit/default.nix index b4e7e66d7d..cadc331a96 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fetchit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fetchit/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "sha256-hxS/+/fbYOpMJ5VfvvG5l7wWKBUUR22rYn9X79DzUUk="; }; - vendorSha256 = "sha256-SyPd8P9s8R2YbGEPqFeztF98W1QyGSBumtirSdpm8VI="; + vendorHash = "sha256-SyPd8P9s8R2YbGEPqFeztF98W1QyGSBumtirSdpm8VI="; subPackages = [ "cmd/fetchit" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index 7d5a7ed22e..a45b86ba55 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles, stdenv }: let - version = "2.0.1"; - sha256 = "1smrqb2y99ml45g2n00lz7cz6vkisahl2jy7mncxvhl7s6wx5acz"; - manifestsSha256 = "0j8hlggndbbiapa4sxv3rvvhj4g8b1brgq3g55v0d9k6dzq3q6b3"; + version = "2.1.1"; + sha256 = "11g7zkzx28xi81qk00frpxn9qsp4m0pr7m1zm61p2in3i9qxrqjn"; + manifestsSha256 = "1zpw9yh5j9ymhj771ccr7a3zm37h3igcrl0xnzyzzrkg754wdv9s"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-n0915f9mHExAEsHtplpLSPDJBWU5cFgBQC2ElToNRmA="; + vendorHash = "sha256-CQt8GbUUUOLUExysZK2H6YZzMx+pXEroGj30BXAhPRY="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/update.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/update.sh index 8c80ef9fda..f252d587da 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/update.sh @@ -21,16 +21,17 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then setKV version ${LATEST_VERSION} setKV sha256 ${SHA256} setKV manifestsSha256 ${SPEC_SHA256} - setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # The same as lib.fakeSha256 + setKV vendorHash "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" # The same as lib.fakeHash set +e - VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd $NIXPKGS_PATH 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') + VENDOR_HASH=$(nix-build --no-out-link -A fluxcd $NIXPKGS_PATH 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') + VENDOR_HASH=$(nix hash to-sri --type sha256 $VENDOR_HASH) set -e - if [ -n "${VENDOR_SHA256:-}" ]; then - setKV vendorSha256 ${VENDOR_SHA256} + if [ -n "${VENDOR_HASH:-}" ]; then + setKV vendorHash ${VENDOR_HASH} else - echo "Update failed. VENDOR_SHA256 is empty." + echo "Update failed. VENDOR_HASH is empty." exit 1 fi diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix index a192abc57e..5891934462 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-rKZ0fI9UN4oq6gfDMNR2+kCazlDexE1+UVzQ3xgkSA8="; }; - vendorSha256 = "sha256-6Trk49Vo3oMjSaHRDm2v+elPDHwdn2D3Z6i4UYcx0IQ="; + vendorHash = "sha256-6Trk49Vo3oMjSaHRDm2v+elPDHwdn2D3Z6i4UYcx0IQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix index 51c5446516..05fa118e2a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.12.0"; + version = "3.13.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; rev = "v${version}"; - sha256 = "sha256-DGLod05gmDzItPOBaGc2X/oMXSzvH932Wa44R+DUt/U="; + hash = "sha256-7ciI8KgkC1NRYP8bFW5RnZ2oLXaCuPHQBd2tvgQ+YO8="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix index 4c69ffe92e..4082fdbc0f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix @@ -1,36 +1,45 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: buildGoModule rec { pname = "glooctl"; - version = "1.14.12"; + version = "1.15.9"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-0ZrR3y3bTXLCOgN+c96lEfNnT+GKXeEBHifM9jfWTBI="; + hash = "sha256-P3NC1/ZujqSO2C4ToNLpxgbxqACXYYsAFQh1Xbbu7x4="; }; + vendorHash = "sha256-KaBq1VCGWv3K50DDelS0hOQkXnK1ufBiXBtbPQFzwMY="; + subPackages = [ "projects/gloo/cli/cmd" ]; - vendorHash = "sha256-2DKRF68dNkFgSeGqI68j2knnGVfVxo0UvGD7YvPwx4M="; nativeBuildInputs = [ installShellFiles ]; + strictDeps = true; + + ldflags = [ + "-s" + "-w" + "-X github.com/solo-io/gloo/pkg/version.Version=${version}" + ]; + postInstall = '' mv $out/bin/cmd $out/bin/glooctl - - export HOME=$TMP installShellCompletion --cmd glooctl \ --bash <($out/bin/glooctl completion bash) \ --zsh <($out/bin/glooctl completion zsh) ''; - ldflags = [ "-s" "-w" "-X github.com/solo-io/gloo/pkg/version.Version=${version}" ]; - - meta = with lib; { + meta = { description = "glooctl is the unified CLI for Gloo"; homepage = "https://docs.solo.io/gloo-edge/latest/reference/cli/glooctl/"; - license = licenses.asl20; - maintainers = with maintainers; [ nelsonjeppesen ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/habitat/Cargo.lock b/third_party/nixpkgs/pkgs/applications/networking/cluster/habitat/Cargo.lock index 7f495a76ea..71c5ab204a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/habitat/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/habitat/Cargo.lock @@ -8,22 +8,22 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes", "futures-core", "futures-sink", - "log 0.4.17", + "log 0.4.20", "memchr", "pin-project-lite", "tokio", - "tokio-util", + "tokio-util 0.7.8", ] [[package]] name = "actix-http" -version = "3.2.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f9ffb6db08c1c3a1f4aef540f1a63193adc73c4fbd40b75a95fc8c5258f6e51" +checksum = "0070905b2c4a98d184c4e81025253cb192aa8a73827553f38e9410801ceb35bb" dependencies = [ "actix-codec", "actix-rt", @@ -31,8 +31,8 @@ dependencies = [ "actix-tls", "actix-utils", "ahash", - "base64 0.13.1", - "bitflags", + "base64 0.21.2", + "bitflags 1.3.2", "bytes", "bytestring", "derive_more", @@ -51,6 +51,8 @@ dependencies = [ "rand 0.8.5", "sha1", "smallvec", + "tokio", + "tokio-util 0.7.8", "tracing", ] @@ -61,7 +63,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6" dependencies = [ "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -73,16 +75,16 @@ dependencies = [ "bytestring", "firestorm", "http", - "log 0.4.17", - "regex 1.7.1", + "log 0.4.20", + "regex 1.7.3", "serde", ] [[package]] name = "actix-rt" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ea16c295198e958ef31930a6ef37d0fb64e9ca3b6116e6b93a8bdae96ee1000" +checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e" dependencies = [ "actix-macros", "futures-core", @@ -100,9 +102,9 @@ dependencies = [ "actix-utils", "futures-core", "futures-util", - "mio 0.8.5", + "mio 0.8.8", "num_cpus", - "socket2", + "socket2 0.4.9", "tokio", "tracing", ] @@ -129,10 +131,10 @@ dependencies = [ "actix-service", "actix-utils", "futures-core", - "log 0.4.17", + "log 0.4.20", "pin-project-lite", "tokio-rustls", - "tokio-util", + "tokio-util 0.7.8", "webpki-roots", ] @@ -148,9 +150,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.1.0" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27e8fe9ba4ae613c21f677c2cfaf0696c3744030c6f485b34634e502d6bb379" +checksum = "cd3cb42f9566ab176e1ef0b8b3a896529062b4efc6be0123046095914c4c1c96" dependencies = [ "actix-codec", "actix-http", @@ -168,22 +170,33 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", + "http", "itoa 1.0.1", "language-tags", - "log 0.4.17", + "log 0.4.20", "mime", "once_cell", "pin-project-lite", - "regex 1.7.1", + "regex 1.7.3", "serde", "serde_json", "serde_urlencoded", "smallvec", - "socket2", + "socket2 0.4.9", "time 0.3.11", "url", ] +[[package]] +name = "addr" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a93b8a41dbe230ad5087cc721f8d41611de654542180586b315d9f4cf6b72bef" +dependencies = [ + "psl", + "psl-types", +] + [[package]] name = "addr2line" version = "0.16.0" @@ -228,6 +241,21 @@ dependencies = [ "memchr", ] +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "ansi_term" version = "0.11.0" @@ -239,9 +267,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.69" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" dependencies = [ "backtrace", ] @@ -266,13 +294,13 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "async-trait" -version = "0.1.61" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] @@ -315,15 +343,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.0" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bimap" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0455254eb5c6964c4545d8bac815e1a1be4f3afe0ae695ea539c12d728d44b" +checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" [[package]] name = "bincode" @@ -334,6 +362,21 @@ dependencies = [ "serde", ] +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bitflags" version = "1.3.2" @@ -341,10 +384,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "blake2b_simd" -version = "1.0.0" +name = "bitflags" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72936ee4afc7f8f736d1c38383b56480b5497b4617b4a77bdbf1d2ababc76127" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] +name = "blake2b_simd" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c2f0dc9a68c6317d884f97cc36cf5a3d20ba14ce404227df55e1af708ab04bc" dependencies = [ "arrayref", "arrayvec", @@ -389,9 +438,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "bytestring" @@ -404,20 +453,22 @@ dependencies = [ [[package]] name = "caps" -version = "0.5.2" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c088f2dddef283f86b023ab1ebe2301c653326834996458b2f48d29b804e9540" +checksum = "190baaad529bcfbde9e1a19022c42781bdb6ff9de25721abdb8fd98c0807730b" dependencies = [ - "errno", "libc", "thiserror", ] [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -433,15 +484,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" dependencies = [ - "libc", - "num-integer", + "android-tzdata", + "iana-time-zone", + "js-sys", "num-traits", "serde", "time 0.1.43", + "wasm-bindgen", "winapi 0.3.9", ] @@ -452,13 +505,23 @@ source = "git+https://github.com/habitat-sh/clap.git?branch=v2-master#21690ba25d dependencies = [ "ansi_term", "atty", - "bitflags", + "bitflags 1.3.2", "strsim", "textwrap", "unicode-width", "vec_map", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + [[package]] name = "colosseum" version = "0.2.2" @@ -468,33 +531,33 @@ checksum = "370c83b49aedf022ee27942e8ae1d9de1cf40dc9653ee6550e4455d08f6406f9" [[package]] name = "configopt" version = "0.1.0" -source = "git+https://github.com/habitat-sh/configopt.git#37990579c24c35b18e0e6dadd4f01ab021df7616" +source = "git+https://github.com/habitat-sh/configopt.git#98e4041a9922d6ebb5e548c3241fb82c76c6a4c0" dependencies = [ "colosseum", "configopt-derive", "lazy_static 1.4.0", "serde", "structopt", - "toml 0.5.10", + "toml 0.7.6", ] [[package]] name = "configopt-derive" version = "0.1.0" -source = "git+https://github.com/habitat-sh/configopt.git#37990579c24c35b18e0e6dadd4f01ab021df7616" +source = "git+https://github.com/habitat-sh/configopt.git#98e4041a9922d6ebb5e548c3241fb82c76c6a4c0" dependencies = [ "heck 0.3.3", "proc-macro2", "proc_macro_roids", "quote", - "syn", + "syn 1.0.104", ] [[package]] name = "constant_time_eq" -version = "0.1.5" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +checksum = "f3ad85c1f65dc7b37604eb0e89748faf0b9653065f2a8ef69f96a687ec1e9279" [[package]] name = "convert_case" @@ -514,9 +577,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" +checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpu-time" @@ -539,9 +602,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.2" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" +checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" dependencies = [ "libc", ] @@ -567,12 +630,12 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.1" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", + "crossbeam-utils 0.8.15", ] [[package]] @@ -588,12 +651,11 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if 1.0.0", - "lazy_static 1.4.0", ] [[package]] @@ -618,12 +680,56 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.2.3" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d91974fbbe88ec1df0c24a4f00f99583667a7e2e6272b2b92d294d81e462173" +checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e" dependencies = [ - "nix 0.25.0", - "winapi 0.3.9", + "nix", + "windows-sys 0.48.0", +] + +[[package]] +name = "cxx" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-build" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613" +dependencies = [ + "cc", + "codespan-reporting", + "once_cell", + "proc-macro2", + "quote", + "scratch", + "syn 1.0.104", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.104", ] [[package]] @@ -634,7 +740,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -647,9 +753,15 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.3.3", - "syn", + "syn 1.0.104", ] +[[package]] +name = "destructure_traitobject" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" + [[package]] name = "digest" version = "0.9.0" @@ -671,9 +783,9 @@ dependencies = [ [[package]] name = "dirs" -version = "3.0.2" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ "dirs-sys", ] @@ -690,13 +802,14 @@ dependencies = [ [[package]] name = "dirs-sys" -version = "0.3.6" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] @@ -712,16 +825,22 @@ dependencies = [ [[package]] name = "dns-lookup" -version = "1.0.8" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ecafc952c4528d9b51a458d1a8904b81783feff9fde08ab6ed2545ff396872" +checksum = "8f332aa79f9e9de741ac013237294ef42ce2e9c6394dc7d766725812f1238812" dependencies = [ "cfg-if 1.0.0", "libc", - "socket2", - "winapi 0.3.9", + "socket2 0.5.3", + "windows-sys 0.48.0", ] +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + [[package]] name = "ed25519" version = "1.2.0" @@ -754,14 +873,14 @@ checksum = "876927d21ef1ae98001c8c35a1d8dfd682136914b23ef04276820fa6d43c3630" [[package]] name = "env_logger" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", "humantime", - "log 0.4.17", - "regex 1.7.1", + "is-terminal", + "log 0.4.20", + "regex 1.7.3", "termcolor", ] @@ -771,21 +890,47 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a5019be18538406a43b5419a5501461f0c8b49ea7dfda0cfc32f4e51fc44be1" dependencies = [ - "log 0.4.17", + "log 0.4.20", "url", ] [[package]] -name = "errno" -version = "0.2.7" +name = "equivalent" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa68f2fb9cae9d37c9b2b3584aba698a2e97f72d7aef7b9f7aa71d8b54ce46fe" +checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1" + +[[package]] +name = "erased-serde" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f2b0c2380453a92ea8b6c8e5f64ecaafccddde8ceab55ff7a8ac1029f894569" +dependencies = [ + "serde", +] + +[[package]] +name = "errno" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" dependencies = [ "errno-dragonfly", "libc", "winapi 0.3.9", ] +[[package]] +name = "errno" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "errno-dragonfly" version = "0.1.1" @@ -802,6 +947,22 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8" +[[package]] +name = "fancy-regex" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +dependencies = [ + "bit-set", + "regex 1.7.3", +] + +[[package]] +name = "fastrand" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" + [[package]] name = "field-offset" version = "0.3.4" @@ -814,14 +975,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.15" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", - "winapi 0.3.9", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", ] [[package]] @@ -838,12 +999,12 @@ checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", - "miniz_oxide 0.6.2", + "miniz_oxide 0.7.1", ] [[package]] @@ -869,9 +1030,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ "percent-encoding", ] @@ -886,21 +1047,11 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "fsevent" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" -dependencies = [ - "bitflags", - "fsevent-sys", -] - [[package]] name = "fsevent-sys" -version = "2.0.1" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" dependencies = [ "libc", ] @@ -911,7 +1062,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", ] @@ -923,9 +1074,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -938,9 +1089,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -948,15 +1099,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -965,38 +1116,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -1024,7 +1175,7 @@ checksum = "c1d9279ca822891c1a4dae06d185612cf8fc6acfe5dff37781b41297811b12ee" dependencies = [ "cc", "libc", - "log 0.4.17", + "log 0.4.20", "rustversion", "winapi 0.3.9", ] @@ -1075,9 +1226,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "h2" -version = "0.3.13" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes", "fnv", @@ -1085,10 +1236,10 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.2", "slab", "tokio", - "tokio-util", + "tokio-util 0.7.8", "tracing", ] @@ -1098,8 +1249,8 @@ version = "0.0.0" dependencies = [ "anyhow", "atty", - "base64 0.21.0", - "bitflags", + "base64 0.21.2", + "bitflags 2.4.0", "chrono", "clap", "configopt", @@ -1117,7 +1268,7 @@ dependencies = [ "handlebars 0.29.1", "lazy_static 1.4.0", "libc", - "log 0.4.17", + "log 0.4.20", "pbr", "rants", "reqwest", @@ -1126,7 +1277,7 @@ dependencies = [ "same-file", "serde", "serde_json", - "serde_yaml", + "serde_yaml 0.9.25", "structopt", "tabwriter", "tar", @@ -1134,14 +1285,14 @@ dependencies = [ "termcolor", "thiserror", "tokio", - "toml 0.5.10", + "toml 0.7.6", "url", "uuid 1.2.2", "walkdir", "webpki", "widestring 1.0.2", "winapi 0.3.9", - "winreg 0.9.0", + "winreg 0.51.0", ] [[package]] @@ -1155,10 +1306,10 @@ dependencies = [ "habitat_core", "ipc-channel", "libc", - "log 0.4.17", - "nix 0.26.2", + "log 0.4.20", + "nix", "prost", - "semver 1.0.16", + "semver 1.0.18", "thiserror", "winapi 0.3.9", ] @@ -1174,7 +1325,7 @@ dependencies = [ "habitat_core", "ipc-channel", "libc", - "log 0.4.17", + "log 0.4.20", "prost", "serde", "thiserror", @@ -1197,7 +1348,7 @@ dependencies = [ "clap", "env_logger", "habitat_butterfly", - "log 0.4.17", + "log 0.4.20", ] [[package]] @@ -1208,31 +1359,31 @@ dependencies = [ "habitat-sup-protocol", "habitat_common", "habitat_core", - "log 0.4.17", + "log 0.4.20", "prost", "rustls", "termcolor", "tokio", - "tokio-util", + "tokio-util 0.7.8", ] [[package]] name = "habitat-sup-protocol" version = "0.0.0" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "bytes", "habitat_core", "lazy_static 1.4.0", - "log 0.4.17", + "log 0.4.20", "prost", "prost-build", "rand 0.8.5", "serde", "tempfile", "tokio", - "tokio-util", - "toml 0.5.10", + "tokio-util 0.7.8", + "toml 0.7.6", ] [[package]] @@ -1246,17 +1397,17 @@ dependencies = [ "futures", "habitat_core", "habitat_http_client", - "log 0.4.17", + "log 0.4.20", "pbr", "percent-encoding", "rand 0.8.5", - "regex 1.7.1", + "regex 1.7.3", "reqwest", "serde", "serde_json", "tee", "tokio", - "tokio-util", + "tokio-util 0.7.8", "url", ] @@ -1270,9 +1421,9 @@ dependencies = [ "habitat_common", "habitat_core", "lazy_static 1.4.0", - "log 0.4.17", + "log 0.4.20", "mktemp", - "parking_lot 0.12.0", + "parking_lot", "prometheus", "prost", "prost-build", @@ -1281,7 +1432,7 @@ dependencies = [ "serde_json", "tempfile", "threadpool", - "toml 0.5.10", + "toml 0.7.6", "uuid 1.2.2", "winapi 0.3.9", "zmq", @@ -1293,7 +1444,7 @@ version = "0.0.0" dependencies = [ "async-trait", "bimap", - "bitflags", + "bitflags 2.4.0", "clap", "dirs", "glob", @@ -1302,26 +1453,26 @@ dependencies = [ "handlebars 0.28.3", "lazy_static 1.4.0", "libc", - "log 0.4.17", + "log 0.4.20", "native-tls", - "nix 0.26.2", + "nix", "owning_ref", - "parking_lot 0.12.0", + "parking_lot", "pbr", "petgraph", - "regex 1.7.1", + "regex 1.7.3", "reqwest", "retry", "rustls", "serde", "serde-transcode", "serde_json", - "serde_yaml", + "serde_yaml 0.9.25", "tempfile", "termcolor", "thiserror", "tokio", - "toml 0.5.10", + "toml 0.7.6", "uuid 1.2.2", "valico", "winapi 0.3.9", @@ -1331,7 +1482,7 @@ dependencies = [ name = "habitat_core" version = "0.0.0" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "blake2b_simd", "caps", "cc", @@ -1339,23 +1490,23 @@ dependencies = [ "ctrlc", "dirs", "dns-lookup", - "errno", + "errno 0.3.2", "glob", "habitat_win_users", "hex", "lazy_static 1.4.0", "libc", - "log 0.4.17", + "log 0.4.20", "native-tls", - "nix 0.26.2", + "nix", "num_cpus", "os_info", "paste", - "pem", + "pem 3.0.1", "pin-project", "rand 0.8.5", "rcgen", - "regex 1.7.1", + "regex 1.7.3", "reqwest", "rustls", "rustls-pemfile", @@ -1369,8 +1520,7 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls", - "toml 0.5.10", - "typemap", + "toml 0.7.6", "url", "webpki", "widestring 1.0.2", @@ -1383,13 +1533,13 @@ dependencies = [ name = "habitat_http_client" version = "0.0.0" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", "env_proxy", "habitat_core", "httparse", - "log 0.4.17", + "log 0.4.20", "native-tls", - "pem", + "pem 3.0.1", "reqwest", "serde", "serde_json", @@ -1402,7 +1552,7 @@ name = "habitat_pkg_export_container" version = "0.0.0" dependencies = [ "anyhow", - "base64 0.21.0", + "base64 0.21.2", "clap", "env_logger", "hab", @@ -1411,7 +1561,7 @@ dependencies = [ "handlebars 0.29.1", "lazy_static 1.4.0", "linked-hash-map", - "log 0.4.17", + "log 0.4.20", "rusoto_core", "rusoto_credential", "rusoto_ecr", @@ -1436,7 +1586,7 @@ dependencies = [ "habitat_core", "handlebars 0.29.1", "lazy_static 1.4.0", - "log 0.4.17", + "log 0.4.20", "mktemp", "serde", "serde_json", @@ -1477,13 +1627,14 @@ dependencies = [ "hyper", "lazy_static 1.4.0", "libc", - "log 0.4.17", + "log 0.4.20", "log4rs", - "mio 0.8.5", - "nix 0.26.2", + "mio 0.8.8", + "multimap 0.9.0", + "nix", "notify", "num_cpus", - "parking_lot 0.12.0", + "parking_lot", "pin-project", "prometheus", "prost", @@ -1491,7 +1642,7 @@ dependencies = [ "prost-types", "rand 0.8.5", "rants", - "regex 1.7.1", + "regex 1.7.3", "reqwest", "rustls", "rustls-pemfile", @@ -1499,7 +1650,7 @@ dependencies = [ "serde-transcode", "serde_derive", "serde_json", - "serde_yaml", + "serde_yaml 0.9.25", "state", "structopt", "tempfile", @@ -1507,8 +1658,8 @@ dependencies = [ "thiserror", "tokio", "tokio-rustls", - "tokio-util", - "toml 0.5.10", + "tokio-util 0.7.8", + "toml 0.7.6", "url", "uuid 1.2.2", "valico", @@ -1520,7 +1671,7 @@ name = "habitat_win_users" version = "0.0.0" dependencies = [ "cc", - "log 0.4.17", + "log 0.4.20", "widestring 1.0.2", "winapi 0.3.9", ] @@ -1555,12 +1706,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" - [[package]] name = "hashbrown" version = "0.12.3" @@ -1570,6 +1715,12 @@ dependencies = [ "ahash", ] +[[package]] +name = "hashbrown" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" + [[package]] name = "heck" version = "0.3.3" @@ -1596,12 +1747,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -1661,9 +1809,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.20" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -1676,7 +1824,7 @@ dependencies = [ "httpdate", "itoa 1.0.1", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1697,21 +1845,34 @@ dependencies = [ ] [[package]] -name = "idna" -version = "0.2.3" +name = "iana-time-zone" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "winapi 0.3.9", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +dependencies = [ + "cxx", + "cxx-build", ] [[package]] name = "idna" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1719,21 +1880,31 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.7.0" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ "autocfg", - "hashbrown 0.11.2", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +dependencies = [ + "equivalent", + "hashbrown 0.14.0", ] [[package]] name = "inotify" -version = "0.7.1" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -1748,12 +1919,14 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.10" +name = "io-lifetimes" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "cfg-if 1.0.0", + "hermit-abi 0.3.2", + "libc", + "windows-sys 0.48.0", ] [[package]] @@ -1790,6 +1963,18 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" +[[package]] +name = "is-terminal" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" +dependencies = [ + "hermit-abi 0.3.2", + "io-lifetimes", + "rustix 0.36.8", + "windows-sys 0.45.0", +] + [[package]] name = "itertools" version = "0.10.1" @@ -1849,6 +2034,26 @@ dependencies = [ "winapi-build", ] +[[package]] +name = "kqueue" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + [[package]] name = "language-tags" version = "0.3.2" @@ -1867,17 +2072,11 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -[[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.139" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libsodium-sys" @@ -1891,12 +2090,33 @@ dependencies = [ "walkdir", ] +[[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" 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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" + [[package]] name = "local-channel" version = "0.1.2" @@ -1930,16 +2150,15 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" dependencies = [ - "log 0.4.17", + "log 0.4.20", ] [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ - "cfg-if 1.0.0", "serde", ] @@ -1951,9 +2170,9 @@ checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" [[package]] name = "log4rs" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "893eaf59f4bef8e2e94302adf56385db445a0306b9823582b0b8d5a06d8822f3" +checksum = "d36ca1786d9e79b8193a68d480a0907b612f109537115c6ff655a3a1967533fd" dependencies = [ "anyhow", "arc-swap", @@ -1962,16 +2181,16 @@ dependencies = [ "fnv", "humantime", "libc", - "log 0.4.17", + "log 0.4.20", "log-mdc", - "parking_lot 0.12.0", + "parking_lot", "serde", "serde-value", "serde_json", - "serde_yaml", + "serde_yaml 0.8.26", "thiserror", "thread-id", - "typemap", + "typemap-ors", "winapi 0.3.9", ] @@ -1999,12 +2218,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - [[package]] name = "maybe-uninit" version = "2.0.0" @@ -2081,9 +2294,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] @@ -2100,7 +2313,7 @@ dependencies = [ "iovec", "kernel32-sys", "libc", - "log 0.4.17", + "log 0.4.20", "miow", "net2", "slab", @@ -2109,26 +2322,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log 0.4.17", + "log 0.4.20", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", -] - -[[package]] -name = "mio-extras" -version = "2.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" -dependencies = [ - "lazycell", - "log 0.4.17", - "mio 0.6.23", - "slab", + "windows-sys 0.48.0", ] [[package]] @@ -2159,14 +2360,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] -name = "native-tls" -version = "0.2.10" +name = "multimap" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +checksum = "70db9248a93dc36a36d9a47898caa007a32755c7ad140ec64eeeb50d5a730631" +dependencies = [ + "serde", +] + +[[package]] +name = "native-tls" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static 1.4.0", "libc", - "log 0.4.17", + "log 0.4.20", "openssl", "openssl-probe", "openssl-sys", @@ -2187,25 +2397,13 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "nix" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if 1.0.0", - "libc", -] - [[package]] name = "nix" version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.7.1", @@ -2225,30 +2423,21 @@ dependencies = [ [[package]] name = "notify" -version = "4.0.17" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags", + "bitflags 2.4.0", + "crossbeam-channel 0.5.8", "filetime", - "fsevent", "fsevent-sys", "inotify", + "kqueue", "libc", - "mio 0.6.23", - "mio-extras", + "log 0.4.20", + "mio 0.8.8", "walkdir", - "winapi 0.3.9", -] - -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", + "windows-sys 0.48.0", ] [[package]] @@ -2262,11 +2451,11 @@ 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 0.3.2", "libc", ] @@ -2302,18 +2491,30 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.35" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "foreign-types", "libc", "once_cell", + "openssl-macros", "openssl-sys", ] +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.104", +] + [[package]] name = "openssl-probe" version = "0.1.4" @@ -2322,20 +2523,19 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-src" -version = "111.22.0+1.1.1q" +version = "111.25.0+1.1.1t" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" +checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.65" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ - "autocfg", "cc", "libc", "openssl-src", @@ -2343,6 +2543,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "ordered-float" version = "2.7.0" @@ -2354,11 +2560,11 @@ dependencies = [ [[package]] name = "os_info" -version = "3.0.6" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d2536ab8ff7605e8dc7044ec2f3eb0d49750cb559af9e5373c4564a3706cdd" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" dependencies = [ - "log 0.4.17", + "log 0.4.20", "serde", "winapi 0.3.9", ] @@ -2374,37 +2580,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.11.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.5", -] - -[[package]] -name = "parking_lot" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.2", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall", - "smallvec", - "winapi 0.3.9", + "parking_lot_core", ] [[package]] @@ -2417,7 +2598,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "petgraph", - "redox_syscall", + "redox_syscall 0.2.10", "smallvec", "thread-id", "windows-sys 0.34.0", @@ -2425,36 +2606,46 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "pbr" -version = "1.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff5751d87f7c00ae6403eb1fcbba229b9c76c9a30de8c1cf87182177b168cea2" +checksum = "ed5827dfa0d69b6c92493d6c38e633bbaa5937c153d0d7c28bf12313f8c6d514" dependencies = [ - "crossbeam-channel 0.5.1", + "crossbeam-channel 0.5.8", "libc", - "time 0.1.43", "winapi 0.3.9", ] [[package]] name = "pem" -version = "1.1.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8" +checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" dependencies = [ - "base64 0.13.1", + "base64 0.21.2", + "serde", +] + +[[package]] +name = "pem" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3127afbfc30b4cad60c34aeb741fb562a808642b81142bcf4afb73142da960" +dependencies = [ + "base64 0.21.2", + "serde", ] [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" @@ -2473,28 +2664,28 @@ dependencies = [ [[package]] name = "petgraph" -version = "0.6.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 2.0.0", ] [[package]] name = "phf" -version = "0.8.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" dependencies = [ "phf_shared", ] [[package]] name = "phf_codegen" -version = "0.8.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" +checksum = "a56ac890c5e3ca598bbdeaa99964edb5b0258a583a9eb6ef4e89fc85d9224770" dependencies = [ "phf_generator", "phf_shared", @@ -2502,48 +2693,48 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.8.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" +checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" dependencies = [ "phf_shared", - "rand 0.7.3", + "rand 0.8.5", ] [[package]] name = "phf_shared" -version = "0.8.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" +checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" dependencies = [ "siphasher", ] [[package]] name = "pin-project" -version = "1.0.12" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.12" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -2563,6 +2754,16 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +[[package]] +name = "prettyplease" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e97e3215779627f01ee256d2fad52f3d95e8e1c11e9fc6fd08f7cd455d5d5c78" +dependencies = [ + "proc-macro2", + "syn 1.0.104", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2572,7 +2773,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.104", "version_check", ] @@ -2589,9 +2790,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" dependencies = [ "unicode-ident", ] @@ -2604,29 +2805,29 @@ checksum = "06675fa2c577f52bcf77fbb511123927547d154faa08097cc012c66ec3c9611a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] name = "prometheus" -version = "0.12.0" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5986aa8d62380092d2f50f8b1cdba9cb9b6731ffd4b25b51fd126b6c3e05b99c" +checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" dependencies = [ "cfg-if 1.0.0", "fnv", "lazy_static 1.4.0", "memchr", - "parking_lot 0.11.2", + "parking_lot", "protobuf", "thiserror", ] [[package]] name = "prost" -version = "0.11.6" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ "bytes", "prost-derive", @@ -2634,44 +2835,45 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.1" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f835c582e6bd972ba8347313300219fed5bfa52caf175298d860b61ff6069bb" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ "bytes", "heck 0.4.0", "itertools", "lazy_static 1.4.0", - "log 0.4.17", - "multimap", + "log 0.4.20", + "multimap 0.8.3", "petgraph", + "prettyplease", "prost", "prost-types", - "regex 1.7.1", + "regex 1.7.3", + "syn 1.0.104", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.11.6" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools", "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] name = "prost-types" -version = "0.11.6" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" dependencies = [ - "bytes", "prost", ] @@ -2682,15 +2884,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "020f86b07722c5c4291f7c723eac4676b3892d47d9a7708dc2779696407f039b" [[package]] -name = "publicsuffix" -version = "1.5.6" +name = "psl" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b4ce31ff0a27d93c8de1849cf58162283752f065a90d508f1105fa6c9a213f" +checksum = "2ac31add97d7c393248c273c9f862bcfd396e870db1ff5dec63e0e707db82ae4" dependencies = [ - "idna 0.2.3", - "url", + "psl-types", ] +[[package]] +name = "psl-types" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" + [[package]] name = "quick-error" version = "1.2.3" @@ -2699,9 +2906,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.9" +version = "1.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" dependencies = [ "proc-macro2", ] @@ -2717,7 +2924,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", - "rand_pcg", ] [[package]] @@ -2778,15 +2984,6 @@ 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 = "rants" version = "0.6.0" @@ -2794,7 +2991,7 @@ source = "git+https://github.com/habitat-sh/rants.git#7fd1434ecaaf9af743ccab1840 dependencies = [ "bytes", "futures", - "log 0.4.17", + "log 0.4.20", "native-tls", "nom", "owning_ref", @@ -2805,17 +3002,17 @@ dependencies = [ "tokio", "tokio-native-tls", "tokio-stream", - "tokio-util", + "tokio-util 0.7.8", "uuid 1.2.2", ] [[package]] name = "rcgen" -version = "0.9.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" +checksum = "4954fbc00dcd4d8282c987710e50ba513d351400dbdd00e803a05172a90d8976" dependencies = [ - "pem", + "pem 2.0.1", "ring", "time 0.3.11", "yasna", @@ -2827,7 +3024,16 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ - "bitflags", + "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]] @@ -2837,7 +3043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ "getrandom 0.2.3", - "redox_syscall", + "redox_syscall 0.2.10", ] [[package]] @@ -2855,13 +3061,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.1" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick 0.7.18", "memchr", - "regex-syntax 0.6.27", + "regex-syntax 0.6.29", ] [[package]] @@ -2875,30 +3081,22 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "reqwest" -version = "0.11.4" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22" +checksum = "87f242f1488a539a79bac6dbe7c8609ae43b7914b7736210f239a37cccb32525" dependencies = [ "base64 0.13.1", "bytes", "encoding_rs", "futures-core", "futures-util", + "h2", "http", "http-body", "hyper", @@ -2906,7 +3104,7 @@ dependencies = [ "ipnet", "js-sys", "lazy_static 1.4.0", - "log 0.4.17", + "log 0.4.20", "mime", "native-tls", "percent-encoding", @@ -2916,6 +3114,7 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-native-tls", + "tokio-util 0.6.10", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -2949,9 +3148,9 @@ dependencies = [ [[package]] name = "rusoto_core" -version = "0.47.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b4f000e8934c1b4f70adde180056812e7ea6b1a247952db8ee98c94cd3116cc" +checksum = "1db30db44ea73551326269adcf7a2169428a054f14faf9e1768f2163494f2fa2" dependencies = [ "async-trait", "base64 0.13.1", @@ -2962,7 +3161,7 @@ dependencies = [ "hyper", "hyper-tls", "lazy_static 1.4.0", - "log 0.4.17", + "log 0.4.20", "rusoto_credential", "rusoto_signature", "rustc_version 0.4.0", @@ -2974,9 +3173,9 @@ dependencies = [ [[package]] name = "rusoto_credential" -version = "0.47.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a46b67db7bb66f5541e44db22b0a02fed59c9603e146db3a9e633272d3bac2f" +checksum = "ee0a6c13db5aad6047b6a44ef023dbbc21a056b6dab5be3b79ce4283d5c02d05" dependencies = [ "async-trait", "chrono", @@ -2992,9 +3191,9 @@ dependencies = [ [[package]] name = "rusoto_ecr" -version = "0.47.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ec4a28e4fb276307c2129abb16cf7d5573da4ec24d9e3895cc5c8a8bc21a4d" +checksum = "f2acfd092a618d37dbfb6f42e519c6e530a11115859a3e1f03d1daf8cc648d09" dependencies = [ "async-trait", "bytes", @@ -3006,9 +3205,9 @@ dependencies = [ [[package]] name = "rusoto_signature" -version = "0.47.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6264e93384b90a747758bcc82079711eacf2e755c3a8b5091687b5349d870bcc" +checksum = "a5ae95491c8b4847931e291b151127eccd6ff8ca13f33603eb3d0035ecb05272" dependencies = [ "base64 0.13.1", "bytes", @@ -3019,7 +3218,7 @@ dependencies = [ "hmac", "http", "hyper", - "log 0.4.17", + "log 0.4.20", "md-5", "percent-encoding", "pin-project-lite", @@ -3051,16 +3250,43 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.16", + "semver 1.0.18", +] + +[[package]] +name = "rustix" +version = "0.36.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" +dependencies = [ + "bitflags 1.3.2", + "errno 0.2.8", + "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 0.3.2", + "libc", + "linux-raw-sys 0.4.3", + "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.20.6" +version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ - "log 0.4.17", + "log 0.4.20", "ring", "sct", "webpki", @@ -3068,11 +3294,11 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.0", + "base64 0.21.2", ] [[package]] @@ -3118,6 +3344,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "scratch" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" + [[package]] name = "sct" version = "0.7.0" @@ -3134,7 +3366,7 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -3162,9 +3394,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.16" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "semver-parser" @@ -3177,9 +3409,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.152" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31" dependencies = [ "serde_derive", ] @@ -3205,32 +3437,41 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.185" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ - "indexmap", + "indexmap 2.0.0", "itoa 1.0.1", "ryu", "serde", ] [[package]] -name = "serde_test" -version = "1.0.152" +name = "serde_spanned" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3611210d2d67e3513204742004d6ac6f589e521861dabb0f649b070eea8bed9e" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_test" +version = "1.0.176" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a2f49ace1498612d14f7e0b8245519584db8299541dfe31a06374a828d620ab" dependencies = [ "serde", ] @@ -3253,12 +3494,25 @@ version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ - "indexmap", + "indexmap 1.9.2", "ryu", "serde", "yaml-rust", ] +[[package]] +name = "serde_yaml" +version = "0.9.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +dependencies = [ + "indexmap 2.0.0", + "itoa 1.0.1", + "ryu", + "serde", + "unsafe-libyaml", +] + [[package]] name = "sha1" version = "0.10.1" @@ -3266,7 +3520,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c77f4e7f65455545c2153c1253d25056825e77ee2533f0e41deb65a93a34852f" dependencies = [ "cfg-if 1.0.0", - "cpufeatures 0.2.2", + "cpufeatures 0.2.5", "digest 0.10.3", ] @@ -3324,14 +3578,24 @@ checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi 0.3.9", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "sodiumoxide" version = "0.2.7" @@ -3358,9 +3622,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" [[package]] name = "state" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cf4f5369e6d3044b5e365c9690f451516ac8f0954084622b49ea3fde2f6de5" +checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8" dependencies = [ "loom", ] @@ -3396,7 +3660,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.104", ] [[package]] @@ -3416,6 +3680,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "tabwriter" version = "1.2.1" @@ -3427,9 +3702,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.36" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8190d9cdacf6ee1b080605fd719b58d80a9fcbcea64db6744b26f743da02e447" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" dependencies = [ "filetime", "libc", @@ -3444,23 +3719,22 @@ checksum = "37c12559dba7383625faaff75be24becf35bfc885044375bcab931111799a3da" [[package]] name = "tempfile" -version = "3.2.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if 1.0.0", - "libc", - "rand 0.8.5", - "redox_syscall", - "remove_dir_all", - "winapi 0.3.9", + "fastrand", + "redox_syscall 0.3.5", + "rustix 0.38.4", + "windows-sys 0.48.0", ] [[package]] name = "termcolor" -version = "1.1.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] @@ -3474,7 +3748,7 @@ dependencies = [ "clap", "serde", "serde_json", - "toml 0.5.10", + "toml 0.7.6", ] [[package]] @@ -3488,22 +3762,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] @@ -3513,7 +3787,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f" dependencies = [ "libc", - "redox_syscall", + "redox_syscall 0.2.10", "winapi 0.3.9", ] @@ -3573,34 +3847,32 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.20.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", - "memchr", - "mio 0.8.5", + "mio 0.8.8", "num_cpus", - "once_cell", - "parking_lot 0.12.0", + "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.3", "tokio-macros", - "winapi 0.3.9", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.8.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.28", ] [[package]] @@ -3633,14 +3905,28 @@ dependencies = [ "futures-core", "pin-project-lite", "tokio", - "tokio-util", + "tokio-util 0.7.8", ] [[package]] name = "tokio-util" -version = "0.7.3" +version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "log 0.4.20", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -3662,12 +3948,37 @@ checksum = "736b60249cb25337bc196faa43ee12c705e426f3d55c214d73a4e7be06f92cb4" [[package]] name = "toml" -version = "0.5.10" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ - "indexmap", + "indexmap 2.0.0", "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c500344a19072298cd05a7224b3c0c629348b78692bf48466c5238656e315a78" +dependencies = [ + "indexmap 2.0.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] [[package]] @@ -3683,7 +3994,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160" dependencies = [ "cfg-if 1.0.0", - "log 0.4.17", + "log 0.4.20", "pin-project-lite", "tracing-core", ] @@ -3697,12 +4008,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "traitobject" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" - [[package]] name = "try-lock" version = "0.2.3" @@ -3710,12 +4015,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] -name = "typemap" -version = "0.3.3" +name = "typemap-ors" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +checksum = "a68c24b707f02dd18f1e4ccceb9d49f2058c2fb86384ef9972592904d7a28867" dependencies = [ - "unsafe-any", + "unsafe-any-ors", ] [[package]] @@ -3738,12 +4043,9 @@ checksum = "c85f514e095d348c279b1e5cd76795082cf15bd59b93207832abe0b1d8fed236" [[package]] name = "unicode-bidi" -version = "0.3.5" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" @@ -3753,9 +4055,9 @@ checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] @@ -3773,14 +4075,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] -name = "unsafe-any" -version = "0.4.2" +name = "unsafe-any-ors" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +checksum = "e0a303d30665362d9680d7d91d78b23f5f899504d4f08b3c4cf08d055d87c0ad" dependencies = [ - "traitobject", + "destructure_traitobject", ] +[[package]] +name = "unsafe-libyaml" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6" + [[package]] name = "untrusted" version = "0.7.1" @@ -3793,17 +4101,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcde98d1fc3f528255b1ecb22fb688ee0d23deb672a8c57127df10b98b4bd18c" dependencies = [ - "regex 1.7.1", + "regex 1.7.3", ] [[package]] name = "url" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" dependencies = [ "form_urlencoded", - "idna 0.3.0", + "idna", "percent-encoding", "serde", ] @@ -3834,24 +4142,26 @@ dependencies = [ [[package]] name = "valico" -version = "3.6.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d81a70f930f9e6cd04669d38abcf232f96b193acceb0f4c006427ddec6e08b10" +checksum = "ca8a0a4df97f827fcbcbe69c65364acddddf3a4bb50e6507f63361177a7ea7a4" dependencies = [ - "base64 0.13.1", + "addr", + "base64 0.21.2", "chrono", + "downcast-rs", + "erased-serde", + "fancy-regex", "json-pointer", "jsonway", "percent-encoding", "phf", "phf_codegen", - "publicsuffix", - "regex 1.7.1", "serde", "serde_json", "uritemplate-next", "url", - "uuid 0.8.2", + "uuid 1.2.2", ] [[package]] @@ -3874,12 +4184,11 @@ checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi 0.3.9", "winapi-util", ] @@ -3889,7 +4198,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" dependencies = [ - "log 0.4.17", + "log 0.4.20", "try-lock", ] @@ -3918,8 +4227,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b608ecc8f4198fe8680e2ed18eccab5f0cd4caaf3d83516fa5fb2e927fda2586" dependencies = [ "cfg-if 1.0.0", - "serde", - "serde_json", "wasm-bindgen-macro", ] @@ -3931,10 +4238,10 @@ checksum = "580aa3a91a63d23aac5b6b267e2d13cb4f363e31dce6c352fca4752ae12e479f" dependencies = [ "bumpalo", "lazy_static 1.4.0", - "log 0.4.17", + "log 0.4.20", "proc-macro2", "quote", - "syn", + "syn 1.0.104", "wasm-bindgen-shared", ] @@ -3968,7 +4275,7 @@ checksum = "6c2657dd393f03aa2a659c25c6ae18a13a4048cebd220e147933ea837efc589f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.104", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4101,24 +4408,63 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows-targets 0.42.1", +] + +[[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.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.1", + "windows_aarch64_msvc 0.42.1", + "windows_i686_gnu 0.42.1", + "windows_i686_msvc 0.42.1", + "windows_x86_64_gnu 0.42.1", + "windows_x86_64_gnullvm 0.42.1", + "windows_x86_64_msvc 0.42.1", +] + +[[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.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" + +[[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" @@ -4128,9 +4474,15 @@ checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" + +[[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" @@ -4140,9 +4492,15 @@ checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" + +[[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" @@ -4152,9 +4510,15 @@ checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" + +[[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" @@ -4164,15 +4528,27 @@ checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" + +[[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.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" + +[[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" @@ -4182,9 +4558,24 @@ checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" + +[[package]] +name = "winnow" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +dependencies = [ + "memchr", +] [[package]] name = "winreg" @@ -4197,11 +4588,12 @@ dependencies = [ [[package]] name = "winreg" -version = "0.9.0" +version = "0.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16cdb3898397cf7f624c294948669beafaeebc5577d5ec53d0afb76633593597" +checksum = "937f3df7948156640f46aacef17a70db0de5917bda9c92b0f751f3a955b588fc" dependencies = [ - "winapi 0.3.9", + "cfg-if 1.0.0", + "windows-sys 0.48.0", ] [[package]] @@ -4216,18 +4608,18 @@ dependencies = [ [[package]] name = "xattr" -version = "0.2.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "244c3741f4240ef46274860397c7c74e50eb23624996930e484c16679633a54c" +checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" dependencies = [ "libc", ] [[package]] name = "xml-rs" -version = "0.8.4" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +checksum = "52839dc911083a8ef63efa4d039d1f58b5e409f923e44c80828f206f66e5541c" [[package]] name = "xz2" @@ -4249,9 +4641,9 @@ dependencies = [ [[package]] name = "yasna" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346d34a236c9d3e5f3b9b74563f238f955bbd05fa0b8b4efa53c130c43982f4c" +checksum = "e17bb3549cc1321ae1296b9cdc2698e2b6cb1992adfa19a8c72e5b7a738f44cd" dependencies = [ "time 0.3.11", ] @@ -4267,9 +4659,9 @@ name = "zmq" version = "0.9.2" source = "git+https://github.com/habitat-sh/rust-zmq?branch=v0.9.2-symlinks-removed#048f33ed4b9241a2c63b4c9b61fdf8bcd142ae00" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", - "log 0.4.17", + "log 0.4.20", "zmq-sys", ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix index 1ff968fc4e..03f6d79a53 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/habitat/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "habitat"; - version = "1.6.652"; + version = "1.6.848"; src = fetchFromGitHub { owner = "habitat-sh"; repo = "habitat"; rev = version; - hash = "sha256-aWQ4A8NxTOauwad1q58Q4IFDUImX/L/4YTCeVLaq8gw="; + hash = "sha256-oK9ZzENwpEq6W1qnhSgkr7Rhy7Fxt/BS4U5nxecyPu8="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "clap-2.33.1" = "sha256-ixyNr91VNB2ce2cIr0CdPmvKYRlckhKLeaSbqxouIAY="; - "configopt-0.1.0" = "sha256-DvpC4WDIzknN5A6+68H7p8bG5lwZ2f+kc9yYhTl16ZM="; + "configopt-0.1.0" = "sha256-76MeSoRD796ZzBqX3CoDJnunekVo2XfctpxrpspxmAU="; "rants-0.6.0" = "sha256-B8uDoiqddCki3j7aC8kilEcmJjvB4ICjZjjTun2UEkY="; "retry-1.0.0" = "sha256-ZaHnzOCelV4V0+MTIbH3DXxdz8QZVgcMq2YeV0S6X6o="; "structopt-0.3.15" = "sha256-0vIX7J7VktKytT3ZnOm45qPRMHDkdJg20eU6pZBIH+Q="; @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.habitat.sh"; changelog = "https://github.com/habitat-sh/habitat/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; - maintainers = with maintainers; [ rushmorem ]; + maintainers = with maintainers; [ rushmorem qjoly ]; mainProgram = "hab"; platforms = [ "x86_64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hashi-up/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/hashi-up/default.nix index 1efc1c438a..583a0c32b1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/hashi-up/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/hashi-up/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-PdZ8X2pJ5TfT0bJ4/P/XbMTv+yyL5/1AxIFHnL/qNcg="; }; - vendorSha256 = "sha256-dircE3WlDPsPnF+0wT5RG/c4hC8qPs8NaSGM5wpvVlM="; + vendorHash = "sha256-dircE3WlDPsPnF+0wT5RG/c4hC8qPs8NaSGM5wpvVlM="; meta = with lib; { description = "A lightweight utility to install HashiCorp Consul, Nomad, or Vault on any remote Linux host"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm-docs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm-docs/default.nix index 3a09148394..cf286c8dc6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-docs"; - version = "1.11.0"; + version = "1.11.2"; src = fetchFromGitHub { owner = "norwoodj"; repo = "helm-docs"; rev = "v${version}"; - sha256 = "sha256-476ZhjRwHlNJFkHzY8qQ7WbAUUpFNSoxXLGX9esDA/E="; + hash = "sha256-w4QV96/02Pbs/l0lTLPYY8Ag21ZDDVPdgvuveiKUCoM="; }; - vendorSha256 = "sha256-xXwunk9rmzZEtqmSo8biuXnAjPp7fqWdQ+Kt9+Di9N8="; + vendorHash = "sha256-6byD8FdeqdRDNUZFZ7FUUdyTuFOO8s3rb6YPGKdwLB8="; subPackages = [ "cmd/helm-docs" ]; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index f3af1036a8..6a8c2d0166 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.12.2"; + version = "3.13.0"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-nUkUb41UX9kCIjBrz3AMnaHZSgNoEc+lS6J8Edy6lVA="; + sha256 = "sha256-/czguDCjnQPO4bcWa9Idl9U3yzFDxL7D4P/Ia7ZzMXE="; }; - vendorHash = "sha256-4NsGosKFyl3T3bIndYRP0hhJQ5oj6KuSv4kYH9b83WE="; + vendorHash = "sha256-ba5ZUpV8QHn8T1mXxY5WB0pA1OGUzmNixtwwTQFrqb4="; subPackages = [ "cmd/helm" ]; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix index f54d2b332f..a5a2f7566b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "helm-cm-push"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "chartmuseum"; repo = "helm-push"; rev = "v${version}"; - hash = "sha256-GyVhjCosVaUS1DtztztFxKuuRlUdxlsOP4/QMQ7+TaU="; + hash = "sha256-YnhI1/BDk9swr3YFm5ajGf4LLgPty7blA2tlsMH0erY="; }; - vendorSha256 = "sha256-9LhokpQrREmcyBqwb33BSMyG8z7IAsl9NtE3B631PnM="; + vendorHash = "sha256-7bUDKqkvBV1Upcrj4DQnVCP74QtKlSwF0Kl2sPFZpjc="; subPackage = [ "cmd/helm-cm-push" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix index 79daed87e7..9d2159f2c3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "hypnoglow"; repo = pname; rev = "v${version}"; - sha256 = "sha256-81Rzqu2fj6xSZbKvAhHzaGnr/3ACZvqJhYe+6Vyc0qk="; + hash = "sha256-81Rzqu2fj6xSZbKvAhHzaGnr/3ACZvqJhYe+6Vyc0qk="; }; - vendorSha256 = "sha256-Jvfl0sdZXV497RIgoZUJD0zK/pXK6yeAnuSdq42nky8="; + vendorHash = "sha256-Jvfl0sdZXV497RIgoZUJD0zK/pXK6yeAnuSdq42nky8="; # NOTE: Remove the install and upgrade hooks. postPatch = '' @@ -34,7 +34,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "A Helm plugin that shows a diff"; + description = "A Helm plugin that allows to set up a chart repository using AWS S3"; homepage = "https://github.com/hypnoglow/helm-s3"; license = licenses.mit; maintainers = with maintainers; [ yurrriq ]; 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 22a993a017..da65c16973 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.4.2"; + version = "4.5.0"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - hash = "sha256-GpPgjRqzH4fcnaHs9SWfdaCZimwBleXnxQLjqy8SArs="; + hash = "sha256-zytorArHhdwF7F9c2QkaX3KxLNlWySKieK2K1b5omFI="; }; 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 e175c49155..b70ecd725e 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.156.0"; + version = "0.157.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-MrDhOsjXo4aaeWSo/WNheUqom7kF2MzyaqeZXVAAzz4="; + sha256 = "sha256-M0XhkmYdmKpaA1gTXGgI7XNqIAuerV2NqfUI7sIgIiw="; }; - vendorHash = "sha256-hMoBwA9KmQSBJkEu3UAxM1wi6RRHZdUhYqri5JGwEmw="; + vendorHash = "sha256-RRnziHhM3pxoi5dZSZI5bkGWIp3Nx0TU3mVsOoU/CCM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix index 0afe7b8344..204b089624 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-kwcmZSOA26XuSgNSHitGaMohalnLobabXf4z3ybSJtk="; }; - vendorSha256 = "sha256-ZtcCBXcJXX9ThzY6T0MhNfDDzRC9PYzRB1VyS4LLXLs="; + vendorHash = "sha256-ZtcCBXcJXX9ThzY6T0MhNfDDzRC9PYzRB1VyS4LLXLs="; doCheck = false; 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 b8eb1a79bf..c7b66eaac7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-ntjrk2OEIkAmNpf9Ag6HkSIOSA3NtO9hSJOBgvne4b0="; }; - vendorSha256 = "sha256-JlaXQqDO/b1xe9NA2JtuB1DZZlphWu3Mo/Mf4lhmKNo="; + vendorHash = "sha256-JlaXQqDO/b1xe9NA2JtuB1DZZlphWu3Mo/Mf4lhmKNo="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix index b02dcd3d83..e74595903b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3d/default.nix @@ -15,13 +15,13 @@ let in buildGoModule rec { pname = "k3d"; - version = "5.5.2"; + version = "5.6.0"; src = fetchFromGitHub { owner = "k3d-io"; repo = "k3d"; rev = "refs/tags/v${version}"; - hash = "sha256-Pa2kqeVl+TEsHOpnE7+iG3feYVAuYrDYnWyDpWJay7M="; + hash = "sha256-KIYwuDPkxhtQy989XW+DcI5NJPhfLP07mYUFc180Sdw="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/default.nix index 6f7644dd54..25b615d671 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_24/default.nix @@ -51,7 +51,7 @@ let k3sVersion = "1.24.10+k3s1"; # k3s git tag k3sCommit = "546a94e9ae1c3be6f9c0dcde32a6e6672b035bc8"; # k3s git commit at the above version k3sRepoSha256 = "sha256-HfkGb3GtR2wQkVIze26aFh6A6W0fegr8ovpSel7oujQ="; - k3sVendorSha256 = "sha256-YAerisDr/knlKPaO2fVMZA4FUpwshFmkpi3mJAmLqKM="; + k3sVendorHash = "sha256-YAerisDr/knlKPaO2fVMZA4FUpwshFmkpi3mJAmLqKM="; # Based on the traefik charts here: https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/scripts/download#L29-L32 # see also https://github.com/k3s-io/k3s/blob/v1.24.10%2Bk3s1/manifests/traefik.yaml#L8-L16 @@ -117,7 +117,7 @@ let k3sCNIPlugins = buildGoModule rec { pname = "k3s-cni-plugins"; version = k3sCNIVersion; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; @@ -170,7 +170,7 @@ let version = k3sVersion; src = k3sRepo; - vendorSha256 = k3sVendorSha256; + vendorHash = k3sVendorHash; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp sqlite.dev ]; @@ -210,7 +210,7 @@ let rev = "v${containerdVersion}"; sha256 = containerdSha256; }; - vendorSha256 = null; + vendorHash = null; buildInputs = [ btrfs-progs ]; subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; ldflags = versionldflags; @@ -221,7 +221,7 @@ buildGoModule rec { version = k3sVersion; src = k3sRepo; - vendorSha256 = k3sVendorSha256; + vendorHash = k3sVendorHash; postPatch = '' # Nix prefers dynamically linked binaries over static binary. @@ -279,7 +279,7 @@ buildGoModule rec { # Specifically, it has a 'go generate' which runs part of the package. See # this comment: # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 - # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + # So, why do we use buildGoModule at all? For the `vendorHash` / `go mod download` stuff primarily. buildPhase = '' patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/default.nix index 47c3b5886c..7ea3ff7867 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_25/default.nix @@ -51,7 +51,7 @@ let k3sVersion = "1.25.3+k3s1"; # k3s git tag k3sCommit = "f2585c1671b31b4b34bddbb3bf4e7d69662b0821"; # k3s git commit at the above version k3sRepoSha256 = "0zwf3iwjcidx14zw36s1hr0q8wmmbfc0rfqwd7fmpjq597h8zkms"; - k3sVendorSha256 = "sha256-U67tJRGqPFk5AfRe7I50zKGC9HJ2oh+iI/C7qF/76BQ="; + k3sVendorHash = "sha256-U67tJRGqPFk5AfRe7I50zKGC9HJ2oh+iI/C7qF/76BQ="; # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. @@ -116,7 +116,7 @@ let k3sCNIPlugins = buildGoModule rec { pname = "k3s-cni-plugins"; version = k3sCNIVersion; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; @@ -169,7 +169,7 @@ let version = k3sVersion; src = k3sRepo; - vendorSha256 = k3sVendorSha256; + vendorHash = k3sVendorHash; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp sqlite.dev ]; @@ -208,7 +208,7 @@ let rev = "v${containerdVersion}"; sha256 = containerdSha256; }; - vendorSha256 = null; + vendorHash = null; buildInputs = [ btrfs-progs ]; subPackages = [ "cmd/containerd" "cmd/containerd-shim-runc-v2" ]; ldflags = versionldflags; @@ -219,7 +219,7 @@ buildGoModule rec { version = k3sVersion; src = k3sRepo; - vendorSha256 = k3sVendorSha256; + vendorHash = k3sVendorHash; patches = [ ./0001-script-download-strip-downloading-just-package-CRD.patch @@ -281,7 +281,7 @@ buildGoModule rec { # Specifically, it has a 'go generate' which runs part of the package. See # this comment: # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 - # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + # So, why do we use buildGoModule at all? For the `vendorHash` / `go mod download` stuff primarily. buildPhase = '' patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/versions.nix index 799fd3f9b1..93df5633f5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_26/versions.nix @@ -2,7 +2,7 @@ k3sVersion = "1.26.6+k3s1"; k3sCommit = "3b1919b0d55811707bd1168f0abf11cccc656c26"; k3sRepoSha256 = "1g82bkq4w0jpfn1fanj1d24bj46rw908wk50p3cm47rqiqlys72y"; - k3sVendorSha256 = "sha256-+a9/q5a28zA9SmAdp2IItHR1MdJvlbMW5796bHTfKBw="; + k3sVendorHash = "sha256-+a9/q5a28zA9SmAdp2IItHR1MdJvlbMW5796bHTfKBw="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix index 257b8e28a8..df84a0a95d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/1_27/versions.nix @@ -1,14 +1,14 @@ { - k3sVersion = "1.27.4+k3s1"; - k3sCommit = "36645e7311e9bdbbf2adb79ecd8bd68556bc86f6"; - k3sRepoSha256 = "0nvh66c4c01kcz63vk2arh0cd9kcss7c83r92ds6f15x1fxv1w3z"; - k3sVendorSha256 = "sha256-azHl2jv/ioI7FVWpgtp7a1dmO9Dlr4CnRmGCIh5Biyg="; + k3sVersion = "1.27.6+k3s1"; + k3sCommit = "bd04941a294793ec92e8703d5e5da14107902e88"; + k3sRepoSha256 = "04chr8gp0yprihigy1yzhvi2baby053fav384gq0sjq6bkp3fzd8"; + k3sVendorHash = "sha256-LH9OsBK0Pq/NGEHprbIgYKQsslYdR3i4LYVvo5P0K+8="; chartVersions = import ./chart-versions.nix; k3sRootVersion = "0.12.2"; k3sRootSha256 = "1gjynvr350qni5mskgm7pcc7alss4gms4jmkiv453vs8mmma9c9k"; - k3sCNIVersion = "1.2.0-k3s1"; - k3sCNISha256 = "0hzcap4vbl94zsiqc66dlwjgql50gw5g6f0adag0p8yqwcy6vaw2"; - containerdVersion = "1.7.1-k3s1"; - containerdSha256 = "00k7nkclfxwbzcgnn8s7rkrxyn0zpk57nyy18icf23wsj352gfrn"; + k3sCNIVersion = "1.3.0-k3s1"; + k3sCNISha256 = "0zma9g4wvdnhs9igs03xlx15bk2nq56j73zns9xgqmfiixd9c9av"; + containerdVersion = "1.7.6-k3s1.27"; + containerdSha256 = "1kzjqw56pcdpsqdkw2k5a3pnpf8n93dh4jc2yybgqz3nyj4fw0a8"; criCtlVersion = "1.26.0-rc.0-k3s1"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/README.md b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/README.md index 2e16de7bfa..df2bead6be 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/README.md +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/README.md @@ -25,7 +25,7 @@ NixOS releases should avoid having deprecated software, or making major version As such, we would like to have only the newest K3s version in each NixOS release at the time the release branch is branched off, which will ensure the -K3s version in that release will receieve updates for the longest duration +K3s version in that release will receive updates for the longest duration possible. However, this conflicts with another desire: we would like people to be able to upgrade between NixOS stable releases without needing to make a large enough k3s version jump that they violate the Kubernetes version skew policy. diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix index 9605ff9f94..a914cf8710 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/builder.nix @@ -5,7 +5,7 @@ lib: # commit hash k3sCommit, k3sRepoSha256 ? lib.fakeHash, - k3sVendorSha256 ? lib.fakeHash, + k3sVendorHash ? lib.fakeHash, # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 k3sRootVersion, k3sRootSha256 ? lib.fakeHash, @@ -129,7 +129,7 @@ let k3sCNIPlugins = buildGoModule rec { pname = "k3s-cni-plugins"; version = k3sCNIVersion; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; @@ -182,7 +182,7 @@ let version = k3sVersion; src = k3sRepo; - vendorSha256 = k3sVendorSha256; + vendorHash = k3sVendorHash; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp sqlite.dev ]; @@ -226,7 +226,7 @@ let rev = "v${containerdVersion}"; sha256 = containerdSha256; }; - vendorSha256 = null; + vendorHash = null; buildInputs = [ btrfs-progs ]; subPackages = [ "cmd/containerd-shim-runc-v2" ]; ldflags = versionldflags; @@ -238,7 +238,7 @@ buildGoModule rec { tags = [ "libsqlite3" "linux" "ctrd" ]; src = k3sRepo; - vendorSha256 = k3sVendorSha256; + vendorHash = k3sVendorHash; postPatch = '' # Nix prefers dynamically linked binaries over static binary. @@ -296,7 +296,7 @@ buildGoModule rec { # Specifically, it has a 'go generate' which runs part of the package. See # this comment: # https://github.com/NixOS/nixpkgs/pull/158089#discussion_r799965694 - # So, why do we use buildGoModule at all? For the `vendorSha256` / `go mod download` stuff primarily. + # So, why do we use buildGoModule at all? For the `vendorHash` / `go mod download` stuff primarily. buildPhase = '' patchShebangs ./scripts/package-cli ./scripts/download ./scripts/build-upload diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update-script.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update-script.sh index d1dad25b07..dc41d7325b 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update-script.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/update-script.sh @@ -101,7 +101,7 @@ cat >versions.nix <versions.nix < 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) colorize (0.8.1) concurrent-ruby (1.2.2) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) - ejson (1.3.1) - faraday (2.7.4) + ejson (1.4.1) + faraday (2.7.10) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) @@ -21,7 +21,7 @@ GEM ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - googleauth (1.5.2) + googleauth (1.7.0) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -37,12 +37,12 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) - jsonpath (1.1.2) + jsonpath (1.1.3) multi_json - jwt (2.7.0) - krane (3.1.0) + jwt (2.7.1) + krane (3.3.0) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -50,7 +50,7 @@ GEM googleauth (~> 1.2) jsonpath (~> 1.0) kubeclient (~> 4.9) - oj (~> 3.0) + multi_json statsd-instrument (>= 2.8, < 4) thor (>= 1.0, < 2.0) kubeclient (4.11.0) @@ -62,15 +62,14 @@ GEM ffi-compiler (~> 1.0) rake (~> 13.0) memoist (0.16.2) - mime-types (3.4.1) + mime-types (3.5.1) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0218.1) - minitest (5.18.0) + mime-types-data (3.2023.0808) + minitest (5.19.0) multi_json (1.15.0) netrc (0.11.0) - oj (3.14.3) os (1.1.4) - public_suffix (5.0.1) + public_suffix (5.0.3) rake (13.0.6) recursive-open-struct (1.1.3) rest-client (2.1.0) @@ -84,8 +83,8 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - statsd-instrument (3.5.7) - thor (1.2.1) + statsd-instrument (3.5.11) + thor (1.2.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) unf (0.1.4) @@ -99,4 +98,4 @@ DEPENDENCIES krane BUNDLED WITH - 2.4.10 + 2.4.18 diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix index 37fad59268..50c859eb72 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp"; + sha256 = "1vlzcnyqlbchaq85phmdv73ydlc18xpvxy1cbsk191cwd29i7q32"; type = "gem"; }; - version = "7.0.4.3"; + version = "7.0.7.2"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; colorize = { groups = ["default"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gmfyyzzvb9k5nm1a5x83d7krajfghghfsakhxmdpvncyj2vnrpa"; + sha256 = "1bpry4i9ajh2h8fyljp0cb17iy03ar36yc9mpfxflmdznl7dwsjf"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.1"; }; faraday = { dependencies = ["faraday-net_http" "ruby2_keywords"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f20vjx0ywx0zdb4dfx4cpa7kd51z6vg7dw5hs35laa45dy9g9pj"; + sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9"; type = "gem"; }; - version = "2.7.4"; + version = "2.7.10"; }; faraday-net_http = { groups = ["default"]; @@ -110,10 +110,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lj5haarpn7rybbq9s031zcn9ji3rlz5bk64bwa2j34q5s1h5gis"; + sha256 = "0h1k47vjaq37l0w9q49g3f50j1b0c1svhk07rmd1h49w38v2hxag"; type = "gem"; }; - version = "1.5.2"; + version = "1.7.0"; }; http = { dependencies = ["addressable" "http-cookie" "http-form_data" "llhttp-ffi"]; @@ -163,10 +163,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.1"; }; jsonpath = { dependencies = ["multi_json"]; @@ -174,31 +174,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fkdjic88hh0accp0sbx5mcrr9yaqwampf5c3214212d4i614138"; + sha256 = "1i1idcl0rpfkzkxngadw33a33v3gqf93a3kj52y2ha2zs26bdzjp"; type = "gem"; }; - version = "1.1.2"; + version = "1.1.3"; }; jwt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p"; + sha256 = "16z11alz13vfc4zs5l3fk6n51n2jw9lskvc4h4prnww0y797qd87"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; krane = { - dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"]; + dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "multi_json" "statsd-instrument" "thor"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d8vdj3wd2qp8agyadn0w33qf7z2p5lk3vlslb8jlph8x5y3mm70"; + sha256 = "1qf5la1w4zrbda5n3s01pb9gij5hyknwglsnqsrc0vcm6bslfygj"; type = "gem"; }; - version = "3.1.0"; + version = "3.3.0"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -238,30 +238,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; + sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; type = "gem"; }; - version = "3.4.1"; + version = "3.5.1"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9"; + sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a"; type = "gem"; }; - version = "3.2023.0218.1"; + version = "3.2023.0808"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; + sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; type = "gem"; }; - version = "5.18.0"; + version = "5.19.0"; }; multi_json = { groups = ["default"]; @@ -283,16 +283,6 @@ }; version = "0.11.0"; }; - oj = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0l8l90iibzrxs33vn3adrhbg8cbmbn1qfh962p7gzwwybsdw73qy"; - type = "gem"; - }; - version = "3.14.3"; - }; os = { groups = ["default"]; platforms = []; @@ -308,10 +298,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; + sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.3"; }; rake = { groups = ["default"]; @@ -370,20 +360,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pg308z3ck1vpazrmczklqa6f9qciay8nysnhc16pgfsh2npzzrz"; + sha256 = "1zpr5ms18ynygpwx73v0a8nkf41kpjylc9m3fyhvchq3ms17hcb0"; type = "gem"; }; - version = "3.5.7"; + version = "3.5.11"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; tzinfo = { dependencies = ["concurrent-ruby"]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/krelay/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/krelay/default.nix index 38c6dcc32b..ce890323a8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/krelay/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/krelay/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "krelay"; - version = "0.0.5"; + version = "0.0.6"; src = fetchFromGitHub { owner = "knight42"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TC+1y0RNBobHr1BsvZdmOM58N2CIBeA7pQoWRj1SXCw="; + sha256 = "sha256-hyjseBIyPdY/xy163bGtfNR1rN/cQczJO53gu4/WmiU="; }; - vendorHash = "sha256-yW6Uephj+cpaMO8LMOv3I02nvooscACB9N2vq1qrXwY="; + vendorHash = "sha256-uDLc1W3jw3F+23C5S65Tcljiurobw4IRw7gYzZyBxQ0="; subPackages = [ "cmd/client" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ktunnel/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/ktunnel/default.nix index 73e1fff2db..3b05aabc00 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/ktunnel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/ktunnel/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, buildGoModule, fetchFromGitHub }: let - version = "1.5.3"; + version = "1.6.1"; in buildGoModule { pname = "ktunnel"; @@ -10,7 +10,7 @@ buildGoModule { owner = "omrikiei"; repo = "ktunnel"; rev = "v${version}"; - sha256 = "sha256-7SWj9Emm78xpzdvJFKqpI5HVQi0ohbixkgXKGTy5C/A="; + sha256 = "sha256-rcUCIUIyBCSuMly7y0GUNQCdJUgsj7Oi6Hpz23uXoJw="; }; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix index 7ac56042a3..1724cb60e1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.11.1"; + version = "3.12.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - hash = "sha256-VT9S8Ijf684rowfoU1kvgPSTzR8ZGr3GwxWiYHWLANc="; + hash = "sha256-drg7hFUEFoicZxzorO365b3eFN9NRdhWYn9bIk+sSY8="; }; - vendorHash = "sha256-5XUYmAfFH6UlLF09PqcSLUxkgZ5iHZGj0Vurab+Jl1g="; + vendorHash = "sha256-qH7+DDGYRCrXI3B2dN/4pZMBqSXKkZUvIrtVEg0Ep+c="; subPackages = ["cmd"]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix index c19344a459..fe3732152d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "kubecfg"; - version = "0.32.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "kubecfg"; repo = "kubecfg"; rev = "v${version}"; - hash = "sha256-qjXc/2QY0PukvhiudukZGhBkovQMutsLg3Juxg1mgTc="; + hash = "sha256-UGxtL8X1wEyo7jYmPw0GTvuzzQCBA3WTIowMnYSyfvM="; }; - vendorHash = "sha256-9kVFOEMFjix2WRwGi0jWHPagzXkISucGHmd88vcBJfk="; + vendorHash = "sha256-AbEEHG+LJB5fOm8koVQllKohtb0lqD6Kln3GCwlkb/0="; ldflags = [ "-s" @@ -36,6 +36,6 @@ buildGoModule rec { homepage = "https://github.com/kubecfg/kubecfg"; changelog = "https://github.com/kubecfg/kubecfg/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ benley ]; + maintainers = with maintainers; [ benley qjoly ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecolor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecolor/default.nix index 625f53515a..d7742cbfc2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecolor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubecolor/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-d1gtbpeK9vp8bwhsMOPVKmohfyEZtQuvRB36VZCB3sY="; }; - vendorSha256 = "sha256-g5bLi0HQ7LQM+DKn5x8enXn8/9j3LFhgDjQ+YN0M7dM="; + vendorHash = "sha256-g5bLi0HQ7LQM+DKn5x8enXn8/9j3LFhgDjQ+YN0M7dM="; ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-doctor/default.nix index 8e50429405..e198de456c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-doctor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-doctor/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { }) ]; - vendorSha256 = "sha256-qhffg/s1RZFNW0nHLbJ89yqLzdC72ARXdbSfMLJK2pQ="; + vendorHash = "sha256-qhffg/s1RZFNW0nHLbJ89yqLzdC72ARXdbSfMLJK2pQ="; postInstall = '' mv $out/bin/{cmd,kubectl-doctor} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix index 54f99f91c8..f17c2b2ad1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-evict-pod/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-alU1c1ppn4cQi582kcA/PIAJJt73i3uG02cQvSYij1A="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "This plugin evicts the given pod and is useful for testing pod disruption budget rules"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-gadget/default.nix index 8ba0d50dd3..53e37c5544 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-gadget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-gadget/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-5FbjD02HsMChaMMvTjsB/hzivO4s1H5tLK1QMIMlBCI="; + hash = "sha256-e93rQRIF3CmXjQhpACxBp4WnPtQ5IJnm7H5BcHGqH0c="; }; - vendorHash = "sha256-Beas+oXcK5i4ibE5EAa9+avYuax/kr3op1xbtMPJMas="; + vendorHash = "sha256-YkOw4HpbX6e6uIAUa7zQPah/ifRfB4ICi90AxleKNNE="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-klock/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-klock/default.nix index 6593c7292c..dc9f8c25b5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-klock/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-klock/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGo121Module, fetchFromGitHub }: -buildGoModule rec { +buildGo121Module rec { pname = "kubectl-klock"; - version = "0.3.2"; + version = "0.4.0"; src = fetchFromGitHub { owner = "jillejr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tXsRifIZRS2W4O4VOONuLsunYGLG5C9KfgnZQQqKACg="; + sha256 = "sha256-HO9/hr/CBmJkrbNdX8tp2pNRfZDaWNW8shyCR46G77A="; }; - vendorSha256 = "sha256-r4oAmD/7CXYiWEWR/FC/Ab0LNxehWv6oCWjQ/fGU2rU="; + vendorHash = "sha256-QvD5yVaisq5Zz/M81HAMKpgQJRB5qPCYveLgldHHGf0="; meta = with lib; { description = "A kubectl plugin to render watch output in a more readable fashion"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-ktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-ktop/default.nix index fbca4e4b8a..a7a27e54c0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-ktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-ktop/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-nkIRVt2kqsE9QBYvvHmupohnzH+OBcwWwV16rMePw4I="; }; - vendorSha256 = "sha256-IiAMmHOq69WMT2B1q9ZV2fGDnLr7AbRm1P7ACSde2FE="; + vendorHash = "sha256-IiAMmHOq69WMT2B1q9ZV2fGDnLr7AbRm1P7ACSde2FE="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix index 995125d250..4eb0a43687 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "kubectl-node-shell"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "kvaps"; repo = "kubectl-node-shell"; rev = "v${version}"; - sha256 = "sha256-TCd/VipsUT/h88CevqCLUUjN7wAJKYxxq63IpEF2P1Y="; + sha256 = "sha256-+JRHSigjsxuZFQg73wTMWWKtCVXd2mMFqivYGcwYznE="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-tree/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-tree/default.nix index 5a6d0efc05..1cb0cc3e94 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-tree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-tree/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-J4/fiTECcTE0N2E+MPrQKE9Msvvm8DLdvLbnDUnUo74="; }; - vendorSha256 = "sha256-iblEfpYOvTjd3YXQ3Mmj5XckivHoXf4336H+F7NEfBA="; + vendorHash = "sha256-iblEfpYOvTjd3YXQ3Mmj5XckivHoXf4336H+F7NEfBA="; meta = with lib; { description = "kubectl plugin to browse Kubernetes object hierarchies as a tree"; 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 7bed01e39d..43e3941a0e 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.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-mrWE1MwcS0KYEQmJ8DSP5Sp5w6jpsDxvU03+KqfPDx4="; + sha256 = "sha256-keYCF/Jte3sgJi4fnVO1ZDAsYyqXlHzX91tyS5oVCW4="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix index 6eae71afe1..d7eb948109 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubefirst/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubefirst"; - version = "2.2.7"; + version = "2.2.17"; src = fetchFromGitHub { owner = "kubefirst"; repo = pname; rev = "v${version}"; - hash = "sha256-sIX+B08JNwWr4QsWWi4kpqaY9uZbIeiM2sVvMCvSb0I="; + hash = "sha256-cqKnoGRW+IquuZ7wvCRipRJ6mO18w/yhf5nS094vs7c="; }; - vendorHash = "sha256-F+kzj2lBSFawfc8OyPf6V2XVB1418uhv+cv3CHpXUk0="; + vendorHash = "sha256-0J27JSewc0DCcc3xvl2DBZE/b0qKuozuP7tFdbrRX7I="; ldflags = [ "-s" "-w" "-X github.com/kubefirst/runtime/configs.K1Version=v${version}"]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix index 09213261da..08d1c5d22e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.31"; + version = "0.0.32"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yIRiIZKq+Q10Uo/9qEToeMHMipA5rApkxIRr/IJ0yfY="; + sha256 = "sha256-pMen6ZL1S0xr5+h7gVBMG4XjlZUifIiqHvjKgg8AY5c="; }; - vendorHash = "sha256-XHSVLATWKklg1jWL4Lnaey7hCkYHAk/cNyUgQZ6WIq0="; + vendorHash = "sha256-pNOCagxOcxhELSWO1GfbxGmopYXIgKD00XdZdVgawrc="; ldflags = [ "-X main.version=${version}" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubent/default.nix index e689af406e..f54b6875a9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubent/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-QIvMhKAo30gInqJBpHvhcyjgVkdRqgBKwLQ80ng/75U="; }; - vendorSha256 = "sha256-XXf6CPPHVvCTZA4Ve5/wmlgXQ/gZZUW0W/jXA0bJgLA="; + vendorHash = "sha256-XXf6CPPHVvCTZA4Ve5/wmlgXQ/gZZUW0W/jXA0bJgLA="; ldflags = [ "-w" "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix index 88176dd599..36fcf3dd23 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubeone"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - hash = "sha256-dLpe3C1gMnEyajJFPawDlTchYKA8cAy2QUAae6+7QBQ="; + hash = "sha256-izUjiRQAdTpdk86s1lQwLfpHy4eJo3mGAgTwWfGkNAQ="; }; - vendorHash = "sha256-aCRrf/E4UVL6PwUPRRzLjD+MzL8gcNJrc2IgKKyIIHI="; + vendorHash = "sha256-AFyvTv1uVeq2KtRG6VToTBnX+8tHorDZPSturJhsrG4="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index 168b988b71..97d3a31402 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.27.4"; + version = "1.28.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-Tb+T7kJHyZPXwUcEATj3jBr9qa7Sk6b+wL8HhqFOhYM="; + hash = "sha256-7juoX4nFvQbIIbhTlnIYVUEYUJGwu+aKrpw4ltujjXI="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix index ab8c7463f0..ab02dff316 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.23.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-Xtyn08rlBo17ouxSLQcVT8mQQ6nuDKPjE4OHBdze8/Q="; + sha256 = "sha256-L5j7+2m2zKRQ/zpmwq1OimPM6I1KmmPBzNcK+s1NIDs="; }; - vendorHash = "sha256-MTueX4+cZIUdjE2BRLVGv7PJr3haV11woJmrkeKFpr0="; + vendorHash = "sha256-+x5wohzPYzff3jpqsvnDqElrBW867WLrl4RaLlRjkUk="; subPackages = [ "cmd/kubeseal" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix index 76d8a0905a..d958e06b7e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeshark"; - version = "41.6"; + version = "50.4"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = version; - sha256 = "sha256-UFBht8H8iOHwMU8PM2FCb+oh7rTkN/XC3/W3EmuTp84="; + sha256 = "sha256-+9AnzY/vnB1OGzkKmYL0sxWS17NV+MGnHNXGOtt+BKU="; }; - vendorHash = "sha256-rcxnvKkc9zerfULRdU5eGRRqSDQQDNMYaLJ7oEMQghk="; + vendorHash = "sha256-Vcn1Ky/J/3QiV6M5fLedDcpkLp5WsVcXRkOEgkKPYEQ="; ldflags = let t = "github.com/kubeshark/kubeshark"; in [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix index 9c28ba063e..574bfc61bb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeval/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { }) ]; - vendorSha256 = "sha256-R/vVrLsVSA9SGra4ytoHlQkPaIgQaj/XdivcQp8xjSM="; + vendorHash = "sha256-R/vVrLsVSA9SGra4ytoHlQkPaIgQaj/XdivcQp8xjSM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix index 9bd4747d2d..acead1775d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubevpn/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubevpn"; - version = "1.1.35"; + version = "2.0.0"; src = fetchFromGitHub { owner = "KubeNetworks"; repo = "kubevpn"; rev = "v${version}"; - sha256 = "sha256-fY0SKluJ1SG323rV7eDdhmDSMn49aITXYyFhR2ArFTw="; + sha256 = "sha256-fXRzo68d65FISW+m/BTmwOXlJiCmMm9Az1qsGGsbPIA="; }; - vendorHash = "sha256-aU8/C/p/VQ3JYApgr/i5dE/nBs0QjsvXBSMnEmj/Sno="; + vendorHash = "sha256-EcHHSOAr93M2kPhEaZSpvpZCq4pi1NCedo9hw1Mn0a4="; # TODO investigate why some config tests are failing doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix index 20bba7d405..f662e965ff 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuma/default.nix @@ -9,27 +9,28 @@ , components ? lib.optionals isFull [ "kumactl" "kuma-cp" - "kuma-prometheus-sd" "kuma-dp" ] }: buildGoModule rec { - inherit pname ; - version = "1.8.1"; - tags = lib.optionals enableGateway ["gateway"]; - vendorSha256 = "sha256-69uXHvpQMeFwQbejMpfQPS8DDXJyVsnn59WUEJpSeng="; + inherit pname; + version = "2.3.1"; + tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - sha256 = "sha256-hNfgiMX3aMb8yjXjFKz73MczOeJyOI3Tna/NRSJBSzs="; + hash = "sha256-BayfHBTTqgc0ArD6ux9HOqaZy0GrEpqgDa7zHZtiG2I="; }; + vendorHash = "sha256-St+jGks7ojKrgecmN7UJ9FjGrmjtgEKsunSY+4itUyA="; + + # no test files doCheck = false; - nativeBuildInputs = [installShellFiles] ++ lib.optionals isFull [coredns]; + nativeBuildInputs = [ installShellFiles ] ++ lib.optionals isFull [ coredns ]; preBuild = '' export HOME=$TMPDIR @@ -59,6 +60,7 @@ buildGoModule rec { meta = with lib; { description = "Service mesh controller"; homepage = "https://kuma.io/"; + changelog = "https://github.com/kumahq/kuma/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ zbioe ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix index be25739db2..48e07567a8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-UI8PVvTqk8D4S9kq3sgxrm8dkRokpgkLyTN6pzUXNV0="; }; - vendorSha256 = "sha256-MzKttGfuIg0Pp/iz68EpXuk4I+tFozhIabKlsWuvJ48="; + vendorHash = "sha256-MzKttGfuIg0Pp/iz68EpXuk4I+tFozhIabKlsWuvJ48="; # The tests try to connect to a Nomad cluster. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix index 8141b8bd87..a763177034 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.13.6"; - sha256 = "1z5gcz1liyxydy227vb350k0hsq31x80kvxamx7l1xkd2p0mcmbj"; - vendorSha256 = "sha256-5T3YrYr7xeRkAADeE24BPu4PYU4mHFspqAiBpS8n4Y0="; + version = "2.14.1"; + sha256 = "1fxwy8c1zcjwnv055czn9ixalpvq710k0m82633n73a0ixnlmjbv"; + vendorHash = "sha256-hOuvIndyGGvNWYmzE0rho/Y30/ilCzeBtL5GEvl9QqU="; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix index 84b68727d2..2e7b8a50b9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "23.8.2"; - sha256 = "18lz817d1jjl8ynkdhvm32p8ja9bkh1xqkpi514cws27y3zcirrz"; - vendorSha256 = "sha256-SIyS01EGpb3yzw3NIBAO47ixAiWPX2F+9ANoeCTkbRg="; + version = "23.9.4"; + sha256 = "1hjhbkwn44i1gsc7llxc9mrdjf5xc1nl4dxqgnxgks3hzkch6qqc"; + vendorHash = "sha256-OzHl9QhNLaTCBCWpCmqzPkdWMwygKXSkYTczQD5KVh8="; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/generic.nix index a4aec900a4..0384f56f14 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/generic.nix @@ -1,10 +1,10 @@ { lib, fetchFromGitHub, buildGoModule, installShellFiles }: -{ channel, version, sha256, vendorSha256 }: +{ channel, version, sha256, vendorHash }: buildGoModule rec { pname = "linkerd-${channel}"; - inherit version vendorSha256; + inherit version vendorHash; src = fetchFromGitHub { owner = "linkerd"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-edge.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-edge.sh index 0e5be4f197..f9d9569b38 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-edge.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-edge.sh @@ -17,17 +17,17 @@ setKV () { setKV version ${VERSION} setKV sha256 ${SHA256} -setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # Necessary to force clean build. +setKV vendorHash "sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB=" # Necessary to force clean build. cd ../../../../../ set +e -VENDOR_SHA256=$(nix-build --no-out-link -A linkerd_edge 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') +VENDOR_HASH=$(nix-build --no-out-link -A linkerd_edge 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') set -e cd - > /dev/null -if [ -n "${VENDOR_SHA256:-}" ]; then - setKV vendorSha256 ${VENDOR_SHA256} +if [ -n "${VENDOR_HASH:-}" ]; then + setKV vendorHash ${VENDOR_HASH} else - echo "Update failed. VENDOR_SHA256 is empty." + echo "Update failed. VENDOR_HASH is empty." exit 1 fi diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-stable.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-stable.sh index 19aa4274be..8643262ec3 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-stable.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/update-stable.sh @@ -17,17 +17,17 @@ setKV () { setKV version ${VERSION} setKV sha256 ${SHA256} -setKV vendorSha256 "0000000000000000000000000000000000000000000000000000" # Necessary to force clean build. +setKV vendorHash "sha256-BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB=" # Necessary to force clean build. cd ../../../../../ set +e -VENDOR_SHA256=$(nix-build --no-out-link -A linkerd 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') +VENDOR_HASH=$(nix-build --no-out-link -A linkerd 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') set -e cd - > /dev/null -if [ -n "${VENDOR_SHA256:-}" ]; then - setKV vendorSha256 ${VENDOR_SHA256} +if [ -n "${VENDOR_HASH:-}" ]; then + setKV vendorHash ${VENDOR_HASH} else - echo "Update failed. VENDOR_SHA256 is empty." + echo "Update failed. VENDOR_HASH is empty." exit 1 fi diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix index 81ddb68b69..7cbdab0d65 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/luigi/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "luigi"; - version = "3.0.2"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb"; + sha256 = "sha256-zIZC3rbiLwYB7o34rT3mOagVIbfmY6elBEkZGFrSs1c="; }; - propagatedBuildInputs = with python3.pkgs; [ python-dateutil tornado python-daemon boto3 ]; + propagatedBuildInputs = with python3.pkgs; [ python-dateutil tornado python-daemon boto3 tenacity ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 26f0cc4e1a..924052c2d9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -12,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.31.1"; + version = "1.31.2"; - vendorHash = "sha256-7Wa5Ut3n+CH4LeyRKvFC2aRf2auQXfqsi54QLKWgak8="; + vendorHash = "sha256-5ChPdSIRI+Q3OLW+joukMpIFbUjU4TKpXT4wAARVVP8="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-6vCZUDH35OclO02sV+AXv8+bj4klwoZC0abotheHSoU="; + sha256 = "sha256-Ha0liXc2oXJ3dLty1veN5xN5BUKIiNXe8NTGqWDbTD0="; }; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix index 5beb7a955f..ceda5e60c4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "multus-cni"; - version = "3.9.3"; + version = "4.0.2"; src = fetchFromGitHub { owner = "k8snetworkplumbingwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-43cFBrFM2jvD/SJ+QT1JQkr593jkdzAAvYlVUAQArEw="; + sha256 = "sha256-Q6ACXOv1E3Ouki4ksdlUZFbWcDgo9xbCiTfEiVG5l18="; }; ldflags = [ @@ -17,21 +17,23 @@ buildGoModule rec { "-X=gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus.version=${version}" ]; - preInstall = '' - mv $GOPATH/bin/cmd $GOPATH/bin/multus - ''; + subPackages = [ + "cmd/multus-daemon" + "cmd/multus-shim" + "cmd/multus" + "cmd/thin_entrypoint" + ]; vendorHash = null; - # Some of the tests require accessing a k8s cluster - doCheck = false; + doCheck = true; meta = with lib; { description = "Multus CNI is a container network interface (CNI) plugin for Kubernetes that enables attaching multiple network interfaces to pods"; homepage = "https://github.com/k8snetworkplumbingwg/multus-cni"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ onixie ]; + maintainers = with maintainers; [ onixie kashw2 ]; mainProgram = "multus"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix index 401b5b156f..72dbfde9f5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - hash = "sha256-ngR+xlhTy3oxPN34+MoT9TSOI0+Epp8QG3KiiPmRUts="; + hash = "sha256-O1N8+Gjo0EapRV5Z7Z27Cfs886cbwTmckJsSJ2OI5fM="; }; - vendorHash = "sha256-lsD8AtbREVKFXiPsteSFA7xntRlNgOQ1y5c44vOqMa8="; + vendorHash = "sha256-/4XFQagUbU8SgoBogK1hAsfGoTY+DaIVaNpSA3Enaho="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix index de79e9759b..0b63cc7b0f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/default.nix @@ -74,15 +74,12 @@ let cryptography = super.cryptography.overridePythonAttrs (old: { meta = old.meta // { knownVulnerabilities = old.meta.knownVulnerabilities or [ ] - ++ lib.optionals (lib.versionOlder old.version "39.0.1") [ - "CVE-2022-4304" - "CVE-2023-0215" - "CVE-2023-0216" - "CVE-2023-0217" - "CVE-2023-0401" - "CVE-2022-4203" - "CVE-2022-4450" - "CVE-2023-23931" + ++ lib.optionals (lib.versionOlder old.version "41.0.0") [ + "CVE-2023-2650" + "CVE-2023-2975" + "CVE-2023-3446" + "CVE-2023-3817" + "CVE-2023-38325" ]; }; }); diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix index f88340f2c7..047a44e84f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.13"; + version = "0.8.14"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nNi4YahrO4zwqwR90tIpQCAydGdQbfy5PXCifpP/T7Q="; + sha256 = "sha256-kh9rYg6UszBMCWYfVU+tP4ZRoigEm6+Z+7pnZWdbcwU="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix index eb185f9743..acd0643b4b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix @@ -28,7 +28,7 @@ let sha256 = "sha256-fK5GsszNhz/WP0zVk2lOfU/gwYijdQa5qhNYO33RhXc="; }; - vendorSha256 = "sha256-Duzjpl011mj/SNoX/jQGMXwqUHPDz7iIMygRmK1vC3Q="; + vendorHash = "sha256-Duzjpl011mj/SNoX/jQGMXwqUHPDz7iIMygRmK1vC3Q="; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix index 2804604e2b..224da229b0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-driver-podman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nomad-driver-podman"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qHhdjWc9bxUpHYUFUrupjtxxIVQDP43OeKKsCDa+4/M="; + sha256 = "sha256-MYqsTuMLxbVNWLAWjQ8xQts5qJvhTylle7YLtGyswjY="; }; - vendorHash = "sha256-UIUavFdBuSiaUsNaibPjRMURMLLK5UjNHVoyNSIRNQ4="; + vendorHash = "sha256-wjJ+mq/m7IjbwypoBvBhjOyAT4v4HDSChHY5OE0xA2U="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix index 65b012a10a..92c98c44fd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-Br+BJRAo9qSJQjg2awQTnsYz76WReVWsTUw6XoUb1YY="; }; - vendorSha256 = "sha256-dUPDwKdkBXBfyfbFxrpgHwZ0Q5jB7aamClNmv+tLCGA="; + vendorHash = "sha256-dUPDwKdkBXBfyfbFxrpgHwZ0Q5jB7aamClNmv+tLCGA="; # skip running go tests as they require network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix index abe2e6ee7f..c973a20ad5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , buildGo120Module +, buildGo121Module , fetchFromGitHub , nixosTests , installShellFiles @@ -8,12 +9,12 @@ let generic = - { buildGoModule, version, sha256, vendorSha256, ... }@attrs: - let attrs' = builtins.removeAttrs attrs [ "buildGoModule" "version" "sha256" "vendorSha256" ]; + { buildGoModule, version, sha256, vendorHash, ... }@attrs: + let attrs' = builtins.removeAttrs attrs [ "buildGoModule" "version" "sha256" "vendorHash" ]; in buildGoModule (rec { pname = "nomad"; - inherit version vendorSha256; + inherit version vendorHash; subPackages = [ "." ]; @@ -40,7 +41,7 @@ let homepage = "https://www.nomadproject.io/"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey techknowlogick ]; + maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes amaxine techknowlogick ]; }; } // attrs'); in @@ -53,25 +54,11 @@ rec { nomad = nomad_1_5; - nomad_1_2 = generic { - buildGoModule = buildGo120Module; - version = "1.2.16"; - sha256 = "sha256-fhfUpcG91EgIzJ4mCS7geyIJyTSHS2e8t4yYiI3PqpQ="; - vendorSha256 = "sha256-kwCDsGFw+25Mimgt/cTK/Z2H7Qh5n4rjr3kIBvjcPL8="; - }; - - nomad_1_3 = generic { - buildGoModule = buildGo120Module; - version = "1.3.9"; - sha256 = "sha256-xfoIzLDG/OfqAPQqeLvQZ11uESWFNyOyLP6Imi+S96w="; - vendorSha256 = "sha256-kW0goicoM1lM1NEHPTfozg2EKR1daf33UxT/mVabyfY="; - }; - nomad_1_4 = generic { buildGoModule = buildGo120Module; - version = "1.4.6"; - sha256 = "sha256-l4GvQIS5JSSgjBjPivAKAb7gKlVLw4WoZpPR8LxnLNc="; - vendorSha256 = "sha256-05BhKF6kx0wbu74cidpTFhUN668R/AxV6qWmchCm/WE="; + version = "1.4.12"; + sha256 = "sha256-dO98FOaO5MB5pWzeF705s/aBDTaF0OyWnVxWGB91suI="; + vendorHash = "sha256-D5TcTZa64Jr47u4mrTXK4lUIC5gfBQNVgL6QKh1CaQM="; passthru.tests.nomad = nixosTests.nomad; }; @@ -79,21 +66,21 @@ rec { buildGoModule = buildGo120Module; version = "1.5.8"; sha256 = "sha256-5VAUNunQz4s1Icd+s5i8Kx6u1P0By+ikl4C5wXM1oho="; - vendorSha256 = "sha256-y3WiQuoQn6SdwTgtPWuB6EBtsJC+YleQPzownZQNkno="; + vendorHash = "sha256-y3WiQuoQn6SdwTgtPWuB6EBtsJC+YleQPzownZQNkno="; passthru.tests.nomad = nixosTests.nomad; preCheck = '' - export PATH="$PATH:/build/go/bin" + export PATH="$PATH:$NIX_BUILD_TOP/go/bin" ''; }; nomad_1_6 = generic { - buildGoModule = buildGo120Module; - version = "1.6.1"; - sha256 = "sha256-RsyGUaLteGiNf0PTkKLcjHTevhKb/mNx2JORpXhHJMw="; - vendorSha256 = "sha256-Y3O7ADzZPlLWFbXSYBcI6b5MAhMD0UnkhQxO9VJMpOY="; + buildGoModule = buildGo121Module; + version = "1.6.2"; + sha256 = "sha256-Q0RyO9FZWGxWgVmTU07/pw5P4Ebcwcednq8TDmshuAk="; + vendorHash = "sha256-XCuWhKuBtSPTK8fXwgjMKMjwLnl1KWZKSJ4Ih9XDIDc="; passthru.tests.nomad = nixosTests.nomad; preCheck = '' - export PATH="$PATH:/build/go/bin" + export PATH="$PATH:$NIX_BUILD_TOP/go/bin" ''; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix index cd9b90f565..ac44c8efff 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/ocm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ocm"; - version = "0.1.67"; + version = "0.1.69"; src = fetchFromGitHub { owner = "openshift-online"; repo = "ocm-cli"; rev = "v${version}"; - sha256 = "sha256-MNagqeT6Uw9fLl6gJ+2FYTRZ2rO2qTYi8SBDoOR9EUM="; + sha256 = "sha256-JKR58is8SzNmEQ8x1om1anReLIbNCHJkkzZQ1SiQ5J4="; }; - vendorHash = "sha256-4d8IGe/gTt4HAqyg05pYtAFfHp6NCmUBtfxRA64rEmM="; + vendorHash = "sha256-3HLTuWf4mK3r92s2mPE2yl/rrPxgcsB9EmrxkiJsMaE="; # Strip the final binary. ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix deleted file mode 100644 index 733e4c04a9..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ lib, stdenv, fetchzip }: - -stdenv.mkDerivation rec { - pname = "octant"; - version = "0.25.1"; - - src = - let - inherit (stdenv.hostPlatform) system; - suffix = { - x86_64-linux = "Linux-64bit"; - aarch64-linux = "Linux-arm64"; - x86_64-darwin = "macOS-64bit"; - aarch64-darwin = "macOS-arm64"; - }.${system} or (throw "Unsupported system: ${system}"); - fetchsrc = version: sha256: fetchzip { - url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/octant_${version}_${suffix}.tar.gz"; - sha256 = sha256.${system}; - }; - in - fetchsrc version { - x86_64-linux = "sha256-bYqycTB036J8trojySPNkC+jrw76F7+N4I4puGCyalU="; - aarch64-linux = "sha256-DlzSIZCAASPnflXQ8ndPU7/0jXA18U4bGGOfmgLXPr0="; - x86_64-darwin = "sha256-FaPyrPzO7AzC6LHQP5c58NjLTqU+ei8vFffT8x6mUhQ="; - aarch64-darwin = "sha256-31CYhAsHYIVAenp8hFHYj8LhFf3lSiOTw7gULBu3gio="; - }; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - install -D octant $out/bin/octant - runHook postInstall - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/octant --help - $out/bin/octant version | grep "${version}" - runHook postInstallCheck - ''; - - dontPatchELF = true; - dontPatchShebangs = true; - - passthru.updateScript = ./update.sh; - - meta = with lib; { - homepage = "https://octant.dev/"; - changelog = "https://github.com/vmware-tanzu/octant/blob/v${version}/CHANGELOG.md"; - description = "Highly extensible platform for developers to better understand the complexity of Kubernetes clusters"; - longDescription = '' - Octant is a tool for developers to understand how applications run on a - Kubernetes cluster. - It aims to be part of the developer's toolkit for gaining insight and - approaching complexity found in Kubernetes. Octant offers a combination of - introspective tooling, cluster navigation, and object management along - with a plugin system to further extend its capabilities. - ''; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.asl20; - maintainers = with maintainers; [ jk ]; - platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix deleted file mode 100644 index fc48ce1e9e..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/desktop.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ lib, stdenv, appimageTools, fetchurl, undmg }: - -let - pname = "octant-desktop"; - version = "0.23.0"; - name = "${pname}-${version}"; - - inherit (stdenv.hostPlatform) system; - - suffix = { - x86_64-linux = "AppImage"; - x86_64-darwin = "dmg"; - }.${system} or (throw "Unsupported system: ${system}"); - - src = fetchurl { - url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}"; - sha256 = { - x86_64-linux = "sha256-K4z6SVCiuqy3xkWMWpm8KM7iYVXyKcnERljMG3NEFMw="; - x86_64-darwin = "sha256-WYra0yw/aPW/wUGrlIn5ud3kjFTkekYEi2LWZcYO5Nw="; - }.${system}; - }; - - linux = appimageTools.wrapType2 { - inherit name src passthru meta; - - profile = '' - export LC_ALL=C.UTF-8 - ''; - - multiArch = false; # no 32bit needed - extraPkgs = appimageTools.defaultFhsEnvArgs.multiPkgs; - extraInstallCommands = - let appimageContents = appimageTools.extractType2 { inherit name src; }; in - '' - mv $out/bin/{${name},${pname}} - install -Dm444 ${appimageContents}/octant.desktop -t $out/share/applications - substituteInPlace $out/share/applications/octant.desktop \ - --replace 'Exec=AppRun --no-sandbox' 'Exec=${pname}' - install -m 444 -D ${appimageContents}/octant.png \ - $out/share/icons/hicolor/512x512/apps/octant.png - ''; - }; - - darwin = stdenv.mkDerivation { - inherit name src passthru meta; - - nativeBuildInputs = [ undmg ]; - sourceRoot = "Octant.app"; - installPhase = '' - mkdir -p $out/Applications/Octant.app - cp -R . $out/Applications/Octant.app - ''; - }; - - passthru = { updateScript = ./update-desktop.sh; }; - - meta = with lib; { - homepage = "https://octant.dev/"; - changelog = "https://github.com/vmware-tanzu/octant/blob/v${version}/CHANGELOG.md"; - description = "Highly extensible platform for developers to better understand the complexity of Kubernetes clusters"; - longDescription = '' - Octant is a tool for developers to understand how applications run on a - Kubernetes cluster. - It aims to be part of the developer's toolkit for gaining insight and - approaching complexity found in Kubernetes. Octant offers a combination of - introspective tooling, cluster navigation, and object management along - with a plugin system to further extend its capabilities. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ jk ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - }; - -in -if stdenv.isDarwin -then darwin -else linux diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix deleted file mode 100644 index 4d3662ea87..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/plugins/starboard-octant-plugin.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub }: - -buildGoModule rec { - pname = "starboard-octant-plugin"; - version = "0.12.0"; - - src = fetchFromGitHub { - owner = "aquasecurity"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-JTSZtIRVFdUjhQsp2EMukeoVIo6nNx4xofq+3iOZUIk="; - }; - - vendorSha256 = "sha256-1zrB+CobUBgdpBHRJPpfDYCD6oVWY4j4Met9EqNQQbE="; - - ldflags = [ - "-s" "-w" - ]; - - meta = with lib; { - homepage = "https://github.com/aquasecurity/starboard-octant-plugin"; - changelog = "https://github.com/aquasecurity/starboard-octant-plugin/releases/tag/v${version}"; - description = "Octant plugin for viewing Starboard security information"; - longDescription = '' - This is an Octant plugin for Starboard which provides visibility into vulnerability assessment reports for - Kubernetes workloads stored as custom security resources. - ''; - license = licenses.asl20; - maintainers = with maintainers; [ jk ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/update-desktop.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/update-desktop.sh deleted file mode 100755 index 4450834b4b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/update-desktop.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused gawk nix-prefetch - -set -euo pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/desktop.nix" -if [ ! -f "$NIX_DRV" ]; then - echo "ERROR: cannot find desktop.nix in $ROOT" - exit 1 -fi - -fetch_arch() { - VER="$1"; SUFFIX="$2" - URL="https://github.com/vmware-tanzu/octant/releases/download/v${VER}/Octant-${VER}.${SUFFIX}" - nix-prefetch "{ stdenv, fetchurl }: -stdenv.mkDerivation rec { - pname = \"octant-desktop\"; version = \"${VER}\"; - src = fetchurl { url = \"$URL\"; }; -} -" -} - -replace_sha() { - sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" -} - -OCTANT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/vmware-tanzu/octant/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') - -OCTANT_DESKTOP_LINUX_X64_SHA256=$(fetch_arch "$OCTANT_VER" "AppImage") -OCTANT_DESKTOP_DARWIN_X64_SHA256=$(fetch_arch "$OCTANT_VER" "dmg") - -sed -i "s/version = \".*\"/version = \"$OCTANT_VER\"/" "$NIX_DRV" - -replace_sha "x86_64-linux" "$OCTANT_DESKTOP_LINUX_X64_SHA256" -replace_sha "x86_64-darwin" "$OCTANT_DESKTOP_DARWIN_X64_SHA256" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/update.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/update.sh deleted file mode 100755 index 3e2b56b7a6..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/octant/update.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused gawk nix-prefetch - -set -euo pipefail - -ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/default.nix" -if [ ! -f "$NIX_DRV" ]; then - echo "ERROR: cannot find default.nix in $ROOT" - exit 1 -fi - -fetch_arch() { - VER="$1"; ARCH="$2" - URL="https://github.com/vmware-tanzu/octant/releases/download/v${VER}/octant_${VER}_${ARCH}.tar.gz" - nix-prefetch "{ stdenv, fetchzip }: -stdenv.mkDerivation rec { - pname = \"octant\"; version = \"${VER}\"; - src = fetchzip { url = \"$URL\"; }; -} -" -} - -replace_sha() { - sed -i "s#$1 = \"sha256-.\{44\}\"#$1 = \"$2\"#" "$NIX_DRV" -} - -OCTANT_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/vmware-tanzu/octant/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') - -OCTANT_LINUX_X64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-64bit") -OCTANT_LINUX_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "Linux-arm64") -OCTANT_DARWIN_X64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-64bit") -OCTANT_DARWIN_AARCH64_SHA256=$(fetch_arch "$OCTANT_VER" "macOS-arm64") - -sed -i "s/version = \".*\"/version = \"$OCTANT_VER\"/" "$NIX_DRV" - -replace_sha "x86_64-linux" "$OCTANT_LINUX_X64_SHA256" -replace_sha "aarch64-linux" "$OCTANT_LINUX_AARCH64_SHA256" -replace_sha "x86_64-darwin" "$OCTANT_DARWIN_X64_SHA256" -replace_sha "aarch64-darwin" "$OCTANT_DARWIN_AARCH64_SHA256" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix index c6474336eb..630b64b4c1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "odo"; - version = "3.13.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "redhat-developer"; repo = "odo"; rev = "v${version}"; - sha256 = "sha256-l5WW6Wos/FLxJsyrWnLhb1vAztGT1QYl8tKhiBgNGbw="; + sha256 = "sha256-d6C+nOz60CPnEsSf74+WBTaeIXGKtysVELg0+dXM1cU="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix new file mode 100644 index 0000000000..f98f9eb110 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix @@ -0,0 +1,180 @@ +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, coreutils +, runCommand +, runtimeShell +, writeText +, terraform-providers +, installShellFiles +}: + +let + package = buildGoModule rec { + pname = "opentofu"; + version = "1.6.0-alpha2"; + + src = fetchFromGitHub { + owner = "opentofu"; + repo = "opentofu"; + rev = "v${version}"; + hash = "sha256-29vF5vWCPxJJHsQ1dkLcIaqEQVYxp2YjZ4LK5r4/dlo="; + }; + vendorHash = "sha256-qhnQ47K9N7HoTMUXhX2RlUuQaCgeAB/Sshh56A5rhpk="; + ldflags = [ "-s" "-w" ]; + + postConfigure = '' + # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 + substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \ + --replace "/bin/stty" "${coreutils}/bin/stty" + ''; + + nativeBuildInputs = [ installShellFiles ]; + patches = [ ./provider-path-0_15.patch ]; + + passthru = { + inherit plugins withPlugins; + tests = { inherit opentofu_plugins_test; }; + }; + + # https://github.com/posener/complete/blob/9a4745ac49b29530e07dc2581745a218b646b7a3/cmd/install/bash.go#L8 + postInstall = '' + installShellCompletion --bash --name tofu <(echo complete -C tofu tofu) + ''; + + preCheck = '' + export HOME=$TMPDIR + export TF_SKIP_REMOTE_TESTS=1 + ''; + + subPackages = [ "./cmd/..." ]; + + meta = with lib; { + description = "Tool for building, changing, and versioning infrastructure"; + homepage = "https://opentofu.org/"; + changelog = "https://github.com/opentofu/opentofu/blob/v${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ + gmemstr + ]; + mainProgram = "tofu"; + }; + }; + + opentofu_plugins_test = let + mainTf = writeText "main.tf" '' + terraform { + required_providers { + random = { + source = "registry.terraform.io/hashicorp/random" + } + } + } + + resource "random_id" "test" {} + ''; + opentofu = package.withPlugins (p: [ p.random ]); + test = runCommand "opentofu-plugin-test" { + buildInputs = [ opentofu ]; + } '' + # make it fail outside of sandbox + export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0 + cp ${mainTf} main.tf + tofu init + touch $out + ''; + in + test; + + plugins = removeAttrs terraform-providers [ + "override" + "overrideDerivation" + "recurseForDerivations" + ]; + + withPlugins = plugins: + let + actualPlugins = plugins package.plugins; + + # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries + wrapperInputs = lib.unique (lib.flatten + (lib.catAttrs "propagatedBuildInputs" + (builtins.filter (x: x != null) actualPlugins))); + + passthru = { + withPlugins = newplugins: + withPlugins (x: newplugins x ++ actualPlugins); + full = withPlugins (p: lib.filter lib.isDerivation (lib.attrValues p.actualProviders)); + + # Expose wrappers around the override* functions of the terraform + # derivation. + # + # Note that this does not behave as anyone would expect if plugins + # are specified. The overrides are not on the user-visible wrapper + # derivation but instead on the function application that eventually + # generates the wrapper. This means: + # + # 1. When using overrideAttrs, only `passthru` attributes will + # become visible on the wrapper derivation. Other overrides that + # modify the derivation *may* still have an effect, but it can be + # difficult to follow. + # + # 2. Other overrides may work if they modify the terraform + # derivation, or they may have no effect, depending on what + # exactly is being changed. + # + # 3. Specifying overrides on the wrapper is unsupported. + # + # See nixpkgs#158620 for details. + overrideDerivation = f: + (package.overrideDerivation f).withPlugins plugins; + overrideAttrs = f: + (package.overrideAttrs f).withPlugins plugins; + override = x: + (package.override x).withPlugins plugins; + }; + # Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading + # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform. + in + if actualPlugins == [ ] then + package.overrideAttrs + (orig: { passthru = orig.passthru // passthru; }) + else + lib.appendToName "with-plugins" (stdenv.mkDerivation { + inherit (package) meta pname version; + nativeBuildInputs = [ makeWrapper ]; + + # Expose the passthru set with the override functions + # defined above, as well as any passthru values already + # set on `terraform` at this point (relevant in case a + # user overrides attributes). + passthru = package.passthru // passthru; + + buildCommand = '' + # Create wrappers for terraform plugins because Terraform only + # walks inside of a tree of files. + for providerDir in ${toString actualPlugins} + do + for file in $(find $providerDir/libexec/terraform-providers -type f) + do + relFile=''${file#$providerDir/} + mkdir -p $out/$(dirname $relFile) + cat < $out/$relFile + #!${runtimeShell} + exec "$file" "$@" + WRAPPER + chmod +x $out/$relFile + done + done + + # Create a wrapper for opentofu to point it to the plugins dir. + mkdir -p $out/bin/ + makeWrapper "${package}/bin/tofu" "$out/bin/tofu" \ + --set NIX_TERRAFORM_PLUGIN_DIR $out/libexec/terraform-providers \ + --prefix PATH : "${lib.makeBinPath wrapperInputs}" + ''; + }); +in +package diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/provider-path-0_15.patch b/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/provider-path-0_15.patch new file mode 100644 index 0000000000..318df9ab69 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/provider-path-0_15.patch @@ -0,0 +1,23 @@ +diff -Naur terraform.old/internal/command/init.go terraform.new/internal/command/init.go +--- terraform.old/internal/command/init.go ++++ terraform.new/internal/command/init.go +@@ -3,6 +3,7 @@ + import ( + "context" + "fmt" ++ "os" + "log" + "strings" + +@@ -55,6 +56,11 @@ + + var diags tfdiags.Diagnostics + ++ val, ok := os.LookupEnv("NIX_TERRAFORM_PLUGIN_DIR") ++ if ok { ++ flagPluginPath = append(flagPluginPath, val) ++ } ++ + if len(flagPluginPath) > 0 { + c.pluginPath = flagPluginPath + } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix index 5483fc1e0f..f8ff802ede 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.7.0"; + version = "2.7.2"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-OA6NY8hI/Aw6vdtDfN1cRXdsLLfxW5ECg5tobPZB66Y="; + hash = "sha256-+DqkYzRS1H6PGthljAqsmLAnGtKkX4g0drZiRh8b1v4="; }; vendorHash = "sha256-q8Cx+J5BjMvO5wuvH5Tc5Oa9rjW7vXvS4DhSVv/E3E4="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix index b04c770dd9..823fdfb434 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pinniped/default.nix @@ -2,18 +2,18 @@ buildGoModule rec{ pname = "pinniped"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "pinniped"; rev = "v${version}"; - sha256 = "sha256-tUdPeBqAXYaBB2rtkhrhN3kRSVv8dg0UI7GEmIdO+fc="; + sha256 = "sha256-z+JwtrP3WGMK11RRYrDig5SrX6YCj7U3AwuLg/J8dgs="; }; subPackages = "cmd/pinniped"; - vendorHash = "sha256-IFVXNd1UkfZiw8YKG3v9uHCJQCE3ajOsjbHv5r3y3L4="; + vendorHash = "sha256-QywpqgQj76x0zmn4eC74fy7UECK4K81WO+nxOYKZqq0="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix index 93986c101b..de8eaa0e01 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.18.2"; + version = "5.18.4"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-PouKOIyKv7mxlBZJYCBppADdkf/XD28gavozCFFcO24="; + hash = "sha256-/8ZJXy5FErLnnXpED0UL+xqOo4QZtmR1hpcSpVsE8mw="; }; - vendorHash = "sha256-okqDtxSKVLlmnm5JdCKSvRZkXTsghi/L5R9TX10WWjY="; + vendorHash = "sha256-ysMRE/OwMf4rBnlkpkW9K8ZHEEbHpQ02RXNwLLSr0nY="; ldflags = [ "-w" "-s" @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://github.com/FairwindsOps/pluto"; description = "Find deprecated Kubernetes apiVersions"; license = licenses.asl20; - maintainers = with maintainers; [ peterromfeldhk ]; + maintainers = with maintainers; [ peterromfeldhk kashw2 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/prow/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/prow/default.nix index b1ea88a11a..9c8b311cf7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/prow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/prow/default.nix @@ -10,10 +10,10 @@ buildGoModule rec { owner = "kubernetes"; repo = "test-infra"; - sha256 = "0mc3ynmbf3kidibdy8k3v3xjlvmxl8w7zm1z2m0skmhd0y4bpmk4"; + hash = "sha256-ZNa7iAcN1qlBFT/UfziivW4q+9hjIt9WbHEOt6r1g1U="; }; - vendorSha256 = "16fdc5r28andm8my4fxj0f1yygx6j2mvn92i6xdfhbcra0lvr4ql"; + vendorHash = "sha256-FJO8KVCZLehaN1Eku6uQpj/vgwOyO+Irqs0qJHJhzZk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix index c3900c4faa..67f1988220 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/pv-migrate/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "pv-migrate"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "utkuozdemir"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mTzVMO0Msk5q8Wnpb0iQ8kifhNXlp4MfM+irMmOLDv8="; + sha256 = "sha256-J4GsXLff9OQNiLv3AvBLtmz383E2JPEB3VEN3nzE5R8="; }; subPackages = [ "cmd/pv-migrate" ]; - vendorHash = "sha256-SyORFCfX/4dhYLnsE/lc21/18TKpLkOxz+W9lsHjKNE="; + vendorHash = "sha256-PzmNCBTw9AfDUBh/tWlukH5EGJffEBCBT1gJTMIZRO0="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix index 8dcb08247e..ea7c1479ef 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-js/UjnNYRW7s3b4TeprhmBe4cDLDYDrMeLtpASI9aN4="; }; - vendorSha256 = "sha256-oEbKk9cMbI0ZWXrfM8Y19OF/A75mwHl0C/PJx0oTOBo="; + vendorHash = "sha256-oEbKk9cMbI0ZWXrfM8Y19OF/A75mwHl0C/PJx0oTOBo="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/rancher/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/rancher/default.nix index df8380010b..8259a574cc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/rancher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/rancher/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rancher"; - version = "2.7.0"; + version = "2.7.7"; src = fetchFromGitHub { owner = "rancher"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-co4LVd5A0bJ4CIuCfv6WyV8XCMbPCFAAcV12WekYrw4="; + hash = "sha256-HgLV4iuZXkL6BOKtUul1pFuIWv09VnUSPbdrtFd6Khk="; }; ldflags = [ @@ -19,7 +19,7 @@ buildGoModule rec { "-static" ]; - vendorHash = "sha256-oclMnt6uJa8SG2fNM0fi+HCVMMi4rkykx8VpK/tXilQ="; + vendorHash = "sha256-mXLZMnGJ1m5gFroJcSoE4SbVvsyuS73hfXFeWBRtUdI="; postInstall = '' mv $out/bin/cli $out/bin/rancher diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix index 38bdff136a..8021d55156 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "rke"; - version = "1.4.8"; + version = "1.4.10"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-tc3XZyn1jdjkxWXG6qjsE2udpoq+RhhIWHXGmUQyO0Y="; + hash = "sha256-rr6CN5ik4vuLNqzNPvISfRfOjTcD48pSre2K6xr6xSk="; }; - vendorHash = "sha256-MFXNwEEXtsEwB0Hcx8gn/Pz9dZM1zUUKhNYp5BlRUEk="; + vendorHash = "sha256-3bivFrn2xDyILD1ugSr7IehhNq4vkqShFQI3sbeY0iY="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/default.nix index 66b1324a6b..68da1404bd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "rke2"; - version = "1.27.3+rke2r1"; + version = "1.28.2+rke2r1"; src = fetchFromGitHub { owner = "rancher"; repo = pname; rev = "v${version}"; - hash = "sha256-M/3F97iNeXdMMhs0eoPODeBC6Jp+yo/PwlPiG28SfYU="; + hash = "sha256-PkBnM6mKE90e8VZ3QHYp2mM4RgD9u1gNjFea3RaPGy0="; }; - vendorHash = "sha256-7Za8PQr22kvZBvoYRVbI4bXUvGWkfILQC+kAmw9ZCro="; + vendorHash = "sha256-aW8en8KJsPITKT4fIyhhtLiYdk+98iL14wQXG4HsM3U="; postPatch = '' # Patch the build scripts so they work in the Nix build environment. @@ -35,5 +35,7 @@ buildGoModule rec { changelog = "https://github.com/rancher/rke2/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ zimbatm zygot ]; + mainProgram = "rke2"; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix index bfd8c740fa..5f22075554 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "4.1.2"; + version = "4.2.0"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-5wNf80kiYnKg/urIQQqe4HijqxQweiFx0UktFiOTeaU="; + sha256 = "sha256-GrqefNH3wLMMd+JfkugVJhUHFP5vvqroAMbWLan9ylU="; }; - vendorHash = "sha256-5glD904guK+TR9YFzeuIyHOXrJblcEVi9EReQz0fCCA="; + vendorHash = "sha256-y/ZoSK/lgqt8VZAb8NgCzyde/cwAhpu658/3mC/tI98="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix index b558a7ff0b..f4d50d3dbb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { sha256 = "sha256-YiVCdAdwdK9PcQ6VQQNAjLQq2X54vJmZfbHRjV2d8VQ="; }; - vendorSha256 = "sha256-Fqxkyl9AKZ7H4QSp2V/yztpeXHt57+LjpzzGtOPndX0="; + vendorHash = "sha256-Fqxkyl9AKZ7H4QSp2V/yztpeXHt57+LjpzzGtOPndX0="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix index baf8584787..613bac4c9e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -3,12 +3,16 @@ , buildGoPackage , makeWrapper , fetchFromGitHub -, fetchpatch , coreutils , nettools -, dmidecode +, busybox , util-linux +, stdenv +, dmidecode , bashInteractive +, nix-update-script +, testers +, ssm-agent , overrideEtc ? true }: @@ -28,17 +32,17 @@ let in buildGoPackage rec { pname = "amazon-ssm-agent"; - version = "3.0.755.0"; + version = "3.2.1630.0"; goPackagePath = "github.com/aws/${pname}"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { - rev = version; + rev = "refs/tags/${version}"; owner = "aws"; repo = "amazon-ssm-agent"; - hash = "sha256-yVQJL1MJ1JlAndlrXfEbNLQihlbLhSoQXTKzJMRzhao="; + hash = "sha256-0tN0rBfz2VZ4UkYLFDGg9218O9vyyRT2Lrppu9TETao="; }; patches = [ @@ -48,38 +52,48 @@ buildGoPackage rec { # They used constants from another package that I couldn't figure # out how to resolve, so hardcoded the constants. ./0002-version-gen-don-t-use-unnecessary-constants.patch - - (fetchpatch { - name = "CVE-2022-29527.patch"; - url = "https://github.com/aws/amazon-ssm-agent/commit/0fe8ae99b2ff25649c7b86d3bc05fc037400aca7.patch"; - sha256 = "sha256-5g14CxhsHLIgs1Vkfw8FCKEJ4AebNqZKf3ZzoAN/T9U="; - }) ]; - preConfigure = '' - rm -r ./Tools/src/goreportcard + # See the list https://github.com/aws/amazon-ssm-agent/blob/3.2.1630.0/makefile#L120-L138 + # The updater is not built because it cannot work on NixOS + subPackages = [ + "core" + "agent" + "agent/cli-main" + "agent/framework/processor/executer/outofproc/worker" + "agent/session/logging" + "agent/framework/processor/executer/outofproc/sessionworker" + ]; + + ldflags = [ + "-s" + "-w" + ]; + + postPatch = '' printf "#!/bin/sh\ntrue" > ./Tools/src/checkstyle.sh substituteInPlace agent/platform/platform_unix.go \ - --replace "/usr/bin/uname" "${coreutils}/bin/uname" \ - --replace '"/bin", "hostname"' '"${nettools}/bin/hostname"' \ - --replace '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"' - - substituteInPlace agent/managedInstances/fingerprint/hardwareInfo_unix.go \ - --replace /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode + --replace "/usr/bin/uname" "${coreutils}/bin/uname" \ + --replace '"/bin", "hostname"' '"${nettools}/bin/hostname"' \ + --replace '"lsb_release"' '"${fake-lsb-release}/bin/lsb_release"' substituteInPlace agent/session/shell/shell_unix.go \ - --replace '"script"' '"${util-linux}/bin/script"' + --replace '"script"' '"${util-linux}/bin/script"' + + substituteInPlace agent/rebooter/rebooter_unix.go \ + --replace "/sbin/shutdown" "shutdown" echo "${version}" > VERSION '' + lib.optionalString overrideEtc '' substituteInPlace agent/appconfig/constants_unix.go \ --replace '"/etc/amazon/ssm/"' '"${placeholder "out"}/etc/amazon/ssm/"' + '' + lib.optionalString stdenv.isLinux '' + substituteInPlace agent/managedInstances/fingerprint/hardwareInfo_unix.go \ + --replace /usr/sbin/dmidecode ${dmidecode}/bin/dmidecode ''; preBuild = '' - cp -r go/src/${goPackagePath}/vendor/src go - pushd go/src/${goPackagePath} # Note: if this step fails, please patch the code to fix it! Please only skip @@ -95,8 +109,6 @@ buildGoPackage rec { postBuild = '' pushd go/bin - rm integration-cli versiongenerator generator - mv core amazon-ssm-agent mv agent ssm-agent-worker mv cli-main ssm-cli @@ -125,11 +137,23 @@ buildGoPackage rec { wrapProgram $out/bin/amazon-ssm-agent --prefix PATH : ${bashInteractive}/bin ''; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = ssm-agent; + command = "amazon-ssm-agent --version"; + }; + }; + meta = with lib; { description = "Agent to enable remote management of your Amazon EC2 instance configuration"; + changelog = "https://github.com/aws/amazon-ssm-agent/releases/tag/${version}"; homepage = "https://github.com/aws/amazon-ssm-agent"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ copumpkin manveru ]; + maintainers = with maintainers; [ copumpkin manveru anthonyroussel ]; + + # Darwin support is broken + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix index 337d86f9fe..ddfa4443d8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "starboard"; - version = "0.15.13"; + version = "0.15.15"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8sEhR32CaTYGHi6tdhjGl8c42QUbaaUDdFwtpEFwRHo="; + sha256 = "sha256-aKxRjPXvj9rGUheUjpjGWlzg9I6LaCxfc6FJV8Kzj3I="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-JEji1wPXLfVireuIVD2Ct/1Nvf92ukwRpMDCrT/CbOE="; + vendorHash = "sha256-dUqcg9/kJfKWIygem0rmtgOiYOHpfWOdH4YV0mYhxeQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix index 0631dd1788..b144df23bd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "stern"; - version = "1.25.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-E4Hs9FH+6iQ7kv6CmYUHw9HchtJghMq9tnERO2rpL1g="; + sha256 = "sha256-86XoYzw1bnIWwGiFgRl9RcZSYrF4byYKnDlJ4QSqXV0="; }; - vendorHash = "sha256-+B3cAuV+HllmB1NaPeZitNpX9udWuCKfDFv+mOVHw2Y="; + vendorHash = "sha256-LLVd9WB8ixH78CHYe0sS4sCDCD+6SQ7PxWr2MHiAOxI="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix index 2beb86e4df..1d0356e68e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.4.7"; + version = "1.5.3"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - hash = "sha256-K5YuT8OTxkkv5k6bW6kFDB3NMmXM1yFGBxId0snShe4="; + hash = "sha256-RoodFtZ4BINyPxxpVkliMD9Sam0eRujvd3gXR2Hxk70="; }; - vendorHash = "sha256-RJhsGjpSHbRXhOr2OkjY7x/Tgw+o7eJ9Ebd+NpW5KFs="; + vendorHash = "sha256-PIuSn4qp6bLPFJwkLEb+pX1ra49IkxXYDRzEFbVqVI0="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix index 05a097845d..3b9962b84a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tektoncd-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tektoncd-cli"; - version = "0.31.1"; + version = "0.32.0"; src = fetchFromGitHub { owner = "tektoncd"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-SneGlXEthl/x6n+IlMN6y/ZubgHlfseoV0PS9sGcrTM="; + sha256 = "sha256-Ilue0stXko8bkMMzXEHrdgJYIV5ZcI39hwFUya8X4ac="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix index c35cf14e06..126a083b5b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule, installShellFiles, symlinkJoin }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles, symlinkJoin, stdenv }: let metaCommon = with lib; { @@ -40,6 +40,9 @@ let "-X github.com/temporalio/cli/headers.Version=${version}" ]; + # Tests fail with x86 on macOS Rosetta 2 + doCheck = !(stdenv.isDarwin && stdenv.hostPlatform.isx86_64); + preCheck = '' export HOME=$(mktemp -d) ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix index de33dd0626..6c0715939f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.21.2"; + version = "1.22.0"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-4iosKxGjH2O2y2wkAs/tuCH+SXTj6FhrPqS9qgL+vTQ="; + hash = "sha256-7AdbGsgdDsSUtj8TkZl4CcvF2Xk1l9W9Vdos+fEsIVI="; }; - vendorHash = "sha256-rgUdoFR7Qcp1h7v63DAWwx6NWSwWrJ6C6/b2tx2kCCw="; + vendorHash = "sha256-gDiVB34fICaS6IyQCAa4ePff/vsT7/7HnJM9ZjiOh4k="; excludedPackages = [ "./build" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporalite/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporalite/default.nix index a842a89628..efe1f2d30c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporalite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporalite/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-IEB9AFEt8U2zXYfbChfL/UH1rNSLPnfS396/cPE8UdE="; }; - vendorSha256 = "sha256-w86/XCMRGBmXM+oQ5+0qiX0fdwiKXvsmEkApuRLUOiA="; + vendorHash = "sha256-w86/XCMRGBmXM+oQ5+0qiX0fdwiKXvsmEkApuRLUOiA="; subPackages = [ "cmd/temporalite" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix index c10b43e1f8..669af001e5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-compliance/default.nix @@ -5,20 +5,21 @@ python3.pkgs.buildPythonApplication rec { pname = "terraform-compliance"; - version = "1.3.34"; + version = "1.3.44"; format = "setuptools"; src = fetchFromGitHub { owner = "terraform-compliance"; repo = "cli"; rev = "refs/tags/${version}"; - sha256 = "sha256-1TFLpBwkpMMdiJJfVvDXlJg4SXWQ8VV605wMFGU+InQ="; + sha256 = "sha256-eE9bqu9ipuas+rdcJpn09V6nkdoYPOpChHgPH8U0rNw="; }; postPatch = '' substituteInPlace setup.py \ --replace "IPython==7.16.1" "IPython" \ - --replace "diskcache==5.1.0" "diskcache>=5.1.0" + --replace "diskcache==5.1.0" "diskcache>=5.1.0" \ + --replace "radish-bdd==0.13.1" "radish-bdd" \ ''; propagatedBuildInputs = with python3.pkgs; [ @@ -33,6 +34,7 @@ python3.pkgs.buildPythonApplication rec { netaddr radish-bdd semver + orjson ]; nativeCheckInputs = with python3.pkgs; [ @@ -53,6 +55,6 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/terraform-compliance/cli"; changelog = "https://github.com/terraform-compliance/cli/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; + maintainers = with maintainers; [ kalbasit kashw2 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix index 50efacfd62..319db3c9b8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "sha256-zSSK2WfcbD1DvqsFUKdTydLfyApWzm1h+ihSnLUmq2E="; }; - vendorSha256 = "sha256-0Bkjx/gq2MAWjxoMSGtBcRzv40SSUVDZBh4PzEtKj5o="; + vendorHash = "sha256-0Bkjx/gq2MAWjxoMSGtBcRzv40SSUVDZBh4PzEtKj5o="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix index 783f9c79bb..89d4b769e9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-inventory/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-gkSDxcBoYmCBzkO8y1WKcRtZdfl8w5qVix0zbyb4Myo="; }; - vendorSha256 = "sha256-pj9XLzaGU1PuNnpTL/7XaKJZUymX+i8hFMroZtHIqTc="; + vendorHash = "sha256-pj9XLzaGU1PuNnpTL/7XaKJZUymX+i8hFMroZtHIqTc="; ldflags = [ "-s" "-w" "-X main.build_version=${version}" ]; 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 462240ce3c..0031fb0397 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 @@ -9,14 +9,14 @@ "vendorHash": null }, "acme": { - "hash": "sha256-azNFQ4U7iGIKLingq4GItjXvdcsm0YkrQ4PRvEeDjVU=", + "hash": "sha256-5KR32V4sE5AkOVroLmelNBzBZpD4KfhC491X+5eo+n8=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "proxyVendor": true, "repo": "terraform-provider-acme", - "rev": "v2.16.1", + "rev": "v2.17.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-9F853+GHfwGH0JQRLawLEB8X76z/Xll1Aa4+vBRWk1o=" + "vendorHash": "sha256-UIV0dIoRZxNiaEq1HGPIV4mFLn4pAoGPo6tx6zV3r3A=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", @@ -28,29 +28,29 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-T9d1iMuFqewDVK4EOsF4uCsqZAsThMHaRa7ilGnYXCo=", + "hash": "sha256-3agD22viTP+yntNg2nyYi5OpknXnfI2Jk/xEcvXgia8=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.7.0", + "rev": "v4.8.2", "spdx": "MIT", - "vendorHash": "sha256-Fcu4RWgbVyAUr72h8q91HT+LbUh9+4SPDz8Vc4/u5RM=" + "vendorHash": "sha256-sVPby/MLAgU7DfBDACqxvkLWblBhisHcUaoOgR3fMaM=" }, "akamai": { - "hash": "sha256-LGgZF2/YCYpoDOSu0UeuPqK9wGXrvPQE4WUGGS0sx30=", + "hash": "sha256-jVl4B7YfBDri+G/cJHTvPJquCALEdKxRY1DKeJOC2p0=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v5.1.0", + "rev": "v5.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-6oPftQghM0h0pgc04Rm4PD8OZ/z+dEdcsIqWPPbSgbM=" + "vendorHash": "sha256-GjGv4q0+Yfu4Vc/eZHcch/Y5MMj1QszDrIlu/sY33Ho=" }, "alicloud": { - "hash": "sha256-hE93VV29Whh2POUz15Hcx8aq/78cw7NXDn+xUhrEA+E=", + "hash": "sha256-Ni69AvtyRgwT89OayULlqS8mWdoK+BLK35H0sQEiksg=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.209.0", + "rev": "v1.209.1", "spdx": "MPL-2.0", "vendorHash": null }, @@ -101,22 +101,22 @@ "vendorHash": "sha256-vORXHX6VKP/JHP/InB2b9Rqej2JIIDOzS3r05wO2I+c=" }, "aviatrix": { - "hash": "sha256-99y+m2U/aCYrJSTB/eQIakPR3KQzh2OqBizl3htsvL4=", + "hash": "sha256-T/GPJBcKxWhBxB7fVACkkwRm6dqixQpkAzi6UYw6TRw=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v3.1.1", + "rev": "v3.1.2", "spdx": "MPL-2.0", "vendorHash": null }, "aws": { - "hash": "sha256-25CTfFwj/RxsFE6gpUxS1X3TbsuRhTZP89WqhsaRp8w=", + "hash": "sha256-Wt6rcHCxn1RPIxblL/Y6JWfsmOcloMZ8DMWvoVz/xrI=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.13.1", + "rev": "v5.14.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Oir+zn8UNbO3vbl3+QUIlis4K2watmWokaYdD7xGYzI=" + "vendorHash": "sha256-wF4dsQItVSXpJWBiOmdt/5ZaZeROmIxNW66Ec80PudU=" }, "azuread": { "hash": "sha256-aLckXkWxMsDS1ddPucAmjFS6+mkwHeAO1+BlPNaF6cI=", @@ -128,11 +128,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-Nw0Ep5YbipmupB53uzZHHogseHFAbvurz42Q4fPNw/o=", + "hash": "sha256-l26MIkMpB4/vO6r2u7vyepAGxRw8CNPDhcUD/USWteg=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.70.0", + "rev": "v3.71.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -146,20 +146,20 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-yV5NgymZesYE/RhXccTE2Qdf7bHO35qAI+QdPYPUPDM=", + "hash": "sha256-5tydl+IMHz1wYxNUHJY6l+yIgtjc0gy5ufa+DQHiNf0=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.13", + "rev": "v1.19.15", "spdx": "MPL-2.0", "vendorHash": null }, "bigip": { - "hash": "sha256-lC6EesN0y8TxW8jXatteY44/X8cHgRs72i8KfvN2JEM=", + "hash": "sha256-dlQRjIf2lffWqD42ykZdm6HJT0qdID9gdc0vjq2nl9k=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.18.1", + "rev": "v1.19.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -182,13 +182,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-rcklWodBh5iJjxIjGhEH0l3S9bXUWfBG52V/23o8JDM=", + "hash": "sha256-LZyfyiPyGToJMMue9049CnMnioJblko/WXt2PSNv4WE=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v0.24.0", + "rev": "v0.26.0", "spdx": "MIT", - "vendorHash": "sha256-3BtXtXhFyTNQD0J/5hNi0JsPcaIDWUQNEgf6r0VIfMM=" + "vendorHash": "sha256-G4aKekEqEZVMxXDjPgnzvXidv0u1WydZqxSPj5d+WKg=" }, "checkly": { "hash": "sha256-tOTrAi6hd4HFbHAj0p/LTYdxQl1R1WuQ9L4hzqmDVqI=", @@ -218,13 +218,13 @@ "vendorHash": "sha256-qIgr+ynaNSfNx1iW5RJrNHvEnlr46dBzIi+5IXYn+3Q=" }, "cloudflare": { - "hash": "sha256-ayxekJkQt/7K/qwMKvjqkyVkux5+Jw3uyepmaiy3Ptc=", + "hash": "sha256-l1cTzPiOOLyvbvbt7dWR9lRgqVFiO5gRq4XNnLqvac0=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.12.0", + "rev": "v4.13.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-VTSbi2pDllzyKDhWs5EpWSXO5oKl+khVqLg/Ro3x8ys=" + "vendorHash": "sha256-uZ0zc+/RmEiqxBSZLgLPmwN29BEJitPN13HE88zPxcI=" }, "cloudfoundry": { "hash": "sha256-yEqsdgTSlwppt6ILRZQ6Epyh5WVN6Il3xsBOa/NfIdo=", @@ -282,13 +282,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-sytQJgrfgtJ761mGo0KUTxAukqvmPYyLM8+vsYGtoZc=", + "hash": "sha256-FAqtbze6Lw6SCU84R6aB0oY+pcWyDBdTZRBZhM2pjyc=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.28.0", + "rev": "v3.29.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-foS7GyRUdhF/M8uTPf2I4WQo7qEg4Z/3FXjagoeSRkU=" + "vendorHash": "sha256-UJRuj5qmWWjkqMBGf0500//83ky0Dxx04IQETPwwSsw=" }, "dexidp": { "hash": "sha256-69r3m3lIKftZQ8NXBD5KEHbsNUwCGpFgn/CYO+921M4=", @@ -353,6 +353,15 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" }, + "doppler": { + "hash": "sha256-VwyJrgPiZW9DzAFS3SeLxV6sdVjD5MzsekOSg3ByhXk=", + "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", + "owner": "DopplerHQ", + "repo": "terraform-provider-doppler", + "rev": "v1.2.4", + "spdx": "Apache-2.0", + "vendorHash": "sha256-Z5GKIty78BUFF3VbTcsZKi437gw/kOIHEKkAYu3uB2o=" + }, "elasticsearch": { "hash": "sha256-a6kHN3w0sQCP+0+ZtFwcg9erfVBYkhNo+yOrnwweGWo=", "homepage": "https://registry.terraform.io/providers/phillbaker/elasticsearch", @@ -363,13 +372,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-MEsE1OQwKjd1Y+Ek7UmZMbLq4x84iQW40sMl78UbW2c=", + "hash": "sha256-6fY1gDQLPOaq2FiuT0Mue8dcsJbFCFQ1N38tmyBcdWg=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.14.7", + "rev": "v1.16.0", "spdx": "MIT", - "vendorHash": "sha256-cfJG0DJJJX85ISz7dSZ+di1uhgJJd5xUH99PhqGMPgw=" + "vendorHash": "sha256-SqT25WhGmJM/ZTd7QdVPJFxo7zo5OB9AuuDK4RdjKeI=" }, "exoscale": { "hash": "sha256-93pCsHrsYLJYgg8MXHz2Gg+vaPC9gcHdLastb89/BMg=", @@ -436,42 +445,42 @@ "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk=" }, "github": { - "hash": "sha256-9U3vF8xunpTKbOTytUEscMeS3ya6u+PVkNVJjufhpZ0=", + "hash": "sha256-I1FOJitXPJo/mlJCTXsJ1i+UCTImbtkJtEWAvV8wUP0=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.33.0", + "rev": "v5.34.0", "spdx": "MIT", "vendorHash": null }, "gitlab": { - "hash": "sha256-uKImp0kcsLZL1SOAygd/ssJ7pxclUbAcDcEB3ko9Mio=", + "hash": "sha256-91hv73KEer3FyS9FWoQ0gV1VwRKZqAu/6fAughmX5D0=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v16.2.0", + "rev": "v16.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-AVTWTS16d8QsPLLAJeAfgcVDzUBMp+b2oAphaCBqhS0=" + "vendorHash": "sha256-G7+3vqxdi4i21o1hYj2GVvoCdcmFN3ue1i4fuepucsw=" }, "google": { - "hash": "sha256-tfjrVWj+l9mNdgZ+unu4NW15OAOzViTVmSTzO/ZiqRE=", + "hash": "sha256-MysIqOj2FTxZL1K/+Ai9/Fv69kIFGEmhWJpWxvsiTcc=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.79.0", + "rev": "v4.80.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-lyOupw64LQvdTJZjJ1RvAn1JLDHAZ4qAaagASXHcEXA=" + "vendorHash": "sha256-jf7BnPmCMTMS3+vCy5AVIO4/tFBDtLDItXn9sDZNLRM=" }, "google-beta": { - "hash": "sha256-70Za/CGYv5HkkXMYtnIHzliW1551ZGF/L05RQtCtjHM=", + "hash": "sha256-xaSse89edfKWBM56oAE3r7IwJ7gdaArSw6flcFC7ZLk=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.79.0", + "rev": "v4.80.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-lyOupw64LQvdTJZjJ1RvAn1JLDHAZ4qAaagASXHcEXA=" + "vendorHash": "sha256-jf7BnPmCMTMS3+vCy5AVIO4/tFBDtLDItXn9sDZNLRM=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", @@ -510,11 +519,11 @@ "vendorHash": "sha256-r8njRjQGYESeHuD8pF6rRUe1j2VVMwoDITFi2StC5bk=" }, "helm": { - "hash": "sha256-mGrQ5YKNsv1+Vkan5ohMXnTYofhCQPuTFjemXF/g+tA=", + "hash": "sha256-pgV1xXhg8WIyF4RhJwAenTI6eAmtINveO8zqrKzLajQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", "repo": "terraform-provider-helm", - "rev": "v2.10.1", + "rev": "v2.11.0", "spdx": "MPL-2.0", "vendorHash": "sha256-a80+gjjoFOKI96pUMvTMyM90F5oCb1Ime8hPQcFedFE=" }, @@ -583,13 +592,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-z3k4H4eP5NMufkHaEUIQBQUybpEcfkUO0k3pEMvMPFQ=", + "hash": "sha256-AGAr1O6gzkEG3MQ/AQZarzYnhMK2yilyf9rtKDOwKsM=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.56.1", + "rev": "v1.56.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-djpo+9BxWUptKRephw0by4xtPABEjsnCqwcbZoRNIug=" + "vendorHash": "sha256-uUVU+2mXyhWq653ig8YlsRyqcQBHO9rrRJQwSHovQiM=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -664,11 +673,11 @@ "vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA=" }, "launchdarkly": { - "hash": "sha256-gXT/rBlucBjg+8cjpSXdlClFGNuWmq6tZuuMfsBhR2E=", + "hash": "sha256-sIu+3Vu99wxcA+fdYMXRMZzK7RpUlV37136wyn5H4WQ=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.15.0", + "rev": "v2.15.1", "spdx": "MPL-2.0", "vendorHash": "sha256-I+9hfKWBbclXXpthQc9LAHhZ7MYr/8I89mLeIVeae+Q=" }, @@ -682,13 +691,13 @@ "vendorHash": "sha256-4jAJf2FC83NdH4t1l7EA26yQ0pqteWmTIyrZDJdi7fg=" }, "linode": { - "hash": "sha256-tSbrd+T1HOOpO4atNDcYmq0SkEureSJkjWOnxqOTdnM=", + "hash": "sha256-rGInk/2GCwd+pNnL3+009xuqhpR4kr7u8NYho1XRtqs=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.6.0", + "rev": "v2.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-dIxOvx8UpZD5I7acucxzfnq+gyDX+uqVMJRkqH5jTRI=" + "vendorHash": "sha256-KlzQ336zOsMUsCX8eanypXP32LxP+iTJDBvQdeWSv2k=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", @@ -709,13 +718,13 @@ "vendorHash": "sha256-ZjS40Xc8y2UBPn4rX3EgRoSapRvMEeVMGZE6z9tpsAQ=" }, "lxd": { - "hash": "sha256-mZ2ptpgpyNXZAS19MVxOq3cfmSjTJvTP60fbpEgk6kE=", + "hash": "sha256-0/nIdfCsmPaUkGkSkmWWioc6RZGTb0XWtvprjuDg2gU=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", "repo": "terraform-provider-lxd", - "rev": "v1.10.1", + "rev": "v1.10.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-zGVatrMqYsbGahEGJ/Gt9ub76R49m7RbLLs2XeKwQJw=" + "vendorHash": "sha256-DMOyP8BX1502a+Hd7rwhpV2/nT0ECFKmKDPtWE6o0IM=" }, "mailgun": { "hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=", @@ -790,13 +799,13 @@ "vendorHash": "sha256-BWCL84bDsfrcM9Bkc3G6r0RQ1YnonH1D9bDSywTcigw=" }, "nomad": { - "hash": "sha256-1TmcFS+ul7xpSGqQohcCdeQ2zuDD429xGI0X2Add5HQ=", + "hash": "sha256-urxTfyBv/vuX3Xowca625aNEsU4sxkmd24tis2YjR3Y=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", "repo": "terraform-provider-nomad", - "rev": "v1.4.20", + "rev": "v2.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jnZ7LzKgyPVCnYoWp+nDeQy2w91sBVX43KjInzqRWqc=" + "vendorHash": "sha256-L8BpkzTs5qcr31Nho66xzlNMVg2SqfZbj9pPAZrNuqA=" }, "ns1": { "hash": "sha256-faxvq99kkJS0rxNflmIhSDCO/VAVvPsIGV4MTgyRf+Y=", @@ -827,11 +836,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-sxhykS4pXF00VJVtVd7kO2GasAqBUUMqPDPLE3BzUFI=", + "hash": "sha256-xZHk/rkq2H4Bkr+ugTHrkb4Al2ky0zOWEQmZtiXV48s=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.9.0", + "rev": "v5.11.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -872,13 +881,13 @@ "vendorHash": "sha256-NnB8deqIeiB66Kba9LWT62fyI23HL57VcsTickoTRwI=" }, "opentelekomcloud": { - "hash": "sha256-WL7eER7FsuIpdFsp4K1RlrrhEEK6hMou7HYAn/XbvLU=", + "hash": "sha256-dNA6rNzbXFycKRKwJl+/HqUKCKn678KqthIRhmOe72M=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.35.5", + "rev": "v1.35.6", "spdx": "MPL-2.0", - "vendorHash": "sha256-C2wZjhO6PAiHuoKWN97QJLnC0tYNEyDXMSErGlv2Zpg=" + "vendorHash": "sha256-PHtTE3puaeIKXr9mf2bDhhHI51L4XVfOPhL7c5AvlBA=" }, "opsgenie": { "hash": "sha256-Jz3JMq39C2NvA0kvJdjjkOHNvZOMuw4Fq2+nyVHRIL4=", @@ -890,20 +899,20 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-CG7xyx3d9jPD+W0EmNVwdV2ShenfsnxykkERe/8ky3A=", + "hash": "sha256-U1gjD3NUm3/KqnbjgM91qe5gy/x/9Mn3Q4VW2XXBRw4=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.32.0", + "rev": "v0.33.0", "spdx": "MPL-2.0", "vendorHash": null }, "pagerduty": { - "hash": "sha256-kVz63aXl03p6T22WPB9PuZm+QllGxJNt3fDZ1H64dqw=", + "hash": "sha256-wVXGDWpKVujS5FfvDM7quCuXRFP2MBlJra7qTyFJgDM=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v2.16.0", + "rev": "v2.16.2", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1025,11 +1034,11 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-zIXlrb/2g/N/slOfvyLmNG2keGXKTes0rHXJmZLV0Sg=", + "hash": "sha256-ILh5mdTyzU0AfJzyGH9JK1QsOER0BtKn9vXyRaGeb8g=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v8.1.0", + "rev": "v9.0.0", "spdx": "MPL-2.0", "vendorHash": "sha256-PQU4VC5wHcB70UkZaRT8jtz+qOAONU2SxtRrTmml9vY=" }, @@ -1106,20 +1115,20 @@ "vendorHash": "sha256-7qDPVKcBQuJQlya6UHjo5YPLgKl0qz1NlU2TuEf8T+0=" }, "talos": { - "hash": "sha256-GRwzR2L6PKx6Us1ci3cs2+DU7TQvhEPcOLyn73dS96Y=", + "hash": "sha256-aP5hiR+b31+QjVWvNPxYkzijTUnFGpgR3f5XuN1Pzx8=", "homepage": "https://registry.terraform.io/providers/siderolabs/talos", "owner": "siderolabs", "repo": "terraform-provider-talos", - "rev": "v0.3.0", + "rev": "v0.3.2", "spdx": "MPL-2.0", "vendorHash": "sha256-0HRhwUGDE4y7UFlXyD0w8zl4NV5436L4SRhrb8vQGyc=" }, "tencentcloud": { - "hash": "sha256-9nm4x3pBHvUDyMWUZpxqbSOc4uxGZ50lKBwf8PV9UAQ=", + "hash": "sha256-OA/GnrdOv9gbnGESdMdw7sc9kRcWI4A6A79ZLOQzyJU=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.21", + "rev": "v1.81.22", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1179,11 +1188,11 @@ "vendorHash": null }, "ucloud": { - "hash": "sha256-ccQwHQlJTqNRNdcz1gd58rzauBcCgV3bGpoKIThruDQ=", + "hash": "sha256-+xqt0y/DIx+h8L+73B00ou0Cy9f60sGijgw95N8eROk=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.36.1", + "rev": "v1.37.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1197,12 +1206,12 @@ "vendorHash": "sha256-D7geLjmJoelbHolyS5IhnGNNl6kD8ZGtCRWcy+j2dxA=" }, "vault": { - "hash": "sha256-lnM52d7J36wu9MYh13IFSR15rMfJpXP4tw47LzRy4o4=", + "hash": "sha256-IPVD4VVC6jn3BWltqfCk2+GFSkQRNK7jkJ3/QmgBxqg=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.19.0", + "rev": "v3.20.0", "spdx": "MPL-2.0", "vendorHash": "sha256-xd2tsJ5k/8PCSegHqeyJ1ePFBS0ho8SD+4m4QyFMTL0=" }, diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 1a2ecf3715..e6c122a539 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -53,17 +53,17 @@ let "Tool for building, changing, and versioning infrastructure"; homepage = "https://www.terraform.io/"; changelog = "https://github.com/hashicorp/terraform/blob/v${version}/CHANGELOG.md"; - license = licenses.mpl20; + license = licenses.bsl11; maintainers = with maintainers; [ Chili-Man babariviere kalbasit - marsam - maxeaubrey + amaxine timstott zimbatm zowoq techknowlogick + qjoly ]; mainProgram = "terraform"; }; @@ -167,9 +167,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.5.5"; - hash = "sha256-SBS3a/CIUdyIUJvc+rANIs+oXCQgfZut8b0517QKq64="; - vendorHash = "sha256-lQgWNMBf+ioNxzAV7tnTQSIS840XdI9fg9duuwoK+U4="; + version = "1.6.0"; + hash = "sha256-R1phgtGn9hyNqa0wR1zY9uThTJSIj7TuK5ekXx48QP0="; + vendorHash = "sha256-V7S+IzHfBhIHo0xCvHJ75gOmvVbJd2k8XBdvLG1dcsc="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 940d6bf2af..1e6c86915a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,23 +5,23 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.48.6"; + version = "0.52.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pvDZfKITFrhtLnewAhRGjwu45zj2q3usNSr9U2xb52Y="; + hash = "sha256-t1GAcOZAYdfrI0lsyKUEBbnJaGzuFP0+Mz3Yrv4Bmik="; }; - vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA="; + vendorHash = "sha256-NSrZVLQ3Qbnp94qCV7NbrEav/7LCRbTov+B2vzbuvdM="; doCheck = false; ldflags = [ "-s" "-w" - "-X main.VERSION=v${version}" + "-X github.com/gruntwork-io/go-commons/version.Version=v${version}" ]; doInstallCheck = true; @@ -38,6 +38,6 @@ buildGoModule rec { changelog = "https://github.com/gruntwork-io/terragrunt/releases/tag/v${version}"; description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices"; license = licenses.mit; - maintainers = with maintainers; [ jk qjoly ]; + maintainers = with maintainers; [ jk qjoly kashw2 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tf-summarize/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tf-summarize/default.nix index d4958d762b..7267e3fc06 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tf-summarize/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tf-summarize/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tf-summarize"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "dineshba"; repo = "tf-summarize"; rev = "v${version}"; - hash = "sha256-d8DIVPQkuEvDCO0wKl+aK1jSu6MJCpTxQrgKYcFnzjA="; + hash = "sha256-1sYWOvSWxoS0R6M1HxJ6yyBSa/LY3b9G8mF3NMofFhM="; }; - vendorHash = "sha256-cnybdZth7qlP2BHK8uvLCoqJtggMIkvaL2+YugiUZRE="; + vendorHash = "sha256-YdfZt8SHBJHk5VUC8Em97EzX79EV4hxvo0B05npBA2U="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tfautomv/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tfautomv/default.nix index 1374bfe08f..7409ec8ea4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tfautomv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tfautomv/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tfautomv"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "busser"; repo = pname; rev = "v${version}"; - hash = "sha256-/Pli1gTG/68BtPdvF+BAwxFaeBrjj69h6Mtcbfm7UZ8="; + hash = "sha256-A1/sf+QjxQ8S2Cqmw9mD0r4aqA2Ssopeni0YNLND9L8="; }; vendorHash = "sha256-zAshnSqZT9lx9EWvJsMwi6rqvhUWJ/3uJnk+44TGzlU="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tfupdate/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tfupdate/default.nix index 24f7e36049..1b99068568 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tfupdate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tfupdate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tfupdate"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "minamijoyo"; repo = "tfupdate"; rev = "v${version}"; - sha256 = "sha256-ii37Au/2jjGdQjc2LnBPkyNNBMbD5XPPo7i3krF33W0="; + sha256 = "sha256-HyDWye7xL0g5vDoGl8FYFXfuMKU4rxAlFawQ5ynqkmc="; }; - vendorHash = "sha256-gtAenM1URr2wFfe2/zCIyNvG7echjIxSxG1hX2vq16g="; + vendorHash = "sha256-oPqAH+i9ryb1Ps1yCkxoPgMmf4RNtFBCeE94vZAEnuo="; # Tests start http servers which need to bind to local addresses: # panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tgswitch/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tgswitch/default.nix index 31df14cebe..25c301f0cb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tgswitch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tgswitch/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "sha256-Q3Cef3B7hfVHLvW8Rx6IdH9g/3luDhpUMZ8TXVpb8gQ="; }; - vendorSha256 = "sha256-PlTdbA8Z2I2SWoG7oYG87VQfczx9zP1SCJx70UWOEog="; + vendorHash = "sha256-PlTdbA8Z2I2SWoG7oYG87VQfczx9zP1SCJx70UWOEog="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix index ac48c5e665..dd95c6d939 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { /* Do not use "dev" as a version. If you do, Tilt will consider itself running in development environment and try to serve assets from the source tree, which is not there once build completes. */ - version = "0.33.4"; + version = "0.33.6"; src = fetchFromGitHub { owner = "tilt-dev"; repo = "tilt"; rev = "v${version}"; - hash = "sha256-rQ5g5QyGyuJAHmE8zGFzqtpqW2xEju5JV386y9Cn+cs="; + hash = "sha256-WtE8ExUKFRtdYeg0+My/DB+L/qT+J1EaKHKChNjC5oI="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix index c0616c6ea3..02e6ffa1a3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/default.nix @@ -1,21 +1,21 @@ { lib -, buildGoModule +, buildGo121Module , fetchFromGitHub , installShellFiles }: -buildGoModule rec { +buildGo121Module rec { pname = "timoni"; - version = "0.11.1"; + version = "0.14.1"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-o5s/3c6fi6aYzKIBKq23U6FtzueDN0WVsG/wdCMEjDU="; + hash = "sha256-DzJNNikvODP3v1jgQLbFcXEhcFfTeIYR6qHhUzEP/Ns="; }; - vendorHash = "sha256-rMLswgEWWaDupBHDXs/JATaaw4n5D+LjlM72eq8hPAM="; + vendorHash = "sha256-lRZFRnft8vEntVxiLOBcR00FP8AXexLyo3h2LCNWN00="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; @@ -23,6 +23,8 @@ buildGoModule rec { # Some tests require running Kubernetes instance doCheck = false; + passthru.updateScript = ./update.sh; + ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/update.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/update.sh new file mode 100755 index 0000000000..4e997beeec --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/timoni/update.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix jq +set -euo pipefail + +PKG_DIR=$(dirname "${BASH_SOURCE[@]}") +FILE="$PKG_DIR/default.nix" +NIXPKGS_ROOT=$(cd $PKG_DIR && git rev-parse --show-toplevel) +ATTR="timoni" + +PREV_VERSION=$(nix eval --raw -f $NIXPKGS_ROOT/default.nix $ATTR.version) +LATEST_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/stefanprodan/timoni/releases/latest | jq -r '.tag_name') +NEXT_VERSION=$(echo ${LATEST_TAG} | sed 's/^v//') + +# update version +sed -i "s|$PREV_VERSION|$NEXT_VERSION|" "$FILE" + +# update hash +PREV_HASH=$(nix eval --raw -f $NIXPKGS_ROOT/default.nix $ATTR.src.outputHash) +NEXT_HASH=$(nix hash to-sri --type sha256 $(nix-prefetch-url --unpack --type sha256 $(nix eval --raw -f $NIXPKGS_ROOT/default.nix $ATTR.src.url))) +sed -i "s|$PREV_HASH|$NEXT_HASH|" "$FILE" + +# update vendor hash +PREV_VENDOR_HASH=$(nix eval --raw -f $NIXPKGS_ROOT/default.nix $ATTR.vendorHash) +EMPTY_HASH="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" +sed -i "s|$PREV_VENDOR_HASH|$EMPTY_HASH|" "$FILE" + +set +e +NEXT_VENDOR_HASH=$(nix-build $NIXPKGS_ROOT --no-out-link -A $ATTR 2>&1 | grep "got:" | cut -d':' -f2 | sed 's| ||g') +set -e + +if [ -z "${NEXT_VENDOR_HASH:-}" ]; then + echo "Update failed. NEXT_VENDOR_HASH is empty." >&2 + exit 1 +fi + +sed -i "s|$EMPTY_HASH|$NEXT_VENDOR_HASH|" "$FILE" + +cat <=5 yet + # https://github.com/NixOS/nixpkgs/issues/258504 + packageOverrides = self: super: { + transmission-rpc = super.transmission-rpc.overridePythonAttrs (old: rec { + version = "4.3.1"; + src = fetchPypi { + pname = "transmission_rpc"; + inherit version; + hash = "sha256-Kh2eARIfM6MuXu7RjPPVhvPZ+bs0AXkA4qUCbfu5hHU="; + }; + doCheck = false; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.9.3"; + version = "3.9.11"; format = "pyproject"; # Fetch from GitHub in order to use `requirements.in` @@ -14,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-IP6rVOrhIWrEWqrA0BCthAbCD2pRNnDzvY7bP4ANTCc="; + hash = "sha256-0ONjRIMSfHKvaO05hhurfnS/waNNRZEVq7BodeV00kU="; }; postPatch = '' @@ -22,12 +39,12 @@ python3.pkgs.buildPythonApplication rec { sed 's/[~<>=][^;]*//' -i requirements.txt ''; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python.pkgs; [ setuptools wheel ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ # See https://github.com/Flexget/Flexget/blob/master/requirements.txt apscheduler beautifulsoup4 diff --git a/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix index 63c674c1a0..470dc77cad 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/freefilesync/default.nix @@ -15,18 +15,18 @@ , makeDesktopItem }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "freefilesync"; - version = "12.5"; + version = "13.0"; src = fetchurl { - url = "https://freefilesync.org/download/FreeFileSync_${version}_Source.zip"; + url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip"; # The URL only redirects to the file on the second attempt postFetch = '' rm -f $out tryDownload "$url" ''; - hash = "sha256-KTN/HbNLP/+z5rryp3wDRo6c7l03vi6tUxCXZPMGUoM="; + hash = "sha256-E0lYKNCVtkdnhI3NPx8828Fz6sfmIm18KSC0NSWgHfQ="; }; sourceRoot = "."; @@ -127,4 +127,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ wegank ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix index cce2b739e1..be8173da16 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gmailctl/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-OpRkBHNWRrBhh6nGrV7dZT01xsSlbANCk+g7b8SidG0="; }; - vendorSha256 = "sha256-+r0WHrKARcxW1hUY1HwAXk0X6ZQrbgBj9+GjIJV5DS0="; + vendorHash = "sha256-+r0WHrKARcxW1hUY1HwAXk0X6ZQrbgBj9+GjIJV5DS0="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/applications/networking/gnmic/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gnmic/default.nix index 43884541cd..c6d8770415 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gnmic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gnmic/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gnmic"; - version = "0.31.7"; + version = "0.33.0"; src = fetchFromGitHub { owner = "openconfig"; repo = pname; rev = "v${version}"; - hash = "sha256-bX8oZk0psPqoXFU8b2JQmfFaPz18yiuSVXDmhoOnpFg="; + hash = "sha256-7jykosmVG+oJ6/27x+VtlVVxq/OQIctcjB1Wjs1DcRU="; }; - vendorHash = "sha256-hIG3kG2e9Y2hnHJ+96cPLgnlp5ParsLgWQY0HZTDggY="; + vendorHash = "sha256-VjeOSnCAdG+RlIg9uIyyQ8wKUqyX5uc2RXG75q84vm4="; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix index f2f26a85f6..b9722b6989 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gnome-network-displays/default.nix @@ -20,12 +20,12 @@ , pipewire }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gnome-network-displays"; version = "0.90.5"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${finalAttrs.pname}/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; sha256 = "sha256-2SBVQK4fJeK8Y2UrrL0g5vQIerDdGE1nhFc6ke4oIpI="; }; @@ -77,4 +77,4 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix index 43aa6e7343..bd1b74fe4a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gns3/default.nix @@ -12,25 +12,25 @@ in { guiStable = mkGui { channel = "stable"; - version = "2.2.42"; - hash = "sha256-FW8Nuha+NrYVhR/66AiBpcCLHRhiLTW8KdHFyWSao84="; + version = "2.2.43"; + hash = "sha256-+2dcyWnTJqGaH9yhknYc9/0gnj3qh80eAy6uxG7+fFM="; }; guiPreview = mkGui { channel = "stable"; - version = "2.2.42"; - hash = "sha256-FW8Nuha+NrYVhR/66AiBpcCLHRhiLTW8KdHFyWSao84="; + version = "2.2.43"; + hash = "sha256-+2dcyWnTJqGaH9yhknYc9/0gnj3qh80eAy6uxG7+fFM="; }; serverStable = mkServer { channel = "stable"; - version = "2.2.42"; - hash = "sha256-YM07krEay2W+/6mKLAg+B7VEnAyDlkD+0+cSO1FAJzA="; + version = "2.2.43"; + hash = "sha256-xWt2qzeqBtt86Wv3dYl4GXkfjr+7WAKn5HdDeUzOQd8="; }; serverPreview = mkServer { channel = "stable"; - version = "2.2.42"; - hash = "sha256-YM07krEay2W+/6mKLAg+B7VEnAyDlkD+0+cSO1FAJzA="; + version = "2.2.43"; + hash = "sha256-xWt2qzeqBtt86Wv3dYl4GXkfjr+7WAKn5HdDeUzOQd8="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix b/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix index 13764d5066..a9537d9931 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gns3/gui.nix @@ -6,6 +6,7 @@ { lib , python3 , fetchFromGitHub +, qt5 , wrapQtAppsHook }: @@ -21,7 +22,6 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook wrapQtAppsHook ]; @@ -33,21 +33,29 @@ python3.pkgs.buildPythonApplication rec { setuptools sip_4 (pyqt5.override { withWebSockets = true; }) truststore + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; - pythonRelaxDeps = [ - "jsonschema" - "sentry-sdk" - ]; - - doCheck = false; # Failing - dontWrapQtApps = true; preFixup = '' wrapQtApp "$out/bin/gns3" ''; + doCheck = true; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + preCheck = '' + export HOME=$(mktemp -d) + export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}" + export QT_QPA_PLATFORM_PLUGIN_PATH="${qt5.qtbase.bin}/lib/qt-${qt5.qtbase.version}/plugins"; + export QT_QPA_PLATFORM=offscreen + ''; + meta = with lib; { description = "Graphical Network Simulator 3 GUI (${channel} release)"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix b/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix index 200153b15e..48d48de83b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix @@ -7,6 +7,7 @@ , python3 , fetchFromGitHub , pkgsStatic +, stdenv }: python3.pkgs.buildPythonApplication { @@ -25,14 +26,6 @@ python3.pkgs.buildPythonApplication { cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox ''; - nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - "jsonschema" - ]; - propagatedBuildInputs = with python3.pkgs; [ aiofiles aiohttp @@ -43,6 +36,7 @@ python3.pkgs.buildPythonApplication { jinja2 jsonschema multidict + platformdirs prompt-toolkit psutil py-cpuinfo @@ -53,13 +47,31 @@ python3.pkgs.buildPythonApplication { zipstream ]; - # Requires network access - doCheck = false; - - postInstall = '' - rm $out/bin/gns3loopback # For Windows only + postInstall = lib.optionalString (!stdenv.hostPlatform.isWindows) '' + rm $out/bin/gns3loopback ''; + doCheck = true; + + # Otherwise tests will fail to create directory + # Permission denied: '/homeless-shelter' + preCheck = '' + export HOME=$(mktemp -d) + ''; + + checkInputs = with python3.pkgs; [ + pytest-aiohttp + pytest-rerunfailures + pytestCheckHook + ]; + + pytestFlagsArray = [ + # fails on ofborg because of lack of cpu vendor information + "--deselect=tests/controller/gns3vm/test_virtualbox_gns3_vm.py::test_cpu_vendor_id" + # Rerun failed tests up to three times (flaky tests) + "--reruns 3" + ]; + meta = with lib; { description = "Graphical Network Simulator 3 server (${channel} release)"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix index 1afcbe4d2a..9944238703 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gopher/sacc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "ftp://bitreich.org/releases/sacc/sacc-${version}.tar.gz"; - sha512 = "7a895e432e1d28b7d9b2bb2a5326ca32350876a2c80d39dc6c19e75347d72a4847f1aa4ff11f07e8a9adea14ea71b84d70890dcc170ff6ce0b779e1d6586b4fa"; + hash = "sha512-eoleQy4dKLfZsrsqUybKMjUIdqLIDTncbBnnU0fXKkhH8apP8R8H6Kmt6hTqcbhNcIkNzBcP9s4Ld54dZYa0+g=="; }; inherit patches; diff --git a/third_party/nixpkgs/pkgs/applications/networking/hyprspace/default.nix b/third_party/nixpkgs/pkgs/applications/networking/hyprspace/default.nix index 69b0f16423..8fc6786836 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/hyprspace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/hyprspace/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "sha256-UlIQCy4moW58tQ1dqxrPsU5LN1Bs/Jy5X+2CEmXdYIk="; }; - vendorSha256 = "sha256-EV59sXmjunWs+MC++CwyuBlbWzWZI1YXDLEsOaESgRU="; + vendorHash = "sha256-EV59sXmjunWs+MC++CwyuBlbWzWZI1YXDLEsOaESgRU="; meta = with lib; { description = "A Lightweight VPN Built on top of Libp2p for Truly Distributed Networks."; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix index 601720345e..4fd9a36b0f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/abaddon/default.nix @@ -9,20 +9,24 @@ , curl , gtkmm3 , libhandy +, libopus , libsecret +, libsodium , nlohmann_json +, pcre2 +, spdlog , sqlite }: stdenv.mkDerivation rec { pname = "abaddon"; - version = "0.1.10"; + version = "0.1.12"; src = fetchFromGitHub { owner = "uowuo"; repo = "abaddon"; rev = "v${version}"; - hash = "sha256-84DrPx0e3pZjg87dHZO4y/z7KfIYNyAibE7/J7oYwXA="; + hash = "sha256-Rz3c6RMZUiKQ0YKKQkCEkelfIGUq+xVmgNskj7uEjGI="; fetchSubmodules = true; }; @@ -37,8 +41,12 @@ stdenv.mkDerivation rec { curl gtkmm3 libhandy + libopus libsecret + libsodium nlohmann_json + pcre2 + spdlog sqlite ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix index 3fb24df14f..843728a098 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "alfaview"; - version = "8.72.0"; + version = "9.0.3"; src = fetchurl { url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; - sha256 = "sha256-8oc3Wy/jI/GKbTnv7IV6q159WmMZSGedMh5EXvf7ZR0="; + sha256 = "sha256-Mmw4wWjU1Fr2dqonD3Vin8m6VX2dfDXbMDl+lTT4YT4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix index d5f8b3aa9d..e8e5f01206 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { pname = "armcord"; - version = "3.2.3"; + version = "3.2.4-libwebp"; src = let @@ -47,12 +47,12 @@ stdenv.mkDerivation rec { in { x86_64-linux = fetchurl { - url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; - hash = "sha256-d8Xv9ecXxkUAIqCS82VKlLNne56hESYvYtSDvNvGul0="; + url = "${base}/v${version}/ArmCord_${builtins.head (lib.splitString "-" version)}_amd64.deb"; + hash = "sha256-WeHgai9vTaN04zMdAXmhemKroKH+kwHuOr/E85mfurE="; }; aarch64-linux = fetchurl { - url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; - hash = "sha256-yqZ4hl+E4IEEEuKhfyDYY1Lyz5/Nekrf8uxoJr1B8w8="; + url = "${base}/v${version}/ArmCord_${builtins.head (lib.splitString "-" version)}_arm64.deb"; + hash = "sha256-4/vGdWXv8wrbF/EhMK6kJPjta0EOGH6C3kUyM0OTB8M="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { downloadPage = "https://github.com/ArmCord/ArmCord"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.osl3; - maintainers = with maintainers; [ wrmilling ]; + maintainers = with maintainers; [ ludovicopiero wrmilling ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; mainProgram = "armcord"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix new file mode 100644 index 0000000000..c523b59fb1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -0,0 +1,59 @@ +{ lib, fetchurl, mkDerivation, appimageTools, libsecret, makeWrapper }: +let + pname = "beeper"; + version = "3.71.16"; + name = "${pname}-${version}"; + src = fetchurl { + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-${version}.AppImage"; + hash = "sha256-Ho5zFmhNzkOmzo/btV+qZfP2GGx5XvV/1JncEKlH4vc="; + }; + appimage = appimageTools.wrapType2 { + inherit version pname src; + extraPkgs = pkgs: with pkgs; [ libsecret ]; + }; + appimageContents = appimageTools.extractType2 { + inherit version pname src; + }; +in +mkDerivation rec { + inherit name pname; + + src = appimage; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mv bin/${name} bin/${pname} + + mkdir -p $out/ + cp -r bin $out/bin + + mkdir -p $out/share/${pname} + cp -a ${appimageContents}/locales $out/share/${pname} + cp -a ${appimageContents}/resources $out/share/${pname} + cp -a ${appimageContents}/usr/share/icons $out/share/ + install -Dm 644 ${appimageContents}/${pname}.desktop -t $out/share/applications/ + + substituteInPlace $out/share/applications/${pname}.desktop --replace "AppRun" "${pname}" + + wrapProgram $out/bin/${pname} \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}} --no-update" + + runHook postInstall + ''; + + meta = with lib; { + description = "Universal chat app."; + longDescription = '' + Beeper is a universal chat app. With Beeper, you can send + and receive messages to friends, family and colleagues on + many different chat networks. + ''; + homepage = "https://beeper.com"; + license = licenses.unfree; + maintainers = with maintainers; [ jshcmpbll ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix index 4194f4c228..104f39f446 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-appimage.nix @@ -43,6 +43,5 @@ in meta = metaCommon // { platforms = [ "x86_64-linux" ]; - mainProgram = "caprine"; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix index 3dc457c488..6a53bba026 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/build-from-dmg.nix @@ -30,6 +30,5 @@ stdenvNoCC.mkDerivation { meta = metaCommon // { platforms = with lib.platforms; darwin; - mainProgram = "caprine"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix index 501d8f7d16..ed8fab4473 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/caprine-bin/default.nix @@ -1,7 +1,7 @@ { lib, callPackage, stdenvNoCC }: let pname = "caprine"; - version = "2.58.0"; + version = "2.58.3"; metaCommon = with lib; { description = "An elegant Facebook Messenger desktop app"; homepage = "https://sindresorhus.com/caprine"; @@ -10,11 +10,11 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - sha256 = "7iK2RyA63okJLH2Xm97fFilJHzqFuP96xkUr2+ADbC4="; + sha256 = "sha256-w0nBQhHYzFLsNu0MxWhoju6fh4JpAKC7MWWVxwDkRYk="; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - sha256 = "RqK+fJJAt9W+m7zg6ZYI6PEAOa3V1UxsptEpG1qjibg="; + sha256 = "sha256-6Mx2ZkT2hdnaSVt2hKMMV9xc7rYPFFbxcj6vb84ojYU="; }; in (if stdenvNoCC.isDarwin then x86_64-dmg else x86_64-appimage).overrideAttrs (oldAttrs: { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index 871138b7df..4353c98332 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "chatterino2"; - version = "2.4.4"; + version = "2.4.6"; src = fetchFromGitHub { owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zvwvvwMPWnNT44L7g8fiY0N7H62Ot1lNCFCIkL8SxQw="; + sha256 = "sha256-CQviw5Fw6v5EwjCldAQoJfAIZMWKBfBzUIQZEgW34k0="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix index 511b6bccb9..2dbe74d3b3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -1,45 +1,74 @@ -{ stdenv -, lib -, dpkg -, fetchurl -, autoPatchelfHook -, glib-networking -, openssl -, webkitgtk +{ lib +, fetchFromGitHub +, rustPlatform +, cinny +, copyDesktopItems , wrapGAppsHook +, pkg-config +, openssl +, dbus +, glib +, glib-networking +, webkitgtk +, makeDesktopItem }: -stdenv.mkDerivation rec { +rustPlatform.buildRustPackage rec { pname = "cinny-desktop"; version = "2.2.6"; - src = fetchurl { - url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb"; - sha256 = "sha256-Bh7qBlHh2bQ6y2HnI4TtxMU6N3t04tr1Juoul2KMrqs="; + src = fetchFromGitHub { + owner = "cinnyapp"; + repo = "cinny-desktop"; + rev = "v${version}"; + hash = "sha256-RW6LeItIAHJk1e7qMa1MLIGb3jHvJ/KM8E9l1qR48w8="; }; + sourceRoot = "${src.name}/src-tauri"; + + cargoHash = "sha256-Iab/icQ9hFVh/o6egZVPa2zeKgO5WxzkluhRckcayvw="; + + postPatch = '' + substituteInPlace tauri.conf.json \ + --replace '"distDir": "../cinny/dist",' '"distDir": "${cinny}",' + ''; + + postInstall = '' + install -DT icons/128x128@2x.png $out/share/icons/hicolor/256x256@2/apps/cinny.png + install -DT icons/128x128.png $out/share/icons/hicolor/128x128/apps/cinny.png + install -DT icons/32x32.png $out/share/icons/hicolor/32x32/apps/cinny.png + ''; + nativeBuildInputs = [ - autoPatchelfHook - dpkg + copyDesktopItems + wrapGAppsHook + pkg-config ]; buildInputs = [ - glib-networking openssl + dbus + glib + glib-networking webkitgtk - wrapGAppsHook ]; - unpackCmd = "dpkg-deb -x $curSrc source"; - - installPhase = "mv usr $out"; + desktopItems = [ + (makeDesktopItem { + name = "cinny"; + exec = "cinny"; + icon = "cinny"; + desktopName = "Cinny"; + comment = meta.description; + categories = [ "Network" "InstantMessaging" ]; + }) + ]; meta = with lib; { description = "Yet another matrix client for desktop"; homepage = "https://github.com/cinnyapp/cinny-desktop"; maintainers = [ maintainers.aveltras ]; license = licenses.agpl3Only; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; mainProgram = "cinny"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix index d8f7e72b9d..336d045b6c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -1,22 +1,30 @@ -{ lib, stdenv, fetchurl, writeText, jq, conf ? {} }: +{ lib, buildNpmPackage, fetchFromGitHub, writeText, jq, conf ? { } }: let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); -in stdenv.mkDerivation rec { +in +buildNpmPackage rec { pname = "cinny"; version = "2.2.6"; - src = fetchurl { - url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - hash = "sha256-AvYM8++PqKmm7CJN5hmg9GSC72IoHX+rRxuT3GflvjU="; + src = fetchFromGitHub { + owner = "cinnyapp"; + repo = "cinny"; + rev = "v${version}"; + hash = "sha256-Da/gbq9piKvkIMiamoafcRrqxF7128GXoswk2C43An8="; }; + npmDepsHash = "sha256-3wgB/dQmLtwxbRsk+OUcyfx98vpCvhvseEOCrJIFohY="; + + nativeBuildInputs = [ + jq + ]; + installPhase = '' runHook preInstall - mkdir -p $out/ - cp -R . $out/ - ${jq}/bin/jq -s '.[0] * .[1]' "config.json" "${configOverrides}" > "$out/config.json" + cp -r dist $out + jq -s '.[0] * .[1]' "config.json" "${configOverrides}" > "$out/config.json" runHook postInstall ''; @@ -25,7 +33,7 @@ in stdenv.mkDerivation rec { description = "Yet another Matrix client for the web"; homepage = "https://cinny.in/"; maintainers = with maintainers; [ abbe ]; - license = licenses.mit; + license = licenses.agpl3Only; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix index 3f388f958c..01bd4ff50e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix @@ -8,12 +8,12 @@ buildGoModule rec { owner = "Bios-Marcel"; repo = pname; rev = version; - sha256 = "0avf09b73fs3wpb4fzmm6ka595aanfvp95m6xj1ccxvq8ciwpqcw"; + hash = "sha256-nOHLI0N4d8aC7KaWdLezSpVU1DS1fkfW5UO7cVYCbis="; }; subPackages = [ "." ]; - vendorSha256 = "01anbhwgwam70dymcmvkia1xpw48658rq7wv4m7fiavxvnli6z2y"; + vendorHash = "sha256-XnwTqd19q+hOJZsfnFExiPDbg4pzV1Z9A6cq/jhcVgU="; meta = with lib; { homepage = "https://github.com/Bios-Marcel/cordless"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 6ad5b5ddc1..6fae9b25fd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -8,7 +8,7 @@ , libdeltachat , makeDesktopItem , makeWrapper -, noto-fonts-emoji +, noto-fonts-color-emoji , pkg-config , python3 , roboto @@ -33,16 +33,16 @@ let in buildNpmPackage rec { pname = "deltachat-desktop"; - version = "1.40.0"; + version = "1.40.4"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; rev = "v${version}"; - hash = "sha256-QvSBM2zR/LcQ2wtkh6mtlU8iqYmZfv6U5bRyMYjLZhE="; + hash = "sha256-cNCM0McWBmHUUutMDa/Cy0qOxhx4NJnhjrW++HRl/nU="; }; - npmDepsHash = "sha256-lxyXfPNu5U+0cge+cwcXHIJv+gVXCSzc5t/2c4IQxNM="; + npmDepsHash = "sha256-CoWa0l2If+SGqD47nP91qsvUlTzOEWP5or5zNUdV7P0="; nativeBuildInputs = [ makeWrapper @@ -85,7 +85,7 @@ buildNpmPackage rec { install -D build/icon.png \ $out/share/icons/hicolor/scalable/apps/deltachat.png - ln -sf ${noto-fonts-emoji}/share/fonts/noto/NotoColorEmoji.ttf \ + ln -sf ${noto-fonts-color-emoji}/share/fonts/noto/NotoColorEmoji.ttf \ $out/lib/node_modules/deltachat-desktop/html-dist/fonts/noto/emoji for font in $out/lib/node_modules/deltachat-desktop/html-dist/fonts/Roboto-*.ttf; do ln -sf ${roboto}/share/fonts/truetype/$(basename $font) \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/darwin.nix index ef3a9031bb..c6f9016396 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -1,4 +1,4 @@ -{ pname, version, src, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper +{ pname, version, src, meta, stdenv, binaryName, desktopName, lib, undmg, makeWrapper, writeScript , branch , withOpenASAR ? false, openasar , withVencord ? false, vencord }: @@ -31,4 +31,19 @@ stdenv.mkDerivation { echo '{"name":"discord","main":"index.js"}' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/package.json echo 'require("${vencord}/patcher.js")' > $out/Applications/${desktopName}.app/Contents/Resources/app.asar/index.js ''; + + passthru = { + updateScript = writeScript "discord-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl gnugrep common-updater-scripts + set -x + set -eou pipefail; + url=$(curl -sI "https://discordapp.com/api/download/${ + builtins.replaceStrings [ "discord-" "discord" ] [ "" "stable" ] pname + }?platform=osx&format=dmg" | grep -oP 'location: \K\S+') + version=''${url##https://dl*.discordapp.net/apps/osx/} + version=''${version%%/*.dmg} + update-source-version ${lib.optionalString (!stdenv.buildPlatform.isDarwin) "pkgsCross.aarch64-darwin."}${pname} "$version" --file=./pkgs/applications/networking/instant-messengers/discord/default.nix --version-key=${branch} + ''; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index 6288154f43..2cd7ee2d2c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,52 +1,52 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.28"; - ptb = "0.0.44"; - canary = "0.0.166"; - development = "0.0.217"; + stable = "0.0.31"; + ptb = "0.0.49"; + canary = "0.0.170"; + development = "0.0.234"; } else { - stable = "0.0.273"; - ptb = "0.0.59"; - canary = "0.0.283"; - development = "0.0.8778"; + stable = "0.0.280"; + ptb = "0.0.80"; + canary = "0.0.315"; + development = "0.0.8797"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "sha256-JwxVVm/QIBLoVyQ2Ff/MX06UNgZ+dAsD960GsCg1M+U="; + hash = "sha256-toWwiMsEFsGaOYaPZziSmZtpzxGd9m+2MtxTrJwqFbw="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "lehrB2jTvMKIDt7QWK/UAkrzYnW5pAP4LRHfIvGpnzA="; + hash = "sha256-o8cDoBe6A0wBjVLjp4JXrv3QsG7TZ/Kj4+T5lj6WHdY="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-bUbJpaHUf0ALJ1+4ACcVz0kpZpoXi0S4QO5yLiUZSgs="; + hash = "sha256-Lw+qLAAwyoDBKDPOBA9HR79gcnqwTshFq6GMpFS0tXA="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - sha256 = "sha256-fzNFKrYo5qckrWZAkkiK337czCt6nOM1O8FeG18Q8Y0="; + hash = "sha256-R5UwgpXgb32mEohTzyRVXmumcgPl8UPan3UjmLFLxLo="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - sha256 = "1vz2g83gz9ks9mxwx7gl7kys2xaw8ksnywwadrpsbj999fzlyyal"; + hash = "sha256-SUbpzd8RIf+e+so/dXZh5OkjCvWRC+EyqgeIg4u32Hg="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - sha256 = "sha256-LS7KExVXkOv8O/GrisPMbBxg/pwoDXIOo1dK9wk1yB8="; + hash = "sha256-IvrCjiZ5Oa616+U8C2ihg8THj7ePV2A8+82wUWqWoPY="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - sha256 = "0mqpk1szp46mih95x42ld32rrspc6jx1j7qdaxf01whzb3d4pi9l"; + hash = "sha256-m43SijSBxcAvYAlSFpQKIFILUm4AgSQ5F4XyQJyftts="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - sha256 = "sha256-K4rlShYhmsjT2QHjb6+IbCXJFK+9REIx/gW68bcVSVc="; + hash = "sha256-ra0El4Y7SqanY6ZBbHE1Y+pqel4OD7nXKKfg/vndULo="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix index 8954d363d5..0c4bebcab9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages, unzip }: +{ lib, stdenv, fetchFromGitHub, nodejs, bash, asar, unzip }: stdenv.mkDerivation rec { pname = "openasar"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { bash scripts/injectPolyfills.sh substituteInPlace src/index.js --replace 'nightly' '${version}' ${nodejs}/bin/node scripts/strip.js - ${nodePackages.asar}/bin/asar pack src app.asar + ${asar}/bin/asar pack src app.asar runHook postBuild ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index f3ec46f364..7611f4dfa0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -7,6 +7,7 @@ , yarn , nodejs , fetchYarnDeps +, jq , electron , element-web , sqlcipher @@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: builtins.removeAttrs pinData [ "hashes" ] // { sha256 = desktopYarnHash; }; - nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper ] + nativeBuildInputs = [ yarn fixup_yarn_lock nodejs makeWrapper jq ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; inherit seshat; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix index 54743f93b6..5f0506b022 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.nix @@ -1,9 +1,9 @@ { - "version" = "1.11.38"; + "version" = "1.11.45"; "hashes" = { - "desktopSrcHash" = "sha256-xDeVwDQ0/ZeqA8c052WvDyhn14TgDTg+FRYQscgxXOQ="; - "desktopYarnHash" = "1ksj99g649kvilr850rkk8nkl55z7vz7m8159777kjikakzra2ly"; - "webSrcHash" = "sha256-R/JyEVjQN4AYD0AqLJDYcrfGHwTMVGDBhNIK3AtGi2c="; - "webYarnHash" = "1znayywxzs1c4ypdv4akxy0lb7mg0i9h74wnja4d5d3vbbdgnid5"; + "desktopSrcHash" = "sha256-SxpnvIctV738mMRmMiuLgr1InMrlWH39/6lTO0wu+vQ="; + "desktopYarnHash" = "09a2swngqjz4hahzvczhw0lh38y39glc1dkkhjkp4jqvmds9ni7n"; + "webSrcHash" = "sha256-hImwZ7vzpupRulk9g5jhfv0sgZqmPXnggJjUUwZ+UCE="; + "webYarnHash" = "0r2xzq9630vky32hqp3h1skdgv3jiiffi8553yzzk4zr45nlvf9d"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix index 7255ff4d97..602df7626f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -63,13 +63,13 @@ }: stdenv.mkDerivation rec { - version = "6.1.11"; + version = "6.9.16"; pname = "feishu"; - packageHash = "e82bd3ef"; # A hash value used in the download url + packageHash = "fe01b99b"; # A hash value used in the download url src = fetchurl { url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/${packageHash}/Feishu-linux_x64-${version}.deb"; - hash = "sha256-IBNMNOcOYIdiTlr4+Ziju7Pbf9XJV0O+w2arHTa1zZ0="; + hash = "sha256-+koH6/K0J8KCVaNGIVvmLmPn/Ttyc9WcNAp0f7PLkqg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock index 46ac41b3a4..085eec078c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + [[package]] name = "aead" version = "0.4.3" @@ -42,9 +48,9 @@ dependencies = [ [[package]] name = "aes" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433cfd6710c9986c576a25ca913c39d66a6474107b406f34f91d4a8923395241" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ "cfg-if", "cipher 0.4.4", @@ -83,9 +89,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] @@ -107,9 +113,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arrayref" @@ -119,15 +125,15 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "ashpd" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31688b40eb5d739049f721d8405c33d3796b3f51f2bea84421a542dafe397e41" +checksum = "7370b58af1d7e96df3ca0f454b57e69acf9aa42ed2d7337bd206923bae0d5754" dependencies = [ "async-std", "enumflags2", @@ -156,9 +162,9 @@ dependencies = [ [[package]] name = "async-channel" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", "event-listener", @@ -174,7 +180,7 @@ dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 1.9.0", "futures-lite", "slab", ] @@ -220,17 +226,17 @@ dependencies = [ "log", "parking", "polling", - "rustix", + "rustix 0.37.23", "slab", - "socket2", + "socket2 0.4.9", "waker-fn", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -248,9 +254,9 @@ dependencies = [ "cfg-if", "event-listener", "futures-lite", - "rustix", + "rustix 0.37.23", "signal-hook", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -261,7 +267,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -298,13 +304,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -337,15 +343,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.1", "object", "rustc-demangle", ] @@ -390,10 +396,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "blake3" -version = "1.3.3" +name = "bitflags" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ae2468a89544a466886840aa467a25b766499f4f04bf7d9fcd10ecee9fccef" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] +name = "blake3" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" dependencies = [ "arrayref", "arrayvec", @@ -462,11 +474,20 @@ dependencies = [ "async-lock", "async-task", "atomic-waker", - "fastrand", + "fastrand 1.9.0", "futures-lite", "log", ] +[[package]] +name = "blurhash" +version = "0.1.1" +source = "git+https://github.com/marc0x1/blurhash-rs?branch=pixbuf-patch#c07c0cbcd29b2277e8c1d0f6ae07b2e0fad1ed52" +dependencies = [ + "gdk-pixbuf", + "image 0.23.14", +] + [[package]] name = "bumpalo" version = "3.13.0" @@ -493,11 +514,11 @@ checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cairo-rs" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8af54f5d48af1226928adc1f57edd22f5df1349e7da1fc96ae15cf43db0e871" +checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cairo-sys-rs", "glib", "libc", @@ -507,9 +528,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55382a01d30e5e53f185eee269124f5e21ab526595b872751278dfbb463594e" +checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff" dependencies = [ "glib-sys", "libc", @@ -527,18 +548,19 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] name = "cfg-expr" -version = "0.15.2" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70d3ad08698a0568b0562f22710fe6bfc1f4a61a367c77d0398c562eadd453a" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", "target-lexicon", @@ -634,9 +656,9 @@ dependencies = [ [[package]] name = "constant_time_eq" -version = "0.2.5" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13418e745008f7349ec7e449155f419a61b92b58a99cc3616942b926825ec76b" +checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation" @@ -656,9 +678,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -673,23 +695,44 @@ dependencies = [ ] [[package]] -name = "crossbeam-epoch" -version = "0.9.14" +name = "crossbeam-channel" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "memoffset 0.8.0", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", ] @@ -746,6 +789,16 @@ dependencies = [ "zeroize", ] +[[package]] +name = "deflate" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" +dependencies = [ + "adler32", + "byteorder", +] + [[package]] name = "derivative" version = "2.2.0" @@ -777,27 +830,6 @@ dependencies = [ "subtle", ] -[[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 = "displaydoc" version = "0.2.4" @@ -806,7 +838,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -817,9 +849,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "either" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "enumflags2" @@ -839,7 +871,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -855,6 +887,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "err-derive" version = "0.3.1" @@ -871,13 +909,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -905,6 +943,12 @@ dependencies = [ "instant", ] +[[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" @@ -932,10 +976,11 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flare" -version = "0.9.1" +version = "0.10.0" dependencies = [ "ashpd", "async-trait", + "blurhash", "env_logger", "err-derive", "futures", @@ -943,9 +988,11 @@ dependencies = [ "gettext-rs", "gtk4", "hex", + "image 0.23.14", "lazy_static", "libadwaita", "libsignal-service", + "libspelling", "log", "once_cell", "oo7", @@ -957,6 +1004,7 @@ dependencies = [ "serde", "serde_json", "sled", + "sourceview5", "tokio", "tracing", "url", @@ -966,12 +1014,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.7.1", ] [[package]] @@ -1059,7 +1107,7 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -1076,7 +1124,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -1120,11 +1168,10 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b023fbe0c6b407bd3d9805d107d9800da3829dc5a676653210f1d5f16d7f59bf" +checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" dependencies = [ - "bitflags", "gdk-pixbuf-sys", "gio", "glib", @@ -1134,9 +1181,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b41bd2b44ed49d99277d3925652a163038bd5ed943ec9809338ffb2f4391e3b" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ "gio-sys", "glib-sys", @@ -1147,11 +1194,10 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" +checksum = "6982d9815ed6ac95b0467b189e81f29dea26d08a732926ec113e65744ed3f96c" dependencies = [ - "bitflags", "cairo-rs", "gdk-pixbuf", "gdk4-sys", @@ -1163,9 +1209,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" +checksum = "dbab43f332a3cf1df9974da690b5bb0e26720ed09a228178ce52175372dcfef0" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1180,9 +1226,9 @@ dependencies = [ [[package]] name = "gdk4-wayland" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa73894ed86fe10157436123d8baae5f2924ebc4fa48a11d8f093e07b9ecbbd" +checksum = "0db9102ff11e55bd65e153c1192abc21ddfa45ede90622e423d4e4a0e5d5f313" dependencies = [ "gdk4", "gdk4-wayland-sys", @@ -1193,9 +1239,9 @@ dependencies = [ [[package]] name = "gdk4-wayland-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af41c5a9cd7e06f612b91ec45ecb423ab57921bbd92f56e46a67b962be198e0c" +checksum = "d48159be256ae0212d5a2b9884627197d08082c7168b28775b53a0f9885d5624" dependencies = [ "glib-sys", "libc", @@ -1204,9 +1250,9 @@ dependencies = [ [[package]] name = "gdk4-x11" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17de2c3554d5127b9dfacd4d1801e2e3c9163bce01c6e1c407c054e9b771f2ee" +checksum = "28c9bbf8ea1ea8469e74c3fdfafc142c9e14810a27f89ddb01b5e9076a60a450" dependencies = [ "gdk4", "gdk4-x11-sys", @@ -1217,9 +1263,9 @@ dependencies = [ [[package]] name = "gdk4-x11-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ca6c03d5019467d21671936edeba09f908039900af8ce4b834c19646031c72" +checksum = "a3de1709370758192369f5329aa593847797f1c693c95e8a261e9b2e06a5f125" dependencies = [ "gdk4-sys", "glib-sys", @@ -1250,9 +1296,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -1290,18 +1336,27 @@ dependencies = [ ] [[package]] -name = "gimli" -version = "0.27.3" +name = "gif" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" +dependencies = [ + "color_quant", + "weezl", +] + +[[package]] +name = "gimli" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" -version = "0.17.9" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d14522e56c6bcb6f7a3aebc25cbcfb06776af4c0c25232b601b4383252d7cb92" +checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524" dependencies = [ - "bitflags", "futures-channel", "futures-core", "futures-io", @@ -1317,9 +1372,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.17.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1d43b0d7968b48455244ecafe41192871257f5740aa6b095eb19db78e362a5" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" dependencies = [ "glib-sys", "gobject-sys", @@ -1330,11 +1385,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.17.9" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7f1de7cbde31ea4f0a919453a2dcece5d54d5b70e08f8ad254dc4840f5f09b6" +checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" dependencies = [ - "bitflags", + "bitflags 2.4.0", "futures-channel", "futures-core", "futures-executor", @@ -1353,24 +1408,23 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.9" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7206c5c03851ef126ea1444990e81fdd6765fb799d5bc694e4897ca01bb97f" +checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" dependencies = [ - "anyhow", "heck 0.4.1", "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.29", ] [[package]] name = "glib-sys" -version = "0.17.4" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f00ad0a1bf548e61adfff15d83430941d9e1bb620e334f779edd1c745680a5" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" dependencies = [ "libc", "system-deps", @@ -1396,9 +1450,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e75b0000a64632b2d8ca3cf856af9308e3a970844f6e9659bd197f026793d0" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" dependencies = [ "glib-sys", "libc", @@ -1407,9 +1461,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.17.1" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21cf11565bb0e4dfc2f99d4775b6c329f0d40a2cff9c0066214d31a0e1b46256" +checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" dependencies = [ "glib", "graphene-sys", @@ -1418,9 +1472,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80a4849a8d9565410a8fec6fc3678e9c617f4ac7be182ca55ab75016e07af9" +checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" dependencies = [ "glib-sys", "libc", @@ -1430,11 +1484,10 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" +checksum = "cc25855255120f294d874acd6eaf4fbed7ce1cdc550e2d8415ea57fafbe816d5" dependencies = [ - "bitflags", "cairo-rs", "gdk4", "glib", @@ -1446,9 +1499,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" +checksum = "e1ecf3a63bf1223d68f80f72cc896c4d8c80482fbce1c9a12c66d3de7290ee46" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1462,11 +1515,10 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" +checksum = "a3b095b26f2a2df70be1805d3590eeb9d7a05ecb5be9649b82defc72dc56228c" dependencies = [ - "bitflags", "cairo-rs", "field-offset", "futures-channel", @@ -1479,15 +1531,14 @@ dependencies = [ "gtk4-macros", "gtk4-sys", "libc", - "once_cell", "pango", ] [[package]] name = "gtk4-macros" -version = "0.6.6" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f" +checksum = "d57ec49cf9b657f69a05bca8027cff0a8dfd0c49e812be026fc7311f2163832f" dependencies = [ "anyhow", "proc-macro-crate", @@ -1499,9 +1550,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.6.3" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" +checksum = "7b0bdde87c50317b4f355bcbb4a9c2c414ece1b7c824fb4ad4ba8f3bdb2c6603" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1518,9 +1569,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" [[package]] name = "headers" @@ -1529,7 +1580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" dependencies = [ "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "bytes", "headers-core", "http", @@ -1564,18 +1615,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.2" 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" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hex" @@ -1660,9 +1702,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" @@ -1672,9 +1714,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.26" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ "bytes", "futures-channel", @@ -1686,7 +1728,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.4.9", "tokio", "tower-service", "tracing", @@ -1722,9 +1764,9 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -1755,25 +1797,44 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-rational", + "gif", + "jpeg-decoder", + "num-iter", + "num-rational 0.3.2", "num-traits", - "png", + "png 0.16.8", + "scoped_threadpool", + "tiff", +] + +[[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 0.4.1", + "num-traits", + "png 0.17.10", ] [[package]] name = "indexmap" -version = "1.9.3" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ - "autocfg", + "equivalent", "hashbrown", ] @@ -1802,21 +1863,20 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.48.0", + "hermit-abi", + "rustix 0.38.9", + "windows-sys", ] [[package]] @@ -1830,9 +1890,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" @@ -1844,10 +1904,19 @@ dependencies = [ ] [[package]] -name = "js-sys" -version = "0.3.63" +name = "jpeg-decoder" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" +dependencies = [ + "rayon", +] + +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1872,11 +1941,10 @@ dependencies = [ [[package]] name = "libadwaita" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab9c0843f9f23ff25634df2743690c3a1faffe0a190e60c490878517eb81abf" +checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" dependencies = [ - "bitflags", "gdk-pixbuf", "gdk4", "gio", @@ -1889,9 +1957,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4231cb2499a9f0c4cdfa4885414b33e39901ddcac61150bc0bb4ff8a57ede404" +checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" dependencies = [ "gdk4-sys", "gio-sys", @@ -1951,7 +2019,7 @@ dependencies = [ [[package]] name = "libsignal-service" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=3c65765#3c65765e8610790afc419af306aa0c1ac77e72af" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=8789920#87899201123b8095cd0f30317620a6d5b7fd652b" dependencies = [ "aes 0.7.5", "aes-gcm", @@ -1974,7 +2042,7 @@ dependencies = [ "rand 0.7.3", "serde", "serde_json", - "sha2 0.10.6", + "sha2 0.10.7", "thiserror", "url", "uuid", @@ -1984,7 +2052,7 @@ dependencies = [ [[package]] name = "libsignal-service-hyper" version = "0.1.0" -source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=3c65765#3c65765e8610790afc419af306aa0c1ac77e72af" +source = "git+https://github.com/whisperfish/libsignal-service-rs?rev=8789920#87899201123b8095cd0f30317620a6d5b7fd652b" dependencies = [ "async-trait", "async-tungstenite", @@ -2007,6 +2075,35 @@ dependencies = [ "url", ] +[[package]] +name = "libspelling" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "850363056ea48497686407e7e583c50c793896c151bbe7139ad4ea02fbf15e76" +dependencies = [ + "gio", + "glib", + "gtk4", + "libc", + "libspelling-sys", + "sourceview5", +] + +[[package]] +name = "libspelling-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "377675d9465da676ebc05742743d5e5bc53a49be1138f463583181aea97da3c6" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "sourceview5-sys", + "system-deps", +] + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -2019,6 +2116,12 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +[[package]] +name = "linux-raw-sys" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" + [[package]] name = "locale_config" version = "0.3.0" @@ -2034,9 +2137,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -2044,9 +2147,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ "value-bag", ] @@ -2083,7 +2186,7 @@ dependencies = [ "rand 0.8.5", "serde", "serde_json", - "sha2 0.10.6", + "sha2 0.10.7", "thiserror", "zeroize", ] @@ -2103,15 +2206,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.9.0" @@ -2143,6 +2237,25 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +[[package]] +name = "miniz_oxide" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" +dependencies = [ + "adler32", +] + +[[package]] +name = "miniz_oxide" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +dependencies = [ + "adler", + "autocfg", +] + [[package]] name = "miniz_oxide" version = "0.7.1" @@ -2161,7 +2274,7 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2198,7 +2311,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", @@ -2217,23 +2330,23 @@ dependencies = [ [[package]] name = "num" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" +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.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", @@ -2242,9 +2355,9 @@ dependencies = [ [[package]] name = "num-bigint-dig" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2399c9463abc5f909349d8aa9ba080e0b88b3ce2885389b60b993f39b1a56905" +checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" dependencies = [ "byteorder", "lazy_static", @@ -2260,9 +2373,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" +checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ "num-traits", ] @@ -2288,6 +2401,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-rational" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + [[package]] name = "num-rational" version = "0.4.1" @@ -2302,20 +2426,20 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", ] [[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", ] @@ -2371,9 +2495,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -2392,28 +2516,27 @@ checksum = "44d11de466f4a3006fe8a5e7ec84e93b79c70cb992ae0aa0eb631ad2df8abfe2" [[package]] name = "oo7" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1007a6c292751abc192f8dbeef8341bac074e991be7b0eb27a6aece5ee79b4dd" +checksum = "220729ba847d98e1a9902c05e41dae79ce4a0b913dad68bc540dd3120a8c2b6b" dependencies = [ - "aes 0.8.2", + "aes 0.8.3", "async-global-executor", "async-std", "byteorder", "cbc", "cipher 0.4.4", "digest 0.10.7", - "dirs", "futures-util", "hkdf 0.12.3", "hmac 0.12.1", "num", "num-bigint-dig", "once_cell", - "pbkdf2 0.12.1", + "pbkdf2 0.12.2", "rand 0.8.5", "serde", - "sha2 0.10.6", + "sha2 0.10.7", "zbus", "zeroize", ] @@ -2430,12 +2553,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - [[package]] name = "ordered-stream" version = "0.2.0" @@ -2448,11 +2565,10 @@ dependencies = [ [[package]] name = "pango" -version = "0.17.4" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52c280b82a881e4208afb3359a8e7fde27a1b272280981f1f34610bed5770d37" +checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" dependencies = [ - "bitflags", "gio", "glib", "libc", @@ -2462,9 +2578,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4293d0f0b5525eb5c24734d30b0ed02cd02aa734f216883f376b54de49625de8" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ "glib-sys", "gobject-sys", @@ -2523,14 +2639,14 @@ dependencies = [ "digest 0.10.7", "hmac 0.12.1", "password-hash", - "sha2 0.10.6", + "sha2 0.10.7", ] [[package]] name = "pbkdf2" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0ca0b5a68607598bf3bad68f32227a8164f6254833f84eafaac409cd6746c31" +checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest 0.10.7", "hmac 0.12.1", @@ -2544,9 +2660,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", "indexmap", @@ -2574,9 +2690,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2592,15 +2708,27 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.8" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" +checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" dependencies = [ - "bitflags", + "bitflags 1.3.2", + "crc32fast", + "deflate", + "miniz_oxide 0.3.7", +] + +[[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", + "miniz_oxide 0.7.1", ] [[package]] @@ -2620,13 +2748,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "concurrent-queue", "libc", "log", "pin-project-lite", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -2660,13 +2788,13 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "pqcrypto-internals" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0127cbc0239f585139a56effd7867921eae3425a000a72dde2b0a156062346b2" +checksum = "d9d34bec6abe2283e6de7748b68b292d1ffa2203397e3e71380ff8418a49fb46" dependencies = [ "cc", "dunce", - "getrandom 0.2.9", + "getrandom 0.2.10", "libc", ] @@ -2692,7 +2820,7 @@ checksum = "97e91cb6af081c6daad5fa705f8adb0634c027662052cb3174bdf2957bf07e25" [[package]] name = "presage" version = "0.6.0-dev" -source = "git+https://github.com/whisperfish/presage?rev=9337c5c#9337c5cd9d4c20967eb233d10d8265c58a62b79f" +source = "git+https://github.com/MarcusGrass/presage?rev=d6d8fff#d6d8fff5f5e6429e6fe9d3c6d388323d094fdab6" dependencies = [ "base64 0.12.3", "futures", @@ -2711,7 +2839,7 @@ dependencies = [ [[package]] name = "presage-store-sled" version = "0.6.0-dev" -source = "git+https://github.com/whisperfish/presage?rev=9337c5c#9337c5cd9d4c20967eb233d10d8265c58a62b79f" +source = "git+https://github.com/MarcusGrass/presage?rev=d6d8fff#d6d8fff5f5e6429e6fe9d3c6d388323d094fdab6" dependencies = [ "async-trait", "base64 0.12.3", @@ -2723,7 +2851,7 @@ dependencies = [ "prost-build 0.10.4", "serde", "serde_json", - "sha2 0.10.6", + "sha2 0.10.7", "sled", "thiserror", ] @@ -2886,7 +3014,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc713c23eb7e1a5f18b84e72be88b82a617ee25783a524a38f0caa4c986b2d76" dependencies = [ "html-escape", - "image", + "image 0.24.7", "qrcodegen", ] @@ -2907,9 +3035,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2973,7 +3101,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.9", + "getrandom 0.2.10", ] [[package]] @@ -2985,13 +3113,35 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rayon" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + [[package]] name = "redox_syscall" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -3000,25 +3150,14 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom 0.2.9", - "redox_syscall 0.2.16", - "thiserror", + "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", @@ -3028,9 +3167,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -3093,16 +3232,29 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", - "windows-sys 0.48.0", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.5", + "windows-sys", ] [[package]] @@ -3119,12 +3271,12 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.2", + "rustls-pemfile 1.0.3", "schannel", "security-framework", ] @@ -3140,39 +3292,45 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" +checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ "base64 0.21.2", ] [[package]] name = "rustversion" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys 0.42.0", + "windows-sys", ] [[package]] -name = "scopeguard" -version = "1.1.0" +name = "scoped_threadpool" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" @@ -3186,11 +3344,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -3199,9 +3357,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -3209,35 +3367,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.175" +version = "1.0.187" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" +checksum = "30a7fe14252655bd1e578af19f5fa00fe02fd0013b100ca6b49fde31c41bae4c" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.175" +version = "1.0.187" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" +checksum = "e46b2a6ca578b3f1d4501b12f78ed4692006d79d82a1a7c561c12dbc3d625eb8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -3246,20 +3404,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.12" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" dependencies = [ "serde", ] @@ -3314,9 +3472,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" +checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" dependencies = [ "cfg-if", "cpufeatures", @@ -3342,9 +3500,9 @@ dependencies = [ [[package]] name = "signal-hook" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -3361,15 +3519,15 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[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", ] @@ -3392,9 +3550,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" @@ -3406,6 +3564,51 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys", +] + +[[package]] +name = "sourceview5" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88c5f976a113e947bc5ec67758b2960c0db4ca76f80fb410d7cd86cd456d9ee5" +dependencies = [ + "futures-channel", + "futures-core", + "gdk-pixbuf", + "gdk4", + "gio", + "glib", + "gtk4", + "libc", + "pango", + "sourceview5-sys", +] + +[[package]] +name = "sourceview5-sys" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29637cccd56075a37ba72c0cc8b8d599dbc1d857e30dadea97eaacbc29b7fd46" +dependencies = [ + "gdk-pixbuf-sys", + "gdk4-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "gtk4-sys", + "libc", + "pango-sys", + "system-deps", +] + [[package]] name = "spin" version = "0.5.2" @@ -3437,9 +3640,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -3460,9 +3663,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" +checksum = "30c2de8a4d8f4b823d634affc9cd2a74ec98c53a756f317e529a48046cbf71f3" dependencies = [ "cfg-expr", "heck 0.4.1", @@ -3473,9 +3676,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.7" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "temp-dir" @@ -3485,15 +3688,15 @@ checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" [[package]] name = "tempfile" -version = "3.5.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand", + "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.45.0", + "rustix 0.38.9", + "windows-sys", ] [[package]] @@ -3507,22 +3710,33 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", +] + +[[package]] +name = "tiff" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" +dependencies = [ + "jpeg-decoder", + "miniz_oxide 0.4.4", + "weezl", ] [[package]] @@ -3542,19 +3756,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.3", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -3575,7 +3788,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3605,9 +3818,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.3" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" dependencies = [ "serde", "serde_spanned", @@ -3617,18 +3830,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.8" +version = "0.19.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" dependencies = [ "indexmap", "serde", @@ -3658,13 +3871,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3721,9 +3934,9 @@ dependencies = [ [[package]] name = "unicase" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" dependencies = [ "version_check", ] @@ -3736,9 +3949,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" [[package]] name = "unicode-normalization" @@ -3803,18 +4016,18 @@ checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" [[package]] name = "uuid" -version = "1.3.3" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" dependencies = [ "serde", ] [[package]] name = "value-bag" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e" +checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3" [[package]] name = "version-compare" @@ -3836,11 +4049,10 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[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", ] @@ -3858,9 +4070,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3868,24 +4080,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.36" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -3895,9 +4107,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3905,28 +4117,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "web-sys" -version = "0.3.63" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -3942,6 +4154,12 @@ dependencies = [ "untrusted", ] +[[package]] +name = "weezl" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" + [[package]] name = "which" version = "4.4.0" @@ -3990,31 +4208,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.0", -] - -[[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", + "windows-targets", ] [[package]] @@ -4023,128 +4217,71 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets", ] [[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", -] - -[[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", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" 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" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[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" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[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" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[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" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[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" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[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" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[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" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.4.1" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -4253,7 +4390,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix index 0b8704c092..7770eb6af5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix @@ -7,8 +7,10 @@ , pkg-config , gst_all_1 , protobuf +, libspelling , libsecret , libadwaita +, gtksourceview5 , rustPlatform , rustc , appstream-glib @@ -19,23 +21,24 @@ stdenv.mkDerivation rec { pname = "flare"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitLab { domain = "gitlab.com"; owner = "schmiddi-on-mobile"; repo = pname; rev = version; - hash = "sha256-RceCVn2OmrHyY2DWT+5XeOc+HlQGVdtOmfo3+2r9hKs="; + hash = "sha256-+9zpYW9xjLe78c2GRL6raFDR5g+R/JWxQzU/ZS+5JtY="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { + "blurhash-0.1.1" = "sha256-SLpszTL2CupMAfUQK5KlnsHTIBDB8hbJs1d6DQXaUiA="; "curve25519-dalek-3.2.1" = "sha256-0hFRhn920tLBpo6ZNCl6DYtTMHMXY/EiDvuhOPVjvC0="; "libsignal-protocol-0.1.0" = "sha256-VQwrGTNZnlDK5p8ZleAZYtbzDiVTHxc93/CRlCUjWtE="; - "libsignal-service-0.1.0" = "sha256-azXQGC008rcqF2C8yHy5CM2NU1Hvwv2I3Kr8aI6URS8="; - "presage-0.6.0-dev" = "sha256-MNd4CvBv6htZQj2g2a3JcQ1r/kk4UPSBLFezEnRK+60="; + "libsignal-service-0.1.0" = "sha256-1ub0IPSvGhZ2tsC6IolusJ1NSWy+5SXSx8qlIdPngTE="; + "presage-0.6.0-dev" = "sha256-4isKBn/4yHoAYsYbBTULK/veZmaecU7t+PvE4Y0oNgk="; }; }; @@ -53,8 +56,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gtksourceview5 libadwaita libsecret + libspelling protobuf # To reproduce audio messages diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index f58f62a7ae..2e47aa8ab6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -1,24 +1,30 @@ { lib -, fetchFromGitLab +, fetchFromGitHub , imagemagick +, mesa +, libdrm , flutter +, pulseaudio , makeDesktopItem , gnome }: +let + libwebrtcRpath = lib.makeLibraryPath [ mesa libdrm ]; +in flutter.buildFlutterApplication rec { pname = "fluffychat"; - version = "1.12.1"; + version = "1.14.1"; - src = fetchFromGitLab { - owner = "famedly"; + src = fetchFromGitHub { + owner = "krille-chan"; repo = "fluffychat"; - rev = "v${version}"; - hash = "sha256-F4oVscw5L8iQZtz5K+yo4tlPYYv1wfs88oyq5Uds20I="; + rev = "refs/tags/v${version}"; + hash = "sha256-VTpZvoyZXJ5SCKr3Ocfm4iT6Z/+AWg+SCw/xmp68kMg="; }; depsListFile = ./deps.json; - vendorHash = "sha256-u0cQ5ejyxhw4du3jXRB8oWsAlMtbw5nX+SMUUCuwklE="; + vendorHash = "sha256-uGrz7QwETZGlwLbfKr1vDo0p/emK1ZCjCX2w0nNVJsA="; desktopItem = makeDesktopItem { name = "Fluffychat"; @@ -30,6 +36,7 @@ flutter.buildFlutterApplication rec { }; nativeBuildInputs = [ imagemagick ]; + runtimeDependencies = [ pulseaudio ]; extraWrapProgramArgs = "--prefix PATH : ${gnome.zenity}/bin"; postInstall = '' FAV=$out/app/data/flutter_assets/assets/favicon.png @@ -45,8 +52,12 @@ flutter.buildFlutterApplication rec { done substituteInPlace $out/share/applications/*.desktop \ --subst-var out + + patchelf --add-rpath ${libwebrtcRpath} $out/app/lib/libwebrtc.so ''; + env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}"; + meta = with lib; { description = "Chat with your friends (matrix client)"; homepage = "https://fluffychat.im/"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/deps.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/deps.json index ab3c8684d5..b1fd21c108 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/deps.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fluffychat/deps.json @@ -1,12 +1,13 @@ [ { "name": "fluffychat", - "version": "1.12.0+3452", + "version": "1.14.1+3516", "kind": "root", "source": "root", "dependencies": [ "adaptive_dialog", "animations", + "archive", "badges", "blurhash_dart", "callkeep", @@ -46,14 +47,13 @@ "flutter_webrtc", "future_loading_dialog", "geolocator", - "handy_window", + "go_router", "hive", "hive_flutter", "http", "image_picker", "intl", "just_audio", - "just_audio_mpv", "keyboard_shortcuts", "latlong2", "linkify", @@ -61,6 +61,7 @@ "matrix_homeserver_recommendations", "native_imaging", "package_info_plus", + "pasteboard", "path_provider", "permission_handler", "pin_code_text_field", @@ -83,7 +84,6 @@ "vibration", "video_compress", "video_player", - "vrouter", "wakelock", "webrtc_interface", "dart_code_metrics", @@ -94,7 +94,6 @@ "integration_test", "msix", "translations_cleaner", - "flutter_secure_storage_windows", "geolocator_android", "wakelock_windows" ] @@ -112,7 +111,7 @@ }, { "name": "win32", - "version": "4.1.4", + "version": "5.0.6", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -121,7 +120,7 @@ }, { "name": "ffi", - "version": "2.0.1", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -151,10 +150,10 @@ "dependencies": [ "characters", "collection", - "js", "material_color_utilities", "meta", "vector_math", + "web", "sky_engine" ] }, @@ -165,6 +164,13 @@ "source": "sdk", "dependencies": [] }, + { + "name": "web", + "version": "0.1.4-beta", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, { "name": "vector_math", "version": "2.1.4", @@ -174,23 +180,16 @@ }, { "name": "material_color_utilities", - "version": "0.2.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "js", - "version": "0.6.7", + "version": "0.5.0", "kind": "transitive", "source": "hosted", "dependencies": [ - "meta" + "collection" ] }, { "name": "collection", - "version": "1.17.1", + "version": "1.17.2", "kind": "direct", "source": "hosted", "dependencies": [] @@ -226,20 +225,13 @@ }, { "name": "plugin_platform_interface", - "version": "2.1.4", + "version": "2.1.5", "kind": "transitive", "source": "hosted", "dependencies": [ "meta" ] }, - { - "name": "flutter_secure_storage_windows", - "version": "1.1.2", - "kind": "transitive", - "source": "git", - "dependencies": [] - }, { "name": "translations_cleaner", "version": "0.0.5", @@ -252,7 +244,7 @@ }, { "name": "glob", - "version": "2.1.1", + "version": "2.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -274,7 +266,7 @@ }, { "name": "source_span", - "version": "1.9.1", + "version": "1.10.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -319,18 +311,17 @@ }, { "name": "args", - "version": "2.4.0", + "version": "2.4.2", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "msix", - "version": "3.11.1", + "version": "3.16.1", "kind": "dev", "source": "hosted", "dependencies": [ - "flutter", "args", "yaml", "path", @@ -363,7 +354,7 @@ }, { "name": "pub_semver", - "version": "2.1.3", + "version": "2.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -384,7 +375,7 @@ }, { "name": "xml", - "version": "6.2.2", + "version": "6.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -395,7 +386,7 @@ }, { "name": "petitparser", - "version": "5.1.0", + "version": "5.4.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -404,17 +395,38 @@ }, { "name": "archive", - "version": "3.3.2", - "kind": "transitive", + "version": "3.3.9", + "kind": "direct", "source": "hosted", "dependencies": [ "crypto", - "path" + "path", + "pointycastle" ] }, { - "name": "crypto", - "version": "3.0.2", + "name": "pointycastle", + "version": "3.7.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "collection", + "convert", + "js" + ] + }, + { + "name": "js", + "version": "0.6.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "meta" + ] + }, + { + "name": "convert", + "version": "3.1.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -423,16 +435,25 @@ }, { "name": "typed_data", - "version": "1.3.1", + "version": "1.3.2", "kind": "transitive", "source": "hosted", "dependencies": [ "collection" ] }, + { + "name": "crypto", + "version": "3.0.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "typed_data" + ] + }, { "name": "get_it", - "version": "7.2.0", + "version": "7.6.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -451,7 +472,7 @@ }, { "name": "yaml", - "version": "3.1.1", + "version": "3.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -478,7 +499,6 @@ "collection", "fake_async", "file", - "js", "matcher", "material_color_utilities", "meta", @@ -490,6 +510,7 @@ "term_glyph", "test_api", "vector_math", + "web", "webdriver" ] }, @@ -523,7 +544,7 @@ }, { "name": "matcher", - "version": "0.12.15", + "version": "0.12.16", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -536,7 +557,7 @@ }, { "name": "test_api", - "version": "0.5.1", + "version": "0.6.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -548,8 +569,7 @@ "stack_trace", "stream_channel", "string_scanner", - "term_glyph", - "matcher" + "term_glyph" ] }, { @@ -590,7 +610,7 @@ }, { "name": "vm_service", - "version": "11.3.0", + "version": "11.7.1", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -603,6 +623,7 @@ "dependencies": [ "flutter", "test_api", + "matcher", "path", "fake_async", "clock", @@ -612,14 +633,13 @@ "boolean_selector", "characters", "collection", - "js", - "matcher", "material_color_utilities", "meta", "source_span", "stream_channel", "string_scanner", - "term_glyph" + "term_glyph", + "web" ] }, { @@ -641,7 +661,6 @@ "characters", "clock", "collection", - "js", "matcher", "material_color_utilities", "platform", @@ -653,7 +672,8 @@ "sync_http", "term_glyph", "test_api", - "vector_math" + "vector_math", + "web" ] }, { @@ -708,7 +728,7 @@ }, { "name": "flutter_native_splash", - "version": "2.2.19", + "version": "2.3.2", "kind": "dev", "source": "hosted", "dependencies": [ @@ -727,7 +747,7 @@ }, { "name": "universal_io", - "version": "2.2.0", + "version": "2.2.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -738,7 +758,7 @@ }, { "name": "html", - "version": "0.15.3", + "version": "0.15.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -748,7 +768,7 @@ }, { "name": "csslib", - "version": "0.17.2", + "version": "0.17.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -762,17 +782,17 @@ "source": "sdk", "dependencies": [ "flutter", - "js", "characters", "collection", "material_color_utilities", "meta", - "vector_math" + "vector_math", + "web" ] }, { "name": "flutter_lints", - "version": "2.0.1", + "version": "2.0.2", "kind": "dev", "source": "hosted", "dependencies": [ @@ -781,14 +801,14 @@ }, { "name": "lints", - "version": "2.0.1", + "version": "2.1.1", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "dart_code_metrics", - "version": "4.21.3", + "version": "5.7.6", "kind": "dev", "source": "hosted", "dependencies": [ @@ -798,32 +818,45 @@ "args", "collection", "crypto", + "dart_code_metrics_presets", "file", "glob", "html", + "http", "meta", "path", "platform", "pub_updater", "source_span", + "uuid", "xml", "yaml" ] }, + { + "name": "uuid", + "version": "3.0.7", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "crypto" + ] + }, { "name": "pub_updater", - "version": "0.2.4", + "version": "0.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ "http", "json_annotation", - "process" + "process", + "pub_semver" ] }, { "name": "json_annotation", - "version": "4.8.0", + "version": "4.8.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -832,14 +865,13 @@ }, { "name": "http", - "version": "0.13.5", + "version": "0.13.6", "kind": "direct", "source": "hosted", "dependencies": [ "async", "http_parser", - "meta", - "path" + "meta" ] }, { @@ -854,6 +886,13 @@ "typed_data" ] }, + { + "name": "dart_code_metrics_presets", + "version": "1.8.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, { "name": "ansicolor", "version": "2.0.1", @@ -876,7 +915,7 @@ }, { "name": "dart_style", - "version": "2.2.5", + "version": "2.3.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -889,7 +928,7 @@ }, { "name": "analyzer", - "version": "5.1.0", + "version": "5.13.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -909,7 +948,7 @@ }, { "name": "watcher", - "version": "1.0.2", + "version": "1.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -917,18 +956,9 @@ "path" ] }, - { - "name": "convert", - "version": "3.1.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "typed_data" - ] - }, { "name": "_fe_analyzer_shared", - "version": "49.0.0", + "version": "61.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -937,7 +967,7 @@ }, { "name": "webrtc_interface", - "version": "1.0.13", + "version": "1.1.1", "kind": "direct", "source": "hosted", "dependencies": [] @@ -980,29 +1010,119 @@ ] }, { - "name": "vrouter", - "version": "1.2.1", + "name": "video_player", + "version": "2.7.0", "kind": "direct", "source": "hosted", "dependencies": [ "flutter", - "url_strategy", - "url_launcher", - "move_to_background" + "html", + "video_player_android", + "video_player_avfoundation", + "video_player_platform_interface", + "video_player_web" ] }, { - "name": "move_to_background", - "version": "1.0.2", + "name": "video_player_web", + "version": "2.0.16", "kind": "transitive", "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "video_player_platform_interface" + ] + }, + { + "name": "video_player_platform_interface", + "version": "6.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, + { + "name": "video_player_avfoundation", + "version": "2.4.9", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "video_player_platform_interface" + ] + }, + { + "name": "video_player_android", + "version": "2.4.9", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "video_player_platform_interface" + ] + }, + { + "name": "video_compress", + "version": "3.1.2", + "kind": "direct", + "source": "hosted", "dependencies": [ "flutter" ] }, + { + "name": "vibration", + "version": "1.8.1", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "device_info_plus" + ] + }, + { + "name": "device_info_plus", + "version": "9.0.3", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "device_info_plus_platform_interface", + "ffi", + "file", + "flutter", + "flutter_web_plugins", + "meta", + "win32", + "win32_registry" + ] + }, + { + "name": "win32_registry", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "ffi", + "win32" + ] + }, + { + "name": "device_info_plus_platform_interface", + "version": "7.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "meta", + "plugin_platform_interface" + ] + }, { "name": "url_launcher", - "version": "6.1.10", + "version": "6.1.12", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1018,7 +1138,7 @@ }, { "name": "url_launcher_windows", - "version": "3.0.6", + "version": "3.0.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1028,7 +1148,7 @@ }, { "name": "url_launcher_platform_interface", - "version": "2.1.2", + "version": "2.1.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1038,7 +1158,7 @@ }, { "name": "url_launcher_web", - "version": "2.0.16", + "version": "2.0.18", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1049,7 +1169,7 @@ }, { "name": "url_launcher_macos", - "version": "3.0.4", + "version": "3.0.6", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1069,7 +1189,7 @@ }, { "name": "url_launcher_ios", - "version": "6.1.3", + "version": "6.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1079,7 +1199,7 @@ }, { "name": "url_launcher_android", - "version": "6.0.25", + "version": "6.0.38", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1087,91 +1207,9 @@ "url_launcher_platform_interface" ] }, - { - "name": "url_strategy", - "version": "0.2.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter_web_plugins" - ] - }, - { - "name": "video_player", - "version": "2.6.0", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "flutter", - "html", - "video_player_android", - "video_player_avfoundation", - "video_player_platform_interface", - "video_player_web" - ] - }, - { - "name": "video_player_web", - "version": "2.0.15", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "flutter_web_plugins", - "video_player_platform_interface" - ] - }, - { - "name": "video_player_platform_interface", - "version": "6.1.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "plugin_platform_interface" - ] - }, - { - "name": "video_player_avfoundation", - "version": "2.4.2", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "video_player_platform_interface" - ] - }, - { - "name": "video_player_android", - "version": "2.4.2", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "video_player_platform_interface" - ] - }, - { - "name": "video_compress", - "version": "3.1.2", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "flutter" - ] - }, - { - "name": "vibration", - "version": "1.7.6", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "flutter" - ] - }, { "name": "universal_html", - "version": "2.2.1", + "version": "2.2.3", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1195,7 +1233,7 @@ }, { "name": "unifiedpush", - "version": "4.0.3", + "version": "5.0.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1207,7 +1245,7 @@ }, { "name": "unifiedpush_android", - "version": "1.1.2", + "version": "2.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1218,7 +1256,7 @@ }, { "name": "unifiedpush_platform_interface", - "version": "1.0.0", + "version": "2.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1228,15 +1266,14 @@ }, { "name": "shared_preferences", - "version": "2.0.15", + "version": "2.2.0", "kind": "direct", "source": "hosted", "dependencies": [ "flutter", "shared_preferences_android", - "shared_preferences_ios", + "shared_preferences_foundation", "shared_preferences_linux", - "shared_preferences_macos", "shared_preferences_platform_interface", "shared_preferences_web", "shared_preferences_windows" @@ -1244,7 +1281,7 @@ }, { "name": "shared_preferences_windows", - "version": "2.1.5", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1258,7 +1295,7 @@ }, { "name": "shared_preferences_platform_interface", - "version": "2.1.1", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1268,7 +1305,7 @@ }, { "name": "path_provider_windows", - "version": "2.1.6", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1281,7 +1318,7 @@ }, { "name": "path_provider_platform_interface", - "version": "2.0.6", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1292,7 +1329,7 @@ }, { "name": "shared_preferences_web", - "version": "2.0.6", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1301,19 +1338,9 @@ "shared_preferences_platform_interface" ] }, - { - "name": "shared_preferences_macos", - "version": "2.0.5", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "shared_preferences_platform_interface" - ] - }, { "name": "shared_preferences_linux", - "version": "2.1.5", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1327,7 +1354,7 @@ }, { "name": "path_provider_linux", - "version": "2.1.10", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1340,18 +1367,17 @@ }, { "name": "xdg_directories", - "version": "0.2.0+3", + "version": "1.0.2", "kind": "transitive", "source": "hosted", "dependencies": [ "meta", - "path", - "process" + "path" ] }, { - "name": "shared_preferences_ios", - "version": "2.1.1", + "name": "shared_preferences_foundation", + "version": "2.3.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1361,7 +1387,7 @@ }, { "name": "shared_preferences_android", - "version": "2.0.17", + "version": "2.2.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1429,7 +1455,7 @@ }, { "name": "share_plus", - "version": "7.0.0", + "version": "7.1.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1450,7 +1476,7 @@ }, { "name": "share_plus_platform_interface", - "version": "3.2.1", + "version": "3.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1463,18 +1489,9 @@ "uuid" ] }, - { - "name": "uuid", - "version": "3.0.7", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "crypto" - ] - }, { "name": "path_provider", - "version": "2.0.13", + "version": "2.1.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1488,7 +1505,7 @@ }, { "name": "path_provider_foundation", - "version": "2.2.0", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1498,7 +1515,7 @@ }, { "name": "path_provider_android", - "version": "2.0.24", + "version": "2.1.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1610,7 +1627,7 @@ }, { "name": "qr_flutter", - "version": "4.0.0", + "version": "4.1.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1620,7 +1637,7 @@ }, { "name": "qr", - "version": "2.1.0", + "version": "3.0.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1676,7 +1693,7 @@ }, { "name": "permission_handler", - "version": "10.2.0", + "version": "10.4.3", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1690,7 +1707,7 @@ }, { "name": "permission_handler_platform_interface", - "version": "3.9.0", + "version": "3.11.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1701,7 +1718,7 @@ }, { "name": "permission_handler_windows", - "version": "0.1.2", + "version": "0.1.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1711,7 +1728,7 @@ }, { "name": "permission_handler_apple", - "version": "9.0.7", + "version": "9.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1721,7 +1738,7 @@ }, { "name": "permission_handler_android", - "version": "10.2.0", + "version": "10.3.3", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1729,9 +1746,20 @@ "permission_handler_platform_interface" ] }, + { + "name": "pasteboard", + "version": "0.2.0", + "kind": "direct", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "js" + ] + }, { "name": "package_info_plus", - "version": "4.0.0", + "version": "4.1.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1778,7 +1806,7 @@ }, { "name": "matrix_api_lite", - "version": "1.6.1", + "version": "1.7.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1796,7 +1824,7 @@ }, { "name": "matrix", - "version": "0.20.5", + "version": "0.22.3", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1820,6 +1848,7 @@ "random_string", "sdp_transform", "slugify", + "typed_data", "webrtc_interface" ] }, @@ -1877,7 +1906,7 @@ }, { "name": "canonical_json", - "version": "1.1.1", + "version": "1.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -1920,7 +1949,7 @@ }, { "name": "latlong2", - "version": "0.8.1", + "version": "0.8.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1929,7 +1958,7 @@ }, { "name": "intl", - "version": "0.18.0", + "version": "0.18.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -1952,7 +1981,7 @@ }, { "name": "tuple", - "version": "2.0.1", + "version": "2.0.2", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -1966,47 +1995,9 @@ "flutter" ] }, - { - "name": "just_audio_mpv", - "version": "0.1.6", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "flutter", - "just_audio_platform_interface", - "mpv_dart" - ] - }, - { - "name": "mpv_dart", - "version": "0.0.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "eventify", - "path" - ] - }, - { - "name": "eventify", - "version": "1.0.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "just_audio_platform_interface", - "version": "4.2.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "plugin_platform_interface" - ] - }, { "name": "just_audio", - "version": "0.9.31", + "version": "0.9.34", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2032,7 +2023,7 @@ }, { "name": "audio_session", - "version": "0.1.13", + "version": "0.1.16", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2044,7 +2035,7 @@ }, { "name": "just_audio_web", - "version": "0.4.7", + "version": "0.4.8", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2053,9 +2044,19 @@ "flutter_web_plugins" ] }, + { + "name": "just_audio_platform_interface", + "version": "4.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, { "name": "image_picker", - "version": "0.8.7", + "version": "1.0.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2063,12 +2064,27 @@ "image_picker_android", "image_picker_for_web", "image_picker_ios", + "image_picker_linux", + "image_picker_macos", + "image_picker_platform_interface", + "image_picker_windows" + ] + }, + { + "name": "image_picker_windows", + "version": "0.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file_selector_platform_interface", + "file_selector_windows", + "flutter", "image_picker_platform_interface" ] }, { "name": "image_picker_platform_interface", - "version": "2.6.3", + "version": "2.9.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2078,9 +2094,78 @@ "plugin_platform_interface" ] }, + { + "name": "file_selector_windows", + "version": "0.9.3", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "file_selector_platform_interface", + "flutter" + ] + }, + { + "name": "file_selector_platform_interface", + "version": "2.6.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "flutter", + "http", + "plugin_platform_interface" + ] + }, + { + "name": "image_picker_macos", + "version": "0.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file_selector_macos", + "file_selector_platform_interface", + "flutter", + "image_picker_platform_interface" + ] + }, + { + "name": "file_selector_macos", + "version": "0.9.3+1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "file_selector_platform_interface", + "flutter" + ] + }, + { + "name": "image_picker_linux", + "version": "0.2.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "file_selector_linux", + "file_selector_platform_interface", + "flutter", + "image_picker_platform_interface" + ] + }, + { + "name": "file_selector_linux", + "version": "0.9.2", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "cross_file", + "file_selector_platform_interface", + "flutter" + ] + }, { "name": "image_picker_ios", - "version": "0.8.7+1", + "version": "0.8.8", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2090,18 +2175,19 @@ }, { "name": "image_picker_for_web", - "version": "2.1.12", + "version": "3.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ "flutter", "flutter_web_plugins", - "image_picker_platform_interface" + "image_picker_platform_interface", + "mime" ] }, { "name": "image_picker_android", - "version": "0.8.6+5", + "version": "0.8.7+4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2112,7 +2198,7 @@ }, { "name": "flutter_plugin_android_lifecycle", - "version": "2.0.9", + "version": "2.0.15", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2132,14 +2218,25 @@ ] }, { - "name": "handy_window", - "version": "0.1.9", + "name": "go_router", + "version": "10.1.0", "kind": "direct", "source": "hosted", "dependencies": [ - "flutter" + "collection", + "flutter", + "flutter_web_plugins", + "logging", + "meta" ] }, + { + "name": "logging", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [] + }, { "name": "geolocator", "version": "7.7.1", @@ -2185,24 +2282,24 @@ }, { "name": "flutter_webrtc", - "version": "0.9.31", + "version": "0.9.40", "kind": "direct", - "source": "git", + "source": "hosted", "dependencies": [ "collection", "dart_webrtc", "flutter", - "js", "path_provider", "webrtc_interface" ] }, { "name": "dart_webrtc", - "version": "1.0.16", + "version": "1.1.2", "kind": "transitive", "source": "hosted", "dependencies": [ + "collection", "js", "platform_detect", "webrtc_interface" @@ -2220,7 +2317,7 @@ }, { "name": "flutter_web_auth_2", - "version": "2.1.1", + "version": "2.1.5", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2242,7 +2339,7 @@ }, { "name": "flutter_web_auth_2_platform_interface", - "version": "2.1.0", + "version": "2.1.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2252,17 +2349,27 @@ }, { "name": "flutter_typeahead", - "version": "4.3.7", + "version": "4.6.2", "kind": "direct", "source": "hosted", "dependencies": [ "flutter", - "flutter_keyboard_visibility" + "flutter_keyboard_visibility", + "pointer_interceptor" + ] + }, + { + "name": "pointer_interceptor", + "version": "0.9.3+4", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" ] }, { "name": "flutter_keyboard_visibility", - "version": "5.4.0", + "version": "5.4.1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2329,7 +2436,7 @@ }, { "name": "flutter_secure_storage", - "version": "7.0.1", + "version": "8.0.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2342,6 +2449,26 @@ "meta" ] }, + { + "name": "flutter_secure_storage_windows", + "version": "2.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_secure_storage_platform_interface" + ] + }, + { + "name": "flutter_secure_storage_platform_interface", + "version": "1.0.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface" + ] + }, { "name": "flutter_secure_storage_web", "version": "1.1.1", @@ -2354,19 +2481,9 @@ "js" ] }, - { - "name": "flutter_secure_storage_platform_interface", - "version": "1.0.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "plugin_platform_interface" - ] - }, { "name": "flutter_secure_storage_macos", - "version": "2.0.1", + "version": "3.0.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2428,7 +2545,7 @@ }, { "name": "flutter_svg", - "version": "2.0.5", + "version": "2.0.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2440,7 +2557,7 @@ }, { "name": "vector_graphics_compiler", - "version": "1.1.5", + "version": "1.1.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2453,7 +2570,7 @@ }, { "name": "vector_graphics_codec", - "version": "1.1.5", + "version": "1.1.7", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -2470,7 +2587,7 @@ }, { "name": "vector_graphics", - "version": "1.1.5", + "version": "1.1.7", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2480,7 +2597,7 @@ }, { "name": "flutter_map", - "version": "3.1.0", + "version": "4.0.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2491,7 +2608,6 @@ "latlong2", "meta", "polylabel", - "positioned_tap_detector_2", "proj4dart", "tuple", "vector_math" @@ -2542,15 +2658,6 @@ "meta" ] }, - { - "name": "positioned_tap_detector_2", - "version": "1.0.4", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter" - ] - }, { "name": "polylabel", "version": "1.0.1", @@ -2571,16 +2678,16 @@ "characters", "clock", "collection", - "js", "material_color_utilities", "meta", "path", - "vector_math" + "vector_math", + "web" ] }, { "name": "flutter_local_notifications", - "version": "12.0.4", + "version": "15.1.0+1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2593,7 +2700,7 @@ }, { "name": "timezone", - "version": "0.9.1", + "version": "0.9.2", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2602,7 +2709,7 @@ }, { "name": "flutter_local_notifications_platform_interface", - "version": "6.0.0", + "version": "7.0.0+1", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2612,13 +2719,14 @@ }, { "name": "flutter_local_notifications_linux", - "version": "1.0.0", + "version": "4.0.0+1", "kind": "transitive", "source": "hosted", "dependencies": [ + "dbus", + "ffi", "flutter", "flutter_local_notifications_platform_interface", - "dbus", "path", "xdg_directories" ] @@ -2659,7 +2767,7 @@ }, { "name": "flutter_layout_grid", - "version": "2.0.3", + "version": "2.0.4", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2719,21 +2827,19 @@ }, { "name": "flutter_foreground_task", - "version": "3.10.0", + "version": "6.0.0+1", "kind": "direct", "source": "hosted", "dependencies": [ "flutter", "plugin_platform_interface", "platform", - "shared_preferences", - "shared_preferences_android", - "shared_preferences_ios" + "shared_preferences" ] }, { "name": "flutter_cache_manager", - "version": "3.3.0", + "version": "3.3.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2744,7 +2850,6 @@ "http", "path", "path_provider", - "pedantic", "rxdart", "sqflite", "uuid" @@ -2752,7 +2857,7 @@ }, { "name": "sqflite", - "version": "2.2.6", + "version": "2.3.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2763,7 +2868,7 @@ }, { "name": "sqflite_common", - "version": "2.4.3", + "version": "2.5.0", "kind": "transitive", "source": "hosted", "dependencies": [ @@ -2774,14 +2879,7 @@ }, { "name": "synchronized", - "version": "3.0.1", - "kind": "transitive", - "source": "hosted", - "dependencies": [] - }, - { - "name": "pedantic", - "version": "1.11.1", + "version": "3.1.0", "kind": "transitive", "source": "hosted", "dependencies": [] @@ -2815,7 +2913,7 @@ }, { "name": "file_picker", - "version": "5.3.0", + "version": "5.3.3", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2858,14 +2956,14 @@ }, { "name": "remove_emoji", - "version": "0.0.7", + "version": "0.0.9", "kind": "transitive", "source": "hosted", "dependencies": [] }, { "name": "emoji_picker_flutter", - "version": "1.5.2", + "version": "1.6.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2877,7 +2975,7 @@ }, { "name": "dynamic_color", - "version": "1.6.2", + "version": "1.6.6", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2886,32 +2984,6 @@ "material_color_utilities" ] }, - { - "name": "device_info_plus", - "version": "8.1.0", - "kind": "direct", - "source": "hosted", - "dependencies": [ - "device_info_plus_platform_interface", - "ffi", - "file", - "flutter", - "flutter_web_plugins", - "meta", - "win32" - ] - }, - { - "name": "device_info_plus_platform_interface", - "version": "7.0.0", - "kind": "transitive", - "source": "hosted", - "dependencies": [ - "flutter", - "meta", - "plugin_platform_interface" - ] - }, { "name": "desktop_notifications", "version": "0.6.3", @@ -2923,7 +2995,7 @@ }, { "name": "desktop_lifecycle", - "version": "0.1.0", + "version": "0.1.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2950,7 +3022,7 @@ }, { "name": "connectivity_plus", - "version": "3.0.3", + "version": "4.0.2", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2984,7 +3056,7 @@ }, { "name": "chewie", - "version": "1.4.0", + "version": "1.7.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -2992,7 +3064,34 @@ "flutter", "provider", "video_player", - "wakelock" + "wakelock_plus" + ] + }, + { + "name": "wakelock_plus", + "version": "1.1.1", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "flutter_web_plugins", + "meta", + "wakelock_plus_platform_interface", + "win32", + "dbus", + "package_info_plus", + "js" + ] + }, + { + "name": "wakelock_plus_platform_interface", + "version": "1.1.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "plugin_platform_interface", + "meta" ] }, { @@ -3006,7 +3105,7 @@ }, { "name": "badges", - "version": "2.0.3", + "version": "3.1.1", "kind": "direct", "source": "hosted", "dependencies": [ @@ -3024,7 +3123,7 @@ }, { "name": "adaptive_dialog", - "version": "1.9.0-no-macos.2", + "version": "1.9.0", "kind": "direct", "source": "hosted", "dependencies": [ @@ -3033,9 +3132,29 @@ "dynamic_color", "flutter", "intersperse", + "macos_ui", "meta" ] }, + { + "name": "macos_ui", + "version": "2.0.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter", + "macos_window_utils" + ] + }, + { + "name": "macos_window_utils", + "version": "1.2.0", + "kind": "transitive", + "source": "hosted", + "dependencies": [ + "flutter" + ] + }, { "name": "intersperse", "version": "2.0.0", diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix index 3e6fa0d924..7938708ca6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -21,11 +21,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - hash = "sha256-EgH8mt0am2l9z4csGHH6rpLqTzFiBRzOPB4NCEP8TUM="; + hash = "sha256-Erh7tR6WX8pt89PRicgbVZd8CLlv18Vyq44O+ZnJVzU="; }; format = "pyproject"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix deleted file mode 100644 index 04d8909f3d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ lib, stdenv, alsa-lib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl -, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libdrm, libX11 -, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes -, libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx -, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, mesa, nspr, nss -, pango, systemd }: - -let gitterDirectorySuffix = "opt/gitter"; - libPath = lib.makeLibraryPath [ - alsa-lib - atk - at-spi2-core - cairo - cups - dbus - expat - fontconfig - freetype - gdk-pixbuf - glib - gtk3 - libX11 - libXScrnSaver - libXcomposite - libXcursor - libXdamage - libXext - libXfixes - libXi - libXrandr - libXrender - libXtst - libappindicator-gtk3 - libcxx - libdrm - libnotify - libpulseaudio - libxcb - mesa - nspr - nss - pango - stdenv.cc.cc - systemd - ]; - doELFPatch = target: '' - patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ - --set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \ - $out/${gitterDirectorySuffix}/${target} - ''; -in stdenv.mkDerivation rec { - pname = "gitter"; - version = "5.0.1"; - - src = fetchurl { - url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb"; - sha256 = "1ps9akylqrril4902r8mi0mprm0hb5wra51ry6c1rb5xz5nrzgh1"; - }; - - nativeBuildInputs = [ makeWrapper dpkg ]; - - unpackPhase = "dpkg -x $src ."; - - installPhase = '' - mkdir -p $out/{bin,opt/gitter,share/pixmaps} - mv ./opt/Gitter/linux64/* $out/opt/gitter - - ${doELFPatch "Gitter"} - ${doELFPatch "nacl_helper"} - ${doELFPatch "minidump_stackwalk"} - ${doELFPatch "nwjc"} - ${doELFPatch "chromedriver"} - ${doELFPatch "payload"} - - patchelf --set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \ - $out/${gitterDirectorySuffix}/lib/libnw.so - - wrapProgram $out/${gitterDirectorySuffix}/Gitter --prefix LD_LIBRARY_PATH : ${libPath} - - ln -s $out/${gitterDirectorySuffix}/Gitter $out/bin/ - ln -s $out/${gitterDirectorySuffix}/logo.png $out/share/pixmaps/gitter.png - ln -s "${desktopItem}/share/applications" $out/share/ - ''; - - desktopItem = makeDesktopItem { - name = pname; - exec = "Gitter"; - icon = pname; - desktopName = "Gitter"; - genericName = meta.description; - categories = [ "Network" "InstantMessaging" ]; - }; - - meta = with lib; { - description = "Where developers come to talk"; - downloadPage = "https://gitter.im/apps"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mit; - maintainers = [ maintainers.imalison ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix index 4dc24073f5..d1947825c4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/go-neb/default.nix @@ -14,7 +14,7 @@ buildGoModule { buildInputs = [ olm ]; - vendorSha256 = "sha256-5Vg7aUkqiFIQuxmsDOJjvXoeA5NjMoBoD0XBhC+o4GA="; + vendorHash = "sha256-5Vg7aUkqiFIQuxmsDOJjvXoeA5NjMoBoD0XBhC+o4GA="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix index cc0a654ad2..d7fd400298 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { sha256 = "sha256-gLyjqmGZudj8PmsYUGXHOjetZzi6u5CFI7Y50y2XAzk="; }; - vendorSha256 = "sha256-FmQJG6hv0YPyHVjZ/DvkQExrGLc1hjoiPS59MnqG2gU="; + vendorHash = "sha256-FmQJG6hv0YPyHVjZ/DvkQExrGLc1hjoiPS59MnqG2gU="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix index 9178c73a46..2c86b3e86f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -4,17 +4,15 @@ with ocamlPackages; buildDunePackage rec { pname = "jackline"; - version = "unstable-2023-02-24"; + version = "unstable-2023-03-09"; minimalOCamlVersion = "4.08"; - duneVersion = "3"; - src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "846be4e7fcddf45e66e0ff5b29fb5a212d6ee8c3"; - hash = "sha256-/j3VJRx/w9HQUnfoq/4gMWV5oVdRiPGddrgbCDk5y8c="; + rev = "a7acd19bd8141b842ac69b05146d9a63e729230d"; + hash = "sha256-AhiFfZkDit9tnGenETc3A1hHqWN+csiS2bVjsGNaHf8="; }; nativeBuildInpts = [ @@ -43,6 +41,7 @@ buildDunePackage rec { cstruct base64 happy-eyeballs-lwt + ppx_sexp_conv ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix index 0002e1d57d..ebf3341e30 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -12,7 +12,7 @@ , mkDerivation , qtgraphicaleffects , qtquickcontrols2 -, qttranslations +, qttools }: # How to update Linphone? (The Qt desktop app) @@ -73,11 +73,11 @@ mkDerivation rec { minizip-ng qtgraphicaleffects qtquickcontrols2 - qttranslations ]; nativeBuildInputs = [ cmake + qttools ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix index a9e27186fe..1548036978 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix @@ -12,17 +12,18 @@ , dbus-python , pyxdg , python-olm +, emoji }: buildPythonApplication rec { pname = "matrix-commander"; - version = "6.0.1"; + version = "7.2.0"; src = fetchFromGitHub { owner = "8go"; repo = "matrix-commander"; rev = "v${version}"; - sha256 = "sha256-NSoMGUQjy4TQXdzZcQfO2rUQDsuSzQnoGDpqFiLQHVQ="; + hash = "sha256-qL6ARkAWu0FEuYK2e9Z9hMSfK4TW0kGgoIFUfJ8Dgwk="; }; format = "pyproject"; @@ -49,6 +50,7 @@ buildPythonApplication rec { dbus-python pyxdg python-olm + emoji ] ++ matrix-nio.optional-dependencies.e2e; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 263610b65c..7e3d8fc7a3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -1,30 +1,24 @@ { lib , stdenv , fetchurl -, atomEnv -, systemd -, pulseaudio -, libxshmfence -, libnotify -, libappindicator-gtk3 -, wrapGAppsHook -, autoPatchelfHook +, electron_26 +, makeWrapper }: let pname = "mattermost-desktop"; - version = "5.3.1"; + version = "5.5.0"; srcs = { "x86_64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - hash = "sha256-rw+SYCFmN2W4t5iIWEpV9VHxcvwTLOckMV58WRa5dZE="; + hash = "sha256-htjKGO16Qs1RVE4U47DdN8bNpUH4JD/LkMOeoIRmLPI="; }; "aarch64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz"; - hash = "sha256-FEIldkb3FbUfVAYRkjs7oPRJDHdsIGDW5iaC2Qz1dpc="; + hash = "sha256-LQhMSIrWDZTXBnJfLKph5e6txHGvQSqEu+P1j1zOiTg="; }; }; @@ -37,22 +31,7 @@ stdenv.mkDerivation { src = fetchurl (srcs."${system}" or (throw "Unsupported system ${system}")); - dontBuild = true; - dontConfigure = true; - dontStrip = true; - - nativeBuildInputs = [ wrapGAppsHook autoPatchelfHook ]; - - buildInputs = atomEnv.packages ++ [ - libxshmfence - ]; - - runtimeDependencies = [ - (lib.getLib systemd) - pulseaudio - libnotify - libappindicator-gtk3 - ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall @@ -63,21 +42,19 @@ stdenv.mkDerivation { find . -type f \( -name '*.so.*' -o -name '*.s[oh]' \) -print0 | xargs -0 chmod +x chmod +x mattermost-desktop chrome-sandbox - mkdir -p $out/share/mattermost-desktop - cp -R . $out/share/mattermost-desktop + mkdir -p $out/bin $out/share/applications $out/share/${pname}/ + cp -r app_icon.png create_desktop_file.sh locales/ resources/* $out/share/${pname}/ - mkdir -p "$out/bin" - ln -s $out/share/mattermost-desktop/mattermost-desktop $out/bin/mattermost-desktop - - patchShebangs $out/share/mattermost-desktop/create_desktop_file.sh - $out/share/mattermost-desktop/create_desktop_file.sh - rm $out/share/mattermost-desktop/create_desktop_file.sh - mkdir -p $out/share/applications - chmod -x Mattermost.desktop + patchShebangs $out/share/${pname}/create_desktop_file.sh + $out/share/${pname}/create_desktop_file.sh + rm $out/share/${pname}/create_desktop_file.sh mv Mattermost.desktop $out/share/applications/Mattermost.desktop substituteInPlace $out/share/applications/Mattermost.desktop \ --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop + makeWrapper ${electron_26}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/app.asar + runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix index ce4963df01..b6c48a0e94 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -10,7 +10,7 @@ buildGoModule { sha256 = "sha256-SdD4EE/rc85H7xqKB/kU8XFsC63i1sVObPha/zrxFGk="; }; - vendorSha256 = "sha256-zJJ9PzQShv2iRNyCg1XVscbwjV9ZtMIojJDtXXm3rVM="; + vendorHash = "sha256-zJJ9PzQShv2iRNyCg1XVscbwjV9ZtMIojJDtXXm3rVM="; meta = with lib; { description = "A file system based matrix client"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix index 1c4f8ca811..51b704f5bc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nchat/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nchat"; - version = "3.60"; + version = "3.67"; src = fetchFromGitHub { owner = "d99kris"; repo = "nchat"; rev = "v${version}"; - hash = "sha256-Fe+Cdh8NlrCkzSO/Juw96eXtGfXajhFIsKeTC3qXIlU="; + hash = "sha256-PhvZejtSoDptzoMP5uIe6T0Ws/bQQXVuYH9uoZo3JsI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neosay/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neosay/default.nix new file mode 100644 index 0000000000..4d9b70dd1e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neosay/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "neosay"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "donuts-are-good"; + repo = "neosay"; + rev = "v${version}"; + hash = "sha256-Uwz6Y26AtzWXLFgJY0WVD0HBb+vbMeeMKt8gCk6viec="; + }; + + vendorHash = "sha256-w0aZnel5Obq73UXcG9wmO9t/7qQTE8ru656u349cvzQ="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Pipe stdin to matrix"; + homepage = "https://github.com/donuts-are-good/neosay"; + license = licenses.mit; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix index 5dc6bde6fe..acc6f8948f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , asciidoc , pkg-config @@ -42,6 +43,22 @@ stdenv.mkDerivation rec { hash = "sha256-2daXxTbpSUlig47y901JOkWRxbZGH4qrvNMepJbvS3o="; }; + patches = [ + # The 2 following patches can be removed with the next version bump. + # Backport of https://github.com/Nheko-Reborn/nheko/commit/e89e65dc17020772eb057414b4f0c5d6f4ad98d0. + (fetchpatch { + name = "nheko-fmt10.patch"; + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/nheko/-/raw/1b0d5c9eff6409dfd82953f346546d36c288a4a9/nheko-0.11.3-fix-for-fmt-10.patch"; + hash = "sha256-UYqAu2iXT3Bn/MxCtybiJrJLfVMOOVRchWqrGuPfapI="; + }) + # https://github.com/Nheko-Reborn/nheko/pull/1552 + (fetchpatch { + name = "nheko-fmt10.1.patch"; + url = "https://github.com/Nheko-Reborn/nheko/commit/614facf93c2b5d6118beb822cc542ac53a883c37.patch"; + hash = "sha256-rjsQNDfj3Lzbv8ow3qiNozGXQFrtYLhArS6a9JCdgBQ="; + }) + ]; + nativeBuildInputs = [ asciidoc cmake diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix index a9ce755be5..54a2e9e6c0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -23,16 +23,16 @@ }: let - version = "3.1.2-13107"; - _hash = "ad5b5393"; + version = "3.2.1-17153"; + _hash = "b69de82d"; srcs = { x86_64-linux = fetchurl { url = "https://dldir1.qq.com/qqfile/qq/QQNT/${_hash}/linuxqq_${version}_amd64.deb"; - hash = "sha256-mBfeexWEYpGybFFianUFvlzMv0HoFR4EeFcwlGVXIRA="; + hash = "sha256-+GjTjv0K2vnlkb46KhMvRRFWuIEBz23Lg3QhiA7QzkA="; }; aarch64-linux = fetchurl { url = "https://dldir1.qq.com/qqfile/qq/QQNT/${_hash}/linuxqq_${version}_arm64.deb"; - hash = "sha256-V6kR2lb63nnNIEhn64Yg0BYYlz7W0Cw60TwnKaJuLgs="; + hash = "sha256-BtmmVpKZF15aU7RRmXl9g5leg2jz5sT4vYXluq9aIYk="; }; }; src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix index 659b6411b4..8273a6fdbc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -12,7 +12,6 @@ , qtbase , qtsvg , qttools -, qttranslations , ffmpeg , filter-audio , libexif @@ -44,7 +43,6 @@ mkDerivation rec { libXScrnSaver qtbase qtsvg - qttranslations ffmpeg filter-audio libexif diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 2bb54b8b5b..133766d8cc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Cross-platform desktop IM client for the Matrix protocol"; - homepage = "https://matrix.org/docs/projects/client/quaternion.html"; + homepage = "https://matrix.org/ecosystem/clients/quaternion/"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; inherit (qtquickcontrols2.meta) platforms; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 95bd9de69e..d3c6a33d24 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.8.11"; + version = "3.9.9"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - sha256 = "sha256-gRMoLzCAXByLVtzYAZnhmbgbfsav6CkbP3ZE0NDdlMw="; + hash = "sha256-50mVmE+q2VYJXIv2iD6ppS83We0aJRT9vje+zpJcdq0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix index 647b2e662a..7989713d4a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix @@ -8,12 +8,12 @@ }: let - version = "1.11.0"; + version = "1.11.3"; pname = "session-desktop"; src = fetchurl { url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage"; - sha256 = "sha256-QartWtp5/OtJqQq5GXRoIQ/ytK9/YCW1ixXTUrnGwqw="; + hash = "sha256-HdgW7Ls0h75BXKXGzzf37K9w4bgkfA9eAUEmBrSDT+U="; }; appimage = appimageTools.wrapType2 { inherit version pname src; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 7137b62502..dfa5155f64 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.11.11"; + version = "0.12.2"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz"; - hash = "sha256-IKKWJBe6A3TVWIRTDyWbfRYMwgRNhSqSJK0ZRZNCVkA="; + hash = "sha256-XhLTovymqjbc19X717WyNIi4jdpwnyttXGqkkHBFwQA="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/AsamK/signal-cli"; description = "Command-line and dbus interface for communicating with the Signal messaging service"; + changelog = "https://github.com/AsamK/signal-cli/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3; maintainers = with maintainers; [ ivan ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index ea1ab235fc..7ae6a8a11a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,12 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.27.1"; - hash = "sha256-nEOt6bep6SqhAab8yD9NlRrDGU2IvZeOxSqPj2u1bio="; + version = "6.32.0"; + hash = "sha256-FZ2wG3nkgIndeoUfXag/9jftXGDSY/MNpT8mqSZpJzA="; }; signal-desktop-beta = { dir = "Signal Beta"; - version = "6.24.0-beta.1"; - hash = "sha256-tA1xsgtAeOn0c0HcZutj+Pqrsr0JV5bQOnknH4t/QkY="; + version = "6.33.0-beta.1"; + hash = "sha256-FLCZvRYUysiE8BLMJVnn0hOkA3km0z383AjN6JvOyWI="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 71b3660ca6..72a5c55e9c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -156,9 +156,10 @@ stdenv.mkDerivation rec { --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} ) - # Fix the desktop link + # Fix the desktop link and fix showing application icon in tray substituteInPlace $out/share/applications/${pname}.desktop \ - --replace "/opt/${dir}/${pname}" $out/bin/${pname} + --replace "/opt/${dir}/${pname}" $out/bin/${pname} \ + --replace "bin/signal-desktop" "bin/signal-desktop --use-tray-icon" autoPatchelf --no-recurse -- "$out/lib/${dir}/" patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node" 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 49035e9bd5..5755327aec 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 @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230730"; + version = "20231003"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-5gXeAX3eV70p5wdQEMXv5QAv3vXH2OH46XL2rY0AUvE="; + hash = "sha256-fMVLmuhdccYzsOgVvViaICmbXgU0o3Fu0K85hbao4YI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index c29df0221b..d4a8045d79 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ 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.96.0.207"; + version = "8.105.0.208"; rpath = lib.makeLibraryPath [ alsa-lib @@ -68,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-tkOPYFkmc4nzO8Rgat9/VNuzzIW10qSEzbXhjkZV83k="; + sha256 = "sha256-P1H9BSXHDmrE8x2kq4Mw5A7r2jVZGSHJh84Hn5EX2lk="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix index 99b8b4563d..2750336cf1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "1fbq7bdhy70hlkklppimgdjamnk0v059pg73xm9ax1f4616ki1m6"; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "Slack client for your terminal"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index 66c81f9f6b..068e47e926 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -4,7 +4,7 @@ , dpkg , undmg , makeWrapper -, nodePackages +, asar , alsa-lib , at-spi2-atk , at-spi2-core @@ -45,14 +45,14 @@ let pname = "slack"; - x86_64-darwin-version = "4.33.84"; - x86_64-darwin-sha256 = "1qkcj0w5rqfdj8l7p7gv2ck0rgkm5sc8490f8mnbflgvjj9y0gsb"; + x86_64-darwin-version = "4.34.121"; + x86_64-darwin-sha256 = "0j04rj8v6aq4kjlkkc6yf466zq821jg3qy6qppmvyg5z0f08cyar"; - x86_64-linux-version = "4.33.84"; - x86_64-linux-sha256 = "0cjl3m9gprxkm57889l1avkl21pyc7bzhcgm4j5yf938dp699zhd"; + x86_64-linux-version = "4.34.121"; + x86_64-linux-sha256 = "11199dsp7phmz0bxlk5al61xp2g6yzgj17nwz0zrx1g7ak0qdvz5"; - aarch64-darwin-version = "4.33.84"; - aarch64-darwin-sha256 = "0aw4wn4xx304dyzz7v9lmdgwg1345lhizil8yq9cjqy5kas3zj34"; + aarch64-darwin-version = "4.34.121"; + aarch64-darwin-sha256 = "0pvlf9h8433fi31398g4rkii14gk77a684sln8n95xg5p3lxkydy"; version = { x86_64-darwin = x86_64-darwin-version; @@ -81,9 +81,10 @@ let meta = with lib; { description = "Desktop client for Slack"; homepage = "https://slack.com"; + changelog = "https://slack.com/release-notes"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ mmahut maxeaubrey ]; + maintainers = with maintainers; [ mmahut amaxine ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; mainProgram = "slack"; }; @@ -143,7 +144,7 @@ let gtk3 # needed for GSETTINGS_SCHEMAS_PATH ]; - nativeBuildInputs = [ dpkg makeWrapper nodePackages.asar ]; + nativeBuildInputs = [ dpkg makeWrapper asar ]; dontUnpack = true; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh index 688fe579f8..2981a26a8e 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -6,12 +6,6 @@ set -eou pipefail latest_linux_version=$(curl -L --silent https://slack.com/downloads/linux | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p') latest_mac_version=$(curl -L --silent https://slack.com/downloads/mac | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p') -# Double check that the latest mac and linux versions are in sync. -if [[ "$latest_linux_version" != "$latest_mac_version" ]]; then - echo "the latest linux ($latest_linux_version) and mac ($latest_mac_version) versions are not the same" - exit 1 -fi - nixpkgs="$(git rev-parse --show-toplevel)" slack_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix" nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p') diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix index 71693485a1..15ff9a9e2b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "shazow"; repo = "ssh-chat"; rev = "v${version}"; - sha256 = "LgrqIuM/tLC0JqDai2TLu6G/edZ5Q7WFXjX5bzc0Bcc="; + hash = "sha256-LgrqIuM/tLC0JqDai2TLu6G/edZ5Q7WFXjX5bzc0Bcc="; }; - vendorSha256 = "QTUBorUAsWDOpNP3E/Y6ht7ZXZViWBbrMPtLl7lHtgE="; + vendorHash = "sha256-QTUBorUAsWDOpNP3E/Y6ht7ZXZViWBbrMPtLl7lHtgE="; meta = with lib; { description = "Chat over SSH"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index ec318aa3e1..157df8ca9a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -8,27 +8,29 @@ , nodejs , fetchYarnDeps , fixup_yarn_lock -, electron +, electron_24 , libpulseaudio , pipewire , alsa-utils , which +, testers +, teams-for-linux }: stdenv.mkDerivation (finalAttrs: { pname = "teams-for-linux"; - version = "1.3.2"; + version = "1.3.13"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; rev = "v${finalAttrs.version}"; - hash = "sha256-2WoTbkRGH9l6cQrveyxGvO/Dy+0NV4UTDaooYn8k06s="; + hash = "sha256-WF2jWP6utopAMZPP/ZWOhqVGZJmACwHyLLE+HQaHJjg="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-j5N6d270myUylDVDFQTScbsGp1wlpt5sISDJBRCV/GU="; + hash = "sha256-vgjPGO5qa4IYfW1svClJ+wP/KtIFFd3P02T2sht69C8="; }; nativeBuildInputs = [ yarn fixup_yarn_lock nodejs copyDesktopItems makeWrapper ]; @@ -50,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: { yarn --offline electron-builder \ --dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"} \ - -c.electronDist=${electron}/lib/electron \ - -c.electronVersion=${electron.version} + -c.electronDist=${electron_24}/libexec/electron \ + -c.electronVersion=${electron_24.version} runHook postBuild ''; @@ -70,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { popd # Linux needs 'aplay' for notification sounds, 'libpulse' for meeting sound, and 'libpipewire' for screen sharing - makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \ + makeWrapper '${electron_24}/bin/electron' "$out/bin/teams-for-linux" \ ${lib.optionalString stdenv.isLinux '' --prefix PATH : ${lib.makeBinPath [ alsa-utils which ]} \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpulseaudio pipewire ]} \ @@ -91,12 +93,16 @@ stdenv.mkDerivation (finalAttrs: { })]; passthru.updateScript = ./update.sh; + passthru.tests.version = testers.testVersion rec { + package = teams-for-linux; + command = "HOME=$TMPDIR ${package.meta.mainProgram or package.pname} --version"; + }; meta = { description = "Unofficial Microsoft Teams client for Linux"; homepage = "https://github.com/IsmaelMartinez/teams-for-linux"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ muscaln lilyinstarlight ]; + maintainers = with lib.maintainers; [ muscaln lilyinstarlight qjoly ]; platforms = lib.platforms.unix; broken = stdenv.isDarwin; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix index be4334438c..ce52a64112 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -1,34 +1,17 @@ { lib , stdenv -, runtimeShell , fetchurl -, autoPatchelfHook -, wrapGAppsHook -, dpkg -, atomEnv -, libuuid -, libappindicator-gtk3 -, pulseaudio -, at-spi2-atk -, coreutils -, gawk -, xdg-utils -, systemd -, nodePackages , xar , cpio , makeWrapper -, enableRectOverlay ? false }: let pname = "teams"; versions = { - linux = "1.5.00.23861"; darwin = "1.6.00.4464"; }; hashes = { - linux = "sha256-h0YnCeJX//l4TegJVZtavV3HrxjYUF2Fa5KmaYmZW8E="; darwin = "sha256-DvXMrXotKWUqFCb7rZj8wU7mmZJKuTLGyx8qOB/aQtg="; }; meta = with lib; { @@ -38,112 +21,10 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ liff tricktron ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "teams"; }; - linux = stdenv.mkDerivation rec { - inherit pname meta; - version = versions.linux; - - src = fetchurl { - urls = [ - "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb" - # NOTE: the archive.org timestamp must also be updated if the version changes. - "https://web.archive.org/web/20221130115842if_/https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${versions.linux}_amd64.deb" - ]; - hash = hashes.linux; - }; - - nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook nodePackages.asar ]; - - unpackCmd = "dpkg -x $curSrc ."; - - buildInputs = atomEnv.packages ++ [ - libuuid - at-spi2-atk - ]; - - runtimeDependencies = [ - (lib.getLib systemd) - pulseaudio - libappindicator-gtk3 - ]; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PATH : "${coreutils}/bin:${gawk}/bin" - - # fix for https://docs.microsoft.com/en-us/answers/questions/298724/open-teams-meeting-link-on-linux-doens39t-work.html?childToView=309406#comment-309406 - --append-flags '--disable-namespace-sandbox --disable-setuid-sandbox' - ) - ''; - - - buildPhase = '' - runHook preBuild - - asar extract share/teams/resources/app.asar "$TMP/work" - substituteInPlace $TMP/work/main.bundle.js \ - --replace "/usr/share/pixmaps/" "$out/share/pixmaps" \ - --replace "/usr/bin/xdg-mime" "${xdg-utils}/bin/xdg-mime" \ - --replace "Exec=/usr/bin/" "Exec=" # Remove usage of absolute path in autostart. - asar pack --unpack='{*.node,*.ftz,rect-overlay}' "$TMP/work" share/teams/resources/app.asar - - runHook postBuild - ''; - - preferLocalBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{opt,bin} - - mv share/teams $out/opt/ - mv share $out/share - - mkdir -p $out/share/icons/hicolor/512x512/apps - mv $out/share/pixmaps/teams.png $out/share/icons/hicolor/512x512/apps - rmdir $out/share/pixmaps - - substituteInPlace $out/share/applications/teams.desktop \ - --replace /usr/bin/ "" - - ln -s $out/opt/teams/teams $out/bin/ - - ${lib.optionalString (!enableRectOverlay) '' - # Work-around screen sharing bug - # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html - rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay - ''} - - runHook postInstall - ''; - - dontAutoPatchelf = true; - - # Includes runtimeDependencies in the RPATH of the included Node modules - # so that dynamic loading works. We cannot use directly runtimeDependencies - # here, since the libraries from runtimeDependencies are not propagated - # to the dynamically loadable node modules because of a condition in - # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) - # instead of EXEC or INTERP it expects. - # Fixes: https://github.com/NixOS/nixpkgs/issues/85449 - postFixup = '' - autoPatchelf "$out" - - runtime_rpath="${lib.makeLibraryPath runtimeDependencies}" - - for mod in $(find "$out/opt/teams" -name '*.node'); do - mod_rpath="$(patchelf --print-rpath "$mod")" - - echo "Adding runtime dependencies to RPATH of Node module $mod" - patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod" - done; - ''; - }; - appName = "Teams.app"; darwin = stdenv.mkDerivation { @@ -178,4 +59,4 @@ let in if stdenv.isDarwin then darwin -else linux +else throw "Teams app for Linux has been removed as it is unmaintained by upstream. (2023-09-29)" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 540555b412..a0c7b678d5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "teamspeak-client"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"; - hash = "sha256-j4sgZ+tJpV6ST0yLmbLTLgBxQTcK1LZoEEfMe3TUAC4="; + hash = "sha256-WfEQQ4lxoj+QSnAOfdCoEc+Z1Oa5dbo6pFli1DsAZCI="; }; # grab the plugin sdk for the desktop icon diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index bc123e212d..73437d7301 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2023-05-01"; + version = "unstable-2023-08-15"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "dcb5069ff76bd293e86928804208737e6cee2ccc"; - sha256 = "0c3wnx51kbpzy9x8i9wm0ng16h35kgqsigrygrmwvxxn7zgv72ma"; + rev = "0532942ac6176a66ef184fb728a4cbb02958fc0b"; + sha256 = "sha256-FcRXxu0Nc8qHQl8PoA92MeuhpV+vgl658uILEpmDy3A="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix index cbc93857c8..ffa603fb80 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -60,7 +60,7 @@ mkDerivation rec { ''; meta = with lib; { - homepage = "https://matrix.org/docs/projects/client/tensor.html"; + homepage = "https://github.com/davidar/tensor"; description = "Cross-platform Qt5/QML-based Matrix client"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index 8d15b8e466..d4877da694 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -36,5 +36,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/Xithrius/twitch-tui/releases/tag/v${version}"; license = licenses.mit; maintainers = [ maintainers.taha ]; + mainProgram = "twt"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix index 00361a7e36..7e0ef77ef2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -13,16 +13,16 @@ buildNpmPackage rec { pname = "webcord"; - version = "4.3.0"; + version = "4.4.2"; src = fetchFromGitHub { owner = "SpacingBat3"; repo = "WebCord"; rev = "v${version}"; - hash = "sha256-E/WXAVSCNTDEDaz71LXOHUf/APFO2uSpkTRhlZfQp0E="; + hash = "sha256-23YmyRU+xBXpC7bZtBY3RZeVpLFQ3I/Ag5Tvi3m9cIs="; }; - npmDepsHash = "sha256-vGaYjM13seVmRbVPyDIM+qhGTCj6rw/el6Dq3KMzDks="; + npmDepsHash = "sha256-gHX5ZdcC46BwMu22G05Q8UhvZ6CtQ1HSf6KLLlN2iX0="; nativeBuildInputs = [ copyDesktopItems @@ -79,12 +79,13 @@ buildNpmPackage rec { passthru.updateScript = nix-update-script { }; meta = with lib; { - description = "A Discord and Fosscord electron-based client implemented without Discord API"; + description = "A Discord and SpaceBar electron-based client implemented without Discord API"; homepage = "https://github.com/SpacingBat3/WebCord"; downloadPage = "https://github.com/SpacingBat3/WebCord/releases"; changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}"; license = licenses.mit; + mainProgram = "webcord"; maintainers = with maintainers; [ huantian ]; - platforms = electron_25.meta.platforms; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix index d55af49f11..47e0673455 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/webcord-vencord/default.nix @@ -2,10 +2,11 @@ , substituteAll , lib , vencord-web-extension -, electron_24 }: -(webcord.overrideAttrs (old: { +webcord.overrideAttrs (old: { + pname = "webcord-vencord"; + patches = (old.patches or [ ]) ++ [ (substituteAll { src = ./add-extension.patch; @@ -17,8 +18,4 @@ description = "Webcord with Vencord web extension"; maintainers = with maintainers; [ FlafyDev NotAShelf ]; }; -})).override { - # Webcord has updated to electron 25, but that causes a segfault - # when launching webcord-vencord on wayland, so downgrade it for now. - electron_25 = electron_24; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix index 5f7956290f..fcb59900ff 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation rec { pname = "webex"; - version = "43.5.0.26155"; + version = "43.8.0.26955"; src = fetchurl { - url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20230508235734/Webex_ubuntu.7z"; - sha256 = "94ddd66be3a44eeb6f854d0e02feec2e010d494ff9fcc81663f30fca37da4774"; + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20230814223338/Webex_ubuntu.7z"; + sha256 = "6c754d65fffbcbbb2ca303e1f8c1e5688da190eea3d3b67c77361abc6e2bb85b"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 27a4a65605..2d14568424 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -1,5 +1,4 @@ -{ atomEnv -, autoPatchelfHook +{ autoPatchelfHook , dpkg , fetchurl , makeDesktopItem @@ -11,7 +10,11 @@ , cpio , xar , libdbusmenu -, libxshmfence +, alsa-lib +, mesa +, nss +, nspr +, systemd }: let @@ -64,8 +67,7 @@ let inherit pname version meta; src = fetchurl { - url = "https://wire-app.wire.com/linux/debian/pool/main/" - + "Wire-${version}_amd64.deb"; + url = "https://wire-app.wire.com/linux/debian/pool/main/Wire-${version}_amd64.deb"; inherit hash; }; @@ -85,6 +87,7 @@ let dontPatchELF = true; dontWrapGApps = true; + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron nativeBuildInputs = [ autoPatchelfHook dpkg @@ -92,7 +95,13 @@ let wrapGAppsHook ]; - buildInputs = [ libxshmfence ] ++ atomEnv.packages; + buildInputs = [ + alsa-lib + mesa + nss + nspr + systemd + ]; unpackPhase = '' runHook preUnpack @@ -132,8 +141,7 @@ let inherit pname version meta; src = fetchurl { - url = "https://github.com/wireapp/wire-desktop/releases/download/" - + "macos%2F${version}/Wire.pkg"; + url = "https://github.com/wireapp/wire-desktop/releases/download/macos%2F${version}/Wire.pkg"; inherit hash; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index f23c95feaf..4ed7a286c4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.15.5.20753"; - versions.x86_64-darwin = "5.15.5.20753"; - versions.x86_64-linux = "5.15.5.5603"; + versions.aarch64-darwin = "5.16.1.23158"; + versions.x86_64-darwin = "5.16.1.23158"; + versions.x86_64-linux = "5.16.1.8561"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-yDdmr0lHmhsJpTpvw4Qr4ZUk7SfEZw/53bVL3yV+a/Q="; + hash = "sha256-D3eYHbnNSLLmOh7eIT2+J7PubhBZONqHThB6ibJLqGY="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-qZ5jiNL7I6IHwm1bZ8rgjVwwFJKPeAViQvx+qatGPug="; + hash = "sha256-kvnaHwwWUiJmNsef6H5S/JHHtQgfFJd9rWwzTvi05g0="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-JIS+jxBiW/ek47iz+yCcmoCZ8+UBzEXMC1Yd7Px0ofg="; + hash = "sha256-zT0qGl8ODIcBISiRQ184aVr9hE8ZHnYatolqcsS6dpo="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix index f00caad302..e519b817e1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,11 +5,11 @@ let pname = "zulip"; - version = "5.10.0"; + version = "5.10.3"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - hash = "sha256-rfFEhoykCStFCyBasQV6Cpb5ey+wvQLMXloIR0A1z7g="; + hash = "sha256-AnaW/zH2Vng8lpzv6LHlzCUnNWJoLpsSpmD0iZfteFg="; name="${pname}-${version}.AppImage"; }; @@ -20,6 +20,8 @@ let in appimageTools.wrapType2 { inherit pname version src; + runScript = "appimage-exec.sh -w ${appimageContents} -- \${NIXOS_OZONE_WL:+\${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"; + extraInstallCommands = '' mv "$out/bin/${pname}-${version}" "$out/bin/${pname}" install -m 444 -D ${appimageContents}/zulip.desktop $out/share/applications/zulip.desktop diff --git a/third_party/nixpkgs/pkgs/applications/networking/insync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/insync/default.nix index 282d45513c..4e11d9fe38 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/insync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/insync/default.nix @@ -1,6 +1,6 @@ { lib , writeShellScript -, buildFHSEnv +, buildFHSEnvBubblewrap , stdenvNoCC , fetchurl , autoPatchelfHook @@ -40,11 +40,12 @@ let }; insync-pkg = stdenvNoCC.mkDerivation { - inherit pname version meta; + name = "${pname}-pkg-${version}"; + inherit version meta; src = fetchurl { # Find a binary from https://www.insynchq.com/downloads/linux#ubuntu. - url = "https://cdn.insynchq.com/builds/linux/${pname}_${version}-lunar_amd64.deb"; + url = "https://cdn.insynchq.com/builds/linux/insync_${version}-lunar_amd64.deb"; sha256 = "sha256-BxTFtQ1rAsOuhKnH5vsl3zkM7WOd+vjA4LKZGxl4jk0="; }; @@ -66,7 +67,7 @@ let installPhase = '' runHook preInstall - mkdir -p $out/bin $out/lib $out/share + mkdir -p $out cp -R usr/* $out/ # use system glibc @@ -75,6 +76,9 @@ let # remove badly packaged plugins rm $out/lib/insync/PySide2/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so + # remove the unused vendor wrapper + rm $out/bin/insync + runHook postInstall ''; @@ -82,37 +86,40 @@ let dontStrip = true; }; - insync-fhsenv = buildFHSEnv { - name = "${pname}-${version}"; - inherit meta; +in buildFHSEnvBubblewrap { + name = pname; + inherit meta; - # for including insync's xdg data dirs - extraOutputsToInstall = [ "share" ]; + targetPkgs = pkgs: with pkgs; [ + insync-pkg + libudev0-shim + ]; - targetPkgs = pkgs: with pkgs; [ - insync-pkg - libudev0-shim - ]; - - runScript = writeShellScript "insync-wrapper.sh" '' + runScript = writeShellScript "insync-wrapper.sh" '' # QT_STYLE_OVERRIDE was used to suppress a QT warning, it should have no actual effect for this binary. - export QT_STYLE_OVERRIDE=Fusion + echo Unsetting QT_STYLE_OVERRIDE=$QT_STYLE_OVERRIDE + echo Unsetting QT_QPA_PLATFORMTHEME=$QT_QPA_PLATFORMTHEME + unset QT_STYLE_OVERRIDE + unset QPA_PLATFORMTHEME + # xkb configuration needed: https://github.com/NixOS/nixpkgs/issues/236365 export XKB_CONFIG_ROOT=${xkeyboard_config}/share/X11/xkb/ - exec "${insync-pkg.outPath}/lib/insync/insync" "$@" + echo XKB_CONFIG_ROOT=$XKB_CONFIG_ROOT + + # For debuging: + # export QT_DEBUG_PLUGINS=1 + # find -L /usr/share -name "*insync*" + + exec /usr/lib/insync/insync "$@" ''; - # "insync start" command starts a daemon. - dieWithParent = false; - }; - -in stdenvNoCC.mkDerivation { - inherit pname version meta; - - dontUnpack = true; - installPhase = '' - mkdir -p $out/bin - ln -s ${insync-fhsenv}/bin/${insync-fhsenv.name} $out/bin/insync - ln -s ${insync-pkg}/share $out/share - ''; + # As intended by this bubble wrap, share as much namespaces as possible with user. + unshareUser = false; + unshareIpc = false; + unsharePid = false; + unshareNet = false; + unshareUts = false; + unshareCgroup = false; + # Since "insync start" command starts a daemon, this daemon should die with it. + dieWithParent = false; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs-upload-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs-upload-client/default.nix index 449eab708c..8a06565e1f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipfs-upload-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs-upload-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ipfs-upload-client"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "infura"; repo = "ipfs-upload-client"; rev = "v${version}"; - sha256 = "sha256-O9N2QGQDNk/nwpuJrJKy9arN3gjsBAL+IdghfSaUrCw="; + hash = "sha256-BT/LC+PKzAjxM7P2Iis28OlJmrZRbCwfd6kPEL3oaaI="; }; - vendorSha256 = "sha256-YzIUoN/B4TBlAfmvORrR9Gy+lMzwlaePm8yBoMsPaYU="; + vendorHash = "sha256-YzIUoN/B4TBlAfmvORrR9Gy+lMzwlaePm8yBoMsPaYU="; meta = with lib; { description = "A minimal CLI tool to upload files and directories to IPFS via Infura's IPFS or another API endpoint"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix index d56573d9d7..c3e4fa1b7a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/catgirl/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; description = "A TLS-only terminal IRC client"; platforms = platforms.unix; + mainProgram = "catgirl"; maintainers = with maintainers; [ xfnw ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/halloy/Cargo.lock b/third_party/nixpkgs/pkgs/applications/networking/irc/halloy/Cargo.lock index d76825a848..5d545ee3d1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/halloy/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/halloy/Cargo.lock @@ -70,6 +70,12 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + [[package]] name = "android-activity" version = "0.4.1" @@ -161,13 +167,10 @@ dependencies = [ ] [[package]] -name = "bincode" -version = "1.3.3" +name = "base64" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bit-set" @@ -452,8 +455,9 @@ dependencies = [ [[package]] name = "cosmic-text" -version = "0.8.0" -source = "git+https://github.com/hecrj/cosmic-text.git?rev=e8b10fd675832cb9c1cc9de30922beb4cf883876#e8b10fd675832cb9c1cc9de30922beb4cf883876" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0b68966c2543609f8d92f9d33ac3b719b2a67529b0c6c0b3e025637b477eef9" dependencies = [ "aliasable", "fontdb", @@ -542,7 +546,7 @@ dependencies = [ name = "data" version = "0.1.0" dependencies = [ - "bincode", + "base64", "chrono", "dirs-next", "flate2", @@ -556,6 +560,7 @@ dependencies = [ "rand_chacha", "seahash", "serde", + "serde_json", "serde_yaml", "thiserror", "tokio", @@ -623,70 +628,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "encoding" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -dependencies = [ - "encoding-index-japanese", - "encoding-index-korean", - "encoding-index-simpchinese", - "encoding-index-singlebyte", - "encoding-index-tradchinese", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" - [[package]] name = "errno" version = "0.3.1" @@ -720,9 +661,9 @@ dependencies = [ [[package]] name = "etagere" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6301151a318f367f392c31395beb1cfba5ccd9abc44d1db0db3a4b27b9601c89" +checksum = "fcf22f748754352918e082e0039335ee92454a5d62bcaf69b5e8daf5907d9644" dependencies = [ "euclid", "svg_fmt", @@ -939,9 +880,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "js-sys", @@ -986,8 +927,9 @@ dependencies = [ [[package]] name = "glyphon" -version = "0.2.0" -source = "git+https://github.com/hecrj/glyphon.git?rev=8dbf36020e5759fa9144517b321372266160113e#8dbf36020e5759fa9144517b321372266160113e" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e87caa7459145f5e5f167bf34db4532901404c679e62339fb712a0e3ccf722a" dependencies = [ "cosmic-text", "etagere", @@ -1059,9 +1001,9 @@ dependencies = [ [[package]] name = "half" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9906a89f1724975a455316ae0554ceaa45ad83bb336f1125a87bfbdb9197cfa0" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" dependencies = [ "cfg-if", "crunchy", @@ -1076,7 +1018,9 @@ dependencies = [ "embed-resource", "fern", "iced", + "image", "log", + "once_cell", "open", "palette", "thiserror", @@ -1096,11 +1040,12 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" dependencies = [ "ahash 0.8.3", + "allocator-api2", ] [[package]] @@ -1135,9 +1080,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] name = "hexf-parse" @@ -1171,7 +1116,7 @@ dependencies = [ [[package]] name = "iced" version = "0.9.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/iced-rs/iced?rev=78dc341ea82449f1e075e37e67c1ccf66b88e8d6#78dc341ea82449f1e075e37e67c1ccf66b88e8d6" dependencies = [ "iced_core", "iced_futures", @@ -1185,7 +1130,7 @@ dependencies = [ [[package]] name = "iced_core" version = "0.9.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/iced-rs/iced?rev=78dc341ea82449f1e075e37e67c1ccf66b88e8d6#78dc341ea82449f1e075e37e67c1ccf66b88e8d6" dependencies = [ "bitflags 1.3.2", "instant", @@ -1198,7 +1143,7 @@ dependencies = [ [[package]] name = "iced_futures" version = "0.6.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/iced-rs/iced?rev=78dc341ea82449f1e075e37e67c1ccf66b88e8d6#78dc341ea82449f1e075e37e67c1ccf66b88e8d6" dependencies = [ "futures", "iced_core", @@ -1211,28 +1156,29 @@ dependencies = [ [[package]] name = "iced_graphics" version = "0.8.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/iced-rs/iced?rev=78dc341ea82449f1e075e37e67c1ccf66b88e8d6#78dc341ea82449f1e075e37e67c1ccf66b88e8d6" dependencies = [ "bitflags 1.3.2", "bytemuck", "glam", + "half", "iced_core", "image", "kamadak-exif", "log", "raw-window-handle", "thiserror", - "tiny-skia 0.9.1", ] [[package]] name = "iced_renderer" version = "0.1.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/iced-rs/iced?rev=78dc341ea82449f1e075e37e67c1ccf66b88e8d6#78dc341ea82449f1e075e37e67c1ccf66b88e8d6" dependencies = [ "iced_graphics", "iced_tiny_skia", "iced_wgpu", + "log", "raw-window-handle", "thiserror", ] @@ -1240,7 +1186,7 @@ dependencies = [ [[package]] name = "iced_runtime" version = "0.1.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/iced-rs/iced?rev=78dc341ea82449f1e075e37e67c1ccf66b88e8d6#78dc341ea82449f1e075e37e67c1ccf66b88e8d6" dependencies = [ "iced_core", "iced_futures", @@ -1250,7 +1196,7 @@ dependencies = [ [[package]] name = "iced_style" version = "0.8.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/iced-rs/iced?rev=78dc341ea82449f1e075e37e67c1ccf66b88e8d6#78dc341ea82449f1e075e37e67c1ccf66b88e8d6" dependencies = [ "iced_core", "once_cell", @@ -1260,7 +1206,7 @@ dependencies = [ [[package]] name = "iced_tiny_skia" version = "0.1.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/iced-rs/iced?rev=78dc341ea82449f1e075e37e67c1ccf66b88e8d6#78dc341ea82449f1e075e37e67c1ccf66b88e8d6" dependencies = [ "bytemuck", "cosmic-text", @@ -1270,14 +1216,14 @@ dependencies = [ "raw-window-handle", "rustc-hash", "softbuffer", - "tiny-skia 0.9.1", + "tiny-skia 0.10.0", "twox-hash", ] [[package]] name = "iced_wgpu" version = "0.10.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/iced-rs/iced?rev=78dc341ea82449f1e075e37e67c1ccf66b88e8d6#78dc341ea82449f1e075e37e67c1ccf66b88e8d6" dependencies = [ "bitflags 1.3.2", "bytemuck", @@ -1297,7 +1243,7 @@ dependencies = [ [[package]] name = "iced_widget" version = "0.1.0" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/iced-rs/iced?rev=78dc341ea82449f1e075e37e67c1ccf66b88e8d6#78dc341ea82449f1e075e37e67c1ccf66b88e8d6" dependencies = [ "iced_renderer", "iced_runtime", @@ -1311,7 +1257,7 @@ dependencies = [ [[package]] name = "iced_winit" version = "0.9.1" -source = "git+https://github.com/tarkah/iced?rev=d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65#d73dba1f1c2dda7f58c9983e7ee8fbac6f563a65" +source = "git+https://github.com/iced-rs/iced?rev=78dc341ea82449f1e075e37e67c1ccf66b88e8d6#78dc341ea82449f1e075e37e67c1ccf66b88e8d6" dependencies = [ "iced_graphics", "iced_runtime", @@ -1372,44 +1318,31 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.1", + "hermit-abi 0.3.2", "libc", "windows-sys 0.48.0", ] [[package]] name = "irc" -version = "0.15.0" -source = "git+https://github.com/aatxe/irc.git?rev=8eef9c56881670aa614782ab4321fb8ae3975fa0#8eef9c56881670aa614782ab4321fb8ae3975fa0" +version = "0.1.0" dependencies = [ - "chrono", - "encoding", - "futures-util", - "irc-proto", - "log", - "native-tls", - "parking_lot 0.12.1", - "pin-project", - "serde", - "serde_derive", + "bytes", + "futures", + "irc_proto", "thiserror", "tokio", "tokio-native-tls", - "tokio-stream", "tokio-util", - "toml", ] [[package]] -name = "irc-proto" -version = "0.15.0" -source = "git+https://github.com/aatxe/irc.git?rev=8eef9c56881670aa614782ab4321fb8ae3975fa0#8eef9c56881670aa614782ab4321fb8ae3975fa0" +name = "irc_proto" +version = "0.1.0" dependencies = [ - "bytes", - "encoding", + "itertools", + "nom", "thiserror", - "tokio", - "tokio-util", ] [[package]] @@ -1440,6 +1373,12 @@ dependencies = [ "either", ] +[[package]] +name = "itoa" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + [[package]] name = "jni-sys" version = "0.3.0" @@ -1516,9 +1455,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libloading" @@ -1576,11 +1515,11 @@ checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de" [[package]] name = "lru" -version = "0.9.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" +checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.0", ] [[package]] @@ -1991,9 +1930,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.54" +version = "0.10.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b3f656a17a6cbc115b5c7a40c616947d213ba182135b014d6051b73ab6f019" +checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -2023,9 +1962,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.88" +version = "0.9.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2ce0f250f34a308dcfdbb351f511359857d4ed2134ba715a4eadd46e1ffd617" +checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" dependencies = [ "cc", "libc", @@ -2602,6 +2541,17 @@ dependencies = [ "syn 2.0.18", ] +[[package]] +name = "serde_json" +version = "1.0.99" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +dependencies = [ + "itoa", + "ryu", + "serde", +] + [[package]] name = "serde_spanned" version = "0.6.2" @@ -2900,9 +2850,9 @@ dependencies = [ [[package]] name = "tiny-skia" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2986c82f77818c7b9144c70818fdde98db15308e329ae2f7204d767808fd3c" +checksum = "7db11798945fa5c3e5490c794ccca7c6de86d3afdd54b4eb324109939c6f37bc" dependencies = [ "arrayref", "arrayvec", @@ -2910,7 +2860,7 @@ dependencies = [ "cfg-if", "log", "png", - "tiny-skia-path 0.9.0", + "tiny-skia-path 0.10.0", ] [[package]] @@ -2926,9 +2876,9 @@ dependencies = [ [[package]] name = "tiny-skia-path" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7acb0ccda1ac91084353a56d0b69b0e29c311fd809d2088b1ed2f9ae1841c47" +checksum = "2f60aa35c89ac2687ace1a2556eaaea68e8c0d47408a2e3e7f5c98a489e7281c" dependencies = [ "arrayref", "bytemuck", @@ -2952,21 +2902,35 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.2" +version = "1.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2" +checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" dependencies = [ "autocfg", + "backtrace", "bytes", "libc", "mio", "num_cpus", + "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", "socket2", + "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.18", +] + [[package]] name = "tokio-native-tls" version = "0.3.1" diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/halloy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/halloy/default.nix index a1d5a38947..eb54490c60 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/halloy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/halloy/default.nix @@ -2,6 +2,8 @@ , stdenv , darwin , fetchFromGitHub +, copyDesktopItems +, makeDesktopItem , libxkbcommon , openssl , pkg-config @@ -13,27 +15,25 @@ rustPlatform.buildRustPackage rec { pname = "halloy"; - version = "23.1-alpha1"; + version = "2023.4"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; rev = "refs/tags/${version}"; - hash = "sha256-Aq+mKctmc1RwpnUEIi+Zmr4o8n6wgQchGCunPWouLsE="; + hash = "sha256-j5Yw7rXdNd32RnbV2jQ+ZUjbm14AKZ7khQNX6A+qPAM="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "cosmic-text-0.8.0" = "sha256-p8PtXcFH+T3z6wWPFYbHFkxrkJpK4oHJ1aJvq4zld/4="; - "glyphon-0.2.0" = "sha256-7h5W82zPMw9PVZiF5HCo7HyRiVhGR8MsfgGuIjo+Kfg="; - "iced-0.9.0" = "sha256-KEBm62lDjSKXvXZssLoBfUYDSW+OpTXutxsKZMz8SE0="; - "irc-0.15.0" = "sha256-ZlwfyX4tmQr9D+blY4jWl85bwJ2tXUYp3ryLqoungII="; + "iced-0.9.0" = "sha256-z/tkUdFXNjxR5Si8dnNrkrvFos0VAqGjnFNSs88D/5w="; "winit-0.28.6" = "sha256-szB1LCOPmPqhZNIWbeO8JMfRMcMRr0+Ze0f4uqyR8AE="; }; }; nativeBuildInputs = [ + copyDesktopItems pkg-config ]; @@ -57,6 +57,25 @@ rustPlatform.buildRustPackage rec { wayland ]; + desktopItems = [ + (makeDesktopItem { + name = "org.squidowl.halloy"; + desktopName = "Halloy"; + comment = "IRC client written in Rust"; + icon = "org.squidowl.halloy"; + exec = pname; + terminal = false; + mimeTypes = [ "x-scheme-handler/irc" "x-scheme-handler/ircs" ]; + categories = [ "Network" "IRCClient" ]; + keywords = [ "IM" "Chat" ]; + startupWMClass = "org.squidowl.halloy"; + }) + ]; + + postInstall = '' + install -Dm644 assets/linux/org.squidowl.halloy.png $out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png + ''; + meta = with lib; { description = "IRC application"; homepage = "https://github.com/squidowl/halloy"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix index 523573e311..d95b64f042 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "irssi"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "irssi"; repo = "irssi"; rev = version; - hash = "sha256-a/+9M2zoywZBdOfXHrA4O6Q9W7HJZNTthB/aseUNefA="; + hash = "sha256-D+KMjkweStMqVhoQoiJPFt/G0vdf7x2FjYCvqGS8UqY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix index 3e87b2aa1d..eaefa41a66 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-q167og8S8YbLcREZ7DVbJhjMzx4iO0WgIFkOV2IpieM="; }; - vendorSha256 = "sha256-PkoEHQEGKCiNbJsm7ieL65MtEult/wubLreJKA1gGpg="; + vendorHash = "sha256-PkoEHQEGKCiNbJsm7ieL65MtEult/wubLreJKA1gGpg="; subPackages = [ "cmd/senpai" diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix index 6d0cfdccde..8136324770 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.0.4"; + version = "4.0.5"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-rl9JebWtoDObhOdB1ffkge6R4/7NQKCZB7ZHUYKetvY="; + hash = "sha256-PXLmGwVjHavcKDIxdo+TioVUSyfjH6v+E8V7TfXF47s="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 2ae0e2abce..c1b9b9fd60 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wee-slack"; - version = "2.9.1"; + version = "2.10.1"; src = fetchFromGitHub { repo = "wee-slack"; owner = "wee-slack"; rev = "v${version}"; - sha256 = "sha256-f5CRJmvNZlKOE1XsU214R42dYo0s5xSRXC8TKOniEf4="; + sha256 = "sha256-J4s7+JFd/y1espp3HZCs48++fhN6lmpaglGkgomtf3o="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix b/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix index b4f33a4e0e..d0542f5c3e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "3.2.0"; + version = "3.2.3"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "juju-${version}"; - sha256 = "sha256-wm6yWxGFQBlNtFfL1PnUuljy6ODOboiyND4cqPjl1nM="; + sha256 = "sha256-sUlM4bLy/kluZmGOzMACz92GG46XYKicNPP5k2FPSGA="; }; - vendorHash = "sha256-ll0qm0noD1Zox8uOlp2Rr/sFFzQlJlpss4Ot3LQn/g4="; + vendorHash = "sha256-mPEixXVuxAqgkBoNqIYnZaFJynHJsnmamaHqyh/svwQ="; # Disable tests because it attempts to use a mongodb instance doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ktailctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ktailctl/default.nix new file mode 100644 index 0000000000..e166e156da --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/ktailctl/default.nix @@ -0,0 +1,83 @@ +{ lib +, stdenv +, fetchFromGitHub +, buildGo121Module +, cmake +, extra-cmake-modules +, git +, go_1_21 +, wrapQtAppsHook +, qtbase +, qtquickcontrols2 +, kconfig +, kcoreaddons +, kguiaddons +, ki18n +, kirigami2 +, kirigami-addons +, knotifications +}: + +let + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "f-koehler"; + repo = "KTailctl"; + rev = "v${version}"; + hash = "sha256-nY6DEHkDVWIlvc64smXb9KshrhNgNLKiilYydbMKCqc="; + }; + + goDeps = (buildGo121Module { + pname = "tailwrap"; + inherit src version; + modRoot = "tailwrap"; + vendorHash = "sha256-Y9xhoTf3vCtiNi5qOPg020EQmASo58BZI3rAoUEC8qE="; + }).goModules; +in stdenv.mkDerivation { + pname = "ktailctl"; + inherit version src; + + postPatch = '' + cp -r --reflink=auto ${goDeps} tailwrap/vendor + ''; + + # needed for go build to work + preBuild = '' + export HOME=$TMPDIR + ''; + + cmakeFlags = [ + # actually just disables Go vendoring updates + "-DKTAILCTL_FLATPAK_BUILD=ON" + ]; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + git + go_1_21 + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtquickcontrols2 + kconfig + kcoreaddons + kguiaddons + ki18n + kirigami2 + kirigami-addons + knotifications + ]; + + meta = with lib; { + description = "A GUI to monitor and manage Tailscale on your Linux desktop"; + homepage = "https://github.com/f-koehler/KTailctl"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ k900 ]; + mainProgram = "ktailctl"; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/all-migrations.nix b/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/all-migrations.nix index 39a9f141c7..54ae2551ca 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/all-migrations.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/all-migrations.nix @@ -14,7 +14,7 @@ let inherit pname version; inherit (kubo-migrator-unwrapped) src; sourceRoot = "${kubo-migrator-unwrapped.src.name}/${pname}"; - vendorSha256 = null; + vendorHash = null; # Fix build on Go 1.17 and later: panic: qtls.ClientHelloInfo doesn't match # See https://github.com/ipfs/fs-repo-migrations/pull/163 postPatch = lib.optionalString (lib.elem pname [ "fs-repo-10-to-11" "fs-repo-11-to-12" ]) '' @@ -36,8 +36,9 @@ let }; # Concatenation of the latest repo version and the version of that migration - version = "14.1.0.0"; + version = "15.1.0.1"; + fs-repo-14-to-15 = fs-repo-common "fs-repo-14-to-15" "1.0.1"; fs-repo-13-to-14 = fs-repo-common "fs-repo-13-to-14" "1.0.0"; fs-repo-12-to-13 = fs-repo-common "fs-repo-12-to-13" "1.0.0"; fs-repo-11-to-12 = fs-repo-common "fs-repo-11-to-12" "1.0.2"; @@ -54,6 +55,7 @@ let fs-repo-0-to-1 = fs-repo-common "fs-repo-0-to-1" "1.0.1"; all-migrations = [ + fs-repo-14-to-15 fs-repo-13-to-14 fs-repo-12-to-13 fs-repo-11-to-12 diff --git a/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/unwrapped.nix index d5dc1421a5..1e63c5852c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/kubo-migrator/unwrapped.nix @@ -11,12 +11,12 @@ buildGoModule rec { owner = "ipfs"; repo = "fs-repo-migrations"; # Use the latest git tag here, since v2.0.2 does not - # contain the latest migration fs-repo-13-to-14/v1.0.0 + # contain the latest migration fs-repo-14-to-15/v1.0.1 # The fs-repo-migrations code itself is the same between # the two versions but the migration code, which is built # into separate binaries, is not. - rev = "fs-repo-13-to-14/v1.0.0"; - hash = "sha256-y0IYSKKZlFbPrTUC6XqYKhS3a79rieNGBL58teWMlC4="; + rev = "fs-repo-14-to-15/v1.0.1"; + hash = "sha256-oIGDZr0cv+TIl5glHr3U+eIqAlPAOWyFzgfQGGM+xNM="; }; sourceRoot = "${src.name}/fs-repo-migrations"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/kubo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/kubo/default.nix index dccd827b12..defb898b44 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/kubo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/kubo/default.nix @@ -1,4 +1,8 @@ -{ lib, buildGoModule, fetchurl, nixosTests, openssl, pkg-config }: +{ lib +, buildGoModule +, fetchurl +, nixosTests +}: buildGoModule rec { pname = "kubo"; @@ -7,7 +11,7 @@ buildGoModule rec { passthru.repoVersion = "14"; # Also update kubo-migrator when changing the repo version - # Kubo makes changes to it's source tarball that don't match the git source. + # Kubo makes changes to its source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; hash = "sha256-TX5ZM8Kyj3LZ12Ro7MsHRd+P5XLk/mU7DUxZaopSEV0="; @@ -27,7 +31,7 @@ buildGoModule rec { passthru.tests.kubo = nixosTests.kubo; - vendorSha256 = null; + vendorHash = null; outputs = [ "out" "systemd_unit" "systemd_unit_hardened" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/libcoap/default.nix b/third_party/nixpkgs/pkgs/applications/networking/libcoap/default.nix index 673b864630..6899e6f485 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/libcoap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/libcoap/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { pname = "libcoap"; - version = "4.3.1"; + version = "4.3.3"; src = fetchFromGitHub { repo = "libcoap"; owner = "obgm"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-4XcAo5StyYIfe9wD0cPHKFZalMcBAuiVV2qFZ126KT8="; + sha256 = "sha256-RS37Fpo1uzwEKzCysilXiH/NYOySEYGPOk0R/+rqiag="; }; nativeBuildInputs = [ automake diff --git a/third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix index ed2817ed10..019da46951 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/localproxy/default.nix @@ -3,37 +3,38 @@ , fetchFromGitHub , cmake , openssl -, protobuf3_19 +, protobuf3_21 , catch2 , boost181 , icu }: let boost = boost181.override { enableStatic = true; }; + protobuf = protobuf3_21.override { enableShared = false; }; in stdenv.mkDerivation (finalAttrs: { pname = "localproxy"; version = "3.1.0"; - src = fetchFromGitHub { - owner = "aws-samples"; - repo = "aws-iot-securetunneling-localproxy"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ec72bvBkRBj4qlTNfzNPeQt02OfOPA8y2PoejHpP9cY="; - }; + src = fetchFromGitHub { + owner = "aws-samples"; + repo = "aws-iot-securetunneling-localproxy"; + rev = "v${finalAttrs.version}"; + hash = "sha256-ec72bvBkRBj4qlTNfzNPeQt02OfOPA8y2PoejHpP9cY="; + }; nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl protobuf3_19 catch2 boost icu ]; + buildInputs = [ openssl protobuf catch2 boost icu ]; # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; - meta = with lib; { - description = "AWS IoT Secure Tunneling Local Proxy Reference Implementation C++"; - homepage = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy"; - license = licenses.asl20; - maintainers = with maintainers; [spalf]; - platforms = platforms.unix; - }; - }) + meta = with lib; { + description = "AWS IoT Secure Tunneling Local Proxy Reference Implementation C++"; + homepage = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy"; + license = licenses.asl20; + maintainers = with maintainers; [ spalf ]; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/localsend/default.nix b/third_party/nixpkgs/pkgs/applications/networking/localsend/default.nix index 5dfb520b55..87e0eb25dd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/localsend/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/localsend/default.nix @@ -2,17 +2,23 @@ let pname = "localsend"; - version = "1.10.0"; + version = "1.11.1"; - srcs = { + hashes = { + x86_64-linux = "sha256-K4M9cks0FNsCLIqQhSgUAz3tRMKng6JkZ/ZfwG2hZJA="; + x86_64-darwin = "sha256-Cixo00I4BBAmUnszsz+CxPX3EY175UTufCmwQmIsEgg="; + }; + + srcs = rec { x86_64-linux = fetchurl { url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}-linux-x86-64.AppImage"; - hash = "sha256-5MxLQG704bVfaW2tCI6BeFmd8X9Xnn1xWPeIGKZv3P8="; + hash = hashes.x86_64-linux; }; x86_64-darwin = fetchurl { url = "https://github.com/localsend/localsend/releases/download/v${version}/LocalSend-${version}.dmg"; - hash = "sha256-IASoA56Vzec+O62CjSM+2Q8XJJzpEK7hsI3L7R1+Izc="; + hash = hashes.x86_64-darwin; }; + aarch64-darwin = x86_64-darwin; }; src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system for package localsend: ${stdenv.hostPlatform.system}"); diff --git a/third_party/nixpkgs/pkgs/applications/networking/localsend/update.sh b/third_party/nixpkgs/pkgs/applications/networking/localsend/update.sh new file mode 100755 index 0000000000..55c391c6fb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/localsend/update.sh @@ -0,0 +1,25 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=./. -i bash -p curl gnused + +set -eou pipefail + +ROOT="$(dirname "$(readlink -f "$0")")" + +latestVersion=$(curl --fail --silent https://api.github.com/repos/localsend/localsend/releases/latest | jq --raw-output .tag_name | sed 's/^v//') + +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; localsend.version or (lib.getVersion localsend)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +sed -i "s/version = \".*\"/version = \"${latestVersion}\"/" "$ROOT/default.nix" + +LINUX_x64_URL="https://github.com/localsend/localsend/releases/download/v${latestVersion}/LocalSend-${latestVersion}-linux-x86-64.AppImage" +LINUX_X64_SHA=$(nix hash to-sri --type sha256 $(nix-prefetch-url ${LINUX_x64_URL})) +sed -i "0,/x86_64-linux/{s|x86_64-linux = \".*\"|x86_64-linux = \"${LINUX_X64_SHA}\"|}" "$ROOT/default.nix" + +DARWIN_x64_URL="https://github.com/localsend/localsend/releases/download/v${latestVersion}/LocalSend-${latestVersion}.dmg" +DARWIN_X64_SHA=$(nix hash to-sri --type sha256 $(nix-prefetch-url ${DARWIN_x64_URL})) +sed -i "0,/x86_64-darwin/{s|x86_64-darwin = \".*\"|x86_64-darwin = \"${DARWIN_X64_SHA}\"|}" "$ROOT/default.nix" diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix index 0ee5228d12..4ca892d131 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -12,19 +12,17 @@ buildGoModule rec { pname = "aerc"; - version = "0.15.2"; + version = "0.16.0"; src = fetchFromSourcehut { owner = "~rjarry"; repo = "aerc"; rev = version; - hash = "sha256-OQDA4AHDcAdDzpwNSi8rW1FKjfYaFktOwiM0FEHPd70="; + hash = "sha256-vmr2U0bz6A7aMZZBtOitA5gKQpXKuNhYxRCmholHYa8="; }; proxyVendor = true; - vendorHash = "sha256-NWOySC0czNgNOakpxFguZLtmEI7AvjJQKXDE2vFWeZg="; - - doCheck = false; + vendorHash = "sha256-j/wTmlVcyVI4gnjbi7KLzk5rdnZtZLrdSNbihtQJxRY="; nativeBuildInputs = [ scdoc @@ -74,6 +72,7 @@ buildGoModule rec { description = "An email client for your terminal"; homepage = "https://aerc-mail.org/"; maintainers = with maintainers; [ tadeokondrak ]; + mainProgram = "aerc"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix index d08bd5dfcc..40292268a5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -12,13 +12,13 @@ let thunderbird-unwrapped = thunderbirdPackages.thunderbird-102; - version = "102.12.0"; + version = "102.15.1"; majVer = lib.versions.major version; betterbird-patches = fetchFromGitHub { owner = "Betterbird"; repo = "thunderbird-patches"; - rev = "${version}-bb37"; + rev = "${version}-bb41"; postFetch = '' echo "Retrieving external patches" @@ -36,7 +36,7 @@ let . ./external.sh rm external.sh ''; - sha256 = "sha256-LH0dgWqariutfaOCPIUZrHzZ8oCbZF1VaaKQIQS4aL8="; + hash = "sha256-fP763ec4B8LbivzmYHzQ4j39QMxWrymqI8chXfF3KX8="; }; in ((buildMozillaMach { pname = "betterbird"; @@ -49,7 +49,7 @@ in ((buildMozillaMach { src = fetchurl { # https://download.cdn.mozilla.net/pub/thunderbird/releases/ url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "303787a8f22a204e48784d54320d5f4adaeeeedbe4c2294cd26ad75792272ffc9453be7f0ab1434214b61a2cc46982c23c4fd447c4d80d588df4a7800225ddee"; + hash = "sha256-og1Tu7PAHOqGs02jkHU291BCGuKDy1J+72v4Gsu4oDg="; }; extraPostPatch = thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' @@ -102,6 +102,7 @@ in ((buildMozillaMach { meta = with lib; { description = "Betterbird is a fine-tuned version of Mozilla Thunderbird, Thunderbird on steroids, if you will"; homepage = "https://www.betterbird.eu/"; + mainProgram = "betterbird"; maintainers = with maintainers; [ SuperSandro2000 ]; inherit (thunderbird-unwrapped.meta) platforms badPlatforms broken license; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix index d750937c3e..cc2f5c9192 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/hasmail/default.nix @@ -15,10 +15,10 @@ buildGoModule rec { owner = "jonhoo"; repo = "hasmail"; rev = "eb52536d26815383bfe5990cd5ace8bb9d036c8d"; - sha256 = "1p6kwa5xk1mb1fkkxz1b5rcyp5kb4zc8nfif1gk6fab6wbdj9ia1"; + hash = "sha256-QcUk2+JmKWfmCy46i9gna5brWS4r/D6nC6uG2Yvi09w="; }; - vendorSha256 = "129hvr8qh5mxj6mzg7793p5jsi4jmsm96f63j7r8wn544yq8sqci"; + vendorHash = "sha256-kWGNsCekWI7ykcM4k6qukkQtyx3pnPerkb0WiFHeMIk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix index d0072a00c5..3a9e2db3ec 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, openssl, lua, pcre2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "imapfilter"; version = "2.8.1"; src = fetchFromGitHub { owner = "lefcha"; repo = "imapfilter"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-nHKZ3skRbDhKWocaw5mbaRnZC37FxFIVd08iFgrEA0s="; }; makeFlags = [ @@ -24,4 +24,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ doronbehar ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix index 9b5adb3a97..4f61935faa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -99,5 +99,6 @@ stdenv.mkDerivation rec { homepage = "https://getmailspring.com"; downloadPage = "https://github.com/Foundry376/Mailspring"; platforms = [ "x86_64-linux" ]; + knownVulnerabilities = [ "CVE-2023-4863" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix new file mode 100644 index 0000000000..1ce4c39da7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/meli/default.nix @@ -0,0 +1,79 @@ +{ stdenv +, lib +, fetchgit +, rustPlatform + +# native build inputs +, pkg-config +, installShellFiles +, makeWrapper +, mandoc +, rustfmt +, file + +# build inputs +, openssl +, dbus +, sqlite + +# runtime deps +, gnum4 +}: + +rustPlatform.buildRustPackage rec { + pname = "meli"; + version = "0.8.2"; + + src = fetchgit { + url = "https://git.meli.delivery/meli/meli.git"; + rev = "v${version}"; + hash = "sha256-iEHTFofga/HV/1jSAqTsqV55zC22tqI7UW7m4PZgz0M="; + }; + + cargoHash = "sha256-ijlivyBezLECBSaWBYVy9tVcSO8U+yGDQyU4dIATR6k="; + + nativeBuildInputs = [ + pkg-config + installShellFiles + makeWrapper + mandoc + (rustfmt.override { asNightly = true; }) + ]; + + buildInputs = [ + openssl + dbus + sqlite + ]; + + nativeCheckInputs = [ + file + ]; + + postInstall = '' + installManPage meli/docs/*.{1,5,7} + + wrapProgram $out/bin/meli \ + --prefix PATH : ${lib.makeBinPath [ gnum4 ]} + ''; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + checkFlags = [ + "--skip=conf::test_config_parse" # panicking due to sandbox + "--skip=smtp::test::test_smtp" # requiring network + "--skip=utils::xdg::query_default_app" # doesn't build + "--skip=utils::xdg::query_mime_info" # doesn't build + ]; + + meta = with lib; { + broken = (stdenv.isLinux && stdenv.isAarch64); + description = "Terminal e-mail client and e-mail client library"; + homepage = "https://meli.delivery"; + license = licenses.gpl3; + maintainers = with maintainers; [ _0x4A6F matthiasbeyer ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mswatch/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mswatch/default.nix index 2706b9c459..f7ba4bb1bf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mswatch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mswatch/default.nix @@ -8,7 +8,7 @@ , glib }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "mswatch"; # Stable release won't compile successfully version = "unstable-2018-11-21"; @@ -35,4 +35,4 @@ stdenv.mkDerivation { platforms = platforms.linux; maintainers = with maintainers; [ doronbehar ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix index 81e6986fc5..6674e957cb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -23,12 +23,12 @@ assert gpgmeSupport -> sslSupport; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.2.11"; + version = "2.2.12"; outputs = [ "out" "doc" "info" ]; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - hash = "sha256-EjJc9m1f+KxL2H+sjbUshp3lLdJ4/DAc/VfVofn0Zcw="; + hash = "sha256-BDrzEvZLjlb3/Qv3f4SiBdTEmAML2VhkV2ZcR7sYzjg="; }; patches = [ @@ -103,6 +103,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A small but very powerful text-based mail client"; homepage = "http://www.mutt.org"; + mainProgram = "mutt"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix index 77bf4db16f..9ac8c83dc5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which +{ lib, stdenv, fetchFromGitHub, fetchpatch, gettext, makeWrapper, tcl, which , ncurses, perl , cyrus_sasl, gss, gpgme, libkrb5, libidn2, libxml2, notmuch, openssl , lua, lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, w3m, mailcap, sqlite, zlib, lndir , pkg-config, zstd, enableZstd ? true, enableMixmaster ? false, enableLua ? false @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/neomutt/neomutt/issues/3773#issuecomment-1493295144 ./fix-open-very-large-mailbox.patch + (fetchpatch { + name = "disable-incorrect-tests.patch"; + url = "https://github.com/neomutt/neomutt/pull/3933.patch"; + hash = "sha256-Plei063T8XyXF4/7/nAb6/4OyXz72vBAXHwls9WL1vM="; + excludes = [".github/workflows/macos.yml"]; + }) ]; buildInputs = [ @@ -112,7 +118,7 @@ stdenv.mkDerivation rec { description = "A small but very powerful text-based mail client"; homepage = "http://www.neomutt.org"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 raitobezarius ]; + maintainers = with maintainers; [ erikryb jfrankenau vrthra ma27 raitobezarius ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix index 743f8eaa9f..87ad4a015f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -7,6 +7,7 @@ , emacs , ruby , testers +, gitUpdater , which, dtach, openssl, bash, gdb, man, git , withEmacs ? true , withRuby ? true @@ -15,11 +16,11 @@ stdenv.mkDerivation rec { pname = "notmuch"; - version = "0.37"; + version = "0.38"; src = fetchurl { url = "https://notmuchmail.org/releases/notmuch-${version}.tar.xz"; - sha256 = "sha256-DnZt8ot4v064I1Ymqx9S8E8eNmZJMlqM6NPJCGAnhvY="; + sha256 = "sha256-oXkBrb5D9IGmv1PBWiogJovI3HrVzPaFoNF8FFbbr24="; }; nativeBuildInputs = [ @@ -102,10 +103,11 @@ stdenv.mkDerivation rec { checkTarget = "test"; nativeCheckInputs = [ which dtach openssl bash - gdb man emacs + gdb man ] # for the test T-850.sh for notmuch-git, which is skipped when notmuch is # built without sexp-support + ++ lib.optional withEmacs emacs ++ lib.optional withSfsexp git; installTargets = [ "install" "install-man" "install-info" ]; @@ -130,11 +132,17 @@ stdenv.mkDerivation rec { pythonSourceRoot = "notmuch-${version}/bindings/python"; tests.version = testers.testVersion { package = notmuch; }; inherit version; + + updateScript = gitUpdater { + url = "https://git.notmuchmail.org/git/notmuch"; + ignoredVersions = "_rc.*"; + }; }; meta = with lib; { description = "Mail indexer"; homepage = "https://notmuchmail.org/"; + changelog = "https://git.notmuchmail.org/git?p=notmuch;a=blob_plain;f=NEWS;hb=${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ flokli puckipedia ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 6b71de09ab..9848815089 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -213,6 +213,7 @@ stdenv.mkDerivation { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; description = "Mozilla Thunderbird, a full-featured email client (binary package)"; homepage = "http://www.mozilla.org/thunderbird/"; + mainProgram = "thunderbird"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mpl20; maintainers = with lib.maintainers; [ lovesegfault ]; 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 698a418f27..9738a3dc8f 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 = "115.1.1"; + version = "115.3.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/af/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/af/thunderbird-115.3.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "872d8cd7580c31e60a8524e3e55a40907e4245192adc43411d9c343badb917bc"; + sha256 = "cebe0180a4a11d1a0d5478347ff1e80e8ba8217fdfde0ffc11e58c7b8a1da039"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ar/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ar/thunderbird-115.3.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "0d53090a0100b42c3b8493fea6b32308a475cabea5a54d27baf4b3313edd645c"; + sha256 = "ebc9d82cf60a18c1c9de514449aa9b4dc6e60c67c40be6a1de679354ab1ddb89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ast/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ast/thunderbird-115.3.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "8e8dc261496632d336bc003df8e9ecf63e1b1002f5357097f4d8aee91cb803b5"; + sha256 = "130b99f167f3e56c8f85da354da70bceaecb7559fc524d2a0d30125557fbe925"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/be/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/be/thunderbird-115.3.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "a48c0efcc48ffea6052beb5a6be8f3155f010bfb1269bbd829d4c1026af9b562"; + sha256 = "d72f73e2dfcd9e3ef9477f4e1ddbfb478d3b2b069107128a28d0f22a939c8ab8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/bg/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/bg/thunderbird-115.3.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "dd3674ce73ad8f7cf40f2da27018104b7c3161b92ddb050bb19660fb6a4344ba"; + sha256 = "58cde7ac9d2089b05f521505309249033773d7c366dfebda06043656c53afd09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/br/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/br/thunderbird-115.3.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "b0c6616fb7f3f5a74ac782e3d67980e88bfb7a3773688cde9c781bcac4c0e7da"; + sha256 = "3cb367bbca0965f42168798e6e18573edf6aa8a65ca6f99d2f31ae2393b7848e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ca/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ca/thunderbird-115.3.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "d297889e32a16375306a5c8806d2fef7ee43b55d2b7209130cda174f9b26da6e"; + sha256 = "18014fb63aab93646bbfe8af40a8a72c6ddac77ef5e0ccbf7fb4fc4aa2e64501"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/cak/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/cak/thunderbird-115.3.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "546e3f398171a5183e3e631e67510479a4e6c93bdc816e766fc01ec275ddb948"; + sha256 = "9c604f7ce4e1245b4fa78e67b9ee91bd5fe93f2e23618f6cc0ebed6235b3bff8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/cs/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/cs/thunderbird-115.3.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "6ec212531f9fa449ead2b7cb0ef12b4539a89111a61b9e110898fdda25a3ea48"; + sha256 = "92b20cbe5c985338a2d690690ee7b84ebe53630383b3c88c2d54d5baa81616ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/cy/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/cy/thunderbird-115.3.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "4b76d0f87ee13952e92997c353effb1600eec640233bf047850873ee3f81a276"; + sha256 = "8ce9601654779de2319671565602bacd407c50834c3a7d9c3eed7663cd2dfda1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/da/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/da/thunderbird-115.3.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "28ce47778c87ea5dfe147a1598a179a3f3f1c2e65dde87e6a0ef97eb502c12d2"; + sha256 = "27efa3be6f134494ac05c91c2b7fd55c64c4df41a10eecad1edabb72b8ad1f1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/de/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/de/thunderbird-115.3.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "47863c8bc2c0879c4eaf80462088995775a511596d4bf0a427b5c1d61afb6cf5"; + sha256 = "8b22cc8e30eba91349db1b6bb51425efc14684a78e5c55026d7be7741e42b7a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/dsb/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/dsb/thunderbird-115.3.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "8736176caf4bb23036f92b21f4f26e078fc2a63b4ecd14b9feba2f76bd59963a"; + sha256 = "a7a1aa4ea136eca7a564982aeff809b79f7e23e305a93a44361c876ad6eb72e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/el/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/el/thunderbird-115.3.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "6521361499b1ba1f9d187ec0e2650258d3acc859abf2a0663d0412eab71ac7c1"; + sha256 = "ff374034283855af4cb9e16e5680748bd7fc084c9a6c1f4c4f39087adde88d01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/en-CA/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/en-CA/thunderbird-115.3.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "f6739c95c4cc08bdd34608b60c7c80de78c021ecc56ce8189f68e1decbed3daa"; + sha256 = "1e06132986b4ad668d3ae053c77964b3aeb191e5bac16b3d54621a69c29c3906"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/en-GB/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/en-GB/thunderbird-115.3.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "79924357ed316530bd5ba51b433ff85536f5b28b6695e453421f18473c5c11fb"; + sha256 = "12c1eeef9790b976fd3da5aadca9912ffa0951cf20cb1ea9be9cb5ecd2b262f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/en-US/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/en-US/thunderbird-115.3.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "f64d1d997b67feb35d650c888ddc0bbff8a3864f30449088d4a519c8f845024c"; + sha256 = "f12ece3d4df211e785d67ada46bdf239be68a2dd00118b15063c9fb12d5faaa2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/es-AR/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/es-AR/thunderbird-115.3.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "53c20ba1f88865138b23b519f733b70baef27df7c4f6c51b3e9756e2f311f7a9"; + sha256 = "a232bcc945cb551e2633c1eb1876eb849d3dec5176640419245cedcac6c5cc09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/es-ES/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/es-ES/thunderbird-115.3.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "0c0fb320b95b68816bce731bab89a5839d8e23bd8167f7f9da0903340611c03d"; + sha256 = "c9a0ee9373ad30d8aa0280681b95eb8de72baa1b3cb09bc25ab9a4bde82fe88c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/es-MX/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/es-MX/thunderbird-115.3.1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "a3c8abf11b6db215454747a4f306f12eb38aa9dae60244938bb9b888dfb16f1f"; + sha256 = "5b44241ce4e34c15346e229e9898f545acb298ddd8ed58ff95ceadd79e0b4d11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/et/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/et/thunderbird-115.3.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5cd8a13208f85627396a50ea2de03c0254596dafc01f6770b2e3ea5978d94f25"; + sha256 = "cdf87430b8f78f53c8b1bb94a577e8d06e85a619f41e69f9fb7d33f707c3e4d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/eu/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/eu/thunderbird-115.3.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "d117e7ff7d0ecd8c0075084ba35ab718f46f564cef3bf0afdbaa5db725143600"; + sha256 = "12f04c6677f0b37edd4daae6fde22b6ef0368e122d43434bdc80689e23923384"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/fi/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/fi/thunderbird-115.3.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "d9811df05161c13c2908fec18b86249108996a3355a44e0a098d92542392ea05"; + sha256 = "47d42496f5a3904ded0f0503e682e06dc0caad999103ecbf58a43df05ba94c55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/fr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/fr/thunderbird-115.3.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "ada502c6e5b654332d00183a813db3f39a1f56ff67486dfcbdfd3034309d5082"; + sha256 = "a05bbd534836e6ae2cf0cd908e8f4ecd04ee5ed6e380590716932fd24760e628"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/fy-NL/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/fy-NL/thunderbird-115.3.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "f41c0c0c209160f11c1fc80da4df1142a4ff7373252badabd1cb3c3fec3e9fe0"; + sha256 = "a2f47372b7b40907639b98d47c69e36b89113fd30cad4cdecb060011b05c50e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ga-IE/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ga-IE/thunderbird-115.3.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "615f820a11d7563a066b8b39c85ea7bc6cad8a7ec39328d3191aa1e936041904"; + sha256 = "50d8934a62bd65dcc3097ba53d5ec55de024d7c0ab3e3aa3de639f103fb9a8ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/gd/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/gd/thunderbird-115.3.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "dc72e38443d503db656efc08a65a141aa7a9973b89f69481ee26fd7df7297fca"; + sha256 = "150d7d5848bab9111eac1e13869f7268728d293de067a2bab48106a59f087a4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/gl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/gl/thunderbird-115.3.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "8cf4b092bb130177e378ec06ad548b40059a91ce701f4d98f992cc8639d1ec15"; + sha256 = "d68375242a2296f33993c6a4c0695ab4ec147509ca2caae9af5b8eba8103ce5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/he/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/he/thunderbird-115.3.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "7e367ceca2ba4b6289ee98445cda8ec8adcf22d668f7808ba555e11766a6a05c"; + sha256 = "097ad868096d22bc634e6304bd3ad836f5d767839d1cb48790c9caeab80f3819"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/hr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/hr/thunderbird-115.3.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9581a29a2031040976645ade6fe84006a5dd26ebfc65b289efbd9fcfc21e5e1f"; + sha256 = "96093e3b5b9d1acf9d6ac14349ee9acb6616444ccecb8f35875c15c43ac38c42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/hsb/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/hsb/thunderbird-115.3.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "eb16e4b20199a18aa0b3610d0007e64d4c03c4533e66e606094723801d8dcfb9"; + sha256 = "fa63db473969f137ffd623c3882b55b91a6040eda2fb3b54903f76ec1d0dbf90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/hu/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/hu/thunderbird-115.3.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "25320a33107358a2cb3ee2f2f6841fc3474a5348c208271a654db022ea2749fb"; + sha256 = "544774cf0ff36ef1cedaae27111755e5050f909fe5e0f3d2f16ba6f9ce0ec3a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/hy-AM/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/hy-AM/thunderbird-115.3.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "07326ebd1420544b7954a25b8208ec3023434a49893de93ccf2c1e8e7716d279"; + sha256 = "f11d0272755ec879b29349903437d8bf11ace96706e5c9453c1fa576206f4227"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/id/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/id/thunderbird-115.3.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "5263bfbed08ca2c80a984ced0cd7cd83eb33ae0f33d2c49153443ee9568d6458"; + sha256 = "9352fefd2809b13bedaae3df31160048b96d4efe743742e032da2cad22a0c8d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/is/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/is/thunderbird-115.3.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "b085dfa757446a301630f7deebc24f67cec720b8d7200700c230b2472bb35a26"; + sha256 = "8d802906a852bbcc14c4b41ced9863eee597301aded1e409afce819084370762"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/it/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/it/thunderbird-115.3.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "a1ace8ac23cef4e74c4dd231125291c95f12773bd4fc5691c7ac137b325ae588"; + sha256 = "914f9304e31a3ffe4054c5521901040a875455f4d202a10712908073377a13c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ja/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ja/thunderbird-115.3.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "6ced33b4003339a09c727d664c0645ecb68d60f8c0eaa8e8c85ae3b6b737eb45"; + sha256 = "2e7964c0ea3a586d365d201fb0fc32e0e1da3426fbfbca0754812844fe17f26c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ka/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ka/thunderbird-115.3.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "138cb5cd29d39e0e02be5ba51d45fad0f765a675465caafb3464e6e106d2a1d4"; + sha256 = "468c045050b0b68254d042f15ec09303318a58d0f5e9fa4e824ec749b256ab0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/kab/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/kab/thunderbird-115.3.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "5e33eb61b6b2dafabff99d9ef5273ccdbe37f60add70141fb6c24a8ffd24993b"; + sha256 = "8d76a4d2e7b491d5a912ff6eb3f64996b9d80ed4874ffb07109239f4f5dba699"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/kk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/kk/thunderbird-115.3.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ee6c25bdf4ac8f35055d24217ed11c39a7cf8c9e26b25c878440ac4f3d17ba4e"; + sha256 = "30cfbc6faa9cccd21e2d17c03267d3542c99d18d4124684458081a5f43b023ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ko/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ko/thunderbird-115.3.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "44204e452f609c70c7416928d6b4224895685f64cd82b9fd1638142526abc496"; + sha256 = "c6817b34e8205680a3f92354bed9232b761249dfb316c61ae2d1d6f4c674b00b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/lt/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/lt/thunderbird-115.3.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "d14e22598305a92944e1ce20a1bc59bce8afcdc5dfa2a5c0bfbda14df90b0158"; + sha256 = "1885249ad6b0b93d1f92cd12d8a7ec826522c0829c20f3650c0fe67409fb839c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/lv/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/lv/thunderbird-115.3.1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "77892ac539b4a6f1e440a6f746fb29094a7e80f3160889eb7d96f7b9cf281a6c"; + sha256 = "f076a056ba8b68291e3461b6acd70d7de8540aaf34414442bdaf7febd54f6565"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ms/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ms/thunderbird-115.3.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "ee7ae86b46f46e87d274c21aa99cda6d8c586099ad8343d7771235529b370880"; + sha256 = "9b4bc1b4d08e3143c38dcbdde0d7d574cb321050a28afcf5826a9050119a087b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/nb-NO/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/nb-NO/thunderbird-115.3.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "9ef14346d1c1c83478fc95dccb58cd1819eba9e9ffd2a0cf3ef703d5f36f0390"; + sha256 = "b1e90bcb60dfaee62765ecdfa2c149869304ae60eb8d4296664d8592b7f0e144"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/nl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/nl/thunderbird-115.3.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "936afadbb7829b965e56c5b5d11a817e97ad529097f44cd1b8fbbe62c8c41323"; + sha256 = "6cdff185bff851dfa0a33cbc5cb70c5bbf9651f7b7cd3bff772d9574c52d09f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/nn-NO/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/nn-NO/thunderbird-115.3.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "0a6a81b2e9345fbd4e88b7e2eec928f1d25a09fc92bfa1f9b96423efccf75028"; + sha256 = "76bcfcc43e07d2b6d869f8ac27e5a0d15edc9d90e1c60f29a6ead469937da00f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/pa-IN/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/pa-IN/thunderbird-115.3.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "8e38aa404f76523db0d6b910033b555a391811297bc9b1988ef50acdaf37c16c"; + sha256 = "5be1be208f37287d956867147a8cbf55bfc7c56691dd7850f142972fa1fd30d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/pl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/pl/thunderbird-115.3.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "847aa25be48228821f817feaa5e7d3038058a37c5abca6d316bed9f8fbbafc26"; + sha256 = "a6f4372fd09296a5e057156c5857ba98d2b28185955bca4eab1bc9693eda454a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/pt-BR/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/pt-BR/thunderbird-115.3.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "0dace36f81b8ce7eae24fb5c691cd8c8b99e5e46a1f6a478d4295606b66c65c4"; + sha256 = "fb19832f75b6d91d989a96b867826253c68c2b16d5bec58c0643caeb393afd43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/pt-PT/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/pt-PT/thunderbird-115.3.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1b0f69f835a37d4e4921ee85828abd216cef831d1ba1ebaf6178b8e8e7905bc0"; + sha256 = "34bb7b3b7972d651cd34f2e5d3759651c5e7f633560b355f9fdf838f94b2c24f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/rm/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/rm/thunderbird-115.3.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "b2ace86fcbf898a1512c132eb8cec006093e5f4e1f9708504f7ebc1b6b18c352"; + sha256 = "8ec988d4367a2d5a4c980a79e2ba0e8f6a8066b068938a16e3a9e3e7719fa9b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ro/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ro/thunderbird-115.3.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "716787eacc023db3bfdfd03461e11a592c20527f3dce5600df9aee51e808115a"; + sha256 = "ead67c7e3ec02ef561478494de852d2444941fa0562908a752a6c776fe4b9704"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/ru/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/ru/thunderbird-115.3.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "586cc5e6266794b40f46484615bd6af908147cb5efd9d41e13e4dd059ba06ace"; + sha256 = "3d81c4f4ab6dcbc602adc4fdd265b18d635c646c50f051b8ade0aa6a8906ba13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/sk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/sk/thunderbird-115.3.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "744ba9de8b3828627915e38a03e3353dfcfd7ad46838ed7a17a77a3cbb79a2f8"; + sha256 = "a2001b49f939b65f5df13fc27f55174281c73a90a657375d9191e5de4a425d58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/sl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/sl/thunderbird-115.3.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "33669faa6d691307da126c6d094e8c83a41a3ac072e7f3cb450dc5232bea4cf2"; + sha256 = "db0999eb0884206f59c5d7053771864590fa8a0911fcdab8d479f13cd76f57c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/sq/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/sq/thunderbird-115.3.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "75d91f46c85000ca42bbc537080a61a446dd6144441523fc25b3c35c2382f847"; + sha256 = "08cd3e5927e0b853324cdf5d475dfbdff222723f21a34b31f59c8fdbdaaa36ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/sr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/sr/thunderbird-115.3.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "e647d2aa18d63a78c9bbef4aaca50622340795376cd779aad3dd13914543965a"; + sha256 = "a4782d01b45030631bdda4692cb52d00f014d4360feaa1b1b9797a74c2fb3861"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/sv-SE/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/sv-SE/thunderbird-115.3.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "fb5832b2416a088ea80b2bae74072652354465b17d996015c7bf46c0da187eeb"; + sha256 = "a13453f4bb640b12ee6db4e83b3b59be2c7c42f0c86f212e7feacee6b7197530"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/th/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/th/thunderbird-115.3.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2a3dd0ec84b9982ab55594001761083656db29fbf2cabd4cd5ff823dc2031088"; + sha256 = "279730d66c90a381a86ce15ad7b709d0dfe6eae305d3166352fd317df0ba5d56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/tr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/tr/thunderbird-115.3.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "c88b1264afc4a1aa323bf670ba164b93c725f7c96faf016a31e9de51ac227d0e"; + sha256 = "7716e1d986c87342cc48a465a662329ac779d1b22d1ca009467716b4d0c60620"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/uk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/uk/thunderbird-115.3.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4c0957e036d29f72df09836dc814dccd115d05fa4d1af3c9d4c0c89bcd6e0c8b"; + sha256 = "0715cf2c118d342dc691581f5f9c617e145f3128887c7f7b9a1c4c464e0d621f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/uz/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/uz/thunderbird-115.3.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "0c2959d777f866c49a9d34fa47056fb23727078677735db280458c73cee14655"; + sha256 = "6af8bae5251ad53cbcfc4abc2b659f73145d246d5db7c655a811ca4a32897428"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/vi/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/vi/thunderbird-115.3.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "326659c38f5417b4fbfdc94b6e1316e0bf926a936882e66650ade39d2caaaff0"; + sha256 = "16c2ef5305c51b6c00b6fe171cb7ad942b6411e53629a3603347ac7fa4a5917f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/zh-CN/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/zh-CN/thunderbird-115.3.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "a50416f5e05a48ab3a57217083ec3bcea8bc7ce89544edb0645af9e62c9d656a"; + sha256 = "a3f3a0d19ddb264031167e8c4eef2192239e4d09408d6972c2f63cd241068b4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-x86_64/zh-TW/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-x86_64/zh-TW/thunderbird-115.3.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "dfa3ffa940ff68cc76a779ee36558df1431609d3f683792b9f9f1c04d9284526"; + sha256 = "de1a3b31b76ccfca1ef2848d96703a0d3e85065d0f71a7a6f030b3054065ddd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/af/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/af/thunderbird-115.3.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "c1978ee67b4fb4391f1fece97de85e7843f05ef6eb58463a5bcfd21a8018bff8"; + sha256 = "a0e0caed0d502c2f5f4be6b80a874daa88ca776e88b848a5dafa9f89d7b7d03d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ar/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ar/thunderbird-115.3.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "abb0a497d824df51b2d78be14c114ff2eeb27164940c4ffaa82375558b14a0a2"; + sha256 = "e073b739553b3ff1cd0e080b2e904e258bd9224e57640b8da8876932156a1a66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ast/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ast/thunderbird-115.3.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "0e0a52a74e17492d39fde141cc59c6b0bfd55d9cee338d1f743608778e2cbbfc"; + sha256 = "bced7c19a96d8eb6819365421b8c79b1f4ed807b1e69b58c4e436a726aa6bcf8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/be/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/be/thunderbird-115.3.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "36a25c4ca43dd8cb23c22784288dd46f6af548bf7161588cc2b1a528f2064d18"; + sha256 = "1c4d9e38742bccd79afc383c6fc7cbd6833476aedc714cabe2bf3dabdda60dec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/bg/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/bg/thunderbird-115.3.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "f81d6037ff8d2df244f0de797ae5baf598df3a55a5aecb8efbf8de93f9e67f3f"; + sha256 = "a26988b65430aa3a51f298c2ff0ae724367265467ed9a886011dbcec7a570155"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/br/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/br/thunderbird-115.3.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "e90f883adc3c2c6a13a56ae6ddb62ae748950eab2782d96bc5fdbcf25c1c0500"; + sha256 = "0b41b1ab5cf1e3ea4bfec6a60fddcca5c310f980b50b65632cdf580a96ce0c36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ca/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ca/thunderbird-115.3.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "0e082f0ff5ad81fc49c77ac5cd2be0abfb09f63862ed6f8c9780976c1a2b4c48"; + sha256 = "41629371090e2d1ad19882931e344379c06d4eed8c42e445bd148cd5a5ac2eb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/cak/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/cak/thunderbird-115.3.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "963b9ce6127a3df5f7023b0e561dab8f07134152c458a664eef27ad1dbd48ab8"; + sha256 = "0a55ee3b2249ed184c92e182da6ea5af630ca7112f88463aa70f34912f7351ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/cs/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/cs/thunderbird-115.3.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "df5cc5f011f80c918214fa6b5e40e8f2901c80b28b9bb55a0a82d54d043180bf"; + sha256 = "6a97c43fe413f14e0cc75f4122df69896f9a0765abfbca3c58000435fb468516"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/cy/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/cy/thunderbird-115.3.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "cf445349e665e4717848ae68ebeff5b7df7a53b531e8a5e51e4345037bb909d9"; + sha256 = "c9bedd80cb934c54c7ee8a3965934a4a551f704b3823ab528c0db2fd8a2bddc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/da/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/da/thunderbird-115.3.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "783039eb62122cd9f8c206d63b2a9779e19e7c0d30d5fbce84b7a41c2199e625"; + sha256 = "5d64f5fa14da87a192658a21bde9f600f94490f3b31b0e28d7b1e365840e9b2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/de/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/de/thunderbird-115.3.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "0db7f5d044670713dd13bc0dd059fe6f4026f1929e5767b804047731d4bf2e1e"; + sha256 = "b232fe451f7fb109c1e6bf8fe41715ca1e2b5021d0fead1b1ed25da8678cea85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/dsb/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/dsb/thunderbird-115.3.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "592334f160a3081cfb04273a5c927259b71e6594f7bf666c18e67ec874d098ba"; + sha256 = "9e92a8e20e874ab7117001cd9db0c72f34f49569be8522f12ed0044829d4733c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/el/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/el/thunderbird-115.3.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "78f2ee6c467f223a53ab092098d0bd003db72b89f996888d629ecfb978536a28"; + sha256 = "dd534a1bb9aff5322b190a3f214e3205c9d61447fb7306a52717960f16da1d4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/en-CA/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/en-CA/thunderbird-115.3.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "495d9634e09315e6304bbe09539271792dc0f513308730b70727b255ac33f758"; + sha256 = "8f95507ee742cf3cc78d2ddef1a052262d3698f90ccbf157ea9227390ae65a4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/en-GB/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/en-GB/thunderbird-115.3.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "05626bde23fae4b2c9677c6ff418d8c84eb5ed5176385f63c070e27ddef83e1d"; + sha256 = "181e6c65ccdb0a6e157557ae3da9adc7c6dec90c3423f7e96d5777adb15e61aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/en-US/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/en-US/thunderbird-115.3.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "594f8eef7c8368b5e7d028b089345d9e69c92eb3494247356a588354f53e917a"; + sha256 = "6df045b6d0a53f2ef9b882f093d069a70d60fe501835d09a8aed0d5fe810283d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/es-AR/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/es-AR/thunderbird-115.3.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "99158b0eaa335bfbce19e5441f304cfdcbd6bf5f572138ede3230305bfe4abdf"; + sha256 = "d77ac4665b50a84fd6b4a7699b2e60b44ddd0a8465144a6c703fa3aa98340b5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/es-ES/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/es-ES/thunderbird-115.3.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a68574ab121e567a2b35f223f1dea71c33fb0a76fa38b566d93121f6602202cb"; + sha256 = "4c28a5ecfac54d0939cd4020381fbb361f96ddd7113c7ef2e23ffba9121c62ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/es-MX/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/es-MX/thunderbird-115.3.1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "1fa0a7ac757476895997c2203961980ee6f912c1839d6e66a29a74059bdc5c17"; + sha256 = "7edde23453945f15db4b5742ffe3654a092cbd8a5ed77891eacd56aa0672f05b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/et/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/et/thunderbird-115.3.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "aecfa2e5600351400edbd5466adfae4ff49eacce5d8439c41f75007e9a1ce3d2"; + sha256 = "e5c8d238030a6fac97a70429b16f2c69c85229928166a134c11422b1be17d9ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/eu/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/eu/thunderbird-115.3.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "2302d42abd183fdbfcba73baf25bf4d0b855c79d11a7fc24b24b25a18dce92a1"; + sha256 = "1c6f0b49244d16c4b092e5a5a04a459f927ad2a1a8233d9d88d53a81b41432f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/fi/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/fi/thunderbird-115.3.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "314e9a7b7c581839dda8c0e031cb78931cb6b48c3740291dba7560ec21c5af99"; + sha256 = "ee41a31bb89866b47398a4d7de1f656e8957e853961f570c3f50d5fa70983303"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/fr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/fr/thunderbird-115.3.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "8c1209785c71cd8b0e80d8823c3788370bf81a01eae7f7d34272f3dc79a8aeab"; + sha256 = "cccb80a0d288821dd9e6a282430aa0793167a0bc5a74542ddcc82b46a3e3507f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/fy-NL/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/fy-NL/thunderbird-115.3.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "f8183a123a64960541795c2b472ebb45c16434177eb6491487b9091a7a38bce6"; + sha256 = "6b90cc256a6a9b4c7c3d967ec843e5b0fdb4b78daa63fad79477cfc04c952719"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ga-IE/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ga-IE/thunderbird-115.3.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "8cc7f3895b6306acd0b3cda7de02748dbc63c390398b515d98a8d67b1b02b901"; + sha256 = "c6ef206267af6fdda477a972f3a59fad83866a0c4530fe9baca6ba7d68b271f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/gd/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/gd/thunderbird-115.3.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "b96b3e0e9bd2cf1e1864b39cc33214a14515f41198e52cce25cf3c5f222978d8"; + sha256 = "9f80964540eb64d49bfc6e0c459d6d3e57465d6cbfa72aee7ab50cb72cb2ca48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/gl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/gl/thunderbird-115.3.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "cc130514df833c06a097ccbff69d36a7cf9dd96e040617e4b28d7d087dd09239"; + sha256 = "e811f521e1aa9b210d2868f2d5492b5b9b8440a75a935c27699aa17a7eaa4937"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/he/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/he/thunderbird-115.3.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "934cacd035b4ee93d09ae6e69c03dd7e2c167ecfefd3359087399e1a20014c34"; + sha256 = "b123f32b8ee177dfba6378bfd1c872453bce2e90aa4839cde489bf60269a22de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/hr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/hr/thunderbird-115.3.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f9173f380c1b27d90132d65c5789db7b0b0fb632c680b7cdaec1e8749d74fd8c"; + sha256 = "90374d091f267036c6806ccd000b4cdbb72f5bbe957ad06e15f723682796fc2f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/hsb/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/hsb/thunderbird-115.3.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "51001276bff6c87f34fc9eb9d0400425176207f7f052c51fa98d85cba96aec57"; + sha256 = "8b99f5aaae0fc61c44780d996a21aad0c1173430d0a56a63d9cfb1bd116bd75a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/hu/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/hu/thunderbird-115.3.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "ac330ac95d73c909c739937fd8fd4e61d987cea8da211cbcb86c02ef13ebf1ac"; + sha256 = "e31779d17e2968907097c367ad442371d86b6c42ed620e6b047b95b23715e48b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/hy-AM/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/hy-AM/thunderbird-115.3.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "71805e3ddfa74699b1c06d0dc2f3dfd3c2faf4332a5dc5f27e4a7cbb2549a4c7"; + sha256 = "180c3453c664f31687dfa084012cf5527425c35c81019df65e9dede4680cf54f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/id/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/id/thunderbird-115.3.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "cc25d0d5d79d592cfccb8f516c7e06132f071c61fb3e72beb07bf9d6b3ad8765"; + sha256 = "c74ff79b76f6b73f7962426594714a9864b6b735216aed7dd0ba15193ccbdf4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/is/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/is/thunderbird-115.3.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "228e328079179a09817c00353219c8339ffbdba644cc3ad7d2bba13961d67b32"; + sha256 = "e93faa12d98ea04510ab192585fda996b0e2c06138133a2ca8078cf933e96fc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/it/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/it/thunderbird-115.3.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "e8aa0180d78042ee15612ba5460316daa09284acbc313c22da0a64266c522ff3"; + sha256 = "b4c6a1ec49ef2e34d399001f2fa6073334223bff487db8764593cf57f641eccf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ja/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ja/thunderbird-115.3.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "b36f21877ce33d928dba32f6fc307c2f46bcd6ee9f9bc66c04beae7ff2355371"; + sha256 = "8abd71c45890632ad38f6cebf8dcffd9938f1d6e5b63513e6cf139a5d657d2e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ka/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ka/thunderbird-115.3.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "8eaab25f84eeb672b4ef395f71a58e721f0a6492ea89b050b23bf087d68788dc"; + sha256 = "a6a0f69751aa4aa967aff05857d826905a25b949a507c6a5953e3a9d764ad6db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/kab/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/kab/thunderbird-115.3.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "33f1d9380787cd09614333f2114c5992f9dbb49f1b2e0271d03916823d473017"; + sha256 = "c6be26710c7a8fa9a7db710bfaf64d6d7bacad607c2f8eeff7b1f306e9050aa4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/kk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/kk/thunderbird-115.3.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "61983a14c8c1d39d88656d0b88f3edc2e65d1167c2087e22e18b6b8c942cf5a0"; + sha256 = "b221573610a8a98600e82db05544f916509822d3bebcc656bb2e64bcbb85a158"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ko/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ko/thunderbird-115.3.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2d6ffbafd5da4032e575df3ced7995d8245516b070748ab7a717bbac01e4c25b"; + sha256 = "ead6c335ac822391b773778abfe609bfdbdfe1e7dc6e5e0956531b0e29fe592d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/lt/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/lt/thunderbird-115.3.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "a336beddbb32cb4eb3ece06bbfe7ab14b67b97f44e73606b8a552dcb9ac73105"; + sha256 = "cfc792e830e60ca5ff8ff1c468493dbae332340ff0d786083b529e4f46b3e30b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/lv/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/lv/thunderbird-115.3.1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "373b581dd03ce10c72ab03e0e9db16f220daa0e7ace5490372bfe3bad7022777"; + sha256 = "76d46bbc0d30c92816391c09ac111c5820c114165e879addb800e18637c7adb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ms/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ms/thunderbird-115.3.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "73e6efdfe3f55257575852a1b76e4932becdd4e6c1f818e030d0ace26d4733ac"; + sha256 = "b14194b7637d0afb8d8b3ef61eb0eaa2bbbcea7ed39316342cb00105445fc2b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/nb-NO/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/nb-NO/thunderbird-115.3.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "b5d31e6ea54b3928857b6baffe44818d22e8e8acebe27dc217f8d1ccd79c1a4c"; + sha256 = "19806dc92d6bc218be377bb7bd8a455a9e18aa5539a2cbc55a4359c0c00505a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/nl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/nl/thunderbird-115.3.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "4451ac693a9c43888224710c79b7ed8838435eef35eeadb9097d3d382df7f2ea"; + sha256 = "d00a9436cb35db75f80472453e3f29694bde58fba07553ce9a6c4b4e559ef2ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/nn-NO/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/nn-NO/thunderbird-115.3.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "c05356371e506f92e472c7b0a759ab8f9d3b512a987fbb72312131a3d5db39e2"; + sha256 = "4a7a0b70caa9d56b8c2ae25762a5ec6e20c805e92694655c31f0498a9b56e29a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/pa-IN/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/pa-IN/thunderbird-115.3.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c773cd3074dfc7415bea45253b50a16c872dc6e9120bdd7807ef4a964ea92707"; + sha256 = "76d6f61c7053139ef52ddfac63454b152a0e5957773e5f293c975cc6468cdd36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/pl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/pl/thunderbird-115.3.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "32c9ec263006738446d4f16c53ca9d2872ac4c152be974cdc8f2c18905120c7c"; + sha256 = "7afac7c8563248a3b2101a990cb0e84039475c8c7a41113fcaaf043df55a54e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/pt-BR/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/pt-BR/thunderbird-115.3.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "110dc01e5f4186b9f7043ea9343f2a3a59927d319da16b969b0f7c7a486e6571"; + sha256 = "d183b0f1d6c01e436bd38d1f5e06bdfe528584e7602103bb576d5640366fddb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/pt-PT/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/pt-PT/thunderbird-115.3.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "d5611e79e78484ad15dd2333d9c977ca6f5b00cb44bfa423cfba8a9fca7c77c8"; + sha256 = "4eac7d59c9df12542ce2fc6fb1bfbce62d537c4520be627716559e2c1e7a2128"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/rm/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/rm/thunderbird-115.3.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "8ae35f806e5a4bc2a5559b74a7766b96833ac5ba469f310358a9d18eabeba235"; + sha256 = "115308e7f02fd241d80591bef5dd300421250827f8eb1373a2b4446018ab897b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ro/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ro/thunderbird-115.3.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "74cc9cf95a390a259540113f36fb25a5ea4b9d2325c96593f3f34df367aa0cf6"; + sha256 = "118587e5d8697e2da4e353deecefe18073c1f2f531eb80903f65957b7bfb965a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/ru/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/ru/thunderbird-115.3.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "06a91c59dcbefb7812515f016b03d9605a0517b9c06351ff5a6f9b6ce164d66f"; + sha256 = "a8b5a03ca48c985e38156d5c7fbfd67a48cfada1613cd1948083410dc1ccab78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/sk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/sk/thunderbird-115.3.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "70fb2f45e334e91c0da1a074e4646731fa151f688049f6539d4cc63f2e755072"; + sha256 = "724f250a2efdb6d3f1b7cd3a16dd667ef013b8e7d8af76befc6a35692b6db51b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/sl/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/sl/thunderbird-115.3.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "1b04aa780472a6d51b21f15e58abf2291b94a86cb5f8e7cc3006f0f85520a88a"; + sha256 = "e243ed7bf35315cbe856c66614b9c8df243884aa68dab703a155bffd3568964e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/sq/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/sq/thunderbird-115.3.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "8cc0cb46414be80f1377a2eb10d535d52c854bf51bc197f137bd16adf4b95a7e"; + sha256 = "7beb3635ce488c8ea059777eb986c2554fe064e162db146ed4074753b86b60ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/sr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/sr/thunderbird-115.3.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "c06788b23a60d3949e00b9bcb623ca8a1457c2e92e15ac8c5d29053d54852c1c"; + sha256 = "162c3daade98baac53b44e03d42c3696f53d4259875f11b92622de756e1af457"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/sv-SE/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/sv-SE/thunderbird-115.3.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "4de0b830eed07a2a743a9a6c4e925d0ea149a74e5b0ae164378c366f8ede7969"; + sha256 = "f76cff08945f213f80997d231d0930a8641725063a6c95ab5090d50c1ef791ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/th/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/th/thunderbird-115.3.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "d5c8601825b47d4abeb51f386199fb23893f69f6e25870c87e962279c6daaf38"; + sha256 = "e45b3bf416d32b65ef8c0e93170bce63f2a151ddc1ec54be637a2111a9966e07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/tr/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/tr/thunderbird-115.3.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "f92c52b8ef7672aa6ae8b8f33063f1acf274f41ed8852cfb66dbde4d86db7a95"; + sha256 = "86859e3328fb519ef0183cffea86222392bd40ff11c6e1eef500de46e2c236ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/uk/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/uk/thunderbird-115.3.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "0ce05dfc43582387f349a56f6e2b34acfe459daecc77a9fc530db9798f77cfc5"; + sha256 = "6e38fe346232dc10dd3fd71578856116c7005b89ee6a064b409481f9bf1b3ad5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/uz/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/uz/thunderbird-115.3.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "9a095f4bf86405e2a44eb0ecb0f630c050bd5c884094f4d9748b40eccc9ddaed"; + sha256 = "f4d3dad6b9ba9a417f9365617fc93f04b794ca5bbe1979606fc7ea2b9b4a919f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/vi/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/vi/thunderbird-115.3.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "a60d9c74a0f8577ad775489e581d19c112d51436c2525f235acf6aeeb4f2ab29"; + sha256 = "740b1c77c00ece1cc21824bbaa76edf8fb1b5ea99307f0ff5c4db28da01b0fef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/zh-CN/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/zh-CN/thunderbird-115.3.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "257b2ef302f202ac0a23bfcec76038f0e665c82346007a68337452bb0eaa1413"; + sha256 = "d1d5c77022286d5eade32a3fe26d0f707d5ea2b2c0288e2b1e589b272948dab3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.1.1/linux-i686/zh-TW/thunderbird-115.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.3.1/linux-i686/zh-TW/thunderbird-115.3.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "25766f390cf68dd829776ab9065f5d753f42175cc454ddb7c44c96d672464bb4"; + sha256 = "ab6d7d5d542146c063cb013c41e04ef6967bfcab0c3b9fad3248bc9a1fe6386f"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index eef91d60d8..71b0768dab 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -11,7 +11,7 @@ rec { binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "4ae3f216833aec55421f827d55bc1b5fc2f0ad4fefecb27724a5be3318c351df24d30a4897b924e733ed2e3995be284b6d135049d46001143fb1c961fefc1830"; + hash = "sha512-SuPyFoM67FVCH4J9VbwbX8LwrU/v7LJ3JKW+MxjDUd8k0wpIl7kk5zPtLjmVvihLbRNQSdRgARQ/sclh/vwYMA=="; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. @@ -22,12 +22,14 @@ rec { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; description = "A full-featured e-mail client"; homepage = "https://thunderbird.net/"; + mainProgram = "thunderbird"; maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ]; platforms = platforms.unix; badPlatforms = platforms.darwin; broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = licenses.mpl20; + knownVulnerabilities = [ "Thunderbird 102 support has ended" ]; }; updateScript = callPackage ./update.nix { attrPath = "thunderbird-unwrapped"; @@ -42,13 +44,13 @@ rec { thunderbird-115 = (buildMozillaMach rec { pname = "thunderbird"; - version = "115.1.1"; + version = "115.3.1"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "26f69dded43bd24ffce9acb0de204bef8c10c8df3cb82b33594d035e41179cb7450cb7c10470bfc92a933c1d801fb968049ea8a17d838d16de9973f5dddff9fc"; + sha512 = "e3b643cfee07d3fdd7bcc686db6dd3e81b09ecabfa9df4d34dd32acf3799b4b0b4a88e169f957d420e06aabba55c4452f3a9761db37828b025048ad5d8ef2db9"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. @@ -59,6 +61,7 @@ rec { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; description = "A full-featured e-mail client"; homepage = "https://thunderbird.net/"; + mainProgram = "thunderbird"; maintainers = with maintainers; [ eelco lovesegfault pierron vcunat ]; platforms = platforms.unix; badPlatforms = platforms.darwin; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix index cd0a61f663..395e9b0f4e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/default.nix @@ -16,8 +16,6 @@ , qtkeychain , qttools , qtwebkit -, qttranslations -, substituteAll , withI18n ? false }: @@ -39,12 +37,6 @@ in mkDerivation rec { sha256 = "sha256-15G9YjT3qBKbeOKfb/IgXOO+DaJaTULP9NJn/MFYZS8="; }; - patches = (substituteAll { - # See https://github.com/NixOS/nixpkgs/issues/86054 - src = ./fix-qttranslations-path.patch; - inherit qttranslations; - }); - buildInputs = [ akonadi-contacts gpgme diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/fix-qttranslations-path.patch b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/fix-qttranslations-path.patch deleted file mode 100644 index c4eac39565..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/trojita/fix-qttranslations-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/src/Gui/main.cpp w/src/Gui/main.cpp -index 851db4f1..e997f46e 100644 ---- i/src/Gui/main.cpp -+++ w/src/Gui/main.cpp -@@ -52,7 +52,7 @@ int main(int argc, char **argv) - - QTranslator qtTranslator; - qtTranslator.load(QLatin1String("qt_") + QLocale::system().name(), -- QLibraryInfo::location(QLibraryInfo::TranslationsPath)); -+ QLatin1String("@qttranslations@/translations")); - app.installTranslator(&qtTranslator); - - QLatin1String localeSuffix("/locale"); diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index f5a2139b53..d7ee8754c9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.115.2"; + version = "3.118.8"; src = fetchurl { url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/${pname}-${version}-unpacked-linux.tar.gz"; name = "tutanota-desktop-${version}.tar.gz"; - sha256 = "sha256-PdVvrb+sC8LF4tZXAHt2CevyoXhxTXJB01Fe64YI6BI="; + hash = "sha256-12R8g5U8p2lXNaSeJiCvEb6AgCC40jDXDKO8kyEvM6w="; }; nativeBuildInputs = [ @@ -54,8 +54,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tutanota official desktop client"; homepage = "https://tutanota.com/"; + changelog = "https://github.com/tutao/tutanota/releases/tag/tutanota-desktop-release-${version}"; license = licenses.gpl3Only; maintainers = with maintainers; [ wolfangaukang ]; + mainProgram = "tutanota-desktop"; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/default.nix b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/default.nix index 98d5628468..b69f90d321 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/default.nix @@ -2,6 +2,7 @@ , lib , nixosTests , fetchFromGitHub +, fetchYarnDeps , applyPatches , bundlerEnv , defaultGemConfig @@ -95,10 +96,13 @@ let yarnEnv = yarn2nix-moretea.mkYarnPackage { pname = "${pname}-node-modules"; inherit version src; - yarnLock = ./yarn.lock; - yarnNix = ./yarn.nix; packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-HI4RR4/ll/zNBNtDCb8OvEsG/BMVYacM0CcYqbkNHEY="; + }; + yarnPreBuild = '' mkdir -p deps/Zammad cp -r ${src}/.eslint-plugin-zammad deps/Zammad/.eslint-plugin-zammad diff --git a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.lock b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.lock deleted file mode 100644 index ca4ca7b697..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.lock +++ /dev/null @@ -1,10810 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@adobe/css-tools@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.0.1.tgz#b38b444ad3aa5fedbb15f2f746dcd934226a12dd" - integrity sha512-+u76oB43nOHrF4DDWRLWDCtci7f3QJoEBigemIdIeTi1ODqjx6Tad9NCVnPRwewWlKkVab5PlK8DCtPTyX7S8g== - -"@ampproject/remapping@^2.1.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" - integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== - dependencies: - "@jridgewell/gen-mapping" "^0.1.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@apideck/better-ajv-errors@^0.3.1": - version "0.3.6" - resolved "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz#957d4c28e886a64a8141f7522783be65733ff097" - integrity sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA== - dependencies: - json-schema "^0.4.0" - jsonpointer "^5.0.0" - leven "^3.1.0" - -"@apollo/client@^3.7.7": - version "3.7.7" - resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.7.7.tgz#5eb6e8af24fb809c97c8f66c3faf9524f83c412b" - integrity sha512-Rp/pCWuJSjLN7Xl5Qi2NoeURmZYEU/TIUz0n/LOwEo1tGdU2W7/fGVZ8+5um58JeVYq4UoTGBKFxSVeG4s411A== - dependencies: - "@graphql-typed-document-node/core" "^3.1.1" - "@wry/context" "^0.7.0" - "@wry/equality" "^0.5.0" - "@wry/trie" "^0.3.0" - graphql-tag "^2.12.6" - hoist-non-react-statics "^3.3.2" - optimism "^0.16.1" - prop-types "^15.7.2" - response-iterator "^0.2.6" - symbol-observable "^4.0.0" - ts-invariant "^0.10.3" - tslib "^2.3.0" - zen-observable-ts "^1.2.5" - -"@ardatan/relay-compiler@12.0.0": - version "12.0.0" - resolved "https://registry.yarnpkg.com/@ardatan/relay-compiler/-/relay-compiler-12.0.0.tgz#2e4cca43088e807adc63450e8cab037020e91106" - integrity sha512-9anThAaj1dQr6IGmzBMcfzOQKTa5artjuPmw8NYK/fiGEMjADbSguBY2FMDykt+QhilR3wc9VA/3yVju7JHg7Q== - dependencies: - "@babel/core" "^7.14.0" - "@babel/generator" "^7.14.0" - "@babel/parser" "^7.14.0" - "@babel/runtime" "^7.0.0" - "@babel/traverse" "^7.14.0" - "@babel/types" "^7.0.0" - babel-preset-fbjs "^3.4.0" - chalk "^4.0.0" - fb-watchman "^2.0.0" - fbjs "^3.0.0" - glob "^7.1.1" - immutable "~3.7.6" - invariant "^2.2.4" - nullthrows "^1.1.1" - relay-runtime "12.0.0" - signedsource "^1.0.0" - yargs "^15.3.1" - -"@ardatan/sync-fetch@0.0.1": - version "0.0.1" - resolved "https://registry.yarnpkg.com/@ardatan/sync-fetch/-/sync-fetch-0.0.1.tgz#3385d3feedceb60a896518a1db857ec1e945348f" - integrity sha512-xhlTqH0m31mnsG0tIP4ETgfSB6gXDaYYsUWTrlUV93fFQPI9dd8hE0Ot6MHLCtqgB32hwJAC3YZMWlXZw7AleA== - dependencies: - node-fetch "^2.6.1" - -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" - integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== - dependencies: - "@babel/highlight" "^7.18.6" - -"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.0": - version "7.20.1" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz#f2e6ef7790d8c8dbf03d379502dcc246dcce0b30" - integrity sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ== - -"@babel/compat-data@^7.19.3", "@babel/compat-data@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.4.tgz#95c86de137bf0317f3a570e1b6e996b427299747" - integrity sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw== - -"@babel/core@^7.11.1", "@babel/core@^7.14.0": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.6.tgz#7122ae4f5c5a37c0946c066149abd8e75f81540f" - integrity sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg== - dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.19.6" - "@babel/helper-compilation-targets" "^7.19.3" - "@babel/helper-module-transforms" "^7.19.6" - "@babel/helpers" "^7.19.4" - "@babel/parser" "^7.19.6" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.6" - "@babel/types" "^7.19.4" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.1" - semver "^6.3.0" - -"@babel/generator@^7.14.0", "@babel/generator@^7.18.13", "@babel/generator@^7.19.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.6.tgz#9e481a3fe9ca6261c972645ae3904ec0f9b34a1d" - integrity sha512-oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA== - dependencies: - "@babel/types" "^7.19.4" - "@jridgewell/gen-mapping" "^0.3.2" - jsesc "^2.5.1" - -"@babel/generator@^7.20.1": - version "7.20.1" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.1.tgz#ef32ecd426222624cbd94871a7024639cf61a9fa" - integrity sha512-u1dMdBUmA7Z0rBB97xh8pIhviK7oItYOkjbsCxTWMknyvbQRBwX7/gn4JXurRdirWMFh+ZtYARqkA6ydogVZpg== - dependencies: - "@babel/types" "^7.20.0" - "@jridgewell/gen-mapping" "^0.3.2" - jsesc "^2.5.1" - -"@babel/helper-annotate-as-pure@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" - integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb" - integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw== - dependencies: - "@babel/helper-explode-assignable-expression" "^7.18.6" - "@babel/types" "^7.18.9" - -"@babel/helper-compilation-targets@^7.17.7": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a" - integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ== - dependencies: - "@babel/compat-data" "^7.20.0" - "@babel/helper-validator-option" "^7.18.6" - browserslist "^4.21.3" - semver "^6.3.0" - -"@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.19.0", "@babel/helper-compilation-targets@^7.19.3": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz#a10a04588125675d7c7ae299af86fa1b2ee038ca" - integrity sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg== - dependencies: - "@babel/compat-data" "^7.19.3" - "@babel/helper-validator-option" "^7.18.6" - browserslist "^4.21.3" - semver "^6.3.0" - -"@babel/helper-create-class-features-plugin@^7.18.6": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz#bfd6904620df4e46470bae4850d66be1054c404b" - integrity sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" - "@babel/helper-member-expression-to-functions" "^7.18.9" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-replace-supers" "^7.18.9" - "@babel/helper-split-export-declaration" "^7.18.6" - -"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz#7976aca61c0984202baca73d84e2337a5424a41b" - integrity sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - regexpu-core "^5.1.0" - -"@babel/helper-define-polyfill-provider@^0.3.3": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a" - integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww== - dependencies: - "@babel/helper-compilation-targets" "^7.17.7" - "@babel/helper-plugin-utils" "^7.16.7" - debug "^4.1.1" - lodash.debounce "^4.0.8" - resolve "^1.14.2" - semver "^6.1.2" - -"@babel/helper-environment-visitor@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" - integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== - -"@babel/helper-explode-assignable-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096" - integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" - integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== - dependencies: - "@babel/template" "^7.18.10" - "@babel/types" "^7.19.0" - -"@babel/helper-hoist-variables@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" - integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-member-expression-to-functions@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815" - integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg== - dependencies: - "@babel/types" "^7.18.9" - -"@babel/helper-module-imports@^7.10.4", "@babel/helper-module-imports@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" - integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.19.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz#6c52cc3ac63b70952d33ee987cbee1c9368b533f" - integrity sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.19.4" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.19.1" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.6" - "@babel/types" "^7.19.4" - -"@babel/helper-optimise-call-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe" - integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf" - integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw== - -"@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519" - integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-wrap-function" "^7.18.9" - "@babel/types" "^7.18.9" - -"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.18.9": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz#e1592a9b4b368aa6bdb8784a711e0bcbf0612b78" - integrity sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-member-expression-to-functions" "^7.18.9" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/traverse" "^7.19.1" - "@babel/types" "^7.19.0" - -"@babel/helper-simple-access@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz#be553f4951ac6352df2567f7daa19a0ee15668e7" - integrity sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg== - dependencies: - "@babel/types" "^7.19.4" - -"@babel/helper-skip-transparent-expression-wrappers@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818" - integrity sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw== - dependencies: - "@babel/types" "^7.18.9" - -"@babel/helper-split-export-declaration@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" - integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-string-parser@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" - integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== - -"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" - integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== - -"@babel/helper-validator-option@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" - integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== - -"@babel/helper-wrap-function@^7.18.9": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz#89f18335cff1152373222f76a4b37799636ae8b1" - integrity sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg== - dependencies: - "@babel/helper-function-name" "^7.19.0" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.0" - "@babel/types" "^7.19.0" - -"@babel/helpers@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.4.tgz#42154945f87b8148df7203a25c31ba9a73be46c5" - integrity sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw== - dependencies: - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.4" - "@babel/types" "^7.19.4" - -"@babel/highlight@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" - integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== - dependencies: - "@babel/helper-validator-identifier" "^7.18.6" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/parser@^7.14.0", "@babel/parser@^7.16.4", "@babel/parser@^7.16.8", "@babel/parser@^7.18.10", "@babel/parser@^7.19.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.6.tgz#b923430cb94f58a7eae8facbffa9efd19130e7f8" - integrity sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA== - -"@babel/parser@^7.20.1": - version "7.20.1" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.1.tgz#3e045a92f7b4623cafc2425eddcb8cf2e54f9cc5" - integrity sha512-hp0AYxaZJhxULfM1zyp7Wgr+pSUKBcP3M+PHnSzWGdXOzg/kHWIgiUWARvubhUKGOEw3xqY4x+lyZ9ytBVcELw== - -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2" - integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz#a11af19aa373d68d561f08e0a57242350ed0ec50" - integrity sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" - "@babel/plugin-proposal-optional-chaining" "^7.18.9" - -"@babel/plugin-proposal-async-generator-functions@^7.19.1": - version "7.20.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz#352f02baa5d69f4e7529bdac39aaa02d41146af9" - integrity sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/helper-remap-async-to-generator" "^7.18.9" - "@babel/plugin-syntax-async-generators" "^7.8.4" - -"@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3" - integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-proposal-class-static-block@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020" - integrity sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-class-static-block" "^7.14.5" - -"@babel/plugin-proposal-dynamic-import@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94" - integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-dynamic-import" "^7.8.3" - -"@babel/plugin-proposal-export-namespace-from@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203" - integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/plugin-syntax-export-namespace-from" "^7.8.3" - -"@babel/plugin-proposal-json-strings@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b" - integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-json-strings" "^7.8.3" - -"@babel/plugin-proposal-logical-assignment-operators@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz#8148cbb350483bf6220af06fa6db3690e14b2e23" - integrity sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" - -"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1" - integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - -"@babel/plugin-proposal-numeric-separator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75" - integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-numeric-separator" "^7.10.4" - -"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz#a8fc86e8180ff57290c91a75d83fe658189b642d" - integrity sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q== - dependencies: - "@babel/compat-data" "^7.19.4" - "@babel/helper-compilation-targets" "^7.19.3" - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.18.8" - -"@babel/plugin-proposal-optional-catch-binding@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb" - integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - -"@babel/plugin-proposal-optional-chaining@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993" - integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - -"@babel/plugin-proposal-private-methods@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea" - integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-proposal-private-property-in-object@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz#a64137b232f0aca3733a67eb1a144c192389c503" - integrity sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-create-class-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/plugin-syntax-private-property-in-object" "^7.14.5" - -"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e" - integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-syntax-async-generators@^7.8.4": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" - integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-class-properties@^7.0.0", "@babel/plugin-syntax-class-properties@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10" - integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA== - dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - -"@babel/plugin-syntax-class-static-block@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" - integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-dynamic-import@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3" - integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-export-namespace-from@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a" - integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - -"@babel/plugin-syntax-flow@^7.0.0", "@babel/plugin-syntax-flow@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz#774d825256f2379d06139be0c723c4dd444f3ca1" - integrity sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-syntax-import-assertions@7.20.0", "@babel/plugin-syntax-import-assertions@^7.18.6": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4" - integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ== - dependencies: - "@babel/helper-plugin-utils" "^7.19.0" - -"@babel/plugin-syntax-json-strings@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" - integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0" - integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-syntax-logical-assignment-operators@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699" - integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" - integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-numeric-separator@^7.10.4": - version "7.10.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97" - integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug== - dependencies: - "@babel/helper-plugin-utils" "^7.10.4" - -"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" - integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-catch-binding@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" - integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" - integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-private-property-in-object@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" - integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-syntax-top-level-await@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" - integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== - dependencies: - "@babel/helper-plugin-utils" "^7.14.5" - -"@babel/plugin-transform-arrow-functions@^7.0.0", "@babel/plugin-transform-arrow-functions@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe" - integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-async-to-generator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615" - integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag== - dependencies: - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-remap-async-to-generator" "^7.18.6" - -"@babel/plugin-transform-block-scoped-functions@^7.0.0", "@babel/plugin-transform-block-scoped-functions@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8" - integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-block-scoping@^7.0.0": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.19.4.tgz#315d70f68ce64426db379a3d830e7ac30be02e9b" - integrity sha512-934S2VLLlt2hRJwPf4MczaOr4hYF0z+VKPwqTNxyKX7NthTiPfhuKFWQZHXRM0vh/wo/VyXB3s4bZUNA08l+tQ== - dependencies: - "@babel/helper-plugin-utils" "^7.19.0" - -"@babel/plugin-transform-block-scoping@^7.19.4": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.0.tgz#91fe5e6ffc9ba13cb6c95ed7f0b1204f68c988c5" - integrity sha512-sXOohbpHZSk7GjxK9b3dKB7CfqUD5DwOH+DggKzOQ7TXYP+RCSbRykfjQmn/zq+rBjycVRtLf9pYhAaEJA786w== - dependencies: - "@babel/helper-plugin-utils" "^7.19.0" - -"@babel/plugin-transform-classes@^7.0.0", "@babel/plugin-transform-classes@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz#0e61ec257fba409c41372175e7c1e606dc79bb20" - integrity sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-compilation-targets" "^7.19.0" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" - "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/helper-replace-supers" "^7.18.9" - "@babel/helper-split-export-declaration" "^7.18.6" - globals "^11.1.0" - -"@babel/plugin-transform-computed-properties@^7.0.0", "@babel/plugin-transform-computed-properties@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e" - integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-destructuring@^7.0.0": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.19.4.tgz#46890722687b9b89e1369ad0bd8dc6c5a3b4319d" - integrity sha512-t0j0Hgidqf0aM86dF8U+vXYReUgJnlv4bZLsyoPnwZNrGY+7/38o8YjaELrvHeVfTZao15kjR0PVv0nju2iduA== - dependencies: - "@babel/helper-plugin-utils" "^7.19.0" - -"@babel/plugin-transform-destructuring@^7.19.4": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.0.tgz#712829ef4825d9cc04bb379de316f981e9a6f648" - integrity sha512-1dIhvZfkDVx/zn2S1aFwlruspTt4189j7fEkH0Y0VyuDM6bQt7bD6kLcz3l4IlLG+e5OReaBz9ROAbttRtUHqA== - dependencies: - "@babel/helper-plugin-utils" "^7.19.0" - -"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8" - integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-duplicate-keys@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e" - integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-exponentiation-operator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd" - integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw== - dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-flow-strip-types@^7.0.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.19.0.tgz#e9e8606633287488216028719638cbbb2f2dde8f" - integrity sha512-sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg== - dependencies: - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/plugin-syntax-flow" "^7.18.6" - -"@babel/plugin-transform-for-of@^7.0.0", "@babel/plugin-transform-for-of@^7.18.8": - version "7.18.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1" - integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-function-name@^7.0.0", "@babel/plugin-transform-function-name@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0" - integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ== - dependencies: - "@babel/helper-compilation-targets" "^7.18.9" - "@babel/helper-function-name" "^7.18.9" - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-literals@^7.0.0", "@babel/plugin-transform-literals@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc" - integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-member-expression-literals@^7.0.0", "@babel/plugin-transform-member-expression-literals@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e" - integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-modules-amd@^7.18.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz#aca391801ae55d19c4d8d2ebfeaa33df5f2a2cbd" - integrity sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg== - dependencies: - "@babel/helper-module-transforms" "^7.19.6" - "@babel/helper-plugin-utils" "^7.19.0" - -"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.18.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz#25b32feef24df8038fc1ec56038917eacb0b730c" - integrity sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ== - dependencies: - "@babel/helper-module-transforms" "^7.19.6" - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/helper-simple-access" "^7.19.4" - -"@babel/plugin-transform-modules-systemjs@^7.19.0": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz#59e2a84064b5736a4471b1aa7b13d4431d327e0d" - integrity sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ== - dependencies: - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-module-transforms" "^7.19.6" - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/helper-validator-identifier" "^7.19.1" - -"@babel/plugin-transform-modules-umd@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9" - integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ== - dependencies: - "@babel/helper-module-transforms" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz#ec7455bab6cd8fb05c525a94876f435a48128888" - integrity sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.19.0" - "@babel/helper-plugin-utils" "^7.19.0" - -"@babel/plugin-transform-new-target@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8" - integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-object-super@^7.0.0", "@babel/plugin-transform-object-super@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c" - integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-replace-supers" "^7.18.6" - -"@babel/plugin-transform-parameters@^7.0.0", "@babel/plugin-transform-parameters@^7.18.8": - version "7.18.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz#ee9f1a0ce6d78af58d0956a9378ea3427cccb48a" - integrity sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-property-literals@^7.0.0", "@babel/plugin-transform-property-literals@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3" - integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-react-display-name@^7.0.0": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz#8b1125f919ef36ebdfff061d664e266c666b9415" - integrity sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-react-jsx@^7.0.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz#b3cbb7c3a00b92ec8ae1027910e331ba5c500eb9" - integrity sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/plugin-syntax-jsx" "^7.18.6" - "@babel/types" "^7.19.0" - -"@babel/plugin-transform-regenerator@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73" - integrity sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - regenerator-transform "^0.15.0" - -"@babel/plugin-transform-reserved-words@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a" - integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9" - integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-spread@^7.0.0", "@babel/plugin-transform-spread@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6" - integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w== - dependencies: - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9" - -"@babel/plugin-transform-sticky-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc" - integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-template-literals@^7.0.0", "@babel/plugin-transform-template-literals@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e" - integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-typeof-symbol@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0" - integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-unicode-escapes@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246" - integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ== - dependencies: - "@babel/helper-plugin-utils" "^7.18.9" - -"@babel/plugin-transform-unicode-regex@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca" - integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA== - dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/preset-env@^7.11.0": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.19.4.tgz#4c91ce2e1f994f717efb4237891c3ad2d808c94b" - integrity sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg== - dependencies: - "@babel/compat-data" "^7.19.4" - "@babel/helper-compilation-targets" "^7.19.3" - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/helper-validator-option" "^7.18.6" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9" - "@babel/plugin-proposal-async-generator-functions" "^7.19.1" - "@babel/plugin-proposal-class-properties" "^7.18.6" - "@babel/plugin-proposal-class-static-block" "^7.18.6" - "@babel/plugin-proposal-dynamic-import" "^7.18.6" - "@babel/plugin-proposal-export-namespace-from" "^7.18.9" - "@babel/plugin-proposal-json-strings" "^7.18.6" - "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6" - "@babel/plugin-proposal-numeric-separator" "^7.18.6" - "@babel/plugin-proposal-object-rest-spread" "^7.19.4" - "@babel/plugin-proposal-optional-catch-binding" "^7.18.6" - "@babel/plugin-proposal-optional-chaining" "^7.18.9" - "@babel/plugin-proposal-private-methods" "^7.18.6" - "@babel/plugin-proposal-private-property-in-object" "^7.18.6" - "@babel/plugin-proposal-unicode-property-regex" "^7.18.6" - "@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-import-assertions" "^7.18.6" - "@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.18.6" - "@babel/plugin-transform-async-to-generator" "^7.18.6" - "@babel/plugin-transform-block-scoped-functions" "^7.18.6" - "@babel/plugin-transform-block-scoping" "^7.19.4" - "@babel/plugin-transform-classes" "^7.19.0" - "@babel/plugin-transform-computed-properties" "^7.18.9" - "@babel/plugin-transform-destructuring" "^7.19.4" - "@babel/plugin-transform-dotall-regex" "^7.18.6" - "@babel/plugin-transform-duplicate-keys" "^7.18.9" - "@babel/plugin-transform-exponentiation-operator" "^7.18.6" - "@babel/plugin-transform-for-of" "^7.18.8" - "@babel/plugin-transform-function-name" "^7.18.9" - "@babel/plugin-transform-literals" "^7.18.9" - "@babel/plugin-transform-member-expression-literals" "^7.18.6" - "@babel/plugin-transform-modules-amd" "^7.18.6" - "@babel/plugin-transform-modules-commonjs" "^7.18.6" - "@babel/plugin-transform-modules-systemjs" "^7.19.0" - "@babel/plugin-transform-modules-umd" "^7.18.6" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1" - "@babel/plugin-transform-new-target" "^7.18.6" - "@babel/plugin-transform-object-super" "^7.18.6" - "@babel/plugin-transform-parameters" "^7.18.8" - "@babel/plugin-transform-property-literals" "^7.18.6" - "@babel/plugin-transform-regenerator" "^7.18.6" - "@babel/plugin-transform-reserved-words" "^7.18.6" - "@babel/plugin-transform-shorthand-properties" "^7.18.6" - "@babel/plugin-transform-spread" "^7.19.0" - "@babel/plugin-transform-sticky-regex" "^7.18.6" - "@babel/plugin-transform-template-literals" "^7.18.9" - "@babel/plugin-transform-typeof-symbol" "^7.18.9" - "@babel/plugin-transform-unicode-escapes" "^7.18.10" - "@babel/plugin-transform-unicode-regex" "^7.18.6" - "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.19.4" - babel-plugin-polyfill-corejs2 "^0.3.3" - babel-plugin-polyfill-corejs3 "^0.6.0" - babel-plugin-polyfill-regenerator "^0.4.1" - core-js-compat "^3.25.1" - semver "^6.3.0" - -"@babel/preset-modules@^0.1.5": - version "0.1.5" - resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9" - integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA== - dependencies: - "@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/runtime@^7.0.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.9.2": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.4.tgz#a42f814502ee467d55b38dd1c256f53a7b885c78" - integrity sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.11.2", "@babel/runtime@^7.8.4": - version "7.20.1" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.1.tgz#1148bb33ab252b165a06698fde7576092a78b4a9" - integrity sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg== - dependencies: - regenerator-runtime "^0.13.10" - -"@babel/runtime@^7.13.10": - version "7.20.13" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.13.tgz#7055ab8a7cff2b8f6058bf6ae45ff84ad2aded4b" - integrity sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA== - dependencies: - regenerator-runtime "^0.13.11" - -"@babel/template@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" - integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.18.10" - "@babel/types" "^7.18.10" - -"@babel/traverse@^7.14.0", "@babel/traverse@^7.16.8", "@babel/traverse@^7.19.1", "@babel/traverse@^7.19.4", "@babel/traverse@^7.19.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.6.tgz#7b4c865611df6d99cb131eec2e8ac71656a490dc" - integrity sha512-6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.19.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.19.6" - "@babel/types" "^7.19.4" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/traverse@^7.19.0": - version "7.20.1" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.1.tgz#9b15ccbf882f6d107eeeecf263fbcdd208777ec8" - integrity sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.20.1" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.20.1" - "@babel/types" "^7.20.0" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/types@^7.0.0", "@babel/types@^7.16.8", "@babel/types@^7.18.10", "@babel/types@^7.18.13", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.19.0", "@babel/types@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.4.tgz#0dd5c91c573a202d600490a35b33246fed8a41c7" - integrity sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw== - dependencies: - "@babel/helper-string-parser" "^7.19.4" - "@babel/helper-validator-identifier" "^7.19.1" - to-fast-properties "^2.0.0" - -"@babel/types@^7.20.0", "@babel/types@^7.4.4": - version "7.20.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.0.tgz#52c94cf8a7e24e89d2a194c25c35b17a64871479" - integrity sha512-Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg== - dependencies: - "@babel/helper-string-parser" "^7.19.4" - "@babel/helper-validator-identifier" "^7.19.1" - to-fast-properties "^2.0.0" - -"@codemirror/commands@^6.1.1": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@codemirror/commands/-/commands-6.1.2.tgz#84fb7d170047c3aeb7b0047ace59510bb19208de" - integrity sha512-sO3jdX1s0pam6lIdeSJLMN3DQ6mPEbM4yLvyKkdqtmd/UDwhXA5+AwFJ89rRXm6vTeOXBsE5cAmlos/t7MJdgg== - dependencies: - "@codemirror/language" "^6.0.0" - "@codemirror/state" "^6.0.0" - "@codemirror/view" "^6.0.0" - "@lezer/common" "^1.0.0" - -"@codemirror/lang-json@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@codemirror/lang-json/-/lang-json-6.0.0.tgz#6ac373248c2d44ceab6d5d58879cc543095e503e" - integrity sha512-DvTcYTKLmg2viADXlTdufrT334M9jowe1qO02W28nvm+nejcvhM5vot5mE8/kPrxYw/HJHhwu1z2PyBpnMLCNQ== - dependencies: - "@codemirror/language" "^6.0.0" - "@lezer/json" "^1.0.0" - -"@codemirror/language@^6.0.0", "@codemirror/language@^6.2.1": - version "6.2.1" - resolved "https://registry.yarnpkg.com/@codemirror/language/-/language-6.2.1.tgz#cb10cd785a76e50ecd2fe2dc59ff66af8a41b87a" - integrity sha512-MC3svxuvIj0MRpFlGHxLS6vPyIdbTr2KKPEW46kCoCXw2ktb4NTkpkPBI/lSP/FoNXLCBJ0mrnUi1OoZxtpW1Q== - dependencies: - "@codemirror/state" "^6.0.0" - "@codemirror/view" "^6.0.0" - "@lezer/common" "^1.0.0" - "@lezer/highlight" "^1.0.0" - "@lezer/lr" "^1.0.0" - style-mod "^4.0.0" - -"@codemirror/lint@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@codemirror/lint/-/lint-6.0.0.tgz#a249b021ac9933b94fe312d994d220f0ef11a157" - integrity sha512-nUUXcJW1Xp54kNs+a1ToPLK8MadO0rMTnJB8Zk4Z8gBdrN0kqV7uvUraU/T2yqg+grDNR38Vmy/MrhQN/RgwiA== - dependencies: - "@codemirror/state" "^6.0.0" - "@codemirror/view" "^6.0.0" - crelt "^1.0.5" - -"@codemirror/state@^6.0.0", "@codemirror/state@^6.1.2": - version "6.1.2" - resolved "https://registry.yarnpkg.com/@codemirror/state/-/state-6.1.2.tgz#182d46eabcc17c95508984d6add5a5a641dcd517" - integrity sha512-Mxff85Hp5va+zuj+H748KbubXjrinX/k28lj43H14T2D0+4kuvEFIEIO7hCEcvBT8ubZyIelt9yGOjj2MWOEQA== - -"@codemirror/theme-one-dark@^6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@codemirror/theme-one-dark/-/theme-one-dark-6.1.0.tgz#6f8b3c7fc22e9fec59edd573f4ba9546db42e007" - integrity sha512-AiTHtFRu8+vWT9wWUWDM+cog6ZwgivJogB1Tm/g40NIpLwph7AnmxrSzWfvJN5fBVufsuwBxecQCNmdcR5D7Aw== - dependencies: - "@codemirror/language" "^6.0.0" - "@codemirror/state" "^6.0.0" - "@codemirror/view" "^6.0.0" - "@lezer/highlight" "^1.0.0" - -"@codemirror/view@^6.0.0", "@codemirror/view@^6.3.0": - version "6.4.0" - resolved "https://registry.yarnpkg.com/@codemirror/view/-/view-6.4.0.tgz#f8c213ab6dfec56048b372d2c378213428e2b4e5" - integrity sha512-Kv32b6Tn7QVwFbj/EDswTLSocjk5kgggF6zzBFAL4o4hZ/vmtFD155+EjH1pVlbfoDyVC2M6SedPsMrwYscgNg== - dependencies: - "@codemirror/state" "^6.0.0" - style-mod "^4.0.0" - w3c-keyname "^2.2.4" - -"@cspotcode/source-map-support@^0.8.0": - version "0.8.1" - resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1" - integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw== - dependencies: - "@jridgewell/trace-mapping" "0.3.9" - -"@csstools/selector-specificity@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz#1bfafe4b7ed0f3e4105837e056e0a89b108ebe36" - integrity sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg== - -"@esbuild/android-arm64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.4.tgz#4b31b9e3da2e4c12a8170bd682f713c775f68ab1" - integrity sha512-VPuTzXFm/m2fcGfN6CiwZTlLzxrKsWbPkG7ArRFpuxyaHUm/XFHQPD4xNwZT6uUmpIHhnSjcaCmcla8COzmZ5Q== - -"@esbuild/android-arm@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.4.tgz#057d3e8b0ee41ff59386c33ba6dcf20f4bedd1f7" - integrity sha512-rZzb7r22m20S1S7ufIc6DC6W659yxoOrl7sKP1nCYhuvUlnCFHVSbATG4keGUtV8rDz11sRRDbWkvQZpzPaHiw== - -"@esbuild/android-x64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.4.tgz#62ccab8ac1d3e6ef1df3fa2e1974bc2b8528d74a" - integrity sha512-MW+B2O++BkcOfMWmuHXB15/l1i7wXhJFqbJhp82IBOais8RBEQv2vQz/jHrDEHaY2X0QY7Wfw86SBL2PbVOr0g== - -"@esbuild/darwin-arm64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.4.tgz#c19a6489d626c36fc611c85ccd8a3333c1f2a930" - integrity sha512-a28X1O//aOfxwJVZVs7ZfM8Tyih2Za4nKJrBwW5Wm4yKsnwBy9aiS/xwpxiiTRttw3EaTg4Srerhcm6z0bu9Wg== - -"@esbuild/darwin-x64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.4.tgz#b726bbc84a1e277f6ec2509d10b8ee03f242b776" - integrity sha512-e3doCr6Ecfwd7VzlaQqEPrnbvvPjE9uoTpxG5pyLzr2rI2NMjDHmvY1E5EO81O/e9TUOLLkXA5m6T8lfjK9yAA== - -"@esbuild/freebsd-arm64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.4.tgz#364568e6ca2901297f247de0681c9b14bbe658c8" - integrity sha512-Oup3G/QxBgvvqnXWrBed7xxkFNwAwJVHZcklWyQt7YCAL5bfUkaa6FVWnR78rNQiM8MqqLiT6ZTZSdUFuVIg1w== - -"@esbuild/freebsd-x64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.4.tgz#44701ba4a5497ba64eec0a6c9e221d8f46a25e72" - integrity sha512-vAP+eYOxlN/Bpo/TZmzEQapNS8W1njECrqkTpNgvXskkkJC2AwOXwZWai/Kc2vEFZUXQttx6UJbj9grqjD/+9Q== - -"@esbuild/linux-arm64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.4.tgz#b58fb418ec9ac714d8dbb38c787ff2441eb1d9db" - integrity sha512-2zXoBhv4r5pZiyjBKrOdFP4CXOChxXiYD50LRUU+65DkdS5niPFHbboKZd/c81l0ezpw7AQnHeoCy5hFrzzs4g== - -"@esbuild/linux-arm@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.4.tgz#b37f15ecddb53eeea466e5960e31a58f33e0e87e" - integrity sha512-A47ZmtpIPyERxkSvIv+zLd6kNIOtJH03XA0Hy7jaceRDdQaQVGSDt4mZqpWqJYgDk9rg96aglbF6kCRvPGDSUA== - -"@esbuild/linux-ia32@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.4.tgz#117e32a9680b5deac184ebee122f8575369fad1b" - integrity sha512-uxdSrpe9wFhz4yBwt2kl2TxS/NWEINYBUFIxQtaEVtglm1eECvsj1vEKI0KX2k2wCe17zDdQ3v+jVxfwVfvvjw== - -"@esbuild/linux-loong64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.4.tgz#dd504fb83c280752d4b485d9acb3cf391cb7bf5b" - integrity sha512-peDrrUuxbZ9Jw+DwLCh/9xmZAk0p0K1iY5d2IcwmnN+B87xw7kujOkig6ZRcZqgrXgeRGurRHn0ENMAjjD5DEg== - -"@esbuild/linux-mips64el@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.4.tgz#9ab77e31cf3be1e35572afff94b51df8149d15bd" - integrity sha512-sD9EEUoGtVhFjjsauWjflZklTNr57KdQ6xfloO4yH1u7vNQlOfAlhEzbyBKfgbJlW7rwXYBdl5/NcZ+Mg2XhQA== - -"@esbuild/linux-ppc64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.4.tgz#69d56c2a960808bee1c7b9b84a115220ec9ce05c" - integrity sha512-X1HSqHUX9D+d0l6/nIh4ZZJ94eQky8d8z6yxAptpZE3FxCWYWvTDd9X9ST84MGZEJx04VYUD/AGgciddwO0b8g== - -"@esbuild/linux-riscv64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.4.tgz#9fc23583f4a1508a8d352bd376340e42217e8a90" - integrity sha512-97ANpzyNp0GTXCt6SRdIx1ngwncpkV/z453ZuxbnBROCJ5p/55UjhbaG23UdHj88fGWLKPFtMoU4CBacz4j9FA== - -"@esbuild/linux-s390x@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.16.4.tgz#4cae1f70ac2943f076dd130c3c80d28f57bf75d1" - integrity sha512-pUvPQLPmbEeJRPjP0DYTC1vjHyhrnCklQmCGYbipkep+oyfTn7GTBJXoPodR7ZS5upmEyc8lzAkn2o29wD786A== - -"@esbuild/linux-x64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.16.4.tgz#fdf494de07cda23a2dc4b71ff1e0848e4ee6539c" - integrity sha512-N55Q0mJs3Sl8+utPRPBrL6NLYZKBCLLx0bme/+RbjvMforTGGzFvsRl4xLTZMUBFC1poDzBEPTEu5nxizQ9Nlw== - -"@esbuild/netbsd-x64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.4.tgz#b59ecb49087119c575c0f64d7e66001d52799e24" - integrity sha512-LHSJLit8jCObEQNYkgsDYBh2JrJT53oJO2HVdkSYLa6+zuLJh0lAr06brXIkljrlI+N7NNW1IAXGn/6IZPi3YQ== - -"@esbuild/openbsd-x64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.4.tgz#c51e36db875948b7b11d08bafa355605a1aa289c" - integrity sha512-nLgdc6tWEhcCFg/WVFaUxHcPK3AP/bh+KEwKtl69Ay5IBqUwKDaq/6Xk0E+fh/FGjnLwqFSsarsbPHeKM8t8Sw== - -"@esbuild/sunos-x64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.16.4.tgz#0b50e941cd44f069e9f2573321aec984244ec228" - integrity sha512-08SluG24GjPO3tXKk95/85n9kpyZtXCVwURR2i4myhrOfi3jspClV0xQQ0W0PYWHioJj+LejFMt41q+PG3mlAQ== - -"@esbuild/win32-arm64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.16.4.tgz#d1c93b20f17355ab2221cd18e13ae2f1b68013e3" - integrity sha512-yYiRDQcqLYQSvNQcBKN7XogbrSvBE45FEQdH8fuXPl7cngzkCvpsG2H9Uey39IjQ6gqqc+Q4VXYHsQcKW0OMjQ== - -"@esbuild/win32-ia32@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.16.4.tgz#df5910e76660e0acbbdceb8d4ae6bf1efeade6ae" - integrity sha512-5rabnGIqexekYkh9zXG5waotq8mrdlRoBqAktjx2W3kb0zsI83mdCwrcAeKYirnUaTGztR5TxXcXmQrEzny83w== - -"@esbuild/win32-x64@0.16.4": - version "0.16.4" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.4.tgz#6ec594468610c176933da1387c609558371d37e0" - integrity sha512-sN/I8FMPtmtT2Yw+Dly8Ur5vQ5a/RmC8hW7jO9PtPSQUPkowxWpcUZnqOggU7VwyT3Xkj6vcXWd3V/qTXwultQ== - -"@eslint/eslintrc@^1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz#af58772019a2d271b7e2d4c23ff4ddcba3ccfb3e" - integrity sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA== - dependencies: - ajv "^6.12.4" - debug "^4.3.2" - espree "^9.4.0" - globals "^13.19.0" - ignore "^5.2.0" - import-fresh "^3.2.1" - js-yaml "^4.1.0" - minimatch "^3.1.2" - strip-json-comments "^3.1.1" - -"@formkit/core@1.0.0-beta.13-c578106", "@formkit/core@^1.0.0-beta.13-c578106": - version "1.0.0-beta.13-c578106" - resolved "https://registry.yarnpkg.com/@formkit/core/-/core-1.0.0-beta.13-c578106.tgz#d6913131cc9ead96f55ec8dd595c8d3fd6542cd9" - integrity sha512-VxpegiuoDHRqPha2vHl0GbFg7F5qZd75P7HSkdOy036vPOW0AIgRyWfJg435zOqAIFuCJIZLEcRn221UPMIQsw== - dependencies: - "@formkit/utils" "1.0.0-beta.13-c578106" - -"@formkit/core@1.0.0-beta.9-f64c966": - version "1.0.0-beta.9-f64c966" - resolved "https://registry.yarnpkg.com/@formkit/core/-/core-1.0.0-beta.9-f64c966.tgz#170ebbe7f88eed30934b957d8adccdebb303ac62" - integrity sha512-EOUlP129AhGR6CgUIHlc1L9zkBfuHf3GGr/6s3m2r2CFlfgFEu3/cVeIUQtc75MpfLtfnLOk1cNW+z1vKfcOJQ== - dependencies: - "@formkit/utils" "1.0.0-beta.9-f64c966" - -"@formkit/dev@1.0.0-beta.13-c578106", "@formkit/dev@^1.0.0-beta.13-c578106": - version "1.0.0-beta.13-c578106" - resolved "https://registry.yarnpkg.com/@formkit/dev/-/dev-1.0.0-beta.13-c578106.tgz#113464c3cbe66ec19e4a9c0b871719c8759fa9b2" - integrity sha512-vVBStwI3CgEapwqQN2i9LCVfxaascebqLV/qO2sZds7DSaBB0iGXVrvN776uyue4qUwqTGXnn66Jh36d4w+8cw== - dependencies: - "@formkit/core" "1.0.0-beta.13-c578106" - "@formkit/utils" "1.0.0-beta.13-c578106" - -"@formkit/i18n@1.0.0-beta.13-c578106", "@formkit/i18n@^1.0.0-beta.13-c578106": - version "1.0.0-beta.13-c578106" - resolved "https://registry.yarnpkg.com/@formkit/i18n/-/i18n-1.0.0-beta.13-c578106.tgz#7bf4da00abcc88db59d35c1ee27cce5672e1a2b2" - integrity sha512-Jfn7vTeZdbg/JF+OSVYGqZpYlp8A1q5WY7LwjyBeULa62cryGt+kDoT+unBV0t04u2YBjc/2OUi/VYOyKUCbeA== - dependencies: - "@formkit/core" "1.0.0-beta.13-c578106" - "@formkit/utils" "1.0.0-beta.13-c578106" - "@formkit/validation" "1.0.0-beta.13-c578106" - -"@formkit/inputs@1.0.0-beta.13-c578106", "@formkit/inputs@^1.0.0-beta.13-c578106": - version "1.0.0-beta.13-c578106" - resolved "https://registry.yarnpkg.com/@formkit/inputs/-/inputs-1.0.0-beta.13-c578106.tgz#5c75737c48b02dd13c5cd53aa7c769b0a5650fc9" - integrity sha512-wVVbvIpUW8ygQgpCI6/WVv1TogxLgC/dcug0B1RbROrLHYWZoqifYMUX1riLy77/XNuJDBeFvQ6cN1u8GS2kCQ== - dependencies: - "@formkit/core" "1.0.0-beta.13-c578106" - -"@formkit/observer@1.0.0-beta.13-c578106": - version "1.0.0-beta.13-c578106" - resolved "https://registry.yarnpkg.com/@formkit/observer/-/observer-1.0.0-beta.13-c578106.tgz#384a10ab38f834b3ddb5938c875e43b3535d735a" - integrity sha512-9Bm51emD1FjdD6cxpdkIlslnhctTRtmdYVkIAqGfbiVXKIyBAA7yt9cqEF1zHuvEGjhwec21Ic/vR7BXr9O/8w== - dependencies: - "@formkit/core" "1.0.0-beta.13-c578106" - "@formkit/utils" "1.0.0-beta.13-c578106" - -"@formkit/rules@1.0.0-beta.13-c578106", "@formkit/rules@^1.0.0-beta.13-c578106": - version "1.0.0-beta.13-c578106" - resolved "https://registry.yarnpkg.com/@formkit/rules/-/rules-1.0.0-beta.13-c578106.tgz#598bcac9a9d970452b4692636cc479d9551f86c7" - integrity sha512-TYWSu12A539jaGmQkRCAYYawKaeiVGLdXv0s70cv/AsowBi+NPTcS7OabyYri6OidByvwLqqUF00Nk290mB14w== - dependencies: - "@formkit/core" "1.0.0-beta.13-c578106" - "@formkit/utils" "1.0.0-beta.13-c578106" - "@formkit/validation" "1.0.0-beta.13-c578106" - -"@formkit/tailwindcss@^1.0.0-beta.13-c578106": - version "1.0.0-beta.9-f64c966" - resolved "https://registry.yarnpkg.com/@formkit/tailwindcss/-/tailwindcss-1.0.0-beta.9-f64c966.tgz#6aee01eb94b5d1e6f6680288294fa11711d37136" - integrity sha512-U4uLNPmdkbX3xQZiDmYaSgtImyNNgqEccfgbH85eoCeHkJD7r6BhjPCTdYnSh/8NoGGLX0rp0rcyO42aB+uNwQ== - dependencies: - "@formkit/themes" "1.0.0-beta.9-f64c966" - -"@formkit/themes@1.0.0-beta.13-c578106", "@formkit/themes@^1.0.0-beta.13-c578106": - version "1.0.0-beta.13-c578106" - resolved "https://registry.yarnpkg.com/@formkit/themes/-/themes-1.0.0-beta.13-c578106.tgz#12cf733e9792a6f5bf04e94dbd236099e43ad0c1" - integrity sha512-Cu/FS6E9oWOtsCfjgSBkC3Jq/Wx5EECnbA40qF1uqLBFZb4+g5qYfMPyxMYDunFEkKEKzbaKybA1wCj2krNiuw== - dependencies: - "@formkit/core" "1.0.0-beta.13-c578106" - -"@formkit/themes@1.0.0-beta.9-f64c966": - version "1.0.0-beta.9-f64c966" - resolved "https://registry.yarnpkg.com/@formkit/themes/-/themes-1.0.0-beta.9-f64c966.tgz#e1c872291458f4aedb36b91b8279ad9a1856efbe" - integrity sha512-Iy/9KoNAZfB/MI6HUfsuxSg8+Ys2veuXoyJNr5AaNDRfzihrv3wIIv1nZuonXgQm3X7+mnfrSybBcXPtqnKU7Q== - dependencies: - "@formkit/core" "1.0.0-beta.9-f64c966" - -"@formkit/utils@1.0.0-beta.13-c578106", "@formkit/utils@^1.0.0-beta.13-c578106": - version "1.0.0-beta.13-c578106" - resolved "https://registry.yarnpkg.com/@formkit/utils/-/utils-1.0.0-beta.13-c578106.tgz#cb036a4a2d5ba10d474aaf05eca96a0adbaed22b" - integrity sha512-BXRJSKM+gK/fIepEtuEiaDFFQHKAp76+z0w36Vor3TDmv/aLn7cnTOZA6YDLtkdm0ps34zjIh+fGtHsWyCKFfA== - -"@formkit/utils@1.0.0-beta.9-f64c966": - version "1.0.0-beta.9-f64c966" - resolved "https://registry.yarnpkg.com/@formkit/utils/-/utils-1.0.0-beta.9-f64c966.tgz#a0541ecbc14529c00ff16c00dc03dec004085b6f" - integrity sha512-MPldWKsqmabj7LzMOlha0G6Fn+a6hShc7jyiF1j0P9rJdj9lYyk7t286co4CxqhQNgOpU0XOv7FZroq8k6clzQ== - -"@formkit/validation@1.0.0-beta.13-c578106", "@formkit/validation@^1.0.0-beta.13-c578106": - version "1.0.0-beta.13-c578106" - resolved "https://registry.yarnpkg.com/@formkit/validation/-/validation-1.0.0-beta.13-c578106.tgz#054586fa0e06ba0c80f098a7b89af6d61401eedb" - integrity sha512-AQ5VAbFXJ8twRbd4YsKMbyj2k/xeOh4OIiyGEkBktejb/e0NGmxtsFXDGOWOMSZWpTR/nsBy6mlC2U/ifZqW4A== - dependencies: - "@formkit/core" "1.0.0-beta.13-c578106" - "@formkit/observer" "1.0.0-beta.13-c578106" - -"@formkit/vue@^1.0.0-beta.13-c578106": - version "1.0.0-beta.13-c578106" - resolved "https://registry.yarnpkg.com/@formkit/vue/-/vue-1.0.0-beta.13-c578106.tgz#83033f1e907c835ff36621f4e7fab228f4d8c03f" - integrity sha512-v/iJrDMfQ/0TOoJiG8ft/csW0Yq0wJqi/l6ToLZI8zHQ8tW0Y4//wSv5ofa9Th7aFwPIRoC2KaC65ox8dVBwSQ== - dependencies: - "@formkit/core" "1.0.0-beta.13-c578106" - "@formkit/dev" "1.0.0-beta.13-c578106" - "@formkit/i18n" "1.0.0-beta.13-c578106" - "@formkit/inputs" "1.0.0-beta.13-c578106" - "@formkit/observer" "1.0.0-beta.13-c578106" - "@formkit/rules" "1.0.0-beta.13-c578106" - "@formkit/themes" "1.0.0-beta.13-c578106" - "@formkit/utils" "1.0.0-beta.13-c578106" - "@formkit/validation" "1.0.0-beta.13-c578106" - -"@graphql-codegen/add@^3.2.1": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-3.2.1.tgz#f1109f36f194f88a6abcc51703abee43ebbb50a2" - integrity sha512-w82H/evh8SSGoD3K6K/Oh3kqSdbuU+TgHqMYmmHFxtH692v2xhN/cu1s/TotBQ7r4mO7OQutze7dde2tZEXGEQ== - dependencies: - "@graphql-codegen/plugin-helpers" "^2.6.2" - tslib "~2.4.0" - -"@graphql-codegen/cli@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-3.0.0.tgz#eb367adfe51349e4822518183fc7ea7c06aea11b" - integrity sha512-16nuFabHCfPQ/d+v52OvR1ueL8eiJvS/nRuvuEV8d9T1fkborHKRw4lhyKVebu9izFBs6G0CvVCLhgVzQwHSLw== - dependencies: - "@babel/generator" "^7.18.13" - "@babel/template" "^7.18.10" - "@babel/types" "^7.18.13" - "@graphql-codegen/core" "^3.0.0" - "@graphql-codegen/plugin-helpers" "^4.0.0" - "@graphql-tools/apollo-engine-loader" "^7.3.6" - "@graphql-tools/code-file-loader" "^7.3.17" - "@graphql-tools/git-loader" "^7.2.13" - "@graphql-tools/github-loader" "^7.3.20" - "@graphql-tools/graphql-file-loader" "^7.5.0" - "@graphql-tools/json-file-loader" "^7.4.1" - "@graphql-tools/load" "^7.8.0" - "@graphql-tools/prisma-loader" "^7.2.49" - "@graphql-tools/url-loader" "^7.13.2" - "@graphql-tools/utils" "^9.0.0" - "@whatwg-node/fetch" "^0.6.0" - chalk "^4.1.0" - chokidar "^3.5.2" - cosmiconfig "^7.0.0" - cosmiconfig-typescript-loader "^4.3.0" - debounce "^1.2.0" - detect-indent "^6.0.0" - graphql-config "^4.4.0" - inquirer "^8.0.0" - is-glob "^4.0.1" - json-to-pretty-yaml "^1.2.2" - listr2 "^4.0.5" - log-symbols "^4.0.0" - shell-quote "^1.7.3" - string-env-interpolation "^1.0.1" - ts-log "^2.2.3" - ts-node "^10.9.1" - tslib "^2.4.0" - yaml "^1.10.0" - yargs "^17.0.0" - -"@graphql-codegen/core@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-3.0.0.tgz#ff6d643bb9d80c54ddd9ee5c68194888c971ae45" - integrity sha512-WUfAUTmUcgeHPR7F5ZQqaBqJLJb5+3Lvp6v9SrnupKOFed+Q3u8CvZL6sPTvDpqqW8Ucjy59DEZqumPLp99pdQ== - dependencies: - "@graphql-codegen/plugin-helpers" "^4.0.0" - "@graphql-tools/schema" "^9.0.0" - "@graphql-tools/utils" "^9.1.1" - tslib "~2.4.0" - -"@graphql-codegen/introspection@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/introspection/-/introspection-3.0.0.tgz#10d73e58d34efb5d0fc23e5832141427e8f4418d" - integrity sha512-PwHPcCg3svkLhcBd88KDHVpj0FuWMPfbx8RxTnLIH6jFyI5QkSSctQavGLO0o4IYiiQjgftEcfbNRtadvEmxtg== - dependencies: - "@graphql-codegen/plugin-helpers" "^4.0.0" - "@graphql-codegen/visitor-plugin-common" "^3.0.0" - tslib "~2.4.0" - -"@graphql-codegen/near-operation-file-preset@^2.5.0": - version "2.5.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/near-operation-file-preset/-/near-operation-file-preset-2.5.0.tgz#987d9bb8d0101e944b9afc406b77d098a4c1e978" - integrity sha512-S9PNJP5tTkUWBQ6inbviOsTREzsMxYVqJGrtPcIdMWkKLZAAItAfAb60klB1T64vt6Oru+nUf8IYUNrchJ8MYg== - dependencies: - "@graphql-codegen/add" "^3.2.1" - "@graphql-codegen/plugin-helpers" "^2.7.2" - "@graphql-codegen/visitor-plugin-common" "2.13.1" - "@graphql-tools/utils" "^8.8.0" - parse-filepath "^1.0.2" - tslib "~2.4.0" - -"@graphql-codegen/plugin-helpers@^2.6.2": - version "2.7.1" - resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-2.7.1.tgz#de999bdf8a1485f6f3c4c5f21cfb038e99d67e3e" - integrity sha512-wpEShhwbQp8pqXolnSCNaj0pU91LbuBvYHpYqm96TUqyeKQYAYRVmw3JIt0g8UQpKYhg8lYIDwWdcINOYqkGLg== - dependencies: - "@graphql-tools/utils" "^8.8.0" - change-case-all "1.0.14" - common-tags "1.8.2" - import-from "4.0.0" - lodash "~4.17.0" - tslib "~2.4.0" - -"@graphql-codegen/plugin-helpers@^2.7.2": - version "2.7.2" - resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-2.7.2.tgz#6544f739d725441c826a8af6a49519f588ff9bed" - integrity sha512-kln2AZ12uii6U59OQXdjLk5nOlh1pHis1R98cDZGFnfaiAbX9V3fxcZ1MMJkB7qFUymTALzyjZoXXdyVmPMfRg== - dependencies: - "@graphql-tools/utils" "^8.8.0" - change-case-all "1.0.14" - common-tags "1.8.2" - import-from "4.0.0" - lodash "~4.17.0" - tslib "~2.4.0" - -"@graphql-codegen/plugin-helpers@^3.0.0": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-3.1.2.tgz#69a2e91178f478ea6849846ade0a59a844d34389" - integrity sha512-emOQiHyIliVOIjKVKdsI5MXj312zmRDwmHpyUTZMjfpvxq/UVAHUJIVdVf+lnjjrI+LXBTgMlTWTgHQfmICxjg== - dependencies: - "@graphql-tools/utils" "^9.0.0" - change-case-all "1.0.15" - common-tags "1.8.2" - import-from "4.0.0" - lodash "~4.17.0" - tslib "~2.4.0" - -"@graphql-codegen/plugin-helpers@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-4.0.0.tgz#9c10e4700dc6efe657781dff47347d0c99674061" - integrity sha512-vgNGTanT36hC4RAC/LAThMEjDvnu3WCyx6MtKZcPUtfCWFxbUAr88+OarGl1LAEiOef0agIREC7tIBXCqjKkJA== - dependencies: - "@graphql-tools/utils" "^9.0.0" - change-case-all "1.0.15" - common-tags "1.8.2" - import-from "4.0.0" - lodash "~4.17.0" - tslib "~2.4.0" - -"@graphql-codegen/schema-ast@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-3.0.0.tgz#3311a58184f885853d33d8272c527ff5bdf3023b" - integrity sha512-5gC8nNk/bxufS2LBSpaPExRgn6eNo8LQdtwDtwfM9XGEzt/F6rIBQoyOmqqwkiBmgu1PHHH8kLZMBYvYB1x5DA== - dependencies: - "@graphql-codegen/plugin-helpers" "^4.0.0" - "@graphql-tools/utils" "^9.0.0" - tslib "~2.4.0" - -"@graphql-codegen/typescript-operations@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-3.0.0.tgz#e67c9dedb739a20f8a1d2c9a9631701c269de0c1" - integrity sha512-t+Lk+lxkUFDh6F0t8CErowOccP3bZwxhl66qmEeBcOrC7jQrSCnRZoFvOXhFKFBJe/y4DIJiizgSr34AqjiJIQ== - dependencies: - "@graphql-codegen/plugin-helpers" "^4.0.0" - "@graphql-codegen/typescript" "^3.0.0" - "@graphql-codegen/visitor-plugin-common" "3.0.0" - auto-bind "~4.0.0" - tslib "~2.4.0" - -"@graphql-codegen/typescript-vue-apollo@^3.3.7": - version "3.3.7" - resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-vue-apollo/-/typescript-vue-apollo-3.3.7.tgz#1a421bf005c04bd489796bb6f4186077fadf6e44" - integrity sha512-vb5gR5B+5gvMtXUG/fnLzPz+QM3aeeVezCRKygeOrHorA9sPtRLKH54FHeQzRCMp0Sbz36jdljpe/LaFoDiiDw== - dependencies: - "@graphql-codegen/plugin-helpers" "^3.0.0" - "@graphql-codegen/visitor-plugin-common" "2.13.1" - auto-bind "~4.0.0" - change-case-all "1.0.15" - tslib "~2.4.0" - -"@graphql-codegen/typescript@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-3.0.0.tgz#473dde1646540039bca5db4b6daf174d13af0ce3" - integrity sha512-FQWyuIUy1y+fxb9+EZfvdBHBQpYExlIBHV5sg2WGNCsyVyCqBTl0mO8icyOtsQPVg6YFMFe8JJO69vQbwHma5w== - dependencies: - "@graphql-codegen/plugin-helpers" "^4.0.0" - "@graphql-codegen/schema-ast" "^3.0.0" - "@graphql-codegen/visitor-plugin-common" "3.0.0" - auto-bind "~4.0.0" - tslib "~2.4.0" - -"@graphql-codegen/visitor-plugin-common@2.13.1": - version "2.13.1" - resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-2.13.1.tgz#2228660f6692bcdb96b1f6d91a0661624266b76b" - integrity sha512-mD9ufZhDGhyrSaWQGrU1Q1c5f01TeWtSWy/cDwXYjJcHIj1Y/DG2x0tOflEfCvh5WcnmHNIw4lzDsg1W7iFJEg== - dependencies: - "@graphql-codegen/plugin-helpers" "^2.7.2" - "@graphql-tools/optimize" "^1.3.0" - "@graphql-tools/relay-operation-optimizer" "^6.5.0" - "@graphql-tools/utils" "^8.8.0" - auto-bind "~4.0.0" - change-case-all "1.0.14" - dependency-graph "^0.11.0" - graphql-tag "^2.11.0" - parse-filepath "^1.0.2" - tslib "~2.4.0" - -"@graphql-codegen/visitor-plugin-common@3.0.0", "@graphql-codegen/visitor-plugin-common@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-3.0.0.tgz#527185eb3b1b06739702084bc6263713e167a166" - integrity sha512-ZoNlCmmkGClB137SpJT9og/nkihLN7Z4Ynl9Ir3OlbDuI20dbpyXsclpr9QGLcxEcfQeVfhGw9CooW7wZJJ8LA== - dependencies: - "@graphql-codegen/plugin-helpers" "^4.0.0" - "@graphql-tools/optimize" "^1.3.0" - "@graphql-tools/relay-operation-optimizer" "^6.5.0" - "@graphql-tools/utils" "^9.0.0" - auto-bind "~4.0.0" - change-case-all "1.0.15" - dependency-graph "^0.11.0" - graphql-tag "^2.11.0" - parse-filepath "^1.0.2" - tslib "~2.4.0" - -"@graphql-tools/apollo-engine-loader@^7.3.6": - version "7.3.13" - resolved "https://registry.yarnpkg.com/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-7.3.13.tgz#090bf03a99a5aaf8580826125346cb7441b54d94" - integrity sha512-fr2TcA9fM+H81ymdtyDaocZ/Ua4Vhhf1IvpQoPpuEUwLorREd86N8VORUEIBvEdJ1b7Bz7NqwL3RnM5m9KXftA== - dependencies: - "@ardatan/sync-fetch" "0.0.1" - "@graphql-tools/utils" "8.12.0" - "@whatwg-node/fetch" "^0.4.0" - tslib "^2.4.0" - -"@graphql-tools/batch-execute@8.5.15": - version "8.5.15" - resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.5.15.tgz#f61ac71d11e57c9b9f8b8b60fc882e4e9762d182" - integrity sha512-qb12M8XCK6SBJmZDS8Lzd4PVJFsIwNUkYmFuqcTiBqOI/WsoDlQDZI++ghRpGcusLkL9uzcIOTT/61OeHhsaLg== - dependencies: - "@graphql-tools/utils" "9.1.4" - dataloader "2.1.0" - tslib "^2.4.0" - value-or-promise "1.0.12" - -"@graphql-tools/batch-execute@8.5.6": - version "8.5.6" - resolved "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.5.6.tgz#476c2f9af1c302567e798d63063f1a2dfaad754a" - integrity sha512-33vMvVDLBKsNJVNhcySVXF+zkcRL/GRs1Lt+MxygrYCypcAPpFm+amE2y9vOCFufuaKExIX7Lonnmxu19vPzaQ== - dependencies: - "@graphql-tools/utils" "8.12.0" - dataloader "2.1.0" - tslib "^2.4.0" - value-or-promise "1.0.11" - -"@graphql-tools/code-file-loader@^7.3.17": - version "7.3.20" - resolved "https://registry.yarnpkg.com/@graphql-tools/code-file-loader/-/code-file-loader-7.3.20.tgz#6f523bcb5b5bcdbcede4b5894cbcb1890132b002" - integrity sha512-htwylU+/if5j5rgrd/i2xgM22cWC2RGgUGO7K+nxZU+l7iCimJUdDQnqCW9G3eVHbLpVOhyza9bBUNMPzh3sxg== - dependencies: - "@graphql-tools/graphql-tag-pluck" "7.4.6" - "@graphql-tools/utils" "9.2.1" - globby "^11.0.3" - tslib "^2.4.0" - unixify "^1.0.0" - -"@graphql-tools/delegate@9.0.22": - version "9.0.22" - resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-9.0.22.tgz#12f27ef76c5add456fa8797a496bb7dc82071771" - integrity sha512-dWJGMN8V7KORtbI8eDAjHYTWiMyis/md27M6pPhrlYVlcsDk3U0jbNdgkswBBUEBvqumPRCv8pVOxKcLS4caKA== - dependencies: - "@graphql-tools/batch-execute" "8.5.15" - "@graphql-tools/executor" "0.0.12" - "@graphql-tools/schema" "9.0.13" - "@graphql-tools/utils" "9.1.4" - dataloader "2.1.0" - tslib "~2.4.0" - value-or-promise "1.0.12" - -"@graphql-tools/delegate@9.0.8": - version "9.0.8" - resolved "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-9.0.8.tgz#aa792f419a041de0c6341eaecf9694cf6f16f76f" - integrity sha512-h+Uce0Np0eKj7wILOvlffRQ9jEQ4KelNXfqG8A2w+2sO2P6CbKsR7bJ4ch9lcUdCBbZ4Wg6L/K+1C4NRFfzbNw== - dependencies: - "@graphql-tools/batch-execute" "8.5.6" - "@graphql-tools/schema" "9.0.4" - "@graphql-tools/utils" "8.12.0" - dataloader "2.1.0" - tslib "~2.4.0" - value-or-promise "1.0.11" - -"@graphql-tools/executor-graphql-ws@0.0.6": - version "0.0.6" - resolved "https://registry.yarnpkg.com/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-0.0.6.tgz#34c1e5bc6ac1ff292fd6c4b5490b7906c6dd25c2" - integrity sha512-n6JvIviYO8iiasV/baclimQqNkYGP7JRlkNSnphNG5LULmVpQ2WsyvbgJHV7wtlTZ8ZQ3+dILgQF83PFyLsfdA== - dependencies: - "@graphql-tools/utils" "9.1.4" - "@repeaterjs/repeater" "3.0.4" - "@types/ws" "^8.0.0" - graphql-ws "5.11.2" - isomorphic-ws "5.0.0" - tslib "^2.4.0" - ws "8.12.0" - -"@graphql-tools/executor-http@0.1.0": - version "0.1.0" - resolved "https://registry.yarnpkg.com/@graphql-tools/executor-http/-/executor-http-0.1.0.tgz#8071343f4d893d9ffc91c0c675230317282f310f" - integrity sha512-HUas+3EIqbw/reNH3NaO8/5Cc61ZxsoIArES55kR6Nq8lS8VWiEpnuXLXBq2THYemmthVdK3eDCKTJLmUFuKdA== - dependencies: - "@graphql-tools/utils" "9.1.4" - "@repeaterjs/repeater" "3.0.4" - "@whatwg-node/fetch" "0.6.1" - dset "3.1.2" - extract-files "^11.0.0" - meros "1.2.1" - tslib "^2.4.0" - value-or-promise "1.0.12" - -"@graphql-tools/executor-legacy-ws@0.0.6": - version "0.0.6" - resolved "https://registry.yarnpkg.com/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-0.0.6.tgz#236dd5b3d4d19492978b1458b74928e8c69d16ff" - integrity sha512-L1hRuSvBUCNerYDhfeSZXFeqliDlnNXa3fDHTp7efI3Newpbevqa19Fm0mVzsCL7gqIKOwzrPORwh7kOVE/vew== - dependencies: - "@graphql-tools/utils" "9.1.4" - "@types/ws" "^8.0.0" - isomorphic-ws "5.0.0" - tslib "^2.4.0" - ws "8.12.0" - -"@graphql-tools/executor@0.0.12": - version "0.0.12" - resolved "https://registry.yarnpkg.com/@graphql-tools/executor/-/executor-0.0.12.tgz#d885c7fa98a8aaeaa771163b71fb98ce9f52f9bd" - integrity sha512-bWpZcYRo81jDoTVONTnxS9dDHhEkNVjxzvFCH4CRpuyzD3uL+5w3MhtxIh24QyWm4LvQ4f+Bz3eMV2xU2I5+FA== - dependencies: - "@graphql-tools/utils" "9.1.4" - "@graphql-typed-document-node/core" "3.1.1" - "@repeaterjs/repeater" "3.0.4" - tslib "^2.4.0" - value-or-promise "1.0.12" - -"@graphql-tools/git-loader@^7.2.13": - version "7.2.16" - resolved "https://registry.yarnpkg.com/@graphql-tools/git-loader/-/git-loader-7.2.16.tgz#8c025cad12a623ac91e421eb01380cc177070e7c" - integrity sha512-8DsxYfSouhgKPOBcc7MzuOTM4M/j2UNFn2ehXD0MX9q41t3dKffufJZKsKxE6VyyCUoVYdlRFhUWEyOHPVdcfQ== - dependencies: - "@graphql-tools/graphql-tag-pluck" "7.4.3" - "@graphql-tools/utils" "9.1.4" - is-glob "4.0.3" - micromatch "^4.0.4" - tslib "^2.4.0" - unixify "^1.0.0" - -"@graphql-tools/github-loader@^7.3.20": - version "7.3.23" - resolved "https://registry.yarnpkg.com/@graphql-tools/github-loader/-/github-loader-7.3.23.tgz#9688f4b9cd9596229f0f8c7eed7a8f500806defa" - integrity sha512-oYTZCvW520KNVVonjucDSMhabCFnHwtM1rJbyUkA1JFyzpmmNAAyNMWOOPcU/Q9rTESrsH+Hbja0mfpjpnBKLA== - dependencies: - "@ardatan/sync-fetch" "0.0.1" - "@graphql-tools/graphql-tag-pluck" "7.4.3" - "@graphql-tools/utils" "9.1.4" - "@whatwg-node/fetch" "^0.6.0" - tslib "^2.4.0" - -"@graphql-tools/graphql-file-loader@^7.3.7", "@graphql-tools/graphql-file-loader@^7.5.0": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.5.5.tgz#d8afb391282e3dc33005df04bdec8488e4ab101d" - integrity sha512-OL+7qO1S66TpMK7OGz8Ag2WL08HlxKxrObVSDlxzWbSubWuXM5v959XscYAKRf6daYcVpkfNvO37QjflL9mjhg== - dependencies: - "@graphql-tools/import" "6.7.6" - "@graphql-tools/utils" "8.12.0" - globby "^11.0.3" - tslib "^2.4.0" - unixify "^1.0.0" - -"@graphql-tools/graphql-tag-pluck@7.4.3": - version "7.4.3" - resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-7.4.3.tgz#b07f2263c383d9605d941c836dc01a7bbc6e56a7" - integrity sha512-w+nrJVQw+NTuaZNQG5AwSh4Qe+urP/s4rUz5s1T007rDnv1kvkiX+XHOCnIfJzXOTuvFmG4GGYw/x0CuSRaGZQ== - dependencies: - "@babel/parser" "^7.16.8" - "@babel/plugin-syntax-import-assertions" "7.20.0" - "@babel/traverse" "^7.16.8" - "@babel/types" "^7.16.8" - "@graphql-tools/utils" "9.1.4" - tslib "^2.4.0" - -"@graphql-tools/graphql-tag-pluck@7.4.6": - version "7.4.6" - resolved "https://registry.yarnpkg.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-7.4.6.tgz#57fe6f37d0c7c5f8bf3dfbec58f70ec693e70b0a" - integrity sha512-KPlkrC+WtJAg/Sv93rPiDHZDsgQDIZEy9ViHqz80KdRvq0aeQN9TGp26mQCyD7zo1Ib2paT16IVwTNQf02yxpQ== - dependencies: - "@babel/parser" "^7.16.8" - "@babel/plugin-syntax-import-assertions" "7.20.0" - "@babel/traverse" "^7.16.8" - "@babel/types" "^7.16.8" - "@graphql-tools/utils" "9.2.1" - tslib "^2.4.0" - -"@graphql-tools/import@6.7.6": - version "6.7.6" - resolved "https://registry.yarnpkg.com/@graphql-tools/import/-/import-6.7.6.tgz#9bc0bb304a6fcc43aa2c9177631670b1fdfb2115" - integrity sha512-WtUyiO2qCaK/H4u81zAw/NbBvCOzwKl4N+Vl+FqrFCzYobscwL6x6roePyoXM1O3+JJIIn3CETv4kg4kwxaBVw== - dependencies: - "@graphql-tools/utils" "8.12.0" - resolve-from "5.0.0" - tslib "^2.4.0" - -"@graphql-tools/json-file-loader@^7.3.7", "@graphql-tools/json-file-loader@^7.4.1": - version "7.4.6" - resolved "https://registry.yarnpkg.com/@graphql-tools/json-file-loader/-/json-file-loader-7.4.6.tgz#d4135c3e15491eda653f58ed89efbd5e21d0b1b8" - integrity sha512-34AfjCitO4NtJ5AcXYLcFF3GDsMVTycrljSaBA2t1d7B4bMPtREDphKXLMc/Uf2zW6IW1i1sZZyrcmArPy1Z8A== - dependencies: - "@graphql-tools/utils" "8.12.0" - globby "^11.0.3" - tslib "^2.4.0" - unixify "^1.0.0" - -"@graphql-tools/load@^7.5.5": - version "7.8.0" - resolved "https://registry.yarnpkg.com/@graphql-tools/load/-/load-7.8.0.tgz#bd4d2e2a5117de9a60f9691a218217e96afc2ea7" - integrity sha512-l4FGgqMW0VOqo+NMYizwV8Zh+KtvVqOf93uaLo9wJ3sS3y/egPCgxPMDJJ/ufQZG3oZ/0oWeKt68qop3jY0yZg== - dependencies: - "@graphql-tools/schema" "9.0.4" - "@graphql-tools/utils" "8.12.0" - p-limit "3.1.0" - tslib "^2.4.0" - -"@graphql-tools/load@^7.8.0": - version "7.8.11" - resolved "https://registry.yarnpkg.com/@graphql-tools/load/-/load-7.8.11.tgz#b9026dd15729dec1e4c318c67d0d3036b583fd1f" - integrity sha512-pVn3fYP/qZ3m2NE86gSexyZpEmvTSUe+OIRfWBM60a4L/SycMxgVfYB5+PyDCzruFZg/didIG3v7RfPlZ7zNTQ== - dependencies: - "@graphql-tools/schema" "9.0.15" - "@graphql-tools/utils" "9.2.0" - p-limit "3.1.0" - tslib "^2.4.0" - -"@graphql-tools/merge@8.3.15": - version "8.3.15" - resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.15.tgz#9b24ee5e9c36074684515c7d1587cd3e200c8a8f" - integrity sha512-hYYOlsqkUlL6oOo7zzuk6hIv7xQzy+x21sgK84d5FWaiWYkLYh9As8myuDd9SD5xovWWQ9m/iRhIOVDEMSyEKA== - dependencies: - "@graphql-tools/utils" "9.1.4" - tslib "^2.4.0" - -"@graphql-tools/merge@8.3.17": - version "8.3.17" - resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.17.tgz#d7e184a296eb455c1550ab95991c5a2f68ea16a4" - integrity sha512-CLzz49lc6BavPhH9gPRm0sJeNA7kC/tF/jLUTQsyef6xj82Jw3rqIJ9PE+bk1cqPCOG01WLOfquBu445OMDO2g== - dependencies: - "@graphql-tools/utils" "9.2.0" - tslib "^2.4.0" - -"@graphql-tools/merge@8.3.6", "@graphql-tools/merge@^8.2.6": - version "8.3.6" - resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.6.tgz#97a936d4c8e8f935e58a514bb516c476437b5b2c" - integrity sha512-uUBokxXi89bj08P+iCvQk3Vew4vcfL5ZM6NTylWi8PIpoq4r5nJ625bRuN8h2uubEdRiH8ntN9M4xkd/j7AybQ== - dependencies: - "@graphql-tools/utils" "8.12.0" - tslib "^2.4.0" - -"@graphql-tools/optimize@^1.3.0": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/optimize/-/optimize-1.3.1.tgz#29407991478dbbedc3e7deb8c44f46acb4e9278b" - integrity sha512-5j5CZSRGWVobt4bgRRg7zhjPiSimk+/zIuColih8E8DxuFOaJ+t0qu7eZS5KXWBkjcd4BPNuhUPpNlEmHPqVRQ== - dependencies: - tslib "^2.4.0" - -"@graphql-tools/prisma-loader@^7.2.49": - version "7.2.52" - resolved "https://registry.yarnpkg.com/@graphql-tools/prisma-loader/-/prisma-loader-7.2.52.tgz#65378ade54bb75aebd2ccc35c3a3946c0b928354" - integrity sha512-xA0p5wJQouyqDL8I1g1lolnJ8zV73+OIln5ObSSTcC8de7zZjqCAvtXR8X9MPeco0FGHnSJo/qdSaGbbc1kXyA== - dependencies: - "@graphql-tools/url-loader" "7.17.1" - "@graphql-tools/utils" "9.1.4" - "@types/js-yaml" "^4.0.0" - "@types/json-stable-stringify" "^1.0.32" - "@types/jsonwebtoken" "^9.0.0" - chalk "^4.1.0" - debug "^4.3.1" - dotenv "^16.0.0" - graphql-request "^5.0.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" - isomorphic-fetch "^3.0.0" - js-yaml "^4.0.0" - json-stable-stringify "^1.0.1" - jsonwebtoken "^9.0.0" - lodash "^4.17.20" - scuid "^1.1.0" - tslib "^2.4.0" - yaml-ast-parser "^0.0.43" - -"@graphql-tools/relay-operation-optimizer@^6.5.0": - version "6.5.6" - resolved "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-6.5.6.tgz#b0df15fc78fac95000f8d1b1419490822fe79f22" - integrity sha512-2KjaWYxD/NC6KtckbDEAbN46QO+74d1SBaZQ26qQjWhyoAjon12xlMW4HWxHEN0d0xuz0cnOVUVc+t4wVXePUg== - dependencies: - "@ardatan/relay-compiler" "12.0.0" - "@graphql-tools/utils" "8.12.0" - tslib "^2.4.0" - -"@graphql-tools/schema@9.0.13": - version "9.0.13" - resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.13.tgz#56b994777df29ac36586a3200fb6397abf7b9d83" - integrity sha512-guRA3fwAtv+M1Kh930P4ydH9aKJTWscIkhVFcWpj/cnjYYxj88jkEJ15ZNiJX/2breNY+sbVgmlgLKb6aXi/Jg== - dependencies: - "@graphql-tools/merge" "8.3.15" - "@graphql-tools/utils" "9.1.4" - tslib "^2.4.0" - value-or-promise "1.0.12" - -"@graphql-tools/schema@9.0.15": - version "9.0.15" - resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.15.tgz#6632765e0281a6c890c7ea6865f13c10bc98fc1b" - integrity sha512-p2DbpkOBcsi+yCEjwoS+r4pJ5z+3JjlJdhbPkCwC4q8lGf5r93dVYrExOrqGKTU5kxLXI/mxabSxcunjNIsDIg== - dependencies: - "@graphql-tools/merge" "8.3.17" - "@graphql-tools/utils" "9.2.0" - tslib "^2.4.0" - value-or-promise "1.0.12" - -"@graphql-tools/schema@9.0.4", "@graphql-tools/schema@^9.0.0": - version "9.0.4" - resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.4.tgz#1a74608b57abf90fae6fd929d25e5482c57bc05d" - integrity sha512-B/b8ukjs18fq+/s7p97P8L1VMrwapYc3N2KvdG/uNThSazRRn8GsBK0Nr+FH+mVKiUfb4Dno79e3SumZVoHuOQ== - dependencies: - "@graphql-tools/merge" "8.3.6" - "@graphql-tools/utils" "8.12.0" - tslib "^2.4.0" - value-or-promise "1.0.11" - -"@graphql-tools/url-loader@7.17.1": - version "7.17.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-7.17.1.tgz#df32e6b84e13603e096e5a9e8fb3b4bd2c2442b9" - integrity sha512-+WZXkg1ZG4fjAB+SkCHLSr7VFZqZAkA/PILcpoPqwAL/wSsrhCHYwbzuWuKn1SGToxJRt7cc+4P0lfR7fq+xhQ== - dependencies: - "@ardatan/sync-fetch" "0.0.1" - "@graphql-tools/delegate" "9.0.22" - "@graphql-tools/executor-graphql-ws" "0.0.6" - "@graphql-tools/executor-http" "0.1.0" - "@graphql-tools/executor-legacy-ws" "0.0.6" - "@graphql-tools/utils" "9.1.4" - "@graphql-tools/wrap" "9.3.0" - "@types/ws" "^8.0.0" - "@whatwg-node/fetch" "^0.6.0" - isomorphic-ws "5.0.0" - tslib "^2.4.0" - value-or-promise "^1.0.11" - ws "8.12.0" - -"@graphql-tools/url-loader@^7.13.2", "@graphql-tools/url-loader@^7.9.7": - version "7.16.4" - resolved "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-7.16.4.tgz#d27787ef9f35fe71b456c067c3a1759b1ecd76a8" - integrity sha512-7yGrJJNcqVQIplCyVLk7tW2mAgYyZ06FRmCBnzw3B61+aIjFavrm6YlnKkhdqYSYyFmIbVcigdP3vkoYIu23TA== - dependencies: - "@ardatan/sync-fetch" "0.0.1" - "@graphql-tools/delegate" "9.0.8" - "@graphql-tools/utils" "8.12.0" - "@graphql-tools/wrap" "9.2.3" - "@types/ws" "^8.0.0" - "@whatwg-node/fetch" "^0.4.0" - dset "^3.1.2" - extract-files "^11.0.0" - graphql-ws "^5.4.1" - isomorphic-ws "^5.0.0" - meros "^1.1.4" - tslib "^2.4.0" - value-or-promise "^1.0.11" - ws "^8.3.0" - -"@graphql-tools/utils@8.12.0", "@graphql-tools/utils@^8.8.0": - version "8.12.0" - resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.12.0.tgz#243bc4f5fc2edbc9e8fd1038189e57d837cbe31f" - integrity sha512-TeO+MJWGXjUTS52qfK4R8HiPoF/R7X+qmgtOYd8DTH0l6b+5Y/tlg5aGeUJefqImRq7nvi93Ms40k/Uz4D5CWw== - dependencies: - tslib "^2.4.0" - -"@graphql-tools/utils@9.1.4", "@graphql-tools/utils@^9.0.0", "@graphql-tools/utils@^9.1.1": - version "9.1.4" - resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.1.4.tgz#2c9e0aefc9655dd73247667befe3c850ec014f3f" - integrity sha512-hgIeLt95h9nQgQuzbbdhuZmh+8WV7RZ/6GbTj6t3IU4Zd2zs9yYJ2jgW/krO587GMOY8zCwrjNOMzD40u3l7Vg== - dependencies: - tslib "^2.4.0" - -"@graphql-tools/utils@9.2.0": - version "9.2.0" - resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.2.0.tgz#d74d0376231c0e8bf897a715fafaf53d0f6bf06c" - integrity sha512-s3lEG1iYkyYEnKCWrIFECX3XH2wmZvbg6Ir3udCvIDynq+ydaO7JQXobclpPtwSJtjlS353haF//6V7mnBQ4bg== - dependencies: - "@graphql-typed-document-node/core" "^3.1.1" - tslib "^2.4.0" - -"@graphql-tools/utils@9.2.1": - version "9.2.1" - resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.2.1.tgz#1b3df0ef166cfa3eae706e3518b17d5922721c57" - integrity sha512-WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A== - dependencies: - "@graphql-typed-document-node/core" "^3.1.1" - tslib "^2.4.0" - -"@graphql-tools/wrap@9.2.3": - version "9.2.3" - resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-9.2.3.tgz#70f7602aed9781fbc860cea64a918636599883be" - integrity sha512-aiLjcAuUwcvA1mF25c7KFDPXEdQDpo6bTDyAMCSlFXpF4T01hoxLERmfmbRmsmy/dP80ZB31a+t70aspVdqZSA== - dependencies: - "@graphql-tools/delegate" "9.0.8" - "@graphql-tools/schema" "9.0.4" - "@graphql-tools/utils" "8.12.0" - tslib "^2.4.0" - value-or-promise "1.0.11" - -"@graphql-tools/wrap@9.3.0": - version "9.3.0" - resolved "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-9.3.0.tgz#6dbafdef0b7eb34e0efa9698159a425106cae04e" - integrity sha512-QOEg04kzFJ1WrlA2t/qjw85C20qPDJwIU/d+bDgDd1+cjTQcVrEt9bq9NilZZg9m9AAgZbeyDwut0oQvNMCGhw== - dependencies: - "@graphql-tools/delegate" "9.0.22" - "@graphql-tools/schema" "9.0.13" - "@graphql-tools/utils" "9.1.4" - tslib "^2.4.0" - value-or-promise "1.0.12" - -"@graphql-typed-document-node/core@3.1.1", "@graphql-typed-document-node/core@^3.1.1": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.1.1.tgz#076d78ce99822258cf813ecc1e7fa460fa74d052" - integrity sha512-NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg== - -"@histoire/app@^0.14.2": - version "0.14.2" - resolved "https://registry.yarnpkg.com/@histoire/app/-/app-0.14.2.tgz#f36b0b825394b82fe7cee43d92ba820832240b7b" - integrity sha512-mY91jH8UPFWYGLnTLbv5ntmly+Yd5etHDKV0+l+q/bRHaKrhGLOtJjr60wyqfxbZ6rDN2sjJAwNDEc6dozFqFw== - dependencies: - "@histoire/controls" "^0.14.2" - "@histoire/shared" "^0.14.2" - "@histoire/vendors" "^0.14.2" - "@types/flexsearch" "^0.7.3" - flexsearch "0.7.21" - shiki-es "^0.2.0" - -"@histoire/controls@^0.14.2": - version "0.14.2" - resolved "https://registry.yarnpkg.com/@histoire/controls/-/controls-0.14.2.tgz#a0b308efa58f05b4489ef68aa3b3545be8b8eaa0" - integrity sha512-6pVyjwVxFLqsUb4stvXJ6BmXjr82tfWA4Gv0oipZcDB8zDxDhhx6ckuy+9l94W3BsQfH2ZaRruCv6dJUtqiFZQ== - dependencies: - "@codemirror/commands" "^6.1.1" - "@codemirror/lang-json" "^6.0.0" - "@codemirror/language" "^6.2.1" - "@codemirror/lint" "^6.0.0" - "@codemirror/state" "^6.1.2" - "@codemirror/theme-one-dark" "^6.1.0" - "@codemirror/view" "^6.3.0" - "@histoire/vendors" "^0.14.2" - -"@histoire/plugin-vue@^0.14.2": - version "0.14.2" - resolved "https://registry.yarnpkg.com/@histoire/plugin-vue/-/plugin-vue-0.14.2.tgz#68365e4627a1baafd25264b4113ed2f8b044748d" - integrity sha512-pa56RTkNkVXKNnXEeQWEbAO0Yh7mHZRtfcPjHjZYvP0DLThD1WjO+WGspGbsK5Liaog3n3AOZYcqEmw6mSOmmw== - dependencies: - "@histoire/controls" "^0.14.2" - "@histoire/shared" "^0.14.2" - "@histoire/vendors" "^0.14.2" - change-case "^4.1.2" - globby "^13.1.1" - launch-editor "^2.6.0" - pathe "^0.2.0" - -"@histoire/shared@^0.14.2": - version "0.14.2" - resolved "https://registry.yarnpkg.com/@histoire/shared/-/shared-0.14.2.tgz#1479e7f138a09439f87502704a864289aa3c4257" - integrity sha512-Q7g8Yr8F2lb+/fnQExJYn5fLEqHgHtK47QqsiAWf6xX+v10r/JYLZUnI28jwEga5tLQTVTl6HEJ+yHqvJNFIiw== - dependencies: - "@histoire/vendors" "^0.14.2" - "@types/fs-extra" "^9.0.13" - "@types/markdown-it" "^12.2.3" - chokidar "^3.5.3" - pathe "^0.2.0" - picocolors "^1.0.0" - -"@histoire/vendors@^0.14.2": - version "0.14.2" - resolved "https://registry.yarnpkg.com/@histoire/vendors/-/vendors-0.14.2.tgz#2e9dbf1d5c06a592aec6c709a42f86d3d8a0a206" - integrity sha512-x8B8KxHXSC8YdMAHJtJBBGQYXHP0jcxDxnytwrZOxoCtzwOYghHJNJ8wPfwboKNE0E3ot6vJSilZahwGVLX+nw== - -"@humanwhocodes/config-array@^0.11.8": - version "0.11.8" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" - integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== - dependencies: - "@humanwhocodes/object-schema" "^1.2.1" - debug "^4.1.1" - minimatch "^3.0.5" - -"@humanwhocodes/module-importer@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" - integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== - -"@humanwhocodes/object-schema@^1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" - integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== - -"@jest/expect-utils@^29.2.1": - version "29.2.1" - resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.2.1.tgz#eae61c90f2066540f60d23b8f254f03b7869b22f" - integrity sha512-yr4aHNg5Z1CjKby5ozm7sKjgBlCOorlAoFcvrOQ/4rbZRfgZQdnmh7cth192PYIgiPZo2bBXvqdOApnAMWFJZg== - dependencies: - jest-get-type "^29.2.0" - -"@jest/schemas@^29.0.0": - version "29.0.0" - resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz#5f47f5994dd4ef067fb7b4188ceac45f77fe952a" - integrity sha512-3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA== - dependencies: - "@sinclair/typebox" "^0.24.1" - -"@jest/types@^29.2.1": - version "29.2.1" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.2.1.tgz#ec9c683094d4eb754e41e2119d8bdaef01cf6da0" - integrity sha512-O/QNDQODLnINEPAI0cl9U6zUIDXEWXt6IC1o2N2QENuos7hlGUIthlKyV4p6ki3TvXFX071blj8HUhgLGquPjw== - dependencies: - "@jest/schemas" "^29.0.0" - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^3.0.0" - "@types/node" "*" - "@types/yargs" "^17.0.8" - chalk "^4.0.0" - -"@jridgewell/gen-mapping@^0.1.0": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" - integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== - dependencies: - "@jridgewell/set-array" "^1.0.0" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" - integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== - dependencies: - "@jridgewell/set-array" "^1.0.1" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" - integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== - -"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== - -"@jridgewell/source-map@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" - integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== - dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.13": - version "1.4.14" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" - integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== - -"@jridgewell/trace-mapping@0.3.9": - version "0.3.9" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" - integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ== - dependencies: - "@jridgewell/resolve-uri" "^3.0.3" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@jridgewell/trace-mapping@^0.3.9": - version "0.3.17" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" - integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== - dependencies: - "@jridgewell/resolve-uri" "3.1.0" - "@jridgewell/sourcemap-codec" "1.4.14" - -"@lezer/common@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@lezer/common/-/common-1.0.1.tgz#d014fda6d582c24336fadf2715e76f02f73c8908" - integrity sha512-8TR5++Q/F//tpDsLd5zkrvEX5xxeemafEaek7mUp7Y+bI8cKQXdSqhzTOBaOogETcMOVr0pT3BBPXp13477ciw== - -"@lezer/highlight@^1.0.0": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@lezer/highlight/-/highlight-1.1.2.tgz#60cd6c2a0a2cf753b8a026b04feeb0ea8df326ea" - integrity sha512-CAun1WR1glxG9ZdOokTZwXbcwB7PXkIEyZRUMFBVwSrhTcogWq634/ByNImrkUnQhjju6xsIaOBIxvcRJtplXQ== - dependencies: - "@lezer/common" "^1.0.0" - -"@lezer/json@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@lezer/json/-/json-1.0.0.tgz#848ad9c2c3e812518eb02897edd5a7f649e9c160" - integrity sha512-zbAuUY09RBzCoCA3lJ1+ypKw5WSNvLqGMtasdW6HvVOqZoCpPr8eWrsGnOVWGKGn8Rh21FnrKRVlJXrGAVUqRw== - dependencies: - "@lezer/highlight" "^1.0.0" - "@lezer/lr" "^1.0.0" - -"@lezer/lr@^1.0.0": - version "1.2.3" - resolved "https://registry.yarnpkg.com/@lezer/lr/-/lr-1.2.3.tgz#f44ca844f15f6762fde4eab877d110567e34ffa1" - integrity sha512-qpB7rBzH8f6Mzjv2AVZRahcm+2Cf7nbIH++uXbvVOL1yIRvVWQ3HAM/saeBLCyz/togB7LGo76qdJYL1uKQlqA== - dependencies: - "@lezer/common" "^1.0.0" - -"@linaria/core@3.0.0-beta.13": - version "3.0.0-beta.13" - resolved "https://registry.yarnpkg.com/@linaria/core/-/core-3.0.0-beta.13.tgz#049c5be5faa67e341e413a0f6b641d5d78d91056" - integrity sha512-3zEi5plBCOsEzUneRVuQb+2SAx3qaC1dj0FfFAI6zIJQoDWu0dlSwKijMRack7oO9tUWrchfj3OkKQAd1LBdVg== - -"@nodelib/fs.scandir@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" - integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== - dependencies: - "@nodelib/fs.stat" "2.0.5" - run-parallel "^1.1.9" - -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" - integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== - -"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" - integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== - dependencies: - "@nodelib/fs.scandir" "2.1.5" - fastq "^1.6.0" - -"@peculiar/asn1-schema@^2.1.6": - version "2.3.0" - resolved "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.3.0.tgz#5368416eb336138770c692ffc2bab119ee3ae917" - integrity sha512-DtNLAG4vmDrdSJFPe7rypkcj597chNQL7u+2dBtYo5mh7VW2+im6ke+O0NVr8W1f4re4C3F71LhoMb0Yxqa48Q== - dependencies: - asn1js "^3.0.5" - pvtsutils "^1.3.2" - tslib "^2.4.0" - -"@peculiar/json-schema@^1.1.12": - version "1.1.12" - resolved "https://registry.yarnpkg.com/@peculiar/json-schema/-/json-schema-1.1.12.tgz#fe61e85259e3b5ba5ad566cb62ca75b3d3cd5339" - integrity sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w== - dependencies: - tslib "^2.0.0" - -"@peculiar/webcrypto@^1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.4.0.tgz#f941bd95285a0f8a3d2af39ccda5197b80cd32bf" - integrity sha512-U58N44b2m3OuTgpmKgf0LPDOmP3bhwNz01vAnj1mBwxBASRhptWYK+M3zG+HBkDqGQM+bFsoIihTW8MdmPXEqg== - dependencies: - "@peculiar/asn1-schema" "^2.1.6" - "@peculiar/json-schema" "^1.1.12" - pvtsutils "^1.3.2" - tslib "^2.4.0" - webcrypto-core "^1.7.4" - -"@pinia/testing@^0.0.14": - version "0.0.14" - resolved "https://registry.yarnpkg.com/@pinia/testing/-/testing-0.0.14.tgz#774791df360a1949c9ea2d8665de35d5a0200251" - integrity sha512-ZmZwVNd/NnKYLIfjfuKl0zlJ3UdiXFpsHzSlL6wCeezSlyrqGMxsIQKv0J6fleu38gyCNTPBEipfxrt8V4+VIg== - dependencies: - vue-demi "*" - -"@polka/url@^1.0.0-next.20": - version "1.0.0-next.21" - resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" - integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== - -"@popperjs/core@^2.9.0": - version "2.11.6" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45" - integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw== - -"@rails/actioncable@6.1.7": - version "6.1.7" - resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.1.7.tgz#8b4506925d3f7146a70941e4db7ce9dda99f99ae" - integrity sha512-F6S74NGpxhbbDRFsQFGYqefRfZPgYvePNtz9hHKYOqLturrsqrDoG+UcrxEGHsvqDUorMYfx4Wl3K8smmk/u2g== - -"@remirror/core-constants@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@remirror/core-constants/-/core-constants-2.0.0.tgz#a52f89059d93955e00810023cc76b4f7db9650bf" - integrity sha512-vpePPMecHJllBqCWXl6+FIcZqS+tRUM2kSCCKFeEo1H3XUEv3ocijBIPhnlSAa7g6maX+12ATTgxrOsLpWVr2g== - dependencies: - "@babel/runtime" "^7.13.10" - -"@remirror/core-helpers@^2.0.1": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@remirror/core-helpers/-/core-helpers-2.0.1.tgz#6847666a009ada8c9b9f3a093c13a6d07a95d9bb" - integrity sha512-s8M1pn33aBUhduvD1QR02uUQMegnFkGaTr4c1iBzxTTyg0rbQstzuQ7Q8TkL6n64JtgCdJS9jLz2dONb2meBKQ== - dependencies: - "@babel/runtime" "^7.13.10" - "@linaria/core" "3.0.0-beta.13" - "@remirror/core-constants" "^2.0.0" - "@remirror/types" "^1.0.0" - "@types/object.omit" "^3.0.0" - "@types/object.pick" "^1.3.1" - "@types/throttle-debounce" "^2.1.0" - case-anything "^2.1.10" - dash-get "^1.0.2" - deepmerge "^4.2.2" - fast-deep-equal "^3.1.3" - make-error "^1.3.6" - object.omit "^3.0.0" - object.pick "^1.3.0" - throttle-debounce "^3.0.1" - -"@remirror/types@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@remirror/types/-/types-1.0.0.tgz#cc8764440089a2ada71f149c409739575b73b12e" - integrity sha512-7HQbW7k8VxrAtfzs9FxwO6XSDabn8tSFDi1wwzShOnU+cvaYpfxu0ygyTk3TpXsag1hgFKY3ZIlAfB4WVz2LkQ== - dependencies: - type-fest "^2.0.0" - -"@repeaterjs/repeater@3.0.4": - version "3.0.4" - resolved "https://registry.yarnpkg.com/@repeaterjs/repeater/-/repeater-3.0.4.tgz#a04d63f4d1bf5540a41b01a921c9a7fddc3bd1ca" - integrity sha512-AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA== - -"@rollup/plugin-babel@^5.2.0": - version "5.3.1" - resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz#04bc0608f4aa4b2e4b1aebf284344d0f68fda283" - integrity sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q== - dependencies: - "@babel/helper-module-imports" "^7.10.4" - "@rollup/pluginutils" "^3.1.0" - -"@rollup/plugin-node-resolve@^11.2.1": - version "11.2.1" - resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz#82aa59397a29cd4e13248b106e6a4a1880362a60" - integrity sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg== - dependencies: - "@rollup/pluginutils" "^3.1.0" - "@types/resolve" "1.17.1" - builtin-modules "^3.1.0" - deepmerge "^4.2.2" - is-module "^1.0.0" - resolve "^1.19.0" - -"@rollup/plugin-replace@^2.4.1": - version "2.4.2" - resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz#a2d539314fbc77c244858faa523012825068510a" - integrity sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg== - dependencies: - "@rollup/pluginutils" "^3.1.0" - magic-string "^0.25.7" - -"@rollup/plugin-replace@^5.0.1": - version "5.0.2" - resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-5.0.2.tgz#45f53501b16311feded2485e98419acb8448c61d" - integrity sha512-M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA== - dependencies: - "@rollup/pluginutils" "^5.0.1" - magic-string "^0.27.0" - -"@rollup/pluginutils@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b" - integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg== - dependencies: - "@types/estree" "0.0.39" - estree-walker "^1.0.1" - picomatch "^2.2.2" - -"@rollup/pluginutils@^5.0.1": - version "5.0.2" - resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz#012b8f53c71e4f6f9cb317e311df1404f56e7a33" - integrity sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA== - dependencies: - "@types/estree" "^1.0.0" - estree-walker "^2.0.2" - picomatch "^2.3.1" - -"@sinclair/typebox@^0.24.1": - version "0.24.50" - resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.50.tgz#35ee4db4ab8f3a8ff56490c51f92445d2776451e" - integrity sha512-k8ETQOOQDg5FtK7y9KJWpsGLik+QlPmIi8zzl/dGUgshV2QitprkFlCR/AemjWOTyKn9UwSSGRTzLVotvgCjYQ== - -"@surma/rollup-plugin-off-main-thread@^2.2.3": - version "2.2.3" - resolved "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz#ee34985952ca21558ab0d952f00298ad2190c053" - integrity sha512-lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ== - dependencies: - ejs "^3.1.6" - json5 "^2.2.0" - magic-string "^0.25.0" - string.prototype.matchall "^4.0.6" - -"@tailwindcss/line-clamp@^0.4.2": - version "0.4.2" - resolved "https://registry.yarnpkg.com/@tailwindcss/line-clamp/-/line-clamp-0.4.2.tgz#f353c5a8ab2c939c6267ac5b907f012e5ee130f9" - integrity sha512-HFzAQuqYCjyy/SX9sLGB1lroPzmcnWv1FHkIpmypte10hptf4oPUfucryMKovZh2u0uiS9U5Ty3GghWfEJGwVw== - -"@testing-library/dom@^8.5.0": - version "8.19.0" - resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.19.0.tgz#bd3f83c217ebac16694329e413d9ad5fdcfd785f" - integrity sha512-6YWYPPpxG3e/xOo6HIWwB/58HukkwIVTOaZ0VwdMVjhRUX/01E4FtQbck9GazOOj7MXHc5RBzMrU86iBJHbI+A== - dependencies: - "@babel/code-frame" "^7.10.4" - "@babel/runtime" "^7.12.5" - "@types/aria-query" "^4.2.0" - aria-query "^5.0.0" - chalk "^4.1.0" - dom-accessibility-api "^0.5.9" - lz-string "^1.4.4" - pretty-format "^27.0.2" - -"@testing-library/jest-dom@^5.16.5": - version "5.16.5" - resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz#3912846af19a29b2dbf32a6ae9c31ef52580074e" - integrity sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA== - dependencies: - "@adobe/css-tools" "^4.0.1" - "@babel/runtime" "^7.9.2" - "@types/testing-library__jest-dom" "^5.9.1" - aria-query "^5.0.0" - chalk "^3.0.0" - css.escape "^1.5.1" - dom-accessibility-api "^0.5.6" - lodash "^4.17.15" - redent "^3.0.0" - -"@testing-library/user-event@^14.4.3": - version "14.4.3" - resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.4.3.tgz#af975e367743fa91989cd666666aec31a8f50591" - integrity sha512-kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q== - -"@testing-library/vue@^6.6.1": - version "6.6.1" - resolved "https://registry.yarnpkg.com/@testing-library/vue/-/vue-6.6.1.tgz#b28d0ce9c0228032873947a1a5a2b96fc9016096" - integrity sha512-vpyBPrHzKTwEGS7ehUC8/IXgnqTBEMk6jd52Gouf51arG2jUorPhmkbsxUwJOyxz6L0gj2ZcmWnznG1OJcTCDQ== - dependencies: - "@babel/runtime" "^7.15.4" - "@testing-library/dom" "^8.5.0" - "@vue/test-utils" "^2.0.0" - -"@tiptap/core@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.0.0-beta.217.tgz#c3cc31c23cc7d12f2727bf065d99f0d18fe59dc1" - integrity sha512-Vifwcg5SglkVjEmtFbnwHOKWU4UUenOhe7ke5fqGhh7FNfGkccu6sK8W1JTDbG4ARWZ1b/632kQ51YE+WuPe7g== - -"@tiptap/extension-blockquote@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.0.0-beta.217.tgz#70575fe2b127d1cbcade756bbcd6b07fe263b89c" - integrity sha512-4U6DUr+xaCe3MRMAh3uMA5devHZmyrk6/6MURg57S3uRXDIMiWlKBkSxxys0URjbpS17T41hvKlRQR85tO1N1Q== - -"@tiptap/extension-bold@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.0.0-beta.217.tgz#94be8feed4e26e5f103d5a3a386c4079d946454f" - integrity sha512-oLzekoVWjvkAbDyOIv4Aj9DzjIwCQLTy33kXH/ItTxH2Z/zxZ+Et3y9qAZi0eR8x8wO552cG41lYUte4tuwo1w== - -"@tiptap/extension-bubble-menu@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.0.0-beta.217.tgz#c72e1d9dba18f2cbe45400002e3649618670eaf3" - integrity sha512-f52hjIzNbvAJy0P3pTf6sv/65XlMU1LCLXam4VCTkYJ2HHVvW+LZcu+dG1M8YmGkM9l+6dQPs5L2rriAQDXt+w== - dependencies: - lodash "^4.17.21" - tippy.js "^6.3.7" - -"@tiptap/extension-bullet-list@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.0.0-beta.217.tgz#bedcf2c45412b613987804ef96a977bcd50ba78b" - integrity sha512-t/9lqdZhErYUOtU9H2m/qDjUUSilzVAjI2pVvJt6y9Z7Aex9uS7sPBVhjirjV43G4yQEVhT7BuTAzyCUX+JXkQ== - -"@tiptap/extension-character-count@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-character-count/-/extension-character-count-2.0.0-beta.217.tgz#8c9d123441efe59084a64b93b3f6f4a1a10f5faf" - integrity sha512-jj3GzuoUbHcPsRyIkxr/X/+FmnvKeDUtzvWhhpEPOlCf9q5Wjq95VbVYZdNPlEXCNCdMu0ePvyW+v8+kFr+Qlw== - -"@tiptap/extension-code-block@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.0.0-beta.217.tgz#ba8e6ef8d848056dec9bbcebabf1e5d2629a96a1" - integrity sha512-vmntduEBM/o+mx4+sSEv+aVU8swr5rOFswMr7tYMXRqzXFYbqjvlEo86kGOQ4lrpnvf/2eUEjrq+2L4Hx2LdsA== - -"@tiptap/extension-code@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.0.0-beta.217.tgz#40f8bea6af46c1571212f4eae8900481dea51829" - integrity sha512-IPpuI8MeVX5N0ueWQcIvh2nD+EN6DbFtKSsoU+FgFJ9meOkiEWGibSJ5yFQinPsiE9zrwYIaZzzjhr4oeY2JNA== - -"@tiptap/extension-document@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.0.0-beta.217.tgz#ce53814197af814fe533da541f9681111fa5d52e" - integrity sha512-CDCTutbVO1Ub7QUULPCYILl2px48ezCX2kxbspQZzPD7nMoYZNmUMZ8gRJvVDdnSpMNlEl7oNnCAU7uC/lny/A== - -"@tiptap/extension-dropcursor@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-2.0.0-beta.217.tgz#6bb99051c576787cf2e6d8ad3d0004dd3b898268" - integrity sha512-+HkLmLBKSAJB987KM6z/pxsE+QMr7wZJiTSJv4JSTQnSjKwyJIHbfYNvNgWZo0k9MSncmLGhd/c4TFxYJZ762w== - -"@tiptap/extension-floating-menu@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.0.0-beta.217.tgz#0c571bc1526b00c1831930467be8b1ba996a799b" - integrity sha512-mP77UrimZo3sdC+Xam0DsPeYfXn29hl4ixEuZeiQQBMqz7g1K9T7vOEsRMQCBVFS7Hsc7MWBqLa1lL1GtyBB9Q== - dependencies: - tippy.js "^6.3.7" - -"@tiptap/extension-gapcursor@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-2.0.0-beta.217.tgz#c3e59b8a08ababc5d267afc5f2417e515245d098" - integrity sha512-BMZAeMuba41EOmSo8ZEClarbrO4XDfGvOslWkjJwqPyJ4oO3nHtX8ep13g6Y3RhMSUDEGmBSUXEKVuUPgSS+Qg== - -"@tiptap/extension-hard-break@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.0.0-beta.217.tgz#2bd5cd1a0a7e7a535287e99bf87e86a3fd86a772" - integrity sha512-15cKxMsJZJ+3cbSKuMa7wjr2sQHxjoJ8aCmbPqUH+zGNLsRtUHvTZzeIPGxJ1SpEjpJpb+rRnu9RMTNjwDMFMA== - -"@tiptap/extension-heading@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.0.0-beta.217.tgz#0fc0f2a4974e2b31c890463798d75c5d0f20d384" - integrity sha512-v7G/1R0+qmPm0U2sOCOftqZef5yd89tEg1R+KVF78ucFvuLgH50Pldes8lhHEBlfoRShye2Ht54E6JHDP73J5w== - -"@tiptap/extension-history@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-history/-/extension-history-2.0.0-beta.217.tgz#1bbe8ecc7bfc6384a12091b4b0b4433789b3d1a2" - integrity sha512-wdgAGMTFVeEh6hlO1Iy0l0LzqUVuoplrYnc2zjry4YFGCJbWwQqLKEKQaHIvmMea0PaXW4Q5wpNy875+UoXDOw== - -"@tiptap/extension-horizontal-rule@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.0.0-beta.217.tgz#7e6a8d6fb2b3fc6eaa23b8029048cd36b18473fc" - integrity sha512-h7uIpGOYLCPfYJUit6Fe8oLnrMf0hK0mHBXa8cV7AWIlDvVRrXZZ/sdtLTF+TXOylvbOYR+vjkvnwDTeVX6dcw== - -"@tiptap/extension-image@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-2.0.0-beta.217.tgz#ddb03f2c4a4d3f007c5b2777a50b89e084581470" - integrity sha512-8ibJOicpcqhFeiPLqYOY8SO9sxkz2bemzwhtzRvgkevy/QERe9D0mbAL0qm1gg88LtXy3z2eFUdwD8suq1xsPQ== - -"@tiptap/extension-italic@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.0.0-beta.217.tgz#e6470cfd1763af0141f74165e404029332bca0bf" - integrity sha512-Oua5QbsOJ/MNV41fvbBtJOE/ciw2AjWybSiPkn8clu1/KjieE9dectlj+COaNbVIOccTNhurECpqfF0h8K87Kg== - -"@tiptap/extension-link@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.0.0-beta.217.tgz#5f0a3eca6ae2bd560d35036e3fffc3823cfbb2bd" - integrity sha512-pC1UnK1OrbW+NDdBdHE8sfmZ+tOpIOsHVAeeX6pg1fkdP/FlbPFFvcvILgJc20dr7DiM6dRqYq16H473G9vyEg== - dependencies: - linkifyjs "^3.0.5" - -"@tiptap/extension-list-item@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-2.0.0-beta.217.tgz#811c1197023bed2ed96f1e88f14ee66eac77d8f7" - integrity sha512-yJmB/Je6CAiyjjJyVl77PPv4AWNFejrhxxmIdPfkYNRuQx9xX5yccx/zXC5RMaUFZVttlC4+gXDZsCvxMiVF1g== - -"@tiptap/extension-mention@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-mention/-/extension-mention-2.0.0-beta.217.tgz#23dadaadcfec403875b8b009c80ec2b8d818715e" - integrity sha512-QCUEyvXQYvTfp8iojPG0agF4euu+vFm0BvIQr5TpjE46kSbsK07PMD2D8Z8YBqZEI7x8YWAz2jZDik62Y1+Ssg== - -"@tiptap/extension-ordered-list@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.0.0-beta.217.tgz#37ec7a2b10c03bb6f53fe901873ffdbc1626c79f" - integrity sha512-Jv79D+imZPqFi7U+nrMBQbNp2FQDk9Y2D7jTovM0ySCYLbgYtG/n5ZLj/eBAN6MwLcqHHWzZa1TXWzF7anlUOQ== - -"@tiptap/extension-paragraph@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.0.0-beta.217.tgz#a5debdebf1290066aa84fec65fad0c71d785842a" - integrity sha512-EeWCz6Boz1eeCrECQ8i9yzbs1MyhmuLmPnvW0WUyNuqlA/qbgr4OvqDGZk4X+4E3CI30Nqzr0PPNpz0CWQgphQ== - -"@tiptap/extension-strike@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.0.0-beta.217.tgz#2a650ba010e225d700c5c87a64709c078bc23c3c" - integrity sha512-frC3SUoh9bSrHYWdW2S3A8s+FEqDMaNjp+Ldoe6vz2ugHXxjUFJ+SsF/pcQbmKw6FsNaf/bqL24KieRt22kgpg== - -"@tiptap/extension-text@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.0.0-beta.217.tgz#7d3f7bda8991b1bac9ef7cbc62ed71d17ad0243b" - integrity sha512-l5PkVhZzVnxbGyMiCMqpLU3ZomJWcZXhuBD0aajry+l85DWc6TK0mhLEAVEU1LoTL8hXFmICoW1KJ1m20Va9dg== - -"@tiptap/extension-underline@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/extension-underline/-/extension-underline-2.0.0-beta.217.tgz#11b986b6a27daa4d0840f1d7dca3678e854de98f" - integrity sha512-feakmZ8ek1maf4yBVd539AYIjv3hnLK1j/GLyT/SjRlwOryQb23xWIQ8I+nF5UWqXib1MkvfMe6Ff6zK5WqrYQ== - -"@tiptap/pm@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.0.0-beta.217.tgz#d944519aa40c74e683402c0d4d39e460d905414e" - integrity sha512-krEplJli2BbBB3U2c+cxDPw4mpHsUEwOMJCM3fr1GTVv7qAOvsrWt2ndRPOwraPSvmUF3rw9gvoP86eyK2nDmA== - dependencies: - prosemirror-changeset "^2.2.0" - prosemirror-collab "^1.3.0" - prosemirror-commands "^1.3.1" - prosemirror-dropcursor "^1.5.0" - prosemirror-gapcursor "^1.3.1" - prosemirror-history "^1.3.0" - prosemirror-inputrules "^1.2.0" - prosemirror-keymap "^1.2.0" - prosemirror-markdown "^1.10.1" - prosemirror-menu "^1.2.1" - prosemirror-model "^1.18.1" - prosemirror-schema-basic "^1.2.0" - prosemirror-schema-list "^1.2.2" - prosemirror-state "^1.4.1" - prosemirror-tables "^1.3.0" - prosemirror-trailing-node "^2.0.2" - prosemirror-transform "^1.7.0" - prosemirror-view "^1.28.2" - -"@tiptap/starter-kit@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/starter-kit/-/starter-kit-2.0.0-beta.217.tgz#197b2c811d5510a3d1aad8ff2d953454c79143d8" - integrity sha512-9FPH8lOP0AfRMKm2OUy2OQKEdcIo2ic7MNO2Jtd5vcUz1skfaQPjYLJYHbhkw2iH0ILUOPPbGpZuIlV8uqSu/g== - dependencies: - "@tiptap/core" "^2.0.0-beta.217" - "@tiptap/extension-blockquote" "^2.0.0-beta.217" - "@tiptap/extension-bold" "^2.0.0-beta.217" - "@tiptap/extension-bullet-list" "^2.0.0-beta.217" - "@tiptap/extension-code" "^2.0.0-beta.217" - "@tiptap/extension-code-block" "^2.0.0-beta.217" - "@tiptap/extension-document" "^2.0.0-beta.217" - "@tiptap/extension-dropcursor" "^2.0.0-beta.217" - "@tiptap/extension-gapcursor" "^2.0.0-beta.217" - "@tiptap/extension-hard-break" "^2.0.0-beta.217" - "@tiptap/extension-heading" "^2.0.0-beta.217" - "@tiptap/extension-history" "^2.0.0-beta.217" - "@tiptap/extension-horizontal-rule" "^2.0.0-beta.217" - "@tiptap/extension-italic" "^2.0.0-beta.217" - "@tiptap/extension-list-item" "^2.0.0-beta.217" - "@tiptap/extension-ordered-list" "^2.0.0-beta.217" - "@tiptap/extension-paragraph" "^2.0.0-beta.217" - "@tiptap/extension-strike" "^2.0.0-beta.217" - "@tiptap/extension-text" "^2.0.0-beta.217" - -"@tiptap/suggestion@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/suggestion/-/suggestion-2.0.0-beta.217.tgz#47a27da8784a8cfe27bdf8d707bd6ed8c15fa05c" - integrity sha512-Z1hXr1giNQ/fkuRrsMICtfyBCbMV+ZPiYYfpKKqUC4uc/lqAeHiRwk3lozpnLZEImnOW42LsYbYug2jtRqrDgA== - -"@tiptap/vue-3@^2.0.0-beta.217": - version "2.0.0-beta.217" - resolved "https://registry.yarnpkg.com/@tiptap/vue-3/-/vue-3-2.0.0-beta.217.tgz#fa86fe3a93a00935e44d1e26ea0634c98d46fa2d" - integrity sha512-QHVc82A6lu4qF1Glz5Ne00Nwbj0A0U/6IEbG8u8/YQDy1XzQ7PZwR6FrwxPTrwLhJivy4/wVBiYTUygs9+vjbQ== - dependencies: - "@tiptap/extension-bubble-menu" "^2.0.0-beta.217" - "@tiptap/extension-floating-menu" "^2.0.0-beta.217" - -"@tootallnate/once@2": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" - integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== - -"@trysound/sax@0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" - integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== - -"@tsconfig/node10@^1.0.7": - version "1.0.9" - resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2" - integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA== - -"@tsconfig/node12@^1.0.7": - version "1.0.11" - resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz#ee3def1f27d9ed66dac6e46a295cffb0152e058d" - integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag== - -"@tsconfig/node14@^1.0.0": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz#e4386316284f00b98435bf40f72f75a09dabf6c1" - integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow== - -"@tsconfig/node16@^1.0.2": - version "1.0.3" - resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz#472eaab5f15c1ffdd7f8628bd4c4f753995ec79e" - integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ== - -"@types/aria-query@^4.2.0": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc" - integrity sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig== - -"@types/chai-subset@^1.3.3": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@types/chai-subset/-/chai-subset-1.3.3.tgz#97893814e92abd2c534de422cb377e0e0bdaac94" - integrity sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw== - dependencies: - "@types/chai" "*" - -"@types/chai@*": - version "4.3.3" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.3.tgz#3c90752792660c4b562ad73b3fbd68bf3bc7ae07" - integrity sha512-hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g== - -"@types/chai@^4.3.4": - version "4.3.4" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.4.tgz#e913e8175db8307d78b4e8fa690408ba6b65dee4" - integrity sha512-KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw== - -"@types/estree@0.0.39": - version "0.0.39" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" - integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== - -"@types/estree@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" - integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== - -"@types/flexsearch@^0.7.3": - version "0.7.3" - resolved "https://registry.yarnpkg.com/@types/flexsearch/-/flexsearch-0.7.3.tgz#ee79b1618035c82284278e05652e91116765b634" - integrity sha512-HXwADeHEP4exXkCIwy2n1+i0f1ilP1ETQOH5KDOugjkTFZPntWo0Gr8stZOaebkxsdx+k0X/K6obU/+it07ocg== - -"@types/fs-extra@^9.0.13": - version "9.0.13" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" - integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== - dependencies: - "@types/node" "*" - -"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" - integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g== - -"@types/istanbul-lib-report@*": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686" - integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg== - dependencies: - "@types/istanbul-lib-coverage" "*" - -"@types/istanbul-reports@^3.0.0": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" - integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== - dependencies: - "@types/istanbul-lib-report" "*" - -"@types/jest@*": - version "29.2.0" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-29.2.0.tgz#fa98e08b46ab119f1a74a9552c48c589f5378a96" - integrity sha512-KO7bPV21d65PKwv3LLsD8Jn3E05pjNjRZvkm+YTacWhVmykAb07wW6IkZUmQAltwQafNcDUEUrMO2h3jeBSisg== - dependencies: - expect "^29.0.0" - pretty-format "^29.0.0" - -"@types/js-yaml@^4.0.0": - version "4.0.5" - resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.5.tgz#738dd390a6ecc5442f35e7f03fa1431353f7e138" - integrity sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA== - -"@types/json-schema@^7.0.9": - version "7.0.11" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" - integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== - -"@types/json-stable-stringify@^1.0.32": - version "1.0.34" - resolved "https://registry.yarnpkg.com/@types/json-stable-stringify/-/json-stable-stringify-1.0.34.tgz#c0fb25e4d957e0ee2e497c1f553d7f8bb668fd75" - integrity sha512-s2cfwagOQAS8o06TcwKfr9Wx11dNGbH2E9vJz1cqV+a/LOyhWNLUNd6JSRYNzvB4d29UuJX2M0Dj9vE1T8fRXw== - -"@types/json5@^0.0.29": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" - integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== - -"@types/jsonwebtoken@^9.0.0": - version "9.0.1" - resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz#29b1369c4774200d6d6f63135bf3d1ba3ef997a4" - integrity sha512-c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw== - dependencies: - "@types/node" "*" - -"@types/linkify-it@*": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9" - integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA== - -"@types/lodash-es@^4.17.6": - version "4.17.6" - resolved "https://registry.yarnpkg.com/@types/lodash-es/-/lodash-es-4.17.6.tgz#c2ed4c8320ffa6f11b43eb89e9eaeec65966a0a0" - integrity sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg== - dependencies: - "@types/lodash" "*" - -"@types/lodash@*": - version "4.14.186" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.186.tgz#862e5514dd7bd66ada6c70ee5fce844b06c8ee97" - integrity sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw== - -"@types/markdown-it@^12.2.3": - version "12.2.3" - resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51" - integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ== - dependencies: - "@types/linkify-it" "*" - "@types/mdurl" "*" - -"@types/mdurl@*": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9" - integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA== - -"@types/minimist@^1.2.0": - version "1.2.2" - resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" - integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== - -"@types/node@*": - version "18.11.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.4.tgz#7017a52e18dfaad32f55eebd539993014441949c" - integrity sha512-BxcJpBu8D3kv/GZkx/gSMz6VnTJREBj/4lbzYOQueUOELkt8WrO6zAcSPmp9uRPEW/d+lUO8QK0W2xnS1hEU0A== - -"@types/normalize-package-data@^2.4.0": - version "2.4.1" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" - integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== - -"@types/object.omit@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/object.omit/-/object.omit-3.0.0.tgz#0d31e1208eac8fe2ad5c9499a1016a8273bbfafc" - integrity sha512-I27IoPpH250TUzc9FzXd0P1BV/BMJuzqD3jOz98ehf9dQqGkxlq+hO1bIqZGWqCg5bVOy0g4AUVJtnxe0klDmw== - -"@types/object.pick@^1.3.1": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/object.pick/-/object.pick-1.3.2.tgz#9eb28118240ad8f658b9c9c6caf35359fdb37150" - integrity sha512-sn7L+qQ6RLPdXRoiaE7bZ/Ek+o4uICma/lBFPyJEKDTPTBP1W8u0c4baj3EiS4DiqLs+Hk+KUGvMVJtAw3ePJg== - -"@types/parse-json@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" - integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== - -"@types/rails__actioncable@^6.1.6": - version "6.1.6" - resolved "https://registry.yarnpkg.com/@types/rails__actioncable/-/rails__actioncable-6.1.6.tgz#c5427f7ba5a41e41e1237bc943c81d7f44b46167" - integrity sha512-/whIczf4uhpac/X19vMRTHOF4reN92I6C4uOmTTtbT1xdesjrStLNQq9v+jexHehc8RENUHk4sXVzwm5PBy2fA== - -"@types/resolve@1.17.1": - version "1.17.1" - resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6" - integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw== - dependencies: - "@types/node" "*" - -"@types/semver@^7.3.12": - version "7.3.12" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.12.tgz#920447fdd78d76b19de0438b7f60df3c4a80bf1c" - integrity sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A== - -"@types/stack-utils@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" - integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== - -"@types/svgo@^2.6.1": - version "2.6.4" - resolved "https://registry.yarnpkg.com/@types/svgo/-/svgo-2.6.4.tgz#b7298fc1dd687539fd63fc818b00146d96e68836" - integrity sha512-l4cmyPEckf8moNYHdJ+4wkHvFxjyW6ulm9l4YGaOxeyBWPhBOT0gvni1InpFPdzx1dKf/2s62qGITwxNWnPQng== - dependencies: - "@types/node" "*" - -"@types/testing-library__jest-dom@^5.9.1": - version "5.14.5" - resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.5.tgz#d113709c90b3c75fdb127ec338dad7d5f86c974f" - integrity sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ== - dependencies: - "@types/jest" "*" - -"@types/throttle-debounce@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@types/throttle-debounce/-/throttle-debounce-2.1.0.tgz#1c3df624bfc4b62f992d3012b84c56d41eab3776" - integrity sha512-5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ== - -"@types/trusted-types@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz#fc25ad9943bcac11cceb8168db4f275e0e72e756" - integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg== - -"@types/ua-parser-js@^0.7.36": - version "0.7.36" - resolved "https://registry.yarnpkg.com/@types/ua-parser-js/-/ua-parser-js-0.7.36.tgz#9bd0b47f26b5a3151be21ba4ce9f5fa457c5f190" - integrity sha512-N1rW+njavs70y2cApeIw1vLMYXRwfBy+7trgavGuuTfOd7j1Yh7QTRc/yqsPl6ncokt72ZXuxEU0PiCp9bSwNQ== - -"@types/uuid@^9.0.0": - version "9.0.0" - resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.0.tgz#53ef263e5239728b56096b0a869595135b7952d2" - integrity sha512-kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q== - -"@types/web-bluetooth@^0.0.16": - version "0.0.16" - resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz#1d12873a8e49567371f2a75fe3e7f7edca6662d8" - integrity sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ== - -"@types/ws@^8.0.0": - version "8.5.3" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" - integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w== - dependencies: - "@types/node" "*" - -"@types/yargs-parser@*": - version "21.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" - integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== - -"@types/yargs@^17.0.8": - version "17.0.13" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz#34cced675ca1b1d51fcf4d34c3c6f0fa142a5c76" - integrity sha512-9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg== - dependencies: - "@types/yargs-parser" "*" - -"@typescript-eslint/eslint-plugin@^5.0.0": - version "5.40.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.1.tgz#3203a6ff396b1194083faaa6e5110c401201d7d5" - integrity sha512-FsWboKkWdytGiXT5O1/R9j37YgcjO8MKHSUmWnIEjVaz0krHkplPnYi7mwdb+5+cs0toFNQb0HIrN7zONdIEWg== - dependencies: - "@typescript-eslint/scope-manager" "5.40.1" - "@typescript-eslint/type-utils" "5.40.1" - "@typescript-eslint/utils" "5.40.1" - debug "^4.3.4" - ignore "^5.2.0" - regexpp "^3.2.0" - semver "^7.3.7" - tsutils "^3.21.0" - -"@typescript-eslint/eslint-plugin@^5.51.0": - version "5.51.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.51.0.tgz#da3f2819633061ced84bb82c53bba45a6fe9963a" - integrity sha512-wcAwhEWm1RgNd7dxD/o+nnLW8oH+6RK1OGnmbmkj/GGoDPV1WWMVP0FXYQBivKHdwM1pwii3bt//RC62EriIUQ== - dependencies: - "@typescript-eslint/scope-manager" "5.51.0" - "@typescript-eslint/type-utils" "5.51.0" - "@typescript-eslint/utils" "5.51.0" - debug "^4.3.4" - grapheme-splitter "^1.0.4" - ignore "^5.2.0" - natural-compare-lite "^1.4.0" - regexpp "^3.2.0" - semver "^7.3.7" - tsutils "^3.21.0" - -"@typescript-eslint/parser@^5.0.0": - version "5.40.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.40.1.tgz#e7f8295dd8154d0d37d661ddd8e2f0ecfdee28dd" - integrity sha512-IK6x55va5w4YvXd4b3VrXQPldV9vQTxi5ov+g4pMANsXPTXOcfjx08CRR1Dfrcc51syPtXHF5bgLlMHYFrvQtg== - dependencies: - "@typescript-eslint/scope-manager" "5.40.1" - "@typescript-eslint/types" "5.40.1" - "@typescript-eslint/typescript-estree" "5.40.1" - debug "^4.3.4" - -"@typescript-eslint/parser@^5.51.0": - version "5.51.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.51.0.tgz#2d74626652096d966ef107f44b9479f02f51f271" - integrity sha512-fEV0R9gGmfpDeRzJXn+fGQKcl0inIeYobmmUWijZh9zA7bxJ8clPhV9up2ZQzATxAiFAECqPQyMDB4o4B81AaA== - dependencies: - "@typescript-eslint/scope-manager" "5.51.0" - "@typescript-eslint/types" "5.51.0" - "@typescript-eslint/typescript-estree" "5.51.0" - debug "^4.3.4" - -"@typescript-eslint/scope-manager@5.40.1": - version "5.40.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.40.1.tgz#a7a5197dfd234622a2421ea590ee0ccc02e18dfe" - integrity sha512-jkn4xsJiUQucI16OLCXrLRXDZ3afKhOIqXs4R3O+M00hdQLKR58WuyXPZZjhKLFCEP2g+TXdBRtLQ33UfAdRUg== - dependencies: - "@typescript-eslint/types" "5.40.1" - "@typescript-eslint/visitor-keys" "5.40.1" - -"@typescript-eslint/scope-manager@5.51.0": - version "5.51.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.51.0.tgz#ad3e3c2ecf762d9a4196c0fbfe19b142ac498990" - integrity sha512-gNpxRdlx5qw3yaHA0SFuTjW4rxeYhpHxt491PEcKF8Z6zpq0kMhe0Tolxt0qjlojS+/wArSDlj/LtE69xUJphQ== - dependencies: - "@typescript-eslint/types" "5.51.0" - "@typescript-eslint/visitor-keys" "5.51.0" - -"@typescript-eslint/type-utils@5.40.1": - version "5.40.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.40.1.tgz#091e4ce3bebbdb68f4980bae9dee2e4e1725f601" - integrity sha512-DLAs+AHQOe6n5LRraXiv27IYPhleF0ldEmx6yBqBgBLaNRKTkffhV1RPsjoJBhVup2zHxfaRtan8/YRBgYhU9Q== - dependencies: - "@typescript-eslint/typescript-estree" "5.40.1" - "@typescript-eslint/utils" "5.40.1" - debug "^4.3.4" - tsutils "^3.21.0" - -"@typescript-eslint/type-utils@5.51.0": - version "5.51.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.51.0.tgz#7af48005531700b62a20963501d47dfb27095988" - integrity sha512-QHC5KKyfV8sNSyHqfNa0UbTbJ6caB8uhcx2hYcWVvJAZYJRBo5HyyZfzMdRx8nvS+GyMg56fugMzzWnojREuQQ== - dependencies: - "@typescript-eslint/typescript-estree" "5.51.0" - "@typescript-eslint/utils" "5.51.0" - debug "^4.3.4" - tsutils "^3.21.0" - -"@typescript-eslint/types@5.40.1": - version "5.40.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.40.1.tgz#de37f4f64de731ee454bb2085d71030aa832f749" - integrity sha512-Icg9kiuVJSwdzSQvtdGspOlWNjVDnF3qVIKXdJ103o36yRprdl3Ge5cABQx+csx960nuMF21v8qvO31v9t3OHw== - -"@typescript-eslint/types@5.51.0": - version "5.51.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.51.0.tgz#e7c1622f46c7eea7e12bbf1edfb496d4dec37c90" - integrity sha512-SqOn0ANn/v6hFn0kjvLwiDi4AzR++CBZz0NV5AnusT2/3y32jdc0G4woXPWHCumWtUXZKPAS27/9vziSsC9jnw== - -"@typescript-eslint/typescript-estree@5.40.1": - version "5.40.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.1.tgz#9a7d25492f02c69882ce5e0cd1857b0c55645d72" - integrity sha512-5QTP/nW5+60jBcEPfXy/EZL01qrl9GZtbgDZtDPlfW5zj/zjNrdI2B5zMUHmOsfvOr2cWqwVdWjobCiHcedmQA== - dependencies: - "@typescript-eslint/types" "5.40.1" - "@typescript-eslint/visitor-keys" "5.40.1" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - semver "^7.3.7" - tsutils "^3.21.0" - -"@typescript-eslint/typescript-estree@5.51.0": - version "5.51.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.51.0.tgz#0ec8170d7247a892c2b21845b06c11eb0718f8de" - integrity sha512-TSkNupHvNRkoH9FMA3w7TazVFcBPveAAmb7Sz+kArY6sLT86PA5Vx80cKlYmd8m3Ha2SwofM1KwraF24lM9FvA== - dependencies: - "@typescript-eslint/types" "5.51.0" - "@typescript-eslint/visitor-keys" "5.51.0" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - semver "^7.3.7" - tsutils "^3.21.0" - -"@typescript-eslint/utils@5.40.1": - version "5.40.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.40.1.tgz#3204fb73a559d3b7bab7dc9d3c44487c2734a9ca" - integrity sha512-a2TAVScoX9fjryNrW6BZRnreDUszxqm9eQ9Esv8n5nXApMW0zeANUYlwh/DED04SC/ifuBvXgZpIK5xeJHQ3aw== - dependencies: - "@types/json-schema" "^7.0.9" - "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.40.1" - "@typescript-eslint/types" "5.40.1" - "@typescript-eslint/typescript-estree" "5.40.1" - eslint-scope "^5.1.1" - eslint-utils "^3.0.0" - semver "^7.3.7" - -"@typescript-eslint/utils@5.51.0": - version "5.51.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.51.0.tgz#074f4fabd5b12afe9c8aa6fdee881c050f8b4d47" - integrity sha512-76qs+5KWcaatmwtwsDJvBk4H76RJQBFe+Gext0EfJdC3Vd2kpY2Pf//OHHzHp84Ciw0/rYoGTDnIAr3uWhhJYw== - dependencies: - "@types/json-schema" "^7.0.9" - "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.51.0" - "@typescript-eslint/types" "5.51.0" - "@typescript-eslint/typescript-estree" "5.51.0" - eslint-scope "^5.1.1" - eslint-utils "^3.0.0" - semver "^7.3.7" - -"@typescript-eslint/visitor-keys@5.40.1": - version "5.40.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.1.tgz#f3d2bf5af192f4432b84cec6fdcb387193518754" - integrity sha512-A2DGmeZ+FMja0geX5rww+DpvILpwo1OsiQs0M+joPWJYsiEFBLsH0y1oFymPNul6Z5okSmHpP4ivkc2N0Cgfkw== - dependencies: - "@typescript-eslint/types" "5.40.1" - eslint-visitor-keys "^3.3.0" - -"@typescript-eslint/visitor-keys@5.51.0": - version "5.51.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.51.0.tgz#c0147dd9a36c0de758aaebd5b48cae1ec59eba87" - integrity sha512-Oh2+eTdjHjOFjKA27sxESlA87YPSOJafGCR0md5oeMdh1ZcCfAGCIOL216uTBAkAIptvLIfKQhl7lHxMJet4GQ== - dependencies: - "@typescript-eslint/types" "5.51.0" - eslint-visitor-keys "^3.3.0" - -"@vitejs/plugin-vue@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-4.0.0.tgz#93815beffd23db46288c787352a8ea31a0c03e5e" - integrity sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA== - -"@vitest/expect@0.28.4": - version "0.28.4" - resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.28.4.tgz#09f2513d2ea951057660540ae235609a0d6378f9" - integrity sha512-JqK0NZ4brjvOSL8hXAnIsfi+jxDF7rH/ZWCGCt0FAqRnVFc1hXsfwXksQvEnKqD84avRt3gmeXoK4tNbmkoVsQ== - dependencies: - "@vitest/spy" "0.28.4" - "@vitest/utils" "0.28.4" - chai "^4.3.7" - -"@vitest/runner@0.28.4": - version "0.28.4" - resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-0.28.4.tgz#4c4e5aed91d4b19a3071e601c75745d672868388" - integrity sha512-Q8UV6GjDvBSTfUoq0QXVCNpNOUrWu4P2qvRq7ssJWzn0+S0ojbVOxEjMt+8a32X6SdkhF8ak+2nkppsqV0JyNQ== - dependencies: - "@vitest/utils" "0.28.4" - p-limit "^4.0.0" - pathe "^1.1.0" - -"@vitest/spy@0.28.4": - version "0.28.4" - resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-0.28.4.tgz#beb994b7d46edee4966160eb1363e0493f9d9ef1" - integrity sha512-8WuhfXLlvCXpNXEGJW6Gc+IKWI32435fQJLh43u70HnZ1otJOa2Cmg2Wy2Aym47ZnNCP4NolF+8cUPwd0MigKQ== - dependencies: - tinyspy "^1.0.2" - -"@vitest/utils@0.28.4": - version "0.28.4" - resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-0.28.4.tgz#be8378f860f40c2d48a62f46c808cf98b9736100" - integrity sha512-l2QztOLdc2LkR+w/lP52RGh8hW+Ul4KESmCAgVE8q737I7e7bQoAfkARKpkPJ4JQtGpwW4deqlj1732VZD7TFw== - dependencies: - cli-truncate "^3.1.0" - diff "^5.1.0" - loupe "^2.3.6" - picocolors "^1.0.0" - pretty-format "^27.5.1" - -"@volar/language-core@1.0.24": - version "1.0.24" - resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.0.24.tgz#5d767571e77728464635e61af1debca944811fe0" - integrity sha512-vTN+alJiWwK0Pax6POqrmevbtFW2dXhjwWiW/MW4f48eDYPLdyURWcr8TixO7EN/nHsUBj2udT7igFKPtjyAKg== - dependencies: - "@volar/source-map" "1.0.24" - muggle-string "^0.1.0" - -"@volar/source-map@1.0.24": - version "1.0.24" - resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.0.24.tgz#ad4c827fea5c26b4bf38a86d983e7deb65b1c61e" - integrity sha512-Qsv/tkplx18pgBr8lKAbM1vcDqgkGKQzbChg6NW+v0CZc3G7FLmK+WrqEPzKlN7Cwdc6XVL559Nod8WKAfKr4A== - dependencies: - muggle-string "^0.1.0" - -"@volar/typescript@1.0.24": - version "1.0.24" - resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.0.24.tgz#f934eda9774b31abdff53efc56782cd2623723d5" - integrity sha512-f8hCSk+PfKR1/RQHxZ79V1NpDImHoivqoizK+mstphm25tn/YJ/JnKNjZHB+o21fuW0yKlI26NV3jkVb2Cc/7A== - dependencies: - "@volar/language-core" "1.0.24" - -"@volar/vue-language-core@1.0.24": - version "1.0.24" - resolved "https://registry.yarnpkg.com/@volar/vue-language-core/-/vue-language-core-1.0.24.tgz#81d180a8e09a53cb575e83acb79a31493891a1a4" - integrity sha512-2NTJzSgrwKu6uYwPqLiTMuAzi7fAY3yFy5PJ255bGJc82If0Xr+cW8pC80vpjG0D/aVLmlwAdO4+Ya2BI8GdDg== - dependencies: - "@volar/language-core" "1.0.24" - "@volar/source-map" "1.0.24" - "@vue/compiler-dom" "^3.2.45" - "@vue/compiler-sfc" "^3.2.45" - "@vue/reactivity" "^3.2.45" - "@vue/shared" "^3.2.45" - minimatch "^5.1.1" - vue-template-compiler "^2.7.14" - -"@volar/vue-typescript@1.0.24": - version "1.0.24" - resolved "https://registry.yarnpkg.com/@volar/vue-typescript/-/vue-typescript-1.0.24.tgz#bef9b2bfb1b108c0f6cb12ec6fbf449b43fc8257" - integrity sha512-9a25oHDvGaNC0okRS47uqJI6FxY4hUQZUsxeOUFHcqVxZEv8s17LPuP/pMMXyz7jPygrZubB/qXqHY5jEu/akA== - dependencies: - "@volar/typescript" "1.0.24" - "@volar/vue-language-core" "1.0.24" - -"@vue/apollo-composable@^4.0.0-beta.2": - version "4.0.0-beta.2" - resolved "https://registry.yarnpkg.com/@vue/apollo-composable/-/apollo-composable-4.0.0-beta.2.tgz#4614ac9bd8b545a91c7e2b9f8b86b82351454789" - integrity sha512-SGZ1uklEldjG9UTMQnHyr9N4+C4D6hZXn3LDkDtpMVLAQksh30sqapSOFkEowOBVWyc/7f/JiCGADOhvxCWRxw== - dependencies: - throttle-debounce "^3.0.1" - ts-essentials "^9.1.2" - vue-demi "^0.13.1" - -"@vue/compiler-core@3.2.41": - version "3.2.41" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.41.tgz#fb5b25f23817400f44377d878a0cdead808453ef" - integrity sha512-oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw== - dependencies: - "@babel/parser" "^7.16.4" - "@vue/shared" "3.2.41" - estree-walker "^2.0.2" - source-map "^0.6.1" - -"@vue/compiler-core@3.2.45": - version "3.2.45" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.45.tgz#d9311207d96f6ebd5f4660be129fb99f01ddb41b" - integrity sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A== - dependencies: - "@babel/parser" "^7.16.4" - "@vue/shared" "3.2.45" - estree-walker "^2.0.2" - source-map "^0.6.1" - -"@vue/compiler-core@3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.47.tgz#3e07c684d74897ac9aa5922c520741f3029267f8" - integrity sha512-p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig== - dependencies: - "@babel/parser" "^7.16.4" - "@vue/shared" "3.2.47" - estree-walker "^2.0.2" - source-map "^0.6.1" - -"@vue/compiler-dom@3.2.41": - version "3.2.41" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.41.tgz#dc63dcd3ce8ca8a8721f14009d498a7a54380299" - integrity sha512-xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw== - dependencies: - "@vue/compiler-core" "3.2.41" - "@vue/shared" "3.2.41" - -"@vue/compiler-dom@3.2.45", "@vue/compiler-dom@^3.2.45": - version "3.2.45" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz#c43cc15e50da62ecc16a42f2622d25dc5fd97dce" - integrity sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw== - dependencies: - "@vue/compiler-core" "3.2.45" - "@vue/shared" "3.2.45" - -"@vue/compiler-dom@3.2.47", "@vue/compiler-dom@^3.0.1": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz#a0b06caf7ef7056939e563dcaa9cbde30794f305" - integrity sha512-dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ== - dependencies: - "@vue/compiler-core" "3.2.47" - "@vue/shared" "3.2.47" - -"@vue/compiler-sfc@3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz#1bdc36f6cdc1643f72e2c397eb1a398f5004ad3d" - integrity sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ== - 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" - -"@vue/compiler-sfc@^3.2.37": - version "3.2.41" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.41.tgz#238fb8c48318408c856748f4116aff8cc1dc2a73" - integrity sha512-+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w== - dependencies: - "@babel/parser" "^7.16.4" - "@vue/compiler-core" "3.2.41" - "@vue/compiler-dom" "3.2.41" - "@vue/compiler-ssr" "3.2.41" - "@vue/reactivity-transform" "3.2.41" - "@vue/shared" "3.2.41" - estree-walker "^2.0.2" - magic-string "^0.25.7" - postcss "^8.1.10" - source-map "^0.6.1" - -"@vue/compiler-sfc@^3.2.45": - version "3.2.45" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz#7f7989cc04ec9e7c55acd406827a2c4e96872c70" - integrity sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q== - dependencies: - "@babel/parser" "^7.16.4" - "@vue/compiler-core" "3.2.45" - "@vue/compiler-dom" "3.2.45" - "@vue/compiler-ssr" "3.2.45" - "@vue/reactivity-transform" "3.2.45" - "@vue/shared" "3.2.45" - estree-walker "^2.0.2" - magic-string "^0.25.7" - postcss "^8.1.10" - source-map "^0.6.1" - -"@vue/compiler-ssr@3.2.41": - version "3.2.41" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.41.tgz#344f564d68584b33367731c04ffc949784611fcb" - integrity sha512-Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ== - dependencies: - "@vue/compiler-dom" "3.2.41" - "@vue/shared" "3.2.41" - -"@vue/compiler-ssr@3.2.45": - version "3.2.45" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz#bd20604b6e64ea15344d5b6278c4141191c983b2" - integrity sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ== - dependencies: - "@vue/compiler-dom" "3.2.45" - "@vue/shared" "3.2.45" - -"@vue/compiler-ssr@3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz#35872c01a273aac4d6070ab9d8da918ab13057ee" - integrity sha512-wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw== - dependencies: - "@vue/compiler-dom" "3.2.47" - "@vue/shared" "3.2.47" - -"@vue/devtools-api@^6.4.5": - version "6.4.5" - resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.4.5.tgz#d54e844c1adbb1e677c81c665ecef1a2b4bb8380" - integrity sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ== - -"@vue/eslint-config-prettier@^7.0.0": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@vue/eslint-config-prettier/-/eslint-config-prettier-7.0.0.tgz#44ab55ca22401102b57795c59428e9dade72be34" - integrity sha512-/CTc6ML3Wta1tCe1gUeO0EYnVXfo3nJXsIhZ8WJr3sov+cGASr6yuiibJTL6lmIBm7GobopToOuB3B6AWyV0Iw== - dependencies: - eslint-config-prettier "^8.3.0" - eslint-plugin-prettier "^4.0.0" - -"@vue/eslint-config-typescript@^11.0.2": - version "11.0.2" - resolved "https://registry.yarnpkg.com/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.2.tgz#03353f404d4472900794e653450bb6623de3c642" - integrity sha512-EiKud1NqlWmSapBFkeSrE994qpKx7/27uCGnhdqzllYDpQZroyX/O6bwjEpeuyKamvLbsGdO6PMR2faIf+zFnw== - dependencies: - "@typescript-eslint/eslint-plugin" "^5.0.0" - "@typescript-eslint/parser" "^5.0.0" - vue-eslint-parser "^9.0.0" - -"@vue/reactivity-transform@3.2.41": - version "3.2.41" - resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.41.tgz#9ff938877600c97f646e09ac1959b5150fb11a0c" - integrity sha512-mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A== - dependencies: - "@babel/parser" "^7.16.4" - "@vue/compiler-core" "3.2.41" - "@vue/shared" "3.2.41" - estree-walker "^2.0.2" - magic-string "^0.25.7" - -"@vue/reactivity-transform@3.2.45": - version "3.2.45" - resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz#07ac83b8138550c83dfb50db43cde1e0e5e8124d" - integrity sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ== - dependencies: - "@babel/parser" "^7.16.4" - "@vue/compiler-core" "3.2.45" - "@vue/shared" "3.2.45" - estree-walker "^2.0.2" - magic-string "^0.25.7" - -"@vue/reactivity-transform@3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz#e45df4d06370f8abf29081a16afd25cffba6d84e" - 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" - -"@vue/reactivity@3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.47.tgz#1d6399074eadfc3ed35c727e2fd707d6881140b6" - integrity sha512-7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ== - dependencies: - "@vue/shared" "3.2.47" - -"@vue/reactivity@^3.2.45": - version "3.2.45" - resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.45.tgz#412a45b574de601be5a4a5d9a8cbd4dee4662ff0" - integrity sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A== - dependencies: - "@vue/shared" "3.2.45" - -"@vue/runtime-core@3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.47.tgz#406ebade3d5551c00fc6409bbc1eeb10f32e121d" - integrity sha512-RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA== - dependencies: - "@vue/reactivity" "3.2.47" - "@vue/shared" "3.2.47" - -"@vue/runtime-dom@3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.47.tgz#93e760eeaeab84dedfb7c3eaf3ed58d776299382" - integrity sha512-ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA== - dependencies: - "@vue/runtime-core" "3.2.47" - "@vue/shared" "3.2.47" - csstype "^2.6.8" - -"@vue/server-renderer@3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.47.tgz#8aa1d1871fc4eb5a7851aa7f741f8f700e6de3c0" - integrity sha512-dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA== - dependencies: - "@vue/compiler-ssr" "3.2.47" - "@vue/shared" "3.2.47" - -"@vue/shared@3.2.41": - version "3.2.41" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.41.tgz#fbc95422df654ea64e8428eced96ba6ad555d2bb" - integrity sha512-W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw== - -"@vue/shared@3.2.45", "@vue/shared@^3.2.45": - version "3.2.45" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.45.tgz#a3fffa7489eafff38d984e23d0236e230c818bc2" - integrity sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg== - -"@vue/shared@3.2.47": - version "3.2.47" - resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.47.tgz#e597ef75086c6e896ff5478a6bfc0a7aa4bbd14c" - integrity sha512-BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ== - -"@vue/test-utils@^2.0.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.2.0.tgz#3d8fc020802db9b726e2d91b6e3fb5b21aa0bf0c" - integrity sha512-EKp5/N7ieNZdoLTkD16j/irUjIEDN63QUIc41vLUMqGvSsTQN0QxbFiQqh5v49RPfS5vZH+DhjNUEkijCMOCSg== - -"@vue/test-utils@^2.2.10": - version "2.2.10" - resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.2.10.tgz#d2a5e00c973c68818352aa01513dc6288d96d716" - integrity sha512-UPY+VdWST5vYZ/Qhl+sLuJAv596e6kTbrOPgdGY82qd9kGN/MfjzLT5KXlmpChkiCbPP3abZ8XT25u1n5h+mRg== - dependencies: - js-beautify "1.14.6" - optionalDependencies: - "@vue/compiler-dom" "^3.0.1" - -"@vueuse/core@^9.12.0": - version "9.12.0" - resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-9.12.0.tgz#e5b20f901e081c7ae5fe0e5f3af217929034eefe" - integrity sha512-h/Di8Bvf6xRcvS/PvUVheiMYYz3U0tH3X25YxONSaAUBa841ayMwxkuzx/DGUMCW/wHWzD8tRy2zYmOC36r4sg== - dependencies: - "@types/web-bluetooth" "^0.0.16" - "@vueuse/metadata" "9.12.0" - "@vueuse/shared" "9.12.0" - vue-demi "*" - -"@vueuse/metadata@9.12.0": - version "9.12.0" - resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-9.12.0.tgz#19a0fefcba6a66a2382af10a7a67ebad6eec1f27" - integrity sha512-9oJ9MM9lFLlmvxXUqsR1wLt1uF7EVbP5iYaHJYqk+G2PbMjY6EXvZeTjbdO89HgoF5cI6z49o2zT/jD9SVoNpQ== - -"@vueuse/router@^9.12.0": - version "9.12.0" - resolved "https://registry.yarnpkg.com/@vueuse/router/-/router-9.12.0.tgz#985759be6fb4a55609942b300e62c4023a47612e" - integrity sha512-I3TaWrsxEdANrgJjNEeRTbOMGS+uYjB5zHoyayhFgk1SY1ytDw51tgXr6n4n9fVqglorvhKdX5rFDvBAbeQ+Xw== - dependencies: - "@vueuse/shared" "9.12.0" - vue-demi "*" - -"@vueuse/shared@9.12.0", "@vueuse/shared@^9.12.0": - version "9.12.0" - resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-9.12.0.tgz#e6597da80084cba8fc3d6545f4c2fa9817b80428" - integrity sha512-TWuJLACQ0BVithVTRbex4Wf1a1VaRuSpVeyEd4vMUWl54PzlE0ciFUshKCXnlLuD0lxIaLK4Ypj3NXYzZh4+SQ== - dependencies: - vue-demi "*" - -"@whatwg-node/fetch@0.6.1": - version "0.6.1" - resolved "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.6.1.tgz#802a3e71ade25c04211efc2f1520a25a8829924f" - integrity sha512-sG39WLvcJxGZ+gDstnLSXR2IcnuvIOB51KxCFo0mEhFW0q2u8fZgolr0HPkL+zXwOJsnmT+9V3IRcqLnTXdqVQ== - dependencies: - "@peculiar/webcrypto" "^1.4.0" - abort-controller "^3.0.0" - busboy "^1.6.0" - form-data-encoder "^1.7.1" - formdata-node "^4.3.1" - node-fetch "^2.6.7" - undici "^5.12.0" - urlpattern-polyfill "^6.0.2" - web-streams-polyfill "^3.2.0" - -"@whatwg-node/fetch@^0.4.0": - version "0.4.7" - resolved "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.4.7.tgz#4cbcda3ba93d5ae15ab823aae5869eae4a0cb14b" - integrity sha512-+oKDMGtmUJ7H37VDL5U2Vdk+ZxsIypZxO2q6y42ytu6W3PL6OIIUYZGliNqQgWtCdtxOZ9WPQvbIAuiLpnLlUw== - dependencies: - "@peculiar/webcrypto" "^1.4.0" - abort-controller "^3.0.0" - busboy "^1.6.0" - form-data-encoder "^1.7.1" - formdata-node "^4.3.1" - node-fetch "^2.6.7" - undici "^5.10.0" - web-streams-polyfill "^3.2.0" - -"@whatwg-node/fetch@^0.6.0": - version "0.6.2" - resolved "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.6.2.tgz#fe4837505f6fc91bcfd6e12cdcec66f4aecfeecc" - integrity sha512-fCUycF1W+bI6XzwJFnbdDuxIldfKM3w8+AzVCLGlucm0D+AQ8ZMm2j84hdcIhfV6ZdE4Y1HFVrHosAxdDZ+nPw== - dependencies: - "@peculiar/webcrypto" "^1.4.0" - abort-controller "^3.0.0" - busboy "^1.6.0" - form-data-encoder "^1.7.1" - formdata-node "^4.3.1" - node-fetch "^2.6.7" - undici "^5.12.0" - urlpattern-polyfill "^6.0.2" - web-streams-polyfill "^3.2.0" - -"@wry/context@^0.6.0": - version "0.6.1" - resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.6.1.tgz#c3c29c0ad622adb00f6a53303c4f965ee06ebeb2" - integrity sha512-LOmVnY1iTU2D8tv4Xf6MVMZZ+juIJ87Kt/plMijjN20NMAXGmH4u8bS1t0uT74cZ5gwpocYueV58YwyI8y+GKw== - dependencies: - tslib "^2.3.0" - -"@wry/context@^0.7.0": - version "0.7.0" - resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.7.0.tgz#be88e22c0ddf62aeb0ae9f95c3d90932c619a5c8" - integrity sha512-LcDAiYWRtwAoSOArfk7cuYvFXytxfVrdX7yxoUmK7pPITLk5jYh2F8knCwS7LjgYL8u1eidPlKKV6Ikqq0ODqQ== - dependencies: - tslib "^2.3.0" - -"@wry/equality@^0.5.0": - version "0.5.3" - resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.5.3.tgz#fafebc69561aa2d40340da89fa7dc4b1f6fb7831" - integrity sha512-avR+UXdSrsF2v8vIqIgmeTY0UR91UT+IyablCyKe/uk22uOJ8fusKZnH9JH9e1/EtLeNJBtagNmL3eJdnOV53g== - dependencies: - tslib "^2.3.0" - -"@wry/trie@^0.3.0": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.3.2.tgz#a06f235dc184bd26396ba456711f69f8c35097e6" - integrity sha512-yRTyhWSls2OY/pYLfwff867r8ekooZ4UI+/gxot5Wj8EFwSf2rG+n+Mo/6LoLQm1TKA4GRj2+LCpbfS937dClQ== - dependencies: - tslib "^2.3.0" - -abab@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291" - integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA== - -abbrev@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - -abort-controller@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392" - integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg== - dependencies: - event-target-shim "^5.0.0" - -acorn-globals@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3" - integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q== - dependencies: - acorn "^8.1.0" - acorn-walk "^8.0.2" - -acorn-jsx@^5.3.2: - version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" - integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== - -acorn-node@^1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" - integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== - dependencies: - acorn "^7.0.0" - acorn-walk "^7.0.0" - xtend "^4.0.2" - -acorn-walk@^7.0.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" - integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== - -acorn-walk@^8.0.2, acorn-walk@^8.1.1, acorn-walk@^8.2.0: - version "8.2.0" - resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" - integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== - -acorn@^7.0.0: - version "7.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" - integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== - -acorn@^8.1.0, acorn@^8.8.0: - version "8.8.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8" - integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w== - -acorn@^8.4.1, acorn@^8.5.0, acorn@^8.8.1: - version "8.8.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" - integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== - -agent-base@6: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== - dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" - -ajv@^6.10.0, ajv@^6.12.4: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - 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" - -ajv@^8.0.1, ajv@^8.6.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" - integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - -ansi-escapes@^4.2.1, ansi-escapes@^4.3.0: - version "4.3.2" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" - integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== - dependencies: - type-fest "^0.21.3" - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-regex@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" - integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== - -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -ansi-styles@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b" - integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA== - -ansi-styles@^6.0.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" - integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== - -anymatch@~3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -arg@^4.1.0: - version "4.1.3" - resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" - integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== - -arg@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c" - integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg== - -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - -aria-query@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.1.tgz#e930bc77378f0db1c705049fe73d90d9cb657600" - integrity sha512-4cPQjOYM2mqq7mZG8CSxkUvL2Yv/x29VhGq5LKehTsxRnoVQps1YGt9NyjcNQsznEsD4rr8a6zGxqeNTqJWjpA== - dependencies: - deep-equal "^2.0.5" - -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA== - -arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== - -array-includes@^3.1.6: - version "3.1.6" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f" - integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - get-intrinsic "^1.1.3" - is-string "^1.0.7" - -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== - -array.prototype.flat@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2" - integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - es-shim-unscopables "^1.0.0" - -array.prototype.flatmap@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183" - integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - es-shim-unscopables "^1.0.0" - -arrify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA== - -asap@~2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" - integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== - -asn1js@^3.0.1, asn1js@^3.0.5: - version "3.0.5" - resolved "https://registry.yarnpkg.com/asn1js/-/asn1js-3.0.5.tgz#5ea36820443dbefb51cc7f88a2ebb5b462114f38" - integrity sha512-FVnvrKJwpt9LP2lAMl8qZswRNm3T4q9CON+bxldk2iwk3FFpuwhx2FfinyitizWHsVYyaY+y5JzDR0rCMV5yTQ== - dependencies: - pvtsutils "^1.3.2" - pvutils "^1.1.3" - tslib "^2.4.0" - -assertion-error@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" - integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw== - -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw== - -astral-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" - integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== - -async-mutex@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/async-mutex/-/async-mutex-0.4.0.tgz#ae8048cd4d04ace94347507504b3cf15e631c25f" - integrity sha512-eJFZ1YhRR8UN8eBLoNzcDPcy/jqjsg6I1AP+KvWQX80BqOSW1oJPJXDylPUEeMr2ZQvHgnQ//Lp6f3RQ1zI7HA== - dependencies: - tslib "^2.4.0" - -async@^3.2.3: - version "3.2.4" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" - integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== - -at-least-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" - integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== - -atob@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== - -auto-bind@~4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz#e3589fc6c2da8f7ca43ba9f84fa52a744fc997fb" - integrity sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ== - -autoprefixer@^10.4.13: - version "10.4.13" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.13.tgz#b5136b59930209a321e9fa3dca2e7c4d223e83a8" - integrity sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg== - dependencies: - browserslist "^4.21.4" - caniuse-lite "^1.0.30001426" - fraction.js "^4.2.0" - normalize-range "^0.1.2" - picocolors "^1.0.0" - postcss-value-parser "^4.2.0" - -available-typed-arrays@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" - integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== - -axe-core@^4.4.2: - version "4.4.3" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz#11c74d23d5013c0fa5d183796729bc3482bd2f6f" - integrity sha512-32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w== - -babel-plugin-polyfill-corejs2@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122" - integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q== - dependencies: - "@babel/compat-data" "^7.17.7" - "@babel/helper-define-polyfill-provider" "^0.3.3" - semver "^6.1.1" - -babel-plugin-polyfill-corejs3@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a" - integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.3" - core-js-compat "^3.25.1" - -babel-plugin-polyfill-regenerator@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747" - integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw== - dependencies: - "@babel/helper-define-polyfill-provider" "^0.3.3" - -babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0: - version "7.0.0-beta.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf" - integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ== - -babel-preset-fbjs@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz#38a14e5a7a3b285a3f3a86552d650dca5cf6111c" - integrity sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow== - dependencies: - "@babel/plugin-proposal-class-properties" "^7.0.0" - "@babel/plugin-proposal-object-rest-spread" "^7.0.0" - "@babel/plugin-syntax-class-properties" "^7.0.0" - "@babel/plugin-syntax-flow" "^7.0.0" - "@babel/plugin-syntax-jsx" "^7.0.0" - "@babel/plugin-syntax-object-rest-spread" "^7.0.0" - "@babel/plugin-transform-arrow-functions" "^7.0.0" - "@babel/plugin-transform-block-scoped-functions" "^7.0.0" - "@babel/plugin-transform-block-scoping" "^7.0.0" - "@babel/plugin-transform-classes" "^7.0.0" - "@babel/plugin-transform-computed-properties" "^7.0.0" - "@babel/plugin-transform-destructuring" "^7.0.0" - "@babel/plugin-transform-flow-strip-types" "^7.0.0" - "@babel/plugin-transform-for-of" "^7.0.0" - "@babel/plugin-transform-function-name" "^7.0.0" - "@babel/plugin-transform-literals" "^7.0.0" - "@babel/plugin-transform-member-expression-literals" "^7.0.0" - "@babel/plugin-transform-modules-commonjs" "^7.0.0" - "@babel/plugin-transform-object-super" "^7.0.0" - "@babel/plugin-transform-parameters" "^7.0.0" - "@babel/plugin-transform-property-literals" "^7.0.0" - "@babel/plugin-transform-react-display-name" "^7.0.0" - "@babel/plugin-transform-react-jsx" "^7.0.0" - "@babel/plugin-transform-shorthand-properties" "^7.0.0" - "@babel/plugin-transform-spread" "^7.0.0" - "@babel/plugin-transform-template-literals" "^7.0.0" - babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0" - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -balanced-match@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz#dc70f920d78db8b858535795867bf48f820633d9" - integrity sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA== - -base64-js@^1.3.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - -birpc@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/birpc/-/birpc-0.1.1.tgz#10b243ffe5a21ccaf4cbaf5a09a6f0cc035c4312" - integrity sha512-B64AGL4ug2IS2jvV/zjTYDD1L+2gOJTT7Rv+VaK7KVQtQOo/xZbCDsh7g727ipckmU+QJYRqo5RcifVr0Kgcmg== - -bl@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" - integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -bluebird@^3.5.0: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== - -boolbase@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" - integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== - dependencies: - balanced-match "^1.0.0" - -braces@^2.2.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - -braces@^3.0.2, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -browserslist@^4.21.3, browserslist@^4.21.4: - version "4.21.4" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" - integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== - dependencies: - caniuse-lite "^1.0.30001400" - electron-to-chromium "^1.4.251" - node-releases "^2.0.6" - update-browserslist-db "^1.0.9" - -bser@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05" - integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ== - dependencies: - node-int64 "^0.4.0" - -buffer-equal-constant-time@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819" - integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA== - -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== - -buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - -builtin-modules@^3.1.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6" - integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw== - -busboy@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893" - integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA== - dependencies: - streamsearch "^1.1.0" - -cac@^6.7.14: - version "6.7.14" - resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959" - integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ== - -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - -call-bind@^1.0.0, call-bind@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" - -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== - -camel-case@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" - integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== - dependencies: - pascal-case "^3.1.2" - tslib "^2.0.3" - -camelcase-css@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz#ee978f6947914cc30c6b44741b6ed1df7f043fd5" - integrity sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA== - -camelcase-keys@^6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0" - integrity sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg== - dependencies: - camelcase "^5.3.1" - map-obj "^4.0.0" - quick-lru "^4.0.1" - -camelcase@^5.0.0, camelcase@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -caniuse-lite@^1.0.30001400: - version "1.0.30001423" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001423.tgz#57176d460aa8cd85ee1a72016b961eb9aca55d91" - integrity sha512-09iwWGOlifvE1XuHokFMP7eR38a0JnajoyL3/i87c8ZjRWRrdKo1fqjNfugfBD0UDBIOz0U+jtNhJ0EPm1VleQ== - -caniuse-lite@^1.0.30001426: - version "1.0.30001427" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001427.tgz#d3a749f74be7ae0671fbec3a4eea18576e8ad646" - integrity sha512-lfXQ73oB9c8DP5Suxaszm+Ta2sr/4tf8+381GkIm1MLj/YdLf+rEDyDSRCzeltuyTVGm+/s18gdZ0q+Wmp8VsQ== - -capital-case@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669" - integrity sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - upper-case-first "^2.0.2" - -case-anything@^2.1.10: - version "2.1.10" - resolved "https://registry.yarnpkg.com/case-anything/-/case-anything-2.1.10.tgz#d18a6ca968d54ec3421df71e3e190f3bced23410" - integrity sha512-JczJwVrCP0jPKh05McyVsuOg6AYosrB9XWZKbQzXeDAm2ClE/PJE/BcrrQrVyGYH7Jg8V/LDupmyL4kFlVsVFQ== - -chai@^4.3.7: - version "4.3.7" - resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.7.tgz#ec63f6df01829088e8bf55fca839bcd464a8ec51" - integrity sha512-HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A== - dependencies: - assertion-error "^1.1.0" - check-error "^1.0.2" - deep-eql "^4.1.2" - get-func-name "^2.0.0" - loupe "^2.3.1" - pathval "^1.1.1" - type-detect "^4.0.5" - -chalk@^2.0.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chalk@^5.0.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.1.2.tgz#d957f370038b75ac572471e83be4c5ca9f8e8c45" - integrity sha512-E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ== - -change-case-all@1.0.14: - version "1.0.14" - resolved "https://registry.yarnpkg.com/change-case-all/-/change-case-all-1.0.14.tgz#bac04da08ad143278d0ac3dda7eccd39280bfba1" - integrity sha512-CWVm2uT7dmSHdO/z1CXT/n47mWonyypzBbuCy5tN7uMg22BsfkhwT6oHmFCAk+gL1LOOxhdbB9SZz3J1KTY3gA== - dependencies: - change-case "^4.1.2" - is-lower-case "^2.0.2" - is-upper-case "^2.0.2" - lower-case "^2.0.2" - lower-case-first "^2.0.2" - sponge-case "^1.0.1" - swap-case "^2.0.2" - title-case "^3.0.3" - upper-case "^2.0.2" - upper-case-first "^2.0.2" - -change-case-all@1.0.15: - version "1.0.15" - resolved "https://registry.yarnpkg.com/change-case-all/-/change-case-all-1.0.15.tgz#de29393167fc101d646cd76b0ef23e27d09756ad" - integrity sha512-3+GIFhk3sNuvFAJKU46o26OdzudQlPNBCu1ZQi3cMeMHhty1bhDxu2WrEilVNYaGvqUtR1VSigFcJOiS13dRhQ== - dependencies: - change-case "^4.1.2" - is-lower-case "^2.0.2" - is-upper-case "^2.0.2" - lower-case "^2.0.2" - lower-case-first "^2.0.2" - sponge-case "^1.0.1" - swap-case "^2.0.2" - title-case "^3.0.3" - upper-case "^2.0.2" - upper-case-first "^2.0.2" - -change-case@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/change-case/-/change-case-4.1.2.tgz#fedfc5f136045e2398c0410ee441f95704641e12" - integrity sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A== - dependencies: - camel-case "^4.1.2" - capital-case "^1.0.4" - constant-case "^3.0.4" - dot-case "^3.0.4" - header-case "^2.0.4" - no-case "^3.0.4" - param-case "^3.0.4" - pascal-case "^3.1.2" - path-case "^3.0.4" - sentence-case "^3.0.4" - snake-case "^3.0.4" - tslib "^2.0.3" - -chardet@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" - integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== - -check-error@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" - integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA== - -"chokidar@>=3.0.0 <4.0.0", chokidar@^3.5.2, chokidar@^3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== - dependencies: - anymatch "~3.1.2" - braces "~3.0.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" - optionalDependencies: - fsevents "~2.3.2" - -ci-info@^3.2.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz#bfac2a29263de4c829d806b1ab478e35091e171f" - integrity sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw== - -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - -classnames@^2.2.6: - version "2.3.2" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924" - integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw== - -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== - -cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== - dependencies: - restore-cursor "^3.1.0" - -cli-spinners@^2.5.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a" - integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw== - -cli-truncate@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" - integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== - dependencies: - slice-ansi "^3.0.0" - string-width "^4.2.0" - -cli-truncate@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-3.1.0.tgz#3f23ab12535e3d73e839bb43e73c9de487db1389" - integrity sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA== - dependencies: - slice-ansi "^5.0.0" - string-width "^5.0.0" - -cli-width@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" - integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== - -cliui@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" - integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^6.2.0" - -cliui@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" - integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.1" - wrap-ansi "^7.0.0" - -clone@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" - integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== - -clone@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" - integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== - -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw== - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - -color-name@^1.1.4, color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -colord@^2.9.3: - version "2.9.3" - resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43" - integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw== - -colorette@^2.0.16: - version "2.0.19" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" - integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== - -combined-stream@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -commander@^2.19.0, commander@^2.20.0: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - -commander@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - -common-tags@1.8.2, common-tags@^1.8.0: - version "1.8.2" - resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6" - integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA== - -component-emitter@^1.2.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - -config-chain@^1.1.13: - version "1.1.13" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" - integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== - dependencies: - ini "^1.3.4" - proto-list "~1.2.1" - -confusing-browser-globals@^1.0.10: - version "1.0.11" - resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81" - integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA== - -connect@^3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" - integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ== - dependencies: - debug "2.6.9" - finalhandler "1.1.2" - parseurl "~1.3.3" - utils-merge "1.0.1" - -constant-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/constant-case/-/constant-case-3.0.4.tgz#3b84a9aeaf4cf31ec45e6bf5de91bdfb0589faf1" - integrity sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - upper-case "^2.0.2" - -convert-source-map@^1.7.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" - integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== - -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== - -core-js-compat@^3.25.1: - version "3.26.0" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.26.0.tgz#94e2cf8ba3e63800c4956ea298a6473bc9d62b44" - integrity sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A== - dependencies: - browserslist "^4.21.4" - -cors@^2.8.5: - version "2.8.5" - resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" - integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== - dependencies: - object-assign "^4" - vary "^1" - -cosmiconfig-typescript-loader@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz#c4259ce474c9df0f32274ed162c0447c951ef073" - integrity sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q== - -cosmiconfig@8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.0.0.tgz#e9feae014eab580f858f8a0288f38997a7bebe97" - integrity sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ== - dependencies: - import-fresh "^3.2.1" - js-yaml "^4.1.0" - parse-json "^5.0.0" - path-type "^4.0.0" - -cosmiconfig@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" - integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== - dependencies: - "@types/parse-json" "^4.0.0" - import-fresh "^3.2.1" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.10.0" - -cosmiconfig@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6" - integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA== - dependencies: - "@types/parse-json" "^4.0.0" - import-fresh "^3.2.1" - parse-json "^5.0.0" - path-type "^4.0.0" - yaml "^1.10.0" - -create-require@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" - integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== - -crelt@^1.0.0, crelt@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/crelt/-/crelt-1.0.5.tgz#57c0d52af8c859e354bace1883eb2e1eb182bb94" - integrity sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA== - -cross-fetch@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" - integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== - dependencies: - node-fetch "2.6.7" - -cross-spawn@^7.0.2: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -crypto-random-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" - integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== - -css-functions-list@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.1.0.tgz#cf5b09f835ad91a00e5959bcfc627cd498e1321b" - integrity sha512-/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w== - -css-select@^4.1.3: - version "4.3.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b" - integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ== - dependencies: - boolbase "^1.0.0" - css-what "^6.0.1" - domhandler "^4.3.1" - domutils "^2.8.0" - nth-check "^2.0.1" - -css-tree@^1.1.2, css-tree@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" - integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== - dependencies: - mdn-data "2.0.14" - source-map "^0.6.1" - -css-what@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" - integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== - -css.escape@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb" - integrity sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg== - -cssesc@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" - integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== - -csso@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" - integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== - dependencies: - css-tree "^1.1.2" - -cssom@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36" - integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw== - -cssom@~0.3.6: - version "0.3.8" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" - integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== - -cssstyle@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" - integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== - dependencies: - cssom "~0.3.6" - -csstype@^2.6.8: - version "2.6.21" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz#2efb85b7cc55c80017c66a5ad7cbd931fda3a90e" - integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w== - -dash-get@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/dash-get/-/dash-get-1.0.2.tgz#4c9e9ad5ef04c4bf9d3c9a451f6f7997298dcc7c" - integrity sha512-4FbVrHDwfOASx7uQVxeiCTo7ggSdYZbqs8lH+WU6ViypPlDbe9y6IP5VVUDQBv9DcnyaiPT5XT0UWHgJ64zLeQ== - -data-urls@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143" - integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ== - dependencies: - abab "^2.0.6" - whatwg-mimetype "^3.0.0" - whatwg-url "^11.0.0" - -dataloader@2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/dataloader/-/dataloader-2.1.0.tgz#c69c538235e85e7ac6c6c444bae8ecabf5de9df7" - integrity sha512-qTcEYLen3r7ojZNgVUaRggOI+KM7jrKxXeSHhogh/TWxYMeONEMqY+hmkobiYQozsGIyg9OYVzO4ZIfoB4I0pQ== - -de-indent@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" - integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg== - -debounce@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5" - integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug== - -debug@2.6.9, debug@^2.2.0, debug@^2.3.3: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -debug@^3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - -decamelize-keys@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" - integrity sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg== - dependencies: - decamelize "^1.1.0" - map-obj "^1.0.0" - -decamelize@^1.1.0, decamelize@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== - -decimal.js@^10.4.2: - version "10.4.2" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz#0341651d1d997d86065a2ce3a441fbd0d8e8b98e" - integrity sha512-ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA== - -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og== - -deep-eql@^4.1.2: - version "4.1.3" - resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz#7c7775513092f7df98d8df9996dd085eb668cc6d" - integrity sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw== - dependencies: - type-detect "^4.0.0" - -deep-equal@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.5.tgz#55cd2fe326d83f9cbf7261ef0e060b3f724c5cb9" - integrity sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw== - dependencies: - call-bind "^1.0.0" - es-get-iterator "^1.1.1" - get-intrinsic "^1.0.1" - is-arguments "^1.0.4" - is-date-object "^1.0.2" - is-regex "^1.1.1" - isarray "^2.0.5" - object-is "^1.1.4" - object-keys "^1.1.1" - object.assign "^4.1.2" - regexp.prototype.flags "^1.3.0" - side-channel "^1.0.3" - which-boxed-primitive "^1.0.1" - which-collection "^1.0.1" - which-typed-array "^1.1.2" - -deep-is@^0.1.3, deep-is@~0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" - integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== - -deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== - -defaults@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a" - integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A== - dependencies: - clone "^1.0.2" - -define-properties@^1.1.3, define-properties@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" - integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== - dependencies: - has-property-descriptors "^1.0.0" - object-keys "^1.1.1" - -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA== - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA== - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - -defined@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.1.tgz#c0b9db27bfaffd95d6f61399419b893df0f91ebf" - integrity sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q== - -defu@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/defu/-/defu-6.1.0.tgz#7a5411655da73335c7d933256911f17c74443e2d" - integrity sha512-pOFYRTIhoKujrmbTRhcW5lYQLBXw/dlTwfI8IguF1QCDJOcJzNH1w+YFjxqy6BAuJrClTy6MUE8q+oKJ2FLsIw== - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== - -dependency-graph@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27" - integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg== - -detect-indent@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6" - integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA== - -detective@^5.2.1: - version "5.2.1" - resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.1.tgz#6af01eeda11015acb0e73f933242b70f24f91034" - integrity sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw== - dependencies: - acorn-node "^1.8.2" - defined "^1.0.0" - minimist "^1.2.6" - -diacritics@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/diacritics/-/diacritics-1.3.0.tgz#3efa87323ebb863e6696cebb0082d48ff3d6f7a1" - integrity sha512-wlwEkqcsaxvPJML+rDh/2iS824jbREk6DUMUKkEaSlxdYHeS43cClJtsWglvw2RfeXGm6ohKDqsXteJ5sP5enA== - -didyoumean@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037" - integrity sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw== - -diff-sequences@^29.2.0: - version "29.2.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.2.0.tgz#4c55b5b40706c7b5d2c5c75999a50c56d214e8f6" - integrity sha512-413SY5JpYeSBZxmenGEmCVQ8mCgtFJF0w9PROdaS6z987XC2Pd2GOKqOITLtMftmyFZqgtCOb/QA7/Z3ZXfzIw== - -diff@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" - integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== - -diff@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40" - integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw== - -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== - dependencies: - path-type "^4.0.0" - -dlv@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" - integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== - -doctrine@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" - integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== - dependencies: - esutils "^2.0.2" - -doctrine@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" - integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== - dependencies: - esutils "^2.0.2" - -dom-accessibility-api@^0.5.14, dom-accessibility-api@^0.5.6, dom-accessibility-api@^0.5.9: - version "0.5.14" - resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.14.tgz#56082f71b1dc7aac69d83c4285eef39c15d93f56" - integrity sha512-NMt+m9zFMPZe0JcY9gN224Qvk6qLIdqex29clBvc/y75ZBX9YA9wNK3frsYvu2DI1xcCIwxwnX+TlsJ2DSOADg== - -dom-serializer@0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" - integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== - dependencies: - domelementtype "^2.0.1" - entities "^2.0.0" - -dom-serializer@^1.0.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30" - integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.2.0" - entities "^2.0.0" - -dom-serializer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" - integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== - dependencies: - domelementtype "^2.3.0" - domhandler "^5.0.2" - entities "^4.2.0" - -domelementtype@1, domelementtype@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" - integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== - -domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" - integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== - -domexception@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673" - integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw== - dependencies: - webidl-conversions "^7.0.0" - -domhandler@^2.3.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" - integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA== - dependencies: - domelementtype "1" - -domhandler@^4.2.0, domhandler@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" - integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== - dependencies: - domelementtype "^2.2.0" - -domhandler@^5.0.1, domhandler@^5.0.2: - version "5.0.3" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" - integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== - dependencies: - domelementtype "^2.3.0" - -domutils@^1.5.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" - integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== - dependencies: - dom-serializer "0" - domelementtype "1" - -domutils@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" - integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== - dependencies: - dom-serializer "^1.0.1" - domelementtype "^2.2.0" - domhandler "^4.2.0" - -domutils@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" - integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== - dependencies: - dom-serializer "^2.0.0" - domelementtype "^2.3.0" - domhandler "^5.0.1" - -dot-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" - integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - -dotenv@^16.0.0: - version "16.0.3" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07" - integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ== - -dset@3.1.2, dset@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/dset/-/dset-3.1.2.tgz#89c436ca6450398396dc6538ea00abc0c54cd45a" - integrity sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q== - -eastasianwidth@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" - integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== - -easy-bem@^1.0.2: - version "1.1.1" - resolved "https://registry.yarnpkg.com/easy-bem/-/easy-bem-1.1.1.tgz#1bfcc10425498090bcfddc0f9c000aba91399e03" - integrity sha512-GJRqdiy2h+EXy6a8E6R+ubmqUM08BK0FWNq41k24fup6045biQ8NXxoXimiwegMQvFFV3t1emADdGNL1TlS61A== - -ecdsa-sig-formatter@1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz#ae0f0fa2d85045ef14a817daa3ce9acd0489e5bf" - integrity sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ== - dependencies: - safe-buffer "^5.0.1" - -editorconfig@^0.15.3: - version "0.15.3" - resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5" - integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g== - dependencies: - commander "^2.19.0" - lru-cache "^4.1.5" - semver "^5.6.0" - sigmund "^1.0.1" - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== - -ejs@^3.1.6: - version "3.1.8" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" - integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== - dependencies: - jake "^10.8.5" - -electron-to-chromium@^1.4.251: - version "1.4.284" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" - integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -emoji-regex@^9.2.2: - version "9.2.2" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" - integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== - -entities@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" - integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== - -entities@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" - integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== - -entities@^4.2.0, entities@^4.3.0, entities@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" - integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== - -entities@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" - integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== - -entities@~3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4" - integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== - -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.5, es-abstract@^1.20.0: - version "1.20.4" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861" - integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA== - dependencies: - call-bind "^1.0.2" - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - function.prototype.name "^1.1.5" - get-intrinsic "^1.1.3" - get-symbol-description "^1.0.0" - has "^1.0.3" - has-property-descriptors "^1.0.0" - has-symbols "^1.0.3" - internal-slot "^1.0.3" - 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-weakref "^1.0.2" - object-inspect "^1.12.2" - object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.4.3" - safe-regex-test "^1.0.0" - string.prototype.trimend "^1.0.5" - string.prototype.trimstart "^1.0.5" - unbox-primitive "^1.0.2" - -es-abstract@^1.20.4: - version "1.21.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz#e6105a099967c08377830a0c9cb589d570dd86c6" - integrity sha512-QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-set-tostringtag "^2.0.1" - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - function.prototype.name "^1.1.5" - get-intrinsic "^1.1.3" - get-symbol-description "^1.0.0" - globalthis "^1.0.3" - gopd "^1.0.1" - has "^1.0.3" - has-property-descriptors "^1.0.0" - has-proto "^1.0.1" - has-symbols "^1.0.3" - internal-slot "^1.0.4" - is-array-buffer "^3.0.1" - 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.10" - is-weakref "^1.0.2" - object-inspect "^1.12.2" - object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.4.3" - safe-regex-test "^1.0.0" - string.prototype.trimend "^1.0.6" - string.prototype.trimstart "^1.0.6" - typed-array-length "^1.0.4" - unbox-primitive "^1.0.2" - which-typed-array "^1.1.9" - -es-get-iterator@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.2.tgz#9234c54aba713486d7ebde0220864af5e2b283f7" - integrity sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.0" - has-symbols "^1.0.1" - is-arguments "^1.1.0" - is-map "^2.0.2" - is-set "^2.0.2" - is-string "^1.0.5" - isarray "^2.0.5" - -es-set-tostringtag@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz#338d502f6f674301d710b80c8592de8a15f09cd8" - integrity sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg== - dependencies: - get-intrinsic "^1.1.3" - has "^1.0.3" - has-tostringtag "^1.0.0" - -es-shim-unscopables@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" - integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w== - dependencies: - has "^1.0.3" - -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - -esbuild@^0.16.3: - version "0.16.4" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.16.4.tgz#06c86298d233386f5e41bcc14d36086daf3f40bd" - integrity sha512-qQrPMQpPTWf8jHugLWHoGqZjApyx3OEm76dlTXobHwh/EBbavbRdjXdYi/GWr43GyN0sfpap14GPkb05NH3ROA== - optionalDependencies: - "@esbuild/android-arm" "0.16.4" - "@esbuild/android-arm64" "0.16.4" - "@esbuild/android-x64" "0.16.4" - "@esbuild/darwin-arm64" "0.16.4" - "@esbuild/darwin-x64" "0.16.4" - "@esbuild/freebsd-arm64" "0.16.4" - "@esbuild/freebsd-x64" "0.16.4" - "@esbuild/linux-arm" "0.16.4" - "@esbuild/linux-arm64" "0.16.4" - "@esbuild/linux-ia32" "0.16.4" - "@esbuild/linux-loong64" "0.16.4" - "@esbuild/linux-mips64el" "0.16.4" - "@esbuild/linux-ppc64" "0.16.4" - "@esbuild/linux-riscv64" "0.16.4" - "@esbuild/linux-s390x" "0.16.4" - "@esbuild/linux-x64" "0.16.4" - "@esbuild/netbsd-x64" "0.16.4" - "@esbuild/openbsd-x64" "0.16.4" - "@esbuild/sunos-x64" "0.16.4" - "@esbuild/win32-arm64" "0.16.4" - "@esbuild/win32-ia32" "0.16.4" - "@esbuild/win32-x64" "0.16.4" - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== - -escape-string-regexp@1.0.5, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - -escape-string-regexp@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344" - integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== - -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -escodegen@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" - integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== - dependencies: - esprima "^4.0.1" - estraverse "^5.2.0" - esutils "^2.0.2" - optionator "^0.8.1" - optionalDependencies: - source-map "~0.6.1" - -eslint-config-airbnb-base@^15.0.0: - version "15.0.0" - resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz#6b09add90ac79c2f8d723a2580e07f3925afd236" - integrity sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig== - dependencies: - confusing-browser-globals "^1.0.10" - object.assign "^4.1.2" - object.entries "^1.1.5" - semver "^6.3.0" - -eslint-config-prettier@^8.3.0: - version "8.5.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" - integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== - -eslint-config-prettier@^8.6.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz#dec1d29ab728f4fa63061774e1672ac4e363d207" - integrity sha512-bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA== - -eslint-import-resolver-alias@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-alias/-/eslint-import-resolver-alias-1.1.2.tgz#297062890e31e4d6651eb5eba9534e1f6e68fc97" - integrity sha512-WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w== - -eslint-import-resolver-node@^0.3.7: - version "0.3.7" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7" - integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA== - dependencies: - debug "^3.2.7" - is-core-module "^2.11.0" - resolve "^1.22.1" - -eslint-module-utils@^2.7.4: - version "2.7.4" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974" - integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA== - dependencies: - debug "^3.2.7" - -eslint-plugin-import@^2.27.5: - version "2.27.5" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65" - integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow== - dependencies: - array-includes "^3.1.6" - array.prototype.flat "^1.3.1" - array.prototype.flatmap "^1.3.1" - debug "^3.2.7" - doctrine "^2.1.0" - eslint-import-resolver-node "^0.3.7" - eslint-module-utils "^2.7.4" - has "^1.0.3" - is-core-module "^2.11.0" - is-glob "^4.0.3" - minimatch "^3.1.2" - object.values "^1.1.6" - resolve "^1.22.1" - semver "^6.3.0" - tsconfig-paths "^3.14.1" - -eslint-plugin-prettier-vue@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier-vue/-/eslint-plugin-prettier-vue-4.2.0.tgz#f24d684a41f8fb112977302689248ffe68175548" - integrity sha512-DA2oNRx+pZ6RM/EIHIPME4FQZifnkEROa55OWtTTUFGHpj53tcHomuxVP/kS/2MM+ul46GEK+jymK69STWDWoA== - dependencies: - "@vue/compiler-sfc" "^3.2.37" - chalk "^4.0.0" - prettier "^2.7.1" - prettier-linter-helpers "^1.0.0" - -eslint-plugin-prettier@^4.0.0, eslint-plugin-prettier@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b" - integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ== - dependencies: - prettier-linter-helpers "^1.0.0" - -eslint-plugin-security@^1.7.1: - version "1.7.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-security/-/eslint-plugin-security-1.7.1.tgz#0e9c4a471f6e4d3ca16413c7a4a51f3966ba16e4" - integrity sha512-sMStceig8AFglhhT2LqlU5r+/fn9OwsA72O5bBuQVTssPCdQAOQzL+oMn/ZcpeUY6KcNfLJArgcrsSULNjYYdQ== - dependencies: - safe-regex "^2.1.1" - -eslint-plugin-sonarjs@^0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-sonarjs/-/eslint-plugin-sonarjs-0.18.0.tgz#7c009452f633cf6a4c28387dd50502a3e828b05e" - integrity sha512-DJ3osLnt6KFdT5e9ZuIDOjT5A6wUGSLeiJJT03lPgpdD+7CVWlYAw9Goe3bt7SmbFO3Xh89NOCZAuB9XA7bAUQ== - -eslint-plugin-vue@^9.9.0: - version "9.9.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.9.0.tgz#ac788ebccd2eb94d846a507df55da50693b80c91" - integrity sha512-YbubS7eK0J7DCf0U2LxvVP7LMfs6rC6UltihIgval3azO3gyDwEGVgsCMe1TmDiEkl6GdMKfRpaME6QxIYtzDQ== - dependencies: - eslint-utils "^3.0.0" - natural-compare "^1.4.0" - nth-check "^2.0.1" - postcss-selector-parser "^6.0.9" - semver "^7.3.5" - vue-eslint-parser "^9.0.1" - xml-name-validator "^4.0.0" - -"eslint-plugin-zammad@file:.eslint-plugin-zammad": - version "0.0.0" - dependencies: - requireindex "^1.2.0" - -eslint-scope@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - -eslint-scope@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" - integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== - dependencies: - esrecurse "^4.3.0" - estraverse "^5.2.0" - -eslint-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" - integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== - dependencies: - eslint-visitor-keys "^2.0.0" - -eslint-visitor-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" - integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== - -eslint-visitor-keys@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" - integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== - -eslint@^8.33.0: - version "8.33.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.33.0.tgz#02f110f32998cb598c6461f24f4d306e41ca33d7" - integrity sha512-WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA== - dependencies: - "@eslint/eslintrc" "^1.4.1" - "@humanwhocodes/config-array" "^0.11.8" - "@humanwhocodes/module-importer" "^1.0.1" - "@nodelib/fs.walk" "^1.2.8" - ajv "^6.10.0" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.3.2" - doctrine "^3.0.0" - escape-string-regexp "^4.0.0" - eslint-scope "^7.1.1" - eslint-utils "^3.0.0" - eslint-visitor-keys "^3.3.0" - espree "^9.4.0" - esquery "^1.4.0" - esutils "^2.0.2" - fast-deep-equal "^3.1.3" - file-entry-cache "^6.0.1" - find-up "^5.0.0" - glob-parent "^6.0.2" - globals "^13.19.0" - grapheme-splitter "^1.0.4" - ignore "^5.2.0" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - is-path-inside "^3.0.3" - js-sdsl "^4.1.4" - js-yaml "^4.1.0" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" - lodash.merge "^4.6.2" - minimatch "^3.1.2" - natural-compare "^1.4.0" - optionator "^0.9.1" - regexpp "^3.2.0" - strip-ansi "^6.0.1" - strip-json-comments "^3.1.0" - text-table "^0.2.0" - -espree@^9.3.1, espree@^9.4.0: - version "9.4.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a" - integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw== - dependencies: - acorn "^8.8.0" - acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.3.0" - -esprima@^4.0.0, esprima@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - -esquery@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" - integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== - dependencies: - estraverse "^5.1.0" - -esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - -estraverse@^5.1.0, estraverse@^5.2.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" - integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== - -estree-walker@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" - integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== - -estree-walker@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac" - integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w== - -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - -etag@^1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== - -event-target-shim@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789" - integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ== - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA== - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -expect@^29.0.0: - version "29.2.1" - resolved "https://registry.yarnpkg.com/expect/-/expect-29.2.1.tgz#25752d0df92d3daa5188dc8804de1f30759658cf" - integrity sha512-BJtA754Fba0YWRWHgjKUMTA3ltWarKgITXHQnbZ2mTxTXC4yMQlR0FI7HkB3fJYkhWBf4qjNiqvg3LDtXCcVRQ== - dependencies: - "@jest/expect-utils" "^29.2.1" - jest-get-type "^29.2.0" - jest-matcher-utils "^29.2.1" - jest-message-util "^29.2.1" - jest-util "^29.2.1" - -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug== - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q== - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -external-editor@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" - integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== - dependencies: - chardet "^0.7.0" - iconv-lite "^0.4.24" - tmp "^0.0.33" - -extglob@^2.0.2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -extract-files@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-11.0.0.tgz#b72d428712f787eef1f5193aff8ab5351ca8469a" - integrity sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ== - -extract-files@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-9.0.0.tgz#8a7744f2437f81f5ed3250ed9f1550de902fe54a" - integrity sha512-CvdFfHkC95B4bBBk36hcEmvdR2awOdhhVUYH6S/zrVj3477zven/fJMYg7121h4T1xHZC+tetUpubpAhxwI7hQ== - -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-diff@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" - integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== - -fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.9: - version "3.2.12" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" - integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== - dependencies: - "@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@^2.0.0, fast-json-stable-stringify@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== - -fastest-levenshtein@^1.0.16: - version "1.0.16" - resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5" - integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg== - -fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== - dependencies: - reusify "^1.0.4" - -fb-watchman@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c" - integrity sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA== - dependencies: - bser "2.1.1" - -fbjs-css-vars@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz#216551136ae02fe255932c3ec8775f18e2c078b8" - integrity sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ== - -fbjs@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.4.tgz#e1871c6bd3083bac71ff2da868ad5067d37716c6" - integrity sha512-ucV0tDODnGV3JCnnkmoszb5lf4bNpzjv80K41wd4k798Etq+UYD0y0TIfalLjZoKgjive6/adkRnszwapiDgBQ== - dependencies: - cross-fetch "^3.1.5" - fbjs-css-vars "^1.0.0" - loose-envify "^1.0.0" - object-assign "^4.1.0" - promise "^7.1.1" - setimmediate "^1.0.5" - ua-parser-js "^0.7.30" - -figures@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" - integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== - dependencies: - escape-string-regexp "^1.0.5" - -file-entry-cache@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" - integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== - dependencies: - flat-cache "^3.0.4" - -filelist@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" - integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== - dependencies: - minimatch "^5.0.1" - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ== - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -finalhandler@1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" - unpipe "~1.0.0" - -find-up@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -find-up@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - -flat-cache@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" - integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== - dependencies: - flatted "^3.1.0" - rimraf "^3.0.2" - -flatpickr@^4.6.13: - version "4.6.13" - resolved "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.13.tgz#8a029548187fd6e0d670908471e43abe9ad18d94" - integrity sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw== - -flatted@^3.1.0: - version "3.2.7" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" - integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== - -flexsearch@0.7.21: - version "0.7.21" - resolved "https://registry.yarnpkg.com/flexsearch/-/flexsearch-0.7.21.tgz#0f5ede3f2aae67ddc351efbe3b24b69d29e9d48b" - integrity sha512-W7cHV7Hrwjid6lWmy0IhsWDFQboWSng25U3VVywpHOTJnnAZNPScog67G+cVpeX9f7yDD21ih0WDrMMT+JoaYg== - -for-each@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" - integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== - dependencies: - is-callable "^1.1.3" - -for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ== - -form-data-encoder@^1.7.1: - version "1.7.2" - resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.7.2.tgz#1f1ae3dccf58ed4690b86d87e4f57c654fbab040" - integrity sha512-qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A== - -form-data@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" - integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - -form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - -formdata-node@^4.3.1: - version "4.4.1" - resolved "https://registry.yarnpkg.com/formdata-node/-/formdata-node-4.4.1.tgz#23f6a5cb9cb55315912cbec4ff7b0f59bbd191e2" - integrity sha512-0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ== - dependencies: - node-domexception "1.0.0" - web-streams-polyfill "4.0.0-beta.3" - -fraction.js@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" - integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== - -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA== - dependencies: - map-cache "^0.2.2" - -fs-extra@^10.0.0, fs-extra@^10.0.1: - version "10.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" - integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-extra@^9.0.1: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== - -fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -function.prototype.name@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" - integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.0" - functions-have-names "^1.2.2" - -functions-have-names@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" - integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== - -gensync@^1.0.0-beta.2: - version "1.0.0-beta.2" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" - integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== - -get-caller-file@^2.0.1, get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-func-name@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" - integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig== - -get-intrinsic@^1.0.1, get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" - integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.3" - -get-own-enumerable-property-symbols@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" - integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g== - -get-symbol-description@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" - integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" - -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA== - -glob-parent@^5.1.2, glob-parent@~5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - -glob-parent@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" - integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== - dependencies: - is-glob "^4.0.3" - -glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - 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" - -glob@^8.0.3: - version "8.1.0" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" - integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^5.0.1" - once "^1.3.0" - -global-modules@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" - integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== - dependencies: - global-prefix "^3.0.0" - -global-prefix@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" - integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== - dependencies: - ini "^1.3.5" - kind-of "^6.0.2" - which "^1.3.1" - -globals@^11.1.0: - version "11.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" - integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== - -globals@^13.19.0: - version "13.19.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz#7a42de8e6ad4f7242fbcca27ea5b23aca367b5c8" - integrity sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ== - dependencies: - type-fest "^0.20.2" - -globalthis@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" - integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== - dependencies: - define-properties "^1.1.3" - -globby@^11.0.3, globby@^11.1.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" - integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== - 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" - -globby@^13.1.1: - version "13.1.2" - resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.2.tgz#29047105582427ab6eca4f905200667b056da515" - integrity sha512-LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ== - dependencies: - dir-glob "^3.0.1" - fast-glob "^3.2.11" - ignore "^5.2.0" - merge2 "^1.4.1" - slash "^4.0.0" - -globjoin@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43" - integrity sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg== - -gopd@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" - integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== - dependencies: - get-intrinsic "^1.1.3" - -graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.9: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== - -grapheme-splitter@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" - integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== - -graphql-config@^4.4.0: - version "4.4.1" - resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-4.4.1.tgz#2b1b5215b38911c0b15ff9b2e878101c984802d6" - integrity sha512-B8wlvfBHZ5WnI4IiuQZRqql6s+CKz7S+xpUeTb28Z8nRBi8tH9ChEBgT5FnTyE05PUhHlrS2jK9ICJ4YBl9OtQ== - dependencies: - "@graphql-tools/graphql-file-loader" "^7.3.7" - "@graphql-tools/json-file-loader" "^7.3.7" - "@graphql-tools/load" "^7.5.5" - "@graphql-tools/merge" "^8.2.6" - "@graphql-tools/url-loader" "^7.9.7" - "@graphql-tools/utils" "^9.0.0" - cosmiconfig "8.0.0" - minimatch "4.2.1" - string-env-interpolation "1.0.1" - tslib "^2.4.0" - -graphql-request@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-5.0.0.tgz#7504a807d0e11be11a3c448e900f0cc316aa18ef" - integrity sha512-SpVEnIo2J5k2+Zf76cUkdvIRaq5FMZvGQYnA4lUWYbc99m+fHh4CZYRRO/Ff4tCLQ613fzCm3SiDT64ubW5Gyw== - dependencies: - "@graphql-typed-document-node/core" "^3.1.1" - cross-fetch "^3.1.5" - extract-files "^9.0.0" - form-data "^3.0.0" - -graphql-ruby-client@^1.11.5: - version "1.11.5" - resolved "https://registry.yarnpkg.com/graphql-ruby-client/-/graphql-ruby-client-1.11.5.tgz#6f5a06e0205eeca3c9f9aa200b1fee8b4f5ff0bf" - integrity sha512-L7PwJwZPw0jc81AqYPQIyOi+1W622itRahFOgYQiWH3++BOuoG5bJTc+6yePyiesTTvBy+2ZDspCVzmZ5bx9Mg== - dependencies: - glob "^7.1.4" - minimist "^1.2.0" - -graphql-tag@^2.11.0, graphql-tag@^2.12.6: - version "2.12.6" - resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz#d441a569c1d2537ef10ca3d1633b48725329b5f1" - integrity sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg== - dependencies: - tslib "^2.1.0" - -graphql-ws@5.11.2, graphql-ws@^5.4.1: - version "5.11.2" - resolved "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.11.2.tgz#d5e0acae8b4d4a4cf7be410a24135cfcefd7ddc0" - integrity sha512-4EiZ3/UXYcjm+xFGP544/yW1+DVI8ZpKASFbzrV5EDTFWJp0ZvLl4Dy2fSZAzz9imKp5pZMIcjB0x/H69Pv/6w== - -graphql@^16.6.0: - version "16.6.0" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.6.0.tgz#c2dcffa4649db149f6282af726c8c83f1c7c5fdb" - integrity sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw== - -gray-matter@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/gray-matter/-/gray-matter-4.0.3.tgz#e893c064825de73ea1f5f7d88c7a9f7274288798" - integrity sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q== - dependencies: - js-yaml "^3.13.1" - kind-of "^6.0.2" - section-matter "^1.0.0" - strip-bom-string "^1.0.0" - -hard-rejection@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" - integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== - -has-bigints@^1.0.1, has-bigints@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" - integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-property-descriptors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" - integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== - dependencies: - get-intrinsic "^1.1.1" - -has-proto@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" - integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== - -has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== - -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== - dependencies: - has-symbols "^1.0.2" - -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q== - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw== - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ== - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ== - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -he@^1.1.1, he@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" - integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== - -header-case@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/header-case/-/header-case-2.0.4.tgz#5a42e63b55177349cf405beb8d775acabb92c063" - integrity sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q== - dependencies: - capital-case "^1.0.4" - tslib "^2.0.3" - -histoire@^0.14.2: - version "0.14.2" - resolved "https://registry.yarnpkg.com/histoire/-/histoire-0.14.2.tgz#379ab683d33aa73b5038337d178a36423538212f" - integrity sha512-nY9O5sIbtlUsGsLQqMGi601I09OKH7aZamYPcDlW7g1fmkf7IMb15xiREboMunQEIpDrpAH+9aWBxGIN+iQ5eA== - dependencies: - "@histoire/app" "^0.14.2" - "@histoire/controls" "^0.14.2" - "@histoire/shared" "^0.14.2" - "@histoire/vendors" "^0.14.2" - "@types/flexsearch" "^0.7.3" - "@types/markdown-it" "^12.2.3" - birpc "^0.1.1" - change-case "^4.1.2" - chokidar "^3.5.3" - connect "^3.7.0" - defu "^6.0.0" - diacritics "^1.3.0" - flexsearch "0.7.21" - fs-extra "^10.0.1" - globby "^13.1.1" - gray-matter "^4.0.3" - jiti "^1.16.0" - jsdom "^20.0.3" - markdown-it "^12.3.2" - markdown-it-anchor "^8.6.2" - markdown-it-attrs "^4.1.3" - markdown-it-emoji "^2.0.0" - micromatch "^4.0.5" - mrmime "^1.0.0" - pathe "^0.2.0" - picocolors "^1.0.0" - sade "^1.8.1" - shiki-es "^0.2.0" - sirv "^2.0.2" - tinypool "^0.1.2" - vite-node "0.28.4" - -hoist-non-react-statics@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" - integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== - dependencies: - react-is "^16.7.0" - -hosted-git-info@^2.1.4: - version "2.8.9" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" - integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== - -hosted-git-info@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" - integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== - dependencies: - lru-cache "^6.0.0" - -html-encoding-sniffer@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9" - integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA== - dependencies: - whatwg-encoding "^2.0.0" - -html-tags@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961" - integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg== - -htmlparser2@^3.8.3: - version "3.10.1" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" - integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== - dependencies: - domelementtype "^1.3.1" - domhandler "^2.3.0" - domutils "^1.5.1" - entities "^1.1.1" - inherits "^2.0.1" - readable-stream "^3.1.1" - -htmlparser2@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010" - integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA== - dependencies: - domelementtype "^2.3.0" - domhandler "^5.0.2" - domutils "^3.0.1" - entities "^4.3.0" - -http-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" - integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== - dependencies: - "@tootallnate/once" "2" - agent-base "6" - debug "4" - -https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" - integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== - dependencies: - agent-base "6" - debug "4" - -iconv-lite@0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" - integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== - dependencies: - safer-buffer ">= 2.1.2 < 3.0.0" - -iconv-lite@^0.4.24: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -idb@^7.0.1: - version "7.1.0" - resolved "https://registry.yarnpkg.com/idb/-/idb-7.1.0.tgz#2cc886be57738419e57f9aab58f647e5e2160270" - integrity sha512-Wsk07aAxDsntgYJY4h0knZJuTxM73eQ4reRAO+Z1liOh8eMCJ/MoDS8fCui1vGT9mnjtl1sOu3I2i/W1swPYZg== - -ieee754@^1.1.13: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -ignore@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" - integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== - -ignore@^5.2.1: - version "5.2.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" - integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== - -image-size@^0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" - integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ== - -immutable@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef" - integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ== - -immutable@~3.7.6: - version "3.7.6" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b" - integrity sha512-AizQPcaofEtO11RZhPPHBOJRdo/20MKQF9mBLnVkBoyHi1/zXK8fzVdnEpSV9gxqtnh6Qomfp3F0xT5qP/vThw== - -import-fresh@^3.0.0, import-fresh@^3.2.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" - integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -import-from@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/import-from/-/import-from-4.0.0.tgz#2710b8d66817d232e16f4166e319248d3d5492e2" - integrity sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ== - -import-lazy@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" - integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== - -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -ini@^1.3.4, ini@^1.3.5: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - -inquirer@^8.0.0: - version "8.2.5" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.5.tgz#d8654a7542c35a9b9e069d27e2df4858784d54f8" - integrity sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ== - dependencies: - ansi-escapes "^4.2.1" - chalk "^4.1.1" - cli-cursor "^3.1.0" - cli-width "^3.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash "^4.17.21" - mute-stream "0.0.8" - ora "^5.4.1" - run-async "^2.4.0" - rxjs "^7.5.5" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" - wrap-ansi "^7.0.0" - -internal-slot@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" - integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== - dependencies: - get-intrinsic "^1.1.0" - has "^1.0.3" - side-channel "^1.0.4" - -internal-slot@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3" - integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ== - dependencies: - get-intrinsic "^1.1.3" - has "^1.0.3" - side-channel "^1.0.4" - -invariant@^2.2.4: - version "2.2.4" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" - integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== - dependencies: - loose-envify "^1.0.0" - -is-absolute@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576" - integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA== - dependencies: - is-relative "^1.0.0" - is-windows "^1.0.1" - -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A== - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== - dependencies: - kind-of "^6.0.0" - -is-arguments@^1.0.4, is-arguments@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-array-buffer@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.1.tgz#deb1db4fcae48308d54ef2442706c0393997052a" - integrity sha512-ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.3" - is-typed-array "^1.1.10" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== - -is-bigint@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" - integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== - dependencies: - has-bigints "^1.0.1" - -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - -is-boolean-object@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" - integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== - -is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" - integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== - -is-core-module@^2.11.0, is-core-module@^2.5.0, is-core-module@^2.9.0: - version "2.11.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" - integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== - dependencies: - has "^1.0.3" - -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg== - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== - dependencies: - kind-of "^6.0.0" - -is-date-object@^1.0.1, is-date-object@^1.0.2: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== - dependencies: - has-tostringtag "^1.0.0" - -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw== - -is-extendable@^1.0.0, is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== - dependencies: - is-plain-object "^2.0.4" - -is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-fullwidth-code-point@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88" - integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ== - -is-glob@4.0.3, is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" - integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== - dependencies: - is-extglob "^2.1.1" - -is-interactive@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" - integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== - -is-lower-case@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-lower-case/-/is-lower-case-2.0.2.tgz#1c0884d3012c841556243483aa5d522f47396d2a" - integrity sha512-bVcMJy4X5Og6VZfdOZstSexlEy20Sr0k/p/b2IlQJlfdKAQuMpiv5w2Ccxb8sKdRUNAG1PnHVHjFSdRDVS6NlQ== - dependencies: - tslib "^2.0.3" - -is-map@^2.0.1, is-map@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" - integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== - -is-module@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" - integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g== - -is-negative-zero@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" - integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== - -is-number-object@^1.0.4: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" - integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== - dependencies: - has-tostringtag "^1.0.0" - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg== - dependencies: - kind-of "^3.0.2" - -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - -is-obj@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" - integrity sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg== - -is-path-inside@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - -is-plain-obj@^1.1, is-plain-obj@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== - -is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-plain-object@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344" - integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q== - -is-potential-custom-element-name@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" - integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== - -is-regex@^1.1.1, is-regex@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-regexp@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" - integrity sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA== - -is-relative@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d" - integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA== - dependencies: - is-unc-path "^1.0.0" - -is-set@^2.0.1, is-set@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" - integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== - -is-shared-array-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" - integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== - dependencies: - call-bind "^1.0.2" - -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - -is-string@^1.0.5, is-string@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" - integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== - dependencies: - has-tostringtag "^1.0.0" - -is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" - integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== - dependencies: - has-symbols "^1.0.2" - -is-typed-array@^1.1.10: - version "1.1.10" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f" - integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - for-each "^0.3.3" - gopd "^1.0.1" - has-tostringtag "^1.0.0" - -is-typed-array@^1.1.9: - version "1.1.9" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.9.tgz#246d77d2871e7d9f5aeb1d54b9f52c71329ece67" - integrity sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-abstract "^1.20.0" - for-each "^0.3.3" - has-tostringtag "^1.0.0" - -is-unc-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d" - integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ== - dependencies: - unc-path-regex "^0.1.2" - -is-unicode-supported@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" - integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== - -is-upper-case@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-upper-case/-/is-upper-case-2.0.2.tgz#f1105ced1fe4de906a5f39553e7d3803fd804649" - integrity sha512-44pxmxAvnnAOwBg4tHPnkfvgjPwbc5QIsSstNU+YcJ1ovxVzCWpSGosPJOZh/a1tdl81fbgnLc9LLv+x2ywbPQ== - dependencies: - tslib "^2.0.3" - -is-weakmap@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" - integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== - -is-weakref@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" - integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== - dependencies: - call-bind "^1.0.2" - -is-weakset@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz#4569d67a747a1ce5a994dfd4ef6dcea76e7c0a1d" - integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" - -is-windows@^1.0.1, is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - -isarray@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== - -isarray@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" - integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== - -isobject@^2.0.0, isobject@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA== - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== - -isomorphic-fetch@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz#0267b005049046d2421207215d45d6a262b8b8b4" - integrity sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA== - dependencies: - node-fetch "^2.6.1" - whatwg-fetch "^3.4.1" - -isomorphic-ws@5.0.0, isomorphic-ws@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz#e5529148912ecb9b451b46ed44d53dae1ce04bbf" - integrity sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw== - -jake@^10.8.5: - version "10.8.5" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" - integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== - dependencies: - async "^3.2.3" - chalk "^4.0.2" - filelist "^1.0.1" - minimatch "^3.0.4" - -jest-diff@^29.2.1: - version "29.2.1" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.2.1.tgz#027e42f5a18b693fb2e88f81b0ccab533c08faee" - integrity sha512-gfh/SMNlQmP3MOUgdzxPOd4XETDJifADpT937fN1iUGz+9DgOu2eUPHH25JDkLVcLwwqxv3GzVyK4VBUr9fjfA== - dependencies: - chalk "^4.0.0" - diff-sequences "^29.2.0" - jest-get-type "^29.2.0" - pretty-format "^29.2.1" - -jest-get-type@^29.2.0: - version "29.2.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408" - integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA== - -jest-matcher-utils@^29.2.1: - version "29.2.1" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.2.1.tgz#2bf876c5f891b33786aadf5d65d5da5970744122" - integrity sha512-hUTBh7H/Mnb6GTpihbLh8uF5rjAMdekfW/oZNXUMAXi7bbmym2HiRpzgqf/zzkjgejMrVAkPdVSQj+32enlUww== - dependencies: - chalk "^4.0.0" - jest-diff "^29.2.1" - jest-get-type "^29.2.0" - pretty-format "^29.2.1" - -jest-message-util@^29.2.1: - version "29.2.1" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.2.1.tgz#3a51357fbbe0cc34236f17a90d772746cf8d9193" - integrity sha512-Dx5nEjw9V8C1/Yj10S/8ivA8F439VS8vTq1L7hEgwHFn9ovSKNpYW/kwNh7UglaEgXO42XxzKJB+2x0nSglFVw== - dependencies: - "@babel/code-frame" "^7.12.13" - "@jest/types" "^29.2.1" - "@types/stack-utils" "^2.0.0" - chalk "^4.0.0" - graceful-fs "^4.2.9" - micromatch "^4.0.4" - pretty-format "^29.2.1" - slash "^3.0.0" - stack-utils "^2.0.3" - -jest-util@^29.2.1: - version "29.2.1" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.2.1.tgz#f26872ba0dc8cbefaba32c34f98935f6cf5fc747" - integrity sha512-P5VWDj25r7kj7kl4pN2rG/RN2c1TLfYYYZYULnS/35nFDjBai+hBeo3MDrYZS7p6IoY3YHZnt2vq4L6mKnLk0g== - dependencies: - "@jest/types" "^29.2.1" - "@types/node" "*" - chalk "^4.0.0" - ci-info "^3.2.0" - graceful-fs "^4.2.9" - picomatch "^2.2.3" - -jest-worker@^26.2.1: - version "26.6.2" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" - integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^7.0.0" - -jiti@^1.16.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.16.0.tgz#f72065954446ad1866fa8d6bcc3bed3cc1cebdaa" - integrity sha512-L3BJStEf5NAqNuzrpfbN71dp43mYIcBUlCRea/vdyv5dW/AYa1d4bpelko4SHdY3I6eN9Wzyasxirj1/vv5kmg== - -js-beautify@1.14.6: - version "1.14.6" - resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.6.tgz#b23ca5d74a462c282c7711bb51150bcc97f2b507" - integrity sha512-GfofQY5zDp+cuHc+gsEXKPpNw2KbPddreEo35O6jT6i0RVK6LhsoYBhq5TvK4/n74wnA0QbK8gGd+jUZwTMKJw== - dependencies: - config-chain "^1.1.13" - editorconfig "^0.15.3" - glob "^8.0.3" - nopt "^6.0.0" - -js-sdsl@^4.1.4: - version "4.1.5" - resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz#1ff1645e6b4d1b028cd3f862db88c9d887f26e2a" - integrity sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q== - -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-tokens@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-8.0.0.tgz#5dbe2cdfa9afc93251d3a77bf18c3ad6fa8a4de4" - integrity sha512-PC7MzqInq9OqKyTXfIvQNcjMkODJYC8A17kAaQgeW79yfhqTWSOfjHYQ2mDDcwJ96Iibtwkfh0C7R/OvqPlgVA== - -js-yaml@^3.13.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -js-yaml@^4.0.0, js-yaml@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - -jsdom@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db" - integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ== - dependencies: - abab "^2.0.6" - acorn "^8.8.1" - acorn-globals "^7.0.0" - cssom "^0.5.0" - cssstyle "^2.3.0" - data-urls "^3.0.2" - decimal.js "^10.4.2" - domexception "^4.0.0" - escodegen "^2.0.0" - form-data "^4.0.0" - html-encoding-sniffer "^3.0.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.1" - is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.2" - parse5 "^7.1.1" - saxes "^6.0.0" - symbol-tree "^3.2.4" - tough-cookie "^4.1.2" - w3c-xmlserializer "^4.0.0" - webidl-conversions "^7.0.0" - whatwg-encoding "^2.0.0" - whatwg-mimetype "^3.0.0" - whatwg-url "^11.0.0" - ws "^8.11.0" - xml-name-validator "^4.0.0" - -jsdom@^21.1.0: - version "21.1.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-21.1.0.tgz#d56ba4a84ed478260d83bd53dc181775f2d8e6ef" - integrity sha512-m0lzlP7qOtthD918nenK3hdItSd2I+V3W9IrBcB36sqDwG+KnUs66IF5GY7laGWUnlM9vTsD0W1QwSEBYWWcJg== - dependencies: - abab "^2.0.6" - acorn "^8.8.1" - acorn-globals "^7.0.0" - cssom "^0.5.0" - cssstyle "^2.3.0" - data-urls "^3.0.2" - decimal.js "^10.4.2" - domexception "^4.0.0" - escodegen "^2.0.0" - form-data "^4.0.0" - html-encoding-sniffer "^3.0.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.1" - is-potential-custom-element-name "^1.0.1" - nwsapi "^2.2.2" - parse5 "^7.1.1" - saxes "^6.0.0" - symbol-tree "^3.2.4" - tough-cookie "^4.1.2" - w3c-xmlserializer "^4.0.0" - webidl-conversions "^7.0.0" - whatwg-encoding "^2.0.0" - whatwg-mimetype "^3.0.0" - whatwg-url "^11.0.0" - ws "^8.11.0" - xml-name-validator "^4.0.0" - -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== - -json-parse-even-better-errors@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - -json-schema@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" - integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== - -json-stable-stringify-without-jsonify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== - -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - integrity sha512-i/J297TW6xyj7sDFa7AmBPkQvLIxWr2kKPWI26tXydnZrzVAocNqn5DMNT1Mzk0vit1V5UkRM7C1KdVNp7Lmcg== - dependencies: - jsonify "~0.0.0" - -json-to-pretty-yaml@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/json-to-pretty-yaml/-/json-to-pretty-yaml-1.2.2.tgz#f4cd0bd0a5e8fe1df25aaf5ba118b099fd992d5b" - integrity sha512-rvm6hunfCcqegwYaG5T4yKJWxc9FXFgBVrcTZ4XfSVRwa5HA/Xs+vB/Eo9treYYHCeNM0nrSUr82V/M31Urc7A== - dependencies: - remedial "^1.0.7" - remove-trailing-spaces "^1.0.6" - -json5@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" - integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== - dependencies: - minimist "^1.2.0" - -json5@^2.2.0, json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== - -jsonc-parser@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz#31ff3f4c2b9793f89c67212627c51c6394f88e76" - integrity sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w== - -jsonfile@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" - integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== - dependencies: - universalify "^2.0.0" - optionalDependencies: - graceful-fs "^4.1.6" - -jsonify@~0.0.0: - version "0.0.1" - resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978" - integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg== - -jsonpointer@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz#2110e0af0900fd37467b5907ecd13a7884a1b559" - integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ== - -jsonwebtoken@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d" - integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw== - dependencies: - jws "^3.2.2" - lodash "^4.17.21" - ms "^2.1.1" - semver "^7.3.8" - -jwa@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a" - integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA== - dependencies: - buffer-equal-constant-time "1.0.1" - ecdsa-sig-formatter "1.0.11" - safe-buffer "^5.0.1" - -jws@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304" - integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA== - dependencies: - jwa "^1.4.1" - safe-buffer "^5.0.1" - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ== - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw== - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0, kind-of@^5.0.2: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== - -kind-of@^6.0.0, kind-of@^6.0.2, kind-of@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - -known-css-properties@^0.26.0: - version "0.26.0" - resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.26.0.tgz#008295115abddc045a9f4ed7e2a84dc8b3a77649" - integrity sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg== - -launch-editor@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7" - integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ== - dependencies: - picocolors "^1.0.0" - shell-quote "^1.7.3" - -leven@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" - integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A== - -levn@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" - integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== - dependencies: - prelude-ls "^1.2.1" - type-check "~0.4.0" - -levn@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA== - dependencies: - prelude-ls "~1.1.2" - type-check "~0.3.2" - -lilconfig@^2.0.5, lilconfig@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz#32a384558bd58af3d4c6e077dd1ad1d397bc69d4" - integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg== - -lines-and-columns@^1.1.6: - version "1.2.4" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632" - integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg== - -linkify-it@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e" - integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ== - dependencies: - uc.micro "^1.0.1" - -linkify-it@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec" - integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw== - dependencies: - uc.micro "^1.0.1" - -linkify-string@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/linkify-string/-/linkify-string-4.1.0.tgz#c1bd6bd26a6a574e1ffa04cde333c2736b0d3d03" - integrity sha512-mw4KyPoE/vP0lamGbFFtDsutxOw0b+3g2/lH5bwS7X4tRHQyLBoJ60avPVGUoHfU8G1bLS329u13hhpxBIqFiA== - -linkifyjs@^3.0.5: - version "3.0.5" - resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-3.0.5.tgz#99e51a3a0c0e232fcb63ebb89eea3ff923378f34" - integrity sha512-1Y9XQH65eQKA9p2xtk+zxvnTeQBG7rdAXSkUG97DmuI/Xhji9uaUzaWxRj6rf9YC0v8KKHkxav7tnLX82Sz5Fg== - -linkifyjs@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.1.0.tgz#0460bfcc37d3348fa80e078d92e7bbc82588db15" - integrity sha512-Ffv8VoY3+ixI1b3aZ3O+jM6x17cOsgwfB1Wq7pkytbo1WlyRp6ZO0YDMqiWT/gQPY/CmtiGuKfzDIVqxh1aCTA== - -listr2@^4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-4.0.5.tgz#9dcc50221583e8b4c71c43f9c7dfd0ef546b75d5" - integrity sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA== - dependencies: - cli-truncate "^2.1.0" - colorette "^2.0.16" - log-update "^4.0.0" - p-map "^4.0.0" - rfdc "^1.3.0" - rxjs "^7.5.5" - through "^2.3.8" - wrap-ansi "^7.0.0" - -loader-utils@^1.1.0, loader-utils@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576" - integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw== - -local-pkg@^0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-0.4.2.tgz#13107310b77e74a0e513147a131a2ba288176c2f" - integrity sha512-mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg== - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== - dependencies: - p-locate "^5.0.0" - -lodash-es@^4.17.21: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee" - integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw== - -lodash.debounce@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== - -lodash.merge@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA== - -lodash.truncate@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" - integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw== - -lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@~4.17.0: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -log-symbols@^4.0.0, log-symbols@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" - integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== - dependencies: - chalk "^4.1.0" - is-unicode-supported "^0.1.0" - -log-update@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1" - integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg== - dependencies: - ansi-escapes "^4.3.0" - cli-cursor "^3.1.0" - slice-ansi "^4.0.0" - wrap-ansi "^6.2.0" - -loglevel@^1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.1.tgz#5c621f83d5b48c54ae93b6156353f555963377b4" - integrity sha512-tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg== - -loose-envify@^1.0.0, loose-envify@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" - integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== - dependencies: - js-tokens "^3.0.0 || ^4.0.0" - -loupe@^2.3.1: - version "2.3.4" - resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.4.tgz#7e0b9bffc76f148f9be769cb1321d3dcf3cb25f3" - integrity sha512-OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ== - dependencies: - get-func-name "^2.0.0" - -loupe@^2.3.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.6.tgz#76e4af498103c532d1ecc9be102036a21f787b53" - integrity sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA== - dependencies: - get-func-name "^2.0.0" - -lower-case-first@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/lower-case-first/-/lower-case-first-2.0.2.tgz#64c2324a2250bf7c37c5901e76a5b5309301160b" - integrity sha512-EVm/rR94FJTZi3zefZ82fLWab+GX14LJN4HrWBcuo6Evmsl9hEfnqxgcHCKb9q+mNf6EVdsjx/qucYFIIB84pg== - dependencies: - tslib "^2.0.3" - -lower-case@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" - integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== - dependencies: - tslib "^2.0.3" - -lru-cache@^4.1.5: - version "4.1.5" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -lz-string@^1.4.4: - version "1.4.4" - resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" - integrity sha512-0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ== - -magic-string@^0.25.0, magic-string@^0.25.7: - version "0.25.9" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c" - integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ== - dependencies: - sourcemap-codec "^1.4.8" - -magic-string@^0.27.0: - version "0.27.0" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz#e4a3413b4bab6d98d2becffd48b4a257effdbbf3" - integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA== - dependencies: - "@jridgewell/sourcemap-codec" "^1.4.13" - -make-error@^1.1.1, make-error@^1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" - integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== - -map-cache@^0.2.0, map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg== - -map-obj@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" - integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg== - -map-obj@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" - integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w== - dependencies: - object-visit "^1.0.0" - -markdown-it-anchor@^8.6.2: - version "8.6.5" - resolved "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.5.tgz#30c4bc5bbff327f15ce3c429010ec7ba75e7b5f8" - integrity sha512-PI1qEHHkTNWT+X6Ip9w+paonfIQ+QZP9sCeMYi47oqhH+EsW8CrJ8J7CzV19QVOj6il8ATGbK2nTECj22ZHGvQ== - -markdown-it-attrs@^4.1.3: - version "4.1.4" - resolved "https://registry.yarnpkg.com/markdown-it-attrs/-/markdown-it-attrs-4.1.4.tgz#25c86055affbc1cb9c4605a86aa26495efa16ec7" - integrity sha512-53Zfv8PTb6rlVFDlD106xcZHKBSsRZKJ2IW/rTxEJBEVbVaoxaNsmRkG0HXfbHl2SK8kaxZ2QKqdthWy/QBwmA== - -markdown-it-emoji@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/markdown-it-emoji/-/markdown-it-emoji-2.0.2.tgz#cd42421c2fda1537d9cc12b9923f5c8aeb9029c8" - integrity sha512-zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ== - -markdown-it@^12.3.2: - version "12.3.2" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90" - integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg== - dependencies: - argparse "^2.0.1" - entities "~2.1.0" - linkify-it "^3.0.1" - mdurl "^1.0.1" - uc.micro "^1.0.5" - -markdown-it@^13.0.1: - version "13.0.1" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz#c6ecc431cacf1a5da531423fc6a42807814af430" - integrity sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q== - dependencies: - argparse "^2.0.1" - entities "~3.0.1" - linkify-it "^4.0.1" - mdurl "^1.0.1" - uc.micro "^1.0.5" - -mathml-tag-names@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" - integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== - -mdn-data@2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" - integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== - -mdurl@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" - integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g== - -meow@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364" - integrity sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ== - dependencies: - "@types/minimist" "^1.2.0" - camelcase-keys "^6.2.2" - decamelize "^1.2.0" - 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" - -merge-options@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-1.0.1.tgz#2a64b24457becd4e4dc608283247e94ce589aa32" - integrity sha512-iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg== - dependencies: - is-plain-obj "^1.1" - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - -merge2@^1.3.0, merge2@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== - -meros@1.2.1, meros@^1.1.4: - version "1.2.1" - resolved "https://registry.yarnpkg.com/meros/-/meros-1.2.1.tgz#056f7a76e8571d0aaf3c7afcbe7eb6407ff7329e" - integrity sha512-R2f/jxYqCAGI19KhAvaxSOxALBMkaXWH2a7rOyqQw+ZmizX5bKkEYWLzdhC+U82ZVVPVp6MCXe3EkVligh+12g== - -micromatch@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.0.tgz#5102d4eaf20b6997d6008e3acfe1c44a3fa815e2" - integrity sha512-3StSelAE+hnRvMs8IdVW7Uhk8CVed5tp+kLLGlBP6WiRAXS21GPGu/Nat4WNPXj2Eoc24B02SaeoyozPMfj0/g== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.2.2" - define-property "^1.0.0" - extend-shallow "^2.0.1" - extglob "^2.0.2" - fragment-cache "^0.2.1" - kind-of "^5.0.2" - nanomatch "^1.2.1" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -micromatch@^4.0.4, micromatch@^4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== - dependencies: - braces "^3.0.2" - picomatch "^2.3.1" - -mime-db@1.52.0: - version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" - integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== - -mime-types@^2.1.12: - version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== - dependencies: - mime-db "1.52.0" - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -min-indent@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" - integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== - -minimatch@4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.1.tgz#40d9d511a46bdc4e563c22c3080cde9c0d8299b4" - integrity sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" - integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== - dependencies: - brace-expansion "^2.0.1" - -minimatch@^5.1.1: - version "5.1.6" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" - integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== - dependencies: - brace-expansion "^2.0.1" - -minimist-options@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" - integrity sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A== - dependencies: - arrify "^1.0.1" - is-plain-obj "^1.1.0" - kind-of "^6.0.3" - -minimist@^1.2.0, minimist@^1.2.6: - version "1.2.7" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" - integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== - -mitt@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/mitt/-/mitt-3.0.0.tgz#69ef9bd5c80ff6f57473e8d89326d01c414be0bd" - integrity sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ== - -mixin-deep@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" - integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - -mlly@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.0.0.tgz#d38ca6e33ab89b60654f71ef08931d51e83d3569" - integrity sha512-QL108Hwt+u9bXdWgOI0dhzZfACovn5Aen4Xvc8Jasd9ouRH4NjnrXEiyP3nVvJo91zPlYjVRckta0Nt2zfoR6g== - dependencies: - acorn "^8.8.1" - pathe "^1.0.0" - pkg-types "^1.0.0" - ufo "^1.0.0" - -mlly@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.1.0.tgz#9e23c5e675ef7b10cc47ee6281795cb1a7aa3aa2" - integrity sha512-cwzBrBfwGC1gYJyfcy8TcZU1f+dbH/T+TuOhtYP2wLv/Fb51/uV7HJQfBPtEupZ2ORLRU1EKFS/QfS3eo9+kBQ== - dependencies: - acorn "^8.8.1" - pathe "^1.0.0" - pkg-types "^1.0.1" - ufo "^1.0.1" - -mock-apollo-client@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-1.2.1.tgz#e3bfdc3ff73b1fea28fa7e91ec82e43ba8cbfa39" - integrity sha512-QYQ6Hxo+t7hard1bcHHbsHxlNQYTQsaMNsm2Psh/NbwLMi2R4tGzplJKt97MUWuARHMq3GHB4PTLj/gxej4Caw== - -mri@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b" - integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA== - -mrmime@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz#5f90c825fad4bdd41dc914eff5d1a8cfdaf24f27" - integrity sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw== - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -muggle-string@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.1.0.tgz#1fda8a281c8b27bb8b70466dbc9f27586a8baa6c" - integrity sha512-Tr1knR3d2mKvvWthlk7202rywKbiOm4rVFLsfAaSIhJ6dt9o47W4S+JMtWhd/PW9Wrdew2/S2fSvhz3E2gkfEg== - -mute-stream@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" - integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== - -nanoid@^3.3.4: - version "3.3.4" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" - integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== - -nanomatch@^1.2.1: - version "1.2.13" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -natural-compare-lite@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4" - integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g== - -natural-compare@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== - -no-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" - integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== - dependencies: - lower-case "^2.0.2" - tslib "^2.0.3" - -node-domexception@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5" - integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ== - -node-fetch@2.6.7, node-fetch@^2.6.1, node-fetch@^2.6.7: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== - dependencies: - whatwg-url "^5.0.0" - -node-int64@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" - integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== - -node-releases@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" - integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== - -nopt@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" - integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g== - dependencies: - abbrev "^1.0.0" - -normalize-package-data@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" - integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== - dependencies: - hosted-git-info "^2.1.4" - resolve "^1.10.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-package-data@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" - integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== - dependencies: - hosted-git-info "^4.0.1" - is-core-module "^2.5.0" - semver "^7.3.4" - validate-npm-package-license "^3.0.1" - -normalize-path@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w== - dependencies: - remove-trailing-separator "^1.0.1" - -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -normalize-range@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA== - -nth-check@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" - integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w== - dependencies: - boolbase "^1.0.0" - -nullthrows@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1" - integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw== - -nwsapi@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0" - integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw== - -object-assign@^4, object-assign@^4.1.0, object-assign@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== - -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ== - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - -object-hash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9" - integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw== - -object-inspect@^1.12.2, object-inspect@^1.9.0: - version "1.12.2" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" - integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== - -object-is@^1.1.4: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" - integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA== - dependencies: - isobject "^3.0.0" - -object.assign@^4.1.2, object.assign@^4.1.4: - version "4.1.4" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" - integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - has-symbols "^1.0.3" - object-keys "^1.1.1" - -object.entries@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861" - integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - -object.omit@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-3.0.0.tgz#0e3edc2fce2ba54df5577ff529f6d97bd8a522af" - integrity sha512-EO+BCv6LJfu+gBIF3ggLicFebFLN5zqzz/WWJlMFfkMyGth+oBkhxzDl0wx2W4GkLzuQs/FsSkXZb2IMWQqmBQ== - dependencies: - is-extendable "^1.0.0" - -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ== - dependencies: - isobject "^3.0.1" - -object.values@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d" - integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww== - dependencies: - ee-first "1.1.1" - -once@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== - dependencies: - wrappy "1" - -onetime@^5.1.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -optimism@^0.16.1: - version "0.16.1" - resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.16.1.tgz#7c8efc1f3179f18307b887e18c15c5b7133f6e7d" - integrity sha512-64i+Uw3otrndfq5kaoGNoY7pvOhSsjFEN4bdEFh80MWVk/dbgJfMv7VFDeCT8LxNAlEVhQmdVEbfE7X2nWNIIg== - dependencies: - "@wry/context" "^0.6.0" - "@wry/trie" "^0.3.0" - -optionator@^0.8.1: - version "0.8.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" - integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== - dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.6" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - word-wrap "~1.2.3" - -optionator@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" - integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== - dependencies: - deep-is "^0.1.3" - fast-levenshtein "^2.0.6" - levn "^0.4.1" - prelude-ls "^1.2.1" - type-check "^0.4.0" - word-wrap "^1.2.3" - -ora@^5.4.1: - version "5.4.1" - resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" - integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== - dependencies: - bl "^4.1.0" - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-spinners "^2.5.0" - is-interactive "^1.0.0" - is-unicode-supported "^0.1.0" - log-symbols "^4.1.0" - strip-ansi "^6.0.0" - wcwidth "^1.0.1" - -orderedmap@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/orderedmap/-/orderedmap-2.1.0.tgz#819457082fa3a06abd316d83a281a1ca467437cd" - integrity sha512-/pIFexOm6S70EPdznemIz3BQZoJ4VTFrhqzu0ACBqBgeLsLxq8e6Jim63ImIfwW/zAD1AlXpRMlOv3aghmo4dA== - -os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== - -p-limit@3.1.0, p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-limit@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644" - integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ== - dependencies: - yocto-queue "^1.0.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== - dependencies: - p-limit "^3.0.2" - -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -param-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" - integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== - dependencies: - dot-case "^3.0.4" - tslib "^2.0.3" - -parent-module@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" - integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== - dependencies: - callsites "^3.0.0" - -parse-filepath@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891" - integrity sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q== - dependencies: - is-absolute "^1.0.0" - map-cache "^0.2.0" - path-root "^0.1.1" - -parse-json@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" - integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== - 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" - -parse5@^7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz#4649f940ccfb95d8754f37f73078ea20afe0c746" - integrity sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg== - dependencies: - entities "^4.4.0" - -parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - -pascal-case@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" - integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw== - -path-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/path-case/-/path-case-3.0.4.tgz#9168645334eb942658375c56f80b4c0cb5f82c6f" - integrity sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg== - dependencies: - dot-case "^3.0.4" - tslib "^2.0.3" - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== - -path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== - -path-parse@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -path-root-regex@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d" - integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ== - -path-root@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7" - integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg== - dependencies: - path-root-regex "^0.1.0" - -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - -pathe@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/pathe/-/pathe-0.2.0.tgz#30fd7bbe0a0d91f0e60bae621f5d19e9e225c339" - integrity sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw== - -pathe@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.0.0.tgz#135fc11464fc57c84ef93d5c5ed21247e24571df" - integrity sha512-nPdMG0Pd09HuSsr7QOKUXO2Jr9eqaDiZvDwdyIhNG5SHYujkQHYKDfGQkulBxvbDHz8oHLsTgKN86LSwYzSHAg== - -pathe@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/pathe/-/pathe-1.1.0.tgz#e2e13f6c62b31a3289af4ba19886c230f295ec03" - integrity sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w== - -pathval@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d" - integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ== - -picocolors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" - integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== - -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== - -pify@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== - -pinia@^2.0.30: - version "2.0.30" - resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.0.30.tgz#b18a581dad6821ed5fbebfaf631229480ea9d2d9" - integrity sha512-q6DUmxWwe/mQgg+55QQjykpKC+aGeGdaJV3niminl19V08dE+LRTvSEuqi6/NLSGCKHI49KGL6tMNEOssFiMyA== - dependencies: - "@vue/devtools-api" "^6.4.5" - vue-demi "*" - -pkg-types@^1.0.0, pkg-types@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.0.1.tgz#25234407f9dc63409af45ced9407625ff446a761" - integrity sha512-jHv9HB+Ho7dj6ItwppRDDl0iZRYBD0jsakHXtFgoLr+cHSF6xC+QL54sJmWxyGxOLYSHm0afhXhXcQDQqH9z8g== - dependencies: - jsonc-parser "^3.2.0" - mlly "^1.0.0" - pathe "^1.0.0" - -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg== - -postcss-html@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-1.5.0.tgz#57a43bc9e336f516ecc448a37d2e8c2290170a6f" - integrity sha512-kCMRWJRHKicpA166kc2lAVUGxDZL324bkj/pVOb6RhjB0Z5Krl7mN0AsVkBhVIRZZirY0lyQXG38HCVaoKVNoA== - dependencies: - htmlparser2 "^8.0.0" - js-tokens "^8.0.0" - postcss "^8.4.0" - postcss-safe-parser "^6.0.0" - -postcss-import@^14.1.0: - version "14.1.0" - resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.1.0.tgz#a7333ffe32f0b8795303ee9e40215dac922781f0" - integrity sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw== - dependencies: - postcss-value-parser "^4.0.0" - read-cache "^1.0.0" - resolve "^1.1.7" - -postcss-js@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.0.tgz#31db79889531b80dc7bc9b0ad283e418dce0ac00" - integrity sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ== - dependencies: - camelcase-css "^2.0.1" - -postcss-load-config@^3.1.4: - version "3.1.4" - resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855" - integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg== - dependencies: - lilconfig "^2.0.5" - yaml "^1.10.2" - -postcss-media-query-parser@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" - integrity sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig== - -postcss-nested@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.0.tgz#1572f1984736578f360cffc7eb7dca69e30d1735" - integrity sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w== - dependencies: - postcss-selector-parser "^6.0.10" - -postcss-prefix-selector@^1.6.0: - version "1.16.0" - resolved "https://registry.yarnpkg.com/postcss-prefix-selector/-/postcss-prefix-selector-1.16.0.tgz#ad5b56f9a73a2c090ca7161049632c9d89bcb404" - integrity sha512-rdVMIi7Q4B0XbXqNUEI+Z4E+pueiu/CS5E6vRCQommzdQ/sgsS4dK42U7GX8oJR+TJOtT+Qv3GkNo6iijUMp3Q== - -postcss-resolve-nested-selector@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e" - integrity sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw== - -postcss-safe-parser@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1" - integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ== - -postcss-scss@^4.0.2: - version "4.0.5" - resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.5.tgz#8ee33c1dda8d9d4753b565ec79014803dc6edabf" - integrity sha512-F7xpB6TrXyqUh3GKdyB4Gkp3QL3DDW1+uI+gxx/oJnUt/qXI4trj5OGlp9rOKdoABGULuqtqeG+3HEVQk4DjmA== - -postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.6, postcss-selector-parser@^6.0.9: - version "6.0.10" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d" - integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - -postcss-selector-parser@^6.0.11: - version "6.0.11" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz#2e41dc39b7ad74046e1615185185cd0b17d0c8dc" - integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - -postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" - integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== - -postcss@^5.2.17, postcss@^8.0.9, postcss@^8.1.10, postcss@^8.4.0, postcss@^8.4.19, postcss@^8.4.20, postcss@^8.4.21: - version "8.4.21" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4" - integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg== - dependencies: - nanoid "^3.3.4" - picocolors "^1.0.0" - source-map-js "^1.0.2" - -posthtml-parser@^0.2.0, posthtml-parser@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/posthtml-parser/-/posthtml-parser-0.2.1.tgz#35d530de386740c2ba24ff2eb2faf39ccdf271dd" - integrity sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw== - dependencies: - htmlparser2 "^3.8.3" - isobject "^2.1.0" - -posthtml-rename-id@^1.0: - version "1.0.12" - resolved "https://registry.yarnpkg.com/posthtml-rename-id/-/posthtml-rename-id-1.0.12.tgz#cf7f6eb37146bf1afac31e68f18c6cc19ae61433" - integrity sha512-UKXf9OF/no8WZo9edRzvuMenb6AD5hDLzIepJW+a4oJT+T/Lx7vfMYWT4aWlGNQh0WMhnUx1ipN9OkZ9q+ddEw== - dependencies: - escape-string-regexp "1.0.5" - -posthtml-render@^1.0.5, posthtml-render@^1.0.6: - version "1.4.0" - resolved "https://registry.yarnpkg.com/posthtml-render/-/posthtml-render-1.4.0.tgz#40114070c45881cacb93347dae3eff53afbcff13" - integrity sha512-W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw== - -posthtml-svg-mode@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/posthtml-svg-mode/-/posthtml-svg-mode-1.0.3.tgz#abd554face81223cab0cb367e18e4efd2a4e74b0" - integrity sha512-hEqw9NHZ9YgJ2/0G7CECOeuLQKZi8HjWLkBaSVtOWjygQ9ZD8P7tqeowYs7WrFdKsWEKG7o+IlsPY8jrr0CJpQ== - dependencies: - merge-options "1.0.1" - posthtml "^0.9.2" - posthtml-parser "^0.2.1" - posthtml-render "^1.0.6" - -posthtml@^0.9.2: - version "0.9.2" - resolved "https://registry.yarnpkg.com/posthtml/-/posthtml-0.9.2.tgz#f4c06db9f67b61fd17c4e256e7e3d9515bf726fd" - integrity sha512-spBB5sgC4cv2YcW03f/IAUN1pgDJWNWD8FzkyY4mArLUMJW+KlQhlmUdKAHQuPfb00Jl5xIfImeOsf6YL8QK7Q== - dependencies: - posthtml-parser "^0.2.0" - posthtml-render "^1.0.5" - -prelude-ls@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" - integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== - -prelude-ls@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w== - -prettier-linter-helpers@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" - integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== - dependencies: - fast-diff "^1.1.2" - -prettier-plugin-tailwindcss@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.2.2.tgz#61f4437936c79c8cc2915f31b4bd512605177239" - integrity sha512-5RjUbWRe305pUpc48MosoIp6uxZvZxrM6GyOgsbGLTce+ehePKNm7ziW2dLG2air9aXbGuXlHVSQQw4Lbosq3w== - -prettier@2.8.4: - version "2.8.4" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.4.tgz#34dd2595629bfbb79d344ac4a91ff948694463c3" - integrity sha512-vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw== - -prettier@^2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" - integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== - -pretty-bytes@^5.3.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" - integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg== - -pretty-bytes@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-6.0.0.tgz#928be2ad1f51a2e336add8ba764739f9776a8140" - integrity sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg== - -pretty-format@^27.0.2, pretty-format@^27.5.1: - version "27.5.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e" - integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ== - dependencies: - ansi-regex "^5.0.1" - ansi-styles "^5.0.0" - react-is "^17.0.1" - -pretty-format@^29.0.0, pretty-format@^29.2.1: - version "29.2.1" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.2.1.tgz#86e7748fe8bbc96a6a4e04fa99172630907a9611" - integrity sha512-Y41Sa4aLCtKAXvwuIpTvcFBkyeYp2gdFWzXGA+ZNES3VwURIB165XO/z7CjETwzCCS53MjW/rLMyyqEnTtaOfA== - dependencies: - "@jest/schemas" "^29.0.0" - ansi-styles "^5.0.0" - react-is "^18.0.0" - -promise@^7.1.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" - integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== - dependencies: - asap "~2.0.3" - -prop-types@^15.7.2: - version "15.8.1" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" - integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== - dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.13.1" - -prosemirror-changeset@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.2.0.tgz#22c05da271a118be40d3e339fa2cace789b1254b" - integrity sha512-QM7ohGtkpVpwVGmFb8wqVhaz9+6IUXcIQBGZ81YNAKYuHiFJ1ShvSzab4pKqTinJhwciZbrtBEk/2WsqSt2PYg== - dependencies: - prosemirror-transform "^1.0.0" - -prosemirror-collab@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/prosemirror-collab/-/prosemirror-collab-1.3.0.tgz#601d33473bf72e6c43041a54b860c84c60b37769" - integrity sha512-+S/IJ69G2cUu2IM5b3PBekuxs94HO1CxJIWOFrLQXUaUDKL/JfBx+QcH31ldBlBXyDEUl+k3Vltfi1E1MKp2mA== - dependencies: - prosemirror-state "^1.0.0" - -prosemirror-commands@^1.0.0, prosemirror-commands@^1.3.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.5.0.tgz#d10efece1647c1d984fef6f65d52fdc77785560b" - integrity sha512-zL0Fxbj3fh71GPNHn5YdYgYGX2aU2XLecZYk2ekEF0oOD259HcXtM+96VjPVi5o3h4sGUdDfEEhGiREXW6U+4A== - dependencies: - prosemirror-model "^1.0.0" - prosemirror-state "^1.0.0" - prosemirror-transform "^1.0.0" - -prosemirror-dropcursor@^1.5.0: - version "1.6.1" - resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.6.1.tgz#31f696172105f232bd17543ccf305e0f33e59d1d" - integrity sha512-LtyqQpkIknaT7NnZl3vDr3TpkNcG4ABvGRXx37XJ8tJNUGtcrZBh40A0344rDwlRTfUEmynQS/grUsoSWz+HgA== - dependencies: - prosemirror-state "^1.0.0" - prosemirror-transform "^1.1.0" - prosemirror-view "^1.1.0" - -prosemirror-gapcursor@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.3.1.tgz#8cfd874592e4504d63720e14ed680c7866e64554" - integrity sha512-GKTeE7ZoMsx5uVfc51/ouwMFPq0o8YrZ7Hx4jTF4EeGbXxBveUV8CGv46mSHuBBeXGmvu50guoV2kSnOeZZnUA== - dependencies: - prosemirror-keymap "^1.0.0" - prosemirror-model "^1.0.0" - prosemirror-state "^1.0.0" - prosemirror-view "^1.0.0" - -prosemirror-history@^1.0.0, prosemirror-history@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.3.0.tgz#bf5a1ff7759aca759ddf0c722c2fa5b14fb0ddc1" - integrity sha512-qo/9Wn4B/Bq89/YD+eNWFbAytu6dmIM85EhID+fz9Jcl9+DfGEo8TTSrRhP15+fFEoaPqpHSxlvSzSEbmlxlUA== - dependencies: - prosemirror-state "^1.2.2" - prosemirror-transform "^1.0.0" - rope-sequence "^1.3.0" - -prosemirror-inputrules@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.2.0.tgz#476dde2dc244050b3aca00cf58a82adfad6749e7" - integrity sha512-eAW/M/NTSSzpCOxfR8Abw6OagdG0MiDAiWHQMQveIsZtoKVYzm0AflSPq/ymqJd56/Su1YPbwy9lM13wgHOFmQ== - dependencies: - prosemirror-state "^1.0.0" - prosemirror-transform "^1.0.0" - -prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.2.0.tgz#d5cc9da9b712020690a994b50b92a0e448a60bf5" - integrity sha512-TdSfu+YyLDd54ufN/ZeD1VtBRYpgZnTPnnbY+4R08DDgs84KrIPEPbJL8t1Lm2dkljFx6xeBE26YWH3aIzkPKg== - dependencies: - prosemirror-state "^1.0.0" - w3c-keyname "^2.2.0" - -prosemirror-markdown@^1.10.1: - version "1.10.1" - resolved "https://registry.yarnpkg.com/prosemirror-markdown/-/prosemirror-markdown-1.10.1.tgz#e20468201cda1916a6182686159398b242bb78ab" - integrity sha512-s7iaTLiX+qO5z8kF2NcMmy2T7mIlxzkS4Sp3vTKSYChPtbMpg6YxFkU0Y06rUg2WtKlvBu7v1bXzlGBkfjUWAA== - dependencies: - markdown-it "^13.0.1" - prosemirror-model "^1.0.0" - -prosemirror-menu@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/prosemirror-menu/-/prosemirror-menu-1.2.1.tgz#94d99a8547b7ba5680c20e9c497ce19846ce3b2c" - integrity sha512-sBirXxVfHalZO4f1ZS63WzewINK4182+7dOmoMeBkqYO8wqMBvBS7wQuwVOHnkMWPEh0+N0LJ856KYUN+vFkmQ== - dependencies: - crelt "^1.0.0" - prosemirror-commands "^1.0.0" - prosemirror-history "^1.0.0" - prosemirror-state "^1.0.0" - -prosemirror-model@^1.0.0, prosemirror-model@^1.16.0, prosemirror-model@^1.18.1, prosemirror-model@^1.19.0, prosemirror-model@^1.8.1: - version "1.19.0" - resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.19.0.tgz#d7ad9a65ada0bb12196f64fe0dd4fc392c841c29" - integrity sha512-/CvFGJnwc41EJSfDkQLly1cAJJJmBpZwwUJtwZPTjY2RqZJfM8HVbCreOY/jti8wTRbVyjagcylyGoeJH/g/3w== - dependencies: - orderedmap "^2.0.0" - -prosemirror-schema-basic@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.1.tgz#a5a137a6399d1a829873332117d2fe8131d291d0" - integrity sha512-vYBdIHsYKSDIqYmPBC7lnwk9DsKn8PnVqK97pMYP5MLEDFqWIX75JiaJTzndBii4bRuNqhC2UfDOfM3FKhlBHg== - dependencies: - prosemirror-model "^1.19.0" - -prosemirror-schema-list@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.2.2.tgz#bafda37b72367d39accdcaf6ddf8fb654a16e8e5" - integrity sha512-rd0pqSDp86p0MUMKG903g3I9VmElFkQpkZ2iOd3EOVg1vo5Cst51rAsoE+5IPy0LPXq64eGcCYlW1+JPNxOj2w== - dependencies: - prosemirror-model "^1.0.0" - prosemirror-state "^1.0.0" - prosemirror-transform "^1.0.0" - -prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, prosemirror-state@^1.4.1: - version "1.4.2" - resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.4.2.tgz#f93bd8a33a4454efab917ba9b738259d828db7e5" - integrity sha512-puuzLD2mz/oTdfgd8msFbe0A42j5eNudKAAPDB0+QJRw8cO1ygjLmhLrg9RvDpf87Dkd6D4t93qdef00KKNacQ== - dependencies: - prosemirror-model "^1.0.0" - prosemirror-transform "^1.0.0" - prosemirror-view "^1.27.0" - -prosemirror-tables@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.3.2.tgz#ca208c6a55d510af14b652d23e800e00ba6bebd4" - integrity sha512-/9JTeN6s58Zq66HXaxP6uf8PAmc7XXKZFPlOGVtLvxEd6xBP6WtzaJB9wBjiGUzwbdhdMEy7V62yuHqk/3VrnQ== - dependencies: - prosemirror-keymap "^1.1.2" - prosemirror-model "^1.8.1" - prosemirror-state "^1.3.1" - prosemirror-transform "^1.2.1" - prosemirror-view "^1.13.3" - -prosemirror-trailing-node@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/prosemirror-trailing-node/-/prosemirror-trailing-node-2.0.3.tgz#213fc0e545a434ff3c37b5218a0de69561bf3892" - integrity sha512-lGrjMrn97KWkjQSW/FjdvnhJmqFACmQIyr6lKYApvHitDnKsCoZz6XzrHB7RZYHni/0NxQmZ01p/2vyK2SkvaA== - dependencies: - "@babel/runtime" "^7.13.10" - "@remirror/core-constants" "^2.0.0" - "@remirror/core-helpers" "^2.0.1" - escape-string-regexp "^4.0.0" - -prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1, prosemirror-transform@^1.7.0: - version "1.7.1" - resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.7.1.tgz#b516e818c3add0bdf960f4ca8ccb9d057a3ba21b" - integrity sha512-VteoifAfpt46z0yEt6Fc73A5OID9t/y2QIeR5MgxEwTuitadEunD/V0c9jQW8ziT8pbFM54uTzRLJ/nLuQjMxg== - dependencies: - prosemirror-model "^1.0.0" - -prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.27.0, prosemirror-view@^1.28.2: - version "1.30.1" - resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.30.1.tgz#7cf0ae8dc8553a02c32961e82eca25079c4d8fc9" - integrity sha512-pZUfr7lICJkEY7XwzldAKrkflZDeIvnbfuu2RIS01N5NwJmR/dfZzDzJRzhb3SM2QtT/bM8b4Nnib8X3MGpAhA== - dependencies: - prosemirror-model "^1.16.0" - prosemirror-state "^1.0.0" - prosemirror-transform "^1.1.0" - -proto-list@~1.2.1: - version "1.2.4" - resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" - integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== - -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ== - -psl@^1.1.33: - version "1.9.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" - integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== - -punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== - -pvtsutils@^1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.3.2.tgz#9f8570d132cdd3c27ab7d51a2799239bf8d8d5de" - integrity sha512-+Ipe2iNUyrZz+8K/2IOo+kKikdtfhRKzNpQbruF2URmqPtoqAs8g3xS7TJvFF2GcPXjh7DkqMnpVveRFq4PgEQ== - dependencies: - tslib "^2.4.0" - -pvutils@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.3.tgz#f35fc1d27e7cd3dfbd39c0826d173e806a03f5a3" - integrity sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ== - -query-string@^4.3.2: - version "4.3.4" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" - integrity sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q== - dependencies: - object-assign "^4.1.0" - strict-uri-encode "^1.0.0" - -querystringify@^2.1.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" - integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== - -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== - -quick-lru@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f" - integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g== - -quick-lru@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" - integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== - -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" - -react-is@^16.13.1, react-is@^16.7.0: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" - integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== - -react-is@^17.0.1: - version "17.0.2" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" - integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== - -react-is@^18.0.0: - version "18.2.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" - integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== - -read-cache@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" - integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA== - dependencies: - pify "^2.3.0" - -read-pkg-up@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" - integrity sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg== - dependencies: - find-up "^4.1.0" - read-pkg "^5.2.0" - type-fest "^0.8.1" - -read-pkg@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" - integrity sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg== - dependencies: - "@types/normalize-package-data" "^2.4.0" - normalize-package-data "^2.5.0" - parse-json "^5.0.0" - type-fest "^0.6.0" - -readable-stream@^3.1.1, readable-stream@^3.4.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== - dependencies: - picomatch "^2.2.1" - -redent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f" - integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg== - dependencies: - indent-string "^4.0.0" - strip-indent "^3.0.0" - -regenerate-unicode-properties@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c" - integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ== - dependencies: - regenerate "^1.4.2" - -regenerate@^1.4.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" - integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== - -regenerator-runtime@^0.13.10, regenerator-runtime@^0.13.4: - version "0.13.10" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz#ed07b19616bcbec5da6274ebc75ae95634bfc2ee" - integrity sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw== - -regenerator-runtime@^0.13.11: - version "0.13.11" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" - integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== - -regenerator-transform@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537" - integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg== - dependencies: - "@babel/runtime" "^7.8.4" - -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - -regexp-tree@~0.1.1: - version "0.1.24" - resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.24.tgz#3d6fa238450a4d66e5bc9c4c14bb720e2196829d" - integrity sha512-s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw== - -regexp.prototype.flags@^1.3.0, regexp.prototype.flags@^1.4.1, regexp.prototype.flags@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" - integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - functions-have-names "^1.2.2" - -regexpp@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" - integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== - -regexpu-core@^5.1.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.1.tgz#a69c26f324c1e962e9ffd0b88b055caba8089139" - integrity sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ== - dependencies: - regenerate "^1.4.2" - regenerate-unicode-properties "^10.1.0" - regjsgen "^0.7.1" - regjsparser "^0.9.1" - unicode-match-property-ecmascript "^2.0.0" - unicode-match-property-value-ecmascript "^2.0.0" - -regjsgen@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.7.1.tgz#ee5ef30e18d3f09b7c369b76e7c2373ed25546f6" - integrity sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA== - -regjsparser@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709" - integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ== - dependencies: - jsesc "~0.5.0" - -relay-runtime@12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-12.0.0.tgz#1e039282bdb5e0c1b9a7dc7f6b9a09d4f4ff8237" - integrity sha512-QU6JKr1tMsry22DXNy9Whsq5rmvwr3LSZiiWV/9+DFpuTWvp+WFhobWMc8TC4OjKFfNhEZy7mOiqUAn5atQtug== - dependencies: - "@babel/runtime" "^7.0.0" - fbjs "^3.0.0" - invariant "^2.2.4" - -remedial@^1.0.7: - version "1.0.8" - resolved "https://registry.yarnpkg.com/remedial/-/remedial-1.0.8.tgz#a5e4fd52a0e4956adbaf62da63a5a46a78c578a0" - integrity sha512-/62tYiOe6DzS5BqVsNpH/nkGlX45C/Sp6V+NtiN6JQNS1Viay7cWkazmRkrQrdFj2eshDe96SIQNIoMxqhzBOg== - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw== - -remove-trailing-spaces@^1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/remove-trailing-spaces/-/remove-trailing-spaces-1.0.8.tgz#4354d22f3236374702f58ee373168f6d6887ada7" - integrity sha512-O3vsMYfWighyFbTd8hk8VaSj9UAGENxAtX+//ugIst2RMk5e03h6RoIS+0ylsFxY1gvmPuAY/PO4It+gPEeySA== - -repeat-element@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" - integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== - -repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== - -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -require-main-filename@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" - integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== - -requireindex@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef" - integrity sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww== - -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== - -resolve-from@5.0.0, resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" - integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== - -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg== - -resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.19.0, resolve@^1.22.1: - version "1.22.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" - integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== - dependencies: - is-core-module "^2.9.0" - path-parse "^1.0.7" - supports-preserve-symlinks-flag "^1.0.0" - -response-iterator@^0.2.6: - version "0.2.6" - resolved "https://registry.yarnpkg.com/response-iterator/-/response-iterator-0.2.6.tgz#249005fb14d2e4eeb478a3f735a28fd8b4c9f3da" - integrity sha512-pVzEEzrsg23Sh053rmDUvLSkGXluZio0qu8VT6ukrYuvtjVfCbDZH9d6PGXb8HZfzdNZt8feXv/jvUzlhRgLnw== - -restore-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" - integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== - -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== - -rfdc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" - integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== - -rimraf@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -rollup-plugin-terser@^7.0.0: - version "7.0.2" - resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d" - integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ== - dependencies: - "@babel/code-frame" "^7.10.4" - jest-worker "^26.2.1" - serialize-javascript "^4.0.0" - terser "^5.0.0" - -rollup@^2.43.1: - version "2.79.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" - integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== - optionalDependencies: - fsevents "~2.3.2" - -rollup@^3.7.0: - version "3.7.3" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.7.3.tgz#d440adff5f89099fd1f552e4e4333045e3bc71d4" - integrity sha512-7e68MQbAWCX6mI4/0lG1WHd+NdNAlVamg0Zkd+8LZ/oXojligdGnCNyHlzXqXCZObyjs5FRc3AH0b17iJESGIQ== - optionalDependencies: - fsevents "~2.3.2" - -rollup@^3.7.2: - version "3.7.5" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.7.5.tgz#db580f8eda50237b0721ddea301fb981cd992933" - integrity sha512-z0ZbqHBtS/et2EEUKMrAl2CoSdwN7ZPzL17UMiKN9RjjqHShTlv7F9J6ZJZJNREYjBh3TvBrdfjkFDIXFNeuiQ== - optionalDependencies: - fsevents "~2.3.2" - -rope-sequence@^1.3.0: - version "1.3.3" - resolved "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.3.tgz#3f67fc106288b84b71532b4a5fd9d4881e4457f0" - integrity sha512-85aZYCxweiD5J8yTEbw+E6A27zSnLPNDL0WfPdw3YYodq7WjnTKo0q4dtyQ2gz23iPT8Q9CUyJtAaUNcTxRf5Q== - -run-async@^2.4.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" - integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== - -run-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" - -rxjs@^7.5.5: - version "7.5.7" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.7.tgz#2ec0d57fdc89ece220d2e702730ae8f1e49def39" - integrity sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA== - dependencies: - tslib "^2.1.0" - -sade@^1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701" - integrity sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A== - dependencies: - mri "^1.1.0" - -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-regex-test@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295" - integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.3" - is-regex "^1.1.4" - -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg== - dependencies: - ret "~0.1.10" - -safe-regex@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-2.1.1.tgz#f7128f00d056e2fe5c11e81a1324dd974aadced2" - integrity sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A== - dependencies: - regexp-tree "~0.1.1" - -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -sass@^1.58.0: - version "1.58.0" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.58.0.tgz#ee8aea3ad5ea5c485c26b3096e2df6087d0bb1cc" - integrity sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg== - dependencies: - chokidar ">=3.0.0 <4.0.0" - immutable "^4.0.0" - source-map-js ">=0.6.2 <2.0.0" - -saxes@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5" - integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA== - dependencies: - xmlchars "^2.2.0" - -scuid@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/scuid/-/scuid-1.1.0.tgz#d3f9f920956e737a60f72d0e4ad280bf324d5dab" - integrity sha512-MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg== - -section-matter@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167" - integrity sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA== - dependencies: - extend-shallow "^2.0.1" - kind-of "^6.0.0" - -"semver@2 || 3 || 4 || 5", semver@^5.6.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semver@^7.3.8: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== - dependencies: - lru-cache "^6.0.0" - -sentence-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/sentence-case/-/sentence-case-3.0.4.tgz#3645a7b8c117c787fde8702056225bb62a45131f" - integrity sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - upper-case-first "^2.0.2" - -serialize-javascript@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" - integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw== - dependencies: - randombytes "^2.1.0" - -set-blocking@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== - -set-value@^2.0.0, set-value@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" - integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - -setimmediate@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA== - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -shell-quote@^1.7.3: - version "1.7.4" - resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.4.tgz#33fe15dee71ab2a81fcbd3a52106c5cfb9fb75d8" - integrity sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw== - -shiki-es@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/shiki-es/-/shiki-es-0.2.0.tgz#ae5bced62dca0ba46ee81149e68d428565a3e6fb" - integrity sha512-RbRMD+IuJJseSZljDdne9ThrUYrwBwJR04FvN4VXpfsU3MNID5VJGHLAD5je/HGThCyEKNgH+nEkSFEWKD7C3Q== - -side-channel@^1.0.3, side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== - dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" - -siginfo@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/siginfo/-/siginfo-2.0.0.tgz#32e76c70b79724e3bb567cb9d543eb858ccfaf30" - integrity sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g== - -sigmund@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" - integrity sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g== - -signal-exit@^3.0.2, signal-exit@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== - -signedsource@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/signedsource/-/signedsource-1.0.0.tgz#1ddace4981798f93bd833973803d80d52e93ad6a" - integrity sha512-6+eerH9fEnNmi/hyM1DXcRK3pWdoMQtlkQ+ns0ntzunjKqp5i3sKCc80ym8Fib3iaYhdJUOPdhlJWj1tvge2Ww== - -sirv@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.2.tgz#128b9a628d77568139cff85703ad5497c46a4760" - integrity sha512-4Qog6aE29nIjAOKe/wowFTxOdmbEZKb+3tsLljaBRzJwtqto0BChD2zzH0LhgCSXiI+V7X+Y45v14wBZQ1TK3w== - dependencies: - "@polka/url" "^1.0.0-next.20" - mrmime "^1.0.0" - totalist "^3.0.0" - -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - -slash@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" - integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== - -slice-ansi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" - integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -slice-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" - integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -slice-ansi@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a" - integrity sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ== - dependencies: - ansi-styles "^6.0.0" - is-fullwidth-code-point "^4.0.0" - -snake-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c" - integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg== - dependencies: - dot-case "^3.0.4" - tslib "^2.0.3" - -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - -sortablejs@1.14.0: - version "1.14.0" - resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.14.0.tgz#6d2e17ccbdb25f464734df621d4f35d4ab35b3d8" - integrity sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w== - -"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" - integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== - -source-map-resolve@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" - integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - -source-map-support@^0.5.21, source-map-support@~0.5.20: - version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map-url@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" - integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== - -source-map@^0.5.6: - version "0.5.7" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== - -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -source-map@^0.8.0-beta.0: - version "0.8.0-beta.0" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz#d4c1bb42c3f7ee925f005927ba10709e0d1d1f11" - integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA== - dependencies: - whatwg-url "^7.0.0" - -sourcemap-codec@^1.4.8: - version "1.4.8" - resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" - integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== - -spdx-correct@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" - integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" - integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== - -spdx-expression-parse@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.12" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779" - integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA== - -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== - dependencies: - extend-shallow "^3.0.0" - -sponge-case@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sponge-case/-/sponge-case-1.0.1.tgz#260833b86453883d974f84854cdb63aecc5aef4c" - integrity sha512-dblb9Et4DAtiZ5YSUZHLl4XhH4uK80GhAZrVXdN4O2P4gQ40Wa5UIOPUHlA/nFd2PLblBZWUioLMMAVrgpoYcA== - dependencies: - tslib "^2.0.3" - -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== - -stable@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" - integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== - -stack-utils@^2.0.3: - version "2.0.5" - resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5" - integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA== - dependencies: - escape-string-regexp "^2.0.0" - -stackback@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/stackback/-/stackback-0.0.2.tgz#1ac8a0d9483848d1695e418b6d031a3c3ce68e3b" - integrity sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw== - -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g== - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - -statuses@~1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== - -std-env@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.3.1.tgz#93a81835815e618c8aa75e7c8a4dc04f7c314e29" - integrity sha512-3H20QlwQsSm2OvAxWIYhs+j01MzzqwMwGiiO1NQaJYZgJZFPuAbf95/DiKRBSTYIJ2FeGUc+B/6mPGcWP9dO3Q== - -streamsearch@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764" - integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg== - -strict-uri-encode@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" - integrity sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ== - -string-env-interpolation@1.0.1, string-env-interpolation@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz#ad4397ae4ac53fe6c91d1402ad6f6a52862c7152" - integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg== - -string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^5.0.0: - version "5.1.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" - integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== - dependencies: - eastasianwidth "^0.2.0" - emoji-regex "^9.2.2" - strip-ansi "^7.0.1" - -string.prototype.matchall@^4.0.6: - version "4.0.7" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz#8e6ecb0d8a1fb1fda470d81acecb2dba057a481d" - integrity sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - get-intrinsic "^1.1.1" - has-symbols "^1.0.3" - internal-slot "^1.0.3" - regexp.prototype.flags "^1.4.1" - side-channel "^1.0.4" - -string.prototype.trimend@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0" - integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.19.5" - -string.prototype.trimend@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" - integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - -string.prototype.trimstart@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef" - integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.19.5" - -string.prototype.trimstart@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4" - integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" - -stringify-object@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz#703065aefca19300d3ce88af4f5b3956d7556629" - integrity sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw== - dependencies: - get-own-enumerable-property-symbols "^3.0.0" - is-obj "^1.0.1" - is-regexp "^1.0.0" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" - integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== - dependencies: - ansi-regex "^6.0.1" - -strip-bom-string@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92" - integrity sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g== - -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA== - -strip-comments@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b" - integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw== - -strip-indent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001" - integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ== - dependencies: - min-indent "^1.0.0" - -strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -strip-literal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-literal/-/strip-literal-1.0.0.tgz#0a484ed5a978cd9d2becf3cf8f4f2cb5ab0e1e74" - integrity sha512-5o4LsH1lzBzO9UFH63AJ2ad2/S2AVx6NtjOcaz+VTT2h1RiRvbipW72z8M/lxEhcPHDBQwpDrnTF7sXy/7OwCQ== - dependencies: - acorn "^8.8.1" - -style-mod@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/style-mod/-/style-mod-4.0.0.tgz#97e7c2d68b592975f2ca7a63d0dd6fcacfe35a01" - integrity sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw== - -style-search@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902" - integrity sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg== - -stylelint-config-html@>=1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/stylelint-config-html/-/stylelint-config-html-1.1.0.tgz#999db19aea713b7ff6dde92ada76e4c1bd812b66" - integrity sha512-IZv4IVESjKLumUGi+HWeb7skgO6/g4VMuAYrJdlqQFndgbj6WJAXPhaysvBiXefX79upBdQVumgYcdd17gCpjQ== - -stylelint-config-prettier@^9.0.5: - version "9.0.5" - resolved "https://registry.yarnpkg.com/stylelint-config-prettier/-/stylelint-config-prettier-9.0.5.tgz#9f78bbf31c7307ca2df2dd60f42c7014ee9da56e" - integrity sha512-U44lELgLZhbAD/xy/vncZ2Pq8sh2TnpiPvo38Ifg9+zeioR+LAkHu0i6YORIOxFafZoVg0xqQwex6e6F25S5XA== - -stylelint-config-recommended-scss@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-8.0.0.tgz#1c1e93e619fe2275d4c1067928d92e0614f7d64f" - integrity sha512-BxjxEzRaZoQb7Iinc3p92GS6zRdRAkIuEu2ZFLTxJK2e1AIcCb5B5MXY9KOXdGTnYFZ+KKx6R4Fv9zU6CtMYPQ== - dependencies: - postcss-scss "^4.0.2" - stylelint-config-recommended "^9.0.0" - stylelint-scss "^4.0.0" - -stylelint-config-recommended-vue@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/stylelint-config-recommended-vue/-/stylelint-config-recommended-vue-1.4.0.tgz#0a182da17dc9e846e4bec65a7676ccf882b35964" - integrity sha512-DVJqyX2KvMCn9U0+keL12r7xlsH26K4Vg8NrIZuq5MoF7g82DpMp326Om4E0Q+Il1o+bTHuUyejf2XAI0iD04Q== - dependencies: - semver "^7.3.5" - stylelint-config-html ">=1.0.0" - stylelint-config-recommended ">=6.0.0" - -stylelint-config-recommended@>=6.0.0, stylelint-config-recommended@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-9.0.0.tgz#1c9e07536a8cd875405f8ecef7314916d94e7e40" - integrity sha512-9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ== - -stylelint-config-standard-scss@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-6.1.0.tgz#a6cddd2a9430578b92fc89726a59474d5548a444" - integrity sha512-iZ2B5kQT2G3rUzx+437cEpdcnFOQkwnwqXuY8Z0QUwIHQVE8mnYChGAquyKFUKZRZ0pRnrciARlPaR1RBtPb0Q== - dependencies: - stylelint-config-recommended-scss "^8.0.0" - stylelint-config-standard "^29.0.0" - -stylelint-config-standard@^29.0.0: - version "29.0.0" - resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-29.0.0.tgz#4cc0e0f05512a39bb8b8e97853247d3a95d66fa2" - integrity sha512-uy8tZLbfq6ZrXy4JKu3W+7lYLgRQBxYTUUB88vPgQ+ZzAxdrvcaSUW9hOMNLYBnwH+9Kkj19M2DHdZ4gKwI7tg== - dependencies: - stylelint-config-recommended "^9.0.0" - -stylelint-prettier@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/stylelint-prettier/-/stylelint-prettier-2.0.0.tgz#ead781aea522379f2ffa2d136bafdfc451d699a5" - integrity sha512-jvT3G+9lopkeB0ARmDPszyfaOnvnIF+30QCjZxyt7E6fynI1T9mOKgYDNb9bXX17M7PXMZaX3j/26wqakjp1tw== - dependencies: - prettier-linter-helpers "^1.0.0" - -stylelint-scss@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-4.3.0.tgz#638800faf823db11fff60d537c81051fe74c90fa" - integrity sha512-GvSaKCA3tipzZHoz+nNO7S02ZqOsdBzMiCx9poSmLlb3tdJlGddEX/8QzCOD8O7GQan9bjsvLMsO5xiw6IhhIQ== - dependencies: - lodash "^4.17.21" - postcss-media-query-parser "^0.2.3" - postcss-resolve-nested-selector "^0.1.1" - postcss-selector-parser "^6.0.6" - postcss-value-parser "^4.1.0" - -stylelint-scss@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-4.4.0.tgz#87ce9d049eff1ce67cce788780fbfda63099017e" - integrity sha512-Qy66a+/30aylFhPmUArHhVsHOun1qrO93LGT15uzLuLjWS7hKDfpFm34mYo1ndR4MCo8W4bEZM1+AlJRJORaaw== - dependencies: - lodash "^4.17.21" - postcss-media-query-parser "^0.2.3" - postcss-resolve-nested-selector "^0.1.1" - postcss-selector-parser "^6.0.6" - postcss-value-parser "^4.1.0" - -stylelint@^14.16.1: - version "14.16.1" - resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-14.16.1.tgz#b911063530619a1bbe44c2b875fd8181ebdc742d" - integrity sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A== - dependencies: - "@csstools/selector-specificity" "^2.0.2" - balanced-match "^2.0.0" - colord "^2.9.3" - cosmiconfig "^7.1.0" - css-functions-list "^3.1.0" - debug "^4.3.4" - fast-glob "^3.2.12" - fastest-levenshtein "^1.0.16" - file-entry-cache "^6.0.1" - global-modules "^2.0.0" - globby "^11.1.0" - globjoin "^0.1.4" - html-tags "^3.2.0" - ignore "^5.2.1" - import-lazy "^4.0.0" - imurmurhash "^0.1.4" - is-plain-object "^5.0.0" - known-css-properties "^0.26.0" - mathml-tag-names "^2.1.3" - meow "^9.0.0" - micromatch "^4.0.5" - normalize-path "^3.0.0" - picocolors "^1.0.0" - postcss "^8.4.19" - postcss-media-query-parser "^0.2.3" - postcss-resolve-nested-selector "^0.1.1" - postcss-safe-parser "^6.0.0" - postcss-selector-parser "^6.0.11" - 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 "^2.3.0" - svg-tags "^1.0.0" - table "^6.8.1" - v8-compile-cache "^2.3.0" - write-file-atomic "^4.0.2" - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.0.0, supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-hyperlinks@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz#3943544347c1ff90b15effb03fc14ae45ec10624" - integrity sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA== - dependencies: - has-flag "^4.0.0" - supports-color "^7.0.0" - -supports-preserve-symlinks-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" - integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== - -svg-baker@1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/svg-baker/-/svg-baker-1.7.0.tgz#8367f78d875550c52fe4756f7303d5c5d7c2e9a7" - integrity sha512-nibslMbkXOIkqKVrfcncwha45f97fGuAOn1G99YwnwTj8kF9YiM6XexPcUso97NxOm6GsP0SIvYVIosBis1xLg== - dependencies: - bluebird "^3.5.0" - clone "^2.1.1" - he "^1.1.1" - image-size "^0.5.1" - loader-utils "^1.1.0" - merge-options "1.0.1" - micromatch "3.1.0" - postcss "^5.2.17" - postcss-prefix-selector "^1.6.0" - posthtml-rename-id "^1.0" - posthtml-svg-mode "^1.0.3" - query-string "^4.3.2" - traverse "^0.6.6" - -svg-tags@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764" - integrity sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA== - -svgo@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" - integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== - dependencies: - "@trysound/sax" "0.2.0" - commander "^7.2.0" - css-select "^4.1.3" - css-tree "^1.1.3" - csso "^4.2.0" - picocolors "^1.0.0" - stable "^0.1.8" - -swap-case@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/swap-case/-/swap-case-2.0.2.tgz#671aedb3c9c137e2985ef51c51f9e98445bf70d9" - integrity sha512-kc6S2YS/2yXbtkSMunBtKdah4VFETZ8Oh6ONSmSd9bRxhqTrtARUCBUiWXH3xVPpvR7tz2CSnkuXVE42EcGnMw== - dependencies: - tslib "^2.0.3" - -symbol-observable@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-4.0.0.tgz#5b425f192279e87f2f9b937ac8540d1984b39205" - integrity sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ== - -symbol-tree@^3.2.4: - version "3.2.4" - resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" - integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== - -table@^6.8.1: - version "6.8.1" - resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf" - integrity sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA== - dependencies: - ajv "^8.0.1" - lodash.truncate "^4.4.2" - slice-ansi "^4.0.0" - string-width "^4.2.3" - strip-ansi "^6.0.1" - -tailwindcss@^3.2.6: - version "3.2.6" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.2.6.tgz#9bedbc744a4a85d6120ce0cc3db024c551a5c733" - integrity sha512-BfgQWZrtqowOQMC2bwaSNe7xcIjdDEgixWGYOd6AL0CbKHJlvhfdbINeAW76l1sO+1ov/MJ93ODJ9yluRituIw== - dependencies: - arg "^5.0.2" - chokidar "^3.5.3" - color-name "^1.1.4" - detective "^5.2.1" - didyoumean "^1.2.2" - dlv "^1.1.3" - fast-glob "^3.2.12" - glob-parent "^6.0.2" - is-glob "^4.0.3" - lilconfig "^2.0.6" - micromatch "^4.0.5" - normalize-path "^3.0.0" - object-hash "^3.0.0" - picocolors "^1.0.0" - postcss "^8.0.9" - postcss-import "^14.1.0" - postcss-js "^4.0.0" - postcss-load-config "^3.1.4" - postcss-nested "6.0.0" - postcss-selector-parser "^6.0.11" - postcss-value-parser "^4.2.0" - quick-lru "^5.1.1" - resolve "^1.22.1" - -temp-dir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e" - integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg== - -tempy@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tempy/-/tempy-0.6.0.tgz#65e2c35abc06f1124a97f387b08303442bde59f3" - integrity sha512-G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw== - dependencies: - is-stream "^2.0.0" - temp-dir "^2.0.0" - type-fest "^0.16.0" - unique-string "^2.0.0" - -terser@^5.0.0: - version "5.15.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.15.1.tgz#8561af6e0fd6d839669c73b92bdd5777d870ed6c" - integrity sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw== - dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" - -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== - -throttle-debounce@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz#32f94d84dfa894f786c9a1f290e7a645b6a19abb" - integrity sha512-dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg== - -through@^2.3.6, through@^2.3.8: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== - -timezone-mock@^1.3.6: - version "1.3.6" - resolved "https://registry.yarnpkg.com/timezone-mock/-/timezone-mock-1.3.6.tgz#44e4c5aeb57e6c07ae630a05c528fc4d9aab86f4" - integrity sha512-YcloWmZfLD9Li5m2VcobkCDNVaLMx8ohAb/97l/wYS3m+0TIEK5PFNMZZfRcusc6sFjIfxu8qcJT0CNnOdpqmg== - -tinybench@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.3.1.tgz#14f64e6b77d7ef0b1f6ab850c7a808c6760b414d" - integrity sha512-hGYWYBMPr7p4g5IarQE7XhlyWveh1EKhy4wUBS1LrHXCKYgvz+4/jCqgmJqZxxldesn05vccrtME2RLLZNW7iA== - -tinypool@^0.1.2: - version "0.1.3" - resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.1.3.tgz#b5570b364a1775fd403de5e7660b325308fee26b" - integrity sha512-2IfcQh7CP46XGWGGbdyO4pjcKqsmVqFAPcXfPxcPXmOWt9cYkTP9HcDmGgsfijYoAEc4z9qcpM/BaBz46Y9/CQ== - -tinypool@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.3.1.tgz#a99c2e446aba9be05d3e1cb756d6aed7af4723b6" - integrity sha512-zLA1ZXlstbU2rlpA4CIeVaqvWq41MTWqLY3FfsAXgC8+f7Pk7zroaJQxDgxn1xNudKW6Kmj4808rPFShUlIRmQ== - -tinyspy@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-1.0.2.tgz#6da0b3918bfd56170fb3cd3a2b5ef832ee1dff0d" - integrity sha512-bSGlgwLBYf7PnUsQ6WOc6SJ3pGOcd+d8AA6EUnLDDM0kWEstC1JIlSZA3UNliDXhd9ABoS7hiRBDCu+XP/sf1Q== - -tippy.js@^6.3.7: - version "6.3.7" - resolved "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.7.tgz#8ccfb651d642010ed9a32ff29b0e9e19c5b8c61c" - integrity sha512-E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ== - dependencies: - "@popperjs/core" "^2.9.0" - -title-case@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/title-case/-/title-case-3.0.3.tgz#bc689b46f02e411f1d1e1d081f7c3deca0489982" - integrity sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA== - dependencies: - tslib "^2.0.3" - -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== - dependencies: - os-tmpdir "~1.0.2" - -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== - -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg== - dependencies: - kind-of "^3.0.2" - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg== - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -to-regex@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - -totalist@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.0.tgz#4ef9c58c5f095255cdc3ff2a0a55091c57a3a1bd" - integrity sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw== - -tough-cookie@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874" - integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ== - dependencies: - psl "^1.1.33" - punycode "^2.1.1" - universalify "^0.2.0" - url-parse "^1.5.3" - -tr46@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" - integrity sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA== - dependencies: - punycode "^2.1.0" - -tr46@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9" - integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA== - dependencies: - punycode "^2.1.1" - -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== - -traverse@^0.6.6: - version "0.6.7" - resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.7.tgz#46961cd2d57dd8706c36664acde06a248f1173fe" - integrity sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg== - -trim-newlines@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144" - integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== - -ts-essentials@^9.1.2: - version "9.3.0" - resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-9.3.0.tgz#7e639c1a76b1805c3c60d6e1b5178da2e70aea02" - integrity sha512-XeiCboEyBG8UqXZtXl59bWEi4ZgOqRsogFDI6WDGIF1LmzbYiAkIwjkXN6zZWWl4re/lsOqMlYfe8KA0XiiEPw== - -ts-invariant@^0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.10.3.tgz#3e048ff96e91459ffca01304dbc7f61c1f642f6c" - integrity sha512-uivwYcQaxAucv1CzRp2n/QdYPo4ILf9VXgH19zEIjFx2EJufV16P0JtJVpYHy89DItG6Kwj2oIUjrcK5au+4tQ== - dependencies: - tslib "^2.1.0" - -ts-log@^2.2.3: - version "2.2.5" - resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.5.tgz#aef3252f1143d11047e2cb6f7cfaac7408d96623" - integrity sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA== - -ts-node@^10.9.1: - version "10.9.1" - resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b" - integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw== - dependencies: - "@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" - -tsconfig-paths@^3.14.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" - integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ== - dependencies: - "@types/json5" "^0.0.29" - json5 "^1.0.1" - minimist "^1.2.6" - strip-bom "^3.0.0" - -tslib@^1.8.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0, tslib@~2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== - -tsutils@^3.21.0: - version "3.21.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" - integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== - dependencies: - tslib "^1.8.1" - -type-check@^0.4.0, type-check@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" - integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== - dependencies: - prelude-ls "^1.2.1" - -type-check@~0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg== - dependencies: - prelude-ls "~1.1.2" - -type-detect@^4.0.0, type-detect@^4.0.5: - version "4.0.8" - resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" - integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== - -type-fest@^0.16.0: - version "0.16.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz#3240b891a78b0deae910dbeb86553e552a148860" - integrity sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg== - -type-fest@^0.18.0: - version "0.18.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz#db4bc151a4a2cf4eebf9add5db75508db6cc841f" - integrity sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw== - -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== - -type-fest@^0.21.3: - version "0.21.3" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" - integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== - -type-fest@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" - integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== - -type-fest@^0.8.1: - version "0.8.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== - -type-fest@^2.0.0: - version "2.19.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" - integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA== - -type-fest@^3.5.7: - version "3.5.7" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.5.7.tgz#1ee9efc9a172f4002c40b896689928a7bba537f2" - integrity sha512-6J4bYzb4sdkcLBty4XW7F18VPI66M4boXNE+CY40532oq2OJe6AVMB5NmjOp6skt/jw5mRjz/hLRpuglz0U+FA== - -typed-array-length@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" - integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== - dependencies: - call-bind "^1.0.2" - for-each "^0.3.3" - is-typed-array "^1.1.9" - -typescript@^4.9.5: - version "4.9.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" - integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== - -ua-parser-js@^0.7.30: - version "0.7.32" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz#cd8c639cdca949e30fa68c44b7813ef13e36d211" - integrity sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw== - -ua-parser-js@^1.0.33: - version "1.0.33" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.33.tgz#f21f01233e90e7ed0f059ceab46eb190ff17f8f4" - integrity sha512-RqshF7TPTE0XLYAqmjlu5cLLuGdKrNu9O1KLA/qp39QtbZwuzwv1dT46DZSopoUMsYgXpB3Cv8a03FI8b74oFQ== - -uc.micro@^1.0.1, uc.micro@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" - integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== - -ufo@^1.0.0, ufo@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.0.1.tgz#64ed43b530706bda2e4892f911f568cf4cf67d29" - integrity sha512-boAm74ubXHY7KJQZLlXrtMz52qFvpsbOxDcZOnw/Wf+LS4Mmyu7JxmzD4tDLtUQtmZECypJ0FrCz4QIe6dvKRA== - -unbox-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" - integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== - dependencies: - call-bind "^1.0.2" - has-bigints "^1.0.2" - has-symbols "^1.0.3" - which-boxed-primitive "^1.0.2" - -unc-path-regex@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" - integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== - -undici@^5.10.0: - version "5.11.0" - resolved "https://registry.yarnpkg.com/undici/-/undici-5.11.0.tgz#1db25f285821828fc09d3804b9e2e934ae86fc13" - integrity sha512-oWjWJHzFet0Ow4YZBkyiJwiK5vWqEYoH7BINzJAJOLedZ++JpAlCbUktW2GQ2DS2FpKmxD/JMtWUUWl1BtghGw== - dependencies: - busboy "^1.6.0" - -undici@^5.12.0: - version "5.15.0" - resolved "https://registry.yarnpkg.com/undici/-/undici-5.15.0.tgz#cb8437c43718673a8be59df0fdd4856ff6689283" - integrity sha512-wCAZJDyjw9Myv+Ay62LAoB+hZLPW9SmKbQkbHIhMw/acKSlpn7WohdMUc/Vd4j1iSMBO0hWwU8mjB7a5p5bl8g== - dependencies: - busboy "^1.6.0" - -unicode-canonical-property-names-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc" - integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ== - -unicode-match-property-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3" - integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q== - dependencies: - unicode-canonical-property-names-ecmascript "^2.0.0" - unicode-property-aliases-ecmascript "^2.0.0" - -unicode-match-property-value-ecmascript@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714" - integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw== - -unicode-property-aliases-ecmascript@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz#43d41e3be698bd493ef911077c9b131f827e8ccd" - integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w== - -union-value@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" - integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^2.0.1" - -unique-string@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" - integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== - dependencies: - crypto-random-string "^2.0.0" - -universalify@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0" - integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== - -universalify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" - integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== - -unixify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unixify/-/unixify-1.0.0.tgz#3a641c8c2ffbce4da683a5c70f03a462940c2090" - integrity sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg== - dependencies: - normalize-path "^2.1.1" - -unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== - -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ== - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - -upath@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" - integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== - -update-browserslist-db@^1.0.9: - version "1.0.10" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" - integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== - dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" - -upper-case-first@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-2.0.2.tgz#992c3273f882abd19d1e02894cc147117f844324" - integrity sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg== - dependencies: - tslib "^2.0.3" - -upper-case@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-2.0.2.tgz#d89810823faab1df1549b7d97a76f8662bae6f7a" - integrity sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg== - dependencies: - tslib "^2.0.3" - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg== - -url-parse@^1.5.3: - version "1.5.10" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1" - integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ== - dependencies: - querystringify "^2.1.1" - requires-port "^1.0.0" - -urlpattern-polyfill@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-6.0.2.tgz#a193fe773459865a2a5c93b246bb794b13d07256" - integrity sha512-5vZjFlH9ofROmuWmXM9yj2wljYKgWstGwe8YTyiqM7hVum/g9LyCizPZtb3UqsuppVwety9QJmfc42VggLpTgg== - dependencies: - braces "^3.0.2" - -use@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== - -util-deprecate@^1.0.1, util-deprecate@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== - -uuid@^9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" - integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== - -v8-compile-cache-lib@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" - integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg== - -v8-compile-cache@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" - integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== - -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -value-or-promise@1.0.11, value-or-promise@^1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140" - integrity sha512-41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg== - -value-or-promise@1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c" - integrity sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q== - -vary@^1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== - -vite-node@0.28.4: - version "0.28.4" - resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-0.28.4.tgz#ce709cde2200d86a2a45457fed65f453234b0261" - integrity sha512-KM0Q0uSG/xHHKOJvVHc5xDBabgt0l70y7/lWTR7Q0pR5/MrYxadT+y32cJOE65FfjGmJgxpVEEY+69btJgcXOQ== - dependencies: - cac "^6.7.14" - debug "^4.3.4" - mlly "^1.1.0" - pathe "^1.1.0" - picocolors "^1.0.0" - source-map "^0.6.1" - source-map-support "^0.5.21" - vite "^3.0.0 || ^4.0.0" - -vite-plugin-pwa@^0.14.1: - version "0.14.1" - resolved "https://registry.yarnpkg.com/vite-plugin-pwa/-/vite-plugin-pwa-0.14.1.tgz#c32905d77916aab23e86522e2d4882c652f008d5" - integrity sha512-5zx7yhQ8RTLwV71+GA9YsQQ63ALKG8XXIMqRJDdZkR8ZYftFcRgnzM7wOWmQZ/DATspyhPih5wCdcZnAIsM+mA== - dependencies: - "@rollup/plugin-replace" "^5.0.1" - debug "^4.3.4" - fast-glob "^3.2.12" - pretty-bytes "^6.0.0" - rollup "^3.7.2" - workbox-build "^6.5.4" - workbox-window "^6.5.4" - -vite-plugin-ruby@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/vite-plugin-ruby/-/vite-plugin-ruby-3.1.3.tgz#893ee7dc3b25daf5611c16c3dc0ca3420e6a801c" - integrity sha512-Y7j0lL8xNMSN1c2/sKBlaLkp0nFtxNFU9/kUReX/GMTOAk8fBylrR9ZdC3fej6EnYzbO3VDtfDDyWzYaoCW3hA== - dependencies: - debug "^4.3.4" - fast-glob "^3.2.11" - -vite-plugin-svg-icons@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/vite-plugin-svg-icons/-/vite-plugin-svg-icons-2.0.1.tgz#7269a0962593509f371b9e2bb344d469db2c6df9" - integrity sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA== - dependencies: - "@types/svgo" "^2.6.1" - cors "^2.8.5" - debug "^4.3.3" - etag "^1.8.1" - fs-extra "^10.0.0" - pathe "^0.2.0" - svg-baker "1.7.0" - svgo "^2.8.0" - -"vite@^3.0.0 || ^4.0.0": - version "4.0.1" - resolved "https://registry.yarnpkg.com/vite/-/vite-4.0.1.tgz#e0a54d818c28ae47fd27bcac6a4a952c6a658502" - integrity sha512-kZQPzbDau35iWOhy3CpkrRC7It+HIHtulAzBhMqzGHKRf/4+vmh8rPDDdv98SWQrFWo6//3ozwsRmwQIPZsK9g== - dependencies: - esbuild "^0.16.3" - postcss "^8.4.20" - resolve "^1.22.1" - rollup "^3.7.0" - optionalDependencies: - fsevents "~2.3.2" - -vite@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/vite/-/vite-4.0.4.tgz#4612ce0b47bbb233a887a54a4ae0c6e240a0da31" - integrity sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw== - dependencies: - esbuild "^0.16.3" - postcss "^8.4.20" - resolve "^1.22.1" - rollup "^3.7.0" - optionalDependencies: - fsevents "~2.3.2" - -vitest-axe@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/vitest-axe/-/vitest-axe-0.1.0.tgz#34f714e5af31d579d7e2ca906d6b95207a1006ec" - integrity sha512-jvtXxeQPg8R/2ANTY8QicA5pvvdRP4F0FsVUAHANJ46YCDASie/cuhlSzu0DGcLmZvGBSBNsNuK3HqfaeknyvA== - dependencies: - aria-query "^5.0.0" - axe-core "^4.4.2" - chalk "^5.0.1" - dom-accessibility-api "^0.5.14" - lodash-es "^4.17.21" - redent "^3.0.0" - -vitest@^0.28.4: - version "0.28.4" - resolved "https://registry.yarnpkg.com/vitest/-/vitest-0.28.4.tgz#d41113d6e250620cefd83ca967387a5844a7bde2" - integrity sha512-sfWIy0AdlbyGRhunm+TLQEJrFH9XuRPdApfubsyLcDbCRrUX717BRQKInTgzEfyl2Ipi1HWoHB84Nqtcwxogcg== - dependencies: - "@types/chai" "^4.3.4" - "@types/chai-subset" "^1.3.3" - "@types/node" "*" - "@vitest/expect" "0.28.4" - "@vitest/runner" "0.28.4" - "@vitest/spy" "0.28.4" - "@vitest/utils" "0.28.4" - acorn "^8.8.1" - acorn-walk "^8.2.0" - cac "^6.7.14" - chai "^4.3.7" - debug "^4.3.4" - local-pkg "^0.4.2" - pathe "^1.1.0" - picocolors "^1.0.0" - source-map "^0.6.1" - std-env "^3.3.1" - strip-literal "^1.0.0" - tinybench "^2.3.1" - tinypool "^0.3.1" - tinyspy "^1.0.2" - vite "^3.0.0 || ^4.0.0" - vite-node "0.28.4" - why-is-node-running "^2.2.2" - -vue-advanced-cropper@^2.8.8: - version "2.8.8" - resolved "https://registry.yarnpkg.com/vue-advanced-cropper/-/vue-advanced-cropper-2.8.8.tgz#af0e8324312be5a1a92ce9fd3aff8264d28a5b33" - integrity sha512-yDM7Jb/gnxcs//JdbOogBUoHr1bhCQSto7/ohgETKAe4wvRpmqIkKSppMm1huVQr+GP1YoVlX/fkjKxvYzwwDQ== - dependencies: - classnames "^2.2.6" - debounce "^1.2.0" - easy-bem "^1.0.2" - -vue-demi@*, vue-demi@^0.13.1: - version "0.13.11" - resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99" - integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A== - -vue-easy-lightbox@1.12.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/vue-easy-lightbox/-/vue-easy-lightbox-1.12.0.tgz#c275547ba39e7788574335f28fe56b804d3cf163" - integrity sha512-An7R3Fr+veHhGcLS1ly+O8XLhayObckJ3t7jupQn9IxXUQH3qA1mkG5DuAg9n4gwzF3fDn+jcORQ3iTp3UdEDg== - -vue-eslint-parser@^9.0.0, vue-eslint-parser@^9.0.1: - version "9.1.0" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz#0e121d1bb29bd10763c83e3cc583ee03434a9dd5" - integrity sha512-NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ== - dependencies: - debug "^4.3.4" - eslint-scope "^7.1.1" - eslint-visitor-keys "^3.3.0" - espree "^9.3.1" - esquery "^1.4.0" - lodash "^4.17.21" - semver "^7.3.6" - -vue-router@^4.1.6: - version "4.1.6" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.1.6.tgz#b70303737e12b4814578d21d68d21618469375a1" - integrity sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ== - dependencies: - "@vue/devtools-api" "^6.4.5" - -vue-template-compiler@^2.7.14: - version "2.7.14" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz#4545b7dfb88090744c1577ae5ac3f964e61634b1" - integrity sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ== - dependencies: - de-indent "^1.0.2" - he "^1.2.0" - -vue-tsc@^1.0.24: - version "1.0.24" - resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.0.24.tgz#c0b270a7c8422408d3b6694fee61b39a4b9e4740" - integrity sha512-mmU1s5SAqE1nByQAiQnao9oU4vX+mSdsgI8H57SfKH6UVzq/jP9+Dbi2GaV+0b4Cn361d2ln8m6xeU60ApiEXg== - dependencies: - "@volar/vue-language-core" "1.0.24" - "@volar/vue-typescript" "1.0.24" - -vue3-draggable-resizable@^1.6.5: - version "1.6.5" - resolved "https://registry.yarnpkg.com/vue3-draggable-resizable/-/vue3-draggable-resizable-1.6.5.tgz#021b2c00bff2885ab4fa5981e03bf4f56f12cdac" - integrity sha512-31142E31fGNnq3HKqvmFLSsqIbhck7TyGuQWhUKrDw6DOcGAuRx4ddRjaxvT6fe7dgeKH53qAh+i0ZlWtPLl2g== - -vue@^3.2.47: - version "3.2.47" - resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.47.tgz#3eb736cbc606fc87038dbba6a154707c8a34cff0" - integrity sha512-60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ== - dependencies: - "@vue/compiler-dom" "3.2.47" - "@vue/compiler-sfc" "3.2.47" - "@vue/runtime-dom" "3.2.47" - "@vue/server-renderer" "3.2.47" - "@vue/shared" "3.2.47" - -vuedraggable@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-4.1.0.tgz#edece68adb8a4d9e06accff9dfc9040e66852270" - integrity sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww== - dependencies: - sortablejs "1.14.0" - -w3c-keyname@^2.2.0, w3c-keyname@^2.2.4: - version "2.2.6" - resolved "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.6.tgz#8412046116bc16c5d73d4e612053ea10a189c85f" - integrity sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg== - -w3c-xmlserializer@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073" - integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw== - dependencies: - xml-name-validator "^4.0.0" - -wcwidth@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" - integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg== - dependencies: - defaults "^1.0.3" - -web-streams-polyfill@4.0.0-beta.3: - version "4.0.0-beta.3" - resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz#2898486b74f5156095e473efe989dcf185047a38" - integrity sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug== - -web-streams-polyfill@^3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6" - integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q== - -webcrypto-core@^1.7.4: - version "1.7.5" - resolved "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.7.5.tgz#c02104c953ca7107557f9c165d194c6316587ca4" - integrity sha512-gaExY2/3EHQlRNNNVSrbG2Cg94Rutl7fAaKILS1w8ZDhGxdFOaw6EbCfHIxPy9vt/xwp5o0VQAx9aySPF6hU1A== - dependencies: - "@peculiar/asn1-schema" "^2.1.6" - "@peculiar/json-schema" "^1.1.12" - asn1js "^3.0.1" - pvtsutils "^1.3.2" - tslib "^2.4.0" - -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== - -webidl-conversions@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" - integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== - -webidl-conversions@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" - integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== - -whatwg-encoding@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53" - integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg== - dependencies: - iconv-lite "0.6.3" - -whatwg-fetch@^3.4.1: - version "3.6.2" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" - integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== - -whatwg-mimetype@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7" - integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q== - -whatwg-url@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018" - integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ== - dependencies: - tr46 "^3.0.0" - webidl-conversions "^7.0.0" - -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== - dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" - -whatwg-url@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz#c2c492f1eca612988efd3d2266be1b9fc6170d06" - integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg== - dependencies: - lodash.sortby "^4.7.0" - tr46 "^1.0.1" - webidl-conversions "^4.0.2" - -which-boxed-primitive@^1.0.1, which-boxed-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" - integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== - 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" - -which-collection@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" - integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== - dependencies: - is-map "^2.0.1" - is-set "^2.0.1" - is-weakmap "^2.0.1" - is-weakset "^2.0.1" - -which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== - -which-typed-array@^1.1.2: - version "1.1.8" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.8.tgz#0cfd53401a6f334d90ed1125754a42ed663eb01f" - integrity sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-abstract "^1.20.0" - for-each "^0.3.3" - has-tostringtag "^1.0.0" - is-typed-array "^1.1.9" - -which-typed-array@^1.1.9: - version "1.1.9" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6" - integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - for-each "^0.3.3" - gopd "^1.0.1" - has-tostringtag "^1.0.0" - is-typed-array "^1.1.10" - -which@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -which@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -why-is-node-running@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/why-is-node-running/-/why-is-node-running-2.2.2.tgz#4185b2b4699117819e7154594271e7e344c9973e" - integrity sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA== - dependencies: - siginfo "^2.0.0" - stackback "0.0.2" - -word-wrap@^1.2.3, word-wrap@~1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" - integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== - -workbox-background-sync@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.4.tgz#3141afba3cc8aa2ae14c24d0f6811374ba8ff6a9" - integrity sha512-0r4INQZMyPky/lj4Ou98qxcThrETucOde+7mRGJl13MPJugQNKeZQOdIJe/1AchOP23cTqHcN/YVpD6r8E6I8g== - dependencies: - idb "^7.0.1" - workbox-core "6.5.4" - -workbox-broadcast-update@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.4.tgz#8441cff5417cd41f384ba7633ca960a7ffe40f66" - integrity sha512-I/lBERoH1u3zyBosnpPEtcAVe5lwykx9Yg1k6f8/BGEPGaMMgZrwVrqL1uA9QZ1NGGFoyE6t9i7lBjOlDhFEEw== - dependencies: - workbox-core "6.5.4" - -workbox-build@^6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.4.tgz#7d06d31eb28a878817e1c991c05c5b93409f0389" - integrity sha512-kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA== - dependencies: - "@apideck/better-ajv-errors" "^0.3.1" - "@babel/core" "^7.11.1" - "@babel/preset-env" "^7.11.0" - "@babel/runtime" "^7.11.2" - "@rollup/plugin-babel" "^5.2.0" - "@rollup/plugin-node-resolve" "^11.2.1" - "@rollup/plugin-replace" "^2.4.1" - "@surma/rollup-plugin-off-main-thread" "^2.2.3" - ajv "^8.6.0" - common-tags "^1.8.0" - fast-json-stable-stringify "^2.1.0" - fs-extra "^9.0.1" - glob "^7.1.6" - lodash "^4.17.20" - pretty-bytes "^5.3.0" - rollup "^2.43.1" - rollup-plugin-terser "^7.0.0" - source-map "^0.8.0-beta.0" - stringify-object "^3.3.0" - strip-comments "^2.0.1" - tempy "^0.6.0" - upath "^1.2.0" - workbox-background-sync "6.5.4" - workbox-broadcast-update "6.5.4" - workbox-cacheable-response "6.5.4" - workbox-core "6.5.4" - workbox-expiration "6.5.4" - workbox-google-analytics "6.5.4" - workbox-navigation-preload "6.5.4" - workbox-precaching "6.5.4" - workbox-range-requests "6.5.4" - workbox-recipes "6.5.4" - workbox-routing "6.5.4" - workbox-strategies "6.5.4" - workbox-streams "6.5.4" - workbox-sw "6.5.4" - workbox-window "6.5.4" - -workbox-cacheable-response@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.4.tgz#a5c6ec0c6e2b6f037379198d4ef07d098f7cf137" - integrity sha512-DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug== - dependencies: - workbox-core "6.5.4" - -workbox-core@6.5.4, workbox-core@^6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz#df48bf44cd58bb1d1726c49b883fb1dffa24c9ba" - integrity sha512-OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q== - -workbox-expiration@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.4.tgz#501056f81e87e1d296c76570bb483ce5e29b4539" - integrity sha512-jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ== - dependencies: - idb "^7.0.1" - workbox-core "6.5.4" - -workbox-google-analytics@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.4.tgz#c74327f80dfa4c1954cbba93cd7ea640fe7ece7d" - integrity sha512-8AU1WuaXsD49249Wq0B2zn4a/vvFfHkpcFfqAFHNHwln3jK9QUYmzdkKXGIZl9wyKNP+RRX30vcgcyWMcZ9VAg== - dependencies: - workbox-background-sync "6.5.4" - workbox-core "6.5.4" - workbox-routing "6.5.4" - workbox-strategies "6.5.4" - -workbox-navigation-preload@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz#ede56dd5f6fc9e860a7e45b2c1a8f87c1c793212" - integrity sha512-IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng== - dependencies: - workbox-core "6.5.4" - -workbox-precaching@6.5.4, workbox-precaching@^6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.4.tgz#740e3561df92c6726ab5f7471e6aac89582cab72" - integrity sha512-hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg== - dependencies: - workbox-core "6.5.4" - workbox-routing "6.5.4" - workbox-strategies "6.5.4" - -workbox-range-requests@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.4.tgz#86b3d482e090433dab38d36ae031b2bb0bd74399" - integrity sha512-Je2qR1NXCFC8xVJ/Lux6saH6IrQGhMpDrPXWZWWS8n/RD+WZfKa6dSZwU+/QksfEadJEr/NfY+aP/CXFFK5JFg== - dependencies: - workbox-core "6.5.4" - -workbox-recipes@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.4.tgz#cca809ee63b98b158b2702dcfb741b5cc3e24acb" - integrity sha512-QZNO8Ez708NNwzLNEXTG4QYSKQ1ochzEtRLGaq+mr2PyoEIC1xFW7MrWxrONUxBFOByksds9Z4//lKAX8tHyUA== - dependencies: - workbox-cacheable-response "6.5.4" - workbox-core "6.5.4" - workbox-expiration "6.5.4" - workbox-precaching "6.5.4" - workbox-routing "6.5.4" - workbox-strategies "6.5.4" - -workbox-routing@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz#6a7fbbd23f4ac801038d9a0298bc907ee26fe3da" - integrity sha512-apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg== - dependencies: - workbox-core "6.5.4" - -workbox-strategies@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.4.tgz#4edda035b3c010fc7f6152918370699334cd204d" - integrity sha512-DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw== - dependencies: - workbox-core "6.5.4" - -workbox-streams@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.4.tgz#1cb3c168a6101df7b5269d0353c19e36668d7d69" - integrity sha512-FXKVh87d2RFXkliAIheBojBELIPnWbQdyDvsH3t74Cwhg0fDheL1T8BqSM86hZvC0ZESLsznSYWw+Va+KVbUzg== - dependencies: - workbox-core "6.5.4" - workbox-routing "6.5.4" - -workbox-sw@6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.4.tgz#d93e9c67924dd153a61367a4656ff4d2ae2ed736" - integrity sha512-vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA== - -workbox-window@6.5.4, workbox-window@^6.5.4: - version "6.5.4" - resolved "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.4.tgz#d991bc0a94dff3c2dbb6b84558cff155ca878e91" - integrity sha512-HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug== - dependencies: - "@types/trusted-types" "^2.0.2" - workbox-core "6.5.4" - -wrap-ansi@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" - integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== - -write-file-atomic@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz#a9df01ae5b77858a027fd2e80768ee433555fcfd" - integrity sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg== - dependencies: - imurmurhash "^0.1.4" - signal-exit "^3.0.7" - -ws@8.12.0: - version "8.12.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" - integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== - -ws@^8.11.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" - integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== - -ws@^8.3.0: - version "8.9.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz#2a994bb67144be1b53fe2d23c53c028adeb7f45e" - integrity sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg== - -xml-name-validator@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835" - integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw== - -xmlchars@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" - integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== - -xtend@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - -y18n@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" - integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yaml-ast-parser@^0.0.43: - version "0.0.43" - resolved "https://registry.yarnpkg.com/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz#e8a23e6fb4c38076ab92995c5dca33f3d3d7c9bb" - integrity sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A== - -yaml@^1.10.0, yaml@^1.10.2: - version "1.10.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" - integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== - -yargs-parser@^18.1.2: - version "18.1.3" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" - integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - -yargs-parser@^20.2.3: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yargs-parser@^21.0.0: - version "21.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - -yargs@^15.3.1: - version "15.4.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" - integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== - dependencies: - cliui "^6.0.0" - decamelize "^1.2.0" - find-up "^4.1.0" - get-caller-file "^2.0.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" - -yargs@^17.0.0: - version "17.6.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c" - integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g== - dependencies: - 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.0.0" - -yn@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" - integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== - -yocto-queue@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" - integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== - -yocto-queue@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251" - integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g== - -zen-observable-ts@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.2.5.tgz#6c6d9ea3d3a842812c6e9519209365a122ba8b58" - integrity sha512-QZWQekv6iB72Naeake9hS1KxHlotfRpe+WGNbNx5/ta+R3DNjVO2bswf63gXlWDcs+EMd7XY8HfVQyP1X6T4Zg== - dependencies: - zen-observable "0.8.15" - -zen-observable@0.8.15: - version "0.8.15" - resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15" - integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ== diff --git a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.nix b/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.nix deleted file mode 100644 index 45864d0b13..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/misc/zammad/yarn.nix +++ /dev/null @@ -1,11446 +0,0 @@ -{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { - offline_cache = linkFarm "offline" packages; - packages = [ - { - name = "_adobe_css_tools___css_tools_4.0.1.tgz"; - path = fetchurl { - name = "_adobe_css_tools___css_tools_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.0.1.tgz"; - sha512 = "+u76oB43nOHrF4DDWRLWDCtci7f3QJoEBigemIdIeTi1ODqjx6Tad9NCVnPRwewWlKkVab5PlK8DCtPTyX7S8g=="; - }; - } - { - name = "_ampproject_remapping___remapping_2.2.0.tgz"; - path = fetchurl { - name = "_ampproject_remapping___remapping_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz"; - sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; - }; - } - { - name = "_apideck_better_ajv_errors___better_ajv_errors_0.3.6.tgz"; - path = fetchurl { - name = "_apideck_better_ajv_errors___better_ajv_errors_0.3.6.tgz"; - url = "https://registry.yarnpkg.com/@apideck/better-ajv-errors/-/better-ajv-errors-0.3.6.tgz"; - sha512 = "P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA=="; - }; - } - { - name = "_apollo_client___client_3.7.7.tgz"; - path = fetchurl { - name = "_apollo_client___client_3.7.7.tgz"; - url = "https://registry.yarnpkg.com/@apollo/client/-/client-3.7.7.tgz"; - sha512 = "Rp/pCWuJSjLN7Xl5Qi2NoeURmZYEU/TIUz0n/LOwEo1tGdU2W7/fGVZ8+5um58JeVYq4UoTGBKFxSVeG4s411A=="; - }; - } - { - name = "_ardatan_relay_compiler___relay_compiler_12.0.0.tgz"; - path = fetchurl { - name = "_ardatan_relay_compiler___relay_compiler_12.0.0.tgz"; - url = "https://registry.yarnpkg.com/@ardatan/relay-compiler/-/relay-compiler-12.0.0.tgz"; - sha512 = "9anThAaj1dQr6IGmzBMcfzOQKTa5artjuPmw8NYK/fiGEMjADbSguBY2FMDykt+QhilR3wc9VA/3yVju7JHg7Q=="; - }; - } - { - name = "_ardatan_sync_fetch___sync_fetch_0.0.1.tgz"; - path = fetchurl { - name = "_ardatan_sync_fetch___sync_fetch_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/@ardatan/sync-fetch/-/sync-fetch-0.0.1.tgz"; - sha512 = "xhlTqH0m31mnsG0tIP4ETgfSB6gXDaYYsUWTrlUV93fFQPI9dd8hE0Ot6MHLCtqgB32hwJAC3YZMWlXZw7AleA=="; - }; - } - { - name = "_babel_code_frame___code_frame_7.18.6.tgz"; - path = fetchurl { - name = "_babel_code_frame___code_frame_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz"; - sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; - }; - } - { - name = "_babel_compat_data___compat_data_7.20.1.tgz"; - path = fetchurl { - name = "_babel_compat_data___compat_data_7.20.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.1.tgz"; - sha512 = "EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ=="; - }; - } - { - name = "_babel_compat_data___compat_data_7.19.4.tgz"; - path = fetchurl { - name = "_babel_compat_data___compat_data_7.19.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.4.tgz"; - sha512 = "CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw=="; - }; - } - { - name = "_babel_core___core_7.19.6.tgz"; - path = fetchurl { - name = "_babel_core___core_7.19.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.19.6.tgz"; - sha512 = "D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg=="; - }; - } - { - name = "_babel_generator___generator_7.19.6.tgz"; - path = fetchurl { - name = "_babel_generator___generator_7.19.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.6.tgz"; - sha512 = "oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA=="; - }; - } - { - name = "_babel_generator___generator_7.20.1.tgz"; - path = fetchurl { - name = "_babel_generator___generator_7.20.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.1.tgz"; - sha512 = "u1dMdBUmA7Z0rBB97xh8pIhviK7oItYOkjbsCxTWMknyvbQRBwX7/gn4JXurRdirWMFh+ZtYARqkA6ydogVZpg=="; - }; - } - { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.18.6.tgz"; - path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"; - sha512 = "duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA=="; - }; - } - { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.18.9.tgz"; - path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz"; - sha512 = "yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw=="; - }; - } - { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.20.0.tgz"; - path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.20.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz"; - sha512 = "0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ=="; - }; - } - { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.19.3.tgz"; - path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.19.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz"; - sha512 = "65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg=="; - }; - } - { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.19.0.tgz"; - path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.19.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz"; - sha512 = "NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw=="; - }; - } - { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.19.0.tgz"; - path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.19.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz"; - sha512 = "htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw=="; - }; - } - { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.3.3.tgz"; - path = fetchurl { - name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.3.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz"; - sha512 = "z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww=="; - }; - } - { - name = "_babel_helper_environment_visitor___helper_environment_visitor_7.18.9.tgz"; - path = fetchurl { - name = "_babel_helper_environment_visitor___helper_environment_visitor_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"; - sha512 = "3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="; - }; - } - { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.18.6.tgz"; - path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"; - sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; - }; - } - { - name = "_babel_helper_function_name___helper_function_name_7.19.0.tgz"; - path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.19.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz"; - sha512 = "WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w=="; - }; - } - { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.18.6.tgz"; - path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; - sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; - }; - } - { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.18.9.tgz"; - path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz"; - sha512 = "RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg=="; - }; - } - { - name = "_babel_helper_module_imports___helper_module_imports_7.18.6.tgz"; - path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; - sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; - }; - } - { - name = "_babel_helper_module_transforms___helper_module_transforms_7.19.6.tgz"; - path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.19.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz"; - sha512 = "fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw=="; - }; - } - { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.18.6.tgz"; - path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"; - sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; - }; - } - { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.19.0.tgz"; - path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.19.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz"; - sha512 = "40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw=="; - }; - } - { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.18.9.tgz"; - path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz"; - sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA=="; - }; - } - { - name = "_babel_helper_replace_supers___helper_replace_supers_7.19.1.tgz"; - path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.19.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz"; - sha512 = "T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw=="; - }; - } - { - name = "_babel_helper_simple_access___helper_simple_access_7.19.4.tgz"; - path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.19.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz"; - sha512 = "f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg=="; - }; - } - { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.18.9.tgz"; - path = fetchurl { - name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz"; - sha512 = "imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw=="; - }; - } - { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.18.6.tgz"; - path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; - sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; - }; - } - { - name = "_babel_helper_string_parser___helper_string_parser_7.19.4.tgz"; - path = fetchurl { - name = "_babel_helper_string_parser___helper_string_parser_7.19.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz"; - sha512 = "nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw=="; - }; - } - { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; - path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.19.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz"; - sha512 = "awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w=="; - }; - } - { - name = "_babel_helper_validator_option___helper_validator_option_7.18.6.tgz"; - path = fetchurl { - name = "_babel_helper_validator_option___helper_validator_option_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; - sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; - }; - } - { - name = "_babel_helper_wrap_function___helper_wrap_function_7.19.0.tgz"; - path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.19.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz"; - sha512 = "txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg=="; - }; - } - { - name = "_babel_helpers___helpers_7.19.4.tgz"; - path = fetchurl { - name = "_babel_helpers___helpers_7.19.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.4.tgz"; - sha512 = "G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw=="; - }; - } - { - name = "_babel_highlight___highlight_7.18.6.tgz"; - path = fetchurl { - name = "_babel_highlight___highlight_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz"; - sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; - }; - } - { - name = "_babel_parser___parser_7.19.6.tgz"; - path = fetchurl { - name = "_babel_parser___parser_7.19.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.6.tgz"; - sha512 = "h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA=="; - }; - } - { - name = "_babel_parser___parser_7.20.1.tgz"; - path = fetchurl { - name = "_babel_parser___parser_7.20.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.1.tgz"; - sha512 = "hp0AYxaZJhxULfM1zyp7Wgr+pSUKBcP3M+PHnSzWGdXOzg/kHWIgiUWARvubhUKGOEw3xqY4x+lyZ9ytBVcELw=="; - }; - } - { - name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz"; - sha512 = "Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ=="; - }; - } - { - name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz"; - sha512 = "AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg=="; - }; - } - { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.20.1.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.20.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz"; - sha512 = "Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g=="; - }; - } - { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"; - sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; - }; - } - { - name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz"; - sha512 = "+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw=="; - }; - } - { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz"; - sha512 = "1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw=="; - }; - } - { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz"; - sha512 = "k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA=="; - }; - } - { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz"; - sha512 = "lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ=="; - }; - } - { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz"; - sha512 = "128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q=="; - }; - } - { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"; - sha512 = "wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA=="; - }; - } - { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"; - sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; - }; - } - { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.19.4.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.19.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz"; - sha512 = "wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q=="; - }; - } - { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz"; - sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="; - }; - } - { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz"; - sha512 = "v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w=="; - }; - } - { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz"; - sha512 = "nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA=="; - }; - } - { - name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz"; - sha512 = "9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw=="; - }; - } - { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"; - sha512 = "2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w=="; - }; - } - { - name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; - sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; - }; - } - { - name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.12.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; - sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; - }; - } - { - name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.14.5.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_class_static_block___plugin_syntax_class_static_block_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"; - sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; - }; - } - { - name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; - sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; - }; - } - { - name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; - sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; - }; - } - { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz"; - sha512 = "LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A=="; - }; - } - { - name = "_babel_plugin_syntax_import_assertions___plugin_syntax_import_assertions_7.20.0.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_import_assertions___plugin_syntax_import_assertions_7.20.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz"; - sha512 = "IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ=="; - }; - } - { - name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; - sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; - }; - } - { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz"; - sha512 = "6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q=="; - }; - } - { - name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; - sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="; - }; - } - { - name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; - sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; - }; - } - { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; - sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="; - }; - } - { - name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; - sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; - }; - } - { - name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; - sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; - }; - } - { - name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; - sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; - }; - } - { - name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.5.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_private_property_in_object___plugin_syntax_private_property_in_object_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"; - sha512 = "0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg=="; - }; - } - { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz"; - path = fetchurl { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.14.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"; - sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; - }; - } - { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz"; - sha512 = "9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ=="; - }; - } - { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz"; - sha512 = "ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag=="; - }; - } - { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"; - sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; - }; - } - { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.19.4.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.19.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.19.4.tgz"; - sha512 = "934S2VLLlt2hRJwPf4MczaOr4hYF0z+VKPwqTNxyKX7NthTiPfhuKFWQZHXRM0vh/wo/VyXB3s4bZUNA08l+tQ=="; - }; - } - { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.20.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.20.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.0.tgz"; - sha512 = "sXOohbpHZSk7GjxK9b3dKB7CfqUD5DwOH+DggKzOQ7TXYP+RCSbRykfjQmn/zq+rBjycVRtLf9pYhAaEJA786w=="; - }; - } - { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.19.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.19.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz"; - sha512 = "YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A=="; - }; - } - { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz"; - sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; - }; - } - { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.19.4.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.19.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.19.4.tgz"; - sha512 = "t0j0Hgidqf0aM86dF8U+vXYReUgJnlv4bZLsyoPnwZNrGY+7/38o8YjaELrvHeVfTZao15kjR0PVv0nju2iduA=="; - }; - } - { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.20.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.20.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.0.tgz"; - sha512 = "1dIhvZfkDVx/zn2S1aFwlruspTt4189j7fEkH0Y0VyuDM6bQt7bD6kLcz3l4IlLG+e5OReaBz9ROAbttRtUHqA=="; - }; - } - { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"; - sha512 = "6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg=="; - }; - } - { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz"; - sha512 = "d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw=="; - }; - } - { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"; - sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="; - }; - } - { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.19.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.19.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.19.0.tgz"; - sha512 = "sgeMlNaQVbCSpgLSKP4ZZKfsJVnFnNQlUSk6gPYzR/q7tzCgQF2t8RBKAP6cKJeZdveei7Q7Jm527xepI8lNLg=="; - }; - } - { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.18.8.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.18.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz"; - sha512 = "yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ=="; - }; - } - { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz"; - sha512 = "WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ=="; - }; - } - { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz"; - sha512 = "IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg=="; - }; - } - { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"; - sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; - }; - } - { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.19.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.19.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz"; - sha512 = "uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg=="; - }; - } - { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.19.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.19.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz"; - sha512 = "8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ=="; - }; - } - { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.19.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.19.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz"; - sha512 = "fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ=="; - }; - } - { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"; - sha512 = "dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ=="; - }; - } - { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.19.1.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.19.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz"; - sha512 = "oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw=="; - }; - } - { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"; - sha512 = "DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw=="; - }; - } - { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"; - sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; - }; - } - { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.18.8.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.18.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz"; - sha512 = "ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg=="; - }; - } - { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"; - sha512 = "cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg=="; - }; - } - { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz"; - sha512 = "TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA=="; - }; - } - { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.19.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.19.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz"; - sha512 = "UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg=="; - }; - } - { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz"; - sha512 = "poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ=="; - }; - } - { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"; - sha512 = "oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA=="; - }; - } - { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"; - sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; - }; - } - { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.19.0.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.19.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz"; - sha512 = "RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w=="; - }; - } - { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"; - sha512 = "kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q=="; - }; - } - { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz"; - sha512 = "S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA=="; - }; - } - { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.18.9.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.18.9.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz"; - sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; - }; - } - { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.18.10.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.18.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz"; - sha512 = "kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ=="; - }; - } - { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.18.6.tgz"; - path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.18.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"; - sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; - }; - } - { - name = "_babel_preset_env___preset_env_7.19.4.tgz"; - path = fetchurl { - name = "_babel_preset_env___preset_env_7.19.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.19.4.tgz"; - sha512 = "5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg=="; - }; - } - { - name = "_babel_preset_modules___preset_modules_0.1.5.tgz"; - path = fetchurl { - name = "_babel_preset_modules___preset_modules_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz"; - sha512 = "A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA=="; - }; - } - { - name = "_babel_runtime___runtime_7.19.4.tgz"; - path = fetchurl { - name = "_babel_runtime___runtime_7.19.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.4.tgz"; - sha512 = "EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA=="; - }; - } - { - name = "_babel_runtime___runtime_7.20.1.tgz"; - path = fetchurl { - name = "_babel_runtime___runtime_7.20.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.1.tgz"; - sha512 = "mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg=="; - }; - } - { - name = "_babel_runtime___runtime_7.20.13.tgz"; - path = fetchurl { - name = "_babel_runtime___runtime_7.20.13.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.13.tgz"; - sha512 = "gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA=="; - }; - } - { - name = "_babel_template___template_7.18.10.tgz"; - path = fetchurl { - name = "_babel_template___template_7.18.10.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz"; - sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; - }; - } - { - name = "_babel_traverse___traverse_7.19.6.tgz"; - path = fetchurl { - name = "_babel_traverse___traverse_7.19.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.6.tgz"; - sha512 = "6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ=="; - }; - } - { - name = "_babel_traverse___traverse_7.20.1.tgz"; - path = fetchurl { - name = "_babel_traverse___traverse_7.20.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.1.tgz"; - sha512 = "d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA=="; - }; - } - { - name = "_babel_types___types_7.19.4.tgz"; - path = fetchurl { - name = "_babel_types___types_7.19.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.19.4.tgz"; - sha512 = "M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw=="; - }; - } - { - name = "_babel_types___types_7.20.0.tgz"; - path = fetchurl { - name = "_babel_types___types_7.20.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.20.0.tgz"; - sha512 = "Jlgt3H0TajCW164wkTOTzHkZb075tMQMULzrLUoUeKmO7eFL96GgDxf7/Axhc5CAuKE3KFyVW1p6ysKsi2oXAg=="; - }; - } - { - name = "_codemirror_commands___commands_6.1.2.tgz"; - path = fetchurl { - name = "_codemirror_commands___commands_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/@codemirror/commands/-/commands-6.1.2.tgz"; - sha512 = "sO3jdX1s0pam6lIdeSJLMN3DQ6mPEbM4yLvyKkdqtmd/UDwhXA5+AwFJ89rRXm6vTeOXBsE5cAmlos/t7MJdgg=="; - }; - } - { - name = "_codemirror_lang_json___lang_json_6.0.0.tgz"; - path = fetchurl { - name = "_codemirror_lang_json___lang_json_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/@codemirror/lang-json/-/lang-json-6.0.0.tgz"; - sha512 = "DvTcYTKLmg2viADXlTdufrT334M9jowe1qO02W28nvm+nejcvhM5vot5mE8/kPrxYw/HJHhwu1z2PyBpnMLCNQ=="; - }; - } - { - name = "_codemirror_language___language_6.2.1.tgz"; - path = fetchurl { - name = "_codemirror_language___language_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/@codemirror/language/-/language-6.2.1.tgz"; - sha512 = "MC3svxuvIj0MRpFlGHxLS6vPyIdbTr2KKPEW46kCoCXw2ktb4NTkpkPBI/lSP/FoNXLCBJ0mrnUi1OoZxtpW1Q=="; - }; - } - { - name = "_codemirror_lint___lint_6.0.0.tgz"; - path = fetchurl { - name = "_codemirror_lint___lint_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/@codemirror/lint/-/lint-6.0.0.tgz"; - sha512 = "nUUXcJW1Xp54kNs+a1ToPLK8MadO0rMTnJB8Zk4Z8gBdrN0kqV7uvUraU/T2yqg+grDNR38Vmy/MrhQN/RgwiA=="; - }; - } - { - name = "_codemirror_state___state_6.1.2.tgz"; - path = fetchurl { - name = "_codemirror_state___state_6.1.2.tgz"; - url = "https://registry.yarnpkg.com/@codemirror/state/-/state-6.1.2.tgz"; - sha512 = "Mxff85Hp5va+zuj+H748KbubXjrinX/k28lj43H14T2D0+4kuvEFIEIO7hCEcvBT8ubZyIelt9yGOjj2MWOEQA=="; - }; - } - { - name = "_codemirror_theme_one_dark___theme_one_dark_6.1.0.tgz"; - path = fetchurl { - name = "_codemirror_theme_one_dark___theme_one_dark_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/@codemirror/theme-one-dark/-/theme-one-dark-6.1.0.tgz"; - sha512 = "AiTHtFRu8+vWT9wWUWDM+cog6ZwgivJogB1Tm/g40NIpLwph7AnmxrSzWfvJN5fBVufsuwBxecQCNmdcR5D7Aw=="; - }; - } - { - name = "_codemirror_view___view_6.4.0.tgz"; - path = fetchurl { - name = "_codemirror_view___view_6.4.0.tgz"; - url = "https://registry.yarnpkg.com/@codemirror/view/-/view-6.4.0.tgz"; - sha512 = "Kv32b6Tn7QVwFbj/EDswTLSocjk5kgggF6zzBFAL4o4hZ/vmtFD155+EjH1pVlbfoDyVC2M6SedPsMrwYscgNg=="; - }; - } - { - name = "_cspotcode_source_map_support___source_map_support_0.8.1.tgz"; - path = fetchurl { - name = "_cspotcode_source_map_support___source_map_support_0.8.1.tgz"; - url = "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz"; - sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="; - }; - } - { - name = "_csstools_selector_specificity___selector_specificity_2.0.2.tgz"; - path = fetchurl { - name = "_csstools_selector_specificity___selector_specificity_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz"; - sha512 = "IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg=="; - }; - } - { - name = "_esbuild_android_arm64___android_arm64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_android_arm64___android_arm64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.4.tgz"; - sha512 = "VPuTzXFm/m2fcGfN6CiwZTlLzxrKsWbPkG7ArRFpuxyaHUm/XFHQPD4xNwZT6uUmpIHhnSjcaCmcla8COzmZ5Q=="; - }; - } - { - name = "_esbuild_android_arm___android_arm_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_android_arm___android_arm_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.4.tgz"; - sha512 = "rZzb7r22m20S1S7ufIc6DC6W659yxoOrl7sKP1nCYhuvUlnCFHVSbATG4keGUtV8rDz11sRRDbWkvQZpzPaHiw=="; - }; - } - { - name = "_esbuild_android_x64___android_x64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_android_x64___android_x64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.4.tgz"; - sha512 = "MW+B2O++BkcOfMWmuHXB15/l1i7wXhJFqbJhp82IBOais8RBEQv2vQz/jHrDEHaY2X0QY7Wfw86SBL2PbVOr0g=="; - }; - } - { - name = "_esbuild_darwin_arm64___darwin_arm64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_darwin_arm64___darwin_arm64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.4.tgz"; - sha512 = "a28X1O//aOfxwJVZVs7ZfM8Tyih2Za4nKJrBwW5Wm4yKsnwBy9aiS/xwpxiiTRttw3EaTg4Srerhcm6z0bu9Wg=="; - }; - } - { - name = "_esbuild_darwin_x64___darwin_x64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_darwin_x64___darwin_x64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.4.tgz"; - sha512 = "e3doCr6Ecfwd7VzlaQqEPrnbvvPjE9uoTpxG5pyLzr2rI2NMjDHmvY1E5EO81O/e9TUOLLkXA5m6T8lfjK9yAA=="; - }; - } - { - name = "_esbuild_freebsd_arm64___freebsd_arm64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_freebsd_arm64___freebsd_arm64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.4.tgz"; - sha512 = "Oup3G/QxBgvvqnXWrBed7xxkFNwAwJVHZcklWyQt7YCAL5bfUkaa6FVWnR78rNQiM8MqqLiT6ZTZSdUFuVIg1w=="; - }; - } - { - name = "_esbuild_freebsd_x64___freebsd_x64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_freebsd_x64___freebsd_x64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.4.tgz"; - sha512 = "vAP+eYOxlN/Bpo/TZmzEQapNS8W1njECrqkTpNgvXskkkJC2AwOXwZWai/Kc2vEFZUXQttx6UJbj9grqjD/+9Q=="; - }; - } - { - name = "_esbuild_linux_arm64___linux_arm64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_linux_arm64___linux_arm64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.4.tgz"; - sha512 = "2zXoBhv4r5pZiyjBKrOdFP4CXOChxXiYD50LRUU+65DkdS5niPFHbboKZd/c81l0ezpw7AQnHeoCy5hFrzzs4g=="; - }; - } - { - name = "_esbuild_linux_arm___linux_arm_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_linux_arm___linux_arm_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.4.tgz"; - sha512 = "A47ZmtpIPyERxkSvIv+zLd6kNIOtJH03XA0Hy7jaceRDdQaQVGSDt4mZqpWqJYgDk9rg96aglbF6kCRvPGDSUA=="; - }; - } - { - name = "_esbuild_linux_ia32___linux_ia32_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_linux_ia32___linux_ia32_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.4.tgz"; - sha512 = "uxdSrpe9wFhz4yBwt2kl2TxS/NWEINYBUFIxQtaEVtglm1eECvsj1vEKI0KX2k2wCe17zDdQ3v+jVxfwVfvvjw=="; - }; - } - { - name = "_esbuild_linux_loong64___linux_loong64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_linux_loong64___linux_loong64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.4.tgz"; - sha512 = "peDrrUuxbZ9Jw+DwLCh/9xmZAk0p0K1iY5d2IcwmnN+B87xw7kujOkig6ZRcZqgrXgeRGurRHn0ENMAjjD5DEg=="; - }; - } - { - name = "_esbuild_linux_mips64el___linux_mips64el_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_linux_mips64el___linux_mips64el_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.4.tgz"; - sha512 = "sD9EEUoGtVhFjjsauWjflZklTNr57KdQ6xfloO4yH1u7vNQlOfAlhEzbyBKfgbJlW7rwXYBdl5/NcZ+Mg2XhQA=="; - }; - } - { - name = "_esbuild_linux_ppc64___linux_ppc64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_linux_ppc64___linux_ppc64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.4.tgz"; - sha512 = "X1HSqHUX9D+d0l6/nIh4ZZJ94eQky8d8z6yxAptpZE3FxCWYWvTDd9X9ST84MGZEJx04VYUD/AGgciddwO0b8g=="; - }; - } - { - name = "_esbuild_linux_riscv64___linux_riscv64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_linux_riscv64___linux_riscv64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.4.tgz"; - sha512 = "97ANpzyNp0GTXCt6SRdIx1ngwncpkV/z453ZuxbnBROCJ5p/55UjhbaG23UdHj88fGWLKPFtMoU4CBacz4j9FA=="; - }; - } - { - name = "_esbuild_linux_s390x___linux_s390x_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_linux_s390x___linux_s390x_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.16.4.tgz"; - sha512 = "pUvPQLPmbEeJRPjP0DYTC1vjHyhrnCklQmCGYbipkep+oyfTn7GTBJXoPodR7ZS5upmEyc8lzAkn2o29wD786A=="; - }; - } - { - name = "_esbuild_linux_x64___linux_x64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_linux_x64___linux_x64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.16.4.tgz"; - sha512 = "N55Q0mJs3Sl8+utPRPBrL6NLYZKBCLLx0bme/+RbjvMforTGGzFvsRl4xLTZMUBFC1poDzBEPTEu5nxizQ9Nlw=="; - }; - } - { - name = "_esbuild_netbsd_x64___netbsd_x64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_netbsd_x64___netbsd_x64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.4.tgz"; - sha512 = "LHSJLit8jCObEQNYkgsDYBh2JrJT53oJO2HVdkSYLa6+zuLJh0lAr06brXIkljrlI+N7NNW1IAXGn/6IZPi3YQ=="; - }; - } - { - name = "_esbuild_openbsd_x64___openbsd_x64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_openbsd_x64___openbsd_x64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.4.tgz"; - sha512 = "nLgdc6tWEhcCFg/WVFaUxHcPK3AP/bh+KEwKtl69Ay5IBqUwKDaq/6Xk0E+fh/FGjnLwqFSsarsbPHeKM8t8Sw=="; - }; - } - { - name = "_esbuild_sunos_x64___sunos_x64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_sunos_x64___sunos_x64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.16.4.tgz"; - sha512 = "08SluG24GjPO3tXKk95/85n9kpyZtXCVwURR2i4myhrOfi3jspClV0xQQ0W0PYWHioJj+LejFMt41q+PG3mlAQ=="; - }; - } - { - name = "_esbuild_win32_arm64___win32_arm64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_win32_arm64___win32_arm64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.16.4.tgz"; - sha512 = "yYiRDQcqLYQSvNQcBKN7XogbrSvBE45FEQdH8fuXPl7cngzkCvpsG2H9Uey39IjQ6gqqc+Q4VXYHsQcKW0OMjQ=="; - }; - } - { - name = "_esbuild_win32_ia32___win32_ia32_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_win32_ia32___win32_ia32_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.16.4.tgz"; - sha512 = "5rabnGIqexekYkh9zXG5waotq8mrdlRoBqAktjx2W3kb0zsI83mdCwrcAeKYirnUaTGztR5TxXcXmQrEzny83w=="; - }; - } - { - name = "_esbuild_win32_x64___win32_x64_0.16.4.tgz"; - path = fetchurl { - name = "_esbuild_win32_x64___win32_x64_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.4.tgz"; - sha512 = "sN/I8FMPtmtT2Yw+Dly8Ur5vQ5a/RmC8hW7jO9PtPSQUPkowxWpcUZnqOggU7VwyT3Xkj6vcXWd3V/qTXwultQ=="; - }; - } - { - name = "_eslint_eslintrc___eslintrc_1.4.1.tgz"; - path = fetchurl { - name = "_eslint_eslintrc___eslintrc_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.1.tgz"; - sha512 = "XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA=="; - }; - } - { - name = "_formkit_core___core_1.0.0_beta.13_c578106.tgz"; - path = fetchurl { - name = "_formkit_core___core_1.0.0_beta.13_c578106.tgz"; - url = "https://registry.yarnpkg.com/@formkit/core/-/core-1.0.0-beta.13-c578106.tgz"; - sha512 = "VxpegiuoDHRqPha2vHl0GbFg7F5qZd75P7HSkdOy036vPOW0AIgRyWfJg435zOqAIFuCJIZLEcRn221UPMIQsw=="; - }; - } - { - name = "_formkit_core___core_1.0.0_beta.9_f64c966.tgz"; - path = fetchurl { - name = "_formkit_core___core_1.0.0_beta.9_f64c966.tgz"; - url = "https://registry.yarnpkg.com/@formkit/core/-/core-1.0.0-beta.9-f64c966.tgz"; - sha512 = "EOUlP129AhGR6CgUIHlc1L9zkBfuHf3GGr/6s3m2r2CFlfgFEu3/cVeIUQtc75MpfLtfnLOk1cNW+z1vKfcOJQ=="; - }; - } - { - name = "_formkit_dev___dev_1.0.0_beta.13_c578106.tgz"; - path = fetchurl { - name = "_formkit_dev___dev_1.0.0_beta.13_c578106.tgz"; - url = "https://registry.yarnpkg.com/@formkit/dev/-/dev-1.0.0-beta.13-c578106.tgz"; - sha512 = "vVBStwI3CgEapwqQN2i9LCVfxaascebqLV/qO2sZds7DSaBB0iGXVrvN776uyue4qUwqTGXnn66Jh36d4w+8cw=="; - }; - } - { - name = "_formkit_i18n___i18n_1.0.0_beta.13_c578106.tgz"; - path = fetchurl { - name = "_formkit_i18n___i18n_1.0.0_beta.13_c578106.tgz"; - url = "https://registry.yarnpkg.com/@formkit/i18n/-/i18n-1.0.0-beta.13-c578106.tgz"; - sha512 = "Jfn7vTeZdbg/JF+OSVYGqZpYlp8A1q5WY7LwjyBeULa62cryGt+kDoT+unBV0t04u2YBjc/2OUi/VYOyKUCbeA=="; - }; - } - { - name = "_formkit_inputs___inputs_1.0.0_beta.13_c578106.tgz"; - path = fetchurl { - name = "_formkit_inputs___inputs_1.0.0_beta.13_c578106.tgz"; - url = "https://registry.yarnpkg.com/@formkit/inputs/-/inputs-1.0.0-beta.13-c578106.tgz"; - sha512 = "wVVbvIpUW8ygQgpCI6/WVv1TogxLgC/dcug0B1RbROrLHYWZoqifYMUX1riLy77/XNuJDBeFvQ6cN1u8GS2kCQ=="; - }; - } - { - name = "_formkit_observer___observer_1.0.0_beta.13_c578106.tgz"; - path = fetchurl { - name = "_formkit_observer___observer_1.0.0_beta.13_c578106.tgz"; - url = "https://registry.yarnpkg.com/@formkit/observer/-/observer-1.0.0-beta.13-c578106.tgz"; - sha512 = "9Bm51emD1FjdD6cxpdkIlslnhctTRtmdYVkIAqGfbiVXKIyBAA7yt9cqEF1zHuvEGjhwec21Ic/vR7BXr9O/8w=="; - }; - } - { - name = "_formkit_rules___rules_1.0.0_beta.13_c578106.tgz"; - path = fetchurl { - name = "_formkit_rules___rules_1.0.0_beta.13_c578106.tgz"; - url = "https://registry.yarnpkg.com/@formkit/rules/-/rules-1.0.0-beta.13-c578106.tgz"; - sha512 = "TYWSu12A539jaGmQkRCAYYawKaeiVGLdXv0s70cv/AsowBi+NPTcS7OabyYri6OidByvwLqqUF00Nk290mB14w=="; - }; - } - { - name = "_formkit_tailwindcss___tailwindcss_1.0.0_beta.9_f64c966.tgz"; - path = fetchurl { - name = "_formkit_tailwindcss___tailwindcss_1.0.0_beta.9_f64c966.tgz"; - url = "https://registry.yarnpkg.com/@formkit/tailwindcss/-/tailwindcss-1.0.0-beta.9-f64c966.tgz"; - sha512 = "U4uLNPmdkbX3xQZiDmYaSgtImyNNgqEccfgbH85eoCeHkJD7r6BhjPCTdYnSh/8NoGGLX0rp0rcyO42aB+uNwQ=="; - }; - } - { - name = "_formkit_themes___themes_1.0.0_beta.13_c578106.tgz"; - path = fetchurl { - name = "_formkit_themes___themes_1.0.0_beta.13_c578106.tgz"; - url = "https://registry.yarnpkg.com/@formkit/themes/-/themes-1.0.0-beta.13-c578106.tgz"; - sha512 = "Cu/FS6E9oWOtsCfjgSBkC3Jq/Wx5EECnbA40qF1uqLBFZb4+g5qYfMPyxMYDunFEkKEKzbaKybA1wCj2krNiuw=="; - }; - } - { - name = "_formkit_themes___themes_1.0.0_beta.9_f64c966.tgz"; - path = fetchurl { - name = "_formkit_themes___themes_1.0.0_beta.9_f64c966.tgz"; - url = "https://registry.yarnpkg.com/@formkit/themes/-/themes-1.0.0-beta.9-f64c966.tgz"; - sha512 = "Iy/9KoNAZfB/MI6HUfsuxSg8+Ys2veuXoyJNr5AaNDRfzihrv3wIIv1nZuonXgQm3X7+mnfrSybBcXPtqnKU7Q=="; - }; - } - { - name = "_formkit_utils___utils_1.0.0_beta.13_c578106.tgz"; - path = fetchurl { - name = "_formkit_utils___utils_1.0.0_beta.13_c578106.tgz"; - url = "https://registry.yarnpkg.com/@formkit/utils/-/utils-1.0.0-beta.13-c578106.tgz"; - sha512 = "BXRJSKM+gK/fIepEtuEiaDFFQHKAp76+z0w36Vor3TDmv/aLn7cnTOZA6YDLtkdm0ps34zjIh+fGtHsWyCKFfA=="; - }; - } - { - name = "_formkit_utils___utils_1.0.0_beta.9_f64c966.tgz"; - path = fetchurl { - name = "_formkit_utils___utils_1.0.0_beta.9_f64c966.tgz"; - url = "https://registry.yarnpkg.com/@formkit/utils/-/utils-1.0.0-beta.9-f64c966.tgz"; - sha512 = "MPldWKsqmabj7LzMOlha0G6Fn+a6hShc7jyiF1j0P9rJdj9lYyk7t286co4CxqhQNgOpU0XOv7FZroq8k6clzQ=="; - }; - } - { - name = "_formkit_validation___validation_1.0.0_beta.13_c578106.tgz"; - path = fetchurl { - name = "_formkit_validation___validation_1.0.0_beta.13_c578106.tgz"; - url = "https://registry.yarnpkg.com/@formkit/validation/-/validation-1.0.0-beta.13-c578106.tgz"; - sha512 = "AQ5VAbFXJ8twRbd4YsKMbyj2k/xeOh4OIiyGEkBktejb/e0NGmxtsFXDGOWOMSZWpTR/nsBy6mlC2U/ifZqW4A=="; - }; - } - { - name = "_formkit_vue___vue_1.0.0_beta.13_c578106.tgz"; - path = fetchurl { - name = "_formkit_vue___vue_1.0.0_beta.13_c578106.tgz"; - url = "https://registry.yarnpkg.com/@formkit/vue/-/vue-1.0.0-beta.13-c578106.tgz"; - sha512 = "v/iJrDMfQ/0TOoJiG8ft/csW0Yq0wJqi/l6ToLZI8zHQ8tW0Y4//wSv5ofa9Th7aFwPIRoC2KaC65ox8dVBwSQ=="; - }; - } - { - name = "_graphql_codegen_add___add_3.2.1.tgz"; - path = fetchurl { - name = "_graphql_codegen_add___add_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-3.2.1.tgz"; - sha512 = "w82H/evh8SSGoD3K6K/Oh3kqSdbuU+TgHqMYmmHFxtH692v2xhN/cu1s/TotBQ7r4mO7OQutze7dde2tZEXGEQ=="; - }; - } - { - name = "_graphql_codegen_cli___cli_3.0.0.tgz"; - path = fetchurl { - name = "_graphql_codegen_cli___cli_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-3.0.0.tgz"; - sha512 = "16nuFabHCfPQ/d+v52OvR1ueL8eiJvS/nRuvuEV8d9T1fkborHKRw4lhyKVebu9izFBs6G0CvVCLhgVzQwHSLw=="; - }; - } - { - name = "_graphql_codegen_core___core_3.0.0.tgz"; - path = fetchurl { - name = "_graphql_codegen_core___core_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-3.0.0.tgz"; - sha512 = "WUfAUTmUcgeHPR7F5ZQqaBqJLJb5+3Lvp6v9SrnupKOFed+Q3u8CvZL6sPTvDpqqW8Ucjy59DEZqumPLp99pdQ=="; - }; - } - { - name = "_graphql_codegen_introspection___introspection_3.0.0.tgz"; - path = fetchurl { - name = "_graphql_codegen_introspection___introspection_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@graphql-codegen/introspection/-/introspection-3.0.0.tgz"; - sha512 = "PwHPcCg3svkLhcBd88KDHVpj0FuWMPfbx8RxTnLIH6jFyI5QkSSctQavGLO0o4IYiiQjgftEcfbNRtadvEmxtg=="; - }; - } - { - name = "_graphql_codegen_near_operation_file_preset___near_operation_file_preset_2.5.0.tgz"; - path = fetchurl { - name = "_graphql_codegen_near_operation_file_preset___near_operation_file_preset_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/@graphql-codegen/near-operation-file-preset/-/near-operation-file-preset-2.5.0.tgz"; - sha512 = "S9PNJP5tTkUWBQ6inbviOsTREzsMxYVqJGrtPcIdMWkKLZAAItAfAb60klB1T64vt6Oru+nUf8IYUNrchJ8MYg=="; - }; - } - { - name = "_graphql_codegen_plugin_helpers___plugin_helpers_2.7.1.tgz"; - path = fetchurl { - name = "_graphql_codegen_plugin_helpers___plugin_helpers_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-2.7.1.tgz"; - sha512 = "wpEShhwbQp8pqXolnSCNaj0pU91LbuBvYHpYqm96TUqyeKQYAYRVmw3JIt0g8UQpKYhg8lYIDwWdcINOYqkGLg=="; - }; - } - { - name = "_graphql_codegen_plugin_helpers___plugin_helpers_2.7.2.tgz"; - path = fetchurl { - name = "_graphql_codegen_plugin_helpers___plugin_helpers_2.7.2.tgz"; - url = "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-2.7.2.tgz"; - sha512 = "kln2AZ12uii6U59OQXdjLk5nOlh1pHis1R98cDZGFnfaiAbX9V3fxcZ1MMJkB7qFUymTALzyjZoXXdyVmPMfRg=="; - }; - } - { - name = "_graphql_codegen_plugin_helpers___plugin_helpers_3.1.2.tgz"; - path = fetchurl { - name = "_graphql_codegen_plugin_helpers___plugin_helpers_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-3.1.2.tgz"; - sha512 = "emOQiHyIliVOIjKVKdsI5MXj312zmRDwmHpyUTZMjfpvxq/UVAHUJIVdVf+lnjjrI+LXBTgMlTWTgHQfmICxjg=="; - }; - } - { - name = "_graphql_codegen_plugin_helpers___plugin_helpers_4.0.0.tgz"; - path = fetchurl { - name = "_graphql_codegen_plugin_helpers___plugin_helpers_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-4.0.0.tgz"; - sha512 = "vgNGTanT36hC4RAC/LAThMEjDvnu3WCyx6MtKZcPUtfCWFxbUAr88+OarGl1LAEiOef0agIREC7tIBXCqjKkJA=="; - }; - } - { - name = "_graphql_codegen_schema_ast___schema_ast_3.0.0.tgz"; - path = fetchurl { - name = "_graphql_codegen_schema_ast___schema_ast_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-3.0.0.tgz"; - sha512 = "5gC8nNk/bxufS2LBSpaPExRgn6eNo8LQdtwDtwfM9XGEzt/F6rIBQoyOmqqwkiBmgu1PHHH8kLZMBYvYB1x5DA=="; - }; - } - { - name = "_graphql_codegen_typescript_operations___typescript_operations_3.0.0.tgz"; - path = fetchurl { - name = "_graphql_codegen_typescript_operations___typescript_operations_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-3.0.0.tgz"; - sha512 = "t+Lk+lxkUFDh6F0t8CErowOccP3bZwxhl66qmEeBcOrC7jQrSCnRZoFvOXhFKFBJe/y4DIJiizgSr34AqjiJIQ=="; - }; - } - { - name = "_graphql_codegen_typescript_vue_apollo___typescript_vue_apollo_3.3.7.tgz"; - path = fetchurl { - name = "_graphql_codegen_typescript_vue_apollo___typescript_vue_apollo_3.3.7.tgz"; - url = "https://registry.yarnpkg.com/@graphql-codegen/typescript-vue-apollo/-/typescript-vue-apollo-3.3.7.tgz"; - sha512 = "vb5gR5B+5gvMtXUG/fnLzPz+QM3aeeVezCRKygeOrHorA9sPtRLKH54FHeQzRCMp0Sbz36jdljpe/LaFoDiiDw=="; - }; - } - { - name = "_graphql_codegen_typescript___typescript_3.0.0.tgz"; - path = fetchurl { - name = "_graphql_codegen_typescript___typescript_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-3.0.0.tgz"; - sha512 = "FQWyuIUy1y+fxb9+EZfvdBHBQpYExlIBHV5sg2WGNCsyVyCqBTl0mO8icyOtsQPVg6YFMFe8JJO69vQbwHma5w=="; - }; - } - { - name = "_graphql_codegen_visitor_plugin_common___visitor_plugin_common_2.13.1.tgz"; - path = fetchurl { - name = "_graphql_codegen_visitor_plugin_common___visitor_plugin_common_2.13.1.tgz"; - url = "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-2.13.1.tgz"; - sha512 = "mD9ufZhDGhyrSaWQGrU1Q1c5f01TeWtSWy/cDwXYjJcHIj1Y/DG2x0tOflEfCvh5WcnmHNIw4lzDsg1W7iFJEg=="; - }; - } - { - name = "_graphql_codegen_visitor_plugin_common___visitor_plugin_common_3.0.0.tgz"; - path = fetchurl { - name = "_graphql_codegen_visitor_plugin_common___visitor_plugin_common_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-3.0.0.tgz"; - sha512 = "ZoNlCmmkGClB137SpJT9og/nkihLN7Z4Ynl9Ir3OlbDuI20dbpyXsclpr9QGLcxEcfQeVfhGw9CooW7wZJJ8LA=="; - }; - } - { - name = "_graphql_tools_apollo_engine_loader___apollo_engine_loader_7.3.13.tgz"; - path = fetchurl { - name = "_graphql_tools_apollo_engine_loader___apollo_engine_loader_7.3.13.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-7.3.13.tgz"; - sha512 = "fr2TcA9fM+H81ymdtyDaocZ/Ua4Vhhf1IvpQoPpuEUwLorREd86N8VORUEIBvEdJ1b7Bz7NqwL3RnM5m9KXftA=="; - }; - } - { - name = "_graphql_tools_batch_execute___batch_execute_8.5.15.tgz"; - path = fetchurl { - name = "_graphql_tools_batch_execute___batch_execute_8.5.15.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.5.15.tgz"; - sha512 = "qb12M8XCK6SBJmZDS8Lzd4PVJFsIwNUkYmFuqcTiBqOI/WsoDlQDZI++ghRpGcusLkL9uzcIOTT/61OeHhsaLg=="; - }; - } - { - name = "_graphql_tools_batch_execute___batch_execute_8.5.6.tgz"; - path = fetchurl { - name = "_graphql_tools_batch_execute___batch_execute_8.5.6.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/batch-execute/-/batch-execute-8.5.6.tgz"; - sha512 = "33vMvVDLBKsNJVNhcySVXF+zkcRL/GRs1Lt+MxygrYCypcAPpFm+amE2y9vOCFufuaKExIX7Lonnmxu19vPzaQ=="; - }; - } - { - name = "_graphql_tools_code_file_loader___code_file_loader_7.3.20.tgz"; - path = fetchurl { - name = "_graphql_tools_code_file_loader___code_file_loader_7.3.20.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/code-file-loader/-/code-file-loader-7.3.20.tgz"; - sha512 = "htwylU+/if5j5rgrd/i2xgM22cWC2RGgUGO7K+nxZU+l7iCimJUdDQnqCW9G3eVHbLpVOhyza9bBUNMPzh3sxg=="; - }; - } - { - name = "_graphql_tools_delegate___delegate_9.0.22.tgz"; - path = fetchurl { - name = "_graphql_tools_delegate___delegate_9.0.22.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-9.0.22.tgz"; - sha512 = "dWJGMN8V7KORtbI8eDAjHYTWiMyis/md27M6pPhrlYVlcsDk3U0jbNdgkswBBUEBvqumPRCv8pVOxKcLS4caKA=="; - }; - } - { - name = "_graphql_tools_delegate___delegate_9.0.8.tgz"; - path = fetchurl { - name = "_graphql_tools_delegate___delegate_9.0.8.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/delegate/-/delegate-9.0.8.tgz"; - sha512 = "h+Uce0Np0eKj7wILOvlffRQ9jEQ4KelNXfqG8A2w+2sO2P6CbKsR7bJ4ch9lcUdCBbZ4Wg6L/K+1C4NRFfzbNw=="; - }; - } - { - name = "_graphql_tools_executor_graphql_ws___executor_graphql_ws_0.0.6.tgz"; - path = fetchurl { - name = "_graphql_tools_executor_graphql_ws___executor_graphql_ws_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-0.0.6.tgz"; - sha512 = "n6JvIviYO8iiasV/baclimQqNkYGP7JRlkNSnphNG5LULmVpQ2WsyvbgJHV7wtlTZ8ZQ3+dILgQF83PFyLsfdA=="; - }; - } - { - name = "_graphql_tools_executor_http___executor_http_0.1.0.tgz"; - path = fetchurl { - name = "_graphql_tools_executor_http___executor_http_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/executor-http/-/executor-http-0.1.0.tgz"; - sha512 = "HUas+3EIqbw/reNH3NaO8/5Cc61ZxsoIArES55kR6Nq8lS8VWiEpnuXLXBq2THYemmthVdK3eDCKTJLmUFuKdA=="; - }; - } - { - name = "_graphql_tools_executor_legacy_ws___executor_legacy_ws_0.0.6.tgz"; - path = fetchurl { - name = "_graphql_tools_executor_legacy_ws___executor_legacy_ws_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-0.0.6.tgz"; - sha512 = "L1hRuSvBUCNerYDhfeSZXFeqliDlnNXa3fDHTp7efI3Newpbevqa19Fm0mVzsCL7gqIKOwzrPORwh7kOVE/vew=="; - }; - } - { - name = "_graphql_tools_executor___executor_0.0.12.tgz"; - path = fetchurl { - name = "_graphql_tools_executor___executor_0.0.12.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/executor/-/executor-0.0.12.tgz"; - sha512 = "bWpZcYRo81jDoTVONTnxS9dDHhEkNVjxzvFCH4CRpuyzD3uL+5w3MhtxIh24QyWm4LvQ4f+Bz3eMV2xU2I5+FA=="; - }; - } - { - name = "_graphql_tools_git_loader___git_loader_7.2.16.tgz"; - path = fetchurl { - name = "_graphql_tools_git_loader___git_loader_7.2.16.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/git-loader/-/git-loader-7.2.16.tgz"; - sha512 = "8DsxYfSouhgKPOBcc7MzuOTM4M/j2UNFn2ehXD0MX9q41t3dKffufJZKsKxE6VyyCUoVYdlRFhUWEyOHPVdcfQ=="; - }; - } - { - name = "_graphql_tools_github_loader___github_loader_7.3.23.tgz"; - path = fetchurl { - name = "_graphql_tools_github_loader___github_loader_7.3.23.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/github-loader/-/github-loader-7.3.23.tgz"; - sha512 = "oYTZCvW520KNVVonjucDSMhabCFnHwtM1rJbyUkA1JFyzpmmNAAyNMWOOPcU/Q9rTESrsH+Hbja0mfpjpnBKLA=="; - }; - } - { - name = "_graphql_tools_graphql_file_loader___graphql_file_loader_7.5.5.tgz"; - path = fetchurl { - name = "_graphql_tools_graphql_file_loader___graphql_file_loader_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.5.5.tgz"; - sha512 = "OL+7qO1S66TpMK7OGz8Ag2WL08HlxKxrObVSDlxzWbSubWuXM5v959XscYAKRf6daYcVpkfNvO37QjflL9mjhg=="; - }; - } - { - name = "_graphql_tools_graphql_tag_pluck___graphql_tag_pluck_7.4.3.tgz"; - path = fetchurl { - name = "_graphql_tools_graphql_tag_pluck___graphql_tag_pluck_7.4.3.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-7.4.3.tgz"; - sha512 = "w+nrJVQw+NTuaZNQG5AwSh4Qe+urP/s4rUz5s1T007rDnv1kvkiX+XHOCnIfJzXOTuvFmG4GGYw/x0CuSRaGZQ=="; - }; - } - { - name = "_graphql_tools_graphql_tag_pluck___graphql_tag_pluck_7.4.6.tgz"; - path = fetchurl { - name = "_graphql_tools_graphql_tag_pluck___graphql_tag_pluck_7.4.6.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-7.4.6.tgz"; - sha512 = "KPlkrC+WtJAg/Sv93rPiDHZDsgQDIZEy9ViHqz80KdRvq0aeQN9TGp26mQCyD7zo1Ib2paT16IVwTNQf02yxpQ=="; - }; - } - { - name = "_graphql_tools_import___import_6.7.6.tgz"; - path = fetchurl { - name = "_graphql_tools_import___import_6.7.6.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/import/-/import-6.7.6.tgz"; - sha512 = "WtUyiO2qCaK/H4u81zAw/NbBvCOzwKl4N+Vl+FqrFCzYobscwL6x6roePyoXM1O3+JJIIn3CETv4kg4kwxaBVw=="; - }; - } - { - name = "_graphql_tools_json_file_loader___json_file_loader_7.4.6.tgz"; - path = fetchurl { - name = "_graphql_tools_json_file_loader___json_file_loader_7.4.6.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/json-file-loader/-/json-file-loader-7.4.6.tgz"; - sha512 = "34AfjCitO4NtJ5AcXYLcFF3GDsMVTycrljSaBA2t1d7B4bMPtREDphKXLMc/Uf2zW6IW1i1sZZyrcmArPy1Z8A=="; - }; - } - { - name = "_graphql_tools_load___load_7.8.0.tgz"; - path = fetchurl { - name = "_graphql_tools_load___load_7.8.0.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/load/-/load-7.8.0.tgz"; - sha512 = "l4FGgqMW0VOqo+NMYizwV8Zh+KtvVqOf93uaLo9wJ3sS3y/egPCgxPMDJJ/ufQZG3oZ/0oWeKt68qop3jY0yZg=="; - }; - } - { - name = "_graphql_tools_load___load_7.8.11.tgz"; - path = fetchurl { - name = "_graphql_tools_load___load_7.8.11.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/load/-/load-7.8.11.tgz"; - sha512 = "pVn3fYP/qZ3m2NE86gSexyZpEmvTSUe+OIRfWBM60a4L/SycMxgVfYB5+PyDCzruFZg/didIG3v7RfPlZ7zNTQ=="; - }; - } - { - name = "_graphql_tools_merge___merge_8.3.15.tgz"; - path = fetchurl { - name = "_graphql_tools_merge___merge_8.3.15.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.15.tgz"; - sha512 = "hYYOlsqkUlL6oOo7zzuk6hIv7xQzy+x21sgK84d5FWaiWYkLYh9As8myuDd9SD5xovWWQ9m/iRhIOVDEMSyEKA=="; - }; - } - { - name = "_graphql_tools_merge___merge_8.3.17.tgz"; - path = fetchurl { - name = "_graphql_tools_merge___merge_8.3.17.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.17.tgz"; - sha512 = "CLzz49lc6BavPhH9gPRm0sJeNA7kC/tF/jLUTQsyef6xj82Jw3rqIJ9PE+bk1cqPCOG01WLOfquBu445OMDO2g=="; - }; - } - { - name = "_graphql_tools_merge___merge_8.3.6.tgz"; - path = fetchurl { - name = "_graphql_tools_merge___merge_8.3.6.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.3.6.tgz"; - sha512 = "uUBokxXi89bj08P+iCvQk3Vew4vcfL5ZM6NTylWi8PIpoq4r5nJ625bRuN8h2uubEdRiH8ntN9M4xkd/j7AybQ=="; - }; - } - { - name = "_graphql_tools_optimize___optimize_1.3.1.tgz"; - path = fetchurl { - name = "_graphql_tools_optimize___optimize_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/optimize/-/optimize-1.3.1.tgz"; - sha512 = "5j5CZSRGWVobt4bgRRg7zhjPiSimk+/zIuColih8E8DxuFOaJ+t0qu7eZS5KXWBkjcd4BPNuhUPpNlEmHPqVRQ=="; - }; - } - { - name = "_graphql_tools_prisma_loader___prisma_loader_7.2.52.tgz"; - path = fetchurl { - name = "_graphql_tools_prisma_loader___prisma_loader_7.2.52.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/prisma-loader/-/prisma-loader-7.2.52.tgz"; - sha512 = "xA0p5wJQouyqDL8I1g1lolnJ8zV73+OIln5ObSSTcC8de7zZjqCAvtXR8X9MPeco0FGHnSJo/qdSaGbbc1kXyA=="; - }; - } - { - name = "_graphql_tools_relay_operation_optimizer___relay_operation_optimizer_6.5.6.tgz"; - path = fetchurl { - name = "_graphql_tools_relay_operation_optimizer___relay_operation_optimizer_6.5.6.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-6.5.6.tgz"; - sha512 = "2KjaWYxD/NC6KtckbDEAbN46QO+74d1SBaZQ26qQjWhyoAjon12xlMW4HWxHEN0d0xuz0cnOVUVc+t4wVXePUg=="; - }; - } - { - name = "_graphql_tools_schema___schema_9.0.13.tgz"; - path = fetchurl { - name = "_graphql_tools_schema___schema_9.0.13.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.13.tgz"; - sha512 = "guRA3fwAtv+M1Kh930P4ydH9aKJTWscIkhVFcWpj/cnjYYxj88jkEJ15ZNiJX/2breNY+sbVgmlgLKb6aXi/Jg=="; - }; - } - { - name = "_graphql_tools_schema___schema_9.0.15.tgz"; - path = fetchurl { - name = "_graphql_tools_schema___schema_9.0.15.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.15.tgz"; - sha512 = "p2DbpkOBcsi+yCEjwoS+r4pJ5z+3JjlJdhbPkCwC4q8lGf5r93dVYrExOrqGKTU5kxLXI/mxabSxcunjNIsDIg=="; - }; - } - { - name = "_graphql_tools_schema___schema_9.0.4.tgz"; - path = fetchurl { - name = "_graphql_tools_schema___schema_9.0.4.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-9.0.4.tgz"; - sha512 = "B/b8ukjs18fq+/s7p97P8L1VMrwapYc3N2KvdG/uNThSazRRn8GsBK0Nr+FH+mVKiUfb4Dno79e3SumZVoHuOQ=="; - }; - } - { - name = "_graphql_tools_url_loader___url_loader_7.17.1.tgz"; - path = fetchurl { - name = "_graphql_tools_url_loader___url_loader_7.17.1.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-7.17.1.tgz"; - sha512 = "+WZXkg1ZG4fjAB+SkCHLSr7VFZqZAkA/PILcpoPqwAL/wSsrhCHYwbzuWuKn1SGToxJRt7cc+4P0lfR7fq+xhQ=="; - }; - } - { - name = "_graphql_tools_url_loader___url_loader_7.16.4.tgz"; - path = fetchurl { - name = "_graphql_tools_url_loader___url_loader_7.16.4.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/url-loader/-/url-loader-7.16.4.tgz"; - sha512 = "7yGrJJNcqVQIplCyVLk7tW2mAgYyZ06FRmCBnzw3B61+aIjFavrm6YlnKkhdqYSYyFmIbVcigdP3vkoYIu23TA=="; - }; - } - { - name = "_graphql_tools_utils___utils_8.12.0.tgz"; - path = fetchurl { - name = "_graphql_tools_utils___utils_8.12.0.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.12.0.tgz"; - sha512 = "TeO+MJWGXjUTS52qfK4R8HiPoF/R7X+qmgtOYd8DTH0l6b+5Y/tlg5aGeUJefqImRq7nvi93Ms40k/Uz4D5CWw=="; - }; - } - { - name = "_graphql_tools_utils___utils_9.1.4.tgz"; - path = fetchurl { - name = "_graphql_tools_utils___utils_9.1.4.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.1.4.tgz"; - sha512 = "hgIeLt95h9nQgQuzbbdhuZmh+8WV7RZ/6GbTj6t3IU4Zd2zs9yYJ2jgW/krO587GMOY8zCwrjNOMzD40u3l7Vg=="; - }; - } - { - name = "_graphql_tools_utils___utils_9.2.0.tgz"; - path = fetchurl { - name = "_graphql_tools_utils___utils_9.2.0.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.2.0.tgz"; - sha512 = "s3lEG1iYkyYEnKCWrIFECX3XH2wmZvbg6Ir3udCvIDynq+ydaO7JQXobclpPtwSJtjlS353haF//6V7mnBQ4bg=="; - }; - } - { - name = "_graphql_tools_utils___utils_9.2.1.tgz"; - path = fetchurl { - name = "_graphql_tools_utils___utils_9.2.1.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-9.2.1.tgz"; - sha512 = "WUw506Ql6xzmOORlriNrD6Ugx+HjVgYxt9KCXD9mHAak+eaXSwuGGPyE60hy9xaDEoXKBsG7SkG69ybitaVl6A=="; - }; - } - { - name = "_graphql_tools_wrap___wrap_9.2.3.tgz"; - path = fetchurl { - name = "_graphql_tools_wrap___wrap_9.2.3.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-9.2.3.tgz"; - sha512 = "aiLjcAuUwcvA1mF25c7KFDPXEdQDpo6bTDyAMCSlFXpF4T01hoxLERmfmbRmsmy/dP80ZB31a+t70aspVdqZSA=="; - }; - } - { - name = "_graphql_tools_wrap___wrap_9.3.0.tgz"; - path = fetchurl { - name = "_graphql_tools_wrap___wrap_9.3.0.tgz"; - url = "https://registry.yarnpkg.com/@graphql-tools/wrap/-/wrap-9.3.0.tgz"; - sha512 = "QOEg04kzFJ1WrlA2t/qjw85C20qPDJwIU/d+bDgDd1+cjTQcVrEt9bq9NilZZg9m9AAgZbeyDwut0oQvNMCGhw=="; - }; - } - { - name = "_graphql_typed_document_node_core___core_3.1.1.tgz"; - path = fetchurl { - name = "_graphql_typed_document_node_core___core_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.1.1.tgz"; - sha512 = "NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg=="; - }; - } - { - name = "_histoire_app___app_0.14.2.tgz"; - path = fetchurl { - name = "_histoire_app___app_0.14.2.tgz"; - url = "https://registry.yarnpkg.com/@histoire/app/-/app-0.14.2.tgz"; - sha512 = "mY91jH8UPFWYGLnTLbv5ntmly+Yd5etHDKV0+l+q/bRHaKrhGLOtJjr60wyqfxbZ6rDN2sjJAwNDEc6dozFqFw=="; - }; - } - { - name = "_histoire_controls___controls_0.14.2.tgz"; - path = fetchurl { - name = "_histoire_controls___controls_0.14.2.tgz"; - url = "https://registry.yarnpkg.com/@histoire/controls/-/controls-0.14.2.tgz"; - sha512 = "6pVyjwVxFLqsUb4stvXJ6BmXjr82tfWA4Gv0oipZcDB8zDxDhhx6ckuy+9l94W3BsQfH2ZaRruCv6dJUtqiFZQ=="; - }; - } - { - name = "_histoire_plugin_vue___plugin_vue_0.14.2.tgz"; - path = fetchurl { - name = "_histoire_plugin_vue___plugin_vue_0.14.2.tgz"; - url = "https://registry.yarnpkg.com/@histoire/plugin-vue/-/plugin-vue-0.14.2.tgz"; - sha512 = "pa56RTkNkVXKNnXEeQWEbAO0Yh7mHZRtfcPjHjZYvP0DLThD1WjO+WGspGbsK5Liaog3n3AOZYcqEmw6mSOmmw=="; - }; - } - { - name = "_histoire_shared___shared_0.14.2.tgz"; - path = fetchurl { - name = "_histoire_shared___shared_0.14.2.tgz"; - url = "https://registry.yarnpkg.com/@histoire/shared/-/shared-0.14.2.tgz"; - sha512 = "Q7g8Yr8F2lb+/fnQExJYn5fLEqHgHtK47QqsiAWf6xX+v10r/JYLZUnI28jwEga5tLQTVTl6HEJ+yHqvJNFIiw=="; - }; - } - { - name = "_histoire_vendors___vendors_0.14.2.tgz"; - path = fetchurl { - name = "_histoire_vendors___vendors_0.14.2.tgz"; - url = "https://registry.yarnpkg.com/@histoire/vendors/-/vendors-0.14.2.tgz"; - sha512 = "x8B8KxHXSC8YdMAHJtJBBGQYXHP0jcxDxnytwrZOxoCtzwOYghHJNJ8wPfwboKNE0E3ot6vJSilZahwGVLX+nw=="; - }; - } - { - name = "_humanwhocodes_config_array___config_array_0.11.8.tgz"; - path = fetchurl { - name = "_humanwhocodes_config_array___config_array_0.11.8.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz"; - sha512 = "UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g=="; - }; - } - { - name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz"; - path = fetchurl { - name = "_humanwhocodes_module_importer___module_importer_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"; - sha512 = "bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA=="; - }; - } - { - name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; - path = fetchurl { - name = "_humanwhocodes_object_schema___object_schema_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"; - sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; - }; - } - { - name = "_jest_expect_utils___expect_utils_29.2.1.tgz"; - path = fetchurl { - name = "_jest_expect_utils___expect_utils_29.2.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.2.1.tgz"; - sha512 = "yr4aHNg5Z1CjKby5ozm7sKjgBlCOorlAoFcvrOQ/4rbZRfgZQdnmh7cth192PYIgiPZo2bBXvqdOApnAMWFJZg=="; - }; - } - { - name = "_jest_schemas___schemas_29.0.0.tgz"; - path = fetchurl { - name = "_jest_schemas___schemas_29.0.0.tgz"; - url = "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.0.0.tgz"; - sha512 = "3Ab5HgYIIAnS0HjqJHQYZS+zXc4tUmTmBH3z83ajI6afXp8X3ZtdLX+nXx+I7LNkJD7uN9LAVhgnjDgZa2z0kA=="; - }; - } - { - name = "_jest_types___types_29.2.1.tgz"; - path = fetchurl { - name = "_jest_types___types_29.2.1.tgz"; - url = "https://registry.yarnpkg.com/@jest/types/-/types-29.2.1.tgz"; - sha512 = "O/QNDQODLnINEPAI0cl9U6zUIDXEWXt6IC1o2N2QENuos7hlGUIthlKyV4p6ki3TvXFX071blj8HUhgLGquPjw=="; - }; - } - { - name = "_jridgewell_gen_mapping___gen_mapping_0.1.1.tgz"; - path = fetchurl { - name = "_jridgewell_gen_mapping___gen_mapping_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; - sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; - }; - } - { - name = "_jridgewell_gen_mapping___gen_mapping_0.3.2.tgz"; - path = fetchurl { - name = "_jridgewell_gen_mapping___gen_mapping_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; - sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; - }; - } - { - name = "_jridgewell_resolve_uri___resolve_uri_3.1.0.tgz"; - path = fetchurl { - name = "_jridgewell_resolve_uri___resolve_uri_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; - sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; - }; - } - { - name = "_jridgewell_set_array___set_array_1.1.2.tgz"; - path = fetchurl { - name = "_jridgewell_set_array___set_array_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz"; - sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; - }; - } - { - name = "_jridgewell_source_map___source_map_0.3.2.tgz"; - path = fetchurl { - name = "_jridgewell_source_map___source_map_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz"; - sha512 = "m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw=="; - }; - } - { - name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.14.tgz"; - path = fetchurl { - name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.14.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; - sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; - }; - } - { - name = "_jridgewell_trace_mapping___trace_mapping_0.3.9.tgz"; - path = fetchurl { - name = "_jridgewell_trace_mapping___trace_mapping_0.3.9.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz"; - sha512 = "3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="; - }; - } - { - name = "_jridgewell_trace_mapping___trace_mapping_0.3.17.tgz"; - path = fetchurl { - name = "_jridgewell_trace_mapping___trace_mapping_0.3.17.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz"; - sha512 = "MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g=="; - }; - } - { - name = "_lezer_common___common_1.0.1.tgz"; - path = fetchurl { - name = "_lezer_common___common_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/@lezer/common/-/common-1.0.1.tgz"; - sha512 = "8TR5++Q/F//tpDsLd5zkrvEX5xxeemafEaek7mUp7Y+bI8cKQXdSqhzTOBaOogETcMOVr0pT3BBPXp13477ciw=="; - }; - } - { - name = "_lezer_highlight___highlight_1.1.2.tgz"; - path = fetchurl { - name = "_lezer_highlight___highlight_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@lezer/highlight/-/highlight-1.1.2.tgz"; - sha512 = "CAun1WR1glxG9ZdOokTZwXbcwB7PXkIEyZRUMFBVwSrhTcogWq634/ByNImrkUnQhjju6xsIaOBIxvcRJtplXQ=="; - }; - } - { - name = "_lezer_json___json_1.0.0.tgz"; - path = fetchurl { - name = "_lezer_json___json_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@lezer/json/-/json-1.0.0.tgz"; - sha512 = "zbAuUY09RBzCoCA3lJ1+ypKw5WSNvLqGMtasdW6HvVOqZoCpPr8eWrsGnOVWGKGn8Rh21FnrKRVlJXrGAVUqRw=="; - }; - } - { - name = "_lezer_lr___lr_1.2.3.tgz"; - path = fetchurl { - name = "_lezer_lr___lr_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/@lezer/lr/-/lr-1.2.3.tgz"; - sha512 = "qpB7rBzH8f6Mzjv2AVZRahcm+2Cf7nbIH++uXbvVOL1yIRvVWQ3HAM/saeBLCyz/togB7LGo76qdJYL1uKQlqA=="; - }; - } - { - name = "_linaria_core___core_3.0.0_beta.13.tgz"; - path = fetchurl { - name = "_linaria_core___core_3.0.0_beta.13.tgz"; - url = "https://registry.yarnpkg.com/@linaria/core/-/core-3.0.0-beta.13.tgz"; - sha512 = "3zEi5plBCOsEzUneRVuQb+2SAx3qaC1dj0FfFAI6zIJQoDWu0dlSwKijMRack7oO9tUWrchfj3OkKQAd1LBdVg=="; - }; - } - { - name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; - path = fetchurl { - name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; - sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; - }; - } - { - name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; - path = fetchurl { - name = "_nodelib_fs.stat___fs.stat_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; - sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; - }; - } - { - name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; - path = fetchurl { - name = "_nodelib_fs.walk___fs.walk_1.2.8.tgz"; - url = "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; - sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; - }; - } - { - name = "_peculiar_asn1_schema___asn1_schema_2.3.0.tgz"; - path = fetchurl { - name = "_peculiar_asn1_schema___asn1_schema_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/@peculiar/asn1-schema/-/asn1-schema-2.3.0.tgz"; - sha512 = "DtNLAG4vmDrdSJFPe7rypkcj597chNQL7u+2dBtYo5mh7VW2+im6ke+O0NVr8W1f4re4C3F71LhoMb0Yxqa48Q=="; - }; - } - { - name = "_peculiar_json_schema___json_schema_1.1.12.tgz"; - path = fetchurl { - name = "_peculiar_json_schema___json_schema_1.1.12.tgz"; - url = "https://registry.yarnpkg.com/@peculiar/json-schema/-/json-schema-1.1.12.tgz"; - sha512 = "coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w=="; - }; - } - { - name = "_peculiar_webcrypto___webcrypto_1.4.0.tgz"; - path = fetchurl { - name = "_peculiar_webcrypto___webcrypto_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/@peculiar/webcrypto/-/webcrypto-1.4.0.tgz"; - sha512 = "U58N44b2m3OuTgpmKgf0LPDOmP3bhwNz01vAnj1mBwxBASRhptWYK+M3zG+HBkDqGQM+bFsoIihTW8MdmPXEqg=="; - }; - } - { - name = "_pinia_testing___testing_0.0.14.tgz"; - path = fetchurl { - name = "_pinia_testing___testing_0.0.14.tgz"; - url = "https://registry.yarnpkg.com/@pinia/testing/-/testing-0.0.14.tgz"; - sha512 = "ZmZwVNd/NnKYLIfjfuKl0zlJ3UdiXFpsHzSlL6wCeezSlyrqGMxsIQKv0J6fleu38gyCNTPBEipfxrt8V4+VIg=="; - }; - } - { - name = "_polka_url___url_1.0.0_next.21.tgz"; - path = fetchurl { - name = "_polka_url___url_1.0.0_next.21.tgz"; - url = "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz"; - sha512 = "a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g=="; - }; - } - { - name = "_popperjs_core___core_2.11.6.tgz"; - path = fetchurl { - name = "_popperjs_core___core_2.11.6.tgz"; - url = "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz"; - sha512 = "50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw=="; - }; - } - { - name = "_rails_actioncable___actioncable_6.1.7.tgz"; - path = fetchurl { - name = "_rails_actioncable___actioncable_6.1.7.tgz"; - url = "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-6.1.7.tgz"; - sha512 = "F6S74NGpxhbbDRFsQFGYqefRfZPgYvePNtz9hHKYOqLturrsqrDoG+UcrxEGHsvqDUorMYfx4Wl3K8smmk/u2g=="; - }; - } - { - name = "_remirror_core_constants___core_constants_2.0.0.tgz"; - path = fetchurl { - name = "_remirror_core_constants___core_constants_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/@remirror/core-constants/-/core-constants-2.0.0.tgz"; - sha512 = "vpePPMecHJllBqCWXl6+FIcZqS+tRUM2kSCCKFeEo1H3XUEv3ocijBIPhnlSAa7g6maX+12ATTgxrOsLpWVr2g=="; - }; - } - { - name = "_remirror_core_helpers___core_helpers_2.0.1.tgz"; - path = fetchurl { - name = "_remirror_core_helpers___core_helpers_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@remirror/core-helpers/-/core-helpers-2.0.1.tgz"; - sha512 = "s8M1pn33aBUhduvD1QR02uUQMegnFkGaTr4c1iBzxTTyg0rbQstzuQ7Q8TkL6n64JtgCdJS9jLz2dONb2meBKQ=="; - }; - } - { - name = "_remirror_types___types_1.0.0.tgz"; - path = fetchurl { - name = "_remirror_types___types_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@remirror/types/-/types-1.0.0.tgz"; - sha512 = "7HQbW7k8VxrAtfzs9FxwO6XSDabn8tSFDi1wwzShOnU+cvaYpfxu0ygyTk3TpXsag1hgFKY3ZIlAfB4WVz2LkQ=="; - }; - } - { - name = "_repeaterjs_repeater___repeater_3.0.4.tgz"; - path = fetchurl { - name = "_repeaterjs_repeater___repeater_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/@repeaterjs/repeater/-/repeater-3.0.4.tgz"; - sha512 = "AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA=="; - }; - } - { - name = "_rollup_plugin_babel___plugin_babel_5.3.1.tgz"; - path = fetchurl { - name = "_rollup_plugin_babel___plugin_babel_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz"; - sha512 = "WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q=="; - }; - } - { - name = "_rollup_plugin_node_resolve___plugin_node_resolve_11.2.1.tgz"; - path = fetchurl { - name = "_rollup_plugin_node_resolve___plugin_node_resolve_11.2.1.tgz"; - url = "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz"; - sha512 = "yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg=="; - }; - } - { - name = "_rollup_plugin_replace___plugin_replace_2.4.2.tgz"; - path = fetchurl { - name = "_rollup_plugin_replace___plugin_replace_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz"; - sha512 = "IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg=="; - }; - } - { - name = "_rollup_plugin_replace___plugin_replace_5.0.2.tgz"; - path = fetchurl { - name = "_rollup_plugin_replace___plugin_replace_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-5.0.2.tgz"; - sha512 = "M9YXNekv/C/iHHK+cvORzfRYfPbq0RDD8r0G+bMiTXjNGKulPnCT9O3Ss46WfhI6ZOCgApOP7xAdmCQJ+U2LAA=="; - }; - } - { - name = "_rollup_pluginutils___pluginutils_3.1.0.tgz"; - path = fetchurl { - name = "_rollup_pluginutils___pluginutils_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"; - sha512 = "GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg=="; - }; - } - { - name = "_rollup_pluginutils___pluginutils_5.0.2.tgz"; - path = fetchurl { - name = "_rollup_pluginutils___pluginutils_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz"; - sha512 = "pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA=="; - }; - } - { - name = "_sinclair_typebox___typebox_0.24.50.tgz"; - path = fetchurl { - name = "_sinclair_typebox___typebox_0.24.50.tgz"; - url = "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.50.tgz"; - sha512 = "k8ETQOOQDg5FtK7y9KJWpsGLik+QlPmIi8zzl/dGUgshV2QitprkFlCR/AemjWOTyKn9UwSSGRTzLVotvgCjYQ=="; - }; - } - { - name = "_surma_rollup_plugin_off_main_thread___rollup_plugin_off_main_thread_2.2.3.tgz"; - path = fetchurl { - name = "_surma_rollup_plugin_off_main_thread___rollup_plugin_off_main_thread_2.2.3.tgz"; - url = "https://registry.yarnpkg.com/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz"; - sha512 = "lR8q/9W7hZpMWweNiAKU7NQerBnzQQLvi8qnTDU/fxItPhtZVMbPV3lbCwjhIlNBe9Bbr5V+KHshvWmVSG9cxQ=="; - }; - } - { - name = "_tailwindcss_line_clamp___line_clamp_0.4.2.tgz"; - path = fetchurl { - name = "_tailwindcss_line_clamp___line_clamp_0.4.2.tgz"; - url = "https://registry.yarnpkg.com/@tailwindcss/line-clamp/-/line-clamp-0.4.2.tgz"; - sha512 = "HFzAQuqYCjyy/SX9sLGB1lroPzmcnWv1FHkIpmypte10hptf4oPUfucryMKovZh2u0uiS9U5Ty3GghWfEJGwVw=="; - }; - } - { - name = "_testing_library_dom___dom_8.19.0.tgz"; - path = fetchurl { - name = "_testing_library_dom___dom_8.19.0.tgz"; - url = "https://registry.yarnpkg.com/@testing-library/dom/-/dom-8.19.0.tgz"; - sha512 = "6YWYPPpxG3e/xOo6HIWwB/58HukkwIVTOaZ0VwdMVjhRUX/01E4FtQbck9GazOOj7MXHc5RBzMrU86iBJHbI+A=="; - }; - } - { - name = "_testing_library_jest_dom___jest_dom_5.16.5.tgz"; - path = fetchurl { - name = "_testing_library_jest_dom___jest_dom_5.16.5.tgz"; - url = "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz"; - sha512 = "N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA=="; - }; - } - { - name = "_testing_library_user_event___user_event_14.4.3.tgz"; - path = fetchurl { - name = "_testing_library_user_event___user_event_14.4.3.tgz"; - url = "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.4.3.tgz"; - sha512 = "kCUc5MEwaEMakkO5x7aoD+DLi02ehmEM2QCGWvNqAS1dV/fAvORWEjnjsEIvml59M7Y5kCkWN6fCCyPOe8OL6Q=="; - }; - } - { - name = "_testing_library_vue___vue_6.6.1.tgz"; - path = fetchurl { - name = "_testing_library_vue___vue_6.6.1.tgz"; - url = "https://registry.yarnpkg.com/@testing-library/vue/-/vue-6.6.1.tgz"; - sha512 = "vpyBPrHzKTwEGS7ehUC8/IXgnqTBEMk6jd52Gouf51arG2jUorPhmkbsxUwJOyxz6L0gj2ZcmWnznG1OJcTCDQ=="; - }; - } - { - name = "_tiptap_core___core_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_core___core_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/core/-/core-2.0.0-beta.217.tgz"; - sha512 = "Vifwcg5SglkVjEmtFbnwHOKWU4UUenOhe7ke5fqGhh7FNfGkccu6sK8W1JTDbG4ARWZ1b/632kQ51YE+WuPe7g=="; - }; - } - { - name = "_tiptap_extension_blockquote___extension_blockquote_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_blockquote___extension_blockquote_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.0.0-beta.217.tgz"; - sha512 = "4U6DUr+xaCe3MRMAh3uMA5devHZmyrk6/6MURg57S3uRXDIMiWlKBkSxxys0URjbpS17T41hvKlRQR85tO1N1Q=="; - }; - } - { - name = "_tiptap_extension_bold___extension_bold_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_bold___extension_bold_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-bold/-/extension-bold-2.0.0-beta.217.tgz"; - sha512 = "oLzekoVWjvkAbDyOIv4Aj9DzjIwCQLTy33kXH/ItTxH2Z/zxZ+Et3y9qAZi0eR8x8wO552cG41lYUte4tuwo1w=="; - }; - } - { - name = "_tiptap_extension_bubble_menu___extension_bubble_menu_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_bubble_menu___extension_bubble_menu_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-bubble-menu/-/extension-bubble-menu-2.0.0-beta.217.tgz"; - sha512 = "f52hjIzNbvAJy0P3pTf6sv/65XlMU1LCLXam4VCTkYJ2HHVvW+LZcu+dG1M8YmGkM9l+6dQPs5L2rriAQDXt+w=="; - }; - } - { - name = "_tiptap_extension_bullet_list___extension_bullet_list_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_bullet_list___extension_bullet_list_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-bullet-list/-/extension-bullet-list-2.0.0-beta.217.tgz"; - sha512 = "t/9lqdZhErYUOtU9H2m/qDjUUSilzVAjI2pVvJt6y9Z7Aex9uS7sPBVhjirjV43G4yQEVhT7BuTAzyCUX+JXkQ=="; - }; - } - { - name = "_tiptap_extension_character_count___extension_character_count_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_character_count___extension_character_count_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-character-count/-/extension-character-count-2.0.0-beta.217.tgz"; - sha512 = "jj3GzuoUbHcPsRyIkxr/X/+FmnvKeDUtzvWhhpEPOlCf9q5Wjq95VbVYZdNPlEXCNCdMu0ePvyW+v8+kFr+Qlw=="; - }; - } - { - name = "_tiptap_extension_code_block___extension_code_block_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_code_block___extension_code_block_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.0.0-beta.217.tgz"; - sha512 = "vmntduEBM/o+mx4+sSEv+aVU8swr5rOFswMr7tYMXRqzXFYbqjvlEo86kGOQ4lrpnvf/2eUEjrq+2L4Hx2LdsA=="; - }; - } - { - name = "_tiptap_extension_code___extension_code_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_code___extension_code_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.0.0-beta.217.tgz"; - sha512 = "IPpuI8MeVX5N0ueWQcIvh2nD+EN6DbFtKSsoU+FgFJ9meOkiEWGibSJ5yFQinPsiE9zrwYIaZzzjhr4oeY2JNA=="; - }; - } - { - name = "_tiptap_extension_document___extension_document_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_document___extension_document_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-document/-/extension-document-2.0.0-beta.217.tgz"; - sha512 = "CDCTutbVO1Ub7QUULPCYILl2px48ezCX2kxbspQZzPD7nMoYZNmUMZ8gRJvVDdnSpMNlEl7oNnCAU7uC/lny/A=="; - }; - } - { - name = "_tiptap_extension_dropcursor___extension_dropcursor_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_dropcursor___extension_dropcursor_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-dropcursor/-/extension-dropcursor-2.0.0-beta.217.tgz"; - sha512 = "+HkLmLBKSAJB987KM6z/pxsE+QMr7wZJiTSJv4JSTQnSjKwyJIHbfYNvNgWZo0k9MSncmLGhd/c4TFxYJZ762w=="; - }; - } - { - name = "_tiptap_extension_floating_menu___extension_floating_menu_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_floating_menu___extension_floating_menu_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-floating-menu/-/extension-floating-menu-2.0.0-beta.217.tgz"; - sha512 = "mP77UrimZo3sdC+Xam0DsPeYfXn29hl4ixEuZeiQQBMqz7g1K9T7vOEsRMQCBVFS7Hsc7MWBqLa1lL1GtyBB9Q=="; - }; - } - { - name = "_tiptap_extension_gapcursor___extension_gapcursor_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_gapcursor___extension_gapcursor_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-gapcursor/-/extension-gapcursor-2.0.0-beta.217.tgz"; - sha512 = "BMZAeMuba41EOmSo8ZEClarbrO4XDfGvOslWkjJwqPyJ4oO3nHtX8ep13g6Y3RhMSUDEGmBSUXEKVuUPgSS+Qg=="; - }; - } - { - name = "_tiptap_extension_hard_break___extension_hard_break_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_hard_break___extension_hard_break_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-hard-break/-/extension-hard-break-2.0.0-beta.217.tgz"; - sha512 = "15cKxMsJZJ+3cbSKuMa7wjr2sQHxjoJ8aCmbPqUH+zGNLsRtUHvTZzeIPGxJ1SpEjpJpb+rRnu9RMTNjwDMFMA=="; - }; - } - { - name = "_tiptap_extension_heading___extension_heading_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_heading___extension_heading_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-heading/-/extension-heading-2.0.0-beta.217.tgz"; - sha512 = "v7G/1R0+qmPm0U2sOCOftqZef5yd89tEg1R+KVF78ucFvuLgH50Pldes8lhHEBlfoRShye2Ht54E6JHDP73J5w=="; - }; - } - { - name = "_tiptap_extension_history___extension_history_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_history___extension_history_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-history/-/extension-history-2.0.0-beta.217.tgz"; - sha512 = "wdgAGMTFVeEh6hlO1Iy0l0LzqUVuoplrYnc2zjry4YFGCJbWwQqLKEKQaHIvmMea0PaXW4Q5wpNy875+UoXDOw=="; - }; - } - { - name = "_tiptap_extension_horizontal_rule___extension_horizontal_rule_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_horizontal_rule___extension_horizontal_rule_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-horizontal-rule/-/extension-horizontal-rule-2.0.0-beta.217.tgz"; - sha512 = "h7uIpGOYLCPfYJUit6Fe8oLnrMf0hK0mHBXa8cV7AWIlDvVRrXZZ/sdtLTF+TXOylvbOYR+vjkvnwDTeVX6dcw=="; - }; - } - { - name = "_tiptap_extension_image___extension_image_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_image___extension_image_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-image/-/extension-image-2.0.0-beta.217.tgz"; - sha512 = "8ibJOicpcqhFeiPLqYOY8SO9sxkz2bemzwhtzRvgkevy/QERe9D0mbAL0qm1gg88LtXy3z2eFUdwD8suq1xsPQ=="; - }; - } - { - name = "_tiptap_extension_italic___extension_italic_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_italic___extension_italic_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-italic/-/extension-italic-2.0.0-beta.217.tgz"; - sha512 = "Oua5QbsOJ/MNV41fvbBtJOE/ciw2AjWybSiPkn8clu1/KjieE9dectlj+COaNbVIOccTNhurECpqfF0h8K87Kg=="; - }; - } - { - name = "_tiptap_extension_link___extension_link_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_link___extension_link_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-link/-/extension-link-2.0.0-beta.217.tgz"; - sha512 = "pC1UnK1OrbW+NDdBdHE8sfmZ+tOpIOsHVAeeX6pg1fkdP/FlbPFFvcvILgJc20dr7DiM6dRqYq16H473G9vyEg=="; - }; - } - { - name = "_tiptap_extension_list_item___extension_list_item_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_list_item___extension_list_item_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-list-item/-/extension-list-item-2.0.0-beta.217.tgz"; - sha512 = "yJmB/Je6CAiyjjJyVl77PPv4AWNFejrhxxmIdPfkYNRuQx9xX5yccx/zXC5RMaUFZVttlC4+gXDZsCvxMiVF1g=="; - }; - } - { - name = "_tiptap_extension_mention___extension_mention_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_mention___extension_mention_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-mention/-/extension-mention-2.0.0-beta.217.tgz"; - sha512 = "QCUEyvXQYvTfp8iojPG0agF4euu+vFm0BvIQr5TpjE46kSbsK07PMD2D8Z8YBqZEI7x8YWAz2jZDik62Y1+Ssg=="; - }; - } - { - name = "_tiptap_extension_ordered_list___extension_ordered_list_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_ordered_list___extension_ordered_list_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-ordered-list/-/extension-ordered-list-2.0.0-beta.217.tgz"; - sha512 = "Jv79D+imZPqFi7U+nrMBQbNp2FQDk9Y2D7jTovM0ySCYLbgYtG/n5ZLj/eBAN6MwLcqHHWzZa1TXWzF7anlUOQ=="; - }; - } - { - name = "_tiptap_extension_paragraph___extension_paragraph_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_paragraph___extension_paragraph_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.0.0-beta.217.tgz"; - sha512 = "EeWCz6Boz1eeCrECQ8i9yzbs1MyhmuLmPnvW0WUyNuqlA/qbgr4OvqDGZk4X+4E3CI30Nqzr0PPNpz0CWQgphQ=="; - }; - } - { - name = "_tiptap_extension_strike___extension_strike_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_strike___extension_strike_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-strike/-/extension-strike-2.0.0-beta.217.tgz"; - sha512 = "frC3SUoh9bSrHYWdW2S3A8s+FEqDMaNjp+Ldoe6vz2ugHXxjUFJ+SsF/pcQbmKw6FsNaf/bqL24KieRt22kgpg=="; - }; - } - { - name = "_tiptap_extension_text___extension_text_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_text___extension_text_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-text/-/extension-text-2.0.0-beta.217.tgz"; - sha512 = "l5PkVhZzVnxbGyMiCMqpLU3ZomJWcZXhuBD0aajry+l85DWc6TK0mhLEAVEU1LoTL8hXFmICoW1KJ1m20Va9dg=="; - }; - } - { - name = "_tiptap_extension_underline___extension_underline_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_extension_underline___extension_underline_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/extension-underline/-/extension-underline-2.0.0-beta.217.tgz"; - sha512 = "feakmZ8ek1maf4yBVd539AYIjv3hnLK1j/GLyT/SjRlwOryQb23xWIQ8I+nF5UWqXib1MkvfMe6Ff6zK5WqrYQ=="; - }; - } - { - name = "_tiptap_pm___pm_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_pm___pm_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/pm/-/pm-2.0.0-beta.217.tgz"; - sha512 = "krEplJli2BbBB3U2c+cxDPw4mpHsUEwOMJCM3fr1GTVv7qAOvsrWt2ndRPOwraPSvmUF3rw9gvoP86eyK2nDmA=="; - }; - } - { - name = "_tiptap_starter_kit___starter_kit_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_starter_kit___starter_kit_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/starter-kit/-/starter-kit-2.0.0-beta.217.tgz"; - sha512 = "9FPH8lOP0AfRMKm2OUy2OQKEdcIo2ic7MNO2Jtd5vcUz1skfaQPjYLJYHbhkw2iH0ILUOPPbGpZuIlV8uqSu/g=="; - }; - } - { - name = "_tiptap_suggestion___suggestion_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_suggestion___suggestion_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/suggestion/-/suggestion-2.0.0-beta.217.tgz"; - sha512 = "Z1hXr1giNQ/fkuRrsMICtfyBCbMV+ZPiYYfpKKqUC4uc/lqAeHiRwk3lozpnLZEImnOW42LsYbYug2jtRqrDgA=="; - }; - } - { - name = "_tiptap_vue_3___vue_3_2.0.0_beta.217.tgz"; - path = fetchurl { - name = "_tiptap_vue_3___vue_3_2.0.0_beta.217.tgz"; - url = "https://registry.yarnpkg.com/@tiptap/vue-3/-/vue-3-2.0.0-beta.217.tgz"; - sha512 = "QHVc82A6lu4qF1Glz5Ne00Nwbj0A0U/6IEbG8u8/YQDy1XzQ7PZwR6FrwxPTrwLhJivy4/wVBiYTUygs9+vjbQ=="; - }; - } - { - name = "_tootallnate_once___once_2.0.0.tgz"; - path = fetchurl { - name = "_tootallnate_once___once_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz"; - sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; - }; - } - { - name = "_trysound_sax___sax_0.2.0.tgz"; - path = fetchurl { - name = "_trysound_sax___sax_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz"; - sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="; - }; - } - { - name = "_tsconfig_node10___node10_1.0.9.tgz"; - path = fetchurl { - name = "_tsconfig_node10___node10_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz"; - sha512 = "jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA=="; - }; - } - { - name = "_tsconfig_node12___node12_1.0.11.tgz"; - path = fetchurl { - name = "_tsconfig_node12___node12_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.11.tgz"; - sha512 = "cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag=="; - }; - } - { - name = "_tsconfig_node14___node14_1.0.3.tgz"; - path = fetchurl { - name = "_tsconfig_node14___node14_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.3.tgz"; - sha512 = "ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow=="; - }; - } - { - name = "_tsconfig_node16___node16_1.0.3.tgz"; - path = fetchurl { - name = "_tsconfig_node16___node16_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.3.tgz"; - sha512 = "yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ=="; - }; - } - { - name = "_types_aria_query___aria_query_4.2.2.tgz"; - path = fetchurl { - name = "_types_aria_query___aria_query_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz"; - sha512 = "HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig=="; - }; - } - { - name = "_types_chai_subset___chai_subset_1.3.3.tgz"; - path = fetchurl { - name = "_types_chai_subset___chai_subset_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/@types/chai-subset/-/chai-subset-1.3.3.tgz"; - sha512 = "frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw=="; - }; - } - { - name = "_types_chai___chai_4.3.3.tgz"; - path = fetchurl { - name = "_types_chai___chai_4.3.3.tgz"; - url = "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.3.tgz"; - sha512 = "hC7OMnszpxhZPduX+m+nrx+uFoLkWOMiR4oa/AZF3MuSETYTZmFfJAHqZEM8MVlvfG7BEUcgvtwoCTxBp6hm3g=="; - }; - } - { - name = "_types_chai___chai_4.3.4.tgz"; - path = fetchurl { - name = "_types_chai___chai_4.3.4.tgz"; - url = "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.4.tgz"; - sha512 = "KnRanxnpfpjUTqTCXslZSEdLfXExwgNxYPdiO2WGUj8+HDjFi8R3k5RVKPeSCzLjCcshCAtVO2QBbVuAV4kTnw=="; - }; - } - { - name = "_types_estree___estree_0.0.39.tgz"; - path = fetchurl { - name = "_types_estree___estree_0.0.39.tgz"; - url = "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz"; - sha512 = "EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw=="; - }; - } - { - name = "_types_estree___estree_1.0.0.tgz"; - path = fetchurl { - name = "_types_estree___estree_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz"; - sha512 = "WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="; - }; - } - { - name = "_types_flexsearch___flexsearch_0.7.3.tgz"; - path = fetchurl { - name = "_types_flexsearch___flexsearch_0.7.3.tgz"; - url = "https://registry.yarnpkg.com/@types/flexsearch/-/flexsearch-0.7.3.tgz"; - sha512 = "HXwADeHEP4exXkCIwy2n1+i0f1ilP1ETQOH5KDOugjkTFZPntWo0Gr8stZOaebkxsdx+k0X/K6obU/+it07ocg=="; - }; - } - { - name = "_types_fs_extra___fs_extra_9.0.13.tgz"; - path = fetchurl { - name = "_types_fs_extra___fs_extra_9.0.13.tgz"; - url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz"; - sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; - }; - } - { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.4.tgz"; - path = fetchurl { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz"; - sha512 = "z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g=="; - }; - } - { - name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; - path = fetchurl { - name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; - sha512 = "plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg=="; - }; - } - { - name = "_types_istanbul_reports___istanbul_reports_3.0.1.tgz"; - path = fetchurl { - name = "_types_istanbul_reports___istanbul_reports_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz"; - sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; - }; - } - { - name = "_types_jest___jest_29.2.0.tgz"; - path = fetchurl { - name = "_types_jest___jest_29.2.0.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-29.2.0.tgz"; - sha512 = "KO7bPV21d65PKwv3LLsD8Jn3E05pjNjRZvkm+YTacWhVmykAb07wW6IkZUmQAltwQafNcDUEUrMO2h3jeBSisg=="; - }; - } - { - name = "_types_js_yaml___js_yaml_4.0.5.tgz"; - path = fetchurl { - name = "_types_js_yaml___js_yaml_4.0.5.tgz"; - url = "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.5.tgz"; - sha512 = "FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA=="; - }; - } - { - name = "_types_json_schema___json_schema_7.0.11.tgz"; - path = fetchurl { - name = "_types_json_schema___json_schema_7.0.11.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz"; - sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; - }; - } - { - name = "_types_json_stable_stringify___json_stable_stringify_1.0.34.tgz"; - path = fetchurl { - name = "_types_json_stable_stringify___json_stable_stringify_1.0.34.tgz"; - url = "https://registry.yarnpkg.com/@types/json-stable-stringify/-/json-stable-stringify-1.0.34.tgz"; - sha512 = "s2cfwagOQAS8o06TcwKfr9Wx11dNGbH2E9vJz1cqV+a/LOyhWNLUNd6JSRYNzvB4d29UuJX2M0Dj9vE1T8fRXw=="; - }; - } - { - name = "_types_json5___json5_0.0.29.tgz"; - path = fetchurl { - name = "_types_json5___json5_0.0.29.tgz"; - url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; - sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="; - }; - } - { - name = "_types_jsonwebtoken___jsonwebtoken_9.0.1.tgz"; - path = fetchurl { - name = "_types_jsonwebtoken___jsonwebtoken_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz"; - sha512 = "c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw=="; - }; - } - { - name = "_types_linkify_it___linkify_it_3.0.2.tgz"; - path = fetchurl { - name = "_types_linkify_it___linkify_it_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz"; - sha512 = "HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA=="; - }; - } - { - name = "_types_lodash_es___lodash_es_4.17.6.tgz"; - path = fetchurl { - name = "_types_lodash_es___lodash_es_4.17.6.tgz"; - url = "https://registry.yarnpkg.com/@types/lodash-es/-/lodash-es-4.17.6.tgz"; - sha512 = "R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg=="; - }; - } - { - name = "_types_lodash___lodash_4.14.186.tgz"; - path = fetchurl { - name = "_types_lodash___lodash_4.14.186.tgz"; - url = "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.186.tgz"; - sha512 = "eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw=="; - }; - } - { - name = "_types_markdown_it___markdown_it_12.2.3.tgz"; - path = fetchurl { - name = "_types_markdown_it___markdown_it_12.2.3.tgz"; - url = "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz"; - sha512 = "GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ=="; - }; - } - { - name = "_types_mdurl___mdurl_1.0.2.tgz"; - path = fetchurl { - name = "_types_mdurl___mdurl_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz"; - sha512 = "eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA=="; - }; - } - { - name = "_types_minimist___minimist_1.2.2.tgz"; - path = fetchurl { - name = "_types_minimist___minimist_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz"; - sha512 = "jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ=="; - }; - } - { - name = "_types_node___node_18.11.4.tgz"; - path = fetchurl { - name = "_types_node___node_18.11.4.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.11.4.tgz"; - sha512 = "BxcJpBu8D3kv/GZkx/gSMz6VnTJREBj/4lbzYOQueUOELkt8WrO6zAcSPmp9uRPEW/d+lUO8QK0W2xnS1hEU0A=="; - }; - } - { - name = "_types_normalize_package_data___normalize_package_data_2.4.1.tgz"; - path = fetchurl { - name = "_types_normalize_package_data___normalize_package_data_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"; - sha512 = "Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="; - }; - } - { - name = "_types_object.omit___object.omit_3.0.0.tgz"; - path = fetchurl { - name = "_types_object.omit___object.omit_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/object.omit/-/object.omit-3.0.0.tgz"; - sha512 = "I27IoPpH250TUzc9FzXd0P1BV/BMJuzqD3jOz98ehf9dQqGkxlq+hO1bIqZGWqCg5bVOy0g4AUVJtnxe0klDmw=="; - }; - } - { - name = "_types_object.pick___object.pick_1.3.2.tgz"; - path = fetchurl { - name = "_types_object.pick___object.pick_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/@types/object.pick/-/object.pick-1.3.2.tgz"; - sha512 = "sn7L+qQ6RLPdXRoiaE7bZ/Ek+o4uICma/lBFPyJEKDTPTBP1W8u0c4baj3EiS4DiqLs+Hk+KUGvMVJtAw3ePJg=="; - }; - } - { - name = "_types_parse_json___parse_json_4.0.0.tgz"; - path = fetchurl { - name = "_types_parse_json___parse_json_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; - sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; - }; - } - { - name = "_types_rails__actioncable___rails__actioncable_6.1.6.tgz"; - path = fetchurl { - name = "_types_rails__actioncable___rails__actioncable_6.1.6.tgz"; - url = "https://registry.yarnpkg.com/@types/rails__actioncable/-/rails__actioncable-6.1.6.tgz"; - sha512 = "/whIczf4uhpac/X19vMRTHOF4reN92I6C4uOmTTtbT1xdesjrStLNQq9v+jexHehc8RENUHk4sXVzwm5PBy2fA=="; - }; - } - { - name = "_types_resolve___resolve_1.17.1.tgz"; - path = fetchurl { - name = "_types_resolve___resolve_1.17.1.tgz"; - url = "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz"; - sha512 = "yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw=="; - }; - } - { - name = "_types_semver___semver_7.3.12.tgz"; - path = fetchurl { - name = "_types_semver___semver_7.3.12.tgz"; - url = "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.12.tgz"; - sha512 = "WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A=="; - }; - } - { - name = "_types_stack_utils___stack_utils_2.0.1.tgz"; - path = fetchurl { - name = "_types_stack_utils___stack_utils_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz"; - sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="; - }; - } - { - name = "_types_svgo___svgo_2.6.4.tgz"; - path = fetchurl { - name = "_types_svgo___svgo_2.6.4.tgz"; - url = "https://registry.yarnpkg.com/@types/svgo/-/svgo-2.6.4.tgz"; - sha512 = "l4cmyPEckf8moNYHdJ+4wkHvFxjyW6ulm9l4YGaOxeyBWPhBOT0gvni1InpFPdzx1dKf/2s62qGITwxNWnPQng=="; - }; - } - { - name = "_types_testing_library__jest_dom___testing_library__jest_dom_5.14.5.tgz"; - path = fetchurl { - name = "_types_testing_library__jest_dom___testing_library__jest_dom_5.14.5.tgz"; - url = "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.5.tgz"; - sha512 = "SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ=="; - }; - } - { - name = "_types_throttle_debounce___throttle_debounce_2.1.0.tgz"; - path = fetchurl { - name = "_types_throttle_debounce___throttle_debounce_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/@types/throttle-debounce/-/throttle-debounce-2.1.0.tgz"; - sha512 = "5eQEtSCoESnh2FsiLTxE121IiE60hnMqcb435fShf4bpLRjEu1Eoekht23y6zXS9Ts3l+Szu3TARnTsA0GkOkQ=="; - }; - } - { - name = "_types_trusted_types___trusted_types_2.0.2.tgz"; - path = fetchurl { - name = "_types_trusted_types___trusted_types_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.2.tgz"; - sha512 = "F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg=="; - }; - } - { - name = "_types_ua_parser_js___ua_parser_js_0.7.36.tgz"; - path = fetchurl { - name = "_types_ua_parser_js___ua_parser_js_0.7.36.tgz"; - url = "https://registry.yarnpkg.com/@types/ua-parser-js/-/ua-parser-js-0.7.36.tgz"; - sha512 = "N1rW+njavs70y2cApeIw1vLMYXRwfBy+7trgavGuuTfOd7j1Yh7QTRc/yqsPl6ncokt72ZXuxEU0PiCp9bSwNQ=="; - }; - } - { - name = "_types_uuid___uuid_9.0.0.tgz"; - path = fetchurl { - name = "_types_uuid___uuid_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.0.tgz"; - sha512 = "kr90f+ERiQtKWMz5rP32ltJ/BtULDI5RVO0uavn1HQUOwjx0R1h0rnDYNL0CepF1zL5bSY6FISAfd9tOdDhU5Q=="; - }; - } - { - name = "_types_web_bluetooth___web_bluetooth_0.0.16.tgz"; - path = fetchurl { - name = "_types_web_bluetooth___web_bluetooth_0.0.16.tgz"; - url = "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz"; - sha512 = "oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ=="; - }; - } - { - name = "_types_ws___ws_8.5.3.tgz"; - path = fetchurl { - name = "_types_ws___ws_8.5.3.tgz"; - url = "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz"; - sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; - }; - } - { - name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; - path = fetchurl { - name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"; - sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; - }; - } - { - name = "_types_yargs___yargs_17.0.13.tgz"; - path = fetchurl { - name = "_types_yargs___yargs_17.0.13.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.13.tgz"; - sha512 = "9sWaruZk2JGxIQU+IhI1fhPYRcQ0UuTNuKuCW9bR5fp7qi2Llf7WDzNa17Cy7TKnh3cdxDOiyTu6gaLS0eDatg=="; - }; - } - { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.40.1.tgz"; - path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.40.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.40.1.tgz"; - sha512 = "FsWboKkWdytGiXT5O1/R9j37YgcjO8MKHSUmWnIEjVaz0krHkplPnYi7mwdb+5+cs0toFNQb0HIrN7zONdIEWg=="; - }; - } - { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.51.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_5.51.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.51.0.tgz"; - sha512 = "wcAwhEWm1RgNd7dxD/o+nnLW8oH+6RK1OGnmbmkj/GGoDPV1WWMVP0FXYQBivKHdwM1pwii3bt//RC62EriIUQ=="; - }; - } - { - name = "_typescript_eslint_parser___parser_5.40.1.tgz"; - path = fetchurl { - name = "_typescript_eslint_parser___parser_5.40.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.40.1.tgz"; - sha512 = "IK6x55va5w4YvXd4b3VrXQPldV9vQTxi5ov+g4pMANsXPTXOcfjx08CRR1Dfrcc51syPtXHF5bgLlMHYFrvQtg=="; - }; - } - { - name = "_typescript_eslint_parser___parser_5.51.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_parser___parser_5.51.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.51.0.tgz"; - sha512 = "fEV0R9gGmfpDeRzJXn+fGQKcl0inIeYobmmUWijZh9zA7bxJ8clPhV9up2ZQzATxAiFAECqPQyMDB4o4B81AaA=="; - }; - } - { - name = "_typescript_eslint_scope_manager___scope_manager_5.40.1.tgz"; - path = fetchurl { - name = "_typescript_eslint_scope_manager___scope_manager_5.40.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.40.1.tgz"; - sha512 = "jkn4xsJiUQucI16OLCXrLRXDZ3afKhOIqXs4R3O+M00hdQLKR58WuyXPZZjhKLFCEP2g+TXdBRtLQ33UfAdRUg=="; - }; - } - { - name = "_typescript_eslint_scope_manager___scope_manager_5.51.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_scope_manager___scope_manager_5.51.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.51.0.tgz"; - sha512 = "gNpxRdlx5qw3yaHA0SFuTjW4rxeYhpHxt491PEcKF8Z6zpq0kMhe0Tolxt0qjlojS+/wArSDlj/LtE69xUJphQ=="; - }; - } - { - name = "_typescript_eslint_type_utils___type_utils_5.40.1.tgz"; - path = fetchurl { - name = "_typescript_eslint_type_utils___type_utils_5.40.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.40.1.tgz"; - sha512 = "DLAs+AHQOe6n5LRraXiv27IYPhleF0ldEmx6yBqBgBLaNRKTkffhV1RPsjoJBhVup2zHxfaRtan8/YRBgYhU9Q=="; - }; - } - { - name = "_typescript_eslint_type_utils___type_utils_5.51.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_type_utils___type_utils_5.51.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.51.0.tgz"; - sha512 = "QHC5KKyfV8sNSyHqfNa0UbTbJ6caB8uhcx2hYcWVvJAZYJRBo5HyyZfzMdRx8nvS+GyMg56fugMzzWnojREuQQ=="; - }; - } - { - name = "_typescript_eslint_types___types_5.40.1.tgz"; - path = fetchurl { - name = "_typescript_eslint_types___types_5.40.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.40.1.tgz"; - sha512 = "Icg9kiuVJSwdzSQvtdGspOlWNjVDnF3qVIKXdJ103o36yRprdl3Ge5cABQx+csx960nuMF21v8qvO31v9t3OHw=="; - }; - } - { - name = "_typescript_eslint_types___types_5.51.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_types___types_5.51.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.51.0.tgz"; - sha512 = "SqOn0ANn/v6hFn0kjvLwiDi4AzR++CBZz0NV5AnusT2/3y32jdc0G4woXPWHCumWtUXZKPAS27/9vziSsC9jnw=="; - }; - } - { - name = "_typescript_eslint_typescript_estree___typescript_estree_5.40.1.tgz"; - path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_5.40.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.40.1.tgz"; - sha512 = "5QTP/nW5+60jBcEPfXy/EZL01qrl9GZtbgDZtDPlfW5zj/zjNrdI2B5zMUHmOsfvOr2cWqwVdWjobCiHcedmQA=="; - }; - } - { - name = "_typescript_eslint_typescript_estree___typescript_estree_5.51.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_5.51.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.51.0.tgz"; - sha512 = "TSkNupHvNRkoH9FMA3w7TazVFcBPveAAmb7Sz+kArY6sLT86PA5Vx80cKlYmd8m3Ha2SwofM1KwraF24lM9FvA=="; - }; - } - { - name = "_typescript_eslint_utils___utils_5.40.1.tgz"; - path = fetchurl { - name = "_typescript_eslint_utils___utils_5.40.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.40.1.tgz"; - sha512 = "a2TAVScoX9fjryNrW6BZRnreDUszxqm9eQ9Esv8n5nXApMW0zeANUYlwh/DED04SC/ifuBvXgZpIK5xeJHQ3aw=="; - }; - } - { - name = "_typescript_eslint_utils___utils_5.51.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_utils___utils_5.51.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.51.0.tgz"; - sha512 = "76qs+5KWcaatmwtwsDJvBk4H76RJQBFe+Gext0EfJdC3Vd2kpY2Pf//OHHzHp84Ciw0/rYoGTDnIAr3uWhhJYw=="; - }; - } - { - name = "_typescript_eslint_visitor_keys___visitor_keys_5.40.1.tgz"; - path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_5.40.1.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.40.1.tgz"; - sha512 = "A2DGmeZ+FMja0geX5rww+DpvILpwo1OsiQs0M+joPWJYsiEFBLsH0y1oFymPNul6Z5okSmHpP4ivkc2N0Cgfkw=="; - }; - } - { - name = "_typescript_eslint_visitor_keys___visitor_keys_5.51.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_visitor_keys___visitor_keys_5.51.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.51.0.tgz"; - sha512 = "Oh2+eTdjHjOFjKA27sxESlA87YPSOJafGCR0md5oeMdh1ZcCfAGCIOL216uTBAkAIptvLIfKQhl7lHxMJet4GQ=="; - }; - } - { - name = "_vitejs_plugin_vue___plugin_vue_4.0.0.tgz"; - path = fetchurl { - name = "_vitejs_plugin_vue___plugin_vue_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-4.0.0.tgz"; - sha512 = "e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA=="; - }; - } - { - name = "_vitest_expect___expect_0.28.4.tgz"; - path = fetchurl { - name = "_vitest_expect___expect_0.28.4.tgz"; - url = "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.28.4.tgz"; - sha512 = "JqK0NZ4brjvOSL8hXAnIsfi+jxDF7rH/ZWCGCt0FAqRnVFc1hXsfwXksQvEnKqD84avRt3gmeXoK4tNbmkoVsQ=="; - }; - } - { - name = "_vitest_runner___runner_0.28.4.tgz"; - path = fetchurl { - name = "_vitest_runner___runner_0.28.4.tgz"; - url = "https://registry.yarnpkg.com/@vitest/runner/-/runner-0.28.4.tgz"; - sha512 = "Q8UV6GjDvBSTfUoq0QXVCNpNOUrWu4P2qvRq7ssJWzn0+S0ojbVOxEjMt+8a32X6SdkhF8ak+2nkppsqV0JyNQ=="; - }; - } - { - name = "_vitest_spy___spy_0.28.4.tgz"; - path = fetchurl { - name = "_vitest_spy___spy_0.28.4.tgz"; - url = "https://registry.yarnpkg.com/@vitest/spy/-/spy-0.28.4.tgz"; - sha512 = "8WuhfXLlvCXpNXEGJW6Gc+IKWI32435fQJLh43u70HnZ1otJOa2Cmg2Wy2Aym47ZnNCP4NolF+8cUPwd0MigKQ=="; - }; - } - { - name = "_vitest_utils___utils_0.28.4.tgz"; - path = fetchurl { - name = "_vitest_utils___utils_0.28.4.tgz"; - url = "https://registry.yarnpkg.com/@vitest/utils/-/utils-0.28.4.tgz"; - sha512 = "l2QztOLdc2LkR+w/lP52RGh8hW+Ul4KESmCAgVE8q737I7e7bQoAfkARKpkPJ4JQtGpwW4deqlj1732VZD7TFw=="; - }; - } - { - name = "_volar_language_core___language_core_1.0.24.tgz"; - path = fetchurl { - name = "_volar_language_core___language_core_1.0.24.tgz"; - url = "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.0.24.tgz"; - sha512 = "vTN+alJiWwK0Pax6POqrmevbtFW2dXhjwWiW/MW4f48eDYPLdyURWcr8TixO7EN/nHsUBj2udT7igFKPtjyAKg=="; - }; - } - { - name = "_volar_source_map___source_map_1.0.24.tgz"; - path = fetchurl { - name = "_volar_source_map___source_map_1.0.24.tgz"; - url = "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.0.24.tgz"; - sha512 = "Qsv/tkplx18pgBr8lKAbM1vcDqgkGKQzbChg6NW+v0CZc3G7FLmK+WrqEPzKlN7Cwdc6XVL559Nod8WKAfKr4A=="; - }; - } - { - name = "_volar_typescript___typescript_1.0.24.tgz"; - path = fetchurl { - name = "_volar_typescript___typescript_1.0.24.tgz"; - url = "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.0.24.tgz"; - sha512 = "f8hCSk+PfKR1/RQHxZ79V1NpDImHoivqoizK+mstphm25tn/YJ/JnKNjZHB+o21fuW0yKlI26NV3jkVb2Cc/7A=="; - }; - } - { - name = "_volar_vue_language_core___vue_language_core_1.0.24.tgz"; - path = fetchurl { - name = "_volar_vue_language_core___vue_language_core_1.0.24.tgz"; - url = "https://registry.yarnpkg.com/@volar/vue-language-core/-/vue-language-core-1.0.24.tgz"; - sha512 = "2NTJzSgrwKu6uYwPqLiTMuAzi7fAY3yFy5PJ255bGJc82If0Xr+cW8pC80vpjG0D/aVLmlwAdO4+Ya2BI8GdDg=="; - }; - } - { - name = "_volar_vue_typescript___vue_typescript_1.0.24.tgz"; - path = fetchurl { - name = "_volar_vue_typescript___vue_typescript_1.0.24.tgz"; - url = "https://registry.yarnpkg.com/@volar/vue-typescript/-/vue-typescript-1.0.24.tgz"; - sha512 = "9a25oHDvGaNC0okRS47uqJI6FxY4hUQZUsxeOUFHcqVxZEv8s17LPuP/pMMXyz7jPygrZubB/qXqHY5jEu/akA=="; - }; - } - { - name = "_vue_apollo_composable___apollo_composable_4.0.0_beta.2.tgz"; - path = fetchurl { - name = "_vue_apollo_composable___apollo_composable_4.0.0_beta.2.tgz"; - url = "https://registry.yarnpkg.com/@vue/apollo-composable/-/apollo-composable-4.0.0-beta.2.tgz"; - sha512 = "SGZ1uklEldjG9UTMQnHyr9N4+C4D6hZXn3LDkDtpMVLAQksh30sqapSOFkEowOBVWyc/7f/JiCGADOhvxCWRxw=="; - }; - } - { - name = "_vue_compiler_core___compiler_core_3.2.41.tgz"; - path = fetchurl { - name = "_vue_compiler_core___compiler_core_3.2.41.tgz"; - url = "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.41.tgz"; - sha512 = "oA4mH6SA78DT+96/nsi4p9DX97PHcNROxs51lYk7gb9Z4BPKQ3Mh+BLn6CQZBw857Iuhu28BfMSRHAlPvD4vlw=="; - }; - } - { - name = "_vue_compiler_core___compiler_core_3.2.45.tgz"; - path = fetchurl { - name = "_vue_compiler_core___compiler_core_3.2.45.tgz"; - url = "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.45.tgz"; - sha512 = "rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A=="; - }; - } - { - name = "_vue_compiler_core___compiler_core_3.2.47.tgz"; - path = fetchurl { - name = "_vue_compiler_core___compiler_core_3.2.47.tgz"; - url = "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.47.tgz"; - sha512 = "p4D7FDnQb7+YJmO2iPEv0SQNeNzcbHdGByJDsT4lynf63AFkOTFN07HsiRSvjGo0QrxR/o3d0hUyNCUnBU2Tig=="; - }; - } - { - name = "_vue_compiler_dom___compiler_dom_3.2.41.tgz"; - path = fetchurl { - name = "_vue_compiler_dom___compiler_dom_3.2.41.tgz"; - url = "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.41.tgz"; - sha512 = "xe5TbbIsonjENxJsYRbDJvthzqxLNk+tb3d/c47zgREDa/PCp6/Y4gC/skM4H6PIuX5DAxm7fFJdbjjUH2QTMw=="; - }; - } - { - name = "_vue_compiler_dom___compiler_dom_3.2.45.tgz"; - path = fetchurl { - name = "_vue_compiler_dom___compiler_dom_3.2.45.tgz"; - url = "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.45.tgz"; - sha512 = "tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw=="; - }; - } - { - name = "_vue_compiler_dom___compiler_dom_3.2.47.tgz"; - path = fetchurl { - name = "_vue_compiler_dom___compiler_dom_3.2.47.tgz"; - url = "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.47.tgz"; - sha512 = "dBBnEHEPoftUiS03a4ggEig74J2YBZ2UIeyfpcRM2tavgMWo4bsEfgCGsu+uJIL/vax9S+JztH8NmQerUo7shQ=="; - }; - } - { - name = "_vue_compiler_sfc___compiler_sfc_3.2.47.tgz"; - path = fetchurl { - name = "_vue_compiler_sfc___compiler_sfc_3.2.47.tgz"; - url = "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.47.tgz"; - sha512 = "rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ=="; - }; - } - { - name = "_vue_compiler_sfc___compiler_sfc_3.2.41.tgz"; - path = fetchurl { - name = "_vue_compiler_sfc___compiler_sfc_3.2.41.tgz"; - url = "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.41.tgz"; - sha512 = "+1P2m5kxOeaxVmJNXnBskAn3BenbTmbxBxWOtBq3mQTCokIreuMULFantBUclP0+KnzNCMOvcnKinqQZmiOF8w=="; - }; - } - { - name = "_vue_compiler_sfc___compiler_sfc_3.2.45.tgz"; - path = fetchurl { - name = "_vue_compiler_sfc___compiler_sfc_3.2.45.tgz"; - url = "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.45.tgz"; - sha512 = "1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q=="; - }; - } - { - name = "_vue_compiler_ssr___compiler_ssr_3.2.41.tgz"; - path = fetchurl { - name = "_vue_compiler_ssr___compiler_ssr_3.2.41.tgz"; - url = "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.41.tgz"; - sha512 = "Y5wPiNIiaMz/sps8+DmhaKfDm1xgj6GrH99z4gq2LQenfVQcYXmHIOBcs5qPwl7jaW3SUQWjkAPKMfQemEQZwQ=="; - }; - } - { - name = "_vue_compiler_ssr___compiler_ssr_3.2.45.tgz"; - path = fetchurl { - name = "_vue_compiler_ssr___compiler_ssr_3.2.45.tgz"; - url = "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.45.tgz"; - sha512 = "6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ=="; - }; - } - { - name = "_vue_compiler_ssr___compiler_ssr_3.2.47.tgz"; - path = fetchurl { - name = "_vue_compiler_ssr___compiler_ssr_3.2.47.tgz"; - url = "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz"; - sha512 = "wVXC+gszhulcMD8wpxMsqSOpvDZ6xKXSVWkf50Guf/S+28hTAXPDYRTbLQ3EDkOP5Xz/+SY37YiwDquKbJOgZw=="; - }; - } - { - name = "_vue_devtools_api___devtools_api_6.4.5.tgz"; - path = fetchurl { - name = "_vue_devtools_api___devtools_api_6.4.5.tgz"; - url = "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.4.5.tgz"; - sha512 = "JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="; - }; - } - { - name = "_vue_eslint_config_prettier___eslint_config_prettier_7.0.0.tgz"; - path = fetchurl { - name = "_vue_eslint_config_prettier___eslint_config_prettier_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@vue/eslint-config-prettier/-/eslint-config-prettier-7.0.0.tgz"; - sha512 = "/CTc6ML3Wta1tCe1gUeO0EYnVXfo3nJXsIhZ8WJr3sov+cGASr6yuiibJTL6lmIBm7GobopToOuB3B6AWyV0Iw=="; - }; - } - { - name = "_vue_eslint_config_typescript___eslint_config_typescript_11.0.2.tgz"; - path = fetchurl { - name = "_vue_eslint_config_typescript___eslint_config_typescript_11.0.2.tgz"; - url = "https://registry.yarnpkg.com/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.2.tgz"; - sha512 = "EiKud1NqlWmSapBFkeSrE994qpKx7/27uCGnhdqzllYDpQZroyX/O6bwjEpeuyKamvLbsGdO6PMR2faIf+zFnw=="; - }; - } - { - name = "_vue_reactivity_transform___reactivity_transform_3.2.41.tgz"; - path = fetchurl { - name = "_vue_reactivity_transform___reactivity_transform_3.2.41.tgz"; - url = "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.41.tgz"; - sha512 = "mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A=="; - }; - } - { - name = "_vue_reactivity_transform___reactivity_transform_3.2.45.tgz"; - path = fetchurl { - name = "_vue_reactivity_transform___reactivity_transform_3.2.45.tgz"; - url = "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz"; - sha512 = "BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ=="; - }; - } - { - name = "_vue_reactivity_transform___reactivity_transform_3.2.47.tgz"; - path = fetchurl { - name = "_vue_reactivity_transform___reactivity_transform_3.2.47.tgz"; - url = "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz"; - sha512 = "m8lGXw8rdnPVVIdIFhf0LeQ/ixyHkH5plYuS83yop5n7ggVJU+z5v0zecwEnX7fa7HNLBhh2qngJJkxpwEEmYA=="; - }; - } - { - name = "_vue_reactivity___reactivity_3.2.47.tgz"; - path = fetchurl { - name = "_vue_reactivity___reactivity_3.2.47.tgz"; - url = "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.47.tgz"; - sha512 = "7khqQ/75oyyg+N/e+iwV6lpy1f5wq759NdlS1fpAhFXa8VeAIKGgk2E/C4VF59lx5b+Ezs5fpp/5WsRYXQiKxQ=="; - }; - } - { - name = "_vue_reactivity___reactivity_3.2.45.tgz"; - path = fetchurl { - name = "_vue_reactivity___reactivity_3.2.45.tgz"; - url = "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.45.tgz"; - sha512 = "PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A=="; - }; - } - { - name = "_vue_runtime_core___runtime_core_3.2.47.tgz"; - path = fetchurl { - name = "_vue_runtime_core___runtime_core_3.2.47.tgz"; - url = "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.47.tgz"; - sha512 = "RZxbLQIRB/K0ev0K9FXhNbBzT32H9iRtYbaXb0ZIz2usLms/D55dJR2t6cIEUn6vyhS3ALNvNthI+Q95C+NOpA=="; - }; - } - { - name = "_vue_runtime_dom___runtime_dom_3.2.47.tgz"; - path = fetchurl { - name = "_vue_runtime_dom___runtime_dom_3.2.47.tgz"; - url = "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.47.tgz"; - sha512 = "ArXrFTjS6TsDei4qwNvgrdmHtD930KgSKGhS5M+j8QxXrDJYLqYw4RRcDy1bz1m1wMmb6j+zGLifdVHtkXA7gA=="; - }; - } - { - name = "_vue_server_renderer___server_renderer_3.2.47.tgz"; - path = fetchurl { - name = "_vue_server_renderer___server_renderer_3.2.47.tgz"; - url = "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.47.tgz"; - sha512 = "dN9gc1i8EvmP9RCzvneONXsKfBRgqFeFZLurmHOveL7oH6HiFXJw5OGu294n1nHc/HMgTy6LulU/tv5/A7f/LA=="; - }; - } - { - name = "_vue_shared___shared_3.2.41.tgz"; - path = fetchurl { - name = "_vue_shared___shared_3.2.41.tgz"; - url = "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.41.tgz"; - sha512 = "W9mfWLHmJhkfAmV+7gDjcHeAWALQtgGT3JErxULl0oz6R6+3ug91I7IErs93eCFhPCZPHBs4QJS7YWEV7A3sxw=="; - }; - } - { - name = "_vue_shared___shared_3.2.45.tgz"; - path = fetchurl { - name = "_vue_shared___shared_3.2.45.tgz"; - url = "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.45.tgz"; - sha512 = "Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg=="; - }; - } - { - name = "_vue_shared___shared_3.2.47.tgz"; - path = fetchurl { - name = "_vue_shared___shared_3.2.47.tgz"; - url = "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.47.tgz"; - sha512 = "BHGyyGN3Q97EZx0taMQ+OLNuZcW3d37ZEVmEAyeoA9ERdGvm9Irc/0Fua8SNyOtV1w6BS4q25wbMzJujO9HIfQ=="; - }; - } - { - name = "_vue_test_utils___test_utils_2.2.0.tgz"; - path = fetchurl { - name = "_vue_test_utils___test_utils_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.2.0.tgz"; - sha512 = "EKp5/N7ieNZdoLTkD16j/irUjIEDN63QUIc41vLUMqGvSsTQN0QxbFiQqh5v49RPfS5vZH+DhjNUEkijCMOCSg=="; - }; - } - { - name = "_vue_test_utils___test_utils_2.2.10.tgz"; - path = fetchurl { - name = "_vue_test_utils___test_utils_2.2.10.tgz"; - url = "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.2.10.tgz"; - sha512 = "UPY+VdWST5vYZ/Qhl+sLuJAv596e6kTbrOPgdGY82qd9kGN/MfjzLT5KXlmpChkiCbPP3abZ8XT25u1n5h+mRg=="; - }; - } - { - name = "_vueuse_core___core_9.12.0.tgz"; - path = fetchurl { - name = "_vueuse_core___core_9.12.0.tgz"; - url = "https://registry.yarnpkg.com/@vueuse/core/-/core-9.12.0.tgz"; - sha512 = "h/Di8Bvf6xRcvS/PvUVheiMYYz3U0tH3X25YxONSaAUBa841ayMwxkuzx/DGUMCW/wHWzD8tRy2zYmOC36r4sg=="; - }; - } - { - name = "_vueuse_metadata___metadata_9.12.0.tgz"; - path = fetchurl { - name = "_vueuse_metadata___metadata_9.12.0.tgz"; - url = "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-9.12.0.tgz"; - sha512 = "9oJ9MM9lFLlmvxXUqsR1wLt1uF7EVbP5iYaHJYqk+G2PbMjY6EXvZeTjbdO89HgoF5cI6z49o2zT/jD9SVoNpQ=="; - }; - } - { - name = "_vueuse_router___router_9.12.0.tgz"; - path = fetchurl { - name = "_vueuse_router___router_9.12.0.tgz"; - url = "https://registry.yarnpkg.com/@vueuse/router/-/router-9.12.0.tgz"; - sha512 = "I3TaWrsxEdANrgJjNEeRTbOMGS+uYjB5zHoyayhFgk1SY1ytDw51tgXr6n4n9fVqglorvhKdX5rFDvBAbeQ+Xw=="; - }; - } - { - name = "_vueuse_shared___shared_9.12.0.tgz"; - path = fetchurl { - name = "_vueuse_shared___shared_9.12.0.tgz"; - url = "https://registry.yarnpkg.com/@vueuse/shared/-/shared-9.12.0.tgz"; - sha512 = "TWuJLACQ0BVithVTRbex4Wf1a1VaRuSpVeyEd4vMUWl54PzlE0ciFUshKCXnlLuD0lxIaLK4Ypj3NXYzZh4+SQ=="; - }; - } - { - name = "_whatwg_node_fetch___fetch_0.6.1.tgz"; - path = fetchurl { - name = "_whatwg_node_fetch___fetch_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.6.1.tgz"; - sha512 = "sG39WLvcJxGZ+gDstnLSXR2IcnuvIOB51KxCFo0mEhFW0q2u8fZgolr0HPkL+zXwOJsnmT+9V3IRcqLnTXdqVQ=="; - }; - } - { - name = "_whatwg_node_fetch___fetch_0.4.7.tgz"; - path = fetchurl { - name = "_whatwg_node_fetch___fetch_0.4.7.tgz"; - url = "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.4.7.tgz"; - sha512 = "+oKDMGtmUJ7H37VDL5U2Vdk+ZxsIypZxO2q6y42ytu6W3PL6OIIUYZGliNqQgWtCdtxOZ9WPQvbIAuiLpnLlUw=="; - }; - } - { - name = "_whatwg_node_fetch___fetch_0.6.2.tgz"; - path = fetchurl { - name = "_whatwg_node_fetch___fetch_0.6.2.tgz"; - url = "https://registry.yarnpkg.com/@whatwg-node/fetch/-/fetch-0.6.2.tgz"; - sha512 = "fCUycF1W+bI6XzwJFnbdDuxIldfKM3w8+AzVCLGlucm0D+AQ8ZMm2j84hdcIhfV6ZdE4Y1HFVrHosAxdDZ+nPw=="; - }; - } - { - name = "_wry_context___context_0.6.1.tgz"; - path = fetchurl { - name = "_wry_context___context_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/@wry/context/-/context-0.6.1.tgz"; - sha512 = "LOmVnY1iTU2D8tv4Xf6MVMZZ+juIJ87Kt/plMijjN20NMAXGmH4u8bS1t0uT74cZ5gwpocYueV58YwyI8y+GKw=="; - }; - } - { - name = "_wry_context___context_0.7.0.tgz"; - path = fetchurl { - name = "_wry_context___context_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/@wry/context/-/context-0.7.0.tgz"; - sha512 = "LcDAiYWRtwAoSOArfk7cuYvFXytxfVrdX7yxoUmK7pPITLk5jYh2F8knCwS7LjgYL8u1eidPlKKV6Ikqq0ODqQ=="; - }; - } - { - name = "_wry_equality___equality_0.5.3.tgz"; - path = fetchurl { - name = "_wry_equality___equality_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/@wry/equality/-/equality-0.5.3.tgz"; - sha512 = "avR+UXdSrsF2v8vIqIgmeTY0UR91UT+IyablCyKe/uk22uOJ8fusKZnH9JH9e1/EtLeNJBtagNmL3eJdnOV53g=="; - }; - } - { - name = "_wry_trie___trie_0.3.2.tgz"; - path = fetchurl { - name = "_wry_trie___trie_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/@wry/trie/-/trie-0.3.2.tgz"; - sha512 = "yRTyhWSls2OY/pYLfwff867r8ekooZ4UI+/gxot5Wj8EFwSf2rG+n+Mo/6LoLQm1TKA4GRj2+LCpbfS937dClQ=="; - }; - } - { - name = "abab___abab_2.0.6.tgz"; - path = fetchurl { - name = "abab___abab_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz"; - sha512 = "j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="; - }; - } - { - name = "abbrev___abbrev_1.1.1.tgz"; - path = fetchurl { - name = "abbrev___abbrev_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz"; - sha512 = "nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q=="; - }; - } - { - name = "abort_controller___abort_controller_3.0.0.tgz"; - path = fetchurl { - name = "abort_controller___abort_controller_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz"; - sha512 = "h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg=="; - }; - } - { - name = "acorn_globals___acorn_globals_7.0.1.tgz"; - path = fetchurl { - name = "acorn_globals___acorn_globals_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz"; - sha512 = "umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q=="; - }; - } - { - name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; - path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.3.2.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; - sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; - }; - } - { - name = "acorn_node___acorn_node_1.8.2.tgz"; - path = fetchurl { - name = "acorn_node___acorn_node_1.8.2.tgz"; - url = "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz"; - sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A=="; - }; - } - { - name = "acorn_walk___acorn_walk_7.2.0.tgz"; - path = fetchurl { - name = "acorn_walk___acorn_walk_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz"; - sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; - }; - } - { - name = "acorn_walk___acorn_walk_8.2.0.tgz"; - path = fetchurl { - name = "acorn_walk___acorn_walk_8.2.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz"; - sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; - }; - } - { - name = "acorn___acorn_7.4.1.tgz"; - path = fetchurl { - name = "acorn___acorn_7.4.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; - sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; - }; - } - { - name = "acorn___acorn_8.8.0.tgz"; - path = fetchurl { - name = "acorn___acorn_8.8.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz"; - sha512 = "QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="; - }; - } - { - name = "acorn___acorn_8.8.1.tgz"; - path = fetchurl { - name = "acorn___acorn_8.8.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz"; - sha512 = "7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA=="; - }; - } - { - name = "agent_base___agent_base_6.0.2.tgz"; - path = fetchurl { - name = "agent_base___agent_base_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; - sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; - }; - } - { - name = "aggregate_error___aggregate_error_3.1.0.tgz"; - path = fetchurl { - name = "aggregate_error___aggregate_error_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; - sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; - }; - } - { - name = "ajv___ajv_6.12.6.tgz"; - path = fetchurl { - name = "ajv___ajv_6.12.6.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; - sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; - }; - } - { - name = "ajv___ajv_8.11.0.tgz"; - path = fetchurl { - name = "ajv___ajv_8.11.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz"; - sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; - }; - } - { - name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; - path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; - sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; - }; - } - { - name = "ansi_regex___ansi_regex_5.0.1.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; - }; - } - { - name = "ansi_regex___ansi_regex_6.0.1.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz"; - sha512 = "n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="; - }; - } - { - name = "ansi_styles___ansi_styles_3.2.1.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz"; - sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; - }; - } - { - name = "ansi_styles___ansi_styles_4.3.0.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; - }; - } - { - name = "ansi_styles___ansi_styles_5.2.0.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz"; - sha512 = "Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA=="; - }; - } - { - name = "ansi_styles___ansi_styles_6.2.1.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_6.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz"; - sha512 = "bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="; - }; - } - { - name = "anymatch___anymatch_3.1.2.tgz"; - path = fetchurl { - name = "anymatch___anymatch_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz"; - sha512 = "P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg=="; - }; - } - { - name = "arg___arg_4.1.3.tgz"; - path = fetchurl { - name = "arg___arg_4.1.3.tgz"; - url = "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz"; - sha512 = "58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="; - }; - } - { - name = "arg___arg_5.0.2.tgz"; - path = fetchurl { - name = "arg___arg_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz"; - sha512 = "PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="; - }; - } - { - name = "argparse___argparse_1.0.10.tgz"; - path = fetchurl { - name = "argparse___argparse_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; - sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; - }; - } - { - name = "argparse___argparse_2.0.1.tgz"; - path = fetchurl { - name = "argparse___argparse_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; - sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; - }; - } - { - name = "aria_query___aria_query_5.1.1.tgz"; - path = fetchurl { - name = "aria_query___aria_query_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/aria-query/-/aria-query-5.1.1.tgz"; - sha512 = "4cPQjOYM2mqq7mZG8CSxkUvL2Yv/x29VhGq5LKehTsxRnoVQps1YGt9NyjcNQsznEsD4rr8a6zGxqeNTqJWjpA=="; - }; - } - { - name = "arr_diff___arr_diff_4.0.0.tgz"; - path = fetchurl { - name = "arr_diff___arr_diff_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz"; - sha512 = "YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA=="; - }; - } - { - name = "arr_flatten___arr_flatten_1.1.0.tgz"; - path = fetchurl { - name = "arr_flatten___arr_flatten_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; - }; - } - { - name = "arr_union___arr_union_3.1.0.tgz"; - path = fetchurl { - name = "arr_union___arr_union_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz"; - sha512 = "sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q=="; - }; - } - { - name = "array_includes___array_includes_3.1.6.tgz"; - path = fetchurl { - name = "array_includes___array_includes_3.1.6.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz"; - sha512 = "sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw=="; - }; - } - { - name = "array_union___array_union_2.1.0.tgz"; - path = fetchurl { - name = "array_union___array_union_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz"; - sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; - }; - } - { - name = "array_unique___array_unique_0.3.2.tgz"; - path = fetchurl { - name = "array_unique___array_unique_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz"; - sha512 = "SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="; - }; - } - { - name = "array.prototype.flat___array.prototype.flat_1.3.1.tgz"; - path = fetchurl { - name = "array.prototype.flat___array.prototype.flat_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz"; - sha512 = "roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA=="; - }; - } - { - name = "array.prototype.flatmap___array.prototype.flatmap_1.3.1.tgz"; - path = fetchurl { - name = "array.prototype.flatmap___array.prototype.flatmap_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz"; - sha512 = "8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ=="; - }; - } - { - name = "arrify___arrify_1.0.1.tgz"; - path = fetchurl { - name = "arrify___arrify_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz"; - sha512 = "3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA=="; - }; - } - { - name = "asap___asap_2.0.6.tgz"; - path = fetchurl { - name = "asap___asap_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz"; - sha512 = "BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="; - }; - } - { - name = "asn1js___asn1js_3.0.5.tgz"; - path = fetchurl { - name = "asn1js___asn1js_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/asn1js/-/asn1js-3.0.5.tgz"; - sha512 = "FVnvrKJwpt9LP2lAMl8qZswRNm3T4q9CON+bxldk2iwk3FFpuwhx2FfinyitizWHsVYyaY+y5JzDR0rCMV5yTQ=="; - }; - } - { - name = "assertion_error___assertion_error_1.1.0.tgz"; - path = fetchurl { - name = "assertion_error___assertion_error_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz"; - sha512 = "jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw=="; - }; - } - { - name = "assign_symbols___assign_symbols_1.0.0.tgz"; - path = fetchurl { - name = "assign_symbols___assign_symbols_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz"; - sha512 = "Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw=="; - }; - } - { - name = "astral_regex___astral_regex_2.0.0.tgz"; - path = fetchurl { - name = "astral_regex___astral_regex_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; - sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; - }; - } - { - name = "async_mutex___async_mutex_0.4.0.tgz"; - path = fetchurl { - name = "async_mutex___async_mutex_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/async-mutex/-/async-mutex-0.4.0.tgz"; - sha512 = "eJFZ1YhRR8UN8eBLoNzcDPcy/jqjsg6I1AP+KvWQX80BqOSW1oJPJXDylPUEeMr2ZQvHgnQ//Lp6f3RQ1zI7HA=="; - }; - } - { - name = "async___async_3.2.4.tgz"; - path = fetchurl { - name = "async___async_3.2.4.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz"; - sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; - }; - } - { - name = "asynckit___asynckit_0.4.0.tgz"; - path = fetchurl { - name = "asynckit___asynckit_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; - }; - } - { - name = "at_least_node___at_least_node_1.0.0.tgz"; - path = fetchurl { - name = "at_least_node___at_least_node_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; - sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; - }; - } - { - name = "atob___atob_2.1.2.tgz"; - path = fetchurl { - name = "atob___atob_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"; - sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; - }; - } - { - name = "auto_bind___auto_bind_4.0.0.tgz"; - path = fetchurl { - name = "auto_bind___auto_bind_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/auto-bind/-/auto-bind-4.0.0.tgz"; - sha512 = "Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ=="; - }; - } - { - name = "autoprefixer___autoprefixer_10.4.13.tgz"; - path = fetchurl { - name = "autoprefixer___autoprefixer_10.4.13.tgz"; - url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.13.tgz"; - sha512 = "49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg=="; - }; - } - { - name = "available_typed_arrays___available_typed_arrays_1.0.5.tgz"; - path = fetchurl { - name = "available_typed_arrays___available_typed_arrays_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"; - sha512 = "DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw=="; - }; - } - { - name = "axe_core___axe_core_4.4.3.tgz"; - path = fetchurl { - name = "axe_core___axe_core_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.3.tgz"; - sha512 = "32+ub6kkdhhWick/UjvEwRchgoetXqTK14INLqbGm5U2TzBkBNF3nQtLYm8ovxSkQWArjEQvftCKryjZaATu3w=="; - }; - } - { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.3.3.tgz"; - path = fetchurl { - name = "babel_plugin_polyfill_corejs2___babel_plugin_polyfill_corejs2_0.3.3.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz"; - sha512 = "8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q=="; - }; - } - { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.6.0.tgz"; - path = fetchurl { - name = "babel_plugin_polyfill_corejs3___babel_plugin_polyfill_corejs3_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz"; - sha512 = "+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA=="; - }; - } - { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.4.1.tgz"; - path = fetchurl { - name = "babel_plugin_polyfill_regenerator___babel_plugin_polyfill_regenerator_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz"; - sha512 = "NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw=="; - }; - } - { - name = "babel_plugin_syntax_trailing_function_commas___babel_plugin_syntax_trailing_function_commas_7.0.0_beta.0.tgz"; - path = fetchurl { - name = "babel_plugin_syntax_trailing_function_commas___babel_plugin_syntax_trailing_function_commas_7.0.0_beta.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz"; - sha512 = "Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ=="; - }; - } - { - name = "babel_preset_fbjs___babel_preset_fbjs_3.4.0.tgz"; - path = fetchurl { - name = "babel_preset_fbjs___babel_preset_fbjs_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz"; - sha512 = "9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow=="; - }; - } - { - name = "balanced_match___balanced_match_1.0.2.tgz"; - path = fetchurl { - name = "balanced_match___balanced_match_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; - sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; - }; - } - { - name = "balanced_match___balanced_match_2.0.0.tgz"; - path = fetchurl { - name = "balanced_match___balanced_match_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-2.0.0.tgz"; - sha512 = "1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA=="; - }; - } - { - name = "base64_js___base64_js_1.5.1.tgz"; - path = fetchurl { - name = "base64_js___base64_js_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; - sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; - }; - } - { - name = "base___base_0.11.2.tgz"; - path = fetchurl { - name = "base___base_0.11.2.tgz"; - url = "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz"; - sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; - }; - } - { - name = "binary_extensions___binary_extensions_2.2.0.tgz"; - path = fetchurl { - name = "binary_extensions___binary_extensions_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz"; - sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; - }; - } - { - name = "birpc___birpc_0.1.1.tgz"; - path = fetchurl { - name = "birpc___birpc_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/birpc/-/birpc-0.1.1.tgz"; - sha512 = "B64AGL4ug2IS2jvV/zjTYDD1L+2gOJTT7Rv+VaK7KVQtQOo/xZbCDsh7g727ipckmU+QJYRqo5RcifVr0Kgcmg=="; - }; - } - { - name = "bl___bl_4.1.0.tgz"; - path = fetchurl { - name = "bl___bl_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz"; - sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; - }; - } - { - name = "bluebird___bluebird_3.7.2.tgz"; - path = fetchurl { - name = "bluebird___bluebird_3.7.2.tgz"; - url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; - sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; - }; - } - { - name = "boolbase___boolbase_1.0.0.tgz"; - path = fetchurl { - name = "boolbase___boolbase_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz"; - sha512 = "JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="; - }; - } - { - name = "brace_expansion___brace_expansion_1.1.11.tgz"; - path = fetchurl { - name = "brace_expansion___brace_expansion_1.1.11.tgz"; - url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - } - { - name = "brace_expansion___brace_expansion_2.0.1.tgz"; - path = fetchurl { - name = "brace_expansion___brace_expansion_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz"; - sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; - }; - } - { - name = "braces___braces_2.3.2.tgz"; - path = fetchurl { - name = "braces___braces_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz"; - sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; - }; - } - { - name = "braces___braces_3.0.2.tgz"; - path = fetchurl { - name = "braces___braces_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz"; - sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; - }; - } - { - name = "browserslist___browserslist_4.21.4.tgz"; - path = fetchurl { - name = "browserslist___browserslist_4.21.4.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz"; - sha512 = "CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw=="; - }; - } - { - name = "bser___bser_2.1.1.tgz"; - path = fetchurl { - name = "bser___bser_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz"; - sha512 = "gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ=="; - }; - } - { - name = "buffer_equal_constant_time___buffer_equal_constant_time_1.0.1.tgz"; - path = fetchurl { - name = "buffer_equal_constant_time___buffer_equal_constant_time_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz"; - sha512 = "zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="; - }; - } - { - name = "buffer_from___buffer_from_1.1.2.tgz"; - path = fetchurl { - name = "buffer_from___buffer_from_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; - sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; - }; - } - { - name = "buffer___buffer_5.7.1.tgz"; - path = fetchurl { - name = "buffer___buffer_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; - sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; - }; - } - { - name = "builtin_modules___builtin_modules_3.3.0.tgz"; - path = fetchurl { - name = "builtin_modules___builtin_modules_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz"; - sha512 = "zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw=="; - }; - } - { - name = "busboy___busboy_1.6.0.tgz"; - path = fetchurl { - name = "busboy___busboy_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz"; - sha512 = "8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA=="; - }; - } - { - name = "cac___cac_6.7.14.tgz"; - path = fetchurl { - name = "cac___cac_6.7.14.tgz"; - url = "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz"; - sha512 = "b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ=="; - }; - } - { - name = "cache_base___cache_base_1.0.1.tgz"; - path = fetchurl { - name = "cache_base___cache_base_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz"; - sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; - }; - } - { - name = "call_bind___call_bind_1.0.2.tgz"; - path = fetchurl { - name = "call_bind___call_bind_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; - sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; - }; - } - { - name = "callsites___callsites_3.1.0.tgz"; - path = fetchurl { - name = "callsites___callsites_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; - sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; - }; - } - { - name = "camel_case___camel_case_4.1.2.tgz"; - path = fetchurl { - name = "camel_case___camel_case_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz"; - sha512 = "gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw=="; - }; - } - { - name = "camelcase_css___camelcase_css_2.0.1.tgz"; - path = fetchurl { - name = "camelcase_css___camelcase_css_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/camelcase-css/-/camelcase-css-2.0.1.tgz"; - sha512 = "QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="; - }; - } - { - name = "camelcase_keys___camelcase_keys_6.2.2.tgz"; - path = fetchurl { - name = "camelcase_keys___camelcase_keys_6.2.2.tgz"; - url = "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz"; - sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; - }; - } - { - name = "camelcase___camelcase_5.3.1.tgz"; - path = fetchurl { - name = "camelcase___camelcase_5.3.1.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz"; - sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; - }; - } - { - name = "caniuse_lite___caniuse_lite_1.0.30001423.tgz"; - path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001423.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001423.tgz"; - sha512 = "09iwWGOlifvE1XuHokFMP7eR38a0JnajoyL3/i87c8ZjRWRrdKo1fqjNfugfBD0UDBIOz0U+jtNhJ0EPm1VleQ=="; - }; - } - { - name = "caniuse_lite___caniuse_lite_1.0.30001427.tgz"; - path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001427.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001427.tgz"; - sha512 = "lfXQ73oB9c8DP5Suxaszm+Ta2sr/4tf8+381GkIm1MLj/YdLf+rEDyDSRCzeltuyTVGm+/s18gdZ0q+Wmp8VsQ=="; - }; - } - { - name = "capital_case___capital_case_1.0.4.tgz"; - path = fetchurl { - name = "capital_case___capital_case_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz"; - sha512 = "ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A=="; - }; - } - { - name = "case_anything___case_anything_2.1.10.tgz"; - path = fetchurl { - name = "case_anything___case_anything_2.1.10.tgz"; - url = "https://registry.yarnpkg.com/case-anything/-/case-anything-2.1.10.tgz"; - sha512 = "JczJwVrCP0jPKh05McyVsuOg6AYosrB9XWZKbQzXeDAm2ClE/PJE/BcrrQrVyGYH7Jg8V/LDupmyL4kFlVsVFQ=="; - }; - } - { - name = "chai___chai_4.3.7.tgz"; - path = fetchurl { - name = "chai___chai_4.3.7.tgz"; - url = "https://registry.yarnpkg.com/chai/-/chai-4.3.7.tgz"; - sha512 = "HLnAzZ2iupm25PlN0xFreAlBA5zaBSv3og0DdeGA4Ar6h6rJ3A0rolRUKJhSF2V10GZKDgWF/VmAEsNWjCRB+A=="; - }; - } - { - name = "chalk___chalk_2.4.2.tgz"; - path = fetchurl { - name = "chalk___chalk_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz"; - sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; - }; - } - { - name = "chalk___chalk_3.0.0.tgz"; - path = fetchurl { - name = "chalk___chalk_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz"; - sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; - }; - } - { - name = "chalk___chalk_4.1.2.tgz"; - path = fetchurl { - name = "chalk___chalk_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; - sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; - }; - } - { - name = "chalk___chalk_5.1.2.tgz"; - path = fetchurl { - name = "chalk___chalk_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-5.1.2.tgz"; - sha512 = "E5CkT4jWURs1Vy5qGJye+XwCkNj7Od3Af7CP6SujMetSMkLs8Do2RWJK5yx1wamHV/op8Rz+9rltjaTQWDnEFQ=="; - }; - } - { - name = "change_case_all___change_case_all_1.0.14.tgz"; - path = fetchurl { - name = "change_case_all___change_case_all_1.0.14.tgz"; - url = "https://registry.yarnpkg.com/change-case-all/-/change-case-all-1.0.14.tgz"; - sha512 = "CWVm2uT7dmSHdO/z1CXT/n47mWonyypzBbuCy5tN7uMg22BsfkhwT6oHmFCAk+gL1LOOxhdbB9SZz3J1KTY3gA=="; - }; - } - { - name = "change_case_all___change_case_all_1.0.15.tgz"; - path = fetchurl { - name = "change_case_all___change_case_all_1.0.15.tgz"; - url = "https://registry.yarnpkg.com/change-case-all/-/change-case-all-1.0.15.tgz"; - sha512 = "3+GIFhk3sNuvFAJKU46o26OdzudQlPNBCu1ZQi3cMeMHhty1bhDxu2WrEilVNYaGvqUtR1VSigFcJOiS13dRhQ=="; - }; - } - { - name = "change_case___change_case_4.1.2.tgz"; - path = fetchurl { - name = "change_case___change_case_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/change-case/-/change-case-4.1.2.tgz"; - sha512 = "bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A=="; - }; - } - { - name = "chardet___chardet_0.7.0.tgz"; - path = fetchurl { - name = "chardet___chardet_0.7.0.tgz"; - url = "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz"; - sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="; - }; - } - { - name = "check_error___check_error_1.0.2.tgz"; - path = fetchurl { - name = "check_error___check_error_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz"; - sha512 = "BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA=="; - }; - } - { - name = "chokidar___chokidar_3.5.3.tgz"; - path = fetchurl { - name = "chokidar___chokidar_3.5.3.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz"; - sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; - }; - } - { - name = "ci_info___ci_info_3.5.0.tgz"; - path = fetchurl { - name = "ci_info___ci_info_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.5.0.tgz"; - sha512 = "yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw=="; - }; - } - { - name = "class_utils___class_utils_0.3.6.tgz"; - path = fetchurl { - name = "class_utils___class_utils_0.3.6.tgz"; - url = "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz"; - sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; - }; - } - { - name = "classnames___classnames_2.3.2.tgz"; - path = fetchurl { - name = "classnames___classnames_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz"; - sha512 = "CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="; - }; - } - { - name = "clean_stack___clean_stack_2.2.0.tgz"; - path = fetchurl { - name = "clean_stack___clean_stack_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; - sha512 = "4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A=="; - }; - } - { - name = "cli_cursor___cli_cursor_3.1.0.tgz"; - path = fetchurl { - name = "cli_cursor___cli_cursor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; - sha512 = "I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw=="; - }; - } - { - name = "cli_spinners___cli_spinners_2.7.0.tgz"; - path = fetchurl { - name = "cli_spinners___cli_spinners_2.7.0.tgz"; - url = "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz"; - sha512 = "qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw=="; - }; - } - { - name = "cli_truncate___cli_truncate_2.1.0.tgz"; - path = fetchurl { - name = "cli_truncate___cli_truncate_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz"; - sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; - }; - } - { - name = "cli_truncate___cli_truncate_3.1.0.tgz"; - path = fetchurl { - name = "cli_truncate___cli_truncate_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-3.1.0.tgz"; - sha512 = "wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA=="; - }; - } - { - name = "cli_width___cli_width_3.0.0.tgz"; - path = fetchurl { - name = "cli_width___cli_width_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz"; - sha512 = "FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="; - }; - } - { - name = "cliui___cliui_6.0.0.tgz"; - path = fetchurl { - name = "cliui___cliui_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz"; - sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; - }; - } - { - name = "cliui___cliui_8.0.1.tgz"; - path = fetchurl { - name = "cliui___cliui_8.0.1.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz"; - sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; - }; - } - { - name = "clone___clone_1.0.4.tgz"; - path = fetchurl { - name = "clone___clone_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz"; - sha512 = "JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="; - }; - } - { - name = "clone___clone_2.1.2.tgz"; - path = fetchurl { - name = "clone___clone_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz"; - sha512 = "3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="; - }; - } - { - name = "collection_visit___collection_visit_1.0.0.tgz"; - path = fetchurl { - name = "collection_visit___collection_visit_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz"; - sha512 = "lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw=="; - }; - } - { - name = "color_convert___color_convert_1.9.3.tgz"; - path = fetchurl { - name = "color_convert___color_convert_1.9.3.tgz"; - url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; - }; - } - { - name = "color_convert___color_convert_2.0.1.tgz"; - path = fetchurl { - name = "color_convert___color_convert_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; - sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; - }; - } - { - name = "color_name___color_name_1.1.3.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; - }; - } - { - name = "color_name___color_name_1.1.4.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; - }; - } - { - name = "colord___colord_2.9.3.tgz"; - path = fetchurl { - name = "colord___colord_2.9.3.tgz"; - url = "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz"; - sha512 = "jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="; - }; - } - { - name = "colorette___colorette_2.0.19.tgz"; - path = fetchurl { - name = "colorette___colorette_2.0.19.tgz"; - url = "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz"; - sha512 = "3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ=="; - }; - } - { - name = "combined_stream___combined_stream_1.0.8.tgz"; - path = fetchurl { - name = "combined_stream___combined_stream_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; - }; - } - { - name = "commander___commander_2.20.3.tgz"; - path = fetchurl { - name = "commander___commander_2.20.3.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"; - sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; - }; - } - { - name = "commander___commander_7.2.0.tgz"; - path = fetchurl { - name = "commander___commander_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz"; - sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; - }; - } - { - name = "common_tags___common_tags_1.8.2.tgz"; - path = fetchurl { - name = "common_tags___common_tags_1.8.2.tgz"; - url = "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz"; - sha512 = "gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA=="; - }; - } - { - name = "component_emitter___component_emitter_1.3.0.tgz"; - path = fetchurl { - name = "component_emitter___component_emitter_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz"; - sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; - }; - } - { - name = "concat_map___concat_map_0.0.1.tgz"; - path = fetchurl { - name = "concat_map___concat_map_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; - }; - } - { - name = "config_chain___config_chain_1.1.13.tgz"; - path = fetchurl { - name = "config_chain___config_chain_1.1.13.tgz"; - url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; - sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; - }; - } - { - name = "confusing_browser_globals___confusing_browser_globals_1.0.11.tgz"; - path = fetchurl { - name = "confusing_browser_globals___confusing_browser_globals_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz"; - sha512 = "JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA=="; - }; - } - { - name = "connect___connect_3.7.0.tgz"; - path = fetchurl { - name = "connect___connect_3.7.0.tgz"; - url = "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz"; - sha512 = "ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ=="; - }; - } - { - name = "constant_case___constant_case_3.0.4.tgz"; - path = fetchurl { - name = "constant_case___constant_case_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/constant-case/-/constant-case-3.0.4.tgz"; - sha512 = "I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ=="; - }; - } - { - name = "convert_source_map___convert_source_map_1.9.0.tgz"; - path = fetchurl { - name = "convert_source_map___convert_source_map_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz"; - sha512 = "ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="; - }; - } - { - name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; - path = fetchurl { - name = "copy_descriptor___copy_descriptor_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; - sha512 = "XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw=="; - }; - } - { - name = "core_js_compat___core_js_compat_3.26.0.tgz"; - path = fetchurl { - name = "core_js_compat___core_js_compat_3.26.0.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.26.0.tgz"; - sha512 = "piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A=="; - }; - } - { - name = "cors___cors_2.8.5.tgz"; - path = fetchurl { - name = "cors___cors_2.8.5.tgz"; - url = "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz"; - sha512 = "KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g=="; - }; - } - { - name = "cosmiconfig_typescript_loader___cosmiconfig_typescript_loader_4.3.0.tgz"; - path = fetchurl { - name = "cosmiconfig_typescript_loader___cosmiconfig_typescript_loader_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz"; - sha512 = "NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q=="; - }; - } - { - name = "cosmiconfig___cosmiconfig_8.0.0.tgz"; - path = fetchurl { - name = "cosmiconfig___cosmiconfig_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.0.0.tgz"; - sha512 = "da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ=="; - }; - } - { - name = "cosmiconfig___cosmiconfig_7.0.1.tgz"; - path = fetchurl { - name = "cosmiconfig___cosmiconfig_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; - sha512 = "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; - }; - } - { - name = "cosmiconfig___cosmiconfig_7.1.0.tgz"; - path = fetchurl { - name = "cosmiconfig___cosmiconfig_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz"; - sha512 = "AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA=="; - }; - } - { - name = "create_require___create_require_1.1.1.tgz"; - path = fetchurl { - name = "create_require___create_require_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz"; - sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; - }; - } - { - name = "crelt___crelt_1.0.5.tgz"; - path = fetchurl { - name = "crelt___crelt_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/crelt/-/crelt-1.0.5.tgz"; - sha512 = "+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA=="; - }; - } - { - name = "cross_fetch___cross_fetch_3.1.5.tgz"; - path = fetchurl { - name = "cross_fetch___cross_fetch_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz"; - sha512 = "lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw=="; - }; - } - { - name = "cross_spawn___cross_spawn_7.0.3.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; - }; - } - { - name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; - path = fetchurl { - name = "crypto_random_string___crypto_random_string_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz"; - sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; - }; - } - { - name = "css_functions_list___css_functions_list_3.1.0.tgz"; - path = fetchurl { - name = "css_functions_list___css_functions_list_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/css-functions-list/-/css-functions-list-3.1.0.tgz"; - sha512 = "/9lCvYZaUbBGvYUgYGFJ4dcYiyqdhSjG7IPVluoV8A1ILjkF7ilmhp1OGUz8n+nmBcu0RNrQAzgD8B6FJbrt2w=="; - }; - } - { - name = "css_select___css_select_4.3.0.tgz"; - path = fetchurl { - name = "css_select___css_select_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz"; - sha512 = "wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ=="; - }; - } - { - name = "css_tree___css_tree_1.1.3.tgz"; - path = fetchurl { - name = "css_tree___css_tree_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz"; - sha512 = "tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q=="; - }; - } - { - name = "css_what___css_what_6.1.0.tgz"; - path = fetchurl { - name = "css_what___css_what_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz"; - sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="; - }; - } - { - name = "css.escape___css.escape_1.5.1.tgz"; - path = fetchurl { - name = "css.escape___css.escape_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz"; - sha512 = "YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg=="; - }; - } - { - name = "cssesc___cssesc_3.0.0.tgz"; - path = fetchurl { - name = "cssesc___cssesc_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz"; - sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; - }; - } - { - name = "csso___csso_4.2.0.tgz"; - path = fetchurl { - name = "csso___csso_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz"; - sha512 = "wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA=="; - }; - } - { - name = "cssom___cssom_0.5.0.tgz"; - path = fetchurl { - name = "cssom___cssom_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz"; - sha512 = "iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw=="; - }; - } - { - name = "cssom___cssom_0.3.8.tgz"; - path = fetchurl { - name = "cssom___cssom_0.3.8.tgz"; - url = "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz"; - sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="; - }; - } - { - name = "cssstyle___cssstyle_2.3.0.tgz"; - path = fetchurl { - name = "cssstyle___cssstyle_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz"; - sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; - }; - } - { - name = "csstype___csstype_2.6.21.tgz"; - path = fetchurl { - name = "csstype___csstype_2.6.21.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.21.tgz"; - sha512 = "Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w=="; - }; - } - { - name = "dash_get___dash_get_1.0.2.tgz"; - path = fetchurl { - name = "dash_get___dash_get_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/dash-get/-/dash-get-1.0.2.tgz"; - sha512 = "4FbVrHDwfOASx7uQVxeiCTo7ggSdYZbqs8lH+WU6ViypPlDbe9y6IP5VVUDQBv9DcnyaiPT5XT0UWHgJ64zLeQ=="; - }; - } - { - name = "data_urls___data_urls_3.0.2.tgz"; - path = fetchurl { - name = "data_urls___data_urls_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz"; - sha512 = "Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ=="; - }; - } - { - name = "dataloader___dataloader_2.1.0.tgz"; - path = fetchurl { - name = "dataloader___dataloader_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/dataloader/-/dataloader-2.1.0.tgz"; - sha512 = "qTcEYLen3r7ojZNgVUaRggOI+KM7jrKxXeSHhogh/TWxYMeONEMqY+hmkobiYQozsGIyg9OYVzO4ZIfoB4I0pQ=="; - }; - } - { - name = "de_indent___de_indent_1.0.2.tgz"; - path = fetchurl { - name = "de_indent___de_indent_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz"; - sha512 = "e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg=="; - }; - } - { - name = "debounce___debounce_1.2.1.tgz"; - path = fetchurl { - name = "debounce___debounce_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz"; - sha512 = "XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug=="; - }; - } - { - name = "debug___debug_2.6.9.tgz"; - path = fetchurl { - name = "debug___debug_2.6.9.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; - }; - } - { - name = "debug___debug_4.3.4.tgz"; - path = fetchurl { - name = "debug___debug_4.3.4.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; - }; - } - { - name = "debug___debug_3.2.7.tgz"; - path = fetchurl { - name = "debug___debug_3.2.7.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz"; - sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; - }; - } - { - name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; - path = fetchurl { - name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; - sha512 = "ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg=="; - }; - } - { - name = "decamelize___decamelize_1.2.0.tgz"; - path = fetchurl { - name = "decamelize___decamelize_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; - sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; - }; - } - { - name = "decimal.js___decimal.js_10.4.2.tgz"; - path = fetchurl { - name = "decimal.js___decimal.js_10.4.2.tgz"; - url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.2.tgz"; - sha512 = "ic1yEvwT6GuvaYwBLLY6/aFFgjZdySKTE8en/fkU3QICTmRtgtSlFn0u0BXN06InZwtfCelR7j8LRiDI/02iGA=="; - }; - } - { - name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; - path = fetchurl { - name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha512 = "hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="; - }; - } - { - name = "deep_eql___deep_eql_4.1.3.tgz"; - path = fetchurl { - name = "deep_eql___deep_eql_4.1.3.tgz"; - url = "https://registry.yarnpkg.com/deep-eql/-/deep-eql-4.1.3.tgz"; - sha512 = "WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw=="; - }; - } - { - name = "deep_equal___deep_equal_2.0.5.tgz"; - path = fetchurl { - name = "deep_equal___deep_equal_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.5.tgz"; - sha512 = "nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw=="; - }; - } - { - name = "deep_is___deep_is_0.1.4.tgz"; - path = fetchurl { - name = "deep_is___deep_is_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; - sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; - }; - } - { - name = "deepmerge___deepmerge_4.2.2.tgz"; - path = fetchurl { - name = "deepmerge___deepmerge_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz"; - sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; - }; - } - { - name = "defaults___defaults_1.0.4.tgz"; - path = fetchurl { - name = "defaults___defaults_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz"; - sha512 = "eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A=="; - }; - } - { - name = "define_properties___define_properties_1.1.4.tgz"; - path = fetchurl { - name = "define_properties___define_properties_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz"; - sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; - }; - } - { - name = "define_property___define_property_0.2.5.tgz"; - path = fetchurl { - name = "define_property___define_property_0.2.5.tgz"; - url = "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz"; - sha512 = "Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA=="; - }; - } - { - name = "define_property___define_property_1.0.0.tgz"; - path = fetchurl { - name = "define_property___define_property_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz"; - sha512 = "cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA=="; - }; - } - { - name = "define_property___define_property_2.0.2.tgz"; - path = fetchurl { - name = "define_property___define_property_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz"; - sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; - }; - } - { - name = "defined___defined_1.0.1.tgz"; - path = fetchurl { - name = "defined___defined_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/defined/-/defined-1.0.1.tgz"; - sha512 = "hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q=="; - }; - } - { - name = "defu___defu_6.1.0.tgz"; - path = fetchurl { - name = "defu___defu_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/defu/-/defu-6.1.0.tgz"; - sha512 = "pOFYRTIhoKujrmbTRhcW5lYQLBXw/dlTwfI8IguF1QCDJOcJzNH1w+YFjxqy6BAuJrClTy6MUE8q+oKJ2FLsIw=="; - }; - } - { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; - path = fetchurl { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; - }; - } - { - name = "dependency_graph___dependency_graph_0.11.0.tgz"; - path = fetchurl { - name = "dependency_graph___dependency_graph_0.11.0.tgz"; - url = "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz"; - sha512 = "JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg=="; - }; - } - { - name = "detect_indent___detect_indent_6.1.0.tgz"; - path = fetchurl { - name = "detect_indent___detect_indent_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz"; - sha512 = "reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA=="; - }; - } - { - name = "detective___detective_5.2.1.tgz"; - path = fetchurl { - name = "detective___detective_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/detective/-/detective-5.2.1.tgz"; - sha512 = "v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw=="; - }; - } - { - name = "diacritics___diacritics_1.3.0.tgz"; - path = fetchurl { - name = "diacritics___diacritics_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/diacritics/-/diacritics-1.3.0.tgz"; - sha512 = "wlwEkqcsaxvPJML+rDh/2iS824jbREk6DUMUKkEaSlxdYHeS43cClJtsWglvw2RfeXGm6ohKDqsXteJ5sP5enA=="; - }; - } - { - name = "didyoumean___didyoumean_1.2.2.tgz"; - path = fetchurl { - name = "didyoumean___didyoumean_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz"; - sha512 = "gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="; - }; - } - { - name = "diff_sequences___diff_sequences_29.2.0.tgz"; - path = fetchurl { - name = "diff_sequences___diff_sequences_29.2.0.tgz"; - url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.2.0.tgz"; - sha512 = "413SY5JpYeSBZxmenGEmCVQ8mCgtFJF0w9PROdaS6z987XC2Pd2GOKqOITLtMftmyFZqgtCOb/QA7/Z3ZXfzIw=="; - }; - } - { - name = "diff___diff_4.0.2.tgz"; - path = fetchurl { - name = "diff___diff_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz"; - sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="; - }; - } - { - name = "diff___diff_5.1.0.tgz"; - path = fetchurl { - name = "diff___diff_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz"; - sha512 = "D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw=="; - }; - } - { - name = "dir_glob___dir_glob_3.0.1.tgz"; - path = fetchurl { - name = "dir_glob___dir_glob_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz"; - sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; - }; - } - { - name = "dlv___dlv_1.1.3.tgz"; - path = fetchurl { - name = "dlv___dlv_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz"; - sha512 = "+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="; - }; - } - { - name = "doctrine___doctrine_2.1.0.tgz"; - path = fetchurl { - name = "doctrine___doctrine_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz"; - sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw=="; - }; - } - { - name = "doctrine___doctrine_3.0.0.tgz"; - path = fetchurl { - name = "doctrine___doctrine_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; - sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; - }; - } - { - name = "dom_accessibility_api___dom_accessibility_api_0.5.14.tgz"; - path = fetchurl { - name = "dom_accessibility_api___dom_accessibility_api_0.5.14.tgz"; - url = "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.14.tgz"; - sha512 = "NMt+m9zFMPZe0JcY9gN224Qvk6qLIdqex29clBvc/y75ZBX9YA9wNK3frsYvu2DI1xcCIwxwnX+TlsJ2DSOADg=="; - }; - } - { - name = "dom_serializer___dom_serializer_0.2.2.tgz"; - path = fetchurl { - name = "dom_serializer___dom_serializer_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz"; - sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; - }; - } - { - name = "dom_serializer___dom_serializer_1.4.1.tgz"; - path = fetchurl { - name = "dom_serializer___dom_serializer_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz"; - sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag=="; - }; - } - { - name = "dom_serializer___dom_serializer_2.0.0.tgz"; - path = fetchurl { - name = "dom_serializer___dom_serializer_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz"; - sha512 = "wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg=="; - }; - } - { - name = "domelementtype___domelementtype_1.3.1.tgz"; - path = fetchurl { - name = "domelementtype___domelementtype_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz"; - sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; - }; - } - { - name = "domelementtype___domelementtype_2.3.0.tgz"; - path = fetchurl { - name = "domelementtype___domelementtype_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz"; - sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="; - }; - } - { - name = "domexception___domexception_4.0.0.tgz"; - path = fetchurl { - name = "domexception___domexception_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz"; - sha512 = "A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw=="; - }; - } - { - name = "domhandler___domhandler_2.4.2.tgz"; - path = fetchurl { - name = "domhandler___domhandler_2.4.2.tgz"; - url = "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz"; - sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; - }; - } - { - name = "domhandler___domhandler_4.3.1.tgz"; - path = fetchurl { - name = "domhandler___domhandler_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz"; - sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="; - }; - } - { - name = "domhandler___domhandler_5.0.3.tgz"; - path = fetchurl { - name = "domhandler___domhandler_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz"; - sha512 = "cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w=="; - }; - } - { - name = "domutils___domutils_1.7.0.tgz"; - path = fetchurl { - name = "domutils___domutils_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz"; - sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; - }; - } - { - name = "domutils___domutils_2.8.0.tgz"; - path = fetchurl { - name = "domutils___domutils_2.8.0.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz"; - sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; - }; - } - { - name = "domutils___domutils_3.0.1.tgz"; - path = fetchurl { - name = "domutils___domutils_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz"; - sha512 = "z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q=="; - }; - } - { - name = "dot_case___dot_case_3.0.4.tgz"; - path = fetchurl { - name = "dot_case___dot_case_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz"; - sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w=="; - }; - } - { - name = "dotenv___dotenv_16.0.3.tgz"; - path = fetchurl { - name = "dotenv___dotenv_16.0.3.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz"; - sha512 = "7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ=="; - }; - } - { - name = "dset___dset_3.1.2.tgz"; - path = fetchurl { - name = "dset___dset_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/dset/-/dset-3.1.2.tgz"; - sha512 = "g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q=="; - }; - } - { - name = "eastasianwidth___eastasianwidth_0.2.0.tgz"; - path = fetchurl { - name = "eastasianwidth___eastasianwidth_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz"; - sha512 = "I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="; - }; - } - { - name = "easy_bem___easy_bem_1.1.1.tgz"; - path = fetchurl { - name = "easy_bem___easy_bem_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/easy-bem/-/easy-bem-1.1.1.tgz"; - sha512 = "GJRqdiy2h+EXy6a8E6R+ubmqUM08BK0FWNq41k24fup6045biQ8NXxoXimiwegMQvFFV3t1emADdGNL1TlS61A=="; - }; - } - { - name = "ecdsa_sig_formatter___ecdsa_sig_formatter_1.0.11.tgz"; - path = fetchurl { - name = "ecdsa_sig_formatter___ecdsa_sig_formatter_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz"; - sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ=="; - }; - } - { - name = "editorconfig___editorconfig_0.15.3.tgz"; - path = fetchurl { - name = "editorconfig___editorconfig_0.15.3.tgz"; - url = "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz"; - sha512 = "M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g=="; - }; - } - { - name = "ee_first___ee_first_1.1.1.tgz"; - path = fetchurl { - name = "ee_first___ee_first_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; - sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; - }; - } - { - name = "ejs___ejs_3.1.8.tgz"; - path = fetchurl { - name = "ejs___ejs_3.1.8.tgz"; - url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz"; - sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; - }; - } - { - name = "electron_to_chromium___electron_to_chromium_1.4.284.tgz"; - path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.4.284.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz"; - sha512 = "M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA=="; - }; - } - { - name = "emoji_regex___emoji_regex_8.0.0.tgz"; - path = fetchurl { - name = "emoji_regex___emoji_regex_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; - }; - } - { - name = "emoji_regex___emoji_regex_9.2.2.tgz"; - path = fetchurl { - name = "emoji_regex___emoji_regex_9.2.2.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz"; - sha512 = "L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="; - }; - } - { - name = "encodeurl___encodeurl_1.0.2.tgz"; - path = fetchurl { - name = "encodeurl___encodeurl_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; - }; - } - { - name = "entities___entities_1.1.2.tgz"; - path = fetchurl { - name = "entities___entities_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz"; - sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; - }; - } - { - name = "entities___entities_2.2.0.tgz"; - path = fetchurl { - name = "entities___entities_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz"; - sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; - }; - } - { - name = "entities___entities_4.4.0.tgz"; - path = fetchurl { - name = "entities___entities_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz"; - sha512 = "oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA=="; - }; - } - { - name = "entities___entities_2.1.0.tgz"; - path = fetchurl { - name = "entities___entities_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz"; - sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; - }; - } - { - name = "entities___entities_3.0.1.tgz"; - path = fetchurl { - name = "entities___entities_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz"; - sha512 = "WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q=="; - }; - } - { - name = "error_ex___error_ex_1.3.2.tgz"; - path = fetchurl { - name = "error_ex___error_ex_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz"; - sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; - }; - } - { - name = "es_abstract___es_abstract_1.20.4.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.20.4.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz"; - sha512 = "0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA=="; - }; - } - { - name = "es_abstract___es_abstract_1.21.1.tgz"; - path = fetchurl { - name = "es_abstract___es_abstract_1.21.1.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.1.tgz"; - sha512 = "QudMsPOz86xYz/1dG1OuGBKOELjCh99IIWHLzy5znUB6j8xG2yMA7bfTV86VSqKF+Y/H08vQPR+9jyXpuC6hfg=="; - }; - } - { - name = "es_get_iterator___es_get_iterator_1.1.2.tgz"; - path = fetchurl { - name = "es_get_iterator___es_get_iterator_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.2.tgz"; - sha512 = "+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ=="; - }; - } - { - name = "es_set_tostringtag___es_set_tostringtag_2.0.1.tgz"; - path = fetchurl { - name = "es_set_tostringtag___es_set_tostringtag_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz"; - sha512 = "g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg=="; - }; - } - { - name = "es_shim_unscopables___es_shim_unscopables_1.0.0.tgz"; - path = fetchurl { - name = "es_shim_unscopables___es_shim_unscopables_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz"; - sha512 = "Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w=="; - }; - } - { - name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; - path = fetchurl { - name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; - sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; - }; - } - { - name = "esbuild___esbuild_0.16.4.tgz"; - path = fetchurl { - name = "esbuild___esbuild_0.16.4.tgz"; - url = "https://registry.yarnpkg.com/esbuild/-/esbuild-0.16.4.tgz"; - sha512 = "qQrPMQpPTWf8jHugLWHoGqZjApyx3OEm76dlTXobHwh/EBbavbRdjXdYi/GWr43GyN0sfpap14GPkb05NH3ROA=="; - }; - } - { - name = "escalade___escalade_3.1.1.tgz"; - path = fetchurl { - name = "escalade___escalade_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; - }; - } - { - name = "escape_html___escape_html_1.0.3.tgz"; - path = fetchurl { - name = "escape_html___escape_html_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; - sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; - }; - } - { - name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; - path = fetchurl { - name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; - }; - } - { - name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; - path = fetchurl { - name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; - sha512 = "UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w=="; - }; - } - { - name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; - path = fetchurl { - name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; - }; - } - { - name = "escodegen___escodegen_2.0.0.tgz"; - path = fetchurl { - name = "escodegen___escodegen_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz"; - sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; - }; - } - { - name = "eslint_config_airbnb_base___eslint_config_airbnb_base_15.0.0.tgz"; - path = fetchurl { - name = "eslint_config_airbnb_base___eslint_config_airbnb_base_15.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-15.0.0.tgz"; - sha512 = "xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig=="; - }; - } - { - name = "eslint_config_prettier___eslint_config_prettier_8.5.0.tgz"; - path = fetchurl { - name = "eslint_config_prettier___eslint_config_prettier_8.5.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz"; - sha512 = "obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q=="; - }; - } - { - name = "eslint_config_prettier___eslint_config_prettier_8.6.0.tgz"; - path = fetchurl { - name = "eslint_config_prettier___eslint_config_prettier_8.6.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.6.0.tgz"; - sha512 = "bAF0eLpLVqP5oEVUFKpMA+NnRFICwn9X8B5jrR9FcqnYBuPbqWEjTEspPWMj5ye6czoSLDweCzSo3Ko7gGrZaA=="; - }; - } - { - name = "eslint_import_resolver_alias___eslint_import_resolver_alias_1.1.2.tgz"; - path = fetchurl { - name = "eslint_import_resolver_alias___eslint_import_resolver_alias_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-alias/-/eslint-import-resolver-alias-1.1.2.tgz"; - sha512 = "WdviM1Eu834zsfjHtcGHtGfcu+F30Od3V7I9Fi57uhBEwPkjDcii7/yW8jAT+gOhn4P/vOxxNAXbFAKsrrc15w=="; - }; - } - { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.7.tgz"; - path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.7.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz"; - sha512 = "gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA=="; - }; - } - { - name = "eslint_module_utils___eslint_module_utils_2.7.4.tgz"; - path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.7.4.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz"; - sha512 = "j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA=="; - }; - } - { - name = "eslint_plugin_import___eslint_plugin_import_2.27.5.tgz"; - path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.27.5.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz"; - sha512 = "LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow=="; - }; - } - { - name = "eslint_plugin_prettier_vue___eslint_plugin_prettier_vue_4.2.0.tgz"; - path = fetchurl { - name = "eslint_plugin_prettier_vue___eslint_plugin_prettier_vue_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-prettier-vue/-/eslint-plugin-prettier-vue-4.2.0.tgz"; - sha512 = "DA2oNRx+pZ6RM/EIHIPME4FQZifnkEROa55OWtTTUFGHpj53tcHomuxVP/kS/2MM+ul46GEK+jymK69STWDWoA=="; - }; - } - { - name = "eslint_plugin_prettier___eslint_plugin_prettier_4.2.1.tgz"; - path = fetchurl { - name = "eslint_plugin_prettier___eslint_plugin_prettier_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz"; - sha512 = "f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ=="; - }; - } - { - name = "eslint_plugin_security___eslint_plugin_security_1.7.1.tgz"; - path = fetchurl { - name = "eslint_plugin_security___eslint_plugin_security_1.7.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-security/-/eslint-plugin-security-1.7.1.tgz"; - sha512 = "sMStceig8AFglhhT2LqlU5r+/fn9OwsA72O5bBuQVTssPCdQAOQzL+oMn/ZcpeUY6KcNfLJArgcrsSULNjYYdQ=="; - }; - } - { - name = "eslint_plugin_sonarjs___eslint_plugin_sonarjs_0.18.0.tgz"; - path = fetchurl { - name = "eslint_plugin_sonarjs___eslint_plugin_sonarjs_0.18.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-sonarjs/-/eslint-plugin-sonarjs-0.18.0.tgz"; - sha512 = "DJ3osLnt6KFdT5e9ZuIDOjT5A6wUGSLeiJJT03lPgpdD+7CVWlYAw9Goe3bt7SmbFO3Xh89NOCZAuB9XA7bAUQ=="; - }; - } - { - name = "eslint_plugin_vue___eslint_plugin_vue_9.9.0.tgz"; - path = fetchurl { - name = "eslint_plugin_vue___eslint_plugin_vue_9.9.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.9.0.tgz"; - sha512 = "YbubS7eK0J7DCf0U2LxvVP7LMfs6rC6UltihIgval3azO3gyDwEGVgsCMe1TmDiEkl6GdMKfRpaME6QxIYtzDQ=="; - }; - } - - { - name = "eslint_scope___eslint_scope_5.1.1.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; - sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; - }; - } - { - name = "eslint_scope___eslint_scope_7.1.1.tgz"; - path = fetchurl { - name = "eslint_scope___eslint_scope_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz"; - sha512 = "QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw=="; - }; - } - { - name = "eslint_utils___eslint_utils_3.0.0.tgz"; - path = fetchurl { - name = "eslint_utils___eslint_utils_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz"; - sha512 = "uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA=="; - }; - } - { - name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; - path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; - sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; - }; - } - { - name = "eslint_visitor_keys___eslint_visitor_keys_3.3.0.tgz"; - path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"; - sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; - }; - } - { - name = "eslint___eslint_8.33.0.tgz"; - path = fetchurl { - name = "eslint___eslint_8.33.0.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-8.33.0.tgz"; - sha512 = "WjOpFQgKK8VrCnAtl8We0SUOy/oVZ5NHykyMiagV1M9r8IFpIJX7DduK6n1mpfhlG7T1NLWm2SuD8QB7KFySaA=="; - }; - } - { - name = "espree___espree_9.4.0.tgz"; - path = fetchurl { - name = "espree___espree_9.4.0.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz"; - sha512 = "DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw=="; - }; - } - { - name = "esprima___esprima_4.0.1.tgz"; - path = fetchurl { - name = "esprima___esprima_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; - sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; - }; - } - { - name = "esquery___esquery_1.4.0.tgz"; - path = fetchurl { - name = "esquery___esquery_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; - sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; - }; - } - { - name = "esrecurse___esrecurse_4.3.0.tgz"; - path = fetchurl { - name = "esrecurse___esrecurse_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; - sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; - }; - } - { - name = "estraverse___estraverse_4.3.0.tgz"; - path = fetchurl { - name = "estraverse___estraverse_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; - sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; - }; - } - { - name = "estraverse___estraverse_5.3.0.tgz"; - path = fetchurl { - name = "estraverse___estraverse_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz"; - sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; - }; - } - { - name = "estree_walker___estree_walker_1.0.1.tgz"; - path = fetchurl { - name = "estree_walker___estree_walker_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz"; - sha512 = "1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="; - }; - } - { - name = "estree_walker___estree_walker_2.0.2.tgz"; - path = fetchurl { - name = "estree_walker___estree_walker_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz"; - sha512 = "Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="; - }; - } - { - name = "esutils___esutils_2.0.3.tgz"; - path = fetchurl { - name = "esutils___esutils_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - } - { - name = "etag___etag_1.8.1.tgz"; - path = fetchurl { - name = "etag___etag_1.8.1.tgz"; - url = "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz"; - sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; - }; - } - { - name = "event_target_shim___event_target_shim_5.0.1.tgz"; - path = fetchurl { - name = "event_target_shim___event_target_shim_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz"; - sha512 = "i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ=="; - }; - } - { - name = "expand_brackets___expand_brackets_2.1.4.tgz"; - path = fetchurl { - name = "expand_brackets___expand_brackets_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz"; - sha512 = "w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA=="; - }; - } - { - name = "expect___expect_29.2.1.tgz"; - path = fetchurl { - name = "expect___expect_29.2.1.tgz"; - url = "https://registry.yarnpkg.com/expect/-/expect-29.2.1.tgz"; - sha512 = "BJtA754Fba0YWRWHgjKUMTA3ltWarKgITXHQnbZ2mTxTXC4yMQlR0FI7HkB3fJYkhWBf4qjNiqvg3LDtXCcVRQ=="; - }; - } - { - name = "extend_shallow___extend_shallow_2.0.1.tgz"; - path = fetchurl { - name = "extend_shallow___extend_shallow_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz"; - sha512 = "zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug=="; - }; - } - { - name = "extend_shallow___extend_shallow_3.0.2.tgz"; - path = fetchurl { - name = "extend_shallow___extend_shallow_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz"; - sha512 = "BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q=="; - }; - } - { - name = "external_editor___external_editor_3.1.0.tgz"; - path = fetchurl { - name = "external_editor___external_editor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz"; - sha512 = "hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="; - }; - } - { - name = "extglob___extglob_2.0.4.tgz"; - path = fetchurl { - name = "extglob___extglob_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz"; - sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; - }; - } - { - name = "extract_files___extract_files_11.0.0.tgz"; - path = fetchurl { - name = "extract_files___extract_files_11.0.0.tgz"; - url = "https://registry.yarnpkg.com/extract-files/-/extract-files-11.0.0.tgz"; - sha512 = "FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ=="; - }; - } - { - name = "extract_files___extract_files_9.0.0.tgz"; - path = fetchurl { - name = "extract_files___extract_files_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/extract-files/-/extract-files-9.0.0.tgz"; - sha512 = "CvdFfHkC95B4bBBk36hcEmvdR2awOdhhVUYH6S/zrVj3477zven/fJMYg7121h4T1xHZC+tetUpubpAhxwI7hQ=="; - }; - } - { - name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; - path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; - }; - } - { - name = "fast_diff___fast_diff_1.2.0.tgz"; - path = fetchurl { - name = "fast_diff___fast_diff_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz"; - sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; - }; - } - { - name = "fast_glob___fast_glob_3.2.12.tgz"; - path = fetchurl { - name = "fast_glob___fast_glob_3.2.12.tgz"; - url = "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz"; - sha512 = "DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w=="; - }; - } - { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; - path = fetchurl { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; - }; - } - { - name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; - path = fetchurl { - name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; - }; - } - { - name = "fastest_levenshtein___fastest_levenshtein_1.0.16.tgz"; - path = fetchurl { - name = "fastest_levenshtein___fastest_levenshtein_1.0.16.tgz"; - url = "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz"; - sha512 = "eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="; - }; - } - { - name = "fastq___fastq_1.13.0.tgz"; - path = fetchurl { - name = "fastq___fastq_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz"; - sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; - }; - } - { - name = "fb_watchman___fb_watchman_2.0.2.tgz"; - path = fetchurl { - name = "fb_watchman___fb_watchman_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz"; - sha512 = "p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA=="; - }; - } - { - name = "fbjs_css_vars___fbjs_css_vars_1.0.2.tgz"; - path = fetchurl { - name = "fbjs_css_vars___fbjs_css_vars_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz"; - sha512 = "b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ=="; - }; - } - { - name = "fbjs___fbjs_3.0.4.tgz"; - path = fetchurl { - name = "fbjs___fbjs_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/fbjs/-/fbjs-3.0.4.tgz"; - sha512 = "ucV0tDODnGV3JCnnkmoszb5lf4bNpzjv80K41wd4k798Etq+UYD0y0TIfalLjZoKgjive6/adkRnszwapiDgBQ=="; - }; - } - { - name = "figures___figures_3.2.0.tgz"; - path = fetchurl { - name = "figures___figures_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz"; - sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; - }; - } - { - name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; - path = fetchurl { - name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; - sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; - }; - } - { - name = "filelist___filelist_1.0.4.tgz"; - path = fetchurl { - name = "filelist___filelist_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz"; - sha512 = "w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q=="; - }; - } - { - name = "fill_range___fill_range_4.0.0.tgz"; - path = fetchurl { - name = "fill_range___fill_range_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz"; - sha512 = "VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ=="; - }; - } - { - name = "fill_range___fill_range_7.0.1.tgz"; - path = fetchurl { - name = "fill_range___fill_range_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; - }; - } - { - name = "finalhandler___finalhandler_1.1.2.tgz"; - path = fetchurl { - name = "finalhandler___finalhandler_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz"; - sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; - }; - } - { - name = "find_up___find_up_4.1.0.tgz"; - path = fetchurl { - name = "find_up___find_up_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; - sha512 = "PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw=="; - }; - } - { - name = "find_up___find_up_5.0.0.tgz"; - path = fetchurl { - name = "find_up___find_up_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz"; - sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; - }; - } - { - name = "flat_cache___flat_cache_3.0.4.tgz"; - path = fetchurl { - name = "flat_cache___flat_cache_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; - sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; - }; - } - { - name = "flatpickr___flatpickr_4.6.13.tgz"; - path = fetchurl { - name = "flatpickr___flatpickr_4.6.13.tgz"; - url = "https://registry.yarnpkg.com/flatpickr/-/flatpickr-4.6.13.tgz"; - sha512 = "97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw=="; - }; - } - { - name = "flatted___flatted_3.2.7.tgz"; - path = fetchurl { - name = "flatted___flatted_3.2.7.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz"; - sha512 = "5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="; - }; - } - { - name = "flexsearch___flexsearch_0.7.21.tgz"; - path = fetchurl { - name = "flexsearch___flexsearch_0.7.21.tgz"; - url = "https://registry.yarnpkg.com/flexsearch/-/flexsearch-0.7.21.tgz"; - sha512 = "W7cHV7Hrwjid6lWmy0IhsWDFQboWSng25U3VVywpHOTJnnAZNPScog67G+cVpeX9f7yDD21ih0WDrMMT+JoaYg=="; - }; - } - { - name = "for_each___for_each_0.3.3.tgz"; - path = fetchurl { - name = "for_each___for_each_0.3.3.tgz"; - url = "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz"; - sha512 = "jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw=="; - }; - } - { - name = "for_in___for_in_1.0.2.tgz"; - path = fetchurl { - name = "for_in___for_in_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz"; - sha512 = "7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="; - }; - } - { - name = "form_data_encoder___form_data_encoder_1.7.2.tgz"; - path = fetchurl { - name = "form_data_encoder___form_data_encoder_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-1.7.2.tgz"; - sha512 = "qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A=="; - }; - } - { - name = "form_data___form_data_3.0.1.tgz"; - path = fetchurl { - name = "form_data___form_data_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz"; - sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; - }; - } - { - name = "form_data___form_data_4.0.0.tgz"; - path = fetchurl { - name = "form_data___form_data_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz"; - sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; - }; - } - { - name = "formdata_node___formdata_node_4.4.1.tgz"; - path = fetchurl { - name = "formdata_node___formdata_node_4.4.1.tgz"; - url = "https://registry.yarnpkg.com/formdata-node/-/formdata-node-4.4.1.tgz"; - sha512 = "0iirZp3uVDjVGt9p49aTaqjk84TrglENEDuqfdlZQ1roC9CWlPk6Avf8EEnZNcAqPonwkG35x4n3ww/1THYAeQ=="; - }; - } - { - name = "fraction.js___fraction.js_4.2.0.tgz"; - path = fetchurl { - name = "fraction.js___fraction.js_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz"; - sha512 = "MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA=="; - }; - } - { - name = "fragment_cache___fragment_cache_0.2.1.tgz"; - path = fetchurl { - name = "fragment_cache___fragment_cache_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz"; - sha512 = "GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA=="; - }; - } - { - name = "fs_extra___fs_extra_10.1.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz"; - sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; - }; - } - { - name = "fs_extra___fs_extra_9.1.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; - sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; - }; - } - { - name = "fs.realpath___fs.realpath_1.0.0.tgz"; - path = fetchurl { - name = "fs.realpath___fs.realpath_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - } - { - name = "fsevents___fsevents_2.3.2.tgz"; - path = fetchurl { - name = "fsevents___fsevents_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz"; - sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="; - }; - } - { - name = "function_bind___function_bind_1.1.1.tgz"; - path = fetchurl { - name = "function_bind___function_bind_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; - }; - } - { - name = "function.prototype.name___function.prototype.name_1.1.5.tgz"; - path = fetchurl { - name = "function.prototype.name___function.prototype.name_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; - sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; - }; - } - { - name = "functions_have_names___functions_have_names_1.2.3.tgz"; - path = fetchurl { - name = "functions_have_names___functions_have_names_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz"; - sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; - }; - } - { - name = "gensync___gensync_1.0.0_beta.2.tgz"; - path = fetchurl { - name = "gensync___gensync_1.0.0_beta.2.tgz"; - url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz"; - sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; - }; - } - { - name = "get_caller_file___get_caller_file_2.0.5.tgz"; - path = fetchurl { - name = "get_caller_file___get_caller_file_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; - }; - } - { - name = "get_func_name___get_func_name_2.0.0.tgz"; - path = fetchurl { - name = "get_func_name___get_func_name_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz"; - sha512 = "Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig=="; - }; - } - { - name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; - path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz"; - sha512 = "QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A=="; - }; - } - { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; - path = fetchurl { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; - sha512 = "I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g=="; - }; - } - { - name = "get_symbol_description___get_symbol_description_1.0.0.tgz"; - path = fetchurl { - name = "get_symbol_description___get_symbol_description_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz"; - sha512 = "2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw=="; - }; - } - { - name = "get_value___get_value_2.0.6.tgz"; - path = fetchurl { - name = "get_value___get_value_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"; - sha512 = "Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA=="; - }; - } - { - name = "glob_parent___glob_parent_5.1.2.tgz"; - path = fetchurl { - name = "glob_parent___glob_parent_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; - sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; - }; - } - { - name = "glob_parent___glob_parent_6.0.2.tgz"; - path = fetchurl { - name = "glob_parent___glob_parent_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz"; - sha512 = "XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A=="; - }; - } - { - name = "glob___glob_7.2.3.tgz"; - path = fetchurl { - name = "glob___glob_7.2.3.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; - }; - } - { - name = "glob___glob_8.1.0.tgz"; - path = fetchurl { - name = "glob___glob_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz"; - sha512 = "r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ=="; - }; - } - { - name = "global_modules___global_modules_2.0.0.tgz"; - path = fetchurl { - name = "global_modules___global_modules_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz"; - sha512 = "NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A=="; - }; - } - { - name = "global_prefix___global_prefix_3.0.0.tgz"; - path = fetchurl { - name = "global_prefix___global_prefix_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz"; - sha512 = "awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg=="; - }; - } - { - name = "globals___globals_11.12.0.tgz"; - path = fetchurl { - name = "globals___globals_11.12.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"; - sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; - }; - } - { - name = "globals___globals_13.19.0.tgz"; - path = fetchurl { - name = "globals___globals_13.19.0.tgz"; - url = "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz"; - sha512 = "dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ=="; - }; - } - { - name = "globalthis___globalthis_1.0.3.tgz"; - path = fetchurl { - name = "globalthis___globalthis_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz"; - sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; - }; - } - { - name = "globby___globby_11.1.0.tgz"; - path = fetchurl { - name = "globby___globby_11.1.0.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz"; - sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; - }; - } - { - name = "globby___globby_13.1.2.tgz"; - path = fetchurl { - name = "globby___globby_13.1.2.tgz"; - url = "https://registry.yarnpkg.com/globby/-/globby-13.1.2.tgz"; - sha512 = "LKSDZXToac40u8Q1PQtZihbNdTYSNMuWe+K5l+oa6KgDzSvVrHXlJy40hUP522RjAIoNLJYBJi7ow+rbFpIhHQ=="; - }; - } - { - name = "globjoin___globjoin_0.1.4.tgz"; - path = fetchurl { - name = "globjoin___globjoin_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz"; - sha512 = "xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg=="; - }; - } - { - name = "gopd___gopd_1.0.1.tgz"; - path = fetchurl { - name = "gopd___gopd_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz"; - sha512 = "d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA=="; - }; - } - { - name = "graceful_fs___graceful_fs_4.2.10.tgz"; - path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.10.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; - }; - } - { - name = "grapheme_splitter___grapheme_splitter_1.0.4.tgz"; - path = fetchurl { - name = "grapheme_splitter___grapheme_splitter_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"; - sha512 = "bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ=="; - }; - } - { - name = "graphql_config___graphql_config_4.4.1.tgz"; - path = fetchurl { - name = "graphql_config___graphql_config_4.4.1.tgz"; - url = "https://registry.yarnpkg.com/graphql-config/-/graphql-config-4.4.1.tgz"; - sha512 = "B8wlvfBHZ5WnI4IiuQZRqql6s+CKz7S+xpUeTb28Z8nRBi8tH9ChEBgT5FnTyE05PUhHlrS2jK9ICJ4YBl9OtQ=="; - }; - } - { - name = "graphql_request___graphql_request_5.0.0.tgz"; - path = fetchurl { - name = "graphql_request___graphql_request_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/graphql-request/-/graphql-request-5.0.0.tgz"; - sha512 = "SpVEnIo2J5k2+Zf76cUkdvIRaq5FMZvGQYnA4lUWYbc99m+fHh4CZYRRO/Ff4tCLQ613fzCm3SiDT64ubW5Gyw=="; - }; - } - { - name = "graphql_ruby_client___graphql_ruby_client_1.11.5.tgz"; - path = fetchurl { - name = "graphql_ruby_client___graphql_ruby_client_1.11.5.tgz"; - url = "https://registry.yarnpkg.com/graphql-ruby-client/-/graphql-ruby-client-1.11.5.tgz"; - sha512 = "L7PwJwZPw0jc81AqYPQIyOi+1W622itRahFOgYQiWH3++BOuoG5bJTc+6yePyiesTTvBy+2ZDspCVzmZ5bx9Mg=="; - }; - } - { - name = "graphql_tag___graphql_tag_2.12.6.tgz"; - path = fetchurl { - name = "graphql_tag___graphql_tag_2.12.6.tgz"; - url = "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.6.tgz"; - sha512 = "FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg=="; - }; - } - { - name = "graphql_ws___graphql_ws_5.11.2.tgz"; - path = fetchurl { - name = "graphql_ws___graphql_ws_5.11.2.tgz"; - url = "https://registry.yarnpkg.com/graphql-ws/-/graphql-ws-5.11.2.tgz"; - sha512 = "4EiZ3/UXYcjm+xFGP544/yW1+DVI8ZpKASFbzrV5EDTFWJp0ZvLl4Dy2fSZAzz9imKp5pZMIcjB0x/H69Pv/6w=="; - }; - } - { - name = "graphql___graphql_16.6.0.tgz"; - path = fetchurl { - name = "graphql___graphql_16.6.0.tgz"; - url = "https://registry.yarnpkg.com/graphql/-/graphql-16.6.0.tgz"; - sha512 = "KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw=="; - }; - } - { - name = "gray_matter___gray_matter_4.0.3.tgz"; - path = fetchurl { - name = "gray_matter___gray_matter_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/gray-matter/-/gray-matter-4.0.3.tgz"; - sha512 = "5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q=="; - }; - } - { - name = "hard_rejection___hard_rejection_2.1.0.tgz"; - path = fetchurl { - name = "hard_rejection___hard_rejection_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz"; - sha512 = "VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA=="; - }; - } - { - name = "has_bigints___has_bigints_1.0.2.tgz"; - path = fetchurl { - name = "has_bigints___has_bigints_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz"; - sha512 = "tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ=="; - }; - } - { - name = "has_flag___has_flag_3.0.0.tgz"; - path = fetchurl { - name = "has_flag___has_flag_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; - }; - } - { - name = "has_flag___has_flag_4.0.0.tgz"; - path = fetchurl { - name = "has_flag___has_flag_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; - }; - } - { - name = "has_property_descriptors___has_property_descriptors_1.0.0.tgz"; - path = fetchurl { - name = "has_property_descriptors___has_property_descriptors_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; - }; - } - { - name = "has_proto___has_proto_1.0.1.tgz"; - path = fetchurl { - name = "has_proto___has_proto_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz"; - sha512 = "7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg=="; - }; - } - { - name = "has_symbols___has_symbols_1.0.3.tgz"; - path = fetchurl { - name = "has_symbols___has_symbols_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz"; - sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; - }; - } - { - name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; - path = fetchurl { - name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; - }; - } - { - name = "has_value___has_value_0.3.1.tgz"; - path = fetchurl { - name = "has_value___has_value_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz"; - sha512 = "gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q=="; - }; - } - { - name = "has_value___has_value_1.0.0.tgz"; - path = fetchurl { - name = "has_value___has_value_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz"; - sha512 = "IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw=="; - }; - } - { - name = "has_values___has_values_0.1.4.tgz"; - path = fetchurl { - name = "has_values___has_values_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz"; - sha512 = "J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ=="; - }; - } - { - name = "has_values___has_values_1.0.0.tgz"; - path = fetchurl { - name = "has_values___has_values_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz"; - sha512 = "ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ=="; - }; - } - { - name = "has___has_1.0.3.tgz"; - path = fetchurl { - name = "has___has_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; - }; - } - { - name = "he___he_1.2.0.tgz"; - path = fetchurl { - name = "he___he_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz"; - sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="; - }; - } - { - name = "header_case___header_case_2.0.4.tgz"; - path = fetchurl { - name = "header_case___header_case_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/header-case/-/header-case-2.0.4.tgz"; - sha512 = "H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q=="; - }; - } - { - name = "histoire___histoire_0.14.2.tgz"; - path = fetchurl { - name = "histoire___histoire_0.14.2.tgz"; - url = "https://registry.yarnpkg.com/histoire/-/histoire-0.14.2.tgz"; - sha512 = "nY9O5sIbtlUsGsLQqMGi601I09OKH7aZamYPcDlW7g1fmkf7IMb15xiREboMunQEIpDrpAH+9aWBxGIN+iQ5eA=="; - }; - } - { - name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; - path = fetchurl { - name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; - url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"; - sha512 = "/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw=="; - }; - } - { - name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; - path = fetchurl { - name = "hosted_git_info___hosted_git_info_2.8.9.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; - sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; - }; - } - { - name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; - path = fetchurl { - name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; - sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; - }; - } - { - name = "html_encoding_sniffer___html_encoding_sniffer_3.0.0.tgz"; - path = fetchurl { - name = "html_encoding_sniffer___html_encoding_sniffer_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz"; - sha512 = "oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA=="; - }; - } - { - name = "html_tags___html_tags_3.2.0.tgz"; - path = fetchurl { - name = "html_tags___html_tags_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/html-tags/-/html-tags-3.2.0.tgz"; - sha512 = "vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg=="; - }; - } - { - name = "htmlparser2___htmlparser2_3.10.1.tgz"; - path = fetchurl { - name = "htmlparser2___htmlparser2_3.10.1.tgz"; - url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz"; - sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="; - }; - } - { - name = "htmlparser2___htmlparser2_8.0.1.tgz"; - path = fetchurl { - name = "htmlparser2___htmlparser2_8.0.1.tgz"; - url = "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz"; - sha512 = "4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA=="; - }; - } - { - name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; - path = fetchurl { - name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; - sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; - }; - } - { - name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; - path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; - sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; - }; - } - { - name = "iconv_lite___iconv_lite_0.6.3.tgz"; - path = fetchurl { - name = "iconv_lite___iconv_lite_0.6.3.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; - }; - } - { - name = "iconv_lite___iconv_lite_0.4.24.tgz"; - path = fetchurl { - name = "iconv_lite___iconv_lite_0.4.24.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz"; - sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; - }; - } - { - name = "idb___idb_7.1.0.tgz"; - path = fetchurl { - name = "idb___idb_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/idb/-/idb-7.1.0.tgz"; - sha512 = "Wsk07aAxDsntgYJY4h0knZJuTxM73eQ4reRAO+Z1liOh8eMCJ/MoDS8fCui1vGT9mnjtl1sOu3I2i/W1swPYZg=="; - }; - } - { - name = "ieee754___ieee754_1.2.1.tgz"; - path = fetchurl { - name = "ieee754___ieee754_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; - sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; - }; - } - { - name = "ignore___ignore_5.2.0.tgz"; - path = fetchurl { - name = "ignore___ignore_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz"; - sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; - }; - } - { - name = "ignore___ignore_5.2.4.tgz"; - path = fetchurl { - name = "ignore___ignore_5.2.4.tgz"; - url = "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz"; - sha512 = "MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ=="; - }; - } - { - name = "image_size___image_size_0.5.5.tgz"; - path = fetchurl { - name = "image_size___image_size_0.5.5.tgz"; - url = "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz"; - sha512 = "6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ=="; - }; - } - { - name = "immutable___immutable_4.1.0.tgz"; - path = fetchurl { - name = "immutable___immutable_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz"; - sha512 = "oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ=="; - }; - } - { - name = "immutable___immutable_3.7.6.tgz"; - path = fetchurl { - name = "immutable___immutable_3.7.6.tgz"; - url = "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz"; - sha512 = "AizQPcaofEtO11RZhPPHBOJRdo/20MKQF9mBLnVkBoyHi1/zXK8fzVdnEpSV9gxqtnh6Qomfp3F0xT5qP/vThw=="; - }; - } - { - name = "import_fresh___import_fresh_3.3.0.tgz"; - path = fetchurl { - name = "import_fresh___import_fresh_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; - sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; - }; - } - { - name = "import_from___import_from_4.0.0.tgz"; - path = fetchurl { - name = "import_from___import_from_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-from/-/import-from-4.0.0.tgz"; - sha512 = "P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ=="; - }; - } - { - name = "import_lazy___import_lazy_4.0.0.tgz"; - path = fetchurl { - name = "import_lazy___import_lazy_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz"; - sha512 = "rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw=="; - }; - } - { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - path = fetchurl { - name = "imurmurhash___imurmurhash_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; - }; - } - { - name = "indent_string___indent_string_4.0.0.tgz"; - path = fetchurl { - name = "indent_string___indent_string_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; - sha512 = "EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg=="; - }; - } - { - name = "inflight___inflight_1.0.6.tgz"; - path = fetchurl { - name = "inflight___inflight_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - } - { - name = "inherits___inherits_2.0.4.tgz"; - path = fetchurl { - name = "inherits___inherits_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - } - { - name = "ini___ini_1.3.8.tgz"; - path = fetchurl { - name = "ini___ini_1.3.8.tgz"; - url = "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz"; - sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; - }; - } - { - name = "inquirer___inquirer_8.2.5.tgz"; - path = fetchurl { - name = "inquirer___inquirer_8.2.5.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.5.tgz"; - sha512 = "QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ=="; - }; - } - { - name = "internal_slot___internal_slot_1.0.3.tgz"; - path = fetchurl { - name = "internal_slot___internal_slot_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz"; - sha512 = "O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA=="; - }; - } - { - name = "internal_slot___internal_slot_1.0.4.tgz"; - path = fetchurl { - name = "internal_slot___internal_slot_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz"; - sha512 = "tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ=="; - }; - } - { - name = "invariant___invariant_2.2.4.tgz"; - path = fetchurl { - name = "invariant___invariant_2.2.4.tgz"; - url = "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz"; - sha512 = "phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA=="; - }; - } - { - name = "is_absolute___is_absolute_1.0.0.tgz"; - path = fetchurl { - name = "is_absolute___is_absolute_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz"; - sha512 = "dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA=="; - }; - } - { - name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; - path = fetchurl { - name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; - url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha512 = "e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A=="; - }; - } - { - name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; - path = fetchurl { - name = "is_accessor_descriptor___is_accessor_descriptor_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; - }; - } - { - name = "is_arguments___is_arguments_1.1.1.tgz"; - path = fetchurl { - name = "is_arguments___is_arguments_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz"; - sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; - }; - } - { - name = "is_array_buffer___is_array_buffer_3.0.1.tgz"; - path = fetchurl { - name = "is_array_buffer___is_array_buffer_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.1.tgz"; - sha512 = "ASfLknmY8Xa2XtB4wmbz13Wu202baeA18cJBCeCy0wXUHZF0IPyVEXqKEcd+t2fNSLLL1vC6k7lxZEojNbISXQ=="; - }; - } - { - name = "is_arrayish___is_arrayish_0.2.1.tgz"; - path = fetchurl { - name = "is_arrayish___is_arrayish_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; - }; - } - { - name = "is_bigint___is_bigint_1.0.4.tgz"; - path = fetchurl { - name = "is_bigint___is_bigint_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz"; - sha512 = "zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg=="; - }; - } - { - name = "is_binary_path___is_binary_path_2.1.0.tgz"; - path = fetchurl { - name = "is_binary_path___is_binary_path_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz"; - sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; - }; - } - { - name = "is_boolean_object___is_boolean_object_1.1.2.tgz"; - path = fetchurl { - name = "is_boolean_object___is_boolean_object_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz"; - sha512 = "gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA=="; - }; - } - { - name = "is_buffer___is_buffer_1.1.6.tgz"; - path = fetchurl { - name = "is_buffer___is_buffer_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; - }; - } - { - name = "is_callable___is_callable_1.2.7.tgz"; - path = fetchurl { - name = "is_callable___is_callable_1.2.7.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz"; - sha512 = "1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA=="; - }; - } - { - name = "is_core_module___is_core_module_2.11.0.tgz"; - path = fetchurl { - name = "is_core_module___is_core_module_2.11.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz"; - sha512 = "RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw=="; - }; - } - { - name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; - path = fetchurl { - name = "is_data_descriptor___is_data_descriptor_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha512 = "+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg=="; - }; - } - { - name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; - path = fetchurl { - name = "is_data_descriptor___is_data_descriptor_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; - }; - } - { - name = "is_date_object___is_date_object_1.0.5.tgz"; - path = fetchurl { - name = "is_date_object___is_date_object_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz"; - sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; - }; - } - { - name = "is_descriptor___is_descriptor_0.1.6.tgz"; - path = fetchurl { - name = "is_descriptor___is_descriptor_0.1.6.tgz"; - url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; - }; - } - { - name = "is_descriptor___is_descriptor_1.0.2.tgz"; - path = fetchurl { - name = "is_descriptor___is_descriptor_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; - }; - } - { - name = "is_extendable___is_extendable_0.1.1.tgz"; - path = fetchurl { - name = "is_extendable___is_extendable_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz"; - sha512 = "5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="; - }; - } - { - name = "is_extendable___is_extendable_1.0.1.tgz"; - path = fetchurl { - name = "is_extendable___is_extendable_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz"; - sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; - }; - } - { - name = "is_extglob___is_extglob_2.1.1.tgz"; - path = fetchurl { - name = "is_extglob___is_extglob_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; - sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; - }; - } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; - }; - } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_4.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz"; - sha512 = "O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ=="; - }; - } - { - name = "is_glob___is_glob_4.0.3.tgz"; - path = fetchurl { - name = "is_glob___is_glob_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz"; - sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; - }; - } - { - name = "is_interactive___is_interactive_1.0.0.tgz"; - path = fetchurl { - name = "is_interactive___is_interactive_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz"; - sha512 = "2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="; - }; - } - { - name = "is_lower_case___is_lower_case_2.0.2.tgz"; - path = fetchurl { - name = "is_lower_case___is_lower_case_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-lower-case/-/is-lower-case-2.0.2.tgz"; - sha512 = "bVcMJy4X5Og6VZfdOZstSexlEy20Sr0k/p/b2IlQJlfdKAQuMpiv5w2Ccxb8sKdRUNAG1PnHVHjFSdRDVS6NlQ=="; - }; - } - { - name = "is_map___is_map_2.0.2.tgz"; - path = fetchurl { - name = "is_map___is_map_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz"; - sha512 = "cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg=="; - }; - } - { - name = "is_module___is_module_1.0.0.tgz"; - path = fetchurl { - name = "is_module___is_module_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz"; - sha512 = "51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g=="; - }; - } - { - name = "is_negative_zero___is_negative_zero_2.0.2.tgz"; - path = fetchurl { - name = "is_negative_zero___is_negative_zero_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz"; - sha512 = "dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="; - }; - } - { - name = "is_number_object___is_number_object_1.0.7.tgz"; - path = fetchurl { - name = "is_number_object___is_number_object_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz"; - sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; - }; - } - { - name = "is_number___is_number_3.0.0.tgz"; - path = fetchurl { - name = "is_number___is_number_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz"; - sha512 = "4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg=="; - }; - } - { - name = "is_number___is_number_7.0.0.tgz"; - path = fetchurl { - name = "is_number___is_number_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz"; - sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; - }; - } - { - name = "is_obj___is_obj_1.0.1.tgz"; - path = fetchurl { - name = "is_obj___is_obj_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz"; - sha512 = "l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg=="; - }; - } - { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - path = fetchurl { - name = "is_path_inside___is_path_inside_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz"; - sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; - }; - } - { - name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; - path = fetchurl { - name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha512 = "yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="; - }; - } - { - name = "is_plain_object___is_plain_object_2.0.4.tgz"; - path = fetchurl { - name = "is_plain_object___is_plain_object_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; - }; - } - { - name = "is_plain_object___is_plain_object_5.0.0.tgz"; - path = fetchurl { - name = "is_plain_object___is_plain_object_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz"; - sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; - }; - } - { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; - path = fetchurl { - name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz"; - sha512 = "bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="; - }; - } - { - name = "is_regex___is_regex_1.1.4.tgz"; - path = fetchurl { - name = "is_regex___is_regex_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz"; - sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; - }; - } - { - name = "is_regexp___is_regexp_1.0.0.tgz"; - path = fetchurl { - name = "is_regexp___is_regexp_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz"; - sha512 = "7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA=="; - }; - } - { - name = "is_relative___is_relative_1.0.0.tgz"; - path = fetchurl { - name = "is_relative___is_relative_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz"; - sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA=="; - }; - } - { - name = "is_set___is_set_2.0.2.tgz"; - path = fetchurl { - name = "is_set___is_set_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz"; - sha512 = "+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g=="; - }; - } - { - name = "is_shared_array_buffer___is_shared_array_buffer_1.0.2.tgz"; - path = fetchurl { - name = "is_shared_array_buffer___is_shared_array_buffer_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"; - sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; - }; - } - { - name = "is_stream___is_stream_2.0.1.tgz"; - path = fetchurl { - name = "is_stream___is_stream_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz"; - sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; - }; - } - { - name = "is_string___is_string_1.0.7.tgz"; - path = fetchurl { - name = "is_string___is_string_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz"; - sha512 = "tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg=="; - }; - } - { - name = "is_symbol___is_symbol_1.0.4.tgz"; - path = fetchurl { - name = "is_symbol___is_symbol_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz"; - sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; - }; - } - { - name = "is_typed_array___is_typed_array_1.1.10.tgz"; - path = fetchurl { - name = "is_typed_array___is_typed_array_1.1.10.tgz"; - url = "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz"; - sha512 = "PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A=="; - }; - } - { - name = "is_typed_array___is_typed_array_1.1.9.tgz"; - path = fetchurl { - name = "is_typed_array___is_typed_array_1.1.9.tgz"; - url = "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.9.tgz"; - sha512 = "kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A=="; - }; - } - { - name = "is_unc_path___is_unc_path_1.0.0.tgz"; - path = fetchurl { - name = "is_unc_path___is_unc_path_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz"; - sha512 = "mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ=="; - }; - } - { - name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; - path = fetchurl { - name = "is_unicode_supported___is_unicode_supported_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"; - sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; - }; - } - { - name = "is_upper_case___is_upper_case_2.0.2.tgz"; - path = fetchurl { - name = "is_upper_case___is_upper_case_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-upper-case/-/is-upper-case-2.0.2.tgz"; - sha512 = "44pxmxAvnnAOwBg4tHPnkfvgjPwbc5QIsSstNU+YcJ1ovxVzCWpSGosPJOZh/a1tdl81fbgnLc9LLv+x2ywbPQ=="; - }; - } - { - name = "is_weakmap___is_weakmap_2.0.1.tgz"; - path = fetchurl { - name = "is_weakmap___is_weakmap_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz"; - sha512 = "NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA=="; - }; - } - { - name = "is_weakref___is_weakref_1.0.2.tgz"; - path = fetchurl { - name = "is_weakref___is_weakref_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz"; - sha512 = "qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ=="; - }; - } - { - name = "is_weakset___is_weakset_2.0.2.tgz"; - path = fetchurl { - name = "is_weakset___is_weakset_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.2.tgz"; - sha512 = "t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg=="; - }; - } - { - name = "is_windows___is_windows_1.0.2.tgz"; - path = fetchurl { - name = "is_windows___is_windows_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz"; - sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; - }; - } - { - name = "isarray___isarray_1.0.0.tgz"; - path = fetchurl { - name = "isarray___isarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; - }; - } - { - name = "isarray___isarray_2.0.5.tgz"; - path = fetchurl { - name = "isarray___isarray_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz"; - sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="; - }; - } - { - name = "isexe___isexe_2.0.0.tgz"; - path = fetchurl { - name = "isexe___isexe_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; - }; - } - { - name = "isobject___isobject_2.1.0.tgz"; - path = fetchurl { - name = "isobject___isobject_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz"; - sha512 = "+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA=="; - }; - } - { - name = "isobject___isobject_3.0.1.tgz"; - path = fetchurl { - name = "isobject___isobject_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; - sha512 = "WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="; - }; - } - { - name = "isomorphic_fetch___isomorphic_fetch_3.0.0.tgz"; - path = fetchurl { - name = "isomorphic_fetch___isomorphic_fetch_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz"; - sha512 = "qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA=="; - }; - } - { - name = "isomorphic_ws___isomorphic_ws_5.0.0.tgz"; - path = fetchurl { - name = "isomorphic_ws___isomorphic_ws_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz"; - sha512 = "muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw=="; - }; - } - { - name = "jake___jake_10.8.5.tgz"; - path = fetchurl { - name = "jake___jake_10.8.5.tgz"; - url = "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz"; - sha512 = "sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw=="; - }; - } - { - name = "jest_diff___jest_diff_29.2.1.tgz"; - path = fetchurl { - name = "jest_diff___jest_diff_29.2.1.tgz"; - url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.2.1.tgz"; - sha512 = "gfh/SMNlQmP3MOUgdzxPOd4XETDJifADpT937fN1iUGz+9DgOu2eUPHH25JDkLVcLwwqxv3GzVyK4VBUr9fjfA=="; - }; - } - { - name = "jest_get_type___jest_get_type_29.2.0.tgz"; - path = fetchurl { - name = "jest_get_type___jest_get_type_29.2.0.tgz"; - url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz"; - sha512 = "uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA=="; - }; - } - { - name = "jest_matcher_utils___jest_matcher_utils_29.2.1.tgz"; - path = fetchurl { - name = "jest_matcher_utils___jest_matcher_utils_29.2.1.tgz"; - url = "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.2.1.tgz"; - sha512 = "hUTBh7H/Mnb6GTpihbLh8uF5rjAMdekfW/oZNXUMAXi7bbmym2HiRpzgqf/zzkjgejMrVAkPdVSQj+32enlUww=="; - }; - } - { - name = "jest_message_util___jest_message_util_29.2.1.tgz"; - path = fetchurl { - name = "jest_message_util___jest_message_util_29.2.1.tgz"; - url = "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.2.1.tgz"; - sha512 = "Dx5nEjw9V8C1/Yj10S/8ivA8F439VS8vTq1L7hEgwHFn9ovSKNpYW/kwNh7UglaEgXO42XxzKJB+2x0nSglFVw=="; - }; - } - { - name = "jest_util___jest_util_29.2.1.tgz"; - path = fetchurl { - name = "jest_util___jest_util_29.2.1.tgz"; - url = "https://registry.yarnpkg.com/jest-util/-/jest-util-29.2.1.tgz"; - sha512 = "P5VWDj25r7kj7kl4pN2rG/RN2c1TLfYYYZYULnS/35nFDjBai+hBeo3MDrYZS7p6IoY3YHZnt2vq4L6mKnLk0g=="; - }; - } - { - name = "jest_worker___jest_worker_26.6.2.tgz"; - path = fetchurl { - name = "jest_worker___jest_worker_26.6.2.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz"; - sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; - }; - } - { - name = "jiti___jiti_1.16.0.tgz"; - path = fetchurl { - name = "jiti___jiti_1.16.0.tgz"; - url = "https://registry.yarnpkg.com/jiti/-/jiti-1.16.0.tgz"; - sha512 = "L3BJStEf5NAqNuzrpfbN71dp43mYIcBUlCRea/vdyv5dW/AYa1d4bpelko4SHdY3I6eN9Wzyasxirj1/vv5kmg=="; - }; - } - { - name = "js_beautify___js_beautify_1.14.6.tgz"; - path = fetchurl { - name = "js_beautify___js_beautify_1.14.6.tgz"; - url = "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.6.tgz"; - sha512 = "GfofQY5zDp+cuHc+gsEXKPpNw2KbPddreEo35O6jT6i0RVK6LhsoYBhq5TvK4/n74wnA0QbK8gGd+jUZwTMKJw=="; - }; - } - { - name = "js_sdsl___js_sdsl_4.1.5.tgz"; - path = fetchurl { - name = "js_sdsl___js_sdsl_4.1.5.tgz"; - url = "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz"; - sha512 = "08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q=="; - }; - } - { - name = "js_tokens___js_tokens_4.0.0.tgz"; - path = fetchurl { - name = "js_tokens___js_tokens_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; - sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; - }; - } - { - name = "js_tokens___js_tokens_8.0.0.tgz"; - path = fetchurl { - name = "js_tokens___js_tokens_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-8.0.0.tgz"; - sha512 = "PC7MzqInq9OqKyTXfIvQNcjMkODJYC8A17kAaQgeW79yfhqTWSOfjHYQ2mDDcwJ96Iibtwkfh0C7R/OvqPlgVA=="; - }; - } - { - name = "js_yaml___js_yaml_3.14.1.tgz"; - path = fetchurl { - name = "js_yaml___js_yaml_3.14.1.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; - sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; - }; - } - { - name = "js_yaml___js_yaml_4.1.0.tgz"; - path = fetchurl { - name = "js_yaml___js_yaml_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; - sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; - }; - } - { - name = "jsdom___jsdom_20.0.3.tgz"; - path = fetchurl { - name = "jsdom___jsdom_20.0.3.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz"; - sha512 = "SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ=="; - }; - } - { - name = "jsdom___jsdom_21.1.0.tgz"; - path = fetchurl { - name = "jsdom___jsdom_21.1.0.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-21.1.0.tgz"; - sha512 = "m0lzlP7qOtthD918nenK3hdItSd2I+V3W9IrBcB36sqDwG+KnUs66IF5GY7laGWUnlM9vTsD0W1QwSEBYWWcJg=="; - }; - } - { - name = "jsesc___jsesc_2.5.2.tgz"; - path = fetchurl { - name = "jsesc___jsesc_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"; - sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; - }; - } - { - name = "jsesc___jsesc_0.5.0.tgz"; - path = fetchurl { - name = "jsesc___jsesc_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; - sha512 = "uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="; - }; - } - { - name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; - path = fetchurl { - name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; - sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; - }; - } - { - name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; - path = fetchurl { - name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; - }; - } - { - name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; - path = fetchurl { - name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; - sha512 = "NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="; - }; - } - { - name = "json_schema___json_schema_0.4.0.tgz"; - path = fetchurl { - name = "json_schema___json_schema_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz"; - sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; - }; - } - { - name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; - path = fetchurl { - name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; - }; - } - { - name = "json_stable_stringify___json_stable_stringify_1.0.1.tgz"; - path = fetchurl { - name = "json_stable_stringify___json_stable_stringify_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha512 = "i/J297TW6xyj7sDFa7AmBPkQvLIxWr2kKPWI26tXydnZrzVAocNqn5DMNT1Mzk0vit1V5UkRM7C1KdVNp7Lmcg=="; - }; - } - { - name = "json_to_pretty_yaml___json_to_pretty_yaml_1.2.2.tgz"; - path = fetchurl { - name = "json_to_pretty_yaml___json_to_pretty_yaml_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/json-to-pretty-yaml/-/json-to-pretty-yaml-1.2.2.tgz"; - sha512 = "rvm6hunfCcqegwYaG5T4yKJWxc9FXFgBVrcTZ4XfSVRwa5HA/Xs+vB/Eo9treYYHCeNM0nrSUr82V/M31Urc7A=="; - }; - } - { - name = "json5___json5_1.0.1.tgz"; - path = fetchurl { - name = "json5___json5_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz"; - sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; - }; - } - { - name = "json5___json5_2.2.1.tgz"; - path = fetchurl { - name = "json5___json5_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz"; - sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; - }; - } - { - name = "jsonc_parser___jsonc_parser_3.2.0.tgz"; - path = fetchurl { - name = "jsonc_parser___jsonc_parser_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.2.0.tgz"; - sha512 = "gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="; - }; - } - { - name = "jsonfile___jsonfile_6.1.0.tgz"; - path = fetchurl { - name = "jsonfile___jsonfile_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; - sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; - }; - } - { - name = "jsonify___jsonify_0.0.1.tgz"; - path = fetchurl { - name = "jsonify___jsonify_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz"; - sha512 = "2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg=="; - }; - } - { - name = "jsonpointer___jsonpointer_5.0.1.tgz"; - path = fetchurl { - name = "jsonpointer___jsonpointer_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz"; - sha512 = "p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ=="; - }; - } - { - name = "jsonwebtoken___jsonwebtoken_9.0.0.tgz"; - path = fetchurl { - name = "jsonwebtoken___jsonwebtoken_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz"; - sha512 = "tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw=="; - }; - } - { - name = "jwa___jwa_1.4.1.tgz"; - path = fetchurl { - name = "jwa___jwa_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz"; - sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA=="; - }; - } - { - name = "jws___jws_3.2.2.tgz"; - path = fetchurl { - name = "jws___jws_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz"; - sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA=="; - }; - } - { - name = "kind_of___kind_of_3.2.2.tgz"; - path = fetchurl { - name = "kind_of___kind_of_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz"; - sha512 = "NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="; - }; - } - { - name = "kind_of___kind_of_4.0.0.tgz"; - path = fetchurl { - name = "kind_of___kind_of_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz"; - sha512 = "24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw=="; - }; - } - { - name = "kind_of___kind_of_5.1.0.tgz"; - path = fetchurl { - name = "kind_of___kind_of_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; - }; - } - { - name = "kind_of___kind_of_6.0.3.tgz"; - path = fetchurl { - name = "kind_of___kind_of_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; - sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; - }; - } - { - name = "known_css_properties___known_css_properties_0.26.0.tgz"; - path = fetchurl { - name = "known_css_properties___known_css_properties_0.26.0.tgz"; - url = "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.26.0.tgz"; - sha512 = "5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg=="; - }; - } - { - name = "launch_editor___launch_editor_2.6.0.tgz"; - path = fetchurl { - name = "launch_editor___launch_editor_2.6.0.tgz"; - url = "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz"; - sha512 = "JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ=="; - }; - } - { - name = "leven___leven_3.1.0.tgz"; - path = fetchurl { - name = "leven___leven_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz"; - sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A=="; - }; - } - { - name = "levn___levn_0.4.1.tgz"; - path = fetchurl { - name = "levn___levn_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; - sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ=="; - }; - } - { - name = "levn___levn_0.3.0.tgz"; - path = fetchurl { - name = "levn___levn_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; - }; - } - { - name = "lilconfig___lilconfig_2.0.6.tgz"; - path = fetchurl { - name = "lilconfig___lilconfig_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz"; - sha512 = "9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg=="; - }; - } - { - name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; - path = fetchurl { - name = "lines_and_columns___lines_and_columns_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; - sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; - }; - } - { - name = "linkify_it___linkify_it_3.0.3.tgz"; - path = fetchurl { - name = "linkify_it___linkify_it_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz"; - sha512 = "ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ=="; - }; - } - { - name = "linkify_it___linkify_it_4.0.1.tgz"; - path = fetchurl { - name = "linkify_it___linkify_it_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz"; - sha512 = "C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw=="; - }; - } - { - name = "linkify_string___linkify_string_4.1.0.tgz"; - path = fetchurl { - name = "linkify_string___linkify_string_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/linkify-string/-/linkify-string-4.1.0.tgz"; - sha512 = "mw4KyPoE/vP0lamGbFFtDsutxOw0b+3g2/lH5bwS7X4tRHQyLBoJ60avPVGUoHfU8G1bLS329u13hhpxBIqFiA=="; - }; - } - { - name = "linkifyjs___linkifyjs_3.0.5.tgz"; - path = fetchurl { - name = "linkifyjs___linkifyjs_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-3.0.5.tgz"; - sha512 = "1Y9XQH65eQKA9p2xtk+zxvnTeQBG7rdAXSkUG97DmuI/Xhji9uaUzaWxRj6rf9YC0v8KKHkxav7tnLX82Sz5Fg=="; - }; - } - { - name = "linkifyjs___linkifyjs_4.1.0.tgz"; - path = fetchurl { - name = "linkifyjs___linkifyjs_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-4.1.0.tgz"; - sha512 = "Ffv8VoY3+ixI1b3aZ3O+jM6x17cOsgwfB1Wq7pkytbo1WlyRp6ZO0YDMqiWT/gQPY/CmtiGuKfzDIVqxh1aCTA=="; - }; - } - { - name = "listr2___listr2_4.0.5.tgz"; - path = fetchurl { - name = "listr2___listr2_4.0.5.tgz"; - url = "https://registry.yarnpkg.com/listr2/-/listr2-4.0.5.tgz"; - sha512 = "juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA=="; - }; - } - { - name = "loader_utils___loader_utils_3.2.1.tgz"; - path = fetchurl { - name = "loader_utils___loader_utils_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.1.tgz"; - sha512 = "ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw=="; - }; - } - { - name = "local_pkg___local_pkg_0.4.2.tgz"; - path = fetchurl { - name = "local_pkg___local_pkg_0.4.2.tgz"; - url = "https://registry.yarnpkg.com/local-pkg/-/local-pkg-0.4.2.tgz"; - sha512 = "mlERgSPrbxU3BP4qBqAvvwlgW4MTg78iwJdGGnv7kibKjWcJksrG3t6LB5lXI93wXRDvG4NpUgJFmTG4T6rdrg=="; - }; - } - { - name = "locate_path___locate_path_5.0.0.tgz"; - path = fetchurl { - name = "locate_path___locate_path_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; - sha512 = "t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g=="; - }; - } - { - name = "locate_path___locate_path_6.0.0.tgz"; - path = fetchurl { - name = "locate_path___locate_path_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz"; - sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; - }; - } - { - name = "lodash_es___lodash_es_4.17.21.tgz"; - path = fetchurl { - name = "lodash_es___lodash_es_4.17.21.tgz"; - url = "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz"; - sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; - }; - } - { - name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; - path = fetchurl { - name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha512 = "FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="; - }; - } - { - name = "lodash.merge___lodash.merge_4.6.2.tgz"; - path = fetchurl { - name = "lodash.merge___lodash.merge_4.6.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; - sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; - }; - } - { - name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; - path = fetchurl { - name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; - sha512 = "HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA=="; - }; - } - { - name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; - path = fetchurl { - name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; - sha512 = "jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="; - }; - } - { - name = "lodash___lodash_4.17.21.tgz"; - path = fetchurl { - name = "lodash___lodash_4.17.21.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; - sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; - }; - } - { - name = "log_symbols___log_symbols_4.1.0.tgz"; - path = fetchurl { - name = "log_symbols___log_symbols_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz"; - sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; - }; - } - { - name = "log_update___log_update_4.0.0.tgz"; - path = fetchurl { - name = "log_update___log_update_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz"; - sha512 = "9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg=="; - }; - } - { - name = "loglevel___loglevel_1.8.1.tgz"; - path = fetchurl { - name = "loglevel___loglevel_1.8.1.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.8.1.tgz"; - sha512 = "tCRIJM51SHjAayKwC+QAg8hT8vg6z7GSgLJKGvzuPb1Wc+hLzqtuVLxp6/HzSPOozuK+8ErAhy7U/sVzw8Dgfg=="; - }; - } - { - name = "loose_envify___loose_envify_1.4.0.tgz"; - path = fetchurl { - name = "loose_envify___loose_envify_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz"; - sha512 = "lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q=="; - }; - } - { - name = "loupe___loupe_2.3.4.tgz"; - path = fetchurl { - name = "loupe___loupe_2.3.4.tgz"; - url = "https://registry.yarnpkg.com/loupe/-/loupe-2.3.4.tgz"; - sha512 = "OvKfgCC2Ndby6aSTREl5aCCPTNIzlDfQZvZxNUrBrihDhL3xcrYegTblhmEiCrg2kKQz4XsFIaemE5BF4ybSaQ=="; - }; - } - { - name = "loupe___loupe_2.3.6.tgz"; - path = fetchurl { - name = "loupe___loupe_2.3.6.tgz"; - url = "https://registry.yarnpkg.com/loupe/-/loupe-2.3.6.tgz"; - sha512 = "RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA=="; - }; - } - { - name = "lower_case_first___lower_case_first_2.0.2.tgz"; - path = fetchurl { - name = "lower_case_first___lower_case_first_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/lower-case-first/-/lower-case-first-2.0.2.tgz"; - sha512 = "EVm/rR94FJTZi3zefZ82fLWab+GX14LJN4HrWBcuo6Evmsl9hEfnqxgcHCKb9q+mNf6EVdsjx/qucYFIIB84pg=="; - }; - } - { - name = "lower_case___lower_case_2.0.2.tgz"; - path = fetchurl { - name = "lower_case___lower_case_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz"; - sha512 = "7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg=="; - }; - } - { - name = "lru_cache___lru_cache_4.1.5.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_4.1.5.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz"; - sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; - }; - } - { - name = "lru_cache___lru_cache_6.0.0.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - } - { - name = "lz_string___lz_string_1.4.4.tgz"; - path = fetchurl { - name = "lz_string___lz_string_1.4.4.tgz"; - url = "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz"; - sha512 = "0ckx7ZHRPqb0oUm8zNr+90mtf9DQB60H1wMCjBtfi62Kl3a7JbHob6gA2bC+xRvZoOL+1hzUK8jeuEIQE8svEQ=="; - }; - } - { - name = "magic_string___magic_string_0.25.9.tgz"; - path = fetchurl { - name = "magic_string___magic_string_0.25.9.tgz"; - url = "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz"; - sha512 = "RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="; - }; - } - { - name = "magic_string___magic_string_0.27.0.tgz"; - path = fetchurl { - name = "magic_string___magic_string_0.27.0.tgz"; - url = "https://registry.yarnpkg.com/magic-string/-/magic-string-0.27.0.tgz"; - sha512 = "8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA=="; - }; - } - { - name = "make_error___make_error_1.3.6.tgz"; - path = fetchurl { - name = "make_error___make_error_1.3.6.tgz"; - url = "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz"; - sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; - }; - } - { - name = "map_cache___map_cache_0.2.2.tgz"; - path = fetchurl { - name = "map_cache___map_cache_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz"; - sha512 = "8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg=="; - }; - } - { - name = "map_obj___map_obj_1.0.1.tgz"; - path = fetchurl { - name = "map_obj___map_obj_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz"; - sha512 = "7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="; - }; - } - { - name = "map_obj___map_obj_4.3.0.tgz"; - path = fetchurl { - name = "map_obj___map_obj_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz"; - sha512 = "hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="; - }; - } - { - name = "map_visit___map_visit_1.0.0.tgz"; - path = fetchurl { - name = "map_visit___map_visit_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz"; - sha512 = "4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w=="; - }; - } - { - name = "markdown_it_anchor___markdown_it_anchor_8.6.5.tgz"; - path = fetchurl { - name = "markdown_it_anchor___markdown_it_anchor_8.6.5.tgz"; - url = "https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.5.tgz"; - sha512 = "PI1qEHHkTNWT+X6Ip9w+paonfIQ+QZP9sCeMYi47oqhH+EsW8CrJ8J7CzV19QVOj6il8ATGbK2nTECj22ZHGvQ=="; - }; - } - { - name = "markdown_it_attrs___markdown_it_attrs_4.1.4.tgz"; - path = fetchurl { - name = "markdown_it_attrs___markdown_it_attrs_4.1.4.tgz"; - url = "https://registry.yarnpkg.com/markdown-it-attrs/-/markdown-it-attrs-4.1.4.tgz"; - sha512 = "53Zfv8PTb6rlVFDlD106xcZHKBSsRZKJ2IW/rTxEJBEVbVaoxaNsmRkG0HXfbHl2SK8kaxZ2QKqdthWy/QBwmA=="; - }; - } - { - name = "markdown_it_emoji___markdown_it_emoji_2.0.2.tgz"; - path = fetchurl { - name = "markdown_it_emoji___markdown_it_emoji_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/markdown-it-emoji/-/markdown-it-emoji-2.0.2.tgz"; - sha512 = "zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ=="; - }; - } - { - name = "markdown_it___markdown_it_12.3.2.tgz"; - path = fetchurl { - name = "markdown_it___markdown_it_12.3.2.tgz"; - url = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz"; - sha512 = "TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg=="; - }; - } - { - name = "markdown_it___markdown_it_13.0.1.tgz"; - path = fetchurl { - name = "markdown_it___markdown_it_13.0.1.tgz"; - url = "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz"; - sha512 = "lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q=="; - }; - } - { - name = "mathml_tag_names___mathml_tag_names_2.1.3.tgz"; - path = fetchurl { - name = "mathml_tag_names___mathml_tag_names_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz"; - sha512 = "APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg=="; - }; - } - { - name = "mdn_data___mdn_data_2.0.14.tgz"; - path = fetchurl { - name = "mdn_data___mdn_data_2.0.14.tgz"; - url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz"; - sha512 = "dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="; - }; - } - { - name = "mdurl___mdurl_1.0.1.tgz"; - path = fetchurl { - name = "mdurl___mdurl_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz"; - sha512 = "/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="; - }; - } - { - name = "meow___meow_9.0.0.tgz"; - path = fetchurl { - name = "meow___meow_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz"; - sha512 = "+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ=="; - }; - } - { - name = "merge_options___merge_options_1.0.1.tgz"; - path = fetchurl { - name = "merge_options___merge_options_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/merge-options/-/merge-options-1.0.1.tgz"; - sha512 = "iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg=="; - }; - } - { - name = "merge_stream___merge_stream_2.0.0.tgz"; - path = fetchurl { - name = "merge_stream___merge_stream_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz"; - sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; - }; - } - { - name = "merge2___merge2_1.4.1.tgz"; - path = fetchurl { - name = "merge2___merge2_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; - sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; - }; - } - { - name = "meros___meros_1.2.1.tgz"; - path = fetchurl { - name = "meros___meros_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/meros/-/meros-1.2.1.tgz"; - sha512 = "R2f/jxYqCAGI19KhAvaxSOxALBMkaXWH2a7rOyqQw+ZmizX5bKkEYWLzdhC+U82ZVVPVp6MCXe3EkVligh+12g=="; - }; - } - { - name = "micromatch___micromatch_3.1.0.tgz"; - path = fetchurl { - name = "micromatch___micromatch_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.0.tgz"; - sha512 = "3StSelAE+hnRvMs8IdVW7Uhk8CVed5tp+kLLGlBP6WiRAXS21GPGu/Nat4WNPXj2Eoc24B02SaeoyozPMfj0/g=="; - }; - } - { - name = "micromatch___micromatch_4.0.5.tgz"; - path = fetchurl { - name = "micromatch___micromatch_4.0.5.tgz"; - url = "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz"; - sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; - }; - } - { - name = "mime_db___mime_db_1.52.0.tgz"; - path = fetchurl { - name = "mime_db___mime_db_1.52.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz"; - sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; - }; - } - { - name = "mime_types___mime_types_2.1.35.tgz"; - path = fetchurl { - name = "mime_types___mime_types_2.1.35.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz"; - sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; - }; - } - { - name = "mimic_fn___mimic_fn_2.1.0.tgz"; - path = fetchurl { - name = "mimic_fn___mimic_fn_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz"; - sha512 = "OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="; - }; - } - { - name = "min_indent___min_indent_1.0.1.tgz"; - path = fetchurl { - name = "min_indent___min_indent_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz"; - sha512 = "I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="; - }; - } - { - name = "minimatch___minimatch_4.2.1.tgz"; - path = fetchurl { - name = "minimatch___minimatch_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-4.2.1.tgz"; - sha512 = "9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g=="; - }; - } - { - name = "minimatch___minimatch_3.1.2.tgz"; - path = fetchurl { - name = "minimatch___minimatch_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz"; - sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; - }; - } - { - name = "minimatch___minimatch_5.1.0.tgz"; - path = fetchurl { - name = "minimatch___minimatch_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz"; - sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; - }; - } - { - name = "minimatch___minimatch_5.1.6.tgz"; - path = fetchurl { - name = "minimatch___minimatch_5.1.6.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz"; - sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; - }; - } - { - name = "minimist_options___minimist_options_4.1.0.tgz"; - path = fetchurl { - name = "minimist_options___minimist_options_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz"; - sha512 = "Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A=="; - }; - } - { - name = "minimist___minimist_1.2.7.tgz"; - path = fetchurl { - name = "minimist___minimist_1.2.7.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz"; - sha512 = "bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g=="; - }; - } - { - name = "mitt___mitt_3.0.0.tgz"; - path = fetchurl { - name = "mitt___mitt_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/mitt/-/mitt-3.0.0.tgz"; - sha512 = "7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ=="; - }; - } - { - name = "mixin_deep___mixin_deep_1.3.2.tgz"; - path = fetchurl { - name = "mixin_deep___mixin_deep_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"; - sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; - }; - } - { - name = "mlly___mlly_1.0.0.tgz"; - path = fetchurl { - name = "mlly___mlly_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/mlly/-/mlly-1.0.0.tgz"; - sha512 = "QL108Hwt+u9bXdWgOI0dhzZfACovn5Aen4Xvc8Jasd9ouRH4NjnrXEiyP3nVvJo91zPlYjVRckta0Nt2zfoR6g=="; - }; - } - { - name = "mlly___mlly_1.1.0.tgz"; - path = fetchurl { - name = "mlly___mlly_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/mlly/-/mlly-1.1.0.tgz"; - sha512 = "cwzBrBfwGC1gYJyfcy8TcZU1f+dbH/T+TuOhtYP2wLv/Fb51/uV7HJQfBPtEupZ2ORLRU1EKFS/QfS3eo9+kBQ=="; - }; - } - { - name = "mock_apollo_client___mock_apollo_client_1.2.1.tgz"; - path = fetchurl { - name = "mock_apollo_client___mock_apollo_client_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/mock-apollo-client/-/mock-apollo-client-1.2.1.tgz"; - sha512 = "QYQ6Hxo+t7hard1bcHHbsHxlNQYTQsaMNsm2Psh/NbwLMi2R4tGzplJKt97MUWuARHMq3GHB4PTLj/gxej4Caw=="; - }; - } - { - name = "mri___mri_1.2.0.tgz"; - path = fetchurl { - name = "mri___mri_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz"; - sha512 = "tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA=="; - }; - } - { - name = "mrmime___mrmime_1.0.1.tgz"; - path = fetchurl { - name = "mrmime___mrmime_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.1.tgz"; - sha512 = "hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw=="; - }; - } - { - name = "ms___ms_2.0.0.tgz"; - path = fetchurl { - name = "ms___ms_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; - }; - } - { - name = "ms___ms_2.1.2.tgz"; - path = fetchurl { - name = "ms___ms_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - } - { - name = "ms___ms_2.1.3.tgz"; - path = fetchurl { - name = "ms___ms_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; - sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; - }; - } - { - name = "muggle_string___muggle_string_0.1.0.tgz"; - path = fetchurl { - name = "muggle_string___muggle_string_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.1.0.tgz"; - sha512 = "Tr1knR3d2mKvvWthlk7202rywKbiOm4rVFLsfAaSIhJ6dt9o47W4S+JMtWhd/PW9Wrdew2/S2fSvhz3E2gkfEg=="; - }; - } - { - name = "mute_stream___mute_stream_0.0.8.tgz"; - path = fetchurl { - name = "mute_stream___mute_stream_0.0.8.tgz"; - url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz"; - sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; - }; - } - { - name = "nanoid___nanoid_3.3.4.tgz"; - path = fetchurl { - name = "nanoid___nanoid_3.3.4.tgz"; - url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz"; - sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; - }; - } - { - name = "nanomatch___nanomatch_1.2.13.tgz"; - path = fetchurl { - name = "nanomatch___nanomatch_1.2.13.tgz"; - url = "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz"; - sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; - }; - } - { - name = "natural_compare_lite___natural_compare_lite_1.4.0.tgz"; - path = fetchurl { - name = "natural_compare_lite___natural_compare_lite_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"; - sha512 = "Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g=="; - }; - } - { - name = "natural_compare___natural_compare_1.4.0.tgz"; - path = fetchurl { - name = "natural_compare___natural_compare_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; - sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; - }; - } - { - name = "no_case___no_case_3.0.4.tgz"; - path = fetchurl { - name = "no_case___no_case_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz"; - sha512 = "fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg=="; - }; - } - { - name = "node_domexception___node_domexception_1.0.0.tgz"; - path = fetchurl { - name = "node_domexception___node_domexception_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz"; - sha512 = "/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ=="; - }; - } - { - name = "node_fetch___node_fetch_2.6.7.tgz"; - path = fetchurl { - name = "node_fetch___node_fetch_2.6.7.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz"; - sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; - }; - } - { - name = "node_int64___node_int64_0.4.0.tgz"; - path = fetchurl { - name = "node_int64___node_int64_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz"; - sha512 = "O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="; - }; - } - { - name = "node_releases___node_releases_2.0.6.tgz"; - path = fetchurl { - name = "node_releases___node_releases_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz"; - sha512 = "PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="; - }; - } - { - name = "nopt___nopt_6.0.0.tgz"; - path = fetchurl { - name = "nopt___nopt_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz"; - sha512 = "ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g=="; - }; - } - { - name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; - path = fetchurl { - name = "normalize_package_data___normalize_package_data_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz"; - sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; - }; - } - { - name = "normalize_package_data___normalize_package_data_3.0.3.tgz"; - path = fetchurl { - name = "normalize_package_data___normalize_package_data_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.3.tgz"; - sha512 = "p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA=="; - }; - } - { - name = "normalize_path___normalize_path_2.1.1.tgz"; - path = fetchurl { - name = "normalize_path___normalize_path_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz"; - sha512 = "3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w=="; - }; - } - { - name = "normalize_path___normalize_path_3.0.0.tgz"; - path = fetchurl { - name = "normalize_path___normalize_path_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz"; - sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; - }; - } - { - name = "normalize_range___normalize_range_0.1.2.tgz"; - path = fetchurl { - name = "normalize_range___normalize_range_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz"; - sha512 = "bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="; - }; - } - { - name = "nth_check___nth_check_2.1.1.tgz"; - path = fetchurl { - name = "nth_check___nth_check_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz"; - sha512 = "lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="; - }; - } - { - name = "nullthrows___nullthrows_1.1.1.tgz"; - path = fetchurl { - name = "nullthrows___nullthrows_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz"; - sha512 = "2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="; - }; - } - { - name = "nwsapi___nwsapi_2.2.2.tgz"; - path = fetchurl { - name = "nwsapi___nwsapi_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz"; - sha512 = "90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw=="; - }; - } - { - name = "object_assign___object_assign_4.1.1.tgz"; - path = fetchurl { - name = "object_assign___object_assign_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; - sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; - }; - } - { - name = "object_copy___object_copy_0.1.0.tgz"; - path = fetchurl { - name = "object_copy___object_copy_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz"; - sha512 = "79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ=="; - }; - } - { - name = "object_hash___object_hash_3.0.0.tgz"; - path = fetchurl { - name = "object_hash___object_hash_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz"; - sha512 = "RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw=="; - }; - } - { - name = "object_inspect___object_inspect_1.12.2.tgz"; - path = fetchurl { - name = "object_inspect___object_inspect_1.12.2.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz"; - sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; - }; - } - { - name = "object_is___object_is_1.1.5.tgz"; - path = fetchurl { - name = "object_is___object_is_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz"; - sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; - }; - } - { - name = "object_keys___object_keys_1.1.1.tgz"; - path = fetchurl { - name = "object_keys___object_keys_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - } - { - name = "object_visit___object_visit_1.0.1.tgz"; - path = fetchurl { - name = "object_visit___object_visit_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz"; - sha512 = "GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA=="; - }; - } - { - name = "object.assign___object.assign_4.1.4.tgz"; - path = fetchurl { - name = "object.assign___object.assign_4.1.4.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz"; - sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; - }; - } - { - name = "object.entries___object.entries_1.1.5.tgz"; - path = fetchurl { - name = "object.entries___object.entries_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz"; - sha512 = "TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g=="; - }; - } - { - name = "object.omit___object.omit_3.0.0.tgz"; - path = fetchurl { - name = "object.omit___object.omit_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/object.omit/-/object.omit-3.0.0.tgz"; - sha512 = "EO+BCv6LJfu+gBIF3ggLicFebFLN5zqzz/WWJlMFfkMyGth+oBkhxzDl0wx2W4GkLzuQs/FsSkXZb2IMWQqmBQ=="; - }; - } - { - name = "object.pick___object.pick_1.3.0.tgz"; - path = fetchurl { - name = "object.pick___object.pick_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz"; - sha512 = "tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ=="; - }; - } - { - name = "object.values___object.values_1.1.6.tgz"; - path = fetchurl { - name = "object.values___object.values_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz"; - sha512 = "FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw=="; - }; - } - { - name = "on_finished___on_finished_2.3.0.tgz"; - path = fetchurl { - name = "on_finished___on_finished_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; - sha512 = "ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww=="; - }; - } - { - name = "once___once_1.4.0.tgz"; - path = fetchurl { - name = "once___once_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - } - { - name = "onetime___onetime_5.1.2.tgz"; - path = fetchurl { - name = "onetime___onetime_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; - sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; - }; - } - { - name = "optimism___optimism_0.16.1.tgz"; - path = fetchurl { - name = "optimism___optimism_0.16.1.tgz"; - url = "https://registry.yarnpkg.com/optimism/-/optimism-0.16.1.tgz"; - sha512 = "64i+Uw3otrndfq5kaoGNoY7pvOhSsjFEN4bdEFh80MWVk/dbgJfMv7VFDeCT8LxNAlEVhQmdVEbfE7X2nWNIIg=="; - }; - } - { - name = "optionator___optionator_0.8.3.tgz"; - path = fetchurl { - name = "optionator___optionator_0.8.3.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; - sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; - }; - } - { - name = "optionator___optionator_0.9.1.tgz"; - path = fetchurl { - name = "optionator___optionator_0.9.1.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; - sha512 = "74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw=="; - }; - } - { - name = "ora___ora_5.4.1.tgz"; - path = fetchurl { - name = "ora___ora_5.4.1.tgz"; - url = "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz"; - sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; - }; - } - { - name = "orderedmap___orderedmap_2.1.0.tgz"; - path = fetchurl { - name = "orderedmap___orderedmap_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/orderedmap/-/orderedmap-2.1.0.tgz"; - sha512 = "/pIFexOm6S70EPdznemIz3BQZoJ4VTFrhqzu0ACBqBgeLsLxq8e6Jim63ImIfwW/zAD1AlXpRMlOv3aghmo4dA=="; - }; - } - { - name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; - path = fetchurl { - name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="; - }; - } - { - name = "p_limit___p_limit_3.1.0.tgz"; - path = fetchurl { - name = "p_limit___p_limit_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz"; - sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; - }; - } - { - name = "p_limit___p_limit_2.3.0.tgz"; - path = fetchurl { - name = "p_limit___p_limit_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; - sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; - }; - } - { - name = "p_limit___p_limit_4.0.0.tgz"; - path = fetchurl { - name = "p_limit___p_limit_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz"; - sha512 = "5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ=="; - }; - } - { - name = "p_locate___p_locate_4.1.0.tgz"; - path = fetchurl { - name = "p_locate___p_locate_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; - sha512 = "R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A=="; - }; - } - { - name = "p_locate___p_locate_5.0.0.tgz"; - path = fetchurl { - name = "p_locate___p_locate_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz"; - sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; - }; - } - { - name = "p_map___p_map_4.0.0.tgz"; - path = fetchurl { - name = "p_map___p_map_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz"; - sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; - }; - } - { - name = "p_try___p_try_2.2.0.tgz"; - path = fetchurl { - name = "p_try___p_try_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz"; - sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; - }; - } - { - name = "param_case___param_case_3.0.4.tgz"; - path = fetchurl { - name = "param_case___param_case_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz"; - sha512 = "RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="; - }; - } - { - name = "parent_module___parent_module_1.0.1.tgz"; - path = fetchurl { - name = "parent_module___parent_module_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; - sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; - }; - } - { - name = "parse_filepath___parse_filepath_1.0.2.tgz"; - path = fetchurl { - name = "parse_filepath___parse_filepath_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz"; - sha512 = "FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q=="; - }; - } - { - name = "parse_json___parse_json_5.2.0.tgz"; - path = fetchurl { - name = "parse_json___parse_json_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz"; - sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; - }; - } - { - name = "parse5___parse5_7.1.1.tgz"; - path = fetchurl { - name = "parse5___parse5_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/parse5/-/parse5-7.1.1.tgz"; - sha512 = "kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg=="; - }; - } - { - name = "parseurl___parseurl_1.3.3.tgz"; - path = fetchurl { - name = "parseurl___parseurl_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"; - sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; - }; - } - { - name = "pascal_case___pascal_case_3.1.2.tgz"; - path = fetchurl { - name = "pascal_case___pascal_case_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz"; - sha512 = "uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g=="; - }; - } - { - name = "pascalcase___pascalcase_0.1.1.tgz"; - path = fetchurl { - name = "pascalcase___pascalcase_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz"; - sha512 = "XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw=="; - }; - } - { - name = "path_case___path_case_3.0.4.tgz"; - path = fetchurl { - name = "path_case___path_case_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/path-case/-/path-case-3.0.4.tgz"; - sha512 = "qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg=="; - }; - } - { - name = "path_exists___path_exists_4.0.0.tgz"; - path = fetchurl { - name = "path_exists___path_exists_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; - sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; - }; - } - { - name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; - path = fetchurl { - name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; - }; - } - { - name = "path_key___path_key_3.1.1.tgz"; - path = fetchurl { - name = "path_key___path_key_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; - sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; - }; - } - { - name = "path_parse___path_parse_1.0.7.tgz"; - path = fetchurl { - name = "path_parse___path_parse_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; - sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; - }; - } - { - name = "path_root_regex___path_root_regex_0.1.2.tgz"; - path = fetchurl { - name = "path_root_regex___path_root_regex_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz"; - sha512 = "4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ=="; - }; - } - { - name = "path_root___path_root_0.1.1.tgz"; - path = fetchurl { - name = "path_root___path_root_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz"; - sha512 = "QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg=="; - }; - } - { - name = "path_type___path_type_4.0.0.tgz"; - path = fetchurl { - name = "path_type___path_type_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; - sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; - }; - } - { - name = "pathe___pathe_0.2.0.tgz"; - path = fetchurl { - name = "pathe___pathe_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/pathe/-/pathe-0.2.0.tgz"; - sha512 = "sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw=="; - }; - } - { - name = "pathe___pathe_1.0.0.tgz"; - path = fetchurl { - name = "pathe___pathe_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/pathe/-/pathe-1.0.0.tgz"; - sha512 = "nPdMG0Pd09HuSsr7QOKUXO2Jr9eqaDiZvDwdyIhNG5SHYujkQHYKDfGQkulBxvbDHz8oHLsTgKN86LSwYzSHAg=="; - }; - } - { - name = "pathe___pathe_1.1.0.tgz"; - path = fetchurl { - name = "pathe___pathe_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/pathe/-/pathe-1.1.0.tgz"; - sha512 = "ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w=="; - }; - } - { - name = "pathval___pathval_1.1.1.tgz"; - path = fetchurl { - name = "pathval___pathval_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz"; - sha512 = "Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ=="; - }; - } - { - name = "picocolors___picocolors_1.0.0.tgz"; - path = fetchurl { - name = "picocolors___picocolors_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz"; - sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; - }; - } - { - name = "picomatch___picomatch_2.3.1.tgz"; - path = fetchurl { - name = "picomatch___picomatch_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz"; - sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; - }; - } - { - name = "pify___pify_2.3.0.tgz"; - path = fetchurl { - name = "pify___pify_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz"; - sha512 = "udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="; - }; - } - { - name = "pinia___pinia_2.0.30.tgz"; - path = fetchurl { - name = "pinia___pinia_2.0.30.tgz"; - url = "https://registry.yarnpkg.com/pinia/-/pinia-2.0.30.tgz"; - sha512 = "q6DUmxWwe/mQgg+55QQjykpKC+aGeGdaJV3niminl19V08dE+LRTvSEuqi6/NLSGCKHI49KGL6tMNEOssFiMyA=="; - }; - } - { - name = "pkg_types___pkg_types_1.0.1.tgz"; - path = fetchurl { - name = "pkg_types___pkg_types_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.0.1.tgz"; - sha512 = "jHv9HB+Ho7dj6ItwppRDDl0iZRYBD0jsakHXtFgoLr+cHSF6xC+QL54sJmWxyGxOLYSHm0afhXhXcQDQqH9z8g=="; - }; - } - { - name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; - path = fetchurl { - name = "posix_character_classes___posix_character_classes_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; - sha512 = "xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg=="; - }; - } - { - name = "postcss_html___postcss_html_1.5.0.tgz"; - path = fetchurl { - name = "postcss_html___postcss_html_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-html/-/postcss-html-1.5.0.tgz"; - sha512 = "kCMRWJRHKicpA166kc2lAVUGxDZL324bkj/pVOb6RhjB0Z5Krl7mN0AsVkBhVIRZZirY0lyQXG38HCVaoKVNoA=="; - }; - } - { - name = "postcss_import___postcss_import_14.1.0.tgz"; - path = fetchurl { - name = "postcss_import___postcss_import_14.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.1.0.tgz"; - sha512 = "flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw=="; - }; - } - { - name = "postcss_js___postcss_js_4.0.0.tgz"; - path = fetchurl { - name = "postcss_js___postcss_js_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.0.tgz"; - sha512 = "77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ=="; - }; - } - { - name = "postcss_load_config___postcss_load_config_3.1.4.tgz"; - path = fetchurl { - name = "postcss_load_config___postcss_load_config_3.1.4.tgz"; - url = "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz"; - sha512 = "6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg=="; - }; - } - { - name = "postcss_media_query_parser___postcss_media_query_parser_0.2.3.tgz"; - path = fetchurl { - name = "postcss_media_query_parser___postcss_media_query_parser_0.2.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz"; - sha512 = "3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig=="; - }; - } - { - name = "postcss_nested___postcss_nested_6.0.0.tgz"; - path = fetchurl { - name = "postcss_nested___postcss_nested_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-6.0.0.tgz"; - sha512 = "0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w=="; - }; - } - { - name = "postcss_prefix_selector___postcss_prefix_selector_1.16.0.tgz"; - path = fetchurl { - name = "postcss_prefix_selector___postcss_prefix_selector_1.16.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-prefix-selector/-/postcss-prefix-selector-1.16.0.tgz"; - sha512 = "rdVMIi7Q4B0XbXqNUEI+Z4E+pueiu/CS5E6vRCQommzdQ/sgsS4dK42U7GX8oJR+TJOtT+Qv3GkNo6iijUMp3Q=="; - }; - } - { - name = "postcss_resolve_nested_selector___postcss_resolve_nested_selector_0.1.1.tgz"; - path = fetchurl { - name = "postcss_resolve_nested_selector___postcss_resolve_nested_selector_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz"; - sha512 = "HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw=="; - }; - } - { - name = "postcss_safe_parser___postcss_safe_parser_6.0.0.tgz"; - path = fetchurl { - name = "postcss_safe_parser___postcss_safe_parser_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz"; - sha512 = "FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ=="; - }; - } - { - name = "postcss_scss___postcss_scss_4.0.5.tgz"; - path = fetchurl { - name = "postcss_scss___postcss_scss_4.0.5.tgz"; - url = "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.5.tgz"; - sha512 = "F7xpB6TrXyqUh3GKdyB4Gkp3QL3DDW1+uI+gxx/oJnUt/qXI4trj5OGlp9rOKdoABGULuqtqeG+3HEVQk4DjmA=="; - }; - } - { - name = "postcss_selector_parser___postcss_selector_parser_6.0.10.tgz"; - path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.10.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz"; - sha512 = "IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w=="; - }; - } - { - name = "postcss_selector_parser___postcss_selector_parser_6.0.11.tgz"; - path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.11.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz"; - sha512 = "zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g=="; - }; - } - { - name = "postcss_value_parser___postcss_value_parser_4.2.0.tgz"; - path = fetchurl { - name = "postcss_value_parser___postcss_value_parser_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"; - sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="; - }; - } - { - name = "postcss___postcss_8.4.21.tgz"; - path = fetchurl { - name = "postcss___postcss_8.4.21.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz"; - sha512 = "tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg=="; - }; - } - { - name = "posthtml_parser___posthtml_parser_0.2.1.tgz"; - path = fetchurl { - name = "posthtml_parser___posthtml_parser_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/posthtml-parser/-/posthtml-parser-0.2.1.tgz"; - sha512 = "nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw=="; - }; - } - { - name = "posthtml_rename_id___posthtml_rename_id_1.0.12.tgz"; - path = fetchurl { - name = "posthtml_rename_id___posthtml_rename_id_1.0.12.tgz"; - url = "https://registry.yarnpkg.com/posthtml-rename-id/-/posthtml-rename-id-1.0.12.tgz"; - sha512 = "UKXf9OF/no8WZo9edRzvuMenb6AD5hDLzIepJW+a4oJT+T/Lx7vfMYWT4aWlGNQh0WMhnUx1ipN9OkZ9q+ddEw=="; - }; - } - { - name = "posthtml_render___posthtml_render_1.4.0.tgz"; - path = fetchurl { - name = "posthtml_render___posthtml_render_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/posthtml-render/-/posthtml-render-1.4.0.tgz"; - sha512 = "W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw=="; - }; - } - { - name = "posthtml_svg_mode___posthtml_svg_mode_1.0.3.tgz"; - path = fetchurl { - name = "posthtml_svg_mode___posthtml_svg_mode_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/posthtml-svg-mode/-/posthtml-svg-mode-1.0.3.tgz"; - sha512 = "hEqw9NHZ9YgJ2/0G7CECOeuLQKZi8HjWLkBaSVtOWjygQ9ZD8P7tqeowYs7WrFdKsWEKG7o+IlsPY8jrr0CJpQ=="; - }; - } - { - name = "posthtml___posthtml_0.9.2.tgz"; - path = fetchurl { - name = "posthtml___posthtml_0.9.2.tgz"; - url = "https://registry.yarnpkg.com/posthtml/-/posthtml-0.9.2.tgz"; - sha512 = "spBB5sgC4cv2YcW03f/IAUN1pgDJWNWD8FzkyY4mArLUMJW+KlQhlmUdKAHQuPfb00Jl5xIfImeOsf6YL8QK7Q=="; - }; - } - { - name = "prelude_ls___prelude_ls_1.2.1.tgz"; - path = fetchurl { - name = "prelude_ls___prelude_ls_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; - sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; - }; - } - { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - path = fetchurl { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; - }; - } - { - name = "prettier_linter_helpers___prettier_linter_helpers_1.0.0.tgz"; - path = fetchurl { - name = "prettier_linter_helpers___prettier_linter_helpers_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz"; - sha512 = "GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w=="; - }; - } - { - name = "prettier_plugin_tailwindcss___prettier_plugin_tailwindcss_0.2.2.tgz"; - path = fetchurl { - name = "prettier_plugin_tailwindcss___prettier_plugin_tailwindcss_0.2.2.tgz"; - url = "https://registry.yarnpkg.com/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.2.2.tgz"; - sha512 = "5RjUbWRe305pUpc48MosoIp6uxZvZxrM6GyOgsbGLTce+ehePKNm7ziW2dLG2air9aXbGuXlHVSQQw4Lbosq3w=="; - }; - } - { - name = "prettier___prettier_2.8.4.tgz"; - path = fetchurl { - name = "prettier___prettier_2.8.4.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-2.8.4.tgz"; - sha512 = "vIS4Rlc2FNh0BySk3Wkd6xmwxB0FpOndW5fisM5H8hsZSxU2VWVB5CWIkIjWvrHjIhxk2g3bfMKM87zNTrZddw=="; - }; - } - { - name = "prettier___prettier_2.7.1.tgz"; - path = fetchurl { - name = "prettier___prettier_2.7.1.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz"; - sha512 = "ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g=="; - }; - } - { - name = "pretty_bytes___pretty_bytes_5.6.0.tgz"; - path = fetchurl { - name = "pretty_bytes___pretty_bytes_5.6.0.tgz"; - url = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz"; - sha512 = "FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="; - }; - } - { - name = "pretty_bytes___pretty_bytes_6.0.0.tgz"; - path = fetchurl { - name = "pretty_bytes___pretty_bytes_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-6.0.0.tgz"; - sha512 = "6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg=="; - }; - } - { - name = "pretty_format___pretty_format_27.5.1.tgz"; - path = fetchurl { - name = "pretty_format___pretty_format_27.5.1.tgz"; - url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz"; - sha512 = "Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="; - }; - } - { - name = "pretty_format___pretty_format_29.2.1.tgz"; - path = fetchurl { - name = "pretty_format___pretty_format_29.2.1.tgz"; - url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.2.1.tgz"; - sha512 = "Y41Sa4aLCtKAXvwuIpTvcFBkyeYp2gdFWzXGA+ZNES3VwURIB165XO/z7CjETwzCCS53MjW/rLMyyqEnTtaOfA=="; - }; - } - { - name = "promise___promise_7.3.1.tgz"; - path = fetchurl { - name = "promise___promise_7.3.1.tgz"; - url = "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz"; - sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg=="; - }; - } - { - name = "prop_types___prop_types_15.8.1.tgz"; - path = fetchurl { - name = "prop_types___prop_types_15.8.1.tgz"; - url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz"; - sha512 = "oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg=="; - }; - } - { - name = "prosemirror_changeset___prosemirror_changeset_2.2.0.tgz"; - path = fetchurl { - name = "prosemirror_changeset___prosemirror_changeset_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-changeset/-/prosemirror-changeset-2.2.0.tgz"; - sha512 = "QM7ohGtkpVpwVGmFb8wqVhaz9+6IUXcIQBGZ81YNAKYuHiFJ1ShvSzab4pKqTinJhwciZbrtBEk/2WsqSt2PYg=="; - }; - } - { - name = "prosemirror_collab___prosemirror_collab_1.3.0.tgz"; - path = fetchurl { - name = "prosemirror_collab___prosemirror_collab_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-collab/-/prosemirror-collab-1.3.0.tgz"; - sha512 = "+S/IJ69G2cUu2IM5b3PBekuxs94HO1CxJIWOFrLQXUaUDKL/JfBx+QcH31ldBlBXyDEUl+k3Vltfi1E1MKp2mA=="; - }; - } - { - name = "prosemirror_commands___prosemirror_commands_1.5.0.tgz"; - path = fetchurl { - name = "prosemirror_commands___prosemirror_commands_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.5.0.tgz"; - sha512 = "zL0Fxbj3fh71GPNHn5YdYgYGX2aU2XLecZYk2ekEF0oOD259HcXtM+96VjPVi5o3h4sGUdDfEEhGiREXW6U+4A=="; - }; - } - { - name = "prosemirror_dropcursor___prosemirror_dropcursor_1.6.1.tgz"; - path = fetchurl { - name = "prosemirror_dropcursor___prosemirror_dropcursor_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.6.1.tgz"; - sha512 = "LtyqQpkIknaT7NnZl3vDr3TpkNcG4ABvGRXx37XJ8tJNUGtcrZBh40A0344rDwlRTfUEmynQS/grUsoSWz+HgA=="; - }; - } - { - name = "prosemirror_gapcursor___prosemirror_gapcursor_1.3.1.tgz"; - path = fetchurl { - name = "prosemirror_gapcursor___prosemirror_gapcursor_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.3.1.tgz"; - sha512 = "GKTeE7ZoMsx5uVfc51/ouwMFPq0o8YrZ7Hx4jTF4EeGbXxBveUV8CGv46mSHuBBeXGmvu50guoV2kSnOeZZnUA=="; - }; - } - { - name = "prosemirror_history___prosemirror_history_1.3.0.tgz"; - path = fetchurl { - name = "prosemirror_history___prosemirror_history_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.3.0.tgz"; - sha512 = "qo/9Wn4B/Bq89/YD+eNWFbAytu6dmIM85EhID+fz9Jcl9+DfGEo8TTSrRhP15+fFEoaPqpHSxlvSzSEbmlxlUA=="; - }; - } - { - name = "prosemirror_inputrules___prosemirror_inputrules_1.2.0.tgz"; - path = fetchurl { - name = "prosemirror_inputrules___prosemirror_inputrules_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.2.0.tgz"; - sha512 = "eAW/M/NTSSzpCOxfR8Abw6OagdG0MiDAiWHQMQveIsZtoKVYzm0AflSPq/ymqJd56/Su1YPbwy9lM13wgHOFmQ=="; - }; - } - { - name = "prosemirror_keymap___prosemirror_keymap_1.2.0.tgz"; - path = fetchurl { - name = "prosemirror_keymap___prosemirror_keymap_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.2.0.tgz"; - sha512 = "TdSfu+YyLDd54ufN/ZeD1VtBRYpgZnTPnnbY+4R08DDgs84KrIPEPbJL8t1Lm2dkljFx6xeBE26YWH3aIzkPKg=="; - }; - } - { - name = "prosemirror_markdown___prosemirror_markdown_1.10.1.tgz"; - path = fetchurl { - name = "prosemirror_markdown___prosemirror_markdown_1.10.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-markdown/-/prosemirror-markdown-1.10.1.tgz"; - sha512 = "s7iaTLiX+qO5z8kF2NcMmy2T7mIlxzkS4Sp3vTKSYChPtbMpg6YxFkU0Y06rUg2WtKlvBu7v1bXzlGBkfjUWAA=="; - }; - } - { - name = "prosemirror_menu___prosemirror_menu_1.2.1.tgz"; - path = fetchurl { - name = "prosemirror_menu___prosemirror_menu_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-menu/-/prosemirror-menu-1.2.1.tgz"; - sha512 = "sBirXxVfHalZO4f1ZS63WzewINK4182+7dOmoMeBkqYO8wqMBvBS7wQuwVOHnkMWPEh0+N0LJ856KYUN+vFkmQ=="; - }; - } - { - name = "prosemirror_model___prosemirror_model_1.19.0.tgz"; - path = fetchurl { - name = "prosemirror_model___prosemirror_model_1.19.0.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.19.0.tgz"; - sha512 = "/CvFGJnwc41EJSfDkQLly1cAJJJmBpZwwUJtwZPTjY2RqZJfM8HVbCreOY/jti8wTRbVyjagcylyGoeJH/g/3w=="; - }; - } - { - name = "prosemirror_schema_basic___prosemirror_schema_basic_1.2.1.tgz"; - path = fetchurl { - name = "prosemirror_schema_basic___prosemirror_schema_basic_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.1.tgz"; - sha512 = "vYBdIHsYKSDIqYmPBC7lnwk9DsKn8PnVqK97pMYP5MLEDFqWIX75JiaJTzndBii4bRuNqhC2UfDOfM3FKhlBHg=="; - }; - } - { - name = "prosemirror_schema_list___prosemirror_schema_list_1.2.2.tgz"; - path = fetchurl { - name = "prosemirror_schema_list___prosemirror_schema_list_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.2.2.tgz"; - sha512 = "rd0pqSDp86p0MUMKG903g3I9VmElFkQpkZ2iOd3EOVg1vo5Cst51rAsoE+5IPy0LPXq64eGcCYlW1+JPNxOj2w=="; - }; - } - { - name = "prosemirror_state___prosemirror_state_1.4.2.tgz"; - path = fetchurl { - name = "prosemirror_state___prosemirror_state_1.4.2.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.4.2.tgz"; - sha512 = "puuzLD2mz/oTdfgd8msFbe0A42j5eNudKAAPDB0+QJRw8cO1ygjLmhLrg9RvDpf87Dkd6D4t93qdef00KKNacQ=="; - }; - } - { - name = "prosemirror_tables___prosemirror_tables_1.3.2.tgz"; - path = fetchurl { - name = "prosemirror_tables___prosemirror_tables_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.3.2.tgz"; - sha512 = "/9JTeN6s58Zq66HXaxP6uf8PAmc7XXKZFPlOGVtLvxEd6xBP6WtzaJB9wBjiGUzwbdhdMEy7V62yuHqk/3VrnQ=="; - }; - } - { - name = "prosemirror_trailing_node___prosemirror_trailing_node_2.0.3.tgz"; - path = fetchurl { - name = "prosemirror_trailing_node___prosemirror_trailing_node_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-trailing-node/-/prosemirror-trailing-node-2.0.3.tgz"; - sha512 = "lGrjMrn97KWkjQSW/FjdvnhJmqFACmQIyr6lKYApvHitDnKsCoZz6XzrHB7RZYHni/0NxQmZ01p/2vyK2SkvaA=="; - }; - } - { - name = "prosemirror_transform___prosemirror_transform_1.7.1.tgz"; - path = fetchurl { - name = "prosemirror_transform___prosemirror_transform_1.7.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.7.1.tgz"; - sha512 = "VteoifAfpt46z0yEt6Fc73A5OID9t/y2QIeR5MgxEwTuitadEunD/V0c9jQW8ziT8pbFM54uTzRLJ/nLuQjMxg=="; - }; - } - { - name = "prosemirror_view___prosemirror_view_1.30.1.tgz"; - path = fetchurl { - name = "prosemirror_view___prosemirror_view_1.30.1.tgz"; - url = "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.30.1.tgz"; - sha512 = "pZUfr7lICJkEY7XwzldAKrkflZDeIvnbfuu2RIS01N5NwJmR/dfZzDzJRzhb3SM2QtT/bM8b4Nnib8X3MGpAhA=="; - }; - } - { - name = "proto_list___proto_list_1.2.4.tgz"; - path = fetchurl { - name = "proto_list___proto_list_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz"; - sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="; - }; - } - { - name = "pseudomap___pseudomap_1.0.2.tgz"; - path = fetchurl { - name = "pseudomap___pseudomap_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz"; - sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; - }; - } - { - name = "psl___psl_1.9.0.tgz"; - path = fetchurl { - name = "psl___psl_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz"; - sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; - }; - } - { - name = "punycode___punycode_2.1.1.tgz"; - path = fetchurl { - name = "punycode___punycode_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; - sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; - }; - } - { - name = "pvtsutils___pvtsutils_1.3.2.tgz"; - path = fetchurl { - name = "pvtsutils___pvtsutils_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/pvtsutils/-/pvtsutils-1.3.2.tgz"; - sha512 = "+Ipe2iNUyrZz+8K/2IOo+kKikdtfhRKzNpQbruF2URmqPtoqAs8g3xS7TJvFF2GcPXjh7DkqMnpVveRFq4PgEQ=="; - }; - } - { - name = "pvutils___pvutils_1.1.3.tgz"; - path = fetchurl { - name = "pvutils___pvutils_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/pvutils/-/pvutils-1.1.3.tgz"; - sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; - }; - } - { - name = "query_string___query_string_4.3.4.tgz"; - path = fetchurl { - name = "query_string___query_string_4.3.4.tgz"; - url = "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz"; - sha512 = "O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q=="; - }; - } - { - name = "querystringify___querystringify_2.2.0.tgz"; - path = fetchurl { - name = "querystringify___querystringify_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz"; - sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="; - }; - } - { - name = "queue_microtask___queue_microtask_1.2.3.tgz"; - path = fetchurl { - name = "queue_microtask___queue_microtask_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"; - sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; - }; - } - { - name = "quick_lru___quick_lru_4.0.1.tgz"; - path = fetchurl { - name = "quick_lru___quick_lru_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz"; - sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; - }; - } - { - name = "quick_lru___quick_lru_5.1.1.tgz"; - path = fetchurl { - name = "quick_lru___quick_lru_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz"; - sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; - }; - } - { - name = "randombytes___randombytes_2.1.0.tgz"; - path = fetchurl { - name = "randombytes___randombytes_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz"; - sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; - }; - } - { - name = "react_is___react_is_16.13.1.tgz"; - path = fetchurl { - name = "react_is___react_is_16.13.1.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz"; - sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; - }; - } - { - name = "react_is___react_is_17.0.2.tgz"; - path = fetchurl { - name = "react_is___react_is_17.0.2.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz"; - sha512 = "w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="; - }; - } - { - name = "react_is___react_is_18.2.0.tgz"; - path = fetchurl { - name = "react_is___react_is_18.2.0.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz"; - sha512 = "xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w=="; - }; - } - { - name = "read_cache___read_cache_1.0.0.tgz"; - path = fetchurl { - name = "read_cache___read_cache_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz"; - sha512 = "Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA=="; - }; - } - { - name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; - path = fetchurl { - name = "read_pkg_up___read_pkg_up_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz"; - sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg=="; - }; - } - { - name = "read_pkg___read_pkg_5.2.0.tgz"; - path = fetchurl { - name = "read_pkg___read_pkg_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz"; - sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; - }; - } - { - name = "readable_stream___readable_stream_3.6.0.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; - }; - } - { - name = "readdirp___readdirp_3.6.0.tgz"; - path = fetchurl { - name = "readdirp___readdirp_3.6.0.tgz"; - url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz"; - sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; - }; - } - { - name = "redent___redent_3.0.0.tgz"; - path = fetchurl { - name = "redent___redent_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz"; - sha512 = "6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg=="; - }; - } - { - name = "regenerate_unicode_properties___regenerate_unicode_properties_10.1.0.tgz"; - path = fetchurl { - name = "regenerate_unicode_properties___regenerate_unicode_properties_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz"; - sha512 = "d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ=="; - }; - } - { - name = "regenerate___regenerate_1.4.2.tgz"; - path = fetchurl { - name = "regenerate___regenerate_1.4.2.tgz"; - url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz"; - sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; - }; - } - { - name = "regenerator_runtime___regenerator_runtime_0.13.10.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.10.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz"; - sha512 = "KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw=="; - }; - } - { - name = "regenerator_runtime___regenerator_runtime_0.13.11.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.11.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"; - sha512 = "kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="; - }; - } - { - name = "regenerator_transform___regenerator_transform_0.15.0.tgz"; - path = fetchurl { - name = "regenerator_transform___regenerator_transform_0.15.0.tgz"; - url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz"; - sha512 = "LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg=="; - }; - } - { - name = "regex_not___regex_not_1.0.2.tgz"; - path = fetchurl { - name = "regex_not___regex_not_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz"; - sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; - }; - } - { - name = "regexp_tree___regexp_tree_0.1.24.tgz"; - path = fetchurl { - name = "regexp_tree___regexp_tree_0.1.24.tgz"; - url = "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.24.tgz"; - sha512 = "s2aEVuLhvnVJW6s/iPgEGK6R+/xngd2jNQ+xy4bXNDKxZKJH6jpPHY6kVeVv1IeLCHgswRj+Kl3ELaDjG6V1iw=="; - }; - } - { - name = "regexp.prototype.flags___regexp.prototype.flags_1.4.3.tgz"; - path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; - sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; - }; - } - { - name = "regexpp___regexpp_3.2.0.tgz"; - path = fetchurl { - name = "regexpp___regexpp_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; - sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; - }; - } - { - name = "regexpu_core___regexpu_core_5.2.1.tgz"; - path = fetchurl { - name = "regexpu_core___regexpu_core_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.1.tgz"; - sha512 = "HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ=="; - }; - } - { - name = "regjsgen___regjsgen_0.7.1.tgz"; - path = fetchurl { - name = "regjsgen___regjsgen_0.7.1.tgz"; - url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.7.1.tgz"; - sha512 = "RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA=="; - }; - } - { - name = "regjsparser___regjsparser_0.9.1.tgz"; - path = fetchurl { - name = "regjsparser___regjsparser_0.9.1.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz"; - sha512 = "dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ=="; - }; - } - { - name = "relay_runtime___relay_runtime_12.0.0.tgz"; - path = fetchurl { - name = "relay_runtime___relay_runtime_12.0.0.tgz"; - url = "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-12.0.0.tgz"; - sha512 = "QU6JKr1tMsry22DXNy9Whsq5rmvwr3LSZiiWV/9+DFpuTWvp+WFhobWMc8TC4OjKFfNhEZy7mOiqUAn5atQtug=="; - }; - } - { - name = "remedial___remedial_1.0.8.tgz"; - path = fetchurl { - name = "remedial___remedial_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/remedial/-/remedial-1.0.8.tgz"; - sha512 = "/62tYiOe6DzS5BqVsNpH/nkGlX45C/Sp6V+NtiN6JQNS1Viay7cWkazmRkrQrdFj2eshDe96SIQNIoMxqhzBOg=="; - }; - } - { - name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; - path = fetchurl { - name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; - sha512 = "/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="; - }; - } - { - name = "remove_trailing_spaces___remove_trailing_spaces_1.0.8.tgz"; - path = fetchurl { - name = "remove_trailing_spaces___remove_trailing_spaces_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/remove-trailing-spaces/-/remove-trailing-spaces-1.0.8.tgz"; - sha512 = "O3vsMYfWighyFbTd8hk8VaSj9UAGENxAtX+//ugIst2RMk5e03h6RoIS+0ylsFxY1gvmPuAY/PO4It+gPEeySA=="; - }; - } - { - name = "repeat_element___repeat_element_1.1.4.tgz"; - path = fetchurl { - name = "repeat_element___repeat_element_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz"; - sha512 = "LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ=="; - }; - } - { - name = "repeat_string___repeat_string_1.6.1.tgz"; - path = fetchurl { - name = "repeat_string___repeat_string_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz"; - sha512 = "PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w=="; - }; - } - { - name = "require_directory___require_directory_2.1.1.tgz"; - path = fetchurl { - name = "require_directory___require_directory_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; - sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; - }; - } - { - name = "require_from_string___require_from_string_2.0.2.tgz"; - path = fetchurl { - name = "require_from_string___require_from_string_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; - sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; - }; - } - { - name = "require_main_filename___require_main_filename_2.0.0.tgz"; - path = fetchurl { - name = "require_main_filename___require_main_filename_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz"; - sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; - }; - } - { - name = "requireindex___requireindex_1.2.0.tgz"; - path = fetchurl { - name = "requireindex___requireindex_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz"; - sha512 = "L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww=="; - }; - } - { - name = "requires_port___requires_port_1.0.0.tgz"; - path = fetchurl { - name = "requires_port___requires_port_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz"; - sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; - }; - } - { - name = "resolve_from___resolve_from_5.0.0.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz"; - sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw=="; - }; - } - { - name = "resolve_from___resolve_from_4.0.0.tgz"; - path = fetchurl { - name = "resolve_from___resolve_from_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; - sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; - }; - } - { - name = "resolve_url___resolve_url_0.2.1.tgz"; - path = fetchurl { - name = "resolve_url___resolve_url_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz"; - sha512 = "ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="; - }; - } - { - name = "resolve___resolve_1.22.1.tgz"; - path = fetchurl { - name = "resolve___resolve_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz"; - sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; - }; - } - { - name = "response_iterator___response_iterator_0.2.6.tgz"; - path = fetchurl { - name = "response_iterator___response_iterator_0.2.6.tgz"; - url = "https://registry.yarnpkg.com/response-iterator/-/response-iterator-0.2.6.tgz"; - sha512 = "pVzEEzrsg23Sh053rmDUvLSkGXluZio0qu8VT6ukrYuvtjVfCbDZH9d6PGXb8HZfzdNZt8feXv/jvUzlhRgLnw=="; - }; - } - { - name = "restore_cursor___restore_cursor_3.1.0.tgz"; - path = fetchurl { - name = "restore_cursor___restore_cursor_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; - sha512 = "l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA=="; - }; - } - { - name = "ret___ret_0.1.15.tgz"; - path = fetchurl { - name = "ret___ret_0.1.15.tgz"; - url = "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz"; - sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; - }; - } - { - name = "reusify___reusify_1.0.4.tgz"; - path = fetchurl { - name = "reusify___reusify_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz"; - sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; - }; - } - { - name = "rfdc___rfdc_1.3.0.tgz"; - path = fetchurl { - name = "rfdc___rfdc_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz"; - sha512 = "V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="; - }; - } - { - name = "rimraf___rimraf_3.0.2.tgz"; - path = fetchurl { - name = "rimraf___rimraf_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; - sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; - }; - } - { - name = "rollup_plugin_terser___rollup_plugin_terser_7.0.2.tgz"; - path = fetchurl { - name = "rollup_plugin_terser___rollup_plugin_terser_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz"; - sha512 = "w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ=="; - }; - } - { - name = "rollup___rollup_2.79.1.tgz"; - path = fetchurl { - name = "rollup___rollup_2.79.1.tgz"; - url = "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz"; - sha512 = "uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw=="; - }; - } - { - name = "rollup___rollup_3.7.3.tgz"; - path = fetchurl { - name = "rollup___rollup_3.7.3.tgz"; - url = "https://registry.yarnpkg.com/rollup/-/rollup-3.7.3.tgz"; - sha512 = "7e68MQbAWCX6mI4/0lG1WHd+NdNAlVamg0Zkd+8LZ/oXojligdGnCNyHlzXqXCZObyjs5FRc3AH0b17iJESGIQ=="; - }; - } - { - name = "rollup___rollup_3.7.5.tgz"; - path = fetchurl { - name = "rollup___rollup_3.7.5.tgz"; - url = "https://registry.yarnpkg.com/rollup/-/rollup-3.7.5.tgz"; - sha512 = "z0ZbqHBtS/et2EEUKMrAl2CoSdwN7ZPzL17UMiKN9RjjqHShTlv7F9J6ZJZJNREYjBh3TvBrdfjkFDIXFNeuiQ=="; - }; - } - { - name = "rope_sequence___rope_sequence_1.3.3.tgz"; - path = fetchurl { - name = "rope_sequence___rope_sequence_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/rope-sequence/-/rope-sequence-1.3.3.tgz"; - sha512 = "85aZYCxweiD5J8yTEbw+E6A27zSnLPNDL0WfPdw3YYodq7WjnTKo0q4dtyQ2gz23iPT8Q9CUyJtAaUNcTxRf5Q=="; - }; - } - { - name = "run_async___run_async_2.4.1.tgz"; - path = fetchurl { - name = "run_async___run_async_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; - sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; - }; - } - { - name = "run_parallel___run_parallel_1.2.0.tgz"; - path = fetchurl { - name = "run_parallel___run_parallel_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz"; - sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; - }; - } - { - name = "rxjs___rxjs_7.5.7.tgz"; - path = fetchurl { - name = "rxjs___rxjs_7.5.7.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.7.tgz"; - sha512 = "z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA=="; - }; - } - { - name = "sade___sade_1.8.1.tgz"; - path = fetchurl { - name = "sade___sade_1.8.1.tgz"; - url = "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz"; - sha512 = "xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A=="; - }; - } - { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.1.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; - }; - } - { - name = "safe_regex_test___safe_regex_test_1.0.0.tgz"; - path = fetchurl { - name = "safe_regex_test___safe_regex_test_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz"; - sha512 = "JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA=="; - }; - } - { - name = "safe_regex___safe_regex_1.1.0.tgz"; - path = fetchurl { - name = "safe_regex___safe_regex_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz"; - sha512 = "aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg=="; - }; - } - { - name = "safe_regex___safe_regex_2.1.1.tgz"; - path = fetchurl { - name = "safe_regex___safe_regex_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/safe-regex/-/safe-regex-2.1.1.tgz"; - sha512 = "rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A=="; - }; - } - { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - path = fetchurl { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - } - { - name = "sass___sass_1.58.0.tgz"; - path = fetchurl { - name = "sass___sass_1.58.0.tgz"; - url = "https://registry.yarnpkg.com/sass/-/sass-1.58.0.tgz"; - sha512 = "PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg=="; - }; - } - { - name = "saxes___saxes_6.0.0.tgz"; - path = fetchurl { - name = "saxes___saxes_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz"; - sha512 = "xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA=="; - }; - } - { - name = "scuid___scuid_1.1.0.tgz"; - path = fetchurl { - name = "scuid___scuid_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/scuid/-/scuid-1.1.0.tgz"; - sha512 = "MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg=="; - }; - } - { - name = "section_matter___section_matter_1.0.0.tgz"; - path = fetchurl { - name = "section_matter___section_matter_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz"; - sha512 = "vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA=="; - }; - } - { - name = "semver___semver_5.7.1.tgz"; - path = fetchurl { - name = "semver___semver_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; - }; - } - { - name = "semver___semver_6.3.0.tgz"; - path = fetchurl { - name = "semver___semver_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; - }; - } - { - name = "semver___semver_7.3.8.tgz"; - path = fetchurl { - name = "semver___semver_7.3.8.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz"; - sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; - }; - } - { - name = "sentence_case___sentence_case_3.0.4.tgz"; - path = fetchurl { - name = "sentence_case___sentence_case_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/sentence-case/-/sentence-case-3.0.4.tgz"; - sha512 = "8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg=="; - }; - } - { - name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; - path = fetchurl { - name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz"; - sha512 = "GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw=="; - }; - } - { - name = "set_blocking___set_blocking_2.0.0.tgz"; - path = fetchurl { - name = "set_blocking___set_blocking_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; - sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; - }; - } - { - name = "set_value___set_value_2.0.1.tgz"; - path = fetchurl { - name = "set_value___set_value_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz"; - sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; - }; - } - { - name = "setimmediate___setimmediate_1.0.5.tgz"; - path = fetchurl { - name = "setimmediate___setimmediate_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz"; - sha512 = "MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="; - }; - } - { - name = "shebang_command___shebang_command_2.0.0.tgz"; - path = fetchurl { - name = "shebang_command___shebang_command_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; - sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; - }; - } - { - name = "shebang_regex___shebang_regex_3.0.0.tgz"; - path = fetchurl { - name = "shebang_regex___shebang_regex_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; - }; - } - { - name = "shell_quote___shell_quote_1.7.4.tgz"; - path = fetchurl { - name = "shell_quote___shell_quote_1.7.4.tgz"; - url = "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.4.tgz"; - sha512 = "8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw=="; - }; - } - { - name = "shiki_es___shiki_es_0.2.0.tgz"; - path = fetchurl { - name = "shiki_es___shiki_es_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/shiki-es/-/shiki-es-0.2.0.tgz"; - sha512 = "RbRMD+IuJJseSZljDdne9ThrUYrwBwJR04FvN4VXpfsU3MNID5VJGHLAD5je/HGThCyEKNgH+nEkSFEWKD7C3Q=="; - }; - } - { - name = "side_channel___side_channel_1.0.4.tgz"; - path = fetchurl { - name = "side_channel___side_channel_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz"; - sha512 = "q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw=="; - }; - } - { - name = "siginfo___siginfo_2.0.0.tgz"; - path = fetchurl { - name = "siginfo___siginfo_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/siginfo/-/siginfo-2.0.0.tgz"; - sha512 = "ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g=="; - }; - } - { - name = "sigmund___sigmund_1.0.1.tgz"; - path = fetchurl { - name = "sigmund___sigmund_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz"; - sha512 = "fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g=="; - }; - } - { - name = "signal_exit___signal_exit_3.0.7.tgz"; - path = fetchurl { - name = "signal_exit___signal_exit_3.0.7.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz"; - sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; - }; - } - { - name = "signedsource___signedsource_1.0.0.tgz"; - path = fetchurl { - name = "signedsource___signedsource_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/signedsource/-/signedsource-1.0.0.tgz"; - sha512 = "6+eerH9fEnNmi/hyM1DXcRK3pWdoMQtlkQ+ns0ntzunjKqp5i3sKCc80ym8Fib3iaYhdJUOPdhlJWj1tvge2Ww=="; - }; - } - { - name = "sirv___sirv_2.0.2.tgz"; - path = fetchurl { - name = "sirv___sirv_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/sirv/-/sirv-2.0.2.tgz"; - sha512 = "4Qog6aE29nIjAOKe/wowFTxOdmbEZKb+3tsLljaBRzJwtqto0BChD2zzH0LhgCSXiI+V7X+Y45v14wBZQ1TK3w=="; - }; - } - { - name = "slash___slash_3.0.0.tgz"; - path = fetchurl { - name = "slash___slash_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz"; - sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; - }; - } - { - name = "slash___slash_4.0.0.tgz"; - path = fetchurl { - name = "slash___slash_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz"; - sha512 = "3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew=="; - }; - } - { - name = "slice_ansi___slice_ansi_3.0.0.tgz"; - path = fetchurl { - name = "slice_ansi___slice_ansi_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz"; - sha512 = "pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="; - }; - } - { - name = "slice_ansi___slice_ansi_4.0.0.tgz"; - path = fetchurl { - name = "slice_ansi___slice_ansi_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; - sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; - }; - } - { - name = "slice_ansi___slice_ansi_5.0.0.tgz"; - path = fetchurl { - name = "slice_ansi___slice_ansi_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz"; - sha512 = "FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ=="; - }; - } - { - name = "snake_case___snake_case_3.0.4.tgz"; - path = fetchurl { - name = "snake_case___snake_case_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz"; - sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; - }; - } - { - name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; - path = fetchurl { - name = "snapdragon_node___snapdragon_node_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; - sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; - }; - } - { - name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; - path = fetchurl { - name = "snapdragon_util___snapdragon_util_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; - sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; - }; - } - { - name = "snapdragon___snapdragon_0.8.2.tgz"; - path = fetchurl { - name = "snapdragon___snapdragon_0.8.2.tgz"; - url = "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz"; - sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; - }; - } - { - name = "sortablejs___sortablejs_1.14.0.tgz"; - path = fetchurl { - name = "sortablejs___sortablejs_1.14.0.tgz"; - url = "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.14.0.tgz"; - sha512 = "pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="; - }; - } - { - name = "source_map_js___source_map_js_1.0.2.tgz"; - path = fetchurl { - name = "source_map_js___source_map_js_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz"; - sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; - }; - } - { - name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; - path = fetchurl { - name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; - sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; - }; - } - { - name = "source_map_support___source_map_support_0.5.21.tgz"; - path = fetchurl { - name = "source_map_support___source_map_support_0.5.21.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz"; - sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; - }; - } - { - name = "source_map_url___source_map_url_0.4.1.tgz"; - path = fetchurl { - name = "source_map_url___source_map_url_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz"; - sha512 = "cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="; - }; - } - { - name = "source_map___source_map_0.5.7.tgz"; - path = fetchurl { - name = "source_map___source_map_0.5.7.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; - sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="; - }; - } - { - name = "source_map___source_map_0.6.1.tgz"; - path = fetchurl { - name = "source_map___source_map_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; - }; - } - { - name = "source_map___source_map_0.8.0_beta.0.tgz"; - path = fetchurl { - name = "source_map___source_map_0.8.0_beta.0.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.8.0-beta.0.tgz"; - sha512 = "2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA=="; - }; - } - { - name = "sourcemap_codec___sourcemap_codec_1.4.8.tgz"; - path = fetchurl { - name = "sourcemap_codec___sourcemap_codec_1.4.8.tgz"; - url = "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"; - sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; - }; - } - { - name = "spdx_correct___spdx_correct_3.1.1.tgz"; - path = fetchurl { - name = "spdx_correct___spdx_correct_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; - sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; - }; - } - { - name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; - path = fetchurl { - name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; - sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; - }; - } - { - name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; - path = fetchurl { - name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; - sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; - }; - } - { - name = "spdx_license_ids___spdx_license_ids_3.0.12.tgz"; - path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.12.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz"; - sha512 = "rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA=="; - }; - } - { - name = "split_string___split_string_3.1.0.tgz"; - path = fetchurl { - name = "split_string___split_string_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz"; - sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; - }; - } - { - name = "sponge_case___sponge_case_1.0.1.tgz"; - path = fetchurl { - name = "sponge_case___sponge_case_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/sponge-case/-/sponge-case-1.0.1.tgz"; - sha512 = "dblb9Et4DAtiZ5YSUZHLl4XhH4uK80GhAZrVXdN4O2P4gQ40Wa5UIOPUHlA/nFd2PLblBZWUioLMMAVrgpoYcA=="; - }; - } - { - name = "sprintf_js___sprintf_js_1.0.3.tgz"; - path = fetchurl { - name = "sprintf_js___sprintf_js_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; - }; - } - { - name = "stable___stable_0.1.8.tgz"; - path = fetchurl { - name = "stable___stable_0.1.8.tgz"; - url = "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz"; - sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; - }; - } - { - name = "stack_utils___stack_utils_2.0.5.tgz"; - path = fetchurl { - name = "stack_utils___stack_utils_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz"; - sha512 = "xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA=="; - }; - } - { - name = "stackback___stackback_0.0.2.tgz"; - path = fetchurl { - name = "stackback___stackback_0.0.2.tgz"; - url = "https://registry.yarnpkg.com/stackback/-/stackback-0.0.2.tgz"; - sha512 = "1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw=="; - }; - } - { - name = "static_extend___static_extend_0.1.2.tgz"; - path = fetchurl { - name = "static_extend___static_extend_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz"; - sha512 = "72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g=="; - }; - } - { - name = "statuses___statuses_1.5.0.tgz"; - path = fetchurl { - name = "statuses___statuses_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; - sha512 = "OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="; - }; - } - { - name = "std_env___std_env_3.3.1.tgz"; - path = fetchurl { - name = "std_env___std_env_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/std-env/-/std-env-3.3.1.tgz"; - sha512 = "3H20QlwQsSm2OvAxWIYhs+j01MzzqwMwGiiO1NQaJYZgJZFPuAbf95/DiKRBSTYIJ2FeGUc+B/6mPGcWP9dO3Q=="; - }; - } - { - name = "streamsearch___streamsearch_1.1.0.tgz"; - path = fetchurl { - name = "streamsearch___streamsearch_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz"; - sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg=="; - }; - } - { - name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; - path = fetchurl { - name = "strict_uri_encode___strict_uri_encode_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; - sha512 = "R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ=="; - }; - } - { - name = "string_env_interpolation___string_env_interpolation_1.0.1.tgz"; - path = fetchurl { - name = "string_env_interpolation___string_env_interpolation_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz"; - sha512 = "78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg=="; - }; - } - { - name = "string_width___string_width_4.2.3.tgz"; - path = fetchurl { - name = "string_width___string_width_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; - sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; - }; - } - { - name = "string_width___string_width_5.1.2.tgz"; - path = fetchurl { - name = "string_width___string_width_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz"; - sha512 = "HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA=="; - }; - } - { - name = "string.prototype.matchall___string.prototype.matchall_4.0.7.tgz"; - path = fetchurl { - name = "string.prototype.matchall___string.prototype.matchall_4.0.7.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz"; - sha512 = "f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg=="; - }; - } - { - name = "string.prototype.trimend___string.prototype.trimend_1.0.5.tgz"; - path = fetchurl { - name = "string.prototype.trimend___string.prototype.trimend_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; - sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; - }; - } - { - name = "string.prototype.trimend___string.prototype.trimend_1.0.6.tgz"; - path = fetchurl { - name = "string.prototype.trimend___string.prototype.trimend_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz"; - sha512 = "JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ=="; - }; - } - { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.5.tgz"; - path = fetchurl { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; - sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; - }; - } - { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.6.tgz"; - path = fetchurl { - name = "string.prototype.trimstart___string.prototype.trimstart_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"; - sha512 = "omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA=="; - }; - } - { - name = "string_decoder___string_decoder_1.3.0.tgz"; - path = fetchurl { - name = "string_decoder___string_decoder_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"; - sha512 = "hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="; - }; - } - { - name = "stringify_object___stringify_object_3.3.0.tgz"; - path = fetchurl { - name = "stringify_object___stringify_object_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.3.0.tgz"; - sha512 = "rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw=="; - }; - } - { - name = "strip_ansi___strip_ansi_6.0.1.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; - }; - } - { - name = "strip_ansi___strip_ansi_7.0.1.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz"; - sha512 = "cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw=="; - }; - } - { - name = "strip_bom_string___strip_bom_string_1.0.0.tgz"; - path = fetchurl { - name = "strip_bom_string___strip_bom_string_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz"; - sha512 = "uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g=="; - }; - } - { - name = "strip_bom___strip_bom_3.0.0.tgz"; - path = fetchurl { - name = "strip_bom___strip_bom_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz"; - sha512 = "vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="; - }; - } - { - name = "strip_comments___strip_comments_2.0.1.tgz"; - path = fetchurl { - name = "strip_comments___strip_comments_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz"; - sha512 = "ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw=="; - }; - } - { - name = "strip_indent___strip_indent_3.0.0.tgz"; - path = fetchurl { - name = "strip_indent___strip_indent_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz"; - sha512 = "laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ=="; - }; - } - { - name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; - path = fetchurl { - name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; - sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; - }; - } - { - name = "strip_literal___strip_literal_1.0.0.tgz"; - path = fetchurl { - name = "strip_literal___strip_literal_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/strip-literal/-/strip-literal-1.0.0.tgz"; - sha512 = "5o4LsH1lzBzO9UFH63AJ2ad2/S2AVx6NtjOcaz+VTT2h1RiRvbipW72z8M/lxEhcPHDBQwpDrnTF7sXy/7OwCQ=="; - }; - } - { - name = "style_mod___style_mod_4.0.0.tgz"; - path = fetchurl { - name = "style_mod___style_mod_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/style-mod/-/style-mod-4.0.0.tgz"; - sha512 = "OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw=="; - }; - } - { - name = "style_search___style_search_0.1.0.tgz"; - path = fetchurl { - name = "style_search___style_search_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz"; - sha512 = "Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg=="; - }; - } - { - name = "stylelint_config_html___stylelint_config_html_1.1.0.tgz"; - path = fetchurl { - name = "stylelint_config_html___stylelint_config_html_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/stylelint-config-html/-/stylelint-config-html-1.1.0.tgz"; - sha512 = "IZv4IVESjKLumUGi+HWeb7skgO6/g4VMuAYrJdlqQFndgbj6WJAXPhaysvBiXefX79upBdQVumgYcdd17gCpjQ=="; - }; - } - { - name = "stylelint_config_prettier___stylelint_config_prettier_9.0.5.tgz"; - path = fetchurl { - name = "stylelint_config_prettier___stylelint_config_prettier_9.0.5.tgz"; - url = "https://registry.yarnpkg.com/stylelint-config-prettier/-/stylelint-config-prettier-9.0.5.tgz"; - sha512 = "U44lELgLZhbAD/xy/vncZ2Pq8sh2TnpiPvo38Ifg9+zeioR+LAkHu0i6YORIOxFafZoVg0xqQwex6e6F25S5XA=="; - }; - } - { - name = "stylelint_config_recommended_scss___stylelint_config_recommended_scss_8.0.0.tgz"; - path = fetchurl { - name = "stylelint_config_recommended_scss___stylelint_config_recommended_scss_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-8.0.0.tgz"; - sha512 = "BxjxEzRaZoQb7Iinc3p92GS6zRdRAkIuEu2ZFLTxJK2e1AIcCb5B5MXY9KOXdGTnYFZ+KKx6R4Fv9zU6CtMYPQ=="; - }; - } - { - name = "stylelint_config_recommended_vue___stylelint_config_recommended_vue_1.4.0.tgz"; - path = fetchurl { - name = "stylelint_config_recommended_vue___stylelint_config_recommended_vue_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/stylelint-config-recommended-vue/-/stylelint-config-recommended-vue-1.4.0.tgz"; - sha512 = "DVJqyX2KvMCn9U0+keL12r7xlsH26K4Vg8NrIZuq5MoF7g82DpMp326Om4E0Q+Il1o+bTHuUyejf2XAI0iD04Q=="; - }; - } - { - name = "stylelint_config_recommended___stylelint_config_recommended_9.0.0.tgz"; - path = fetchurl { - name = "stylelint_config_recommended___stylelint_config_recommended_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-9.0.0.tgz"; - sha512 = "9YQSrJq4NvvRuTbzDsWX3rrFOzOlYBmZP+o513BJN/yfEmGSr0AxdvrWs0P/ilSpVV/wisamAHu5XSk8Rcf4CQ=="; - }; - } - { - name = "stylelint_config_standard_scss___stylelint_config_standard_scss_6.1.0.tgz"; - path = fetchurl { - name = "stylelint_config_standard_scss___stylelint_config_standard_scss_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/stylelint-config-standard-scss/-/stylelint-config-standard-scss-6.1.0.tgz"; - sha512 = "iZ2B5kQT2G3rUzx+437cEpdcnFOQkwnwqXuY8Z0QUwIHQVE8mnYChGAquyKFUKZRZ0pRnrciARlPaR1RBtPb0Q=="; - }; - } - { - name = "stylelint_config_standard___stylelint_config_standard_29.0.0.tgz"; - path = fetchurl { - name = "stylelint_config_standard___stylelint_config_standard_29.0.0.tgz"; - url = "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-29.0.0.tgz"; - sha512 = "uy8tZLbfq6ZrXy4JKu3W+7lYLgRQBxYTUUB88vPgQ+ZzAxdrvcaSUW9hOMNLYBnwH+9Kkj19M2DHdZ4gKwI7tg=="; - }; - } - { - name = "stylelint_prettier___stylelint_prettier_2.0.0.tgz"; - path = fetchurl { - name = "stylelint_prettier___stylelint_prettier_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/stylelint-prettier/-/stylelint-prettier-2.0.0.tgz"; - sha512 = "jvT3G+9lopkeB0ARmDPszyfaOnvnIF+30QCjZxyt7E6fynI1T9mOKgYDNb9bXX17M7PXMZaX3j/26wqakjp1tw=="; - }; - } - { - name = "stylelint_scss___stylelint_scss_4.3.0.tgz"; - path = fetchurl { - name = "stylelint_scss___stylelint_scss_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-4.3.0.tgz"; - sha512 = "GvSaKCA3tipzZHoz+nNO7S02ZqOsdBzMiCx9poSmLlb3tdJlGddEX/8QzCOD8O7GQan9bjsvLMsO5xiw6IhhIQ=="; - }; - } - { - name = "stylelint_scss___stylelint_scss_4.4.0.tgz"; - path = fetchurl { - name = "stylelint_scss___stylelint_scss_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/stylelint-scss/-/stylelint-scss-4.4.0.tgz"; - sha512 = "Qy66a+/30aylFhPmUArHhVsHOun1qrO93LGT15uzLuLjWS7hKDfpFm34mYo1ndR4MCo8W4bEZM1+AlJRJORaaw=="; - }; - } - { - name = "stylelint___stylelint_14.16.1.tgz"; - path = fetchurl { - name = "stylelint___stylelint_14.16.1.tgz"; - url = "https://registry.yarnpkg.com/stylelint/-/stylelint-14.16.1.tgz"; - sha512 = "ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A=="; - }; - } - { - name = "supports_color___supports_color_5.5.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz"; - sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; - }; - } - { - name = "supports_color___supports_color_7.2.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; - sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; - }; - } - { - name = "supports_hyperlinks___supports_hyperlinks_2.3.0.tgz"; - path = fetchurl { - name = "supports_hyperlinks___supports_hyperlinks_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz"; - sha512 = "RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA=="; - }; - } - { - name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; - path = fetchurl { - name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; - sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; - }; - } - { - name = "svg_baker___svg_baker_1.7.0.tgz"; - path = fetchurl { - name = "svg_baker___svg_baker_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/svg-baker/-/svg-baker-1.7.0.tgz"; - sha512 = "nibslMbkXOIkqKVrfcncwha45f97fGuAOn1G99YwnwTj8kF9YiM6XexPcUso97NxOm6GsP0SIvYVIosBis1xLg=="; - }; - } - { - name = "svg_tags___svg_tags_1.0.0.tgz"; - path = fetchurl { - name = "svg_tags___svg_tags_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz"; - sha512 = "ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA=="; - }; - } - { - name = "svgo___svgo_2.8.0.tgz"; - path = fetchurl { - name = "svgo___svgo_2.8.0.tgz"; - url = "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz"; - sha512 = "+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg=="; - }; - } - { - name = "swap_case___swap_case_2.0.2.tgz"; - path = fetchurl { - name = "swap_case___swap_case_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/swap-case/-/swap-case-2.0.2.tgz"; - sha512 = "kc6S2YS/2yXbtkSMunBtKdah4VFETZ8Oh6ONSmSd9bRxhqTrtARUCBUiWXH3xVPpvR7tz2CSnkuXVE42EcGnMw=="; - }; - } - { - name = "symbol_observable___symbol_observable_4.0.0.tgz"; - path = fetchurl { - name = "symbol_observable___symbol_observable_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-4.0.0.tgz"; - sha512 = "b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ=="; - }; - } - { - name = "symbol_tree___symbol_tree_3.2.4.tgz"; - path = fetchurl { - name = "symbol_tree___symbol_tree_3.2.4.tgz"; - url = "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz"; - sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; - }; - } - { - name = "table___table_6.8.1.tgz"; - path = fetchurl { - name = "table___table_6.8.1.tgz"; - url = "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz"; - sha512 = "Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA=="; - }; - } - { - name = "tailwindcss___tailwindcss_3.2.6.tgz"; - path = fetchurl { - name = "tailwindcss___tailwindcss_3.2.6.tgz"; - url = "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.2.6.tgz"; - sha512 = "BfgQWZrtqowOQMC2bwaSNe7xcIjdDEgixWGYOd6AL0CbKHJlvhfdbINeAW76l1sO+1ov/MJ93ODJ9yluRituIw=="; - }; - } - { - name = "temp_dir___temp_dir_2.0.0.tgz"; - path = fetchurl { - name = "temp_dir___temp_dir_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz"; - sha512 = "aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg=="; - }; - } - { - name = "tempy___tempy_0.6.0.tgz"; - path = fetchurl { - name = "tempy___tempy_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/tempy/-/tempy-0.6.0.tgz"; - sha512 = "G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw=="; - }; - } - { - name = "terser___terser_5.15.1.tgz"; - path = fetchurl { - name = "terser___terser_5.15.1.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-5.15.1.tgz"; - sha512 = "K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw=="; - }; - } - { - name = "text_table___text_table_0.2.0.tgz"; - path = fetchurl { - name = "text_table___text_table_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; - sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; - }; - } - { - name = "throttle_debounce___throttle_debounce_3.0.1.tgz"; - path = fetchurl { - name = "throttle_debounce___throttle_debounce_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-3.0.1.tgz"; - sha512 = "dTEWWNu6JmeVXY0ZYoPuH5cRIwc0MeGbJwah9KUNYSJwommQpCzTySTpEe8Gs1J23aeWEuAobe4Ag7EHVt/LOg=="; - }; - } - { - name = "through___through_2.3.8.tgz"; - path = fetchurl { - name = "through___through_2.3.8.tgz"; - url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; - }; - } - { - name = "timezone_mock___timezone_mock_1.3.6.tgz"; - path = fetchurl { - name = "timezone_mock___timezone_mock_1.3.6.tgz"; - url = "https://registry.yarnpkg.com/timezone-mock/-/timezone-mock-1.3.6.tgz"; - sha512 = "YcloWmZfLD9Li5m2VcobkCDNVaLMx8ohAb/97l/wYS3m+0TIEK5PFNMZZfRcusc6sFjIfxu8qcJT0CNnOdpqmg=="; - }; - } - { - name = "tinybench___tinybench_2.3.1.tgz"; - path = fetchurl { - name = "tinybench___tinybench_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/tinybench/-/tinybench-2.3.1.tgz"; - sha512 = "hGYWYBMPr7p4g5IarQE7XhlyWveh1EKhy4wUBS1LrHXCKYgvz+4/jCqgmJqZxxldesn05vccrtME2RLLZNW7iA=="; - }; - } - { - name = "tinypool___tinypool_0.1.3.tgz"; - path = fetchurl { - name = "tinypool___tinypool_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/tinypool/-/tinypool-0.1.3.tgz"; - sha512 = "2IfcQh7CP46XGWGGbdyO4pjcKqsmVqFAPcXfPxcPXmOWt9cYkTP9HcDmGgsfijYoAEc4z9qcpM/BaBz46Y9/CQ=="; - }; - } - { - name = "tinypool___tinypool_0.3.1.tgz"; - path = fetchurl { - name = "tinypool___tinypool_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/tinypool/-/tinypool-0.3.1.tgz"; - sha512 = "zLA1ZXlstbU2rlpA4CIeVaqvWq41MTWqLY3FfsAXgC8+f7Pk7zroaJQxDgxn1xNudKW6Kmj4808rPFShUlIRmQ=="; - }; - } - { - name = "tinyspy___tinyspy_1.0.2.tgz"; - path = fetchurl { - name = "tinyspy___tinyspy_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/tinyspy/-/tinyspy-1.0.2.tgz"; - sha512 = "bSGlgwLBYf7PnUsQ6WOc6SJ3pGOcd+d8AA6EUnLDDM0kWEstC1JIlSZA3UNliDXhd9ABoS7hiRBDCu+XP/sf1Q=="; - }; - } - { - name = "tippy.js___tippy.js_6.3.7.tgz"; - path = fetchurl { - name = "tippy.js___tippy.js_6.3.7.tgz"; - url = "https://registry.yarnpkg.com/tippy.js/-/tippy.js-6.3.7.tgz"; - sha512 = "E1d3oP2emgJ9dRQZdf3Kkn0qJgI6ZLpyS5z6ZkY1DF3kaQaBsGZsndEpHwx+eC+tYM41HaSNvNtLx8tU57FzTQ=="; - }; - } - { - name = "title_case___title_case_3.0.3.tgz"; - path = fetchurl { - name = "title_case___title_case_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/title-case/-/title-case-3.0.3.tgz"; - sha512 = "e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA=="; - }; - } - { - name = "tmp___tmp_0.0.33.tgz"; - path = fetchurl { - name = "tmp___tmp_0.0.33.tgz"; - url = "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"; - sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="; - }; - } - { - name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; - path = fetchurl { - name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; - }; - } - { - name = "to_object_path___to_object_path_0.3.0.tgz"; - path = fetchurl { - name = "to_object_path___to_object_path_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz"; - sha512 = "9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg=="; - }; - } - { - name = "to_regex_range___to_regex_range_2.1.1.tgz"; - path = fetchurl { - name = "to_regex_range___to_regex_range_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz"; - sha512 = "ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg=="; - }; - } - { - name = "to_regex_range___to_regex_range_5.0.1.tgz"; - path = fetchurl { - name = "to_regex_range___to_regex_range_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; - }; - } - { - name = "to_regex___to_regex_3.0.2.tgz"; - path = fetchurl { - name = "to_regex___to_regex_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz"; - sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; - }; - } - { - name = "totalist___totalist_3.0.0.tgz"; - path = fetchurl { - name = "totalist___totalist_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/totalist/-/totalist-3.0.0.tgz"; - sha512 = "eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw=="; - }; - } - { - name = "tough_cookie___tough_cookie_4.1.2.tgz"; - path = fetchurl { - name = "tough_cookie___tough_cookie_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz"; - sha512 = "G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ=="; - }; - } - { - name = "tr46___tr46_1.0.1.tgz"; - path = fetchurl { - name = "tr46___tr46_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz"; - sha512 = "dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA=="; - }; - } - { - name = "tr46___tr46_3.0.0.tgz"; - path = fetchurl { - name = "tr46___tr46_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz"; - sha512 = "l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA=="; - }; - } - { - name = "tr46___tr46_0.0.3.tgz"; - path = fetchurl { - name = "tr46___tr46_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz"; - sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; - }; - } - { - name = "traverse___traverse_0.6.7.tgz"; - path = fetchurl { - name = "traverse___traverse_0.6.7.tgz"; - url = "https://registry.yarnpkg.com/traverse/-/traverse-0.6.7.tgz"; - sha512 = "/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg=="; - }; - } - { - name = "trim_newlines___trim_newlines_3.0.1.tgz"; - path = fetchurl { - name = "trim_newlines___trim_newlines_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz"; - sha512 = "c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="; - }; - } - { - name = "ts_essentials___ts_essentials_9.3.0.tgz"; - path = fetchurl { - name = "ts_essentials___ts_essentials_9.3.0.tgz"; - url = "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-9.3.0.tgz"; - sha512 = "XeiCboEyBG8UqXZtXl59bWEi4ZgOqRsogFDI6WDGIF1LmzbYiAkIwjkXN6zZWWl4re/lsOqMlYfe8KA0XiiEPw=="; - }; - } - { - name = "ts_invariant___ts_invariant_0.10.3.tgz"; - path = fetchurl { - name = "ts_invariant___ts_invariant_0.10.3.tgz"; - url = "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.10.3.tgz"; - sha512 = "uivwYcQaxAucv1CzRp2n/QdYPo4ILf9VXgH19zEIjFx2EJufV16P0JtJVpYHy89DItG6Kwj2oIUjrcK5au+4tQ=="; - }; - } - { - name = "ts_log___ts_log_2.2.5.tgz"; - path = fetchurl { - name = "ts_log___ts_log_2.2.5.tgz"; - url = "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.5.tgz"; - sha512 = "PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA=="; - }; - } - { - name = "ts_node___ts_node_10.9.1.tgz"; - path = fetchurl { - name = "ts_node___ts_node_10.9.1.tgz"; - url = "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz"; - sha512 = "NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw=="; - }; - } - { - name = "tsconfig_paths___tsconfig_paths_3.14.1.tgz"; - path = fetchurl { - name = "tsconfig_paths___tsconfig_paths_3.14.1.tgz"; - url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz"; - sha512 = "fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ=="; - }; - } - { - name = "tslib___tslib_1.14.1.tgz"; - path = fetchurl { - name = "tslib___tslib_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz"; - sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; - }; - } - { - name = "tslib___tslib_2.4.0.tgz"; - path = fetchurl { - name = "tslib___tslib_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz"; - sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; - }; - } - { - name = "tsutils___tsutils_3.21.0.tgz"; - path = fetchurl { - name = "tsutils___tsutils_3.21.0.tgz"; - url = "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz"; - sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA=="; - }; - } - { - name = "type_check___type_check_0.4.0.tgz"; - path = fetchurl { - name = "type_check___type_check_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; - sha512 = "XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew=="; - }; - } - { - name = "type_check___type_check_0.3.2.tgz"; - path = fetchurl { - name = "type_check___type_check_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; - sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; - }; - } - { - name = "type_detect___type_detect_4.0.8.tgz"; - path = fetchurl { - name = "type_detect___type_detect_4.0.8.tgz"; - url = "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz"; - sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; - }; - } - { - name = "type_fest___type_fest_0.16.0.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.16.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.16.0.tgz"; - sha512 = "eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg=="; - }; - } - { - name = "type_fest___type_fest_0.18.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.18.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.18.1.tgz"; - sha512 = "OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw=="; - }; - } - { - name = "type_fest___type_fest_0.20.2.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.20.2.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; - sha512 = "Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ=="; - }; - } - { - name = "type_fest___type_fest_0.21.3.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.21.3.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz"; - sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; - }; - } - { - name = "type_fest___type_fest_0.6.0.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz"; - sha512 = "q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg=="; - }; - } - { - name = "type_fest___type_fest_0.8.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.8.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; - sha512 = "4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA=="; - }; - } - { - name = "type_fest___type_fest_2.19.0.tgz"; - path = fetchurl { - name = "type_fest___type_fest_2.19.0.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz"; - sha512 = "RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="; - }; - } - { - name = "type_fest___type_fest_3.5.7.tgz"; - path = fetchurl { - name = "type_fest___type_fest_3.5.7.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-3.5.7.tgz"; - sha512 = "6J4bYzb4sdkcLBty4XW7F18VPI66M4boXNE+CY40532oq2OJe6AVMB5NmjOp6skt/jw5mRjz/hLRpuglz0U+FA=="; - }; - } - { - name = "typed_array_length___typed_array_length_1.0.4.tgz"; - path = fetchurl { - name = "typed_array_length___typed_array_length_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz"; - sha512 = "KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng=="; - }; - } - { - name = "typescript___typescript_4.9.5.tgz"; - path = fetchurl { - name = "typescript___typescript_4.9.5.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz"; - sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; - }; - } - { - name = "ua_parser_js___ua_parser_js_0.7.32.tgz"; - path = fetchurl { - name = "ua_parser_js___ua_parser_js_0.7.32.tgz"; - url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz"; - sha512 = "f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw=="; - }; - } - { - name = "ua_parser_js___ua_parser_js_1.0.33.tgz"; - path = fetchurl { - name = "ua_parser_js___ua_parser_js_1.0.33.tgz"; - url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.33.tgz"; - sha512 = "RqshF7TPTE0XLYAqmjlu5cLLuGdKrNu9O1KLA/qp39QtbZwuzwv1dT46DZSopoUMsYgXpB3Cv8a03FI8b74oFQ=="; - }; - } - { - name = "uc.micro___uc.micro_1.0.6.tgz"; - path = fetchurl { - name = "uc.micro___uc.micro_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz"; - sha512 = "8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="; - }; - } - { - name = "ufo___ufo_1.0.1.tgz"; - path = fetchurl { - name = "ufo___ufo_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/ufo/-/ufo-1.0.1.tgz"; - sha512 = "boAm74ubXHY7KJQZLlXrtMz52qFvpsbOxDcZOnw/Wf+LS4Mmyu7JxmzD4tDLtUQtmZECypJ0FrCz4QIe6dvKRA=="; - }; - } - { - name = "unbox_primitive___unbox_primitive_1.0.2.tgz"; - path = fetchurl { - name = "unbox_primitive___unbox_primitive_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz"; - sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; - }; - } - { - name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; - path = fetchurl { - name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; - sha512 = "eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg=="; - }; - } - { - name = "undici___undici_5.11.0.tgz"; - path = fetchurl { - name = "undici___undici_5.11.0.tgz"; - url = "https://registry.yarnpkg.com/undici/-/undici-5.11.0.tgz"; - sha512 = "oWjWJHzFet0Ow4YZBkyiJwiK5vWqEYoH7BINzJAJOLedZ++JpAlCbUktW2GQ2DS2FpKmxD/JMtWUUWl1BtghGw=="; - }; - } - { - name = "undici___undici_5.15.0.tgz"; - path = fetchurl { - name = "undici___undici_5.15.0.tgz"; - url = "https://registry.yarnpkg.com/undici/-/undici-5.15.0.tgz"; - sha512 = "wCAZJDyjw9Myv+Ay62LAoB+hZLPW9SmKbQkbHIhMw/acKSlpn7WohdMUc/Vd4j1iSMBO0hWwU8mjB7a5p5bl8g=="; - }; - } - { - name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_2.0.0.tgz"; - path = fetchurl { - name = "unicode_canonical_property_names_ecmascript___unicode_canonical_property_names_ecmascript_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"; - sha512 = "yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ=="; - }; - } - { - name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_2.0.0.tgz"; - path = fetchurl { - name = "unicode_match_property_ecmascript___unicode_match_property_ecmascript_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"; - sha512 = "5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q=="; - }; - } - { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_2.0.0.tgz"; - path = fetchurl { - name = "unicode_match_property_value_ecmascript___unicode_match_property_value_ecmascript_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"; - sha512 = "7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw=="; - }; - } - { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_2.1.0.tgz"; - path = fetchurl { - name = "unicode_property_aliases_ecmascript___unicode_property_aliases_ecmascript_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz"; - sha512 = "6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w=="; - }; - } - { - name = "union_value___union_value_1.0.1.tgz"; - path = fetchurl { - name = "union_value___union_value_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz"; - sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; - }; - } - { - name = "unique_string___unique_string_2.0.0.tgz"; - path = fetchurl { - name = "unique_string___unique_string_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz"; - sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; - }; - } - { - name = "universalify___universalify_0.2.0.tgz"; - path = fetchurl { - name = "universalify___universalify_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz"; - sha512 = "CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg=="; - }; - } - { - name = "universalify___universalify_2.0.0.tgz"; - path = fetchurl { - name = "universalify___universalify_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; - }; - } - { - name = "unixify___unixify_1.0.0.tgz"; - path = fetchurl { - name = "unixify___unixify_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/unixify/-/unixify-1.0.0.tgz"; - sha512 = "6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg=="; - }; - } - { - name = "unpipe___unpipe_1.0.0.tgz"; - path = fetchurl { - name = "unpipe___unpipe_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; - sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; - }; - } - { - name = "unset_value___unset_value_1.0.0.tgz"; - path = fetchurl { - name = "unset_value___unset_value_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz"; - sha512 = "PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ=="; - }; - } - { - name = "upath___upath_1.2.0.tgz"; - path = fetchurl { - name = "upath___upath_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz"; - sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; - }; - } - { - name = "update_browserslist_db___update_browserslist_db_1.0.10.tgz"; - path = fetchurl { - name = "update_browserslist_db___update_browserslist_db_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"; - sha512 = "OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ=="; - }; - } - { - name = "upper_case_first___upper_case_first_2.0.2.tgz"; - path = fetchurl { - name = "upper_case_first___upper_case_first_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-2.0.2.tgz"; - sha512 = "514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg=="; - }; - } - { - name = "upper_case___upper_case_2.0.2.tgz"; - path = fetchurl { - name = "upper_case___upper_case_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/upper-case/-/upper-case-2.0.2.tgz"; - sha512 = "KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg=="; - }; - } - { - name = "uri_js___uri_js_4.4.1.tgz"; - path = fetchurl { - name = "uri_js___uri_js_4.4.1.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; - sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; - }; - } - { - name = "urix___urix_0.1.0.tgz"; - path = fetchurl { - name = "urix___urix_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz"; - sha512 = "Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="; - }; - } - { - name = "url_parse___url_parse_1.5.10.tgz"; - path = fetchurl { - name = "url_parse___url_parse_1.5.10.tgz"; - url = "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz"; - sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; - }; - } - { - name = "urlpattern_polyfill___urlpattern_polyfill_6.0.2.tgz"; - path = fetchurl { - name = "urlpattern_polyfill___urlpattern_polyfill_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/urlpattern-polyfill/-/urlpattern-polyfill-6.0.2.tgz"; - sha512 = "5vZjFlH9ofROmuWmXM9yj2wljYKgWstGwe8YTyiqM7hVum/g9LyCizPZtb3UqsuppVwety9QJmfc42VggLpTgg=="; - }; - } - { - name = "use___use_3.1.1.tgz"; - path = fetchurl { - name = "use___use_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"; - sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; - }; - } - { - name = "util_deprecate___util_deprecate_1.0.2.tgz"; - path = fetchurl { - name = "util_deprecate___util_deprecate_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; - }; - } - { - name = "utils_merge___utils_merge_1.0.1.tgz"; - path = fetchurl { - name = "utils_merge___utils_merge_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; - sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; - }; - } - { - name = "uuid___uuid_9.0.0.tgz"; - path = fetchurl { - name = "uuid___uuid_9.0.0.tgz"; - url = "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz"; - sha512 = "MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="; - }; - } - { - name = "v8_compile_cache_lib___v8_compile_cache_lib_3.0.1.tgz"; - path = fetchurl { - name = "v8_compile_cache_lib___v8_compile_cache_lib_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz"; - sha512 = "wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg=="; - }; - } - { - name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; - path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; - sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; - }; - } - { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - path = fetchurl { - name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"; - sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="; - }; - } - { - name = "value_or_promise___value_or_promise_1.0.11.tgz"; - path = fetchurl { - name = "value_or_promise___value_or_promise_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz"; - sha512 = "41BrgH+dIbCFXClcSapVs5M6GkENd3gQOJpEfPDNa71LsUGMXDL0jMWpI/Rh7WhX+Aalfz2TTS3Zt5pUsbnhLg=="; - }; - } - { - name = "value_or_promise___value_or_promise_1.0.12.tgz"; - path = fetchurl { - name = "value_or_promise___value_or_promise_1.0.12.tgz"; - url = "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz"; - sha512 = "Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q=="; - }; - } - { - name = "vary___vary_1.1.2.tgz"; - path = fetchurl { - name = "vary___vary_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; - sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; - }; - } - { - name = "vite_node___vite_node_0.28.4.tgz"; - path = fetchurl { - name = "vite_node___vite_node_0.28.4.tgz"; - url = "https://registry.yarnpkg.com/vite-node/-/vite-node-0.28.4.tgz"; - sha512 = "KM0Q0uSG/xHHKOJvVHc5xDBabgt0l70y7/lWTR7Q0pR5/MrYxadT+y32cJOE65FfjGmJgxpVEEY+69btJgcXOQ=="; - }; - } - { - name = "vite_plugin_pwa___vite_plugin_pwa_0.14.1.tgz"; - path = fetchurl { - name = "vite_plugin_pwa___vite_plugin_pwa_0.14.1.tgz"; - url = "https://registry.yarnpkg.com/vite-plugin-pwa/-/vite-plugin-pwa-0.14.1.tgz"; - sha512 = "5zx7yhQ8RTLwV71+GA9YsQQ63ALKG8XXIMqRJDdZkR8ZYftFcRgnzM7wOWmQZ/DATspyhPih5wCdcZnAIsM+mA=="; - }; - } - { - name = "vite_plugin_ruby___vite_plugin_ruby_3.1.3.tgz"; - path = fetchurl { - name = "vite_plugin_ruby___vite_plugin_ruby_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/vite-plugin-ruby/-/vite-plugin-ruby-3.1.3.tgz"; - sha512 = "Y7j0lL8xNMSN1c2/sKBlaLkp0nFtxNFU9/kUReX/GMTOAk8fBylrR9ZdC3fej6EnYzbO3VDtfDDyWzYaoCW3hA=="; - }; - } - { - name = "vite_plugin_svg_icons___vite_plugin_svg_icons_2.0.1.tgz"; - path = fetchurl { - name = "vite_plugin_svg_icons___vite_plugin_svg_icons_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/vite-plugin-svg-icons/-/vite-plugin-svg-icons-2.0.1.tgz"; - sha512 = "6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA=="; - }; - } - { - name = "vite___vite_4.0.1.tgz"; - path = fetchurl { - name = "vite___vite_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/vite/-/vite-4.0.1.tgz"; - sha512 = "kZQPzbDau35iWOhy3CpkrRC7It+HIHtulAzBhMqzGHKRf/4+vmh8rPDDdv98SWQrFWo6//3ozwsRmwQIPZsK9g=="; - }; - } - { - name = "vite___vite_4.0.4.tgz"; - path = fetchurl { - name = "vite___vite_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/vite/-/vite-4.0.4.tgz"; - sha512 = "xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw=="; - }; - } - { - name = "vitest_axe___vitest_axe_0.1.0.tgz"; - path = fetchurl { - name = "vitest_axe___vitest_axe_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/vitest-axe/-/vitest-axe-0.1.0.tgz"; - sha512 = "jvtXxeQPg8R/2ANTY8QicA5pvvdRP4F0FsVUAHANJ46YCDASie/cuhlSzu0DGcLmZvGBSBNsNuK3HqfaeknyvA=="; - }; - } - { - name = "vitest___vitest_0.28.4.tgz"; - path = fetchurl { - name = "vitest___vitest_0.28.4.tgz"; - url = "https://registry.yarnpkg.com/vitest/-/vitest-0.28.4.tgz"; - sha512 = "sfWIy0AdlbyGRhunm+TLQEJrFH9XuRPdApfubsyLcDbCRrUX717BRQKInTgzEfyl2Ipi1HWoHB84Nqtcwxogcg=="; - }; - } - { - name = "vue_advanced_cropper___vue_advanced_cropper_2.8.8.tgz"; - path = fetchurl { - name = "vue_advanced_cropper___vue_advanced_cropper_2.8.8.tgz"; - url = "https://registry.yarnpkg.com/vue-advanced-cropper/-/vue-advanced-cropper-2.8.8.tgz"; - sha512 = "yDM7Jb/gnxcs//JdbOogBUoHr1bhCQSto7/ohgETKAe4wvRpmqIkKSppMm1huVQr+GP1YoVlX/fkjKxvYzwwDQ=="; - }; - } - { - name = "vue_demi___vue_demi_0.13.11.tgz"; - path = fetchurl { - name = "vue_demi___vue_demi_0.13.11.tgz"; - url = "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz"; - sha512 = "IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A=="; - }; - } - { - name = "vue_easy_lightbox___vue_easy_lightbox_1.12.0.tgz"; - path = fetchurl { - name = "vue_easy_lightbox___vue_easy_lightbox_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/vue-easy-lightbox/-/vue-easy-lightbox-1.12.0.tgz"; - sha512 = "An7R3Fr+veHhGcLS1ly+O8XLhayObckJ3t7jupQn9IxXUQH3qA1mkG5DuAg9n4gwzF3fDn+jcORQ3iTp3UdEDg=="; - }; - } - { - name = "vue_eslint_parser___vue_eslint_parser_9.1.0.tgz"; - path = fetchurl { - name = "vue_eslint_parser___vue_eslint_parser_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.1.0.tgz"; - sha512 = "NGn/iQy8/Wb7RrRa4aRkokyCZfOUWk19OP5HP6JEozQFX5AoS/t+Z0ZN7FY4LlmWc4FNI922V7cvX28zctN8dQ=="; - }; - } - { - name = "vue_router___vue_router_4.1.6.tgz"; - path = fetchurl { - name = "vue_router___vue_router_4.1.6.tgz"; - url = "https://registry.yarnpkg.com/vue-router/-/vue-router-4.1.6.tgz"; - sha512 = "DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ=="; - }; - } - { - name = "vue_template_compiler___vue_template_compiler_2.7.14.tgz"; - path = fetchurl { - name = "vue_template_compiler___vue_template_compiler_2.7.14.tgz"; - url = "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz"; - sha512 = "zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ=="; - }; - } - { - name = "vue_tsc___vue_tsc_1.0.24.tgz"; - path = fetchurl { - name = "vue_tsc___vue_tsc_1.0.24.tgz"; - url = "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.0.24.tgz"; - sha512 = "mmU1s5SAqE1nByQAiQnao9oU4vX+mSdsgI8H57SfKH6UVzq/jP9+Dbi2GaV+0b4Cn361d2ln8m6xeU60ApiEXg=="; - }; - } - { - name = "vue3_draggable_resizable___vue3_draggable_resizable_1.6.5.tgz"; - path = fetchurl { - name = "vue3_draggable_resizable___vue3_draggable_resizable_1.6.5.tgz"; - url = "https://registry.yarnpkg.com/vue3-draggable-resizable/-/vue3-draggable-resizable-1.6.5.tgz"; - sha512 = "31142E31fGNnq3HKqvmFLSsqIbhck7TyGuQWhUKrDw6DOcGAuRx4ddRjaxvT6fe7dgeKH53qAh+i0ZlWtPLl2g=="; - }; - } - { - name = "vue___vue_3.2.47.tgz"; - path = fetchurl { - name = "vue___vue_3.2.47.tgz"; - url = "https://registry.yarnpkg.com/vue/-/vue-3.2.47.tgz"; - sha512 = "60188y/9Dc9WVrAZeUVSDxRQOZ+z+y5nO2ts9jWXSTkMvayiWxCWOWtBQoYjLeccfXkiiPZWAHcV+WTPhkqJHQ=="; - }; - } - { - name = "vuedraggable___vuedraggable_4.1.0.tgz"; - path = fetchurl { - name = "vuedraggable___vuedraggable_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-4.1.0.tgz"; - sha512 = "FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww=="; - }; - } - { - name = "w3c_keyname___w3c_keyname_2.2.6.tgz"; - path = fetchurl { - name = "w3c_keyname___w3c_keyname_2.2.6.tgz"; - url = "https://registry.yarnpkg.com/w3c-keyname/-/w3c-keyname-2.2.6.tgz"; - sha512 = "f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg=="; - }; - } - { - name = "w3c_xmlserializer___w3c_xmlserializer_4.0.0.tgz"; - path = fetchurl { - name = "w3c_xmlserializer___w3c_xmlserializer_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz"; - sha512 = "d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw=="; - }; - } - { - name = "wcwidth___wcwidth_1.0.1.tgz"; - path = fetchurl { - name = "wcwidth___wcwidth_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz"; - sha512 = "XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg=="; - }; - } - { - name = "web_streams_polyfill___web_streams_polyfill_4.0.0_beta.3.tgz"; - path = fetchurl { - name = "web_streams_polyfill___web_streams_polyfill_4.0.0_beta.3.tgz"; - url = "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.3.tgz"; - sha512 = "QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug=="; - }; - } - { - name = "web_streams_polyfill___web_streams_polyfill_3.2.1.tgz"; - path = fetchurl { - name = "web_streams_polyfill___web_streams_polyfill_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz"; - sha512 = "e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q=="; - }; - } - { - name = "webcrypto_core___webcrypto_core_1.7.5.tgz"; - path = fetchurl { - name = "webcrypto_core___webcrypto_core_1.7.5.tgz"; - url = "https://registry.yarnpkg.com/webcrypto-core/-/webcrypto-core-1.7.5.tgz"; - sha512 = "gaExY2/3EHQlRNNNVSrbG2Cg94Rutl7fAaKILS1w8ZDhGxdFOaw6EbCfHIxPy9vt/xwp5o0VQAx9aySPF6hU1A=="; - }; - } - { - name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; - path = fetchurl { - name = "webidl_conversions___webidl_conversions_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz"; - sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="; - }; - } - { - name = "webidl_conversions___webidl_conversions_4.0.2.tgz"; - path = fetchurl { - name = "webidl_conversions___webidl_conversions_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; - sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; - }; - } - { - name = "webidl_conversions___webidl_conversions_7.0.0.tgz"; - path = fetchurl { - name = "webidl_conversions___webidl_conversions_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz"; - sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g=="; - }; - } - { - name = "whatwg_encoding___whatwg_encoding_2.0.0.tgz"; - path = fetchurl { - name = "whatwg_encoding___whatwg_encoding_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz"; - sha512 = "p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg=="; - }; - } - { - name = "whatwg_fetch___whatwg_fetch_3.6.2.tgz"; - path = fetchurl { - name = "whatwg_fetch___whatwg_fetch_3.6.2.tgz"; - url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz"; - sha512 = "bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="; - }; - } - { - name = "whatwg_mimetype___whatwg_mimetype_3.0.0.tgz"; - path = fetchurl { - name = "whatwg_mimetype___whatwg_mimetype_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz"; - sha512 = "nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q=="; - }; - } - { - name = "whatwg_url___whatwg_url_11.0.0.tgz"; - path = fetchurl { - name = "whatwg_url___whatwg_url_11.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz"; - sha512 = "RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ=="; - }; - } - { - name = "whatwg_url___whatwg_url_5.0.0.tgz"; - path = fetchurl { - name = "whatwg_url___whatwg_url_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz"; - sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw=="; - }; - } - { - name = "whatwg_url___whatwg_url_7.1.0.tgz"; - path = fetchurl { - name = "whatwg_url___whatwg_url_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz"; - sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; - }; - } - { - name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; - path = fetchurl { - name = "which_boxed_primitive___which_boxed_primitive_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"; - sha512 = "bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg=="; - }; - } - { - name = "which_collection___which_collection_1.0.1.tgz"; - path = fetchurl { - name = "which_collection___which_collection_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz"; - sha512 = "W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A=="; - }; - } - { - name = "which_module___which_module_2.0.0.tgz"; - path = fetchurl { - name = "which_module___which_module_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz"; - sha512 = "B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="; - }; - } - { - name = "which_typed_array___which_typed_array_1.1.8.tgz"; - path = fetchurl { - name = "which_typed_array___which_typed_array_1.1.8.tgz"; - url = "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.8.tgz"; - sha512 = "Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw=="; - }; - } - { - name = "which_typed_array___which_typed_array_1.1.9.tgz"; - path = fetchurl { - name = "which_typed_array___which_typed_array_1.1.9.tgz"; - url = "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz"; - sha512 = "w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA=="; - }; - } - { - name = "which___which_1.3.1.tgz"; - path = fetchurl { - name = "which___which_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz"; - sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; - }; - } - { - name = "which___which_2.0.2.tgz"; - path = fetchurl { - name = "which___which_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; - sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; - }; - } - { - name = "why_is_node_running___why_is_node_running_2.2.2.tgz"; - path = fetchurl { - name = "why_is_node_running___why_is_node_running_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/why-is-node-running/-/why-is-node-running-2.2.2.tgz"; - sha512 = "6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA=="; - }; - } - { - name = "word_wrap___word_wrap_1.2.3.tgz"; - path = fetchurl { - name = "word_wrap___word_wrap_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; - sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; - }; - } - { - name = "workbox_background_sync___workbox_background_sync_6.5.4.tgz"; - path = fetchurl { - name = "workbox_background_sync___workbox_background_sync_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-6.5.4.tgz"; - sha512 = "0r4INQZMyPky/lj4Ou98qxcThrETucOde+7mRGJl13MPJugQNKeZQOdIJe/1AchOP23cTqHcN/YVpD6r8E6I8g=="; - }; - } - { - name = "workbox_broadcast_update___workbox_broadcast_update_6.5.4.tgz"; - path = fetchurl { - name = "workbox_broadcast_update___workbox_broadcast_update_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-broadcast-update/-/workbox-broadcast-update-6.5.4.tgz"; - sha512 = "I/lBERoH1u3zyBosnpPEtcAVe5lwykx9Yg1k6f8/BGEPGaMMgZrwVrqL1uA9QZ1NGGFoyE6t9i7lBjOlDhFEEw=="; - }; - } - { - name = "workbox_build___workbox_build_6.5.4.tgz"; - path = fetchurl { - name = "workbox_build___workbox_build_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-build/-/workbox-build-6.5.4.tgz"; - sha512 = "kgRevLXEYvUW9WS4XoziYqZ8Q9j/2ziJYEtTrjdz5/L/cTUa2XfyMP2i7c3p34lgqJ03+mTiz13SdFef2POwbA=="; - }; - } - { - name = "workbox_cacheable_response___workbox_cacheable_response_6.5.4.tgz"; - path = fetchurl { - name = "workbox_cacheable_response___workbox_cacheable_response_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-6.5.4.tgz"; - sha512 = "DCR9uD0Fqj8oB2TSWQEm1hbFs/85hXXoayVwFKLVuIuxwJaihBsLsp4y7J9bvZbqtPJ1KlCkmYVGQKrBU4KAug=="; - }; - } - { - name = "workbox_core___workbox_core_6.5.4.tgz"; - path = fetchurl { - name = "workbox_core___workbox_core_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-core/-/workbox-core-6.5.4.tgz"; - sha512 = "OXYb+m9wZm8GrORlV2vBbE5EC1FKu71GGp0H4rjmxmF4/HLbMCoTFws87M3dFwgpmg0v00K++PImpNQ6J5NQ6Q=="; - }; - } - { - name = "workbox_expiration___workbox_expiration_6.5.4.tgz"; - path = fetchurl { - name = "workbox_expiration___workbox_expiration_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-expiration/-/workbox-expiration-6.5.4.tgz"; - sha512 = "jUP5qPOpH1nXtjGGh1fRBa1wJL2QlIb5mGpct3NzepjGG2uFFBn4iiEBiI9GUmfAFR2ApuRhDydjcRmYXddiEQ=="; - }; - } - { - name = "workbox_google_analytics___workbox_google_analytics_6.5.4.tgz"; - path = fetchurl { - name = "workbox_google_analytics___workbox_google_analytics_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-6.5.4.tgz"; - sha512 = "8AU1WuaXsD49249Wq0B2zn4a/vvFfHkpcFfqAFHNHwln3jK9QUYmzdkKXGIZl9wyKNP+RRX30vcgcyWMcZ9VAg=="; - }; - } - { - name = "workbox_navigation_preload___workbox_navigation_preload_6.5.4.tgz"; - path = fetchurl { - name = "workbox_navigation_preload___workbox_navigation_preload_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-navigation-preload/-/workbox-navigation-preload-6.5.4.tgz"; - sha512 = "IIwf80eO3cr8h6XSQJF+Hxj26rg2RPFVUmJLUlM0+A2GzB4HFbQyKkrgD5y2d84g2IbJzP4B4j5dPBRzamHrng=="; - }; - } - { - name = "workbox_precaching___workbox_precaching_6.5.4.tgz"; - path = fetchurl { - name = "workbox_precaching___workbox_precaching_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-6.5.4.tgz"; - sha512 = "hSMezMsW6btKnxHB4bFy2Qfwey/8SYdGWvVIKFaUm8vJ4E53JAY+U2JwLTRD8wbLWoP6OVUdFlXsTdKu9yoLTg=="; - }; - } - { - name = "workbox_range_requests___workbox_range_requests_6.5.4.tgz"; - path = fetchurl { - name = "workbox_range_requests___workbox_range_requests_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-6.5.4.tgz"; - sha512 = "Je2qR1NXCFC8xVJ/Lux6saH6IrQGhMpDrPXWZWWS8n/RD+WZfKa6dSZwU+/QksfEadJEr/NfY+aP/CXFFK5JFg=="; - }; - } - { - name = "workbox_recipes___workbox_recipes_6.5.4.tgz"; - path = fetchurl { - name = "workbox_recipes___workbox_recipes_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-recipes/-/workbox-recipes-6.5.4.tgz"; - sha512 = "QZNO8Ez708NNwzLNEXTG4QYSKQ1ochzEtRLGaq+mr2PyoEIC1xFW7MrWxrONUxBFOByksds9Z4//lKAX8tHyUA=="; - }; - } - { - name = "workbox_routing___workbox_routing_6.5.4.tgz"; - path = fetchurl { - name = "workbox_routing___workbox_routing_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-6.5.4.tgz"; - sha512 = "apQswLsbrrOsBUWtr9Lf80F+P1sHnQdYodRo32SjiByYi36IDyL2r7BH1lJtFX8fwNHDa1QOVY74WKLLS6o5Pg=="; - }; - } - { - name = "workbox_strategies___workbox_strategies_6.5.4.tgz"; - path = fetchurl { - name = "workbox_strategies___workbox_strategies_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-6.5.4.tgz"; - sha512 = "DEtsxhx0LIYWkJBTQolRxG4EI0setTJkqR4m7r4YpBdxtWJH1Mbg01Cj8ZjNOO8etqfA3IZaOPHUxCs8cBsKLw=="; - }; - } - { - name = "workbox_streams___workbox_streams_6.5.4.tgz"; - path = fetchurl { - name = "workbox_streams___workbox_streams_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-6.5.4.tgz"; - sha512 = "FXKVh87d2RFXkliAIheBojBELIPnWbQdyDvsH3t74Cwhg0fDheL1T8BqSM86hZvC0ZESLsznSYWw+Va+KVbUzg=="; - }; - } - { - name = "workbox_sw___workbox_sw_6.5.4.tgz"; - path = fetchurl { - name = "workbox_sw___workbox_sw_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-6.5.4.tgz"; - sha512 = "vo2RQo7DILVRoH5LjGqw3nphavEjK4Qk+FenXeUsknKn14eCNedHOXWbmnvP4ipKhlE35pvJ4yl4YYf6YsJArA=="; - }; - } - { - name = "workbox_window___workbox_window_6.5.4.tgz"; - path = fetchurl { - name = "workbox_window___workbox_window_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/workbox-window/-/workbox-window-6.5.4.tgz"; - sha512 = "HnLZJDwYBE+hpG25AQBO8RUWBJRaCsI9ksQJEp3aCOFCaG5kqaToAYXFRAHxzRluM2cQbGzdQF5rjKPWPA1fug=="; - }; - } - { - name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; - sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; - }; - } - { - name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; - }; - } - { - name = "wrappy___wrappy_1.0.2.tgz"; - path = fetchurl { - name = "wrappy___wrappy_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - } - { - name = "write_file_atomic___write_file_atomic_4.0.2.tgz"; - path = fetchurl { - name = "write_file_atomic___write_file_atomic_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.2.tgz"; - sha512 = "7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg=="; - }; - } - { - name = "ws___ws_8.12.0.tgz"; - path = fetchurl { - name = "ws___ws_8.12.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz"; - sha512 = "kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig=="; - }; - } - { - name = "ws___ws_8.11.0.tgz"; - path = fetchurl { - name = "ws___ws_8.11.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz"; - sha512 = "HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg=="; - }; - } - { - name = "ws___ws_8.9.0.tgz"; - path = fetchurl { - name = "ws___ws_8.9.0.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-8.9.0.tgz"; - sha512 = "Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg=="; - }; - } - { - name = "xml_name_validator___xml_name_validator_4.0.0.tgz"; - path = fetchurl { - name = "xml_name_validator___xml_name_validator_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz"; - sha512 = "ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw=="; - }; - } - { - name = "xmlchars___xmlchars_2.2.0.tgz"; - path = fetchurl { - name = "xmlchars___xmlchars_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz"; - sha512 = "JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="; - }; - } - { - name = "xtend___xtend_4.0.2.tgz"; - path = fetchurl { - name = "xtend___xtend_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; - sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; - }; - } - { - name = "y18n___y18n_4.0.3.tgz"; - path = fetchurl { - name = "y18n___y18n_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz"; - sha512 = "JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="; - }; - } - { - name = "y18n___y18n_5.0.8.tgz"; - path = fetchurl { - name = "y18n___y18n_5.0.8.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; - sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; - }; - } - { - name = "yallist___yallist_2.1.2.tgz"; - path = fetchurl { - name = "yallist___yallist_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz"; - sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; - }; - } - { - name = "yallist___yallist_4.0.0.tgz"; - path = fetchurl { - name = "yallist___yallist_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; - sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; - }; - } - { - name = "yaml_ast_parser___yaml_ast_parser_0.0.43.tgz"; - path = fetchurl { - name = "yaml_ast_parser___yaml_ast_parser_0.0.43.tgz"; - url = "https://registry.yarnpkg.com/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz"; - sha512 = "2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A=="; - }; - } - { - name = "yaml___yaml_1.10.2.tgz"; - path = fetchurl { - name = "yaml___yaml_1.10.2.tgz"; - url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz"; - sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; - }; - } - { - name = "yargs_parser___yargs_parser_18.1.3.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_18.1.3.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz"; - sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; - }; - } - { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_20.2.9.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz"; - sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; - }; - } - { - name = "yargs_parser___yargs_parser_21.1.1.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_21.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz"; - sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="; - }; - } - { - name = "yargs___yargs_15.4.1.tgz"; - path = fetchurl { - name = "yargs___yargs_15.4.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz"; - sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="; - }; - } - { - name = "yargs___yargs_17.6.0.tgz"; - path = fetchurl { - name = "yargs___yargs_17.6.0.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz"; - sha512 = "8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g=="; - }; - } - { - name = "yn___yn_3.1.1.tgz"; - path = fetchurl { - name = "yn___yn_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz"; - sha512 = "Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q=="; - }; - } - { - name = "yocto_queue___yocto_queue_0.1.0.tgz"; - path = fetchurl { - name = "yocto_queue___yocto_queue_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz"; - sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; - }; - } - { - name = "yocto_queue___yocto_queue_1.0.0.tgz"; - path = fetchurl { - name = "yocto_queue___yocto_queue_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz"; - sha512 = "9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g=="; - }; - } - { - name = "zen_observable_ts___zen_observable_ts_1.2.5.tgz"; - path = fetchurl { - name = "zen_observable_ts___zen_observable_ts_1.2.5.tgz"; - url = "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-1.2.5.tgz"; - sha512 = "QZWQekv6iB72Naeake9hS1KxHlotfRpe+WGNbNx5/ta+R3DNjVO2bswf63gXlWDcs+EMd7XY8HfVQyP1X6T4Zg=="; - }; - } - { - name = "zen_observable___zen_observable_0.8.15.tgz"; - path = fetchurl { - name = "zen_observable___zen_observable_0.8.15.tgz"; - url = "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz"; - sha512 = "PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ=="; - }; - } - ]; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad/libwg.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad/libwg.nix index 0ed9599963..2f852e3a25 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad/libwg.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad/libwg.nix @@ -1,6 +1,5 @@ { lib , buildGoModule -, fetchFromGitHub , mullvad }: buildGoModule { @@ -13,7 +12,7 @@ buildGoModule { sourceRoot = "${mullvad.src.name}/wireguard/libwg"; - vendorSha256 = "QNde5BqkSuqp3VJQOhn7aG6XknRDZQ62PE3WGhEJ5LU="; + vendorHash = "sha256-QNde5BqkSuqp3VJQOhn7aG6XknRDZQ62PE3WGhEJ5LU="; # XXX: hack to make the ar archive go to the correct place # This is necessary because passing `-o ...` to `ldflags` does not work diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix index 2047cc7617..187eaa5a9c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix @@ -85,184 +85,193 @@ let sha512 = "2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w=="; }; }; - "@aws-sdk/client-cognito-identity-3.395.0" = { + "@aws-sdk/client-cognito-identity-3.414.0" = { name = "_at_aws-sdk_slash_client-cognito-identity"; packageName = "@aws-sdk/client-cognito-identity"; - version = "3.395.0"; + version = "3.414.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.395.0.tgz"; - sha512 = "97cOjOzEHWaP8cmf7Q+8QwQiao3Dq+9FmeRpjoNDo0+0cT3TP6gYRqPiHYt3fcfQsk+Nmk88oFUWhz2ibW27gA=="; + url = "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.414.0.tgz"; + sha512 = "U9J0R/22eftQjY6JeAzXXYSgA+T6vx/jDsBBWBIKTjCZPBmmVOb2A4/d4sxHMxjh6Ms3DolpocE5FCbB9eGBEg=="; }; }; - "@aws-sdk/client-sso-3.395.0" = { + "@aws-sdk/client-sso-3.414.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.395.0"; + version = "3.414.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.395.0.tgz"; - sha512 = "IEmqpZnflzFk6NTlkRpEXIcU2uBrTYl+pA5z4ZerbKclYWuxJ7MoLtLDNWgIn3mkNxvdroWgaPY1B2dkQlTe4g=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.414.0.tgz"; + sha512 = "GvRwQ7wA3edzsQEKS70ZPhkOUZ62PAiXasjp6GxrsADEb8sV1z4FxXNl9Un/7fQxKkh9QYaK1Wu1PmhLi9MLMg=="; }; }; - "@aws-sdk/client-sts-3.395.0" = { + "@aws-sdk/client-sts-3.414.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.395.0"; + version = "3.414.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.395.0.tgz"; - sha512 = "zWxZ+pjeP88uRN4k0Zzid6t/8Yhzg1Cv2LnrYX6kZzbS6AOTDho7fVGZgUl+cme33QZhtE8pXUvwGeJAptbhqg=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.414.0.tgz"; + sha512 = "xeYH3si6Imp1EWolWn1zuxJJu2AXKwXl1HDftQULwC5AWkm1mNFbXYSJN4hQul1IM+kn+JTRB0XRHByQkKhe+Q=="; }; }; - "@aws-sdk/credential-provider-cognito-identity-3.395.0" = { + "@aws-sdk/credential-provider-cognito-identity-3.414.0" = { name = "_at_aws-sdk_slash_credential-provider-cognito-identity"; packageName = "@aws-sdk/credential-provider-cognito-identity"; - version = "3.395.0"; + version = "3.414.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.395.0.tgz"; - sha512 = "aRsDf4HO9ek6REmadAcY8MuwprNDHyYASFuc4YtbbmkH90jVhyz70e7PGCmDpcJZN2lLTV8tcZeWmKXcvMwq/A=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.414.0.tgz"; + sha512 = "sAbp5HVy0YmvXUKkkTt8Tr5a5XNQMxshxI+pmXHLCHNpRATS9A6i7YHVNMGmERKGriFWZG0Q8qgKh1E+rvN7fQ=="; }; }; - "@aws-sdk/credential-provider-env-3.391.0" = { + "@aws-sdk/credential-provider-env-3.413.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.391.0"; + version = "3.413.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.391.0.tgz"; - sha512 = "mAzICedcg4bfL0mM5O6QTd9mQ331NLse1DMr6XL21ZZiLB48ej19L7AGV2xq5QwVbqKU3IVv1myRyhvpDM9jMg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.413.0.tgz"; + sha512 = "yeMOkfG20/RlzfPMtQuDB647AcPEvFEVYOWZzAWVJfldYQ5ybKr0d7sBkgG9sdAzGkK3Aw9dE4rigYI8EIqc1Q=="; }; }; - "@aws-sdk/credential-provider-ini-3.395.0" = { + "@aws-sdk/credential-provider-ini-3.414.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.395.0"; + version = "3.414.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.395.0.tgz"; - sha512 = "t7cWs+syJsSkj9NGdKyZ1t/+nYQyOec2nPjTtPWwKs8D7rvH3IMIgJwkvAGNzYaiIoIpXXx0wgCqys84TSEIYQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.414.0.tgz"; + sha512 = "rlpLLx70roJL/t40opWC96LbIASejdMbRlgSCRpK8b/hKngYDe5A7SRVacaw08vYrAywxRiybxpQOwOt9b++rA=="; }; }; - "@aws-sdk/credential-provider-node-3.395.0" = { + "@aws-sdk/credential-provider-node-3.414.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.395.0"; + version = "3.414.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.395.0.tgz"; - sha512 = "qJawWTYf5L7Z1Is0sSJEYc4e96Qd0HWGqluO2h9qoUNrRREZ9RSxsDq+LGxVVAYLupYFcIFtiCnA/MoBBIWhzg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.414.0.tgz"; + sha512 = "xlkcOUKeGHInxWKKrZKIPSBCUL/ozyCldJBjmMKEj7ZmBAEiDcjpMe3pZ//LibMkCSy0b/7jtyQBE/eaIT2o0A=="; }; }; - "@aws-sdk/credential-provider-process-3.391.0" = { + "@aws-sdk/credential-provider-process-3.413.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.391.0"; + version = "3.413.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.391.0.tgz"; - sha512 = "KMlzPlBI+hBmXDo+EoFZdLgCVRkRa9B9iEE6x0+hQQ6g9bW6HI7cDRVdceR1ZoPasSaNAZ9QOXMTIBxTpn0sPQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.413.0.tgz"; + sha512 = "GFJdgS14GzJ1wc2DEnS44Z/34iBZ05CAkvDsLN2CMwcDgH4eZuif9/x0lwzIJBK3xVFHzYUeVvEzsqRPbCHRsw=="; }; }; - "@aws-sdk/credential-provider-sso-3.395.0" = { + "@aws-sdk/credential-provider-sso-3.414.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.395.0"; + version = "3.414.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.395.0.tgz"; - sha512 = "wAoHG9XqO0L8TvJv4cjwN/2XkYskp0cbnupKKTJm+D29MYcctKEtL0aYOHxaNN2ECAYxIFIQDdlo62GKb3nJ5Q=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.414.0.tgz"; + sha512 = "w9g2hlkZn7WekWICRqk+L33py7KrjYMFryVpkKXOx2pjDchCfZDr6pL1ml782GZ0L3qsob4SbNpbtp13JprnWQ=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.391.0" = { + "@aws-sdk/credential-provider-web-identity-3.413.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.391.0"; + version = "3.413.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.391.0.tgz"; - sha512 = "n0vYg82B8bc4rxKltVbVqclev7hx+elyS9pEnZs3YbnbWJq0qqsznXmDfLqd1TcWpa09PGXcah0nsRDolVThsA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.413.0.tgz"; + sha512 = "5cdA1Iq9JeEHtg59ERV9fdMQ7cS0JF6gH/BWA7HYEUGdSVPXCuwyEggPtG64QgpNU7SmxH+QdDG+Ldxz09ycIA=="; }; }; - "@aws-sdk/credential-providers-3.395.0" = { + "@aws-sdk/credential-providers-3.414.0" = { name = "_at_aws-sdk_slash_credential-providers"; packageName = "@aws-sdk/credential-providers"; - version = "3.395.0"; + version = "3.414.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.395.0.tgz"; - sha512 = "V4oYeXdjjgdQGGYqIXbA1XbnHvAJWni5caEq0zWJdIm9f0JCOQUZBCq5Gkv0ptiUc+GP8U+nzAmweTmYYOMVmg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.414.0.tgz"; + sha512 = "xv3cN/lu+HRroGWYWtqwBQ+guykyjSKHzYq6FlyfBZyjC6u8hoeNSNilFobIooJOXfrDM0LKr9L+uUlPE+0+lg=="; }; }; - "@aws-sdk/middleware-host-header-3.391.0" = { + "@aws-sdk/middleware-host-header-3.413.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.391.0"; + version = "3.413.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.391.0.tgz"; - sha512 = "+nyNr0rb2ixY7mU48nibr7L7gsw37y4oELhqgnNKhcjZDJ34imBwKIMFa64n21FdftmhcjR8IdSpzXE9xrkJ8g=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.413.0.tgz"; + sha512 = "r9PQx468EzPHo9wRzZLfgROpKtVdbkteMrdhsuM12bifVHjU1OHr7yfhc1OdWv39X8Xiv6F8n5r+RBQEM0S6+g=="; }; }; - "@aws-sdk/middleware-logger-3.391.0" = { + "@aws-sdk/middleware-logger-3.413.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.391.0"; + version = "3.413.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.391.0.tgz"; - sha512 = "KOwl5zo16b17JDhqILHBStccBQ2w35em7+/6vdkJdUII6OU8aVIFTlIQT9wOUvd4do6biIRBMZG3IK0Rg7mRDQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.413.0.tgz"; + sha512 = "jqcXDubcKvoqBy+kkEa0WoNjG6SveDeyNy+gdGnTV+DEtYjkcHrHJei4q0W5zFl0mzc+dP+z8tJF44rv95ZY3Q=="; }; }; - "@aws-sdk/middleware-recursion-detection-3.391.0" = { + "@aws-sdk/middleware-recursion-detection-3.413.0" = { name = "_at_aws-sdk_slash_middleware-recursion-detection"; packageName = "@aws-sdk/middleware-recursion-detection"; - version = "3.391.0"; + version = "3.413.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.391.0.tgz"; - sha512 = "hVR3z59G7pX4pjDQs9Ag1tMgbLeGXOzeAAaNP9fEtHSd3KBMAGQgN3K3b9WPjzE2W0EoloHRJMK4qxZErdde2g=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.413.0.tgz"; + sha512 = "C6k0IKJk/A4/VBGwUjxEPG+WOjjnmWAZVRBUzaeM7PqRh+g5rLcuIV356ntV3pREVxyiSTePTYVYIHU9YXkLKQ=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.391.0" = { + "@aws-sdk/middleware-sdk-sts-3.413.0" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.391.0"; + version = "3.413.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.391.0.tgz"; - sha512 = "6ZXI3Z4QU+TnT5PwKWloGmRHG81tWeI18/zxf9wWzrO2NhYFvITzEJH0vWLLiXdWtn/BYfLULXtDvkTaepbI5A=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.413.0.tgz"; + sha512 = "t0u//JUyaEZRVnH5q+Ur3tWnuyIsTdwA0XOdDCZXcSlLYzGp2MI/tScLjn9IydRrceIFpFfmbjk4Nf/Q6TeBTQ=="; }; }; - "@aws-sdk/middleware-signing-3.391.0" = { + "@aws-sdk/middleware-signing-3.413.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.391.0"; + version = "3.413.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.391.0.tgz"; - sha512 = "2pAJJlZqaHc0d+cz2FTVrQmWi8ygKfqfczHUo/loCtOaMNtWXBHb/JsLEecs6cXdizy6gi3YsLz6VZYwY4Ssxw=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.413.0.tgz"; + sha512 = "QFEnVvIKYPCermM+ESxEztgUgXzGSKpnPnohMYNvSZySqmOLu/4VvxiZbRO/BX9J3ZHcUgaw4vKm5VBZRrycxw=="; }; }; - "@aws-sdk/middleware-user-agent-3.391.0" = { + "@aws-sdk/middleware-user-agent-3.413.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.391.0"; + version = "3.413.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.391.0.tgz"; - sha512 = "LdK9uMNA14zqRw3B79Mhy7GX36qld/GYo93xuu+lr+AQ98leZEdc6GUbrtNDI3fP1Z8TMQcyHUKBml4/B+wXpQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.413.0.tgz"; + sha512 = "eVMJyeWxNBqerhfD+sE9sTjDtwQiECrfU6wpUQP5fGPhJD2cVVZPxuTuJGDZCu/4k/V61dF85IYlsPUNLdVQ6w=="; }; }; - "@aws-sdk/token-providers-3.391.0" = { + "@aws-sdk/region-config-resolver-3.413.0" = { + name = "_at_aws-sdk_slash_region-config-resolver"; + packageName = "@aws-sdk/region-config-resolver"; + version = "3.413.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.413.0.tgz"; + sha512 = "h90e6yyOhvoc+1F5vFk3C5mxwB8RSDEMKTO/fxexyur94seczZ1yxyYkTMZv30oc9RUiToABlHNrh/wxL7TZPQ=="; + }; + }; + "@aws-sdk/token-providers-3.413.0" = { name = "_at_aws-sdk_slash_token-providers"; packageName = "@aws-sdk/token-providers"; - version = "3.391.0"; + version = "3.413.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.391.0.tgz"; - sha512 = "kgfArsKLDJE71qQjfXiHiM5cZqgDHlMsqEx35+A65GmTWJaS1PGDqu3ZvVVU8E5mxnCCLw7vho21fsjvH6TBpg=="; + url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.413.0.tgz"; + sha512 = "NfP1Ib9LAWVLMTOa/1aJwt4TRrlRrNyukCpVZGfNaMnNNEoP5Rakdbcs8KFVHe/MJzU+GdKVzxQ4TgRkLOGTrA=="; }; }; - "@aws-sdk/types-3.391.0" = { + "@aws-sdk/types-3.413.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.391.0"; + version = "3.413.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.391.0.tgz"; - sha512 = "QpYVFKMOnzHz/JMj/b8wb18qxiT92U/5r5MmtRz2R3LOH6ooTO96k4ozXCrYr0qNed1PAnOj73rPrrH2wnCJKQ=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.413.0.tgz"; + sha512 = "j1xib0f/TazIFc5ySIKOlT1ujntRbaoG4LJFeEezz4ji03/wSJMI8Vi4KjzpBp8J1tTu0oRDnsxRIGixsUBeYQ=="; }; }; - "@aws-sdk/util-endpoints-3.391.0" = { + "@aws-sdk/util-endpoints-3.413.0" = { name = "_at_aws-sdk_slash_util-endpoints"; packageName = "@aws-sdk/util-endpoints"; - version = "3.391.0"; + version = "3.413.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.391.0.tgz"; - sha512 = "zv4sYDTQhNxyLoekcE02/nk3xvoo6yCHDy1kDJk0MFxOKaqUB+CvZdQBR4YBLSDlD4o4DUBmdYgKT58FfbM8sQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.413.0.tgz"; + sha512 = "VAwr7cITNb1L6/2XUPIbCOuhKGm0VtKCRblurrfUF2bxqG/wtuw/2Fm4ahYJPyxklOSXAMSq+RHdFWcir0YB/g=="; }; }; "@aws-sdk/util-locate-window-3.310.0" = { @@ -274,22 +283,22 @@ let sha512 = "qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w=="; }; }; - "@aws-sdk/util-user-agent-browser-3.391.0" = { + "@aws-sdk/util-user-agent-browser-3.413.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.391.0"; + version = "3.413.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.391.0.tgz"; - sha512 = "6ipHOB1WdCBNeAMJauN7l2qNE0WLVaTNhkD290/ElXm1FHGTL8yw6lIDIjhIFO1bmbZxDiKApwDiG7ROhaJoxQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.413.0.tgz"; + sha512 = "7j/qWcRO2OBZBre2fC6V6M0PAS9n7k6i+VtofPkkhxC2DZszLJElqnooF9hGmVGYK3zR47Np4WjURXKIEZclWg=="; }; }; - "@aws-sdk/util-user-agent-node-3.391.0" = { + "@aws-sdk/util-user-agent-node-3.413.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.391.0"; + version = "3.413.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.391.0.tgz"; - sha512 = "PVvAK/Lf4BdB1eJIZtyFpGSslGQwKpYt9/hKs5NlR+qxBMXU9T0DnTqH4GiXZaazvXr7OUVWitIF2b7iKBMTow=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.413.0.tgz"; + sha512 = "vHm9TVZIzfWMeDvdmoOky6VarqOt8Pr68CESHN0jyuO6XbhCDnr9rpaXiBhbSR+N1Qm7R/AfJgAhQyTMu2G1OA=="; }; }; "@aws-sdk/util-utf8-browser-3.259.0" = { @@ -328,13 +337,13 @@ let sha512 = "kleJ1iUTxcO32Y06dH9Pfi9K4U+Tlb111WXEnbt7R/ne+NLRwppZiTGJuTD5VVoxTMK5NTbEtm5t2vcdNCFe2g=="; }; }; - "@azure/core-http-3.0.2" = { + "@azure/core-http-3.0.3" = { name = "_at_azure_slash_core-http"; packageName = "@azure/core-http"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.2.tgz"; - sha512 = "o1wR9JrmoM0xEAa0Ue7Sp8j+uJvmqYaGoHOCT5qaVYmvgmnZDC0OvQimPA/JR3u77Sz6D1y3Xmk1y69cDU9q9A=="; + url = "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.3.tgz"; + sha512 = "QMib3wXotJMFhHgmJBPUF9YsyErw34H0XDFQd9CauH7TPB+RGcyl9Ayy7iURtJB04ngXhE6YwrQsWDXlSLrilg=="; }; }; "@azure/core-http-compat-1.3.0" = { @@ -364,13 +373,13 @@ let sha512 = "zqWdVIt+2Z+3wqxEOGzR5hXFZ8MGKK52x4vFLw8n58pR6ZfKRx3EXYTxTaYxYHc/PexPUTyimcTWFJbji9Z6Iw=="; }; }; - "@azure/core-rest-pipeline-1.12.0" = { + "@azure/core-rest-pipeline-1.12.1" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.12.0.tgz"; - sha512 = "+MnSB0vGZjszSzr5AW8z93/9fkDu2RLtWmAN8gskURq7EW2sSwqy8jZa0V26rjuBVkwhdA3Hw8z3VWoeBUOw+A=="; + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.12.1.tgz"; + sha512 = "SsyWQ+T5MFQRX+M8H/66AlaI6HyCbQStGfFngx2fuiW+vKI2DkhtOvbYodPyf9fOe/ARLWWc3ohX54lQ5Kmaog=="; }; }; "@azure/core-tracing-1.0.0-preview.13" = { @@ -427,22 +436,22 @@ let sha512 = "ustrPY8MryhloQj7OWGe+HrYx+aoiOxzbXTtgblbV3xwCqpzUK36phH3XNHQKj3EPonyFUuDTfR3qFhTEAuZEg=="; }; }; - "@azure/msal-browser-2.38.1" = { + "@azure/msal-browser-2.38.2" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.38.1"; + version = "2.38.2"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.38.1.tgz"; - sha512 = "NROo7mLpw7aWtj8tWy9ZPz3WWiudwVAOIDZ1K3PPrjDAA4kFYayWlbZiJl1T1sD5Oqwa6FOtwzFSvuUj1CWp6Q=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.38.2.tgz"; + sha512 = "71BeIn2we6LIgMplwCSaMq5zAwmalyJR3jFcVOZxNVfQ1saBRwOD+P77nLs5vrRCedVKTq8RMFhIOdpMLNno0A=="; }; }; - "@azure/msal-common-13.2.1" = { + "@azure/msal-common-13.3.0" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "13.2.1"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-13.2.1.tgz"; - sha512 = "9CtyVdDtAOw+raemKg8gdBuE7gleObgSb7p4bzMIlUt8eM69/Gaow7uqr1gK3jLYINSrss32OZW8mBbdgVLiHg=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-13.3.0.tgz"; + sha512 = "/VFWTicjcJbrGp3yQP7A24xU95NiDMe23vxIU1U6qdRPFsprMDNUohMudclnd+WSHE4/McqkZs/nUU3sAKkVjg=="; }; }; "@azure/msal-common-7.6.0" = { @@ -454,130 +463,31 @@ let sha512 = "XqfbglUTVLdkHQ8F9UQJtKseRr3sSnr9ysboxtoswvaMVaEfvyLtMoHv9XdKUfOc0qKGzNgRFd9yRjIWVepl6Q=="; }; }; - "@azure/msal-node-1.18.1" = { + "@azure/msal-node-1.18.3" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.18.1"; + version = "1.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.1.tgz"; - sha512 = "B4kUOWJoN4vD8b3pGJ9Q9mIZhaDb8EnQM1aN0x1otlQgTfzDvEk6rWc6fy8uGdtXqcNddBtiXdc4oRiItroVkA=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.18.3.tgz"; + sha512 = "lI1OsxNbS/gxRD4548Wyj22Dk8kS7eGMwD9GlBZvQmFV8FJUXoXySL1BiNzDsHUE96/DS/DHmA+F73p1Dkcktg=="; }; }; - "@azure/storage-blob-12.15.0" = { + "@azure/storage-blob-12.16.0" = { name = "_at_azure_slash_storage-blob"; packageName = "@azure/storage-blob"; - version = "12.15.0"; + version = "12.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.15.0.tgz"; - sha512 = "e7JBKLOFi0QVJqqLzrjx1eL3je3/Ug2IQj24cTM9b85CsnnFjLGeGjJVIjbGGZaytewiCEG7r3lRwQX7fKj0/w=="; + url = "https://registry.npmjs.org/@azure/storage-blob/-/storage-blob-12.16.0.tgz"; + sha512 = "jz33rUSUGUB65FgYrTRgRDjG6hdPHwfvHe+g/UrwVG8MsyLqSxg9TaW7Yuhjxu1v1OZ5xam2NU6+IpCN0xJO8Q=="; }; }; - "@babel/parser-7.22.10" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.22.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.22.10.tgz"; - sha512 = "lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ=="; - }; - }; - "@babel/runtime-7.22.10" = { + "@babel/runtime-7.22.15" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.22.10"; + version = "7.22.15"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.10.tgz"; - sha512 = "21t/fkKLMZI4pqP2wlmsQAWnYW1PDyKyyUV4vCi+B25ydmdaYTKXPwCj0BzSUnZf4seIiYvSA3jcZ3gdsMFkLQ=="; - }; - }; - "@codemirror/autocomplete-6.9.0" = { - name = "_at_codemirror_slash_autocomplete"; - packageName = "@codemirror/autocomplete"; - version = "6.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.9.0.tgz"; - sha512 = "Fbwm0V/Wn3BkEJZRhr0hi5BhCo5a7eBL6LYaliPjOSwCyfOpnjXY59HruSxOUNV+1OYer0Tgx1zRNQttjXyDog=="; - }; - }; - "@codemirror/commands-6.2.4" = { - name = "_at_codemirror_slash_commands"; - packageName = "@codemirror/commands"; - version = "6.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.4.tgz"; - sha512 = "42lmDqVH0ttfilLShReLXsDfASKLXzfyC36bzwcqzox9PlHulMcsUOfHXNo2X2aFMVNUoQ7j+d4q5bnfseYoOA=="; - }; - }; - "@codemirror/lang-css-6.2.1" = { - name = "_at_codemirror_slash_lang-css"; - packageName = "@codemirror/lang-css"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lang-css/-/lang-css-6.2.1.tgz"; - sha512 = "/UNWDNV5Viwi/1lpr/dIXJNWiwDxpw13I4pTUAsNxZdg6E0mI2kTQb0P2iHczg1Tu+H4EBgJR+hYhKiHKko7qg=="; - }; - }; - "@codemirror/lang-javascript-6.1.9" = { - name = "_at_codemirror_slash_lang-javascript"; - packageName = "@codemirror/lang-javascript"; - version = "6.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-6.1.9.tgz"; - sha512 = "z3jdkcqOEBT2txn2a87A0jSy6Te3679wg/U8QzMeftFt+4KA6QooMwfdFzJiuC3L6fXKfTXZcDocoaxMYfGz0w=="; - }; - }; - "@codemirror/lang-json-6.0.1" = { - name = "_at_codemirror_slash_lang-json"; - packageName = "@codemirror/lang-json"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-6.0.1.tgz"; - sha512 = "+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ=="; - }; - }; - "@codemirror/lang-python-6.1.3" = { - name = "_at_codemirror_slash_lang-python"; - packageName = "@codemirror/lang-python"; - version = "6.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lang-python/-/lang-python-6.1.3.tgz"; - sha512 = "S9w2Jl74hFlD5nqtUMIaXAq9t5WlM0acCkyuQWUUSvZclk1sV+UfnpFiZzuZSG+hfEaOmxKR5UxY/Uxswn7EhQ=="; - }; - }; - "@codemirror/language-6.9.0" = { - name = "_at_codemirror_slash_language"; - packageName = "@codemirror/language"; - version = "6.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/language/-/language-6.9.0.tgz"; - sha512 = "nFu311/0ne/qGuGCL3oKuktBgzVOaxCHZPZv1tLSZkNjPYxxvkjSbzno3MlErG2tgw1Yw1yF8BxMCegeMXqpiw=="; - }; - }; - "@codemirror/lint-6.4.0" = { - name = "_at_codemirror_slash_lint"; - packageName = "@codemirror/lint"; - version = "6.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.0.tgz"; - sha512 = "6VZ44Ysh/Zn07xrGkdtNfmHCbGSHZzFBdzWi0pbd7chAQ/iUcpLGX99NYRZTa7Ugqg4kEHCqiHhcZnH0gLIgSg=="; - }; - }; - "@codemirror/state-6.2.1" = { - name = "_at_codemirror_slash_state"; - packageName = "@codemirror/state"; - version = "6.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/state/-/state-6.2.1.tgz"; - sha512 = "RupHSZ8+OjNT38zU9fKH2sv+Dnlr8Eb8sl4NOnnqz95mCFTZUaiRP8Xv5MeeaG0px2b8Bnfe7YGwCV3nsBhbuw=="; - }; - }; - "@codemirror/view-6.16.0" = { - name = "_at_codemirror_slash_view"; - packageName = "@codemirror/view"; - version = "6.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@codemirror/view/-/view-6.16.0.tgz"; - sha512 = "1Z2HkvkC3KR/oEZVuW9Ivmp8TWLzGEd8T8TA04TTwPvqogfkHBdYSlflytDOqmkUxM2d1ywTg7X2dU5mC+SXvg=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.15.tgz"; + sha512 = "T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA=="; }; }; "@colors/colors-1.5.0" = { @@ -598,15 +508,6 @@ let sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="; }; }; - "@ctrl/tinycolor-3.6.0" = { - name = "_at_ctrl_slash_tinycolor"; - packageName = "@ctrl/tinycolor"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.6.0.tgz"; - sha512 = "/Z3l6pXthq0JvMYdUFyX9j0MaCltlIn6mfh9jLyQwg5aPKxkyNa0PTHtU1AlFXLNk55ZuAeJRcpvq+tmLfKmaQ=="; - }; - }; "@curlconverter/yargs-0.0.2" = { name = "_at_curlconverter_slash_yargs"; packageName = "@curlconverter/yargs"; @@ -634,15 +535,6 @@ let sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; }; }; - "@element-plus/icons-vue-2.1.0" = { - name = "_at_element-plus_slash_icons-vue"; - packageName = "@element-plus/icons-vue"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-2.1.0.tgz"; - sha512 = "PSBn3elNoanENc1vnCfh+3WA9fimRC7n+fWkf3rE5jvv+aBohNHABC/KAR5KWPecxWxDTVT1ERpRbOMRcOV/vA=="; - }; - }; "@ewoudenberg/difflib-0.1.0" = { name = "_at_ewoudenberg_slash_difflib"; packageName = "@ewoudenberg/difflib"; @@ -652,114 +544,6 @@ let sha512 = "OU5P5mJyD3OoWYMWY+yIgwvgNS9cFAU10f+DDuvtogcWQOoJIsQ4Hy2McSfUfhKjq8L0FuWVb4Rt7kgA+XK86A=="; }; }; - "@floating-ui/core-1.4.1" = { - name = "_at_floating-ui_slash_core"; - packageName = "@floating-ui/core"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz"; - sha512 = "jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ=="; - }; - }; - "@floating-ui/dom-1.5.1" = { - name = "_at_floating-ui_slash_dom"; - packageName = "@floating-ui/dom"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.1.tgz"; - sha512 = "KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw=="; - }; - }; - "@floating-ui/utils-0.1.1" = { - name = "_at_floating-ui_slash_utils"; - packageName = "@floating-ui/utils"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.1.tgz"; - sha512 = "m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw=="; - }; - }; - "@fontsource/open-sans-4.5.14" = { - name = "_at_fontsource_slash_open-sans"; - packageName = "@fontsource/open-sans"; - version = "4.5.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.14.tgz"; - sha512 = "mBXIIETBlW8q/ocuUN0hyGow2iuf75hQEHQt8R/RJ/HcphVbLg8KB7pHYGbFGDqs75W+SWvTC7JkVeAjT65BuQ=="; - }; - }; - "@fortawesome/fontawesome-common-types-0.2.36" = { - name = "_at_fortawesome_slash_fontawesome-common-types"; - packageName = "@fortawesome/fontawesome-common-types"; - version = "0.2.36"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz"; - sha512 = "a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg=="; - }; - }; - "@fortawesome/fontawesome-common-types-0.3.0" = { - name = "_at_fortawesome_slash_fontawesome-common-types"; - packageName = "@fortawesome/fontawesome-common-types"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.3.0.tgz"; - sha512 = "CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w=="; - }; - }; - "@fortawesome/fontawesome-common-types-6.4.2" = { - name = "_at_fortawesome_slash_fontawesome-common-types"; - packageName = "@fortawesome/fontawesome-common-types"; - version = "6.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.2.tgz"; - sha512 = "1DgP7f+XQIJbLFCTX1V2QnxVmpLdKdzzo2k8EmvDOePfchaIGQ9eCHj2up3/jNEbZuBqel5OxiaOJf37TWauRA=="; - }; - }; - "@fortawesome/fontawesome-svg-core-1.3.0" = { - name = "_at_fortawesome_slash_fontawesome-svg-core"; - packageName = "@fortawesome/fontawesome-svg-core"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.3.0.tgz"; - sha512 = "UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg=="; - }; - }; - "@fortawesome/free-regular-svg-icons-6.4.2" = { - name = "_at_fortawesome_slash_free-regular-svg-icons"; - packageName = "@fortawesome/free-regular-svg-icons"; - version = "6.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.4.2.tgz"; - sha512 = "0+sIUWnkgTVVXVAPQmW4vxb9ZTHv0WstOa3rBx9iPxrrrDH6bNLsDYuwXF9b6fGm+iR7DKQvQshUH/FJm3ed9Q=="; - }; - }; - "@fortawesome/free-solid-svg-icons-5.15.4" = { - name = "_at_fortawesome_slash_free-solid-svg-icons"; - packageName = "@fortawesome/free-solid-svg-icons"; - version = "5.15.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz"; - sha512 = "JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w=="; - }; - }; - "@fortawesome/vue-fontawesome-2.0.10" = { - name = "_at_fortawesome_slash_vue-fontawesome"; - packageName = "@fortawesome/vue-fontawesome"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.10.tgz"; - sha512 = "OTETSXz+3ygD2OK2/vy82cmUBpuJqeOAg4gfnnv+f2Rir1tDIhQg026Q3NQxznq83ZLz8iNqGG9XJm26inpDeg=="; - }; - }; - "@fortawesome/vue-fontawesome-3.0.3" = { - name = "_at_fortawesome_slash_vue-fontawesome"; - packageName = "@fortawesome/vue-fontawesome"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-3.0.3.tgz"; - sha512 = "KCPHi9QemVXGMrfuwf3nNnNo129resAIQWut9QTAMXmXqL2ErABC6ohd2yY5Ipq0CLWNbKHk8TMdTXL/Zf3ZhA=="; - }; - }; "@gar/promisify-1.1.3" = { name = "_at_gar_slash_promisify"; packageName = "@gar/promisify"; @@ -868,13 +652,13 @@ let sha512 = "FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g=="; }; }; - "@grpc/proto-loader-0.7.8" = { + "@grpc/proto-loader-0.7.9" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; - version = "0.7.8"; + version = "0.7.9"; src = fetchurl { - url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.8.tgz"; - sha512 = "GU12e2c8dmdXb7XUlOgYWZ2o2i+z9/VeACkxTA/zzAe2IjclC5PnVL0lpgjhrqfpDYHzM8B1TF6pqWegMYAzlA=="; + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.9.tgz"; + sha512 = "YJsOehVXzgurc+lLAxYnlSMc1p/Gu6VAvnfx0ATi2nzvr0YZcjhmZDeY8SeAKv1M7zE3aEJH0Xo9mK1iZ8GYoQ=="; }; }; "@httptoolkit/websocket-stream-6.0.1" = { @@ -895,51 +679,6 @@ let sha512 = "RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg=="; }; }; - "@intlify/core-base-9.2.2" = { - name = "_at_intlify_slash_core-base"; - packageName = "@intlify/core-base"; - version = "9.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.2.2.tgz"; - sha512 = "JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA=="; - }; - }; - "@intlify/devtools-if-9.2.2" = { - name = "_at_intlify_slash_devtools-if"; - packageName = "@intlify/devtools-if"; - version = "9.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/devtools-if/-/devtools-if-9.2.2.tgz"; - sha512 = "4ttr/FNO29w+kBbU7HZ/U0Lzuh2cRDhP8UlWOtV9ERcjHzuyXVZmjyleESK6eVP60tGC9QtQW9yZE+JeRhDHkg=="; - }; - }; - "@intlify/message-compiler-9.2.2" = { - name = "_at_intlify_slash_message-compiler"; - packageName = "@intlify/message-compiler"; - version = "9.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.2.2.tgz"; - sha512 = "IUrQW7byAKN2fMBe8z6sK6riG1pue95e5jfokn8hA5Q3Bqy4MBJ5lJAofUsawQJYHeoPJ7svMDyBaVJ4d0GTtA=="; - }; - }; - "@intlify/shared-9.2.2" = { - name = "_at_intlify_slash_shared"; - packageName = "@intlify/shared"; - version = "9.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/shared/-/shared-9.2.2.tgz"; - sha512 = "wRwTpsslgZS5HNyM7uDQYZtxnbI12aGiBZURX3BTR9RFIKKRWpllTsgzHWvj3HKm3Y2Sh5LPC1r0PDCKEhVn9Q=="; - }; - }; - "@intlify/vue-devtools-9.2.2" = { - name = "_at_intlify_slash_vue-devtools"; - packageName = "@intlify/vue-devtools"; - version = "9.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@intlify/vue-devtools/-/vue-devtools-9.2.2.tgz"; - sha512 = "+dUyqyCHWHb/UcvY1MlIpO87munedm3Gn6E9WWYdWrMuYLcoIoOEVDWSS8xSwtlPU+kA+MEQTP6Q1iI/ocusJg=="; - }; - }; "@ioredis/commands-1.2.0" = { name = "_at_ioredis_slash_commands"; packageName = "@ioredis/commands"; @@ -1039,51 +778,6 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsplumb/browser-ui-5.13.7" = { - name = "_at_jsplumb_slash_browser-ui"; - packageName = "@jsplumb/browser-ui"; - version = "5.13.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/browser-ui/-/browser-ui-5.13.7.tgz"; - sha512 = "rVw6DrDpUlBOOxggSWgWagf/PoXB+mQx+jCK0IXWEpmsaYfFp+4sx8qhH8jrLQf3LMEsXeQA2YI7Mi3Dz+4bRQ=="; - }; - }; - "@jsplumb/common-5.13.7" = { - name = "_at_jsplumb_slash_common"; - packageName = "@jsplumb/common"; - version = "5.13.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/common/-/common-5.13.7.tgz"; - sha512 = "NTQ/N3qRaY+axpOVrTtFPq6l36zsJx6TDlpUo3FGh0KhXd0BE7TRNkDUijNsXXj8aVFJ4djlqFuMYoroonYA+Q=="; - }; - }; - "@jsplumb/connector-bezier-5.13.7" = { - name = "_at_jsplumb_slash_connector-bezier"; - packageName = "@jsplumb/connector-bezier"; - version = "5.13.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/connector-bezier/-/connector-bezier-5.13.7.tgz"; - sha512 = "UtmIAabkNJx13nM335CKb4OSy9dTJrNorBY+DJ6rN63pG/eHhWZKW3Mwdxv/mGX1OT7sNK+N71qi+/QtqidbGw=="; - }; - }; - "@jsplumb/core-5.13.7" = { - name = "_at_jsplumb_slash_core"; - packageName = "@jsplumb/core"; - version = "5.13.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/core/-/core-5.13.7.tgz"; - sha512 = "24SfEuyjmOSdrN3m3gDesAFzlZARJIYiV8CEtoK6tBwaVwoqSSiUvY4zGHrppwx2yWDOEO5Vwv5iyw6OYlUjGw=="; - }; - }; - "@jsplumb/util-5.13.7" = { - name = "_at_jsplumb_slash_util"; - packageName = "@jsplumb/util"; - version = "5.13.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@jsplumb/util/-/util-5.13.7.tgz"; - sha512 = "DEoDaKDl0e8Y8P6rKGfpnRaaSUVDvZ52cvULLWiZIYQuo3K328vSAIoYVef3V6OSxmpfndOSfkO7oqfY0pWh0g=="; - }; - }; "@kafkajs/confluent-schema-registry-1.0.6" = { name = "_at_kafkajs_slash_confluent-schema-registry"; packageName = "@kafkajs/confluent-schema-registry"; @@ -1111,78 +805,6 @@ let sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; }; }; - "@lezer/common-1.0.4" = { - name = "_at_lezer_slash_common"; - packageName = "@lezer/common"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@lezer/common/-/common-1.0.4.tgz"; - sha512 = "lZHlk8p67x4aIDtJl6UQrXSOP6oi7dQR3W/geFVrENdA1JDaAJWldnVqVjPMJupbTKbzDfFcePfKttqVidS/dg=="; - }; - }; - "@lezer/css-1.1.3" = { - name = "_at_lezer_slash_css"; - packageName = "@lezer/css"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@lezer/css/-/css-1.1.3.tgz"; - sha512 = "SjSM4pkQnQdJDVc80LYzEaMiNy9txsFbI7HsMgeVF28NdLaAdHNtQ+kB/QqDUzRBV/75NTXjJ/R5IdC8QQGxMg=="; - }; - }; - "@lezer/highlight-1.1.6" = { - name = "_at_lezer_slash_highlight"; - packageName = "@lezer/highlight"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.6.tgz"; - sha512 = "cmSJYa2us+r3SePpRCjN5ymCqCPv+zyXmDl0ciWtVaNiORT/MxM7ZgOMQZADD0o51qOaOg24qc/zBViOIwAjJg=="; - }; - }; - "@lezer/html-1.3.6" = { - name = "_at_lezer_slash_html"; - packageName = "@lezer/html"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@lezer/html/-/html-1.3.6.tgz"; - sha512 = "Kk9HJARZTc0bAnMQUqbtuhFVsB4AnteR2BFUWfZV7L/x1H0aAKz6YabrfJ2gk/BEgjh9L3hg5O4y2IDZRBdzuQ=="; - }; - }; - "@lezer/javascript-1.4.5" = { - name = "_at_lezer_slash_javascript"; - packageName = "@lezer/javascript"; - version = "1.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@lezer/javascript/-/javascript-1.4.5.tgz"; - sha512 = "FmBUHz8K1V22DgjTd6SrIG9owbzOYZ1t3rY6vGEmw+e2RVBd7sqjM8uXEVRFmfxKFn1Mx2ABJehHjrN3G2ZpmA=="; - }; - }; - "@lezer/json-1.0.1" = { - name = "_at_lezer_slash_json"; - packageName = "@lezer/json"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@lezer/json/-/json-1.0.1.tgz"; - sha512 = "nkVC27qiEZEjySbi6gQRuMwa2sDu2PtfjSgz0A4QF81QyRGm3kb2YRzLcOPcTEtmcwvrX/cej7mlhbwViA4WJw=="; - }; - }; - "@lezer/lr-1.3.10" = { - name = "_at_lezer_slash_lr"; - packageName = "@lezer/lr"; - version = "1.3.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.10.tgz"; - sha512 = "BZfVvf7Re5BIwJHlZXbJn9L8lus5EonxQghyn+ih8Wl36XMFBPTXC0KM0IdUtj9w/diPHsKlXVgL+AlX2jYJ0Q=="; - }; - }; - "@lezer/python-1.1.8" = { - name = "_at_lezer_slash_python"; - packageName = "@lezer/python"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@lezer/python/-/python-1.1.8.tgz"; - sha512 = "1T/XsmeF57ijrjpC0Zmrf9YeO5mn2zC1XeSNrOnc0KB+6PgxJ5m7kWKt0CnwyS74oHQXbJxUUL+QDQJR26c1Gw=="; - }; - }; "@mapbox/node-pre-gyp-1.0.11" = { name = "_at_mapbox_slash_node-pre-gyp"; packageName = "@mapbox/node-pre-gyp"; @@ -1192,40 +814,40 @@ let sha512 = "Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ=="; }; }; - "@mongodb-js/zstd-1.1.0" = { + "@mongodb-js/zstd-1.2.0" = { name = "_at_mongodb-js_slash_zstd"; packageName = "@mongodb-js/zstd"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@mongodb-js/zstd/-/zstd-1.1.0.tgz"; - sha512 = "+dRj3tSgenHhdqZ1d9ii7PKrXerXOZgDKJE9E2IFxC2lOecgOnSnInAD1o6hCFmyJ5NDQrcsrJKxkOlptwA1mw=="; + url = "https://registry.npmjs.org/@mongodb-js/zstd/-/zstd-1.2.0.tgz"; + sha512 = "sKHsJU2MXsp822IFXOHw/4mpFulScNHpZzVy1Zi5k5wBsdiAPx1QramyOXZkpacla+2QPEC/s7TxPlEhG/HuNQ=="; }; }; - "@n8n/client-oauth2-0.6.0" = { + "@n8n/client-oauth2-0.7.0" = { name = "_at_n8n_slash_client-oauth2"; packageName = "@n8n/client-oauth2"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@n8n/client-oauth2/-/client-oauth2-0.6.0.tgz"; - sha512 = "t5K1N0O4llf+FMfmnox3DcAjaP09hkM3nJU+iBYHF0AbbSDXEvBCZk0TW26ujAKe/4QOM8JXAoQUuw7HRUVAug=="; + url = "https://registry.npmjs.org/@n8n/client-oauth2/-/client-oauth2-0.7.0.tgz"; + sha512 = "E/ir1Ay8Pmia+b5tvV4KhZ0J0xexz3jJc1w93xx39Iaq5XuZRWC3TNJhJdVp0f2fPti0rVDHnAMHsovBucHBIw=="; }; }; - "@n8n/codemirror-lang-sql-1.0.2" = { - name = "_at_n8n_slash_codemirror-lang-sql"; - packageName = "@n8n/codemirror-lang-sql"; - version = "1.0.2"; + "@n8n/vm2-3.9.20" = { + name = "_at_n8n_slash_vm2"; + packageName = "@n8n/vm2"; + version = "3.9.20"; src = fetchurl { - url = "https://registry.npmjs.org/@n8n/codemirror-lang-sql/-/codemirror-lang-sql-1.0.2.tgz"; - sha512 = "sOf/KyewSu3Ikij0CkRtzJJDhRDZcwNCEYl8UdH4U/riL0/XZGcBD7MYofCCcKszanJZiEWRZ2KU1sRp234iMg=="; + url = "https://registry.npmjs.org/@n8n/vm2/-/vm2-3.9.20.tgz"; + sha512 = "qk2oJYkuFRVSTxoro4obX/sv/wT1pViZjHh/isjOvFB93D52QIg3TCjMPsHOfHTmkxCKJffjLrUvjIwvWzSMCQ=="; }; }; - "@n8n_io/license-sdk-2.4.0" = { + "@n8n_io/license-sdk-2.5.1" = { name = "_at_n8n_io_slash_license-sdk"; packageName = "@n8n_io/license-sdk"; - version = "2.4.0"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@n8n_io/license-sdk/-/license-sdk-2.4.0.tgz"; - sha512 = "99kuCVH4NcBi4nyn/WIpd6KSIMLk/pbBks0zr8bC65ALKj0se7/2MwC6N+WwGkG7NqH0kMdGe/7Y5KnJkMTefg=="; + url = "https://registry.npmjs.org/@n8n_io/license-sdk/-/license-sdk-2.5.1.tgz"; + sha512 = "CL4JVJS8nvI8qPFQ1jSG7CiPnNkeKJSgbDxWOLVX4MRjTKrwL8Cpd1LeYMx5g5StmHzkoxz2TDqL8WT6qyMlrQ=="; }; }; "@n8n_io/riot-tmpl-4.0.1" = { @@ -1363,22 +985,13 @@ let sha512 = "nEv7dFPxCrWrvK6dQ8zya0/Kb54EXVcwIKV9capjSa89ZDoOo+qH0YSo4/eQVECXgW3eUvgKLDIcIt62YBk0HA=="; }; }; - "@opentelemetry/api-1.4.1" = { + "@opentelemetry/api-1.6.0" = { name = "_at_opentelemetry_slash_api"; packageName = "@opentelemetry/api"; - version = "1.4.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.4.1.tgz"; - sha512 = "O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA=="; - }; - }; - "@popperjs/core-2.11.7" = { - name = "_at_popperjs_slash_core"; - packageName = "@popperjs/core"; - version = "2.11.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz"; - sha512 = "Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="; + url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.6.0.tgz"; + sha512 = "OWlrQAnWn9577PhVgqjUvMr1pg57Bc4jv0iL4w0PRuOSRvq67rvHW9Ie/dZVMvCzhSCB+UxhcY/PmCmFj33Q+g=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -1480,13 +1093,13 @@ let sha512 = "HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg=="; }; }; - "@redis/client-1.5.8" = { + "@redis/client-1.5.9" = { name = "_at_redis_slash_client"; packageName = "@redis/client"; - version = "1.5.8"; + version = "1.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/client/-/client-1.5.8.tgz"; - sha512 = "xzElwHIO6rBAqzPeVnCzgvrnBEcFL1P0w8P65VNLRkdVW8rOE58f52hdj0BDgmsdOm4f1EoXPZtH4Fh7M/qUpw=="; + url = "https://registry.npmjs.org/@redis/client/-/client-1.5.9.tgz"; + sha512 = "SffgN+P1zdWJWSXBvJeynvEnmnZrYmtKSRW00xl8pOPFOMJjxRR9u0frSxJpPR6Y4V+k54blJjGW7FgxbTI7bQ=="; }; }; "@redis/graph-1.1.0" = { @@ -1516,13 +1129,13 @@ let sha512 = "4Dg1JjvCevdiCBTZqjhKkGoC5/BcB7k9j99kdMnaXFXg8x4eyOIVg9487CMv7/BUVkFLZCaIh8ead9mU15DNng=="; }; }; - "@redis/time-series-1.0.4" = { + "@redis/time-series-1.0.5" = { name = "_at_redis_slash_time-series"; packageName = "@redis/time-series"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.4.tgz"; - sha512 = "ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng=="; + url = "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.5.tgz"; + sha512 = "IFjIgTusQym2B5IZJG3XKr5llka7ey84fw/NOYqESP5WUfQs9zz1ww/9+qoz4ka/S6KcGBodzlCeZ5UImKbscg=="; }; }; "@rudderstack/rudder-sdk-node-1.0.6" = { @@ -1534,13 +1147,13 @@ let sha512 = "kJYCXv6fRFbQrAp3hMsgRCnAa7RUBdbiGLBT9PcpQURi0VwHmD7mk3Ja7U4HDnL0EHXYJpPyx3oSonkklmPJ9Q=="; }; }; - "@sap/hana-client-2.17.22" = { + "@sap/hana-client-2.18.22" = { name = "_at_sap_slash_hana-client"; packageName = "@sap/hana-client"; - version = "2.17.22"; + version = "2.18.22"; src = fetchurl { - url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.17.22.tgz"; - sha512 = "EwhiBZcuRJcc9wtipzcebi3A7JMRnVcxUy3k2S49zFiZqbVJaqFx84zNVvwjbTjzAjKq7NQZ4rTxHKOZx72o+Q=="; + url = "https://registry.npmjs.org/@sap/hana-client/-/hana-client-2.18.22.tgz"; + sha512 = "iihhrDk70vg9SYHCDWnFiYSBjS3y5TMojPqEPkcPpkNg7YuYlabcdY7xy4iepLpDP6jqa1EijPxPi33zYAnXzw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -1561,121 +1174,121 @@ let sha512 = "P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ=="; }; }; - "@sentry-internal/tracing-7.64.0" = { + "@sentry-internal/tracing-7.69.0" = { name = "_at_sentry-internal_slash_tracing"; packageName = "@sentry-internal/tracing"; - version = "7.64.0"; + version = "7.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.64.0.tgz"; - sha512 = "1XE8W6ki7hHyBvX9hfirnGkKDBKNq3bDJyXS86E0bYVDl94nvbRM9BD9DHsCFetqYkVm1yDGEK+6aUVs4CztoQ=="; + url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.69.0.tgz"; + sha512 = "4BgeWZUj9MO6IgfO93C9ocP3+AdngqujF/+zB2rFdUe+y9S6koDyUC7jr9Knds/0Ta72N/0D6PwhgSCpHK8s0Q=="; }; }; - "@sentry/core-7.64.0" = { + "@sentry/core-7.69.0" = { name = "_at_sentry_slash_core"; packageName = "@sentry/core"; - version = "7.64.0"; + version = "7.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/core/-/core-7.64.0.tgz"; - sha512 = "IzmEyl5sNG7NyEFiyFHEHC+sizsZp9MEw1+RJRLX6U5RITvcsEgcajSkHQFafaBPzRrcxZMdm47Cwhl212LXcw=="; + url = "https://registry.npmjs.org/@sentry/core/-/core-7.69.0.tgz"; + sha512 = "V6jvK2lS8bhqZDMFUtvwe2XvNstFQf5A+2LMKCNBOV/NN6eSAAd6THwEpginabjet9dHsNRmMk7WNKvrUfQhZw=="; }; }; - "@sentry/integrations-7.64.0" = { + "@sentry/integrations-7.69.0" = { name = "_at_sentry_slash_integrations"; packageName = "@sentry/integrations"; - version = "7.64.0"; + version = "7.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.64.0.tgz"; - sha512 = "6gbSGiruOifAmLtXw//Za19GWiL5qugDMEFxSvc5WrBWb+A8UK+foPn3K495OcivLS68AmqAQCUGb+6nlVowwA=="; + url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.69.0.tgz"; + sha512 = "FEFtFqXuCo9+L7bENZxFpEAlIODwHl6FyW/DwLfniy9jOXHU7BhP/oICLrFE5J7rh1gNY7N/8VlaiQr3hCnS/g=="; }; }; - "@sentry/node-7.64.0" = { + "@sentry/node-7.69.0" = { name = "_at_sentry_slash_node"; packageName = "@sentry/node"; - version = "7.64.0"; + version = "7.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/node/-/node-7.64.0.tgz"; - sha512 = "wRi0uTnp1WSa83X2yLD49tV9QPzGh5e42IKdIDBiQ7lV9JhLILlyb34BZY1pq6p4dp35yDasDrP3C7ubn7wo6A=="; + url = "https://registry.npmjs.org/@sentry/node/-/node-7.69.0.tgz"; + sha512 = "T0NgPcmDQvEuz5hy6aEhXghTHHTWsiP3IWoeEAakDBHAXmtpT6lYFQZgb5AiEOt9F5KO/G/1yH3YYdpDAnKhPw=="; }; }; - "@sentry/types-7.64.0" = { + "@sentry/types-7.69.0" = { name = "_at_sentry_slash_types"; packageName = "@sentry/types"; - version = "7.64.0"; + version = "7.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/types/-/types-7.64.0.tgz"; - sha512 = "LqjQprWXjUFRmzIlUjyA+KL+38elgIYmAeoDrdyNVh8MK5IC1W2Lh1Q87b4yOiZeMiIhIVNBd7Ecoh2rodGrGA=="; + url = "https://registry.npmjs.org/@sentry/types/-/types-7.69.0.tgz"; + sha512 = "zPyCox0mzitzU6SIa1KIbNoJAInYDdUpdiA+PoUmMn2hFMH1llGU/cS7f4w/mAsssTlbtlBi72RMnWUCy578bw=="; }; }; - "@sentry/utils-7.64.0" = { + "@sentry/utils-7.69.0" = { name = "_at_sentry_slash_utils"; packageName = "@sentry/utils"; - version = "7.64.0"; + version = "7.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.64.0.tgz"; - sha512 = "HRlM1INzK66Gt+F4vCItiwGKAng4gqzCR4C5marsL3qv6SrKH98dQnCGYgXluSWaaa56h97FRQu7TxCk6jkSvQ=="; + url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.69.0.tgz"; + sha512 = "4eBixe5Y+0EGVU95R4NxH3jkkjtkE4/CmSZD4In8SCkWGSauogePtq6hyiLsZuP1QHdpPb9Kt0+zYiBb2LouBA=="; }; }; - "@smithy/abort-controller-2.0.4" = { + "@smithy/abort-controller-2.0.8" = { name = "_at_smithy_slash_abort-controller"; packageName = "@smithy/abort-controller"; - version = "2.0.4"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.4.tgz"; - sha512 = "3+3/xRQ0K/NFVtKSiTGsUa3muZnVaBmHrLNgxwoBLZO9rNhwZtjjjf7pFJ6aoucoul/c/w3xobRkgi8F9MWX8Q=="; + url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-2.0.8.tgz"; + sha512 = "2SOdVj5y0zE37Y9scSXoizoxgi6mgnDabi7a/SOfhl0p+50I0rIkuJTfyAuTPDtQ7e5dD6tSZPCLB3c/YM6Zig=="; }; }; - "@smithy/config-resolver-2.0.4" = { + "@smithy/config-resolver-2.0.9" = { name = "_at_smithy_slash_config-resolver"; packageName = "@smithy/config-resolver"; - version = "2.0.4"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.4.tgz"; - sha512 = "JtKWIKoCFeOY5JGQeEl81AKdIpzeLLSjSMmO5yoKqc58Yn3cxmteylT6Elba3FgAHjK1OthARRXz5JXaKKRB7g=="; + url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-2.0.9.tgz"; + sha512 = "QBkGPLUqyPmis9Erz8v4q5lo/ErnF7+GD5WZHa6JZiXopUPfaaM+B21n8gzS5xCkIXZmnwzNQhObP9xQPu8oqQ=="; }; }; - "@smithy/credential-provider-imds-2.0.4" = { + "@smithy/credential-provider-imds-2.0.11" = { name = "_at_smithy_slash_credential-provider-imds"; packageName = "@smithy/credential-provider-imds"; - version = "2.0.4"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.4.tgz"; - sha512 = "vW7xoDKZwjjf/2GCwVf/uvZce/QJOAYan9r8UsqlzOrnnpeS2ffhxeZjLK0/emZu8n6qU3amGgZ/BTo3oVtEyQ=="; + url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.11.tgz"; + sha512 = "uJJs8dnM5iXkn8a2GaKvlKMhcOJ+oJPYqY9gY3CM/EieCVObIDjxUtR/g8lU/k/A+OauA78GzScAfulmFjPOYA=="; }; }; - "@smithy/eventstream-codec-2.0.4" = { + "@smithy/eventstream-codec-2.0.8" = { name = "_at_smithy_slash_eventstream-codec"; packageName = "@smithy/eventstream-codec"; - version = "2.0.4"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.4.tgz"; - sha512 = "DkVLcQjhOxPj/4pf2hNj2kvOeoLczirHe57g7czMNJCUBvg9cpU9hNgqS37Y5sjdEtMSa2oTyCS5oeHZtKgoIw=="; + url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-2.0.8.tgz"; + sha512 = "onO4to8ujCKn4m5XagReT9Nc6FlNG5vveuvjp1H7AtaG7njdet1LOl6/jmUOkskF2C/w+9jNw3r9Ak+ghOvN0A=="; }; }; - "@smithy/fetch-http-handler-2.0.4" = { + "@smithy/fetch-http-handler-2.1.4" = { name = "_at_smithy_slash_fetch-http-handler"; packageName = "@smithy/fetch-http-handler"; - version = "2.0.4"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.0.4.tgz"; - sha512 = "1dwR8T+QMe5Gs60NpZgF7ReZp0SXz1O/aX5BdDhsOJh72fi3Bx2UZlDihCdb++9vPyBRMXFRF7I8/C4x8iIm8A=="; + url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-2.1.4.tgz"; + sha512 = "SL24M9W5ERByoXaVicRx+bj9GJVujDnPn+QO7GY7adhY0mPGa6DSF58pVKsgIh4r5Tx/k3SWCPlH4BxxSxA/fQ=="; }; }; - "@smithy/hash-node-2.0.4" = { + "@smithy/hash-node-2.0.8" = { name = "_at_smithy_slash_hash-node"; packageName = "@smithy/hash-node"; - version = "2.0.4"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.4.tgz"; - sha512 = "vZ6a/fvEAFJKNtxJsn0I2WM8uBdypLLhLTpP4BA6fRsBAtwIl5S4wTt0Hspy6uGNn/74LmCxGmFSTMMbSd7ZDA=="; + url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-2.0.8.tgz"; + sha512 = "yZL/nmxZzjZV5/QX5JWSgXlt0HxuMTwFO89CS++jOMMPiCMZngf6VYmtNdccs8IIIAMmfQeTzwu07XgUE/Zd3Q=="; }; }; - "@smithy/invalid-dependency-2.0.4" = { + "@smithy/invalid-dependency-2.0.8" = { name = "_at_smithy_slash_invalid-dependency"; packageName = "@smithy/invalid-dependency"; - version = "2.0.4"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.4.tgz"; - sha512 = "zfbPPZFiZvhIXJYKlzQwDUnxmWK/SmyDcM6iQJRZHU2jQZAzhHUXFGIu2lKH9L02VUqysOgQi3S/HY4fhrVT8w=="; + url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-2.0.8.tgz"; + sha512 = "88VOS7W3KzUz/bNRc+Sl/F/CDIasFspEE4G39YZRHIh9YmsXF7GUyVaAKURfMNulTie62ayk6BHC9O0nOBAVgQ=="; }; }; "@smithy/is-array-buffer-2.0.0" = { @@ -1687,157 +1300,157 @@ let sha512 = "z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug=="; }; }; - "@smithy/middleware-content-length-2.0.4" = { + "@smithy/middleware-content-length-2.0.10" = { name = "_at_smithy_slash_middleware-content-length"; packageName = "@smithy/middleware-content-length"; - version = "2.0.4"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.4.tgz"; - sha512 = "Pdd+fhRbvizqsgYJ0pLWE6hjhq42wDFWzMj/1T7mEY9tG9bP6/AcdsQK8SAOckrBLURDoeSqTAwPKalsgcZBxw=="; + url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-2.0.10.tgz"; + sha512 = "EGSbysyA4jH0p3xI6G0jdXoj9Iz9GUnAta6aEaHtXm3wVWtenRf80y2TeVvNkVSr5jwKOdSCjKIRI2l1A/oZLA=="; }; }; - "@smithy/middleware-endpoint-2.0.4" = { + "@smithy/middleware-endpoint-2.0.8" = { name = "_at_smithy_slash_middleware-endpoint"; packageName = "@smithy/middleware-endpoint"; - version = "2.0.4"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.4.tgz"; - sha512 = "aLPqkqKjZQ1V718P0Ostpp53nWfwK32uD0HFKSAOT25RvL285dqzGl0PAKDXpyLsPsPmHe0Yrg0AUFkRv4CRbQ=="; + url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.8.tgz"; + sha512 = "yOpogfG2d2V0cbJdAJ6GLAWkNOc9pVsL5hZUfXcxJu408N3CUCsXzIAFF6+70ZKSE+lCfG3GFErcSXv/UfUbjw=="; }; }; - "@smithy/middleware-retry-2.0.4" = { + "@smithy/middleware-retry-2.0.11" = { name = "_at_smithy_slash_middleware-retry"; packageName = "@smithy/middleware-retry"; - version = "2.0.4"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.4.tgz"; - sha512 = "stozO6NgH9W/OSfFMOJEtlJCsnJFSoGyV4LHzIVQeXTzZ2RHjmytQ/Ez7GngHGZ1YsB4zxE1qDTXAU0AlaKf2w=="; + url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-2.0.11.tgz"; + sha512 = "pknfokumZ+wvBERSuKAI2vVr+aK3ZgPiWRg6+0ZG4kKJogBRpPmDGWw+Jht0izS9ZaEbIobNzueIb4wD33JJVg=="; }; }; - "@smithy/middleware-serde-2.0.4" = { + "@smithy/middleware-serde-2.0.8" = { name = "_at_smithy_slash_middleware-serde"; packageName = "@smithy/middleware-serde"; - version = "2.0.4"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.4.tgz"; - sha512 = "oDttJMMES7yXmopjQHnqTkxu8vZOdjB9VpSj94Ff4/GXdKQH7ozKLNIPq4C568nbeQbBt/gsLb6Ttbx1+j+JPQ=="; + url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-2.0.8.tgz"; + sha512 = "Is0sm+LiNlgsc0QpstDzifugzL9ehno1wXp109GgBgpnKTK3j+KphiparBDI4hWTtH9/7OUsxuspNqai2yyhcg=="; }; }; - "@smithy/middleware-stack-2.0.0" = { + "@smithy/middleware-stack-2.0.1" = { name = "_at_smithy_slash_middleware-stack"; packageName = "@smithy/middleware-stack"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.0.tgz"; - sha512 = "31XC1xNF65nlbc16yuh3wwTudmqs6qy4EseQUGF8A/p2m/5wdd/cnXJqpniy/XvXVwkHPz/GwV36HqzHtIKATQ=="; + url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-2.0.1.tgz"; + sha512 = "UexsfY6/oQZRjTQL56s9AKtMcR60tBNibSgNYX1I2WXaUaXg97W9JCkFyth85TzBWKDBTyhLfenrukS/kyu54A=="; }; }; - "@smithy/node-config-provider-2.0.4" = { + "@smithy/node-config-provider-2.0.11" = { name = "_at_smithy_slash_node-config-provider"; packageName = "@smithy/node-config-provider"; - version = "2.0.4"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.4.tgz"; - sha512 = "s9O90cEhkpzZulvdHBBaroZ6AJ5uV6qtmycgYKP1yOCSfPHGIWYwaULdbfxraUsvzCcnMosDNkfckqXYoKI6jw=="; + url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-2.0.11.tgz"; + sha512 = "CaR1dciSSGKttjhcefpytYjsfI/Yd5mqL8am4wfmyFCDxSiPsvnEWHl8UjM/RbcAjX0klt+CeIKPSHEc0wGvJA=="; }; }; - "@smithy/node-http-handler-2.0.4" = { + "@smithy/node-http-handler-2.1.4" = { name = "_at_smithy_slash_node-http-handler"; packageName = "@smithy/node-http-handler"; - version = "2.0.4"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.0.4.tgz"; - sha512 = "svqeqkGgQz1B2m3IurHtp1O8vfuUGbqw6vynFmOrvPirRdiIPukHTZW1GN/JuBCtDpq9mNPutSVipfz2n4sZbQ=="; + url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-2.1.4.tgz"; + sha512 = "8Rw/AusvWDyC6SK8esAcVBeTlQHf94NMFv805suFUJCQ2gwlh0oLDNh+6s2MDOrxcjvLxjjzv1mytM0Mt+0cPQ=="; }; }; - "@smithy/property-provider-2.0.4" = { + "@smithy/property-provider-2.0.9" = { name = "_at_smithy_slash_property-provider"; packageName = "@smithy/property-provider"; - version = "2.0.4"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.4.tgz"; - sha512 = "OfaUIhnyvOkuCPHWMPkJqX++dUaDKsiZWuZqCdU04Z9dNAl2TtZAh7dw2rsZGb57vq6YH3PierNrDfQJTAKYtg=="; + url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-2.0.9.tgz"; + sha512 = "25pPZ8f8DeRwYI5wbPRZaoMoR+3vrw8DwbA0TjP+GsdiB2KxScndr4HQehiJ5+WJ0giOTWhLz0bd+7Djv1qpUQ=="; }; }; - "@smithy/protocol-http-2.0.4" = { + "@smithy/protocol-http-3.0.4" = { name = "_at_smithy_slash_protocol-http"; packageName = "@smithy/protocol-http"; - version = "2.0.4"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-2.0.4.tgz"; - sha512 = "I1vCZ/m1U424gA9TXkL/pJ3HlRfujY8+Oj3GfDWcrNiWVmAeyx3CTvXw+yMHp2X01BOOu5fnyAa6JwAn1O+txA=="; + url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-3.0.4.tgz"; + sha512 = "CGfSWk6TRlbwa8YgrSXdn80Yu7pov3EV/h7TSfiCHhq6/LO3WymmqnzgH1f0qV2bdTDipIkTNp5dGCGN3Af/5g=="; }; }; - "@smithy/querystring-builder-2.0.4" = { + "@smithy/querystring-builder-2.0.8" = { name = "_at_smithy_slash_querystring-builder"; packageName = "@smithy/querystring-builder"; - version = "2.0.4"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.4.tgz"; - sha512 = "Jc7UPx1pNeisYcABkoo2Pn4kvomy1UI7uxv7R+1W3806KMAKgYHutWmZG01aPHu2XH0zY2RF2KfGiuialsxHvA=="; + url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-2.0.8.tgz"; + sha512 = "+vzIMwjC8Saz97/ptPn+IJRCRRZ+pP95ZIWDRqEqZV/a6hiKbaFoMSa2iCKsnKzR696U2JZXrDqMu3e/FD1+2g=="; }; }; - "@smithy/querystring-parser-2.0.4" = { + "@smithy/querystring-parser-2.0.8" = { name = "_at_smithy_slash_querystring-parser"; packageName = "@smithy/querystring-parser"; - version = "2.0.4"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.4.tgz"; - sha512 = "Uh6+PhGxSo17qe2g/JlyoekvTHKn7dYWfmHqUzPAvkW+dHlc3DNVG3++PV48z33lCo5YDVBBturWQ9N/TKn+EA=="; + url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-2.0.8.tgz"; + sha512 = "ArbanNuR7O/MmTd90ZqhDqGOPPDYmxx3huHxD+R3cuCnazcK/1tGQA+SnnR5307T7ZRb5WTpB6qBggERuibVSA=="; }; }; - "@smithy/service-error-classification-2.0.0" = { + "@smithy/service-error-classification-2.0.1" = { name = "_at_smithy_slash_service-error-classification"; packageName = "@smithy/service-error-classification"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.0.tgz"; - sha512 = "2z5Nafy1O0cTf69wKyNjGW/sNVMiqDnb4jgwfMG8ye8KnFJ5qmJpDccwIbJNhXIfbsxTg9SEec2oe1cexhMJvw=="; + url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-2.0.1.tgz"; + sha512 = "QHa9+t+v4s0cMuDCcbjIJN67mNZ42/+fc3jKe8P6ZMPXZl5ksKk6a8vhZ/m494GZng5eFTc3OePv+NF9cG83yg=="; }; }; - "@smithy/shared-ini-file-loader-2.0.4" = { + "@smithy/shared-ini-file-loader-2.0.10" = { name = "_at_smithy_slash_shared-ini-file-loader"; packageName = "@smithy/shared-ini-file-loader"; - version = "2.0.4"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.4.tgz"; - sha512 = "091yneupXnSqvAU+vLG7h0g4QRRO6TjulpECXYVU6yW/LiNp7QE533DBpaphmbtI6tTC4EfGrhn35gTa0w+GQg=="; + url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.10.tgz"; + sha512 = "jWASteSezRKohJ7GdA7pHDvmr7Q7tw3b5mu3xLHIkZy/ICftJ+O7aqNaF8wklhI7UNFoQ7flFRM3Rd0KA+1BbQ=="; }; }; - "@smithy/signature-v4-2.0.4" = { + "@smithy/signature-v4-2.0.8" = { name = "_at_smithy_slash_signature-v4"; packageName = "@smithy/signature-v4"; - version = "2.0.4"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.4.tgz"; - sha512 = "y2xblkS0hb44QJDn9YjPp5aRFYSiI7w0bI3tATE3ybOrII2fppqD0SE3zgvew/B/3rTunuiCW+frTD0W4UYb9Q=="; + url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-2.0.8.tgz"; + sha512 = "qrtiYMzaLlQ5HSJOaFwnyTQ3JLjmPY+3+pr9IBDpCVM6YtVj22cBLVB9bPOiZMIpkdI7ZRdxLBFlIjh5CO1Bhw=="; }; }; - "@smithy/smithy-client-2.0.4" = { + "@smithy/smithy-client-2.1.5" = { name = "_at_smithy_slash_smithy-client"; packageName = "@smithy/smithy-client"; - version = "2.0.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.0.4.tgz"; - sha512 = "Dg1dkqyj3jwa03RFs6E4ASmfQ7CjplbGISJIJNSt3F8NfIid2RalbeCMOIHK7VagKh9qngZNyoKxObZC9LB9Lg=="; + url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-2.1.5.tgz"; + sha512 = "7S865uKzsxApM8W8Q6zkij7tcUFgaG8PuADMFdMt1yL/ku3d0+s6Zwrg3N7iXCPM08Gu/mf0BIfTXIu/9i450Q=="; }; }; - "@smithy/types-2.2.1" = { + "@smithy/types-2.3.2" = { name = "_at_smithy_slash_types"; packageName = "@smithy/types"; - version = "2.2.1"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/types/-/types-2.2.1.tgz"; - sha512 = "6nyDOf027ZeJiQVm6PXmLm7dR+hR2YJUkr4VwUniXA8xZUGAu5Mk0zfx2BPFrt+e5YauvlIqQoH0CsrM4tLkfg=="; + url = "https://registry.npmjs.org/@smithy/types/-/types-2.3.2.tgz"; + sha512 = "iH0cdKi7HQlzfAM3w2shFk/qZYKAqJWswtpmQpPtlruF+uFZeGEpMJjgDRyhWiddfVM4e2oP4nMaOBsMy6lXgg=="; }; }; - "@smithy/url-parser-2.0.4" = { + "@smithy/url-parser-2.0.8" = { name = "_at_smithy_slash_url-parser"; packageName = "@smithy/url-parser"; - version = "2.0.4"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.4.tgz"; - sha512 = "puIQ6+TJpI2AAPw7IGdGG6d2DEcVP5nJqa1VjrxzUcy2Jx7LtGn+gDHY2o9Pc9vQkmoicovTEKgvv7CdqP+0gg=="; + url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-2.0.8.tgz"; + sha512 = "wQw7j004ScCrBRJ+oNPXlLE9mtofxyadSZ9D8ov/rHkyurS7z1HTNuyaGRj6OvKsEk0SVQsuY0C9+EfM75XTkw=="; }; }; "@smithy/util-base64-2.0.0" = { @@ -1858,13 +1471,13 @@ let sha512 = "JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg=="; }; }; - "@smithy/util-body-length-node-2.0.0" = { + "@smithy/util-body-length-node-2.1.0" = { name = "_at_smithy_slash_util-body-length-node"; packageName = "@smithy/util-body-length-node"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.0.0.tgz"; - sha512 = "ZV7Z/WHTMxHJe/xL/56qZwSUcl63/5aaPAGjkfynJm4poILjdD4GmFI+V+YWabh2WJIjwTKZ5PNsuvPQKt93Mg=="; + url = "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-2.1.0.tgz"; + sha512 = "/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw=="; }; }; "@smithy/util-buffer-from-2.0.0" = { @@ -1885,22 +1498,22 @@ let sha512 = "xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg=="; }; }; - "@smithy/util-defaults-mode-browser-2.0.4" = { + "@smithy/util-defaults-mode-browser-2.0.9" = { name = "_at_smithy_slash_util-defaults-mode-browser"; packageName = "@smithy/util-defaults-mode-browser"; - version = "2.0.4"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.4.tgz"; - sha512 = "wGdnPt4Ng72duUd97HrlqVkq6DKVB/yjaGkSg5n3uuQKzzHjoi3OdjXGumD/VYPHz0dYd7wpLNG2CnMm/nfDrg=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.9.tgz"; + sha512 = "JONLJVQWT8165XoSV36ERn3SVlZLJJ4D6IeGsCSePv65Uxa93pzSLE0UMSR9Jwm4zix7rst9AS8W5QIypZWP8Q=="; }; }; - "@smithy/util-defaults-mode-node-2.0.4" = { + "@smithy/util-defaults-mode-node-2.0.11" = { name = "_at_smithy_slash_util-defaults-mode-node"; packageName = "@smithy/util-defaults-mode-node"; - version = "2.0.4"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.4.tgz"; - sha512 = "QMkNcV6x52BeeeIvhvow6UmOu7nP7DXQljY6DKOP/aAokrli53IWTP/kUTd9B0Mp9tbW3WC10O6zaM69xiMNYw=="; + url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.11.tgz"; + sha512 = "tmqjNsfj+bgZN6jXBe6efZnukzILA7BUytHkzqikuRLNtR+0VVchQHvawD0w6vManh76rO81ydhioe7i4oBzuA=="; }; }; "@smithy/util-hex-encoding-2.0.0" = { @@ -1912,31 +1525,31 @@ let sha512 = "c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA=="; }; }; - "@smithy/util-middleware-2.0.0" = { + "@smithy/util-middleware-2.0.1" = { name = "_at_smithy_slash_util-middleware"; packageName = "@smithy/util-middleware"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.0.tgz"; - sha512 = "eCWX4ECuDHn1wuyyDdGdUWnT4OGyIzV0LN1xRttBFMPI9Ff/4heSHVxneyiMtOB//zpXWCha1/SWHJOZstG7kA=="; + url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-2.0.1.tgz"; + sha512 = "LnsBMi0Mg3gfz/TpNGLv2Jjcz2ra1OX5HR/4IaCepIYmtPQzqMWDdhX/XTW1LS8OZ0xbQuyQPcHkQ+2XkhWOVQ=="; }; }; - "@smithy/util-retry-2.0.0" = { + "@smithy/util-retry-2.0.1" = { name = "_at_smithy_slash_util-retry"; packageName = "@smithy/util-retry"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.0.tgz"; - sha512 = "/dvJ8afrElasuiiIttRJeoS2sy8YXpksQwiM/TcepqdRVp7u4ejd9C4IQURHNjlfPUT7Y6lCDSa2zQJbdHhVTg=="; + url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-2.0.1.tgz"; + sha512 = "naj4X0IafJ9yJnVJ58QgSMkCNLjyQOnyrnKh/T0f+0UOUxJiT8vuFn/hS7B/pNqbo2STY7PyJ4J4f+5YqxwNtA=="; }; }; - "@smithy/util-stream-2.0.4" = { + "@smithy/util-stream-2.0.11" = { name = "_at_smithy_slash_util-stream"; packageName = "@smithy/util-stream"; - version = "2.0.4"; + version = "2.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.4.tgz"; - sha512 = "ZVje79afuv3DB1Ma/g5m/5v9Zda8nA0xNgvE1pOD3EnoTp/Ekch1z20AN6gfVsf7JYWK2VSMVDiqI9N8Ua4wbg=="; + url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-2.0.11.tgz"; + sha512 = "2MeWfqSpZKdmEJ+tH8CJQSgzLWhH5cmdE24X7JB0hiamXrOmswWGGuPvyj/9sQCTclo57pNxLR2p7KrP8Ahiyg=="; }; }; "@smithy/util-uri-escape-2.0.0" = { @@ -1966,31 +1579,40 @@ let sha512 = "Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw=="; }; }; - "@swc/core-1.3.78" = { + "@swc/core-1.3.85" = { name = "_at_swc_slash_core"; packageName = "@swc/core"; - version = "1.3.78"; + version = "1.3.85"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/core/-/core-1.3.78.tgz"; - sha512 = "y6DQP571v7fbUUY7nz5G4lNIRGofuO48K5pGhD9VnuOCTuptfooCdi8wnigIrIhM/M4zQ53m/YCMDCbOtDgEww=="; + url = "https://registry.npmjs.org/@swc/core/-/core-1.3.85.tgz"; + sha512 = "qnoxp+2O0GtvRdYnXgR1v8J7iymGGYpx6f6yCK9KxipOZOjrlKILFANYlghQxZyPUfXwK++TFxfSlX4r9wK+kg=="; }; }; - "@swc/helpers-0.5.1" = { + "@swc/helpers-0.5.2" = { name = "_at_swc_slash_helpers"; packageName = "@swc/helpers"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.1.tgz"; - sha512 = "sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg=="; + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.2.tgz"; + sha512 = "E4KcWTpoLHqwPHLxidpOqQbcrZVgi0rsmmZXUle1jXmJfuIf/UWpczUJ7MZZ5tlxytgJXyp0w4PGkkeLiuIdZw=="; }; }; - "@swc/wasm-1.3.78" = { + "@swc/types-0.1.4" = { + name = "_at_swc_slash_types"; + packageName = "@swc/types"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@swc/types/-/types-0.1.4.tgz"; + sha512 = "z/G02d+59gyyUb7KYhKi9jOhicek6QD2oMaotUyG+lUkybpXoV49dY9bj7Ah5Q+y7knK2jU67UTX9FyfGzaxQg=="; + }; + }; + "@swc/wasm-1.3.85" = { name = "_at_swc_slash_wasm"; packageName = "@swc/wasm"; - version = "1.3.78"; + version = "1.3.85"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.78.tgz"; - sha512 = "MaJEpjm69eLX+XDT3jmkPtAEjN2MVHmTFSYUwtqKdO2lTAVYZcv2u/2oyAtsgOqTseklJrlgxQHWFJjaN44F1g=="; + url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.3.85.tgz"; + sha512 = "lO2QTgKsq/CQSs0fbojiFFmbMo5Nv1cnDdbyLUpl7q+XXkFA/uBh5zF8Bgv5kqJo2Yoo+ydCbTq7GQLrmcjyMQ=="; }; }; "@techteamer/ocsp-1.0.0" = { @@ -2011,13 +1633,13 @@ let sha512 = "d/keJiNKfpHo+GmSB8QcsAwBx8h+V1UbdozA5TD+eSLXprNY53JAYub47J9evsSKWDdNG5uVj0FiMozLKuzowQ=="; }; }; - "@tediousjs/connection-string-0.4.4" = { + "@tediousjs/connection-string-0.5.0" = { name = "_at_tediousjs_slash_connection-string"; packageName = "@tediousjs/connection-string"; - version = "0.4.4"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.4.4.tgz"; - sha512 = "Qssn7gmOILmqD0zkfA09YyFd52UajWYkLTTSi4Dx/XZaUuVcx4W4guv2rAVc5mm8wYRdonmG/HfFH3PS6izXAg=="; + url = "https://registry.npmjs.org/@tediousjs/connection-string/-/connection-string-0.5.0.tgz"; + sha512 = "7qSgZbincDDDFyRweCIEvZULFAw5iz/DeunhvuxpL31nfntX3P4Yd4HkHBRg9H8CdqY1e5WFN1PZIz/REL9MVQ=="; }; }; "@tokenizer/token-0.3.0" = { @@ -2101,22 +1723,22 @@ let sha512 = "ubLURWoc4tCw/8Yds0P3CE9cBG5q+aoycwWBiXXx4gp7XPYZy9ch0L9+Pv6osSoSRgvuQNqJdlwEhP5QhKKl6w=="; }; }; - "@types/body-parser-1.19.2" = { + "@types/body-parser-1.19.3" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; - version = "1.19.2"; + version = "1.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"; - sha512 = "ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g=="; + url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.3.tgz"; + sha512 = "oyl4jvAfTGX9Bt6Or4H9ni1Z447/tQuxnZsytsCaExKlmJiU8sFgnIBRzJUpKwB5eWn9HuBYlUlVA74q/yN0eQ=="; }; }; - "@types/connect-3.4.35" = { + "@types/connect-3.4.36" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; - version = "3.4.35"; + version = "3.4.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"; - sha512 = "cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ=="; + url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.36.tgz"; + sha512 = "P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w=="; }; }; "@types/duplexify-3.6.1" = { @@ -2173,58 +1795,49 @@ let sha512 = "Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q=="; }; }; - "@types/express-serve-static-core-4.17.35" = { + "@types/express-serve-static-core-4.17.36" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.35"; + version = "4.17.36"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz"; - sha512 = "wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.36.tgz"; + sha512 = "zbivROJ0ZqLAtMzgzIUC4oNqDG9iF0lSsAqpOD9kbs5xcIM3dTiyuHvBc7R8MtWBp3AAWGaovJa+wzWPjLYW7Q=="; }; }; - "@types/http-errors-2.0.1" = { + "@types/http-errors-2.0.2" = { name = "_at_types_slash_http-errors"; packageName = "@types/http-errors"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.1.tgz"; - sha512 = "/K3ds8TRAfBvi5vfjuz8y6+GiAYBZ0x4tXv1Av6CWBWn0IlADc+ZX9pMq7oU0fNQPnBwIZl3rmeLp6SBApbxSQ=="; + url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.2.tgz"; + sha512 = "lPG6KlZs88gef6aD85z3HNkztpj7w2R7HmR3gygjfXCQmsLloWNARFkMuzKiiY8FGdh1XDpgBdrSf4aKDiA7Kg=="; }; }; - "@types/json-schema-7.0.12" = { + "@types/json-schema-7.0.13" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; - version = "7.0.12"; + version = "7.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz"; - sha512 = "Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA=="; + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz"; + sha512 = "RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ=="; }; }; - "@types/jsonwebtoken-9.0.2" = { + "@types/jsonwebtoken-9.0.3" = { name = "_at_types_slash_jsonwebtoken"; packageName = "@types/jsonwebtoken"; - version = "9.0.2"; + version = "9.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz"; - sha512 = "drE6uz7QBKq1fYqqoFKTDRdFCPHd5TCub75BM+D+cMx7NU9hUz7SESLfC2fSCXVFMO5Yj8sOWHuGqPgjc+fz0Q=="; + url = "https://registry.npmjs.org/@types/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz"; + sha512 = "b0jGiOgHtZ2jqdPgPnP6WLCXZk1T8p06A/vPGzUvxpFGgKMbjXJDjC5m52ErqBnIuWZFgGoIJyRdeG5AyreJjA=="; }; }; - "@types/lodash-4.14.197" = { + "@types/lodash-4.14.198" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.197"; + version = "4.14.198"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.197.tgz"; - sha512 = "BMVOiWs0uNxHVlHBgzTIqJYmj+PgCo4euloGF+5m4okL3rEYzM2EEv78mw8zWSMM57dM7kVIgJ2QDvwHSoCI5g=="; - }; - }; - "@types/lodash-es-4.17.8" = { - name = "_at_types_slash_lodash-es"; - packageName = "@types/lodash-es"; - version = "4.17.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.8.tgz"; - sha512 = "euY3XQcZmIzSy7YH5+Unb3b2X12Wtk54YWINBvvGQ5SmMvwb11JQskGsfkH/5HXK77Kr8GF0wkVDIxzAisWtog=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.198.tgz"; + sha512 = "trNJ/vtMZYMLhfN45uLq4ShQSw0/S7xCTLLVM+WM1rmFpba/VS42jVUgaO3w/NOLiWR/09lnYk0yMaA/atdIsg=="; }; }; "@types/long-4.0.2" = { @@ -2254,22 +1867,22 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-20.5.1" = { + "@types/node-20.6.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "20.5.1"; + version = "20.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-20.5.1.tgz"; - sha512 = "4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg=="; + url = "https://registry.npmjs.org/@types/node/-/node-20.6.2.tgz"; + sha512 = "Y+/1vGBHV/cYk6OI1Na/LHzwnlNCAfU3ZNGrc1LdRe/LAIbdDPTTv/HU3M7yXN448aTVDq3eKRm2cg7iKLb8gw=="; }; }; - "@types/node-fetch-2.6.4" = { + "@types/node-fetch-2.6.5" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; - version = "2.6.4"; + version = "2.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.4.tgz"; - sha512 = "1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg=="; + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.5.tgz"; + sha512 = "OZsUlr2nxvkqUFLSaY2ZbA+P1q22q+KrlxWOn/38RX+u5kTkYL2mTujEpzUhGkS+K/QCYp9oagfXG39XOzyySg=="; }; }; "@types/pumpify-1.4.1" = { @@ -2281,13 +1894,13 @@ let sha512 = "l7u/Dnh1OG9T7VH6TvulR0g8oE8hgIW5409mSUKi8Vxw2+JV18aTa06Sv5bvNjrD0zbsB/cuZ/iTFQgFNfzIuw=="; }; }; - "@types/qs-6.9.7" = { + "@types/qs-6.9.8" = { name = "_at_types_slash_qs"; packageName = "@types/qs"; - version = "6.9.7"; + version = "6.9.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz"; - sha512 = "FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw=="; + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.8.tgz"; + sha512 = "u95svzDlTysU5xecFNTgfFG5RUWu1A9P0VzgpcIiGZA9iraHOdSzcxMxQ55DyeRaGCSxQi7LxXDI4rzq/MYfdg=="; }; }; "@types/range-parser-1.2.4" = { @@ -2299,6 +1912,15 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; + "@types/readable-stream-4.0.2" = { + name = "_at_types_slash_readable-stream"; + packageName = "@types/readable-stream"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.2.tgz"; + sha512 = "hhzOsMEISZ+mX1l+01F0duYt9wHEbCGmjARed0PcQoVS5zAdu7u5YbWYuNGhw09M1MgGr3kfsto+ut/MnAdKqA=="; + }; + }; "@types/send-0.17.1" = { name = "_at_types_slash_send"; packageName = "@types/send"; @@ -2326,13 +1948,13 @@ let sha512 = "TgfOX+mGY/NyNxJLIbDWrO9DjGoVSW9+aB8H2yy1fy32jsvxijhmyJI9fDFgvz3YP4lvJaq9DzdR/M1bOgVc9g=="; }; }; - "@types/triple-beam-1.3.2" = { + "@types/triple-beam-1.3.3" = { name = "_at_types_slash_triple-beam"; packageName = "@types/triple-beam"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.2.tgz"; - sha512 = "txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g=="; + url = "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.3.tgz"; + sha512 = "6tOUG+nVHn0cJbVp25JFayS5UE6+xlbcNF9Lo9mU7U0zk3zeUShZied4YEQZjy1JBF043FSkdXw8YkUJuVtB5g=="; }; }; "@types/tunnel-0.0.3" = { @@ -2353,13 +1975,13 @@ let sha512 = "c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw=="; }; }; - "@types/uuid-9.0.2" = { + "@types/uuid-9.0.4" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; - version = "9.0.2"; + version = "9.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.2.tgz"; - sha512 = "kNnC1GFBLuhImSnV7w4njQkUiJi0ZXUycu1rUaouPqiKlXkh77JKgdRnTAp1x5eBwcIwbtI+3otwzuIDEuDoxQ=="; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.4.tgz"; + sha512 = "zAuJWQflfx6dYJM62vna+Sn5aeSWhh3OB+wfUEACNcqUSc0AGc5JKl+ycL1vrH7frGTXhJchYjE1Hak8L819dA=="; }; }; "@types/validator-13.11.1" = { @@ -2371,24 +1993,6 @@ let sha512 = "d/MUkJYdOeKycmm75Arql4M5+UuXmf4cHdHKsyw1GcvnNgL6s77UkgSgJ8TE/rI5PYsnwYq5jkcWBLuN/MpQ1A=="; }; }; - "@types/web-bluetooth-0.0.16" = { - name = "_at_types_slash_web-bluetooth"; - packageName = "@types/web-bluetooth"; - version = "0.0.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz"; - sha512 = "oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ=="; - }; - }; - "@types/web-bluetooth-0.0.17" = { - name = "_at_types_slash_web-bluetooth"; - packageName = "@types/web-bluetooth"; - version = "0.0.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.17.tgz"; - sha512 = "4p9vcSmxAayx72yn70joFoL44c9MO/0+iVEBIQXe3v2h2SiAsEIo/G5v6ObFWvNKRFjbrVadNf9LqEEZeQPzdA=="; - }; - }; "@types/webidl-conversions-7.0.0" = { name = "_at_types_slash_webidl-conversions"; packageName = "@types/webidl-conversions"; @@ -2416,186 +2020,6 @@ let sha512 = "lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg=="; }; }; - "@vue/compiler-core-3.3.4" = { - name = "_at_vue_slash_compiler-core"; - packageName = "@vue/compiler-core"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz"; - sha512 = "cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g=="; - }; - }; - "@vue/compiler-dom-3.3.4" = { - name = "_at_vue_slash_compiler-dom"; - packageName = "@vue/compiler-dom"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz"; - sha512 = "wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w=="; - }; - }; - "@vue/compiler-sfc-2.7.14" = { - name = "_at_vue_slash_compiler-sfc"; - packageName = "@vue/compiler-sfc"; - version = "2.7.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz"; - sha512 = "aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA=="; - }; - }; - "@vue/compiler-sfc-3.3.4" = { - name = "_at_vue_slash_compiler-sfc"; - packageName = "@vue/compiler-sfc"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz"; - sha512 = "6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ=="; - }; - }; - "@vue/compiler-ssr-3.3.4" = { - name = "_at_vue_slash_compiler-ssr"; - packageName = "@vue/compiler-ssr"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz"; - sha512 = "m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ=="; - }; - }; - "@vue/composition-api-1.7.2" = { - name = "_at_vue_slash_composition-api"; - packageName = "@vue/composition-api"; - version = "1.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/composition-api/-/composition-api-1.7.2.tgz"; - sha512 = "M8jm9J/laYrYT02665HkZ5l2fWTK4dcVg3BsDHm/pfz+MjDYwX+9FUaZyGwEyXEDonQYRCo0H7aLgdklcIELjw=="; - }; - }; - "@vue/devtools-api-6.5.0" = { - name = "_at_vue_slash_devtools-api"; - packageName = "@vue/devtools-api"; - version = "6.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.0.tgz"; - sha512 = "o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="; - }; - }; - "@vue/reactivity-3.3.4" = { - name = "_at_vue_slash_reactivity"; - packageName = "@vue/reactivity"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.4.tgz"; - sha512 = "kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ=="; - }; - }; - "@vue/reactivity-transform-3.3.4" = { - name = "_at_vue_slash_reactivity-transform"; - packageName = "@vue/reactivity-transform"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz"; - sha512 = "MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw=="; - }; - }; - "@vue/runtime-core-3.3.4" = { - name = "_at_vue_slash_runtime-core"; - packageName = "@vue/runtime-core"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.4.tgz"; - sha512 = "R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA=="; - }; - }; - "@vue/runtime-dom-3.3.4" = { - name = "_at_vue_slash_runtime-dom"; - packageName = "@vue/runtime-dom"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz"; - sha512 = "Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ=="; - }; - }; - "@vue/server-renderer-3.3.4" = { - name = "_at_vue_slash_server-renderer"; - packageName = "@vue/server-renderer"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.4.tgz"; - sha512 = "Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ=="; - }; - }; - "@vue/shared-3.3.4" = { - name = "_at_vue_slash_shared"; - packageName = "@vue/shared"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz"; - sha512 = "7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="; - }; - }; - "@vueuse/components-10.3.0" = { - name = "_at_vueuse_slash_components"; - packageName = "@vueuse/components"; - version = "10.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/components/-/components-10.3.0.tgz"; - sha512 = "EeZz3kjmJI7bH7JSxxMlLyk21LGl6GQjXfpl2n/GiI9QSJi+BVzIra5kEty5eM8McwAanx3e/HnK4drYTgFOWw=="; - }; - }; - "@vueuse/core-10.3.0" = { - name = "_at_vueuse_slash_core"; - packageName = "@vueuse/core"; - version = "10.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/core/-/core-10.3.0.tgz"; - sha512 = "BEM5yxcFKb5btFjTSAFjTu5jmwoW66fyV9uJIP4wUXXU8aR5Hl44gndaaXp7dC5HSObmgbnR2RN+Un1p68Mf5Q=="; - }; - }; - "@vueuse/core-9.13.0" = { - name = "_at_vueuse_slash_core"; - packageName = "@vueuse/core"; - version = "9.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/core/-/core-9.13.0.tgz"; - sha512 = "pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw=="; - }; - }; - "@vueuse/metadata-10.3.0" = { - name = "_at_vueuse_slash_metadata"; - packageName = "@vueuse/metadata"; - version = "10.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.3.0.tgz"; - sha512 = "Ema3YhNOa4swDsV0V7CEY5JXvK19JI/o1szFO1iWxdFg3vhdFtCtSTP26PCvbUpnUtNHBY2wx5y3WDXND5Pvnw=="; - }; - }; - "@vueuse/metadata-9.13.0" = { - name = "_at_vueuse_slash_metadata"; - packageName = "@vueuse/metadata"; - version = "9.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/metadata/-/metadata-9.13.0.tgz"; - sha512 = "gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ=="; - }; - }; - "@vueuse/shared-10.3.0" = { - name = "_at_vueuse_slash_shared"; - packageName = "@vueuse/shared"; - version = "10.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/shared/-/shared-10.3.0.tgz"; - sha512 = "kGqCTEuFPMK4+fNWy6dUOiYmxGcUbtznMwBZLC1PubidF4VZY05B+Oht7Jh7/6x4VOWGpvu3R37WHi81cKpiqg=="; - }; - }; - "@vueuse/shared-9.13.0" = { - name = "_at_vueuse_slash_shared"; - packageName = "@vueuse/shared"; - version = "9.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@vueuse/shared/-/shared-9.13.0.tgz"; - sha512 = "UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw=="; - }; - }; "@webassemblyjs/ast-1.11.6" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -3064,22 +2488,22 @@ let sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; - "array.prototype.reduce-1.0.5" = { + "array.prototype.reduce-1.0.6" = { name = "array.prototype.reduce"; packageName = "array.prototype.reduce"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz"; - sha512 = "kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q=="; + url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz"; + sha512 = "UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg=="; }; }; - "arraybuffer.prototype.slice-1.0.1" = { + "arraybuffer.prototype.slice-1.0.2" = { name = "arraybuffer.prototype.slice"; packageName = "arraybuffer.prototype.slice"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz"; - sha512 = "09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw=="; + url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz"; + sha512 = "yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw=="; }; }; "arrify-2.0.1" = { @@ -3199,15 +2623,6 @@ let sha512 = "wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw=="; }; }; - "async-validator-4.2.5" = { - name = "async-validator"; - packageName = "async-validator"; - version = "4.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz"; - sha512 = "7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg=="; - }; - }; "asynckit-0.4.0" = { name = "asynckit"; packageName = "asynckit"; @@ -3262,13 +2677,13 @@ let sha512 = "H5Vrb/GMzq72+Of2zrW69i/BTQ4gQd3MQvdZ3X3okfppzHdEjSPkdJN6ia8V2/1J1FmFvEtoxaY4nwraHUGQvg=="; }; }; - "aws-sdk-2.1440.0" = { + "aws-sdk-2.1459.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1440.0"; + version = "2.1459.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1440.0.tgz"; - sha512 = "ijHaRFZIKLYUDqOGTNrwncXF5vzJPU6VJpbRr7eNBAvo+nFtEHY4BZkldWYuhELCbWz0U5/+qMtF2T/JgPjfWQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1459.0.tgz"; + sha512 = "My45PgQYhRTh6fOeZ94ELUoXzza/6gTy0J22aK4iy0DEA+uE5gjr1VthnIwbLYNMeEqn8xwJZuNJqvi/WaUUcQ=="; }; }; "aws4-1.12.0" = { @@ -3307,13 +2722,22 @@ let sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; - "axios-retry-3.6.0" = { + "axios-1.5.0" = { + name = "axios"; + packageName = "axios"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz"; + sha512 = "D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ=="; + }; + }; + "axios-retry-3.7.0" = { name = "axios-retry"; packageName = "axios-retry"; - version = "3.6.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.6.0.tgz"; - sha512 = "jtH4qWTKZ2a17dH6tjq52Y1ssNV0lKge6/Z9Lw67s9Wt01nGTg4hg7/LJBGYfDci44NTANJQlCPHPOT/TSFm9w=="; + url = "https://registry.npmjs.org/axios-retry/-/axios-retry-3.7.0.tgz"; + sha512 = "ZTnCkJbRtfScvwiRnoVskFAfvU0UG3xNcsjwTR0mawSbIJoothxn67gKsMaNAFHRXJ1RmuLhmZBzvyXi3+9WyQ=="; }; }; "balanced-match-1.0.2" = { @@ -3370,13 +2794,13 @@ let sha512 = "V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="; }; }; - "better-sqlite3-8.5.1" = { + "better-sqlite3-8.6.0" = { name = "better-sqlite3"; packageName = "better-sqlite3"; - version = "8.5.1"; + version = "8.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.5.1.tgz"; - sha512 = "aDfC67xfll6bugnOqRJhdUWioQZnkhLkrwZ+oo6yZbNMtyktbwkDO4SfBcCVWbm4BlsCjCNTJchlHaBt+vB4Iw=="; + url = "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.6.0.tgz"; + sha512 = "jwAudeiTMTSyby+/SfbHDebShbmC2MCH8mU2+DXi0WJfv13ypEJm47cd3kljmy/H130CazEvkf2Li//ewcMJ1g=="; }; }; "big-integer-1.6.51" = { @@ -3415,13 +2839,13 @@ let sha512 = "uw4ra6Cv483Op/ebM0GBKKfxZlSmn6NgFRby5L3yGTlunLj53KQgndDlqy2WVFOwgvurocApYkSud0aO+mvrpQ=="; }; }; - "bignumber.js-9.1.1" = { + "bignumber.js-9.1.2" = { name = "bignumber.js"; packageName = "bignumber.js"; - version = "9.1.1"; + version = "9.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.1.tgz"; - sha512 = "pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig=="; + url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz"; + sha512 = "2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug=="; }; }; "binary-extensions-2.2.0" = { @@ -3586,13 +3010,13 @@ let sha512 = "Ry9wCtIZ5kGqkJoi6aD8KjxFZEx78guTQDnpXWiNthsxzrxAK/i8E6pCHAIZTbaEFWcOCvbecMukfK7XUvyLpQ=="; }; }; - "bson-5.4.0" = { + "bson-5.5.0" = { name = "bson"; packageName = "bson"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-5.4.0.tgz"; - sha512 = "WRZ5SQI5GfUuKnPTNmAYPiKIof3ORXAF4IRU5UcgmivNIon01rWQlw5RUH954dpu8yGL8T59YShVddIPaU/gFA=="; + url = "https://registry.npmjs.org/bson/-/bson-5.5.0.tgz"; + sha512 = "B+QB4YmDx9RStKv8LLSl/aVIEV3nYJc3cJNNTK2Cd1TL+7P+cNpw9mAPeCgc5K+j01Dv6sxUzcITXDx7ZU3F0w=="; }; }; "buffer-4.9.2" = { @@ -3784,13 +3208,13 @@ let sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; - "caniuse-lite-1.0.30001522" = { + "caniuse-lite-1.0.30001534" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001522"; + version = "1.0.30001534"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001522.tgz"; - sha512 = "TKiyTVZxJGhsTszLuzb+6vUZSjVOAhClszBr2Ta2k9IwtNBT/4dzmL6aywt0HCgEZlmwJzXJd8yNiob6HgwTRg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001534.tgz"; + sha512 = "vlPVrhsCS7XaSh2VvWluIQEzVhefrUQcEsQWSS5A5V+dM07uv1qHeQzAOTGIMy9i3e9bH15+muvI/UHojVgS/Q=="; }; }; "capital-case-1.0.4" = { @@ -4018,24 +3442,6 @@ let sha512 = "RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA=="; }; }; - "codemirror-lang-html-n8n-1.0.0" = { - name = "codemirror-lang-html-n8n"; - packageName = "codemirror-lang-html-n8n"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/codemirror-lang-html-n8n/-/codemirror-lang-html-n8n-1.0.0.tgz"; - sha512 = "ofNP6VTDGJ5rue+kTCZlDZdF1PnE0sl2cAkfrsCAd5MlBgDmqTwuFJIkTI6KXOJXs0ucdTYH6QLhy9BSW7EaOQ=="; - }; - }; - "codemirror-lang-n8n-expression-0.2.0" = { - name = "codemirror-lang-n8n-expression"; - packageName = "codemirror-lang-n8n-expression"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/codemirror-lang-n8n-expression/-/codemirror-lang-n8n-expression-0.2.0.tgz"; - sha512 = "kdlpzevdCpWcpbNcwES9YZy+rDFwWOdO6Z78SWxT6jMhCPmdHQmO+gJ39aXAXlUI7OGLfOBtg1/ONxPjRpEIYQ=="; - }; - }; "color-3.2.1" = { name = "color"; packageName = "color"; @@ -4342,22 +3748,13 @@ let sha512 = "3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w=="; }; }; - "copy-to-clipboard-3.3.3" = { - name = "copy-to-clipboard"; - packageName = "copy-to-clipboard"; - version = "3.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz"; - sha512 = "2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA=="; - }; - }; - "core-js-3.32.1" = { + "core-js-3.32.2" = { name = "core-js"; packageName = "core-js"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.32.1.tgz"; - sha512 = "lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.32.2.tgz"; + sha512 = "pxXSw1mYZPDGvTQqEc5vgIb83jGQKFGYWY76z4a7weZXUolw3G+OvpZqSRcfYOoOVUQJYEPsWeQK8pKEnUtWxQ=="; }; }; "core-util-is-1.0.3" = { @@ -4378,15 +3775,6 @@ let sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; }; }; - "crelt-1.0.6" = { - name = "crelt"; - packageName = "crelt"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz"; - sha512 = "VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g=="; - }; - }; "cron-1.7.2" = { name = "cron"; packageName = "cron"; @@ -4486,22 +3874,13 @@ let sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="; }; }; - "cssfilter-0.0.10" = { - name = "cssfilter"; - packageName = "cssfilter"; - version = "0.0.10"; + "csv-parse-5.5.0" = { + name = "csv-parse"; + packageName = "csv-parse"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz"; - sha512 = "FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw=="; - }; - }; - "csstype-3.1.2" = { - name = "csstype"; - packageName = "csstype"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz"; - sha512 = "I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.5.0.tgz"; + sha512 = "RxruSK3M4XgzcD7Trm2wEN+SJ26ChIb903+IWxNOcB5q4jT2Cs+hFr6QP39J05EohshRFEvyzEBoZ/466S2sbw=="; }; }; "curlconverter-3.21.0" = { @@ -4558,24 +3937,6 @@ let sha512 = "fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw=="; }; }; - "dateformat-3.0.3" = { - name = "dateformat"; - packageName = "dateformat"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz"; - sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; - }; - }; - "dayjs-1.11.9" = { - name = "dayjs"; - packageName = "dayjs"; - version = "1.11.9"; - src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz"; - sha512 = "QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA=="; - }; - }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -4693,6 +4054,15 @@ let sha512 = "bDF7bg6OSNcSwFWPu4zYKpVkJZQYVrAANMYB8bc9Szem1D0yKdm4sa/rOCs2aC9+2GMqQ7KnwtZRvDhmLF0dXw=="; }; }; + "define-data-property-1.1.0" = { + name = "define-data-property"; + packageName = "define-data-property"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz"; + sha512 = "UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g=="; + }; + }; "define-lazy-prop-2.0.0" = { name = "define-lazy-prop"; packageName = "define-lazy-prop"; @@ -4702,13 +4072,13 @@ let sha512 = "Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="; }; }; - "define-properties-1.2.0" = { + "define-properties-1.2.1" = { name = "define-properties"; packageName = "define-properties"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz"; - sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="; + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz"; + sha512 = "8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg=="; }; }; "degenerator-3.0.4" = { @@ -4990,22 +4360,13 @@ let sha512 = "rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ=="; }; }; - "electron-to-chromium-1.4.496" = { + "electron-to-chromium-1.4.523" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.496"; + version = "1.4.523"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.496.tgz"; - sha512 = "qeXC3Zbykq44RCrBa4kr8v/dWzYJA8rAwpyh9Qd+NKWoJfjG5vvJqy9XOJ9H4P/lqulZBCgUWAYi+FeK5AuJ8g=="; - }; - }; - "element-plus-2.3.9" = { - name = "element-plus"; - packageName = "element-plus"; - version = "2.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/element-plus/-/element-plus-2.3.9.tgz"; - sha512 = "TIOLnPl4cnoCPXqK3QYh+jpkthUBQnAM21O7o3Lhbse8v9pfrRXRTaBJtoEKnYNa8GZ4lZptUfH0PeZgDCNLUg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.523.tgz"; + sha512 = "9AreocSUWnzNtvLcbpng6N+GkXnCcBR80IQkxRC9Dfdyg4gaWNUPBujAHUpKkiUkoSoR9UlhA4zD/IgBklmhzg=="; }; }; "emoji-regex-8.0.0" = { @@ -5098,13 +4459,13 @@ let sha512 = "GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA=="; }; }; - "entities-2.1.0" = { + "entities-2.2.0" = { name = "entities"; packageName = "entities"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"; - sha512 = "hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="; + url = "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"; + sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; "entities-4.5.0" = { @@ -5134,22 +4495,22 @@ let sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; }; }; - "es-abstract-1.22.1" = { + "es-abstract-1.22.2" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.22.1"; + version = "1.22.2"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz"; - sha512 = "ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz"; + sha512 = "YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA=="; }; }; - "es-aggregate-error-1.0.9" = { + "es-aggregate-error-1.0.11" = { name = "es-aggregate-error"; packageName = "es-aggregate-error"; - version = "1.0.9"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/es-aggregate-error/-/es-aggregate-error-1.0.9.tgz"; - sha512 = "fvnX40sb538wdU6r4s35cq4EY6Lr09Upj40BEVem4LEsuW8XgQep9yD5Q1U2KftokNp1rWODFJ2qwZSsAjFpbg=="; + url = "https://registry.npmjs.org/es-aggregate-error/-/es-aggregate-error-1.0.11.tgz"; + sha512 = "DCiZiNlMlbvofET/cE55My387NiLvuGToBEZDdK9U2G3svDCjL8WOgO5Il6lO83nQ8qmag/R9nArdpaFQ/m3lA=="; }; }; "es-array-method-boxes-properly-1.0.0" = { @@ -5170,13 +4531,13 @@ let sha512 = "sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw=="; }; }; - "es-module-lexer-1.3.0" = { + "es-module-lexer-1.3.1" = { name = "es-module-lexer"; packageName = "es-module-lexer"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz"; - sha512 = "vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA=="; + url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz"; + sha512 = "JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q=="; }; }; "es-set-tostringtag-2.0.1" = { @@ -5260,15 +4621,6 @@ let sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; }; }; - "esprima-1.2.2" = { - name = "esprima"; - packageName = "esprima"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz"; - sha512 = "+JpPZam9w5DuJ3Q67SqsMGtiHKENSMRVoxvArfJZK01/BfLEObtZ6orJa/MtoGNR/rfMgp5837T41PAmTwAv/A=="; - }; - }; "esprima-4.0.1" = { name = "esprima"; packageName = "esprima"; @@ -5314,15 +4666,6 @@ let sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; }; - "estree-walker-2.0.2" = { - name = "estree-walker"; - packageName = "estree-walker"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"; - sha512 = "Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="; - }; - }; "esutils-2.0.3" = { name = "esutils"; packageName = "esutils"; @@ -5575,15 +4918,6 @@ let sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; }; }; - "file-saver-2.0.5" = { - name = "file-saver"; - packageName = "file-saver"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz"; - sha512 = "P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="; - }; - }; "file-type-16.5.4" = { name = "file-type"; packageName = "file-type"; @@ -5656,13 +4990,13 @@ let sha512 = "VvKbnaxrC0polTFDC+teKPTdl2mn6B/KUW+WB3C9RzKDeNwbzfLdnUz3FxC+tnjvus6bI0jWrWicQyVIPdS37A=="; }; }; - "flatted-3.2.7" = { + "flatted-3.2.9" = { name = "flatted"; packageName = "flatted"; - version = "3.2.7"; + version = "3.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz"; - sha512 = "5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz"; + sha512 = "36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ=="; }; }; "fn.name-1.1.0" = { @@ -5701,15 +5035,6 @@ let sha512 = "TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg=="; }; }; - "form-data-3.0.1" = { - name = "form-data"; - packageName = "form-data"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz"; - sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; - }; - }; "form-data-4.0.0" = { name = "form-data"; packageName = "form-data"; @@ -5719,13 +5044,13 @@ let sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; }; }; - "formidable-3.5.0" = { + "formidable-3.5.1" = { name = "formidable"; packageName = "formidable"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-3.5.0.tgz"; - sha512 = "WwsMWvPmY+Kv37C3+KP3A+2Ym1aZoac4nz4ZEe5z0UPBoCg0O/wHay3eeYkZr4KJIbCzpSUeno+STMhde+KCfw=="; + url = "https://registry.npmjs.org/formidable/-/formidable-3.5.1.tgz"; + sha512 = "WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og=="; }; }; "formstream-1.3.1" = { @@ -5818,13 +5143,13 @@ let sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; }; }; - "function.prototype.name-1.1.5" = { + "function.prototype.name-1.1.6" = { name = "function.prototype.name"; packageName = "function.prototype.name"; - version = "1.1.5"; + version = "1.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"; - sha512 = "uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA=="; + url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz"; + sha512 = "Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg=="; }; }; "functions-have-names-1.2.3" = { @@ -5989,13 +5314,13 @@ let sha512 = "SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw=="; }; }; - "glob-10.3.3" = { + "glob-10.3.4" = { name = "glob"; packageName = "glob"; - version = "10.3.3"; + version = "10.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-10.3.3.tgz"; - sha512 = "92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw=="; + url = "https://registry.npmjs.org/glob/-/glob-10.3.4.tgz"; + sha512 = "6LFElP3A+i/Q8XQKEvZjkEWEOTgAIALR9AO2rwT8bgPhDd1anmqDJDZ6lLddI4ehxxxR1S5RIqKe1uapMQfYaQ=="; }; }; "glob-7.2.3" = { @@ -6403,15 +5728,6 @@ let sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; }; - "humanize-duration-3.29.0" = { - name = "humanize-duration"; - packageName = "humanize-duration"; - version = "3.29.0"; - src = fetchurl { - url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.29.0.tgz"; - sha512 = "G5wZGwYTLaQAmYqhfK91aw3xt6wNbJW1RnWDh4qP1PvF4T/jnkjx2RVhG5kzB2PGsYGTn+oSDBQp+dMdILLxcg=="; - }; - }; "humanize-ms-1.2.1" = { name = "humanize-ms"; packageName = "humanize-ms"; @@ -6547,6 +5863,15 @@ let sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A=="; }; }; + "infisical-node-1.4.3" = { + name = "infisical-node"; + packageName = "infisical-node"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/infisical-node/-/infisical-node-1.4.3.tgz"; + sha512 = "z/gYkctAB6yQoH/9um9znvljsF6WVhsrMw9urZ80O5E1M+/RwZW40mc6LHs2nQpZD90at6SbuzVWQoEwSdEmTw=="; + }; + }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -6853,15 +6178,6 @@ let sha512 = "k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ=="; }; }; - "is-plain-object-5.0.0" = { - name = "is-plain-object"; - packageName = "is-plain-object"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"; - sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; - }; - }; "is-promise-1.0.1" = { name = "is-promise"; packageName = "is-promise"; @@ -7060,13 +6376,13 @@ let sha512 = "BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w=="; }; }; - "jackspeak-2.3.0" = { + "jackspeak-2.3.3" = { name = "jackspeak"; packageName = "jackspeak"; - version = "2.3.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.0.tgz"; - sha512 = "uKmsITSsF4rUWQHzqaRUuyAir3fZfW3f202Ee34lz/gZCi970CPZwyQXLGNgWJvvZbvFyzeyGq0+4fcG/mBKZg=="; + url = "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.3.tgz"; + sha512 = "R2bUw+kVZFS/h1AZqBKrSgDmdmjApzgY0AlCPumopFiAlbUxE2gf+SCuBzQ0cP5hHmUmFYF5yw55T97Th5Kstg=="; }; }; "jake-10.8.7" = { @@ -7105,13 +6421,13 @@ let sha512 = "bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="; }; }; - "jose-4.14.4" = { + "jose-4.14.6" = { name = "jose"; packageName = "jose"; - version = "4.14.4"; + version = "4.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/jose/-/jose-4.14.4.tgz"; - sha512 = "j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g=="; + url = "https://registry.npmjs.org/jose/-/jose-4.14.6.tgz"; + sha512 = "EqJPEUlZD0/CSUMubKtMaYUOtWe91tZXTWMJZoKSbLk+KtdhNdcvppH8lA9XwVu2V4Ailvsj0GBZJ2ZwDjfesQ=="; }; }; "js-base64-3.7.5" = { @@ -7267,15 +6583,6 @@ let sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; }; }; - "jsonpath-1.1.1" = { - name = "jsonpath"; - packageName = "jsonpath"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonpath/-/jsonpath-1.1.1.tgz"; - sha512 = "l6Cg7jRpixfbgoWgkrl77dgEj8RPvND0wMH6TwQmi9Qs4TFfS9u5cUFnbeKTwj5ga5Y3BTGGNI28k117LJ009w=="; - }; - }; "jsonschema-1.4.1" = { name = "jsonschema"; packageName = "jsonschema"; @@ -7285,13 +6592,13 @@ let sha512 = "S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ=="; }; }; - "jsonwebtoken-9.0.1" = { + "jsonwebtoken-9.0.2" = { name = "jsonwebtoken"; packageName = "jsonwebtoken"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.1.tgz"; - sha512 = "K8wx7eJ5TPvEjuiVSkv167EVboBDv9PZdDoF7BgeQnBLVvZWW9clr2PsQHVJDTKaEIH5JBIwHujGcHp7GgI2eg=="; + url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz"; + sha512 = "PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ=="; }; }; "jssha-3.3.1" = { @@ -7357,13 +6664,13 @@ let sha512 = "+Rcfu2hyQ/jv5skqRY8xA7Ra+mmRkDAzCaLDYbkGtgsNKpzxPWiLbk8ub0dgr4EbWrN1Zb4BCXHUkD6+zYfdWg=="; }; }; - "kerberos-2.0.1" = { + "kerberos-2.0.3" = { name = "kerberos"; packageName = "kerberos"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/kerberos/-/kerberos-2.0.1.tgz"; - sha512 = "O/jIgbdGK566eUhFwIcgalbqirYU/r76MW7/UFw06Fd9x5bSwgyZWL/Vm26aAmezQww/G9KYkmmJBkEkPk5HLw=="; + url = "https://registry.npmjs.org/kerberos/-/kerberos-2.0.3.tgz"; + sha512 = "p2EgcmKCdFyGbvReS3+YZMDss7e4xYE4H6KYKzk0Vd9zj0nUt02I9DpD/+cMBsOcPHoqlHr1tm6RWY/SHCQVtw=="; }; }; "kuler-2.0.0" = { @@ -7438,13 +6745,13 @@ let sha512 = "A0z9O4+5q+ZTj7QwNe/Juy1KARNb4WaviO4mYeFC4b8dBT2EEqK2pkM+GC8MVnkOjqhl5nYQxRgnPYRRTNmuSQ=="; }; }; - "libphonenumber-js-1.10.41" = { + "libphonenumber-js-1.10.44" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.41"; + version = "1.10.44"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.41.tgz"; - sha512 = "4rmmF4u4vD3eGNuuCGjCPwRwO+fIuu1WWcS7VwbPTiMFkJd8F02v8o5pY5tlYuMR+xOvJ88mtOHpkm0Tnu2LcQ=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.44.tgz"; + sha512 = "svlRdNBI5WgBjRC20GrCfbFiclbF0Cx+sCcQob/C1r57nsoq0xg8r65QbTyVyweQIlB33P+Uahyho6EMYgcOyQ=="; }; }; "libpq-1.8.12" = { @@ -7483,15 +6790,6 @@ let sha512 = "FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA=="; }; }; - "linkify-it-3.0.3" = { - name = "linkify-it"; - packageName = "linkify-it"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz"; - sha512 = "ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ=="; - }; - }; "linkify-it-4.0.1" = { name = "linkify-it"; packageName = "linkify-it"; @@ -7555,15 +6853,6 @@ let sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; }; }; - "lodash-unified-1.0.3" = { - name = "lodash-unified"; - packageName = "lodash-unified"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash-unified/-/lodash-unified-1.0.3.tgz"; - sha512 = "WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ=="; - }; - }; "lodash.camelcase-4.3.0" = { name = "lodash.camelcase"; packageName = "lodash.camelcase"; @@ -7609,6 +6898,15 @@ let sha512 = "z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="; }; }; + "lodash.includes-4.3.0" = { + name = "lodash.includes"; + packageName = "lodash.includes"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz"; + sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="; + }; + }; "lodash.isarguments-3.1.0" = { name = "lodash.isarguments"; packageName = "lodash.isarguments"; @@ -7618,6 +6916,42 @@ let sha512 = "chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg=="; }; }; + "lodash.isboolean-3.0.3" = { + name = "lodash.isboolean"; + packageName = "lodash.isboolean"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz"; + sha512 = "Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg=="; + }; + }; + "lodash.isinteger-4.0.4" = { + name = "lodash.isinteger"; + packageName = "lodash.isinteger"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz"; + sha512 = "DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA=="; + }; + }; + "lodash.isnumber-3.0.3" = { + name = "lodash.isnumber"; + packageName = "lodash.isnumber"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz"; + sha512 = "QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw=="; + }; + }; + "lodash.isplainobject-4.0.6" = { + name = "lodash.isplainobject"; + packageName = "lodash.isplainobject"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha512 = "oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="; + }; + }; "lodash.isstring-4.0.1" = { name = "lodash.isstring"; packageName = "lodash.isstring"; @@ -7627,13 +6961,13 @@ let sha512 = "0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="; }; }; - "lodash.orderby-4.6.0" = { - name = "lodash.orderby"; - packageName = "lodash.orderby"; - version = "4.6.0"; + "lodash.once-4.1.1" = { + name = "lodash.once"; + packageName = "lodash.once"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.orderby/-/lodash.orderby-4.6.0.tgz"; - sha512 = "T0rZxKmghOOf5YPnn8EY5iLYeWCpZq8G41FfqoVHH5QDTAFaghJRmAdLiadEDq+ztgM2q5PjA+Z1fOwGrLgmtg=="; + url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; + sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; }; }; "lodash.snakecase-4.1.1" = { @@ -7645,15 +6979,6 @@ let sha512 = "QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw=="; }; }; - "lodash.throttle-4.1.1" = { - name = "lodash.throttle"; - packageName = "lodash.throttle"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"; - sha512 = "wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="; - }; - }; "lodash.uniq-4.5.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; @@ -7798,22 +7123,13 @@ let sha512 = "Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ=="; }; }; - "luxon-3.4.0" = { + "luxon-3.4.3" = { name = "luxon"; packageName = "luxon"; - version = "3.4.0"; + version = "3.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-3.4.0.tgz"; - sha512 = "7eDo4Pt7aGhoCheGFIuq4Xa2fJm4ZpmldpGhjTYBNUYNCN6TIEP6v7chwwwt3KRp7YR+rghbfvjyo3V5y9hgBw=="; - }; - }; - "magic-string-0.30.3" = { - name = "magic-string"; - packageName = "magic-string"; - version = "0.30.3"; - src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.30.3.tgz"; - sha512 = "B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw=="; + url = "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz"; + sha512 = "tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg=="; }; }; "mailparser-3.6.5" = { @@ -7861,58 +7177,13 @@ let sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="; }; }; - "mappersmith-2.41.0" = { + "mappersmith-2.42.0" = { name = "mappersmith"; packageName = "mappersmith"; - version = "2.41.0"; + version = "2.42.0"; src = fetchurl { - url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.41.0.tgz"; - sha512 = "kg2PXCFiM0WBMKZSgkvVBhF6SV7vdDEUsql5+DGdEHYZx9cwK+2QCSnsZ2EI4oyIWHMdIN/l+4yiyXJTsH7PcQ=="; - }; - }; - "markdown-it-12.3.2" = { - name = "markdown-it"; - packageName = "markdown-it"; - version = "12.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz"; - sha512 = "TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg=="; - }; - }; - "markdown-it-13.0.1" = { - name = "markdown-it"; - packageName = "markdown-it"; - version = "13.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz"; - sha512 = "lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q=="; - }; - }; - "markdown-it-emoji-2.0.2" = { - name = "markdown-it-emoji"; - packageName = "markdown-it-emoji"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-2.0.2.tgz"; - sha512 = "zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ=="; - }; - }; - "markdown-it-link-attributes-4.0.1" = { - name = "markdown-it-link-attributes"; - packageName = "markdown-it-link-attributes"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-link-attributes/-/markdown-it-link-attributes-4.0.1.tgz"; - sha512 = "pg5OK0jPLg62H4k7M9mRJLT61gUp9nvG0XveKYHMOOluASo9OEF13WlXrpAp2aj35LbedAy3QOCgQCw0tkLKAQ=="; - }; - }; - "markdown-it-task-lists-2.1.1" = { - name = "markdown-it-task-lists"; - packageName = "markdown-it-task-lists"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-task-lists/-/markdown-it-task-lists-2.1.1.tgz"; - sha512 = "TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA=="; + url = "https://registry.npmjs.org/mappersmith/-/mappersmith-2.42.0.tgz"; + sha512 = "1QCZ1FKu+3GqgPkCotTkhnDEyFCU+ZPJnIx7X20L9d2JL6OfBDL9VVc5kyGGlroxZZ6IwYZrmSke+14HpSVC1g=="; }; }; "md5-2.3.0" = { @@ -7924,15 +7195,6 @@ let sha512 = "T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g=="; }; }; - "mdurl-1.0.1" = { - name = "mdurl"; - packageName = "mdurl"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"; - sha512 = "/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="; - }; - }; "media-typer-0.3.0" = { name = "media-typer"; packageName = "media-typer"; @@ -7951,15 +7213,6 @@ let sha512 = "aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="; }; }; - "memoize-one-6.0.0" = { - name = "memoize-one"; - packageName = "memoize-one"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz"; - sha512 = "rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="; - }; - }; "merge-descriptors-1.0.1" = { name = "merge-descriptors"; packageName = "merge-descriptors"; @@ -8257,22 +7510,22 @@ let sha512 = "72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ=="; }; }; - "mongodb-4.17.0" = { + "mongodb-4.17.1" = { name = "mongodb"; packageName = "mongodb"; - version = "4.17.0"; + version = "4.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.17.0.tgz"; - sha512 = "LZGMIPjPfWEfhPJATk1s9IvVTD18tyfKdT/0blCMih5vGagk2SwA9wFAUPMdtJpTrhXmyfGgwAaMkvneX2bn2A=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.17.1.tgz"; + sha512 = "MBuyYiPUPRTqfH2dV0ya4dcr2E5N52ocBuZ8Sgg/M030nGF78v855B3Z27mZJnp8PxjnUquEnAtjOsphgMZOlQ=="; }; }; - "mongodb-5.7.0" = { + "mongodb-5.9.0" = { name = "mongodb"; packageName = "mongodb"; - version = "5.7.0"; + version = "5.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-5.7.0.tgz"; - sha512 = "zm82Bq33QbqtxDf58fLWBwTjARK3NSvKYjyz997KSy6hpat0prjeX/kxjbPVyZY60XYPDNETaHkHJI2UCzSLuw=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-5.9.0.tgz"; + sha512 = "g+GCMHN1CoRUA+wb1Agv0TI4YTSiWr42B5ulkiAfLLHitGK1R+PkSAf3Lr5rPZwi/3F04LiaZEW0Kxro9Fi2TA=="; }; }; "mongodb-client-encryption-2.9.0" = { @@ -8302,13 +7555,13 @@ let sha512 = "ew3qwG/TJRorTz47eW46vZ5oBw5MEYbQZVaEji44j5lAUSQSqIEoul7Kua/BatBW0H0kKQcC9kwUHa1qzaWHSw=="; }; }; - "mqtt-5.0.3" = { + "mqtt-5.0.5" = { name = "mqtt"; packageName = "mqtt"; - version = "5.0.3"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-5.0.3.tgz"; - sha512 = "XyCzdCNFm4XXBUV7HQPd1qXYdu7GC/H+wXr+RfaztwZ72/c3sD8yRivOBdh8iKWHc+EGawSeDIvXCnvEykcJVA=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-5.0.5.tgz"; + sha512 = "Ahbzk7nddvYg0aOezbYl/d9o8wcEbZw1NjiH+CmGObxiHsG4HgL7+IaRkph5yxwH679GVMAwtfsyUY2dFBSVSw=="; }; }; "mqtt-packet-6.10.0" = { @@ -8356,13 +7609,13 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "msgpackr-1.9.7" = { + "msgpackr-1.9.9" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.9.7"; + version = "1.9.9"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.9.7.tgz"; - sha512 = "baUNaLvKQvVhzfWTNO07njwbZK1Lxjtb0P1JL6/EhXdLTHzR57/mZqqJC39TtQKvOmkJA4pcejS4dbk7BDgLLA=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.9.9.tgz"; + sha512 = "sbn6mioS2w0lq1O6PpGtsv6Gy8roWM+o3o4Sqjd6DudrL/nOugY+KyJUimoWzHnf9OkO0T6broHFnYE/R05t9A=="; }; }; "mssql-8.1.4" = { @@ -8374,13 +7627,13 @@ let sha512 = "nqkYYehETWVvFLB9zAGJV2kegOsdtLjUnkHA52aFhlE0ZIoOXC3BL8pLERwFicFypM4i3DX1hYeuM726EEIxjQ=="; }; }; - "mssql-9.1.3" = { + "mssql-9.3.2" = { name = "mssql"; packageName = "mssql"; - version = "9.1.3"; + version = "9.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-9.1.3.tgz"; - sha512 = "oXs2lJ1vKUe2s0twCdcdKnqATTVaIswzpSiGnUjMIhV6Sip9vEDuYt3dCoVWXXNuPJ5iFIqLxvagw4Hrz6xR4A=="; + url = "https://registry.npmjs.org/mssql/-/mssql-9.3.2.tgz"; + sha512 = "XI5GOGCCSSNL8K2SSXg9HMyugJoCjLmrhiZfcZrJrJ2r3NfTcnz3Cegeg4m+xPkNVd0o3owsSL/NsDCFYfjOlw=="; }; }; "multer-1.4.5-lts.1" = { @@ -8419,49 +7672,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-1.3.1" = { + "n8n-core-1.6.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "1.3.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-1.3.1.tgz"; - sha512 = "qAh0cZfwrhY1gy0xH+nzvtK6uNPYdxgQQpHupn8vro8wPVsGYLAhZ8sLh5f7d2HLccL9QrPbvVne4SKLhrfWKQ=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-1.6.0.tgz"; + sha512 = "VQw8RpmOKQ7xFBB61hb/Te0HT0J5nIRV/LYMwN9YrjzGMh6XuRQkn8el0hlgBR97K52Yo1iyMBR9TKHunAH13Q=="; }; }; - "n8n-design-system-1.3.1" = { - name = "n8n-design-system"; - packageName = "n8n-design-system"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-1.3.1.tgz"; - sha512 = "1BLdJ4zAy7MnSVJc0MQKUzjQ7tJi/fOQDYSEjSVsn1If4eEPPmfZE8ed/gvrAH2deHXCNoTh9LLYmtB5jOg0yg=="; - }; - }; - "n8n-editor-ui-1.3.1" = { + "n8n-editor-ui-1.6.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "1.3.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-1.3.1.tgz"; - sha512 = "n7Y9p8G0qtxORLyFOzOMCFeS0SeSmOnlPfpy56Bfh3oyAG16OqQR6TgkWWqfU/YrCQW8qs1QbmL6P4Cxij9OhQ=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-1.6.0.tgz"; + sha512 = "hfVWAfJ3zjhQgSOM89RFgkplW7/9RyClHdYR8PaXgNKm1xV6YkF2ofeF2II+yLxgbxqVjTdpRM7AhohKtEowTw=="; }; }; - "n8n-nodes-base-1.3.1" = { + "n8n-nodes-base-1.6.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "1.3.1"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-1.3.1.tgz"; - sha512 = "L9YBF4qzYNHb+k6o52w/Eo6RpjQZq3IFMbwHs5RyB9MQVj6+50tjQcjJ3DDCN2ewM7xroLLTlxQRa1nm7CEgTA=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-1.6.0.tgz"; + sha512 = "SGWCmh6T8yuQVTEcC2ZaRG1DutYcg8M7EuoloYLftO4IVM/drYsx5fOWHUXPU52C9R6WlQI40K4YMzDNHYCOdg=="; }; }; - "n8n-workflow-1.3.0" = { + "n8n-nodes-base-1.6.1" = { + name = "n8n-nodes-base"; + packageName = "n8n-nodes-base"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-1.6.1.tgz"; + sha512 = "4mZqwJ+uiUmXlnktBhlydkpRTdiuFkDOQElbctPumhNQ4Xfkhzehd3zjr7IjPBA3M+t8EEerVl7SfLUdoPIAMg=="; + }; + }; + "n8n-workflow-1.6.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "1.3.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-1.3.0.tgz"; - sha512 = "CozT9PjzBRYWXJ3MeBT96GUfM0FBmftlndThb7b9ZW54S36FsyfY7O3RYCVEiBYdwBUYP5/eeh61HKX3+QUfyw=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-1.6.0.tgz"; + sha512 = "MkwhM5p0ps3RevX/MWTS1DyFSDZ4p0IJ+gDtU48GZBJGR9nk5HWvmAOFAJJBnyGXCwy+U61d0CQoOZbVKXeGBw=="; }; }; "named-placeholders-1.1.3" = { @@ -8473,13 +7726,13 @@ let sha512 = "eLoBxg6wE/rZkJPhU/xRX1WTpkFEwDJEN96oxFrTsqBdbT5ec295Q+CoHrL9IT0DipqKhmGcaZmwOt8OON5x1w=="; }; }; - "nan-2.17.0" = { + "nan-2.18.0" = { name = "nan"; packageName = "nan"; - version = "2.17.0"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz"; - sha512 = "2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="; + url = "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz"; + sha512 = "W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w=="; }; }; "nanoclone-0.2.1" = { @@ -8590,13 +7843,22 @@ let sha512 = "73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ=="; }; }; - "node-fetch-2.6.13" = { + "node-addon-api-6.1.0" = { + name = "node-addon-api"; + packageName = "node-addon-api"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-6.1.0.tgz"; + sha512 = "+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA=="; + }; + }; + "node-fetch-2.7.0" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.6.13"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.13.tgz"; - sha512 = "StxNAxh15zr77QvvkmveSQ8uCQ4+v5FkvNTj0OESmiHu+VRi/gXArXtkWMElOsOUNLtUEvI4yS+rdtOHZTwlQA=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz"; + sha512 = "c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A=="; }; }; "node-forge-1.3.1" = { @@ -8617,13 +7879,13 @@ let sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; }; }; - "node-gyp-build-4.6.0" = { + "node-gyp-build-4.6.1" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.6.0"; + version = "4.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz"; - sha512 = "NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz"; + sha512 = "24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ=="; }; }; "node-html-markdown-1.3.0" = { @@ -8635,13 +7897,13 @@ let sha512 = "OeFi3QwC/cPjvVKZ114tzzu+YoR+v9UXW5RwSXGUqGb0qCl0DvP406tzdL7SFn8pZrMyzXoisfG2zcuF9+zw4g=="; }; }; - "node-html-parser-6.1.6" = { + "node-html-parser-6.1.10" = { name = "node-html-parser"; packageName = "node-html-parser"; - version = "6.1.6"; + version = "6.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.6.tgz"; - sha512 = "C/MGDQ2NjdjzUq41bW9kW00MPZecAe/oo89vZEFLDfWoQVDk/DdML1yuxVVKLDMFIFax2VTq6Vpfzyn7z5yYgQ=="; + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-6.1.10.tgz"; + sha512 = "6/uWdWxjQWQ7tMcFK2wWlrflsQUzh1HsEzlIf2j5+TtzfhT2yUvg3DwZYAmjEHeR3uX74ko7exjHW69J0tOzIg=="; }; }; "node-machine-id-1.1.12" = { @@ -8698,13 +7960,13 @@ let sha512 = "fy9v3NgTzBngrMFkDsKEj0r02U7jm6XfC3b52eoNV+GCrGj+s8pt5OqhiJdWKuw51zCTdiNR/IUD1z33LIIGpg=="; }; }; - "nodemailer-6.9.4" = { + "nodemailer-6.9.5" = { name = "nodemailer"; packageName = "nodemailer"; - version = "6.9.4"; + version = "6.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.4.tgz"; - sha512 = "CXjQvrQZV4+6X5wP6ZIgdehJamI63MFoYFGGPtHudWym9qaEHDNdPzaj5bfMCvxG1vhAileSWW90q7nL0N36mA=="; + url = "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.5.tgz"; + sha512 = "/dmdWo62XjumuLc5+AYQZeiRj+PRR8y8qKtFCOyuOl1k/hckZd8durUUHs/ucKx6/8kN+wFxqKJlQ/LK/qR5FA=="; }; }; "nopt-5.0.0" = { @@ -8725,24 +7987,6 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; - "normalize-wheel-1.0.1" = { - name = "normalize-wheel"; - packageName = "normalize-wheel"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz"; - sha512 = "1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="; - }; - }; - "normalize-wheel-es-1.2.0" = { - name = "normalize-wheel-es"; - packageName = "normalize-wheel-es"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-wheel-es/-/normalize-wheel-es-1.2.0.tgz"; - sha512 = "Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw=="; - }; - }; "npmlog-5.0.1" = { name = "npmlog"; packageName = "npmlog"; @@ -8869,13 +8113,13 @@ let sha512 = "1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ=="; }; }; - "object.getownpropertydescriptors-2.1.6" = { + "object.getownpropertydescriptors-2.1.7" = { name = "object.getownpropertydescriptors"; packageName = "object.getownpropertydescriptors"; - version = "2.1.6"; + version = "2.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz"; - sha512 = "lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ=="; + url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz"; + sha512 = "PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g=="; }; }; "on-finished-2.4.1" = { @@ -9157,15 +8401,6 @@ let sha512 = "1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q=="; }; }; - "parse-srcset-1.0.2" = { - name = "parse-srcset"; - packageName = "parse-srcset"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"; - sha512 = "/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q=="; - }; - }; "parse5-5.1.1" = { name = "parse5"; packageName = "parse5"; @@ -9526,15 +8761,6 @@ let sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; - "pinia-2.1.6" = { - name = "pinia"; - packageName = "pinia"; - version = "2.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/pinia/-/pinia-2.1.6.tgz"; - sha512 = "bIU6QuE5qZviMmct5XwCesXelb5VavdOWKWaB17ggk++NUwQWWbP5YnsONTk3b752QkW9sACiR81rorpeOMSvQ=="; - }; - }; "pkce-challenge-3.1.0" = { name = "pkce-challenge"; packageName = "pkce-challenge"; @@ -9544,15 +8770,6 @@ let sha512 = "bQ/0XPZZ7eX+cdAkd61uYWpfMhakH3NeteUF1R8GNa+LMqX8QFAkbCLqq+AYAns1/ueACBu/BMWhrlKGrdvGZg=="; }; }; - "postcss-8.4.28" = { - name = "postcss"; - packageName = "postcss"; - version = "8.4.28"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz"; - sha512 = "Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw=="; - }; - }; "postgres-array-1.0.3" = { name = "postgres-array"; packageName = "postgres-array"; @@ -9625,15 +8842,6 @@ let sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; }; }; - "prettier-2.8.8" = { - name = "prettier"; - packageName = "prettier"; - version = "2.8.8"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz"; - sha512 = "tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q=="; - }; - }; "pretty-bytes-5.6.0" = { name = "pretty-bytes"; packageName = "pretty-bytes"; @@ -9715,13 +8923,13 @@ let sha512 = "y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g=="; }; }; - "promise.prototype.finally-3.1.4" = { + "promise.prototype.finally-3.1.7" = { name = "promise.prototype.finally"; packageName = "promise.prototype.finally"; - version = "3.1.4"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.4.tgz"; - sha512 = "nNc3YbgMfLzqtqvO/q5DP6RR0SiHI9pUPGzyDf1q+usTwCN2kjvAnJkBb7bHe3o+fFSBPpsGMoYtaSi+LTNqng=="; + url = "https://registry.npmjs.org/promise.prototype.finally/-/promise.prototype.finally-3.1.7.tgz"; + sha512 = "iL9OcJRUZcCE5xn6IwhZxO+eMM0VEXjkETHy+Nk+d9q3s7kxVtPg+mBlMO+ZGxNKNMODyKmy/bOyt/yhxTnvEw=="; }; }; "property-expr-2.0.5" = { @@ -9760,13 +8968,13 @@ let sha512 = "5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw=="; }; }; - "protobufjs-7.2.4" = { + "protobufjs-7.2.5" = { name = "protobufjs"; packageName = "protobufjs"; - version = "7.2.4"; + version = "7.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.4.tgz"; - sha512 = "AT+RJgD2sH8phPmCf7OUZR8xGdcJRga4+1cOaXJ64hvcSkVhNcRHOwIxUatPH15+nj59WAGTDv3LSGZPEQbJaQ=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz"; + sha512 = "gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A=="; }; }; "proxy-addr-2.0.7" = { @@ -10084,13 +9292,13 @@ let sha512 = "grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw=="; }; }; - "redis-4.6.7" = { + "redis-4.6.8" = { name = "redis"; packageName = "redis"; - version = "4.6.7"; + version = "4.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-4.6.7.tgz"; - sha512 = "KrkuNJNpCwRm5vFJh0tteMxW8SaUzkm5fBH7eL5hd/D0fAkzvapxbfGPP/r+4JAXdQuX7nebsBkBqA2RHB7Usw=="; + url = "https://registry.npmjs.org/redis/-/redis-4.6.8.tgz"; + sha512 = "S7qNkPUYrsofQ0ztWlTHSaK0Qqfl1y+WMIxrzeAGNG+9iUZB4HGeBgkHxE6uJJ6iXrkvLd1RVJ2nvu6H1sAzfQ=="; }; }; "redis-commands-1.7.0" = { @@ -10147,13 +9355,13 @@ let sha512 = "srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="; }; }; - "regexp.prototype.flags-1.5.0" = { + "regexp.prototype.flags-1.5.1" = { name = "regexp.prototype.flags"; packageName = "regexp.prototype.flags"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz"; - sha512 = "0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA=="; + url = "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz"; + sha512 = "sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg=="; }; }; "reinterval-1.1.0" = { @@ -10201,13 +9409,13 @@ let sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; }; - "resolve-1.22.4" = { + "resolve-1.22.6" = { name = "resolve"; packageName = "resolve"; - version = "1.22.4"; + version = "1.22.6"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz"; - sha512 = "PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz"; + sha512 = "njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw=="; }; }; "restore-cursor-3.1.0" = { @@ -10345,13 +9553,13 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "safe-array-concat-1.0.0" = { + "safe-array-concat-1.0.1" = { name = "safe-array-concat"; packageName = "safe-array-concat"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz"; - sha512 = "9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ=="; + url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz"; + sha512 = "6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q=="; }; }; "safe-buffer-5.1.2" = { @@ -10408,15 +9616,6 @@ let sha512 = "g2M1Qq2uL7GHtmBRaTVYcJD0Vb+XOyvXHsPARHCoqQ54Vp7m5h3NMUGzvLEIFGujxaamyM3BhEi9fdVAkJMvHw=="; }; }; - "sanitize-html-2.10.0" = { - name = "sanitize-html"; - packageName = "sanitize-html"; - version = "2.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-2.10.0.tgz"; - sha512 = "JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ=="; - }; - }; "sax-1.2.1" = { name = "sax"; packageName = "sax"; @@ -10570,6 +9769,15 @@ let sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; + "set-function-name-2.0.1" = { + name = "set-function-name"; + packageName = "set-function-name"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz"; + sha512 = "tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA=="; + }; + }; "setprototypeof-1.2.0" = { name = "setprototypeof"; packageName = "setprototypeof"; @@ -10741,13 +9949,13 @@ let sha512 = "iADMq1kY0v3vJmGTuKcFWSXt15qYUz7wFkArOrsSg0IFfI3nJqIJvK2/ZbEIndg7erIJLtAVX2nSOqPz7DcwbA=="; }; }; - "snowflake-sdk-1.7.0" = { + "snowflake-sdk-1.8.0" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.7.0.tgz"; - sha512 = "dSCq4NGBV67Ws9VPEO1md8AZw2mx8czoosBdq8CKdVSwUf9e9wUMpH+VEeIJUKy573M/B4vLU4CUYrhGlSkUHQ=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.8.0.tgz"; + sha512 = "zdU1c+ytIZclF4K6D4XPPHa5II6l6cOQdsLdvKP95IwSdTYJz324ESA7fPcg/rwYV7vUKnIZJ9OCjB1mE7D2IQ=="; }; }; "socks-2.7.1" = { @@ -10786,15 +9994,6 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "source-map-js-1.0.2" = { - name = "source-map-js"; - packageName = "source-map-js"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"; - sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; - }; - }; "source-map-support-0.5.21" = { name = "source-map-support"; packageName = "source-map-support"; @@ -10867,13 +10066,13 @@ let sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; }; - "sprintf-js-1.1.2" = { + "sprintf-js-1.1.3" = { name = "sprintf-js"; packageName = "sprintf-js"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz"; - sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; + url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz"; + sha512 = "Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA=="; }; }; "sql.js-1.8.0" = { @@ -10966,15 +10165,6 @@ let sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="; }; }; - "static-eval-2.0.2" = { - name = "static-eval"; - packageName = "static-eval"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/static-eval/-/static-eval-2.0.2.tgz"; - sha512 = "N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg=="; - }; - }; "statuses-1.5.0" = { name = "statuses"; packageName = "statuses"; @@ -11011,15 +10201,6 @@ let sha512 = "KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw=="; }; }; - "stream-browserify-3.0.0" = { - name = "stream-browserify"; - packageName = "stream-browserify"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz"; - sha512 = "H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA=="; - }; - }; "stream-events-1.0.5" = { name = "stream-events"; packageName = "stream-events"; @@ -11110,31 +10291,31 @@ let sha512 = "VHhsDkuf8gsw4JNRK9cIZjYe6r7PsVUutVohaBhqYAoPaRADoQH+mMgUg7Cs/TgQeDGEvI+PzPEMOdvdsCMvpg=="; }; }; - "string.prototype.trim-1.2.7" = { + "string.prototype.trim-1.2.8" = { name = "string.prototype.trim"; packageName = "string.prototype.trim"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz"; - sha512 = "p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg=="; + url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz"; + sha512 = "lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ=="; }; }; - "string.prototype.trimend-1.0.6" = { + "string.prototype.trimend-1.0.7" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz"; - sha512 = "JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz"; + sha512 = "Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA=="; }; }; - "string.prototype.trimstart-1.0.6" = { + "string.prototype.trimstart-1.0.7" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz"; - sha512 = "omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz"; + sha512 = "NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg=="; }; }; "string_decoder-0.10.31" = { @@ -11227,15 +10408,6 @@ let sha512 = "PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw=="; }; }; - "style-mod-4.0.3" = { - name = "style-mod"; - packageName = "style-mod"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/style-mod/-/style-mod-4.0.3.tgz"; - sha512 = "78Jv8kYJdjbvRwwijtCevYADfsI0lGzYJe4mMFdceO8l75DFFDoqBhR1jVDicDRRaX4//g1u9wKeo+ztc2h1Rw=="; - }; - }; "supports-color-7.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -11272,13 +10444,13 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "swagger-ui-dist-5.4.2" = { + "swagger-ui-dist-5.7.1" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "5.4.2"; + version = "5.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.4.2.tgz"; - sha512 = "vT5QxP/NOr9m4gLZl+SpavWI3M9Fdh30+Sdw9rEtZbkqNmNNEPhjXas2xTD9rsJYYdLzAiMfwXvtooWH3xbLJA=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-5.7.1.tgz"; + sha512 = "mY+htL+asLQTrwbCOcbzOtgch2TA5A4IqMleEtVleegFAIgzd2w0jyY2IvA8upDOR/AmftudyiI1/h+VBPIc7A=="; }; }; "swagger-ui-express-4.6.3" = { @@ -11308,13 +10480,13 @@ let sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; }; }; - "tar-6.1.15" = { + "tar-6.2.0" = { name = "tar"; packageName = "tar"; - version = "6.1.15"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.1.15.tgz"; - sha512 = "/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A=="; + url = "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz"; + sha512 = "/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ=="; }; }; "tar-fs-2.1.1" = { @@ -11389,13 +10561,13 @@ let sha512 = "jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww=="; }; }; - "terser-5.19.2" = { + "terser-5.19.4" = { name = "terser"; packageName = "terser"; - version = "5.19.2"; + version = "5.19.4"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz"; - sha512 = "qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA=="; + url = "https://registry.npmjs.org/terser/-/terser-5.19.4.tgz"; + sha512 = "6p1DjHeuluwxDXcuT9VR8p64klWJKo1ILiy19s6C9+0Bh2+NWTX6nD9EPppiER4ICkHDVB1RkVpin/YW2nQn/g=="; }; }; "terser-webpack-plugin-5.3.9" = { @@ -11461,15 +10633,6 @@ let sha512 = "iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw=="; }; }; - "timeago.js-4.0.2" = { - name = "timeago.js"; - packageName = "timeago.js"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/timeago.js/-/timeago.js-4.0.2.tgz"; - sha512 = "a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w=="; - }; - }; "title-case-3.0.3" = { name = "title-case"; packageName = "title-case"; @@ -11524,15 +10687,6 @@ let sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; }; - "toggle-selection-1.0.6" = { - name = "toggle-selection"; - packageName = "toggle-selection"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz"; - sha512 = "BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ=="; - }; - }; "toidentifier-1.0.1" = { name = "toidentifier"; packageName = "toidentifier"; @@ -11659,6 +10813,24 @@ let sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; }; }; + "tweetnacl-1.0.3" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz"; + sha512 = "6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw=="; + }; + }; + "tweetnacl-util-0.15.1" = { + name = "tweetnacl-util"; + packageName = "tweetnacl-util"; + version = "0.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl-util/-/tweetnacl-util-0.15.1.tgz"; + sha512 = "RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw=="; + }; + }; "type-check-0.3.2" = { name = "type-check"; packageName = "type-check"; @@ -11758,13 +10930,13 @@ let sha512 = "EqrdoXr0FbUrAMmkNQQuPwlhUGM7SJnpwUlWTWNlK2mOhOUyM+33fhm1f1hz3nnJJV8fTxzS3kTDq6pkVASLAw=="; }; }; - "typescript-5.1.6" = { + "typescript-5.2.2" = { name = "typescript"; packageName = "typescript"; - version = "5.1.6"; + version = "5.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz"; - sha512 = "zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA=="; + url = "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz"; + sha512 = "mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w=="; }; }; "uc.micro-1.0.6" = { @@ -11794,22 +10966,13 @@ let sha512 = "61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw=="; }; }; - "underscore-1.12.1" = { - name = "underscore"; - packageName = "underscore"; - version = "1.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz"; - sha512 = "hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw=="; - }; - }; - "undici-5.23.0" = { + "undici-5.24.0" = { name = "undici"; packageName = "undici"; - version = "5.23.0"; + version = "5.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.23.0.tgz"; - sha512 = "1D7w+fvRsqlQ9GscLBwcAJinqcZGHUKjbOmXdlE/v8BvEGXjeWAax+341q44EuTcHXXnfyKNbKRq4Lg7OzhMmg=="; + url = "https://registry.npmjs.org/undici/-/undici-5.24.0.tgz"; + sha512 = "OKlckxBjFl0oXxcj9FU6oB8fDAaiRUq+D8jrFWGmOfI/gIyjk/IeS75LMzgYKUaeHzLUcYvf9bbJGSrUwTfwwQ=="; }; }; "unescape-1.0.1" = { @@ -12046,22 +11209,13 @@ let sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; - "uuid-9.0.0" = { + "uuid-9.0.1" = { name = "uuid"; packageName = "uuid"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz"; - sha512 = "MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg=="; - }; - }; - "v3-infinite-loading-1.3.1" = { - name = "v3-infinite-loading"; - packageName = "v3-infinite-loading"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/v3-infinite-loading/-/v3-infinite-loading-1.3.1.tgz"; - sha512 = "Yi/STWDo+jasQSd8sBCta2u5/C75eLWdTyqkUPOcCEWYFzzw0DddYrDfvjB2IEbcvFxNiA4ljBpNLcRLVe2adA=="; + url = "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz"; + sha512 = "b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="; }; }; "v8-compile-cache-lib-3.0.1" = { @@ -12100,105 +11254,6 @@ let sha512 = "J637XF0DHDMV57R6JyVsTak7nIL8gy5KH4r1HiwWLf/4GBbb5MKL5y7LpmF4A8E2nR6XmzpmMFQ7V7ppPTmUQg=="; }; }; - "vue-2.6.14" = { - name = "vue"; - packageName = "vue"; - version = "2.6.14"; - src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz"; - sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; - }; - }; - "vue-2.7.14" = { - name = "vue"; - packageName = "vue"; - version = "2.7.14"; - src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.14.tgz"; - sha512 = "b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ=="; - }; - }; - "vue-3.3.4" = { - name = "vue"; - packageName = "vue"; - version = "3.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz"; - sha512 = "VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw=="; - }; - }; - "vue-agile-2.0.0" = { - name = "vue-agile"; - packageName = "vue-agile"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-agile/-/vue-agile-2.0.0.tgz"; - sha512 = "5xkSLJQNRdQ7qpEnXj5FgLg33XKRHaTZKGP5qkvteOc/uGJX89MYCjPSgdNqJ1GYFGfdGAp0jvhihW8OMuXS3g=="; - }; - }; - "vue-boring-avatars-1.3.0" = { - name = "vue-boring-avatars"; - packageName = "vue-boring-avatars"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-boring-avatars/-/vue-boring-avatars-1.3.0.tgz"; - sha512 = "X0Ur6+aYE8jXjKyY/LaWKrZ+FeJmc4xsirdz/lLuvm68wiokJc26Y9WpYPDuS1L2GwbvRDqLrnd9F2eL46buzA=="; - }; - }; - "vue-demi-0.14.5" = { - name = "vue-demi"; - packageName = "vue-demi"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.5.tgz"; - sha512 = "o9NUVpl/YlsGJ7t+xuqJKx8EBGf1quRhCiT6D/J0pfwmk9zUwYkC7yrF4SZCe6fETvSM3UNL2edcbYrSyc4QHA=="; - }; - }; - "vue-i18n-9.2.2" = { - name = "vue-i18n"; - packageName = "vue-i18n"; - version = "9.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.2.2.tgz"; - sha512 = "yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ=="; - }; - }; - "vue-json-pretty-2.2.4" = { - name = "vue-json-pretty"; - packageName = "vue-json-pretty"; - version = "2.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-json-pretty/-/vue-json-pretty-2.2.4.tgz"; - sha512 = "JX80b3QDrspcH43C53CdtYeq/froApQGSV5y43bEMWFj2LGOxB96aH1VmvrFA21nD1WTP6nwfFMQqGXuS4jyFQ=="; - }; - }; - "vue-router-4.2.4" = { - name = "vue-router"; - packageName = "vue-router"; - version = "4.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-router/-/vue-router-4.2.4.tgz"; - sha512 = "9PISkmaCO02OzPVOMq2w82ilty6+xJmQrarYZDkjZBfl4RvYAlt4PKnEX21oW4KTtWfa9OuO/b3qk1Od3AEdCQ=="; - }; - }; - "vue3-touch-events-4.1.3" = { - name = "vue3-touch-events"; - packageName = "vue3-touch-events"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vue3-touch-events/-/vue3-touch-events-4.1.3.tgz"; - sha512 = "uXTclRzn7de1mgiDIZ8N4J/wnWl1vBPLTWr60fqoLXu7ifhDKpl83Q2m9qA20KfEiAy+L4X/xXGc5ptGmdPh4A=="; - }; - }; - "w3c-keyname-2.2.8" = { - name = "w3c-keyname"; - packageName = "w3c-keyname"; - version = "2.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz"; - sha512 = "dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ=="; - }; - }; "watchpack-2.4.0" = { name = "watchpack"; packageName = "watchpack"; @@ -12442,13 +11497,13 @@ let sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; - "ws-8.13.0" = { + "ws-8.14.1" = { name = "ws"; packageName = "ws"; - version = "8.13.0"; + version = "8.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz"; - sha512 = "x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA=="; + url = "https://registry.npmjs.org/ws/-/ws-8.14.1.tgz"; + sha512 = "4OOseMUq8AzRBI/7SLMUwO+FEDnguetSk7KMb1sHwvF2w2Wv5Hoj0nlifx8vtGsftE/jWHojPy8sMMzYLJ2G/A=="; }; }; "xlsx-https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz" = { @@ -12524,15 +11579,6 @@ let sha512 = "xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA=="; }; }; - "xss-1.0.14" = { - name = "xss"; - packageName = "xss"; - version = "1.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/xss/-/xss-1.0.14.tgz"; - sha512 = "og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw=="; - }; - }; "xtend-4.0.2" = { name = "xtend"; packageName = "xtend"; @@ -12665,10 +11711,10 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "1.3.1"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-1.3.1.tgz"; - sha512 = "BYNeFcyYt68EGnMPUEeFsVt3ZtbotvGZ2zjRDgVZkJ1wc7F+Z+flQZqF0b9+tgeZRTvjY4LECCWBaECidHtcUw=="; + url = "https://registry.npmjs.org/n8n/-/n8n-1.6.1.tgz"; + sha512 = "sksFExGzsnwKLzuP7y+VfGaCVFz/1r6eliY8dl/l8hVqmhtBF+sOShZB5GNm1N5oha12C1xbTK14cP+d7fkVaQ=="; }; dependencies = [ (sources."@acuminous/bitsyntax-0.1.2" // { @@ -12713,34 +11759,35 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/client-cognito-identity-3.395.0" - sources."@aws-sdk/client-sso-3.395.0" - sources."@aws-sdk/client-sts-3.395.0" - sources."@aws-sdk/credential-provider-cognito-identity-3.395.0" - sources."@aws-sdk/credential-provider-env-3.391.0" - sources."@aws-sdk/credential-provider-ini-3.395.0" - sources."@aws-sdk/credential-provider-node-3.395.0" - sources."@aws-sdk/credential-provider-process-3.391.0" - sources."@aws-sdk/credential-provider-sso-3.395.0" - sources."@aws-sdk/credential-provider-web-identity-3.391.0" - sources."@aws-sdk/credential-providers-3.395.0" - sources."@aws-sdk/middleware-host-header-3.391.0" - sources."@aws-sdk/middleware-logger-3.391.0" - sources."@aws-sdk/middleware-recursion-detection-3.391.0" - sources."@aws-sdk/middleware-sdk-sts-3.391.0" - sources."@aws-sdk/middleware-signing-3.391.0" - sources."@aws-sdk/middleware-user-agent-3.391.0" - sources."@aws-sdk/token-providers-3.391.0" - sources."@aws-sdk/types-3.391.0" - sources."@aws-sdk/util-endpoints-3.391.0" + sources."@aws-sdk/client-cognito-identity-3.414.0" + sources."@aws-sdk/client-sso-3.414.0" + sources."@aws-sdk/client-sts-3.414.0" + sources."@aws-sdk/credential-provider-cognito-identity-3.414.0" + sources."@aws-sdk/credential-provider-env-3.413.0" + sources."@aws-sdk/credential-provider-ini-3.414.0" + sources."@aws-sdk/credential-provider-node-3.414.0" + sources."@aws-sdk/credential-provider-process-3.413.0" + sources."@aws-sdk/credential-provider-sso-3.414.0" + sources."@aws-sdk/credential-provider-web-identity-3.413.0" + sources."@aws-sdk/credential-providers-3.414.0" + sources."@aws-sdk/middleware-host-header-3.413.0" + sources."@aws-sdk/middleware-logger-3.413.0" + sources."@aws-sdk/middleware-recursion-detection-3.413.0" + sources."@aws-sdk/middleware-sdk-sts-3.413.0" + sources."@aws-sdk/middleware-signing-3.413.0" + sources."@aws-sdk/middleware-user-agent-3.413.0" + sources."@aws-sdk/region-config-resolver-3.413.0" + sources."@aws-sdk/token-providers-3.413.0" + sources."@aws-sdk/types-3.413.0" + sources."@aws-sdk/util-endpoints-3.413.0" sources."@aws-sdk/util-locate-window-3.310.0" - sources."@aws-sdk/util-user-agent-browser-3.391.0" - sources."@aws-sdk/util-user-agent-node-3.391.0" + sources."@aws-sdk/util-user-agent-browser-3.413.0" + sources."@aws-sdk/util-user-agent-node-3.413.0" sources."@aws-sdk/util-utf8-browser-3.259.0" sources."@azure/abort-controller-1.1.0" sources."@azure/core-auth-1.5.0" sources."@azure/core-client-1.7.3" - (sources."@azure/core-http-3.0.2" // { + (sources."@azure/core-http-3.0.3" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" ]; @@ -12748,7 +11795,7 @@ in sources."@azure/core-http-compat-1.3.0" sources."@azure/core-lro-2.5.4" sources."@azure/core-paging-1.5.0" - (sources."@azure/core-rest-pipeline-1.12.0" // { + (sources."@azure/core-rest-pipeline-1.12.1" // { dependencies = [ sources."@tootallnate/once-2.0.0" sources."http-proxy-agent-5.0.0" @@ -12765,63 +11812,33 @@ in }) sources."@azure/keyvault-keys-4.7.2" sources."@azure/logger-1.0.4" - (sources."@azure/msal-browser-2.38.1" // { + (sources."@azure/msal-browser-2.38.2" // { dependencies = [ - sources."@azure/msal-common-13.2.1" + sources."@azure/msal-common-13.3.0" ]; }) sources."@azure/msal-common-7.6.0" - (sources."@azure/msal-node-1.18.1" // { + (sources."@azure/msal-node-1.18.3" // { dependencies = [ - sources."@azure/msal-common-13.2.1" + sources."@azure/msal-common-13.3.0" ]; }) - (sources."@azure/storage-blob-12.15.0" // { + (sources."@azure/storage-blob-12.16.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" ]; }) - sources."@babel/parser-7.22.10" - (sources."@babel/runtime-7.22.10" // { + (sources."@babel/runtime-7.22.15" // { dependencies = [ sources."regenerator-runtime-0.14.0" ]; }) - sources."@codemirror/autocomplete-6.9.0" - sources."@codemirror/commands-6.2.4" - sources."@codemirror/lang-css-6.2.1" - sources."@codemirror/lang-javascript-6.1.9" - sources."@codemirror/lang-json-6.0.1" - sources."@codemirror/lang-python-6.1.3" - sources."@codemirror/language-6.9.0" - sources."@codemirror/lint-6.4.0" - sources."@codemirror/state-6.2.1" - sources."@codemirror/view-6.16.0" sources."@colors/colors-1.5.0" sources."@cspotcode/source-map-support-0.8.1" - sources."@ctrl/tinycolor-3.6.0" sources."@curlconverter/yargs-0.0.2" sources."@curlconverter/yargs-parser-0.0.1" sources."@dabh/diagnostics-2.0.3" - sources."@element-plus/icons-vue-2.1.0" sources."@ewoudenberg/difflib-0.1.0" - sources."@floating-ui/core-1.4.1" - sources."@floating-ui/dom-1.5.1" - sources."@floating-ui/utils-0.1.1" - sources."@fontsource/open-sans-4.5.14" - sources."@fortawesome/fontawesome-common-types-0.3.0" - sources."@fortawesome/fontawesome-svg-core-1.3.0" - (sources."@fortawesome/free-regular-svg-icons-6.4.2" // { - dependencies = [ - sources."@fortawesome/fontawesome-common-types-6.4.2" - ]; - }) - (sources."@fortawesome/free-solid-svg-icons-5.15.4" // { - dependencies = [ - sources."@fortawesome/fontawesome-common-types-0.2.36" - ]; - }) - sources."@fortawesome/vue-fontawesome-3.0.3" sources."@gar/promisify-1.1.3" sources."@google-cloud/common-3.10.0" sources."@google-cloud/paginator-3.0.7" @@ -12847,7 +11864,7 @@ in sources."retry-request-5.0.2" (sources."teeny-request-8.0.3" // { dependencies = [ - sources."uuid-9.0.0" + sources."uuid-9.0.1" ]; }) sources."yallist-4.0.0" @@ -12855,10 +11872,10 @@ in }) (sources."@grpc/grpc-js-1.6.12" // { dependencies = [ - sources."@grpc/proto-loader-0.7.8" + sources."@grpc/proto-loader-0.7.9" sources."cliui-8.0.1" sources."long-5.2.3" - sources."protobufjs-7.2.4" + sources."protobufjs-7.2.5" sources."wrap-ansi-7.0.0" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" @@ -12881,11 +11898,6 @@ in sources."string_decoder-0.10.31" ]; }) - sources."@intlify/core-base-9.2.2" - sources."@intlify/devtools-if-9.2.2" - sources."@intlify/message-compiler-9.2.2" - sources."@intlify/shared-9.2.2" - sources."@intlify/vue-devtools-9.2.2" sources."@ioredis/commands-1.2.0" (sources."@isaacs/cliui-8.0.2" // { dependencies = [ @@ -12905,27 +11917,14 @@ in sources."@jridgewell/trace-mapping-0.3.9" sources."@js-joda/core-5.5.3" sources."@jsdevtools/ono-7.1.3" - sources."@jsplumb/browser-ui-5.13.7" - sources."@jsplumb/common-5.13.7" - sources."@jsplumb/connector-bezier-5.13.7" - sources."@jsplumb/core-5.13.7" - sources."@jsplumb/util-5.13.7" sources."@kafkajs/confluent-schema-registry-1.0.6" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" - sources."@lezer/common-1.0.4" - sources."@lezer/css-1.1.3" - sources."@lezer/highlight-1.1.6" - sources."@lezer/html-1.3.6" - sources."@lezer/javascript-1.4.5" - sources."@lezer/json-1.0.1" - sources."@lezer/lr-1.3.10" - sources."@lezer/python-1.1.8" sources."@mapbox/node-pre-gyp-1.0.11" - sources."@mongodb-js/zstd-1.1.0" - sources."@n8n/client-oauth2-0.6.0" - sources."@n8n/codemirror-lang-sql-1.0.2" - sources."@n8n_io/license-sdk-2.4.0" + sources."@mongodb-js/zstd-1.2.0" + sources."@n8n/client-oauth2-0.7.0" + sources."@n8n/vm2-3.9.20" + sources."@n8n_io/license-sdk-2.5.1" sources."@n8n_io/riot-tmpl-4.0.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -12960,8 +11959,7 @@ in sources."@oclif/linewrap-1.0.0" sources."@oclif/parser-3.8.17" sources."@oclif/screen-3.0.6" - sources."@opentelemetry/api-1.4.1" - sources."@popperjs/core-2.11.7" + sources."@opentelemetry/api-1.6.0" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -12973,7 +11971,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@redis/bloom-1.2.0" - (sources."@redis/client-1.5.8" // { + (sources."@redis/client-1.5.9" // { dependencies = [ sources."yallist-4.0.0" ]; @@ -12981,71 +11979,76 @@ in sources."@redis/graph-1.1.0" sources."@redis/json-1.0.4" sources."@redis/search-1.1.3" - sources."@redis/time-series-1.0.4" + sources."@redis/time-series-1.0.5" (sources."@rudderstack/rudder-sdk-node-1.0.6" // { dependencies = [ sources."bull-3.29.3" sources."ioredis-4.28.5" ]; }) - (sources."@sap/hana-client-2.17.22" // { + (sources."@sap/hana-client-2.18.22" // { dependencies = [ sources."debug-3.1.0" sources."ms-2.0.0" ]; }) sources."@segment/loosely-validate-event-2.0.0" - sources."@selderee/plugin-htmlparser2-0.11.0" - sources."@sentry-internal/tracing-7.64.0" - sources."@sentry/core-7.64.0" - sources."@sentry/integrations-7.64.0" - sources."@sentry/node-7.64.0" - sources."@sentry/types-7.64.0" - sources."@sentry/utils-7.64.0" - sources."@smithy/abort-controller-2.0.4" - sources."@smithy/config-resolver-2.0.4" - sources."@smithy/credential-provider-imds-2.0.4" - sources."@smithy/eventstream-codec-2.0.4" - sources."@smithy/fetch-http-handler-2.0.4" - sources."@smithy/hash-node-2.0.4" - sources."@smithy/invalid-dependency-2.0.4" + (sources."@selderee/plugin-htmlparser2-0.11.0" // { + dependencies = [ + sources."domhandler-5.0.3" + ]; + }) + sources."@sentry-internal/tracing-7.69.0" + sources."@sentry/core-7.69.0" + sources."@sentry/integrations-7.69.0" + sources."@sentry/node-7.69.0" + sources."@sentry/types-7.69.0" + sources."@sentry/utils-7.69.0" + sources."@smithy/abort-controller-2.0.8" + sources."@smithy/config-resolver-2.0.9" + sources."@smithy/credential-provider-imds-2.0.11" + sources."@smithy/eventstream-codec-2.0.8" + sources."@smithy/fetch-http-handler-2.1.4" + sources."@smithy/hash-node-2.0.8" + sources."@smithy/invalid-dependency-2.0.8" sources."@smithy/is-array-buffer-2.0.0" - sources."@smithy/middleware-content-length-2.0.4" - sources."@smithy/middleware-endpoint-2.0.4" - sources."@smithy/middleware-retry-2.0.4" - sources."@smithy/middleware-serde-2.0.4" - sources."@smithy/middleware-stack-2.0.0" - sources."@smithy/node-config-provider-2.0.4" - sources."@smithy/node-http-handler-2.0.4" - sources."@smithy/property-provider-2.0.4" - sources."@smithy/protocol-http-2.0.4" - sources."@smithy/querystring-builder-2.0.4" - sources."@smithy/querystring-parser-2.0.4" - sources."@smithy/service-error-classification-2.0.0" - sources."@smithy/shared-ini-file-loader-2.0.4" - sources."@smithy/signature-v4-2.0.4" - sources."@smithy/smithy-client-2.0.4" - sources."@smithy/types-2.2.1" - sources."@smithy/url-parser-2.0.4" + sources."@smithy/middleware-content-length-2.0.10" + sources."@smithy/middleware-endpoint-2.0.8" + sources."@smithy/middleware-retry-2.0.11" + sources."@smithy/middleware-serde-2.0.8" + sources."@smithy/middleware-stack-2.0.1" + sources."@smithy/node-config-provider-2.0.11" + sources."@smithy/node-http-handler-2.1.4" + sources."@smithy/property-provider-2.0.9" + sources."@smithy/protocol-http-3.0.4" + sources."@smithy/querystring-builder-2.0.8" + sources."@smithy/querystring-parser-2.0.8" + sources."@smithy/service-error-classification-2.0.1" + sources."@smithy/shared-ini-file-loader-2.0.10" + sources."@smithy/signature-v4-2.0.8" + sources."@smithy/smithy-client-2.1.5" + sources."@smithy/types-2.3.2" + sources."@smithy/url-parser-2.0.8" sources."@smithy/util-base64-2.0.0" sources."@smithy/util-body-length-browser-2.0.0" - sources."@smithy/util-body-length-node-2.0.0" + sources."@smithy/util-body-length-node-2.1.0" sources."@smithy/util-buffer-from-2.0.0" sources."@smithy/util-config-provider-2.0.0" - sources."@smithy/util-defaults-mode-browser-2.0.4" - sources."@smithy/util-defaults-mode-node-2.0.4" + sources."@smithy/util-defaults-mode-browser-2.0.9" + sources."@smithy/util-defaults-mode-node-2.0.11" sources."@smithy/util-hex-encoding-2.0.0" - sources."@smithy/util-middleware-2.0.0" - sources."@smithy/util-retry-2.0.0" - sources."@smithy/util-stream-2.0.4" + sources."@smithy/util-middleware-2.0.1" + sources."@smithy/util-retry-2.0.1" + sources."@smithy/util-stream-2.0.11" sources."@smithy/util-uri-escape-2.0.0" sources."@smithy/util-utf8-2.0.0" sources."@sqltools/formatter-1.2.5" - sources."@swc/core-1.3.78" - sources."@swc/helpers-0.5.1" - sources."@swc/wasm-1.3.78" + sources."@swc/core-1.3.85" + sources."@swc/helpers-0.5.2" + sources."@swc/types-0.1.4" + sources."@swc/wasm-1.3.85" sources."@techteamer/ocsp-1.0.0" - sources."@tediousjs/connection-string-0.4.4" + sources."@tediousjs/connection-string-0.5.0" sources."@tokenizer/token-0.3.0" sources."@tootallnate/once-1.1.2" sources."@tsconfig/node10-1.0.9" @@ -13054,63 +12057,42 @@ in sources."@tsconfig/node16-1.0.4" sources."@types/asn1-0.2.1" sources."@types/big.js-6.2.0" - sources."@types/body-parser-1.19.2" - sources."@types/connect-3.4.35" + sources."@types/body-parser-1.19.3" + sources."@types/connect-3.4.36" sources."@types/duplexify-3.6.1" sources."@types/es-aggregate-error-1.0.2" sources."@types/eslint-8.44.2" sources."@types/eslint-scope-3.7.4" sources."@types/estree-1.0.1" sources."@types/express-4.17.17" - sources."@types/express-serve-static-core-4.17.35" - sources."@types/http-errors-2.0.1" - sources."@types/json-schema-7.0.12" - sources."@types/jsonwebtoken-9.0.2" - sources."@types/lodash-4.14.197" - sources."@types/lodash-es-4.17.8" + sources."@types/express-serve-static-core-4.17.36" + sources."@types/http-errors-2.0.2" + sources."@types/json-schema-7.0.13" + sources."@types/jsonwebtoken-9.0.3" + sources."@types/lodash-4.14.198" sources."@types/long-4.0.2" sources."@types/mime-1.3.2" sources."@types/multer-1.4.7" - sources."@types/node-20.5.1" - (sources."@types/node-fetch-2.6.4" // { + sources."@types/node-20.6.2" + sources."@types/node-fetch-2.6.5" + sources."@types/pumpify-1.4.1" + sources."@types/qs-6.9.8" + sources."@types/range-parser-1.2.4" + (sources."@types/readable-stream-4.0.2" // { dependencies = [ - sources."form-data-3.0.1" + sources."safe-buffer-5.1.2" ]; }) - sources."@types/pumpify-1.4.1" - sources."@types/qs-6.9.7" - sources."@types/range-parser-1.2.4" sources."@types/send-0.17.1" sources."@types/serve-static-1.15.2" sources."@types/stack-trace-0.0.29" - sources."@types/triple-beam-1.3.2" + sources."@types/triple-beam-1.3.3" sources."@types/tunnel-0.0.3" - sources."@types/uuid-9.0.2" + sources."@types/uuid-9.0.4" sources."@types/validator-13.11.1" - sources."@types/web-bluetooth-0.0.17" sources."@types/webidl-conversions-7.0.0" sources."@types/whatwg-url-8.2.2" sources."@types/ws-8.5.5" - sources."@vue/compiler-core-3.3.4" - sources."@vue/compiler-dom-3.3.4" - sources."@vue/compiler-sfc-3.3.4" - sources."@vue/compiler-ssr-3.3.4" - (sources."@vue/composition-api-1.7.2" // { - dependencies = [ - sources."vue-2.6.14" - ]; - }) - sources."@vue/devtools-api-6.5.0" - sources."@vue/reactivity-3.3.4" - sources."@vue/reactivity-transform-3.3.4" - sources."@vue/runtime-core-3.3.4" - sources."@vue/runtime-dom-3.3.4" - sources."@vue/server-renderer-3.3.4" - sources."@vue/shared-3.3.4" - sources."@vueuse/components-10.3.0" - sources."@vueuse/core-10.3.0" - sources."@vueuse/metadata-10.3.0" - sources."@vueuse/shared-10.3.0" sources."@webassemblyjs/ast-1.11.6" sources."@webassemblyjs/floating-point-hex-parser-1.11.6" sources."@webassemblyjs/helper-api-error-1.11.6" @@ -13173,8 +12155,8 @@ in sources."array-parallel-0.1.3" sources."array-series-0.1.5" sources."array-union-2.1.0" - sources."array.prototype.reduce-1.0.5" - sources."arraybuffer.prototype.slice-1.0.1" + sources."array.prototype.reduce-1.0.6" + sources."arraybuffer.prototype.slice-1.0.2" sources."arrify-2.0.1" sources."asap-2.0.6" sources."asn1-0.2.6" @@ -13194,7 +12176,6 @@ in sources."retry-0.13.1" ]; }) - sources."async-validator-4.2.5" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" (sources."auto-changelog-1.16.4" // { @@ -13209,7 +12190,7 @@ in sources."axios-0.24.0" ]; }) - (sources."aws-sdk-2.1440.0" // { + (sources."aws-sdk-2.1459.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -13221,7 +12202,7 @@ in }) sources."aws4-1.12.0" sources."axios-0.21.4" - sources."axios-retry-3.6.0" + sources."axios-retry-3.7.0" sources."balanced-match-1.0.2" sources."base-64-1.0.0" sources."base64-js-1.5.1" @@ -13230,12 +12211,16 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."bcrypt-pbkdf-1.0.2" + (sources."bcrypt-pbkdf-1.0.2" // { + dependencies = [ + sources."tweetnacl-0.14.5" + ]; + }) sources."bcryptjs-2.4.3" - sources."better-sqlite3-8.5.1" + sources."better-sqlite3-8.6.0" sources."big-integer-1.6.51" sources."big.js-6.2.1" - sources."bignumber.js-9.1.1" + sources."bignumber.js-9.1.2" sources."binary-extensions-2.2.0" sources."binascii-0.0.2" sources."bindings-1.5.0" @@ -13263,7 +12248,7 @@ in sources."braces-3.0.2" sources."browser-request-0.3.3" sources."browserslist-4.21.10" - sources."bson-5.4.0" + sources."bson-5.5.0" sources."buffer-6.0.3" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.2" @@ -13294,7 +12279,7 @@ in sources."callsites-3.1.0" sources."camel-case-4.1.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001522" + sources."caniuse-lite-1.0.30001534" sources."capital-case-1.0.4" sources."cardinal-2.1.1" sources."chalk-4.1.2" @@ -13310,20 +12295,10 @@ in }) (sources."cheerio-1.0.0-rc.6" // { dependencies = [ - sources."dom-serializer-1.4.1" - sources."domhandler-4.3.1" - sources."domutils-2.8.0" - sources."htmlparser2-6.1.0" sources."parse5-6.0.1" ]; }) - (sources."cheerio-select-1.6.0" // { - dependencies = [ - sources."dom-serializer-1.4.1" - sources."domhandler-4.3.1" - sources."domutils-2.8.0" - ]; - }) + sources."cheerio-select-1.6.0" sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."chrome-trace-event-1.0.3" @@ -13344,8 +12319,6 @@ in ]; }) sources."cluster-key-slot-1.1.2" - sources."codemirror-lang-html-n8n-1.0.0" - sources."codemirror-lang-n8n-expression-0.2.0" (sources."color-3.2.1" // { dependencies = [ sources."color-convert-1.9.3" @@ -13386,35 +12359,24 @@ in }) sources."cookie-signature-1.0.6" sources."copy-to-2.0.1" - sources."copy-to-clipboard-3.3.3" - sources."core-js-3.32.1" + sources."core-js-3.32.2" sources."core-util-is-1.0.3" sources."create-require-1.1.1" - sources."crelt-1.0.6" sources."cron-1.7.2" sources."cron-parser-2.18.0" sources."cross-spawn-7.0.3" sources."crypt-0.0.2" sources."crypto-js-4.1.1" sources."csrf-3.1.0" - (sources."css-select-4.3.0" // { - dependencies = [ - sources."dom-serializer-1.4.1" - sources."domhandler-4.3.1" - sources."domutils-2.8.0" - ]; - }) + sources."css-select-4.3.0" sources."css-what-6.1.0" - sources."cssfilter-0.0.10" - sources."csstype-3.1.2" + sources."csv-parse-5.5.0" sources."curlconverter-3.21.0" sources."currency-codes-2.1.0" sources."dashdash-1.14.1" sources."data-api-client-1.3.0" sources."data-uri-to-buffer-3.0.1" sources."date-fns-2.30.0" - sources."dateformat-3.0.3" - sources."dayjs-1.11.9" sources."debug-4.3.4" sources."debuglog-1.0.1" sources."decode-uri-component-0.2.2" @@ -13424,8 +12386,9 @@ in sources."deep-is-0.1.4" sources."deepmerge-4.3.1" sources."default-user-agent-1.0.0" + sources."define-data-property-1.1.0" sources."define-lazy-prop-2.0.0" - sources."define-properties-1.2.0" + sources."define-properties-1.2.1" sources."degenerator-3.0.4" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -13437,15 +12400,11 @@ in sources."diff-4.0.2" sources."digest-header-1.1.0" sources."dir-glob-3.0.1" - (sources."dom-serializer-2.0.0" // { - dependencies = [ - sources."entities-4.5.0" - ]; - }) + sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" - sources."domhandler-5.0.3" + sources."domhandler-4.3.1" sources."dommatrix-1.0.3" - sources."domutils-3.1.0" + sources."domutils-2.8.0" sources."dot-case-3.0.4" sources."dotenv-8.6.0" sources."dreamopt-0.8.0" @@ -13459,15 +12418,7 @@ in sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" sources."ejs-3.1.9" - sources."electron-to-chromium-1.4.496" - (sources."element-plus-2.3.9" // { - dependencies = [ - sources."@types/web-bluetooth-0.0.16" - sources."@vueuse/core-9.13.0" - sources."@vueuse/metadata-9.13.0" - sources."@vueuse/shared-9.13.0" - ]; - }) + sources."electron-to-chromium-1.4.523" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enabled-2.0.0" @@ -13477,14 +12428,14 @@ in sources."end-of-stream-1.4.4" sources."enhanced-resolve-5.15.0" sources."ent-2.2.0" - sources."entities-2.1.0" + sources."entities-2.2.0" sources."env-paths-2.2.1" sources."err-code-2.0.3" - sources."es-abstract-1.22.1" - sources."es-aggregate-error-1.0.9" + sources."es-abstract-1.22.2" + sources."es-aggregate-error-1.0.11" sources."es-array-method-boxes-properly-1.0.0" sources."es-get-iterator-1.1.3" - sources."es-module-lexer-1.3.0" + sources."es-module-lexer-1.3.1" sources."es-set-tostringtag-2.0.1" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" @@ -13501,7 +12452,6 @@ in ]; }) sources."estraverse-4.3.0" - sources."estree-walker-2.0.2" sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-target-shim-5.0.1" @@ -13552,7 +12502,6 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."file-saver-2.0.5" sources."file-type-16.5.4" sources."file-uri-to-path-1.0.0" (sources."filelist-1.0.4" // { @@ -13569,13 +12518,13 @@ in ]; }) sources."first-match-0.0.1" - sources."flatted-3.2.7" + sources."flatted-3.2.9" sources."fn.name-1.1.0" sources."follow-redirects-1.15.2" sources."for-each-0.3.3" sources."foreground-child-3.1.1" sources."form-data-4.0.0" - sources."formidable-3.5.0" + sources."formidable-3.5.1" (sources."formstream-1.3.1" // { dependencies = [ sources."mime-2.6.0" @@ -13600,7 +12549,7 @@ in ]; }) sources."function-bind-1.1.1" - sources."function.prototype.name-1.1.5" + sources."function.prototype.name-1.1.6" sources."functions-have-names-1.2.3" (sources."gauge-3.0.2" // { dependencies = [ @@ -13627,7 +12576,7 @@ in }) sources."getpass-0.1.7" sources."github-from-package-0.0.0" - (sources."glob-10.3.3" // { + (sources."glob-10.3.4" // { dependencies = [ sources."minimatch-9.0.3" ]; @@ -13690,17 +12639,20 @@ in sources."hexoid-1.0.0" sources."highlight.js-10.7.3" sources."homedir-polyfill-1.0.3" - sources."html-to-text-9.0.5" - (sources."htmlparser2-8.0.2" // { + (sources."html-to-text-9.0.5" // { dependencies = [ + sources."dom-serializer-2.0.0" + sources."domhandler-5.0.3" + sources."domutils-3.1.0" sources."entities-4.5.0" + sources."htmlparser2-8.0.2" ]; }) + sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.1" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.1" - sources."humanize-duration-3.29.0" sources."humanize-ms-1.2.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.6.3" @@ -13723,6 +12675,12 @@ in sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."infer-owner-1.0.4" + (sources."infisical-node-1.4.3" // { + dependencies = [ + sources."axios-1.5.0" + sources."dotenv-16.3.1" + ]; + }) sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" @@ -13759,7 +12717,6 @@ in sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" sources."is-number-object-1.0.7" - sources."is-plain-object-5.0.0" sources."is-promise-1.0.1" sources."is-property-1.0.2" sources."is-regex-1.1.4" @@ -13780,7 +12737,7 @@ in sources."isexe-2.0.0" sources."iso-639-1-2.1.15" sources."isomorphic-ws-4.0.1" - sources."jackspeak-2.3.0" + sources."jackspeak-2.3.3" sources."jake-10.8.7" (sources."jest-worker-27.5.1" // { dependencies = [ @@ -13789,7 +12746,7 @@ in }) sources."jmespath-0.16.0" sources."join-component-1.1.0" - sources."jose-4.14.4" + sources."jose-4.14.6" sources."js-base64-3.7.5" sources."js-md4-0.3.2" sources."js-nacl-1.4.0" @@ -13805,23 +12762,22 @@ in sources."json-schema-traverse-0.4.1" sources."json5-2.2.3" sources."jsonfile-6.1.0" - (sources."jsonpath-1.1.1" // { - dependencies = [ - sources."esprima-1.2.2" - ]; - }) sources."jsonschema-1.4.1" - sources."jsonwebtoken-9.0.1" + sources."jsonwebtoken-9.0.2" sources."jssha-3.3.1" sources."jwa-1.4.1" sources."jwks-rsa-3.0.1" sources."jws-3.2.2" sources."kafkajs-1.16.0" - sources."kerberos-2.0.1" + (sources."kerberos-2.0.3" // { + dependencies = [ + sources."node-addon-api-6.1.0" + ]; + }) sources."kuler-2.0.0" (sources."ldapts-4.2.6" // { dependencies = [ - sources."uuid-9.0.0" + sources."uuid-9.0.1" ]; }) sources."leac-0.6.0" @@ -13829,12 +12785,12 @@ in sources."levn-0.3.0" sources."libbase64-1.2.1" sources."libmime-5.2.1" - sources."libphonenumber-js-1.10.41" + sources."libphonenumber-js-1.10.44" sources."libpq-1.8.12" sources."libqp-2.0.1" sources."lie-3.1.1" sources."limiter-1.1.5" - sources."linkify-it-3.0.3" + sources."linkify-it-4.0.1" sources."loader-runner-4.3.0" (sources."loader-utils-2.0.4" // { dependencies = [ @@ -13849,17 +12805,20 @@ in }) sources."lodash-4.17.21" sources."lodash-es-4.17.21" - sources."lodash-unified-1.0.3" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" sources."lodash.defaults-4.2.0" sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" + sources."lodash.includes-4.3.0" sources."lodash.isarguments-3.1.0" + sources."lodash.isboolean-3.0.3" + sources."lodash.isinteger-4.0.4" + sources."lodash.isnumber-3.0.3" + sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" - sources."lodash.orderby-4.6.0" + sources."lodash.once-4.1.1" sources."lodash.snakecase-4.1.1" - sources."lodash.throttle-4.1.1" sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" sources."lodash.zipobject-4.1.3" @@ -13874,11 +12833,9 @@ in ]; }) sources."lru_map-0.3.3" - sources."luxon-3.4.0" - sources."magic-string-0.30.3" + sources."luxon-3.4.3" (sources."mailparser-3.6.5" // { dependencies = [ - sources."linkify-it-4.0.1" sources."nodemailer-6.9.3" ]; }) @@ -13900,15 +12857,9 @@ in sources."yallist-4.0.0" ]; }) - sources."mappersmith-2.41.0" - sources."markdown-it-13.0.1" - sources."markdown-it-emoji-2.0.2" - sources."markdown-it-link-attributes-4.0.1" - sources."markdown-it-task-lists-2.1.1" + sources."mappersmith-2.42.0" sources."md5-2.3.0" - sources."mdurl-1.0.1" sources."media-typer-0.3.0" - sources."memoize-one-6.0.0" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" @@ -13972,7 +12923,7 @@ in sources."mkdirp-classic-0.5.3" sources."moment-2.29.4" sources."moment-timezone-0.5.43" - sources."mongodb-5.7.0" + sources."mongodb-5.9.0" (sources."mongodb-client-encryption-2.9.0" // { dependencies = [ sources."gaxios-5.1.3" @@ -13999,8 +12950,8 @@ in }) sources."mqtt-packet-6.10.0" sources."ms-2.1.2" - sources."msgpackr-1.9.7" - (sources."mssql-9.1.3" // { + sources."msgpackr-1.9.9" + (sources."mssql-9.3.2" // { dependencies = [ sources."commander-11.0.0" ]; @@ -14015,23 +12966,43 @@ in ]; }) sources."mz-2.7.0" - (sources."n8n-core-1.3.1" // { + (sources."n8n-core-1.6.0" // { dependencies = [ + sources."@tediousjs/connection-string-0.3.0" + (sources."bl-5.1.0" // { + dependencies = [ + sources."buffer-6.0.3" + ]; + }) + sources."bson-4.7.2" + sources."buffer-5.7.1" + sources."chokidar-3.5.2" + sources."commander-9.5.0" + sources."commist-3.2.0" sources."concat-stream-2.0.0" + sources."glob-8.1.0" + sources."help-me-4.2.0" + sources."lru-cache-7.18.3" + sources."minimatch-5.1.6" + sources."mongodb-4.17.1" + (sources."mqtt-5.0.5" // { + dependencies = [ + sources."buffer-6.0.3" + sources."readable-stream-4.4.2" + ]; + }) + sources."mqtt-packet-8.2.0" + sources."mssql-8.1.4" + sources."n8n-nodes-base-1.6.0" sources."readable-stream-3.6.2" + sources."redis-3.1.2" + sources."sprintf-js-1.1.3" + sources."string_decoder-1.3.0" + sources."tedious-14.7.0" ]; }) - (sources."n8n-design-system-1.3.1" // { - dependencies = [ - sources."@fortawesome/vue-fontawesome-2.0.10" - sources."@vue/compiler-sfc-2.7.14" - sources."argparse-2.0.1" - sources."markdown-it-12.3.2" - sources."vue-2.7.14" - ]; - }) - sources."n8n-editor-ui-1.3.1" - (sources."n8n-nodes-base-1.3.1" // { + sources."n8n-editor-ui-1.6.0" + (sources."n8n-nodes-base-1.6.1" // { dependencies = [ sources."@tediousjs/connection-string-0.3.0" (sources."bl-5.1.0" // { @@ -14058,8 +13029,8 @@ in }) sources."lru-cache-7.18.3" sources."minimatch-5.1.6" - sources."mongodb-4.17.0" - sources."mqtt-5.0.3" + sources."mongodb-4.17.1" + sources."mqtt-5.0.5" sources."mqtt-packet-8.2.0" sources."mssql-8.1.4" (sources."readable-stream-4.4.2" // { @@ -14068,12 +13039,13 @@ in ]; }) sources."redis-3.1.2" - sources."sprintf-js-1.1.2" + sources."sprintf-js-1.1.3" sources."string_decoder-1.3.0" sources."tedious-14.7.0" + sources."xlsx-https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz" ]; }) - (sources."n8n-workflow-1.3.0" // { + (sources."n8n-workflow-1.6.0" // { dependencies = [ sources."ast-types-0.15.2" ]; @@ -14083,7 +13055,7 @@ in sources."lru-cache-7.18.3" ]; }) - sources."nan-2.17.0" + sources."nan-2.18.0" sources."nanoclone-0.2.1" sources."nanoid-3.3.6" sources."napi-build-utils-1.0.2" @@ -14096,7 +13068,7 @@ in sources."node-abi-3.47.0" sources."node-abort-controller-3.1.1" sources."node-addon-api-4.3.0" - sources."node-fetch-2.6.13" + sources."node-fetch-2.7.0" sources."node-forge-1.3.1" (sources."node-gyp-8.4.1" // { dependencies = [ @@ -14108,11 +13080,15 @@ in sources."signal-exit-3.0.7" ]; }) - sources."node-gyp-build-4.6.0" + sources."node-gyp-build-4.6.1" sources."node-html-markdown-1.3.0" - (sources."node-html-parser-6.1.6" // { + (sources."node-html-parser-6.1.10" // { dependencies = [ sources."css-select-5.1.0" + sources."dom-serializer-2.0.0" + sources."domhandler-5.0.3" + sources."domutils-3.1.0" + sources."entities-4.5.0" ]; }) sources."node-machine-id-1.1.12" @@ -14120,11 +13096,9 @@ in sources."node-rsa-1.1.1" sources."node-ssh-12.0.5" sources."nodeify-1.0.1" - sources."nodemailer-6.9.4" + sources."nodemailer-6.9.5" sources."nopt-5.0.0" sources."normalize-path-3.0.0" - sources."normalize-wheel-1.0.1" - sources."normalize-wheel-es-1.2.0" sources."npmlog-5.0.1" sources."nth-check-2.1.1" sources."nub-0.0.0" @@ -14138,7 +13112,7 @@ in sources."object-keys-1.1.1" sources."object-treeify-1.1.33" sources."object.assign-4.1.4" - sources."object.getownpropertydescriptors-2.1.6" + sources."object.getownpropertydescriptors-2.1.7" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -14176,7 +13150,6 @@ in sources."param-case-3.0.4" sources."parse-github-url-1.0.2" sources."parse-passwd-1.0.0" - sources."parse-srcset-1.0.2" sources."parse5-5.1.1" (sources."parse5-htmlparser2-tree-adapter-6.0.1" // { dependencies = [ @@ -14229,9 +13202,7 @@ in sources."pgpass-1.0.5" sources."picocolors-1.0.0" sources."picomatch-2.3.1" - sources."pinia-2.1.6" sources."pkce-challenge-3.1.0" - sources."postcss-8.4.28" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" sources."postgres-date-1.0.7" @@ -14247,7 +13218,6 @@ in ]; }) sources."prelude-ls-1.1.2" - sources."prettier-2.8.8" sources."pretty-bytes-5.6.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -14257,7 +13227,7 @@ in sources."promise-ftp-common-1.1.5" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."promise.prototype.finally-3.1.4" + sources."promise.prototype.finally-3.1.7" sources."property-expr-2.0.5" sources."proto3-json-serializer-0.1.9" sources."protobufjs-6.11.4" @@ -14316,13 +13286,13 @@ in }) sources."rechoir-0.6.2" sources."redeyed-2.1.1" - sources."redis-4.6.7" + sources."redis-4.6.8" sources."redis-commands-1.7.0" sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" sources."reflect-metadata-0.1.13" sources."regenerator-runtime-0.13.11" - sources."regexp.prototype.flags-1.5.0" + sources."regexp.prototype.flags-1.5.1" sources."reinterval-1.1.0" sources."remove-trailing-slash-0.1.1" (sources."replacestream-4.0.3" // { @@ -14332,7 +13302,7 @@ in }) sources."require-directory-2.1.1" sources."requires-port-1.0.0" - sources."resolve-1.22.4" + sources."resolve-1.22.6" (sources."restore-cursor-3.1.0" // { dependencies = [ sources."signal-exit-3.0.7" @@ -14366,13 +13336,12 @@ in sources."tslib-1.14.1" ]; }) - sources."safe-array-concat-1.0.0" + sources."safe-array-concat-1.0.1" sources."safe-buffer-5.2.1" sources."safe-regex-test-1.0.0" sources."safe-stable-stringify-2.4.3" sources."safer-buffer-2.1.2" sources."samlify-2.8.10" - sources."sanitize-html-2.10.0" sources."sax-1.2.4" sources."sb-promise-queue-2.1.0" sources."sb-scandir-3.1.0" @@ -14399,6 +13368,7 @@ in sources."serialize-javascript-5.0.1" sources."serve-static-1.15.0" sources."set-blocking-2.0.0" + sources."set-function-name-2.0.1" sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" sources."shebang-command-2.0.0" @@ -14425,7 +13395,7 @@ in sources."smart-buffer-4.2.0" sources."snake-case-3.0.4" sources."snappy-7.2.2" - (sources."snowflake-sdk-1.7.0" // { + (sources."snowflake-sdk-1.8.0" // { dependencies = [ sources."axios-0.27.2" sources."bignumber.js-2.4.0" @@ -14439,7 +13409,6 @@ in sources."socks-2.7.1" sources."socks-proxy-agent-6.2.1" sources."source-map-0.6.1" - sources."source-map-js-1.0.2" sources."source-map-support-0.5.21" sources."spex-3.2.0" sources."split-array-stream-2.0.0" @@ -14457,7 +13426,11 @@ in sources."readable-stream-3.6.2" ]; }) - sources."sshpk-1.17.0" + (sources."sshpk-1.17.0" // { + dependencies = [ + sources."tweetnacl-0.14.5" + ]; + }) (sources."ssri-8.0.1" // { dependencies = [ sources."minipass-3.3.6" @@ -14466,15 +13439,9 @@ in }) sources."stack-trace-0.0.10" sources."standard-as-callback-2.1.0" - sources."static-eval-2.0.2" sources."statuses-2.0.1" sources."stop-iteration-iterator-1.0.0" sources."stoppable-1.1.0" - (sources."stream-browserify-3.0.0" // { - dependencies = [ - sources."readable-stream-3.6.2" - ]; - }) sources."stream-events-1.0.5" sources."stream-shift-1.0.1" sources."streamsearch-1.1.0" @@ -14484,9 +13451,9 @@ in sources."string-width-4.2.3" sources."string-width-cjs-4.2.3" sources."string.prototype.startswith-1.0.0" - sources."string.prototype.trim-1.2.7" - sources."string.prototype.trimend-1.0.6" - sources."string.prototype.trimstart-1.0.6" + sources."string.prototype.trim-1.2.8" + sources."string.prototype.trimend-1.0.7" + sources."string.prototype.trimstart-1.0.7" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -14498,15 +13465,14 @@ in sources."strnum-1.0.5" sources."strtok3-6.3.0" sources."stubs-3.0.0" - sources."style-mod-4.0.3" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.3.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."swagger-ui-dist-5.4.2" + sources."swagger-ui-dist-5.7.1" sources."swagger-ui-express-4.6.3" sources."syslog-client-1.1.1" sources."tapable-2.2.1" - (sources."tar-6.1.15" // { + (sources."tar-6.2.0" // { dependencies = [ sources."minipass-5.0.0" sources."mkdirp-1.0.4" @@ -14530,7 +13496,7 @@ in dependencies = [ sources."bl-5.1.0" sources."readable-stream-3.6.2" - sources."sprintf-js-1.1.2" + sources."sprintf-js-1.1.3" ]; }) (sources."teeny-request-7.2.0" // { @@ -14539,7 +13505,7 @@ in sources."http-proxy-agent-5.0.0" ]; }) - (sources."terser-5.19.2" // { + (sources."terser-5.19.4" // { dependencies = [ sources."commander-2.20.3" ]; @@ -14559,7 +13525,6 @@ in sources."readable-stream-3.6.2" ]; }) - sources."timeago.js-4.0.2" sources."title-case-3.0.3" sources."tlds-1.240.0" sources."tmp-0.0.33" @@ -14569,7 +13534,6 @@ in ]; }) sources."to-regex-range-5.0.1" - sources."toggle-selection-1.0.6" sources."toidentifier-1.0.1" sources."token-types-4.2.1" sources."toposort-2.0.2" @@ -14588,7 +13552,8 @@ in sources."tsscmp-1.0.6" sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" + sources."tweetnacl-1.0.3" + sources."tweetnacl-util-0.15.1" sources."type-check-0.3.2" sources."type-fest-0.21.3" sources."type-is-1.6.18" @@ -14605,19 +13570,18 @@ in sources."glob-8.1.0" sources."minimatch-5.1.6" sources."mkdirp-2.1.6" - sources."uuid-9.0.0" + sources."uuid-9.0.1" sources."wrap-ansi-7.0.0" sources."yargs-17.7.2" sources."yargs-parser-21.1.1" ]; }) sources."typeorm-aurora-data-api-driver-2.4.4" - sources."typescript-5.1.6" + sources."typescript-5.2.2" sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" - sources."underscore-1.12.1" - sources."undici-5.23.0" + sources."undici-5.24.0" sources."unescape-1.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -14658,20 +13622,10 @@ in sources."utils-merge-1.0.1" sources."uuencode-0.0.4" sources."uuid-8.3.2" - sources."v3-infinite-loading-1.3.1" sources."v8-compile-cache-lib-3.0.1" sources."validator-13.7.0" sources."vary-1.1.2" sources."vm2-3.9.19" - sources."vue-3.3.4" - sources."vue-agile-2.0.0" - sources."vue-boring-avatars-1.3.0" - sources."vue-demi-0.14.5" - sources."vue-i18n-9.2.2" - sources."vue-json-pretty-2.2.4" - sources."vue-router-4.2.4" - sources."vue3-touch-events-4.1.3" - sources."w3c-keyname-2.2.8" sources."watchpack-2.4.0" sources."web-streams-polyfill-3.2.1" sources."webidl-conversions-3.0.1" @@ -14705,7 +13659,7 @@ in sources."wrap-ansi-6.2.0" sources."wrap-ansi-cjs-7.0.0" sources."wrappy-1.0.2" - sources."ws-8.13.0" + sources."ws-8.14.1" sources."xlsx-https://cdn.sheetjs.com/xlsx-0.19.3/xlsx-0.19.3.tgz" sources."xml-1.0.1" sources."xml-crypto-3.2.0" @@ -14714,11 +13668,6 @@ in sources."xmllint-wasm-3.0.1" sources."xpath-0.0.32" sources."xregexp-2.0.0" - (sources."xss-1.0.14" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yallist-2.1.2" diff --git a/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix b/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix index dab2a9406f..fe90b8a811 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.20.5"; + version = "0.21.0"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-bnYIyYnJhrdI8zfeOBdab8yZuK2rxTO5YO6EKlaRlHo="; + hash = "sha256-RL0tGhtndahTezQFz/twyLh36h2RXFy7EUnPiLAxP4U="; }; - vendorHash = "sha256-Nz1vE3SelUdgJoGQLOBXtFwAtM1VTDL9oKDQqxVi8Vg="; + vendorHash = "sha256-4Wxutkg9OdKs6B8z/P6JMgcE3cGS+6W4V7sKzVBwRJc="; inherit subPackages; @@ -39,6 +39,6 @@ buildGoModule rec { homepage = "https://netmaker.io"; changelog = "https://github.com/gravitl/netmaker/-/releases/v${version}"; license = licenses.sspl; - maintainers = with maintainers; [ urandom ]; + maintainers = with maintainers; [ urandom qjoly ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix index 768f56c56d..2463757216 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.15.1"; + version = "1.15.3"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "QOdGltz4wns1vq0Nv/O65koMYkLmPAAP4hKp301dAKI="; + hash = "sha256-FKjsosSSW0U8fQwV6QYhsbuuaTeCt6SfHEcY0v5xUO4="; }; nativeBuildInputs = [ 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 adce1d4801..ce94768074 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.9.3"; + version = "3.10.0"; outputs = [ "out" "dev" ]; @@ -33,7 +33,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-9DfQZ3AFyiUKwt8IqAgjQlQ2XJtwkLEtPM5+VH+x/6c="; + sha256 = "sha256-BNqMKL888DKuRiM537V7CBuCabg5YmGYGpWARtvs7go="; }; patches = [ @@ -86,9 +86,6 @@ mkDerivation rec { "-DNO_SHIBBOLETH=1" # allows to compile without qtwebkit ]; - # causes redefinition of _FORTIFY_SOURCE - hardeningDisable = [ "fortify3" ]; - postBuild = '' make doc-man ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix index c17c65e14f..04d43a4c79 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.39.4"; + version = "1.40.1"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-7inMloKU/AL4s/p171xCzs4p4+AcLsvsbVsELK9vhFc="; + sha256 = "sha256-VK6e8+r0A642zP0Pae8qbQCWT+CGpHY7B9ZGobXl92A="; }; - vendorHash = "sha256-pCta8FzGVpl9fvnnjQ7/e2x/HolXAuxnz0vwKejGk98="; + vendorHash = "sha256-CKKyLtqSzbmvpmDcoyGD79msAudlumqxcXaMTNbCbNI="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ostinato/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ostinato/default.nix index b3ff51ab7c..abc75b8bb7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ostinato/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ostinato/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "ostinato"; - version = "1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "pstavirs"; repo = "ostinato"; rev = "v${version}"; - sha256 = "0B3jOj5rA3/rD2gXS2praZImeP34zN06fOPy/IswXOg="; + sha256 = "sha256-yhfhNfkiZulF0FxNT+3CeGqUTXLmwPQntl2TLdCcMTQ="; }; ostinatoIcon = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/lokinet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/lokinet/default.nix index 574380ed69..f77323d2bc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/lokinet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/lokinet/default.nix @@ -8,13 +8,20 @@ , nlohmann_json , pkg-config , spdlog +, fmt_9 , sqlite , systemd , unbound , zeromq }: +let + # Upstream has received reports of incompatibilities with fmt, and other + # dependencies, see: https://github.com/oxen-io/lokinet/issues/2200. + spdlog' = spdlog.override { + fmt = fmt_9; + }; -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "lokinet"; version = "0.9.11"; @@ -36,7 +43,7 @@ stdenv.mkDerivation rec { libuv libsodium nlohmann_json - spdlog + spdlog' sqlite systemd unbound diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix index f7130edf66..a51dba890a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/magnetico/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-V1pBzillWTk9iuHAhFztxYaq4uLL3U3HYvedGk6ffbk="; }; - vendorSha256 = "sha256-ngYkTtBEZSyYYnfBHi0VrotwKGvMOiowbrwigJnjsuU="; + vendorHash = "sha256-ngYkTtBEZSyYYnfBHi0VrotwKGvMOiowbrwigJnjsuU="; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix index 15e7304ef9..41eedcc1b4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/pyrosimple/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pyrosimple"; - version = "2.10.2"; + version = "2.11.3"; format = "pyproject"; src = fetchFromGitHub { owner = "kannibalox"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3ZsRJNGbcKGU6v2uYUintMpKY8Z/DyTIDDxTsDEV6lw="; + hash = "sha256-P12Tx9lEGp9OINL6vJIdyL3+pJbR/uaYe8k7v9kSz/A="; }; pythonRelaxDeps = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix index 68b007fa53..a82adc4dc3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -11,13 +11,13 @@ assert trackerSearch -> (python3 != null); mkDerivation rec { pname = "qbittorrent" + lib.optionalString (!guiSupport) "-nox"; - version = "4.5.4"; + version = "4.5.5"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - hash = "sha256-c/ZJ83kxxFo/iI7Tjo3ZY0/vmVanjoJXBOu8XTnFm+Q="; + hash = "sha256-rWv+KGw+3385GOKK4MvoSP0CepotUZELiDVFpyDf+9k="; }; enableParallelBuilding = true; @@ -53,6 +53,6 @@ mkDerivation rec { changelog = "https://github.com/qbittorrent/qBittorrent/blob/release-${version}/Changelog"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ Anton-Latukha ]; + maintainers = with maintainers; [ Anton-Latukha kashw2 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/soulseekqt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/soulseekqt/default.nix index 3faf7ce6a7..9587bd0a93 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -28,24 +28,20 @@ mkDerivation rec { buildInputs = [ qtmultimedia stdenv.cc.cc ]; installPhase = '' - # directory in /nix/store so readonly - cd $appextracted - - binary="$(readlink AppRun)" + binary="$(realpath ${appextracted}/AppRun)" install -Dm755 $binary -t $out/bin # fixup and install desktop file desktop-file-install --dir $out/share/applications \ --set-key Exec --set-value $binary \ --set-key Comment --set-value "${meta.description}" \ - --set-key Categories --set-value Network default.desktop + --set-key Categories --set-value Network ${appextracted}/default.desktop mv $out/share/applications/default.desktop $out/share/applications/SoulseekQt.desktop - #TODO: write generic code to read icon path from $binary.desktop - icon="$(readlink .DirIcon)" + icon="$(realpath ${appextracted}/.DirIcon)" for size in 16 32 48 64 72 96 128 192 256 512 1024; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -resize "$size"x"$size" $icon $out/share/icons/hicolor/"$size"x"$size"/apps/$icon + convert -resize "$size"x"$size" $icon $out/share/icons/hicolor/"$size"x"$size"/apps/$(basename $icon) done ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 6c6cc99f5a..77124120d5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -1,32 +1,65 @@ -{ lib, stdenv, wrapGAppsHook, fetchFromGitHub, pkg-config, gtk3, json-glib, curl -, glib, appstream-glib, desktop-file-utils, meson, ninja, geoip, gettext -, libappindicator, libmrss, libproxy }: +{ lib +, stdenv +, appstream-glib +, curl +, desktop-file-utils +, fetchFromGitHub +, geoip +, gettext +, glib +, gtk3 +, json-glib +, libappindicator +, libmrss +, libproxy +, libsoup_3 +, meson +, ninja +, pkg-config +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "transmission-remote-gtk"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "transmission-remote-gtk"; repo = "transmission-remote-gtk"; - rev = version; - sha256 = "4/ID12JukDDvJzWupc76r7W8Us5erwv8oXZhDnB6VDk="; + rev = "refs/tags/${version}"; + hash = "sha256-/syZI/5LhuYLvXrNknnpbGHEH0z5iHeye2YRNJFWZJ0="; }; - nativeBuildInputs = - [ desktop-file-utils wrapGAppsHook meson ninja pkg-config appstream-glib ]; + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + meson + ninja + pkg-config + wrapGAppsHook + ]; - buildInputs = - [ gtk3 json-glib curl glib gettext libmrss geoip libproxy libappindicator ]; + buildInputs = [ + curl + geoip + gettext + glib + gtk3 + json-glib + libappindicator + libmrss + libproxy + libsoup_3 + ] ++ libsoup_3.propagatedUserEnvPackages; doCheck = false; # Requires network access meta = with lib; { description = "GTK remote control for the Transmission BitTorrent client"; - homepage = - "https://github.com/transmission-remote-gtk/transmission-remote-gtk"; + homepage = "https://github.com/transmission-remote-gtk/transmission-remote-gtk"; + changelog = "https://github.com/transmission-remote-gtk/transmission-remote-gtk/releases/tag/${version}"; license = licenses.gpl2; - maintainers = [ maintainers.ehmry ]; + maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix index d388f07e01..78f5b6cf25 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix @@ -21,7 +21,7 @@ , dht , libnatpmp , libiconv -, darwin +, Foundation # Build options , enableGTK3 ? false , gtkmm3 @@ -37,15 +37,15 @@ , apparmorRulesFromClosure }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "transmission"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "transmission"; repo = "transmission"; - rev = version; - hash = "sha256-P7omd49xLmReo9Zrg0liO1msUVzCa5CxH7PGmH4oPzg="; + rev = finalAttrs.version; + hash = "sha256-Sz3+5VvfOgET1aiormEnBOrF+yN79tiSQvjLAoGqTLw="; fetchSubmodules = true; }; @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { ++ lib.optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ] ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals stdenv.isLinux [ inotify-tools ] - ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Foundation ]; + ++ lib.optionals stdenv.isDarwin [ libiconv Foundation ]; postInstall = '' mkdir $apparmor @@ -141,8 +141,14 @@ stdenv.mkDerivation rec { EOF ''; + passthru.tests = { + apparmor = nixosTests.transmission_4; # starts the service with apparmor enabled + smoke-test = nixosTests.bittorrent; + }; + meta = { description = "A fast, easy and free BitTorrent client"; + mainProgram = if enableQt then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli"; longDescription = '' Transmission is a BitTorrent client which features a simple interface on top of a cross-platform back-end. @@ -158,7 +164,5 @@ stdenv.mkDerivation rec { license = with lib.licenses; [ gpl2Plus mit ]; maintainers = with lib.maintainers; [ astsmtl ]; platforms = lib.platforms.unix; - # Needs macOS >= 10.14.6 - broken = stdenv.isDarwin && stdenv.isx86_64; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix index cc82c50380..58de6fa975 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix @@ -32,17 +32,14 @@ , apparmorRulesFromClosure }: -let - version = "3.00"; - -in stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "transmission"; - inherit version; + version = "3.00"; src = fetchFromGitHub { owner = "transmission"; repo = "transmission"; - rev = version; + rev = finalAttrs.version; sha256 = "0ccg0km54f700x9p0jsnncnwvfnxfnxf7kcm7pcx1cj0vw78924z"; fetchSubmodules = true; }; @@ -129,6 +126,7 @@ in stdenv.mkDerivation { meta = { description = "A fast, easy and free BitTorrent client"; + mainProgram = if enableQt then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli"; longDescription = '' Transmission is a BitTorrent client which features a simple interface on top of a cross-platform back-end. @@ -146,4 +144,4 @@ in stdenv.mkDerivation { platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix index 016ff2aa5e..48e6a76c29 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/tremc/default.nix @@ -12,22 +12,22 @@ let in python3Packages.buildPythonApplication rec { pname = "tremc"; - version = "0.9.2"; + version = "0.9.3"; format = "other"; src = fetchFromGitHub { owner = "tremc"; repo = pname; rev = version; - sha256 = "1fqspp2ckafplahgba54xmx0sjidx1pdzyjaqjhz0ivh98dkx2n5"; + hash = "sha256-219rntmetmj1JFG+4NyYMFTWmrHKJL7fnLoMIvnTP4Y="; }; patches = [ - # Remove when version >0.9.2 is released + # Remove when tremc > 0.9.3 is released (fetchpatch { - url = "https://github.com/tremc/tremc/commit/bdffff2bd76186a4e3488b83f719fc7f7e3362b6.patch"; - sha256 = "1zip2skh22v0yyv2hmszxn5jshp9m1jpw0fsyfvmqfxzq7m3czy5"; - name = "replace-decodestring-with-decodebytes.patch"; + url = "https://github.com/tremc/tremc/commit/a8aaf9a6728a9ef3d8f13b3603456b0086122891.patch"; + hash = "sha256-+HYdWTbcpvZqjshdHLZ+Svmr6U/aKFc3sy0aka6rn/A="; + name = "support-transmission-4.patch"; }) ]; @@ -56,5 +56,6 @@ python3Packages.buildPythonApplication rec { description = "Curses interface for transmission"; homepage = "https://github.com/tremc/tremc"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ kashw2 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix index 403d1e0cf3..ff0d808e8f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix @@ -38,12 +38,13 @@ let pname = "pcloud"; - version = "1.12.0"; - code = "XZyc9wVZAbFzyV8ElP71D5v170CvEmVtmrB7"; + version = "1.14.0"; + code = "XZpL8AVZAqfCXz5TebJ2gcvAiHi15pYFKPey"; + # Archive link's codes: https://www.pcloud.com/release-notes/linux.html src = fetchzip { url = "https://api.pcloud.com/getpubzip?code=${code}&filename=${pname}-${version}.zip"; - hash = "sha256-QzBlpF+qtNdSZFv3gU0mQhpVyPTWdGH3c+UHKKGfvKc="; + hash = "sha256-uirj/ASOrJyE728q+SB7zq0O9O58XDNzhokvNyca+2c="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/networking/peroxide/default.nix b/third_party/nixpkgs/pkgs/applications/networking/peroxide/default.nix index 9638d0863c..6e8537275f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/peroxide/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/peroxide/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-6Jb1i4aNjeemiQp9FF/KGyZ+Evom9PPBvARbJWyrhok="; }; - vendorSha256 = "sha256-kuFlkkMkCKO5Rrh1EoyVdaykvxTfchK2l1/THqTBeAY="; + vendorHash = "sha256-kuFlkkMkCKO5Rrh1EoyVdaykvxTfchK2l1/THqTBeAY="; postPatch = '' # These tests connect to the internet, which does not work in sandboxed 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 33ba132b4d..1e89c1b2cb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, mkYarnPackage, nixosTests, writeText, python3 }: +{ lib, stdenv, fetchFromGitHub, fetchYarnDeps, mkYarnPackage, nixosTests, writeText, python3 }: let version = "0.4.1"; @@ -12,7 +12,7 @@ let python = python3; pythonDeps = with python.pkgs; [ - flask flask_assets flask-login flask-sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-session-captcha flask-sslify + 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 gunicorn itsdangerous python3-saml pytz rcssmin rjsmin authlib bravado-core @@ -22,7 +22,12 @@ let assets = mkYarnPackage { inherit src version; packageJSON = ./package.json; - yarnNix = ./yarndeps.nix; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-3ebT19LrbYuypdJaoB3tClVVP0Fi8tHx3Xi6ge/DpA4="; + }; + # Copied from package.json, see also # https://github.com/NixOS/nixpkgs/pull/214952 packageResolutions = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh deleted file mode 100755 index 86dcb8cbf6..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/update-asset-deps.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../.. -i bash -p wget yarn2nix-moretea.yarn2nix jq - -# This script is based upon: -# pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh - -set -euo pipefail - -if [[ $# -ne 1 || $1 == -* ]]; then - echo "Regenerates the Yarn dependency lock files for the powerdns-admin package." - echo "Usage: $0 " - exit 1 -fi - -WEB_SRC="https://raw.githubusercontent.com/ngoduykhanh/PowerDNS-Admin/v$1" - -wget "$WEB_SRC/package.json" -O - | jq ".name = \"powerdns-admin-assets\" | .version = \"$1\"" > package.json -wget "$WEB_SRC/yarn.lock" -O yarn.lock -yarn2nix --lockfile=yarn.lock > yarndeps.nix -rm yarn.lock diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/yarndeps.nix b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/yarndeps.nix deleted file mode 100644 index 4e49c31089..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/yarndeps.nix +++ /dev/null @@ -1,1701 +0,0 @@ -{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { - offline_cache = linkFarm "offline" packages; - packages = [ - { - name = "_foliojs_fork_fontkit___fontkit_1.9.1.tgz"; - path = fetchurl { - name = "_foliojs_fork_fontkit___fontkit_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/@foliojs-fork/fontkit/-/fontkit-1.9.1.tgz"; - sha512 = "U589voc2/ROnvx1CyH9aNzOQWJp127JGU1QAylXGQ7LoEAF6hMmahZLQ4eqAcgHUw+uyW4PjtCItq9qudPkK3A=="; - }; - } - { - name = "_foliojs_fork_linebreak___linebreak_1.1.1.tgz"; - path = fetchurl { - name = "_foliojs_fork_linebreak___linebreak_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@foliojs-fork/linebreak/-/linebreak-1.1.1.tgz"; - sha512 = "pgY/+53GqGQI+mvDiyprvPWgkTlVBS8cxqee03ejm6gKAQNsR1tCYCIvN9FHy7otZajzMqCgPOgC4cHdt4JPig=="; - }; - } - { - name = "_foliojs_fork_pdfkit___pdfkit_0.13.0.tgz"; - path = fetchurl { - name = "_foliojs_fork_pdfkit___pdfkit_0.13.0.tgz"; - url = "https://registry.yarnpkg.com/@foliojs-fork/pdfkit/-/pdfkit-0.13.0.tgz"; - sha512 = "YXeG1fml9k97YNC9K8e292Pj2JzGt9uOIiBFuQFxHsdQ45BlxW+JU3RQK6JAvXU7kjhjP8rCcYvpk36JLD33sQ=="; - }; - } - { - name = "_foliojs_fork_restructure___restructure_2.0.2.tgz"; - path = fetchurl { - name = "_foliojs_fork_restructure___restructure_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@foliojs-fork/restructure/-/restructure-2.0.2.tgz"; - sha512 = "59SgoZ3EXbkfSX7b63tsou/SDGzwUEK6MuB5sKqgVK1/XE0fxmpsOb9DQI8LXW3KfGnAjImCGhhEb7uPPAUVNA=="; - }; - } - { - name = "_fortawesome_fontawesome_free___fontawesome_free_6.3.0.tgz"; - path = fetchurl { - name = "_fortawesome_fontawesome_free___fontawesome_free_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.3.0.tgz"; - sha512 = "qVtd5i1Cc7cdrqnTWqTObKQHjPWAiRwjUPaXObaeNPcy7+WKxJumGBx66rfSFgK6LNpIasVKkEgW8oyf0tmPLA=="; - }; - } - { - name = "_lgaitan_pace_progress___pace_progress_1.0.7.tgz"; - path = fetchurl { - name = "_lgaitan_pace_progress___pace_progress_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/@lgaitan/pace-progress/-/pace-progress-1.0.7.tgz"; - sha512 = "GMoTcF6WBpno7a7Iyx7M79os26d5bCDbh7YTZmXZM8YuLR3DDtwo0/CBYddStGD6QIBTieFDz4IAQiO0dAdRGw=="; - }; - } - { - name = "_sweetalert2_theme_bootstrap_4___theme_bootstrap_4_5.0.15.tgz"; - path = fetchurl { - name = "_sweetalert2_theme_bootstrap_4___theme_bootstrap_4_5.0.15.tgz"; - url = "https://registry.yarnpkg.com/@sweetalert2/theme-bootstrap-4/-/theme-bootstrap-4-5.0.15.tgz"; - sha512 = "WsGXk67Yz3Txe3lJA4FNqQCKbQQ6yJLpVUknyGcoESVvwHm+UBBlIMHAcKuLvF+WXK9Rbq8gXhpDIU8ISoiPlQ=="; - }; - } - { - name = "_ttskch_select2_bootstrap4_theme___select2_bootstrap4_theme_1.5.2.tgz"; - path = fetchurl { - name = "_ttskch_select2_bootstrap4_theme___select2_bootstrap4_theme_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/@ttskch/select2-bootstrap4-theme/-/select2-bootstrap4-theme-1.5.2.tgz"; - sha512 = "gAj8qNy/VYwQDBkACm0USM66kxFai8flX83ayRXPNhzZckEgSqIBB9sM74SCM3ssgeX+ZVy4BifTnLis+KpIyg=="; - }; - } - { - name = "acorn_node___acorn_node_1.8.2.tgz"; - path = fetchurl { - name = "acorn_node___acorn_node_1.8.2.tgz"; - url = "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz"; - sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A=="; - }; - } - { - name = "acorn_walk___acorn_walk_7.2.0.tgz"; - path = fetchurl { - name = "acorn_walk___acorn_walk_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz"; - sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA=="; - }; - } - { - name = "acorn___acorn_7.4.1.tgz"; - path = fetchurl { - name = "acorn___acorn_7.4.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; - sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; - }; - } - { - name = "admin_lte___admin_lte_3.2.0.tgz"; - path = fetchurl { - name = "admin_lte___admin_lte_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/admin-lte/-/admin-lte-3.2.0.tgz"; - sha512 = "IDUfoU8jo9DVlB59lDEASAJXTesAEXDZ68DOHI3qg93r5ehVTkMl2x0ixgIyff8NiHeNYXpcOZh3tr6oGbvu9g=="; - }; - } - { - name = "amdefine___amdefine_1.0.1.tgz"; - path = fetchurl { - name = "amdefine___amdefine_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz"; - sha512 = "S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg=="; - }; - } - { - name = "array_from___array_from_2.1.1.tgz"; - path = fetchurl { - name = "array_from___array_from_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz"; - sha512 = "GQTc6Uupx1FCavi5mPzBvVT7nEOeWMmUA9P95wpfpW1XwMSKs+KaymD5C2Up7KAUKg/mYwbsUYzdZWcoajlNZg=="; - }; - } - { - name = "ast_transform___ast_transform_0.0.0.tgz"; - path = fetchurl { - name = "ast_transform___ast_transform_0.0.0.tgz"; - url = "https://registry.yarnpkg.com/ast-transform/-/ast-transform-0.0.0.tgz"; - sha512 = "e/JfLiSoakfmL4wmTGPjv0HpTICVmxwXgYOB8x+mzozHL8v+dSfCbrJ8J8hJ0YBP0XcYu1aLZ6b/3TnxNK3P2A=="; - }; - } - { - name = "ast_types___ast_types_0.7.8.tgz"; - path = fetchurl { - name = "ast_types___ast_types_0.7.8.tgz"; - url = "https://registry.yarnpkg.com/ast-types/-/ast-types-0.7.8.tgz"; - sha512 = "RIOpVnVlltB6PcBJ5BMLx+H+6JJ/zjDGU0t7f0L6c2M1dqcK92VQopLBlPQ9R80AVXelfqYgjcPLtHtDbNFg0Q=="; - }; - } - { - name = "base64_js___base64_js_1.3.1.tgz"; - path = fetchurl { - name = "base64_js___base64_js_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz"; - sha512 = "mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="; - }; - } - { - name = "base64_js___base64_js_1.5.1.tgz"; - path = fetchurl { - name = "base64_js___base64_js_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; - sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; - }; - } - { - name = "bootstrap_colorpicker___bootstrap_colorpicker_3.4.0.tgz"; - path = fetchurl { - name = "bootstrap_colorpicker___bootstrap_colorpicker_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/bootstrap-colorpicker/-/bootstrap-colorpicker-3.4.0.tgz"; - sha512 = "7vA0hvLrat3ptobEKlT9+6amzBUJcDAoh6hJRQY/AD+5dVZYXXf1ivRfrTwmuwiVLJo9rZwM8YB4lYzp6agzqg=="; - }; - } - { - name = "bootstrap_datepicker___bootstrap_datepicker_1.9.0.tgz"; - path = fetchurl { - name = "bootstrap_datepicker___bootstrap_datepicker_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/bootstrap-datepicker/-/bootstrap-datepicker-1.9.0.tgz"; - sha512 = "9rYYbaVOheGYxjOr/+bJCmRPihfy+LkLSg4fIFMT9Od8WwWB/MB50w0JO1eBgKUMbb7PFHQD5uAfI3ArAxZRXA=="; - }; - } - { - name = "bootstrap_slider___bootstrap_slider_11.0.2.tgz"; - path = fetchurl { - name = "bootstrap_slider___bootstrap_slider_11.0.2.tgz"; - url = "https://registry.yarnpkg.com/bootstrap-slider/-/bootstrap-slider-11.0.2.tgz"; - sha512 = "CdwS+Z6X79OkLes9RfDgPB9UIY/+81wTkm6ktdSB6hdyiRbjJLFQIjZdnEr55tDyXZfgC7U6yeSXkNN9ZdGqjA=="; - }; - } - { - name = "bootstrap_switch___bootstrap_switch_3.3.4.tgz"; - path = fetchurl { - name = "bootstrap_switch___bootstrap_switch_3.3.4.tgz"; - url = "https://registry.yarnpkg.com/bootstrap-switch/-/bootstrap-switch-3.3.4.tgz"; - sha512 = "7YQo+Ir6gCUqC36FFp1Zvec5dRF/+obq+1drMtdIMi9Xc84Kx63Evi0kdcp4HfiGsZpiz6IskyYDNlSKcxsL7w=="; - }; - } - { - name = "bootstrap_validator___bootstrap_validator_0.11.9.tgz"; - path = fetchurl { - name = "bootstrap_validator___bootstrap_validator_0.11.9.tgz"; - url = "https://registry.yarnpkg.com/bootstrap-validator/-/bootstrap-validator-0.11.9.tgz"; - sha512 = "BJlnaTeFNr5+SNtZ71DNaiFx7qY0X2c7m/KvZE1GiVXbyD8PihJlALvS6TeRGUs8mY8qga/LrhG80N9dw8UWqA=="; - }; - } - { - name = "bootstrap4_duallistbox___bootstrap4_duallistbox_4.0.2.tgz"; - path = fetchurl { - name = "bootstrap4_duallistbox___bootstrap4_duallistbox_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/bootstrap4-duallistbox/-/bootstrap4-duallistbox-4.0.2.tgz"; - sha512 = "vQdANVE2NN0HMaZO9qWJy0C7u04uTpAmtUGO3KLq3xAZKCboJweQ437hDTszI6pbYV2olJCGZMbdhvIkBNGeGQ=="; - }; - } - { - name = "bootstrap___bootstrap_4.6.2.tgz"; - path = fetchurl { - name = "bootstrap___bootstrap_4.6.2.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz"; - sha512 = "51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ=="; - }; - } - { - name = "bootstrap___bootstrap_5.2.3.tgz"; - path = fetchurl { - name = "bootstrap___bootstrap_5.2.3.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-5.2.3.tgz"; - sha512 = "cEKPM+fwb3cT8NzQZYEu4HilJ3anCrWqh3CHAok1p9jXqMPsPTBhU25fBckEJHJ/p+tTxTFTsFQGM+gaHpi3QQ=="; - }; - } - { - name = "brfs___brfs_2.0.2.tgz"; - path = fetchurl { - name = "brfs___brfs_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/brfs/-/brfs-2.0.2.tgz"; - sha512 = "IrFjVtwu4eTJZyu8w/V2gxU7iLTtcHih67sgEdzrhjLBMHp2uYefUBfdM4k2UvcuWMgV7PQDZHSLeNWnLFKWVQ=="; - }; - } - { - name = "brotli___brotli_1.3.3.tgz"; - path = fetchurl { - name = "brotli___brotli_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/brotli/-/brotli-1.3.3.tgz"; - sha512 = "oTKjJdShmDuGW94SyyaoQvAjf30dZaHnjJ8uAF+u2/vGJkJbJPJAT1gDiOJP5v1Zb6f9KEyW/1HpuaWIXtGHPg=="; - }; - } - { - name = "browser_resolve___browser_resolve_1.11.3.tgz"; - path = fetchurl { - name = "browser_resolve___browser_resolve_1.11.3.tgz"; - url = "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz"; - sha512 = "exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ=="; - }; - } - { - name = "browserify_optional___browserify_optional_1.0.1.tgz"; - path = fetchurl { - name = "browserify_optional___browserify_optional_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/browserify-optional/-/browserify-optional-1.0.1.tgz"; - sha512 = "VrhjbZ+Ba5mDiSYEuPelekQMfTbhcA2DhLk2VQWqdcCROWeFqlTcXZ7yfRkXCIl8E+g4gINJYJiRB7WEtfomAQ=="; - }; - } - { - name = "bs_custom_file_input___bs_custom_file_input_1.3.4.tgz"; - path = fetchurl { - name = "bs_custom_file_input___bs_custom_file_input_1.3.4.tgz"; - url = "https://registry.yarnpkg.com/bs-custom-file-input/-/bs-custom-file-input-1.3.4.tgz"; - sha512 = "NBsQzTnef3OW1MvdKBbMHAYHssCd613MSeJV7z2McXznWtVMnJCy7Ckyc+PwxV6Pk16cu6YBcYWh/ZE0XWNKCA=="; - }; - } - { - name = "bs_stepper___bs_stepper_1.7.0.tgz"; - path = fetchurl { - name = "bs_stepper___bs_stepper_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/bs-stepper/-/bs-stepper-1.7.0.tgz"; - sha512 = "+DX7UKKgw2GI6ucsSCRd19VHYrxf/8znRCLs1lQVVLxz+h7EqgIOxoHcJ0/QTaaNoR9Cwg78ydo6hXIasyd3LA=="; - }; - } - { - name = "buffer_equal___buffer_equal_0.0.1.tgz"; - path = fetchurl { - name = "buffer_equal___buffer_equal_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz"; - sha512 = "RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA=="; - }; - } - { - name = "buffer_from___buffer_from_1.1.2.tgz"; - path = fetchurl { - name = "buffer_from___buffer_from_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; - sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; - }; - } - { - name = "call_bind___call_bind_1.0.2.tgz"; - path = fetchurl { - name = "call_bind___call_bind_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz"; - sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; - }; - } - { - name = "chart.js___chart.js_2.9.4.tgz"; - path = fetchurl { - name = "chart.js___chart.js_2.9.4.tgz"; - url = "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.4.tgz"; - sha512 = "B07aAzxcrikjAPyV+01j7BmOpxtQETxTSlQ26BEYJ+3iUkbNKaOJ/nDbT6JjyqYxseM0ON12COHYdU2cTIjC7A=="; - }; - } - { - name = "chartjs_color_string___chartjs_color_string_0.6.0.tgz"; - path = fetchurl { - name = "chartjs_color_string___chartjs_color_string_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz"; - sha512 = "TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A=="; - }; - } - { - name = "chartjs_color___chartjs_color_2.4.1.tgz"; - path = fetchurl { - name = "chartjs_color___chartjs_color_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz"; - sha512 = "haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w=="; - }; - } - { - name = "clone___clone_1.0.4.tgz"; - path = fetchurl { - name = "clone___clone_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz"; - sha512 = "JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="; - }; - } - { - name = "codemirror___codemirror_5.65.11.tgz"; - path = fetchurl { - name = "codemirror___codemirror_5.65.11.tgz"; - url = "https://registry.yarnpkg.com/codemirror/-/codemirror-5.65.11.tgz"; - sha512 = "Gp62g2eKSCHYt10axmGhKq3WoJSvVpvhXmowNq7pZdRVowwtvBR/hi2LSP5srtctKkRT33T6/n8Kv1UGp7JW4A=="; - }; - } - { - name = "color_convert___color_convert_1.9.3.tgz"; - path = fetchurl { - name = "color_convert___color_convert_1.9.3.tgz"; - url = "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz"; - sha512 = "QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="; - }; - } - { - name = "color_name___color_name_1.1.3.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; - }; - } - { - name = "color_name___color_name_1.1.4.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; - }; - } - { - name = "concat_stream___concat_stream_1.6.2.tgz"; - path = fetchurl { - name = "concat_stream___concat_stream_1.6.2.tgz"; - url = "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; - }; - } - { - name = "convert_source_map___convert_source_map_1.9.0.tgz"; - path = fetchurl { - name = "convert_source_map___convert_source_map_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz"; - sha512 = "ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A=="; - }; - } - { - name = "core_util_is___core_util_is_1.0.3.tgz"; - path = fetchurl { - name = "core_util_is___core_util_is_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz"; - sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; - }; - } - { - name = "crypto_js___crypto_js_4.1.1.tgz"; - path = fetchurl { - name = "crypto_js___crypto_js_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz"; - sha512 = "o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="; - }; - } - { - name = "d___d_1.0.1.tgz"; - path = fetchurl { - name = "d___d_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz"; - sha512 = "m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA=="; - }; - } - { - name = "dash_ast___dash_ast_2.0.1.tgz"; - path = fetchurl { - name = "dash_ast___dash_ast_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/dash-ast/-/dash-ast-2.0.1.tgz"; - sha512 = "5TXltWJGc+RdnabUGzhRae1TRq6m4gr+3K2wQX0is5/F2yS6MJXJvLyI3ErAnsAXuJoGqvfVD5icRgim07DrxQ=="; - }; - } - { - name = "datatables.net_autofill_bs4___datatables.net_autofill_bs4_2.5.2.tgz"; - path = fetchurl { - name = "datatables.net_autofill_bs4___datatables.net_autofill_bs4_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-autofill-bs4/-/datatables.net-autofill-bs4-2.5.2.tgz"; - sha512 = "k8SU+S0fa8iX2vJLdzfykpawIRNXRygX6pZJZ52zcEMh6pO7wYKFblH4A6N9ToPrkF22lW5kYHqshEb+GMZLiA=="; - }; - } - { - name = "datatables.net_autofill___datatables.net_autofill_2.5.2.tgz"; - path = fetchurl { - name = "datatables.net_autofill___datatables.net_autofill_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-autofill/-/datatables.net-autofill-2.5.2.tgz"; - sha512 = "sMkHTVv3I8shEt4Qvf3y9Hfp3XLTe8wMi1tMclJw5OV9NOL5UkuHmBkQeJUegZWOBZ6sivYjOvOX7H8AI6OHMg=="; - }; - } - { - name = "datatables.net_bs4___datatables.net_bs4_1.13.2.tgz"; - path = fetchurl { - name = "datatables.net_bs4___datatables.net_bs4_1.13.2.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.13.2.tgz"; - sha512 = "sr5D4pV+VqIfPGPh3oKQDu+denk/bZ3ObyAYp/EbQLoLw2U6dvVJifHeccCC5M+ZhYtucHVID/qpbswx90QQHA=="; - }; - } - { - name = "datatables.net_buttons_bs4___datatables.net_buttons_bs4_2.3.4.tgz"; - path = fetchurl { - name = "datatables.net_buttons_bs4___datatables.net_buttons_bs4_2.3.4.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-buttons-bs4/-/datatables.net-buttons-bs4-2.3.4.tgz"; - sha512 = "rg1OpsPxbXeYStcsHHeh1NnvCIMKnnyKk0cnrNyGck5DJFFunKNySqJk2t1MkQrpEN1NibeuqyMCjfsAx5TQHg=="; - }; - } - { - name = "datatables.net_buttons___datatables.net_buttons_2.3.4.tgz"; - path = fetchurl { - name = "datatables.net_buttons___datatables.net_buttons_2.3.4.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-buttons/-/datatables.net-buttons-2.3.4.tgz"; - sha512 = "1fe/aiKBdKbwJ5j0OobP2dzhbg/alGOphnTfLFGaqlP5yVxDCfcZ9EsuglYeHRJ/KnU7DZ8BgsPFiTE0tOFx8Q=="; - }; - } - { - name = "datatables.net_colreorder_bs4___datatables.net_colreorder_bs4_1.6.1.tgz"; - path = fetchurl { - name = "datatables.net_colreorder_bs4___datatables.net_colreorder_bs4_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-colreorder-bs4/-/datatables.net-colreorder-bs4-1.6.1.tgz"; - sha512 = "vdr0Padd26pDNdUhasFUGWK6WrYyoBSwoJ5Sq4294hgj1SqblP8pz1vIGUmFiFtlHlOsHaVor3rffeqyYH8Waw=="; - }; - } - { - name = "datatables.net_colreorder___datatables.net_colreorder_1.6.1.tgz"; - path = fetchurl { - name = "datatables.net_colreorder___datatables.net_colreorder_1.6.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-colreorder/-/datatables.net-colreorder-1.6.1.tgz"; - sha512 = "ae0gdkG0OmrEGUrXYm0XgWDzDkuEhEuNrfvQsmtCTl0j+1nxtXPsecIiWBCqv/dM0X4x8PT0dJY8furqPCzXXw=="; - }; - } - { - name = "datatables.net_fixedcolumns_bs4___datatables.net_fixedcolumns_bs4_4.2.1.tgz"; - path = fetchurl { - name = "datatables.net_fixedcolumns_bs4___datatables.net_fixedcolumns_bs4_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-fixedcolumns-bs4/-/datatables.net-fixedcolumns-bs4-4.2.1.tgz"; - sha512 = "RXI0weSNs9MlwKZujIKtih2wAdycjYgE7xunFYNTLJrjMzmRrisHs1FQ8AwZAQZu2CkvUbrUjdiAuaJXwKPyuA=="; - }; - } - { - name = "datatables.net_fixedcolumns___datatables.net_fixedcolumns_4.2.1.tgz"; - path = fetchurl { - name = "datatables.net_fixedcolumns___datatables.net_fixedcolumns_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-fixedcolumns/-/datatables.net-fixedcolumns-4.2.1.tgz"; - sha512 = "XCNM2UyWwLl8Qtaw23/wgMlUhQjIWEKXJSLqB67RTibeyfVUF7zsnNQECPtlPr6kqUN229Ep8UZG15Zc71MytQ=="; - }; - } - { - name = "datatables.net_fixedheader_bs4___datatables.net_fixedheader_bs4_3.3.1.tgz"; - path = fetchurl { - name = "datatables.net_fixedheader_bs4___datatables.net_fixedheader_bs4_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-fixedheader-bs4/-/datatables.net-fixedheader-bs4-3.3.1.tgz"; - sha512 = "cTSh9VygiEoMwnkuR5xhex/NDCJ5CsgXCLG0VDdOqptUwjYIqlrrVf4hBCj2XnJCxHi/liV1sSW3qu7q1QnpwQ=="; - }; - } - { - name = "datatables.net_fixedheader___datatables.net_fixedheader_3.3.1.tgz"; - path = fetchurl { - name = "datatables.net_fixedheader___datatables.net_fixedheader_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-fixedheader/-/datatables.net-fixedheader-3.3.1.tgz"; - sha512 = "m1ip5dOOsdjaFw2e5G77o+XLjqy5wWKnBnp+BwbnFCq4J5hFbMqcIV1r5z9X+NeAiKlADqZqteeLoO2xYRXBVA=="; - }; - } - { - name = "datatables.net_keytable_bs4___datatables.net_keytable_bs4_2.8.1.tgz"; - path = fetchurl { - name = "datatables.net_keytable_bs4___datatables.net_keytable_bs4_2.8.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-keytable-bs4/-/datatables.net-keytable-bs4-2.8.1.tgz"; - sha512 = "1RAE6oC8z7EnWXFfi1sbilYpeUyrK3j0MDCH5Bm6DfIsT7fnchjUEzgBy3Nr9+uE5edFUb7FNW0VQjTZKjFd2g=="; - }; - } - { - name = "datatables.net_keytable___datatables.net_keytable_2.8.1.tgz"; - path = fetchurl { - name = "datatables.net_keytable___datatables.net_keytable_2.8.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-keytable/-/datatables.net-keytable-2.8.1.tgz"; - sha512 = "ch9O35OSUgwTCb9cJXV6ABRQ8l296cg/UEtPmLjto9CHVL/XF7o0ZwzvKWevnabXmTVbudfB647mrUtkFd/8og=="; - }; - } - { - name = "datatables.net_plugins___datatables.net_plugins_1.13.1.tgz"; - path = fetchurl { - name = "datatables.net_plugins___datatables.net_plugins_1.13.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-plugins/-/datatables.net-plugins-1.13.1.tgz"; - sha512 = "4UpaRl7ZiTmStjV1QTB3x9V0EKmgdMvF7Ms+HzZ6gSzv33kPrL9Cw76/Uxxl02Z+ajergobvfMN64ndlZ9AXzA=="; - }; - } - { - name = "datatables.net_responsive_bs4___datatables.net_responsive_bs4_2.4.0.tgz"; - path = fetchurl { - name = "datatables.net_responsive_bs4___datatables.net_responsive_bs4_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-responsive-bs4/-/datatables.net-responsive-bs4-2.4.0.tgz"; - sha512 = "zCAxwcuaLneJd3Yy1eKZU3wksIj4IFvcaQEXrFeVBgsl6iH3H+uqW9apwdadDL8agsBHdsln08qYjkz8bYY7Bg=="; - }; - } - { - name = "datatables.net_responsive___datatables.net_responsive_2.4.0.tgz"; - path = fetchurl { - name = "datatables.net_responsive___datatables.net_responsive_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-responsive/-/datatables.net-responsive-2.4.0.tgz"; - sha512 = "Acws4aEPJZX/+CQsXpuDBHfrwgl3XxWEc/zlsnJCXE/GGbqjVAtQt7SM6EBcdReMv1FbyWUlF/Uw+de11NT46A=="; - }; - } - { - name = "datatables.net_rowgroup_bs4___datatables.net_rowgroup_bs4_1.3.0.tgz"; - path = fetchurl { - name = "datatables.net_rowgroup_bs4___datatables.net_rowgroup_bs4_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-rowgroup-bs4/-/datatables.net-rowgroup-bs4-1.3.0.tgz"; - sha512 = "qw4PwsFgVNKazimL/ixYP9NGzsEgZtt1VQfFK/r+JF1uoV7/vVvG7qK/B+wFRAdTAXL+9v6uKlJ/8RI7bPAbvg=="; - }; - } - { - name = "datatables.net_rowgroup___datatables.net_rowgroup_1.3.0.tgz"; - path = fetchurl { - name = "datatables.net_rowgroup___datatables.net_rowgroup_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-rowgroup/-/datatables.net-rowgroup-1.3.0.tgz"; - sha512 = "kLzYxvMmy8wmISksXvHBbZrv0wD7hlmp8NaiZQ6rFMwbTIoMt9YzOA+tpKDZiw3MOnku44QAOBXdPtXwxjE0JA=="; - }; - } - { - name = "datatables.net_rowreorder_bs4___datatables.net_rowreorder_bs4_1.3.2.tgz"; - path = fetchurl { - name = "datatables.net_rowreorder_bs4___datatables.net_rowreorder_bs4_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-rowreorder-bs4/-/datatables.net-rowreorder-bs4-1.3.2.tgz"; - sha512 = "tzPefl59gbw4qytRtwfPGTA49O6Gf2J7jL1xvhR2px2fcKHP2RqNJaHtnBk9nhqTJNWc9YPPy2wtbkIFIkswqQ=="; - }; - } - { - name = "datatables.net_rowreorder___datatables.net_rowreorder_1.3.2.tgz"; - path = fetchurl { - name = "datatables.net_rowreorder___datatables.net_rowreorder_1.3.2.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-rowreorder/-/datatables.net-rowreorder-1.3.2.tgz"; - sha512 = "zF2nsYEdteqIPojl+8ADDF1uMR9v7WttQlMiYkz/5qaNMaMj6GUbrql4eXPFBFH87CKTqnN9fL0HH0CRvewKBg=="; - }; - } - { - name = "datatables.net_scroller_bs4___datatables.net_scroller_bs4_2.1.0.tgz"; - path = fetchurl { - name = "datatables.net_scroller_bs4___datatables.net_scroller_bs4_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-scroller-bs4/-/datatables.net-scroller-bs4-2.1.0.tgz"; - sha512 = "xZa2rhZjKbk1ebPQBrY6pqQRdc8/JTuAzzqhQjU7hDKwQqRyQ6WJuVjdJxJ6MHkB2fFVdj7v9H3VCvUJOuXTEQ=="; - }; - } - { - name = "datatables.net_scroller___datatables.net_scroller_2.1.0.tgz"; - path = fetchurl { - name = "datatables.net_scroller___datatables.net_scroller_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-scroller/-/datatables.net-scroller-2.1.0.tgz"; - sha512 = "B/MxP8YPcFtoa1cexvlcK0PXQdzy6tz+HhQlyjNpRCoRc/8ZM5VcZg+ecYfP/pRBBXZORgkOJjWYkIdoChhE0w=="; - }; - } - { - name = "datatables.net_searchbuilder_bs4___datatables.net_searchbuilder_bs4_1.4.0.tgz"; - path = fetchurl { - name = "datatables.net_searchbuilder_bs4___datatables.net_searchbuilder_bs4_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-searchbuilder-bs4/-/datatables.net-searchbuilder-bs4-1.4.0.tgz"; - sha512 = "iEjhIkKLKoVD7wGWEVNSfpQaqBx+SXbiDTmH3t39h5hNWpYqoLtwEy/PhtaSdaF+hIhlrhcB4y8qHr/mW7KlSw=="; - }; - } - { - name = "datatables.net_searchbuilder___datatables.net_searchbuilder_1.4.0.tgz"; - path = fetchurl { - name = "datatables.net_searchbuilder___datatables.net_searchbuilder_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-searchbuilder/-/datatables.net-searchbuilder-1.4.0.tgz"; - sha512 = "I6+a5EebX6uYFlWmc7TAk1oQvlfoGZqyLgdN4H9Rm6fL5VZv6SvWQ7y2+W9ebshMD0smKdtp8pedYc8PIh80kg=="; - }; - } - { - name = "datatables.net_searchpanes_bs4___datatables.net_searchpanes_bs4_1.4.0.tgz"; - path = fetchurl { - name = "datatables.net_searchpanes_bs4___datatables.net_searchpanes_bs4_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-searchpanes-bs4/-/datatables.net-searchpanes-bs4-1.4.0.tgz"; - sha512 = "Floxzmw2cQkUQdI7Vv4IWtLqLmwPrmY6MPncbEWq4YvkSeaZW7OHzSmZLLUjMn2P6Huvz59WUVcwL0lSDui6GQ=="; - }; - } - { - name = "datatables.net_searchpanes___datatables.net_searchpanes_2.1.1.tgz"; - path = fetchurl { - name = "datatables.net_searchpanes___datatables.net_searchpanes_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-searchpanes/-/datatables.net-searchpanes-2.1.1.tgz"; - sha512 = "WsgnK8C/jCco9oRcpsVaImgTCiD7hk28dLHBmlpbvbIHMHCAhLPn0zVnCB3yInoNC/7kOGKpkeItpIpFHDMnhA=="; - }; - } - { - name = "datatables.net_select_bs4___datatables.net_select_bs4_1.6.0.tgz"; - path = fetchurl { - name = "datatables.net_select_bs4___datatables.net_select_bs4_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-select-bs4/-/datatables.net-select-bs4-1.6.0.tgz"; - sha512 = "oHClu+R1IMpttFse0cAdUhl4uLHGgoHrFEU/QxpASOQLd1h4CtkiVnmDr0fFRvm6XZMRTNt5xgYgwr262YuXyQ=="; - }; - } - { - name = "datatables.net_select___datatables.net_select_1.6.0.tgz"; - path = fetchurl { - name = "datatables.net_select___datatables.net_select_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/datatables.net-select/-/datatables.net-select-1.6.0.tgz"; - sha512 = "1kj32GOXs/dSpjBL5iDV3pwRwHU0hhJLPnTW/NOUH8Vhv1rGR3/X3PMSCc/T+Fy7J1jCJFbk8hQDsruXQKfSzw=="; - }; - } - { - name = "datatables.net___datatables.net_1.13.2.tgz"; - path = fetchurl { - name = "datatables.net___datatables.net_1.13.2.tgz"; - url = "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.13.2.tgz"; - sha512 = "u5nOU+C9SBp1SyPmd6G+niozZtrBwo1E8xzdOk3JJaAkFYgX/KxF3Gd79R8YLbUfmIs2OLnLe5gaz/qs5U8UDA=="; - }; - } - { - name = "daterangepicker___daterangepicker_3.1.0.tgz"; - path = fetchurl { - name = "daterangepicker___daterangepicker_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/daterangepicker/-/daterangepicker-3.1.0.tgz"; - sha512 = "DxWXvvPq4srWLCqFugqSV+6CBt/CvQ0dnpXhQ3gl0autcIDAruG1PuGG3gC7yPRNytAD1oU1AcUOzaYhOawhTw=="; - }; - } - { - name = "deep_equal___deep_equal_1.1.1.tgz"; - path = fetchurl { - name = "deep_equal___deep_equal_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; - sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; - }; - } - { - name = "deep_is___deep_is_0.1.4.tgz"; - path = fetchurl { - name = "deep_is___deep_is_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz"; - sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; - }; - } - { - name = "define_properties___define_properties_1.2.0.tgz"; - path = fetchurl { - name = "define_properties___define_properties_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz"; - sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="; - }; - } - { - name = "dfa___dfa_1.2.0.tgz"; - path = fetchurl { - name = "dfa___dfa_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/dfa/-/dfa-1.2.0.tgz"; - sha512 = "ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q=="; - }; - } - { - name = "dropzone___dropzone_5.9.3.tgz"; - path = fetchurl { - name = "dropzone___dropzone_5.9.3.tgz"; - url = "https://registry.yarnpkg.com/dropzone/-/dropzone-5.9.3.tgz"; - sha512 = "Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA=="; - }; - } - { - name = "duplexer2___duplexer2_0.1.4.tgz"; - path = fetchurl { - name = "duplexer2___duplexer2_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz"; - sha512 = "asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA=="; - }; - } - { - name = "ekko_lightbox___ekko_lightbox_5.3.0.tgz"; - path = fetchurl { - name = "ekko_lightbox___ekko_lightbox_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/ekko-lightbox/-/ekko-lightbox-5.3.0.tgz"; - sha512 = "mbacwySuVD3Ad6F2hTkjSTvJt59bcVv2l/TmBerp4xZnLak8tPtA4AScUn4DL42c1ksTiAO6sGhJZ52P/1Qgew=="; - }; - } - { - name = "es5_ext___es5_ext_0.10.62.tgz"; - path = fetchurl { - name = "es5_ext___es5_ext_0.10.62.tgz"; - url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz"; - sha512 = "BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA=="; - }; - } - { - name = "es6_iterator___es6_iterator_2.0.3.tgz"; - path = fetchurl { - name = "es6_iterator___es6_iterator_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz"; - sha512 = "zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g=="; - }; - } - { - name = "es6_map___es6_map_0.1.5.tgz"; - path = fetchurl { - name = "es6_map___es6_map_0.1.5.tgz"; - url = "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz"; - sha512 = "mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A=="; - }; - } - { - name = "es6_set___es6_set_0.1.6.tgz"; - path = fetchurl { - name = "es6_set___es6_set_0.1.6.tgz"; - url = "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.6.tgz"; - sha512 = "TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw=="; - }; - } - { - name = "es6_symbol___es6_symbol_3.1.3.tgz"; - path = fetchurl { - name = "es6_symbol___es6_symbol_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz"; - sha512 = "NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA=="; - }; - } - { - name = "escodegen___escodegen_1.14.3.tgz"; - path = fetchurl { - name = "escodegen___escodegen_1.14.3.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; - sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; - }; - } - { - name = "escodegen___escodegen_1.2.0.tgz"; - path = fetchurl { - name = "escodegen___escodegen_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.2.0.tgz"; - sha512 = "yLy3Cc+zAC0WSmoT2fig3J87TpQ8UaZGx8ahCAs9FL8qNbyV7CVyPKS74DG4bsHiL5ew9sxdYx131OkBQMFnvA=="; - }; - } - { - name = "esprima___esprima_4.0.1.tgz"; - path = fetchurl { - name = "esprima___esprima_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; - sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; - }; - } - { - name = "esprima___esprima_1.0.4.tgz"; - path = fetchurl { - name = "esprima___esprima_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz"; - sha512 = "rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA=="; - }; - } - { - name = "estraverse___estraverse_4.3.0.tgz"; - path = fetchurl { - name = "estraverse___estraverse_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; - sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; - }; - } - { - name = "estraverse___estraverse_1.5.1.tgz"; - path = fetchurl { - name = "estraverse___estraverse_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/estraverse/-/estraverse-1.5.1.tgz"; - sha512 = "FpCjJDfmo3vsc/1zKSeqR5k42tcIhxFIlvq+h9j0fO2q/h2uLKyweq7rYJ+0CoVvrGQOxIS5wyBrW/+vF58BUQ=="; - }; - } - { - name = "estree_is_function___estree_is_function_1.0.0.tgz"; - path = fetchurl { - name = "estree_is_function___estree_is_function_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/estree-is-function/-/estree-is-function-1.0.0.tgz"; - sha512 = "nSCWn1jkSq2QAtkaVLJZY2ezwcFO161HVc174zL1KPW3RJ+O6C3eJb8Nx7OXzvhoEv+nLgSR1g71oWUHUDTrJA=="; - }; - } - { - name = "esutils___esutils_2.0.3.tgz"; - path = fetchurl { - name = "esutils___esutils_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - } - { - name = "esutils___esutils_1.0.0.tgz"; - path = fetchurl { - name = "esutils___esutils_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/esutils/-/esutils-1.0.0.tgz"; - sha512 = "x/iYH53X3quDwfHRz4y8rn4XcEwwCJeWsul9pF1zldMbGtgOtMNBEOuYWwB1EQlK2LRa1fev3YAgym/RElp5Cg=="; - }; - } - { - name = "ev_emitter___ev_emitter_1.1.1.tgz"; - path = fetchurl { - name = "ev_emitter___ev_emitter_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/ev-emitter/-/ev-emitter-1.1.1.tgz"; - sha512 = "ipiDYhdQSCZ4hSbX4rMW+XzNKMD1prg/sTvoVmSLkuQ1MVlwjJQQA+sW8tMYR3BLUr9KjodFV4pvzunvRhd33Q=="; - }; - } - { - name = "eve_raphael___eve_raphael_0.5.0.tgz"; - path = fetchurl { - name = "eve_raphael___eve_raphael_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz"; - sha512 = "jrxnPsCGqng1UZuEp9DecX/AuSyAszATSjf4oEcRxvfxa1Oux4KkIPKBAAWWnpdwfARtr+Q0o9aPYWjsROD7ug=="; - }; - } - { - name = "event_emitter___event_emitter_0.3.5.tgz"; - path = fetchurl { - name = "event_emitter___event_emitter_0.3.5.tgz"; - url = "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz"; - sha512 = "D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA=="; - }; - } - { - name = "ext___ext_1.7.0.tgz"; - path = fetchurl { - name = "ext___ext_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/ext/-/ext-1.7.0.tgz"; - sha512 = "6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw=="; - }; - } - { - name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; - path = fetchurl { - name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; - }; - } - { - name = "fast_memoize___fast_memoize_2.5.2.tgz"; - path = fetchurl { - name = "fast_memoize___fast_memoize_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz"; - sha512 = "Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw=="; - }; - } - { - name = "fastclick___fastclick_1.0.6.tgz"; - path = fetchurl { - name = "fastclick___fastclick_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/fastclick/-/fastclick-1.0.6.tgz"; - sha512 = "cXyDBT4g0uWl/Xe75QspBDAgAWQ0lkPi/zgp6YFEUHj6WV6VIZl7R6TiDZhdOVU3W4ehp/8tG61Jev1jit+ztQ=="; - }; - } - { - name = "filterizr___filterizr_2.2.4.tgz"; - path = fetchurl { - name = "filterizr___filterizr_2.2.4.tgz"; - url = "https://registry.yarnpkg.com/filterizr/-/filterizr-2.2.4.tgz"; - sha512 = "hqyEdg7RrvJMVFOeF0yysS75HP6jLu0wBSUtSPAc3BysAtHpwcXaPnR1kYp2uZtd3YXyhH6JRfF9+H4SRvrqXg=="; - }; - } - { - name = "flag_icon_css___flag_icon_css_4.1.7.tgz"; - path = fetchurl { - name = "flag_icon_css___flag_icon_css_4.1.7.tgz"; - url = "https://registry.yarnpkg.com/flag-icon-css/-/flag-icon-css-4.1.7.tgz"; - sha512 = "AFjSU+fv98XbU0vnTQ32vcLj89UEr1MhwDFcooQv14qWJCjg9fGZzfh9BVyDhAhIOZW/pGmJmq38RqpgPaeybQ=="; - }; - } - { - name = "flot___flot_4.2.3.tgz"; - path = fetchurl { - name = "flot___flot_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/flot/-/flot-4.2.3.tgz"; - sha512 = "r1t2gfhILE6dt7cnYDHX/D2VHERyD0YoV0UdFJg5dWbjkcu05MugfhNY7VspfBFTa+hjVNYVZw6/t9ZyYNen+w=="; - }; - } - { - name = "fs_extra___fs_extra_10.1.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz"; - sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; - }; - } - { - name = "fullcalendar___fullcalendar_5.11.4.tgz"; - path = fetchurl { - name = "fullcalendar___fullcalendar_5.11.4.tgz"; - url = "https://registry.yarnpkg.com/fullcalendar/-/fullcalendar-5.11.4.tgz"; - sha512 = "1TH40KkWFVlZBpqJ/eB69E7nPABleA0skoc7pTIXJNNNYyUuKPjiJg+TSMunjJ9faPLzvbvfCdgttGZnynPA3Q=="; - }; - } - { - name = "function_bind___function_bind_1.1.1.tgz"; - path = fetchurl { - name = "function_bind___function_bind_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; - }; - } - { - name = "functions_have_names___functions_have_names_1.2.3.tgz"; - path = fetchurl { - name = "functions_have_names___functions_have_names_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz"; - sha512 = "xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="; - }; - } - { - name = "get_assigned_identifiers___get_assigned_identifiers_1.2.0.tgz"; - path = fetchurl { - name = "get_assigned_identifiers___get_assigned_identifiers_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz"; - sha512 = "mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ=="; - }; - } - { - name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; - path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; - sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; - }; - } - { - name = "graceful_fs___graceful_fs_4.2.10.tgz"; - path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.10.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; - }; - } - { - name = "has_property_descriptors___has_property_descriptors_1.0.0.tgz"; - path = fetchurl { - name = "has_property_descriptors___has_property_descriptors_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; - }; - } - { - name = "has_symbols___has_symbols_1.0.3.tgz"; - path = fetchurl { - name = "has_symbols___has_symbols_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz"; - sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; - }; - } - { - name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; - path = fetchurl { - name = "has_tostringtag___has_tostringtag_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; - sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; - }; - } - { - name = "has___has_1.0.3.tgz"; - path = fetchurl { - name = "has___has_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; - }; - } - { - name = "icheck_bootstrap___icheck_bootstrap_3.0.1.tgz"; - path = fetchurl { - name = "icheck_bootstrap___icheck_bootstrap_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/icheck-bootstrap/-/icheck-bootstrap-3.0.1.tgz"; - sha512 = "Rj3SybdcMcayhsP4IJ+hmCNgCKclaFcs/5zwCuLXH1WMo468NegjhZVxbSNKhEjJjnwc4gKETogUmPYSQ9lEZQ=="; - }; - } - { - name = "icheck___icheck_1.0.2.tgz"; - path = fetchurl { - name = "icheck___icheck_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/icheck/-/icheck-1.0.2.tgz"; - sha512 = "1oDqj9ikiH4csFWKZnfbD1S9IY/MqzEt4cir6PIfkT84D/8QYaAZFrplXoyz5eaATmaoawY3KMTkMAO+fP4wGg=="; - }; - } - { - name = "iconv_lite___iconv_lite_0.6.3.tgz"; - path = fetchurl { - name = "iconv_lite___iconv_lite_0.6.3.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; - }; - } - { - name = "imagesloaded___imagesloaded_4.1.4.tgz"; - path = fetchurl { - name = "imagesloaded___imagesloaded_4.1.4.tgz"; - url = "https://registry.yarnpkg.com/imagesloaded/-/imagesloaded-4.1.4.tgz"; - sha512 = "ltiBVcYpc/TYTF5nolkMNsnREHW+ICvfQ3Yla2Sgr71YFwQ86bDwV9hgpFhFtrGPuwEx5+LqOHIrdXBdoWwwsA=="; - }; - } - { - name = "immediate___immediate_3.0.6.tgz"; - path = fetchurl { - name = "immediate___immediate_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz"; - sha512 = "XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="; - }; - } - { - name = "inherits___inherits_2.0.4.tgz"; - path = fetchurl { - name = "inherits___inherits_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - } - { - name = "inputmask___inputmask_5.0.7.tgz"; - path = fetchurl { - name = "inputmask___inputmask_5.0.7.tgz"; - url = "https://registry.yarnpkg.com/inputmask/-/inputmask-5.0.7.tgz"; - sha512 = "rUxbRDS25KEib+c/Ow+K01oprU/+EK9t9SOPC8ov94/ftULGDqj1zOgRU/Hko6uzoKRMdwCfuhAafJ/Wk2wffQ=="; - }; - } - { - name = "ion_rangeslider___ion_rangeslider_2.3.1.tgz"; - path = fetchurl { - name = "ion_rangeslider___ion_rangeslider_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/ion-rangeslider/-/ion-rangeslider-2.3.1.tgz"; - sha512 = "6V+24FD13/feliI485gnRHZYD9Ev64M5NAFTxnVib516ATHa9PlXQrC+nOiPngouRYTCLPJyokAJEi3e1Umi5g=="; - }; - } - { - name = "is_arguments___is_arguments_1.1.1.tgz"; - path = fetchurl { - name = "is_arguments___is_arguments_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz"; - sha512 = "8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA=="; - }; - } - { - name = "is_core_module___is_core_module_2.11.0.tgz"; - path = fetchurl { - name = "is_core_module___is_core_module_2.11.0.tgz"; - url = "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz"; - sha512 = "RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw=="; - }; - } - { - name = "is_date_object___is_date_object_1.0.5.tgz"; - path = fetchurl { - name = "is_date_object___is_date_object_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz"; - sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; - }; - } - { - name = "is_regex___is_regex_1.1.4.tgz"; - path = fetchurl { - name = "is_regex___is_regex_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz"; - sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; - }; - } - { - name = "isarray___isarray_1.0.0.tgz"; - path = fetchurl { - name = "isarray___isarray_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; - }; - } - { - name = "jquery_knob_chif___jquery_knob_chif_1.2.13.tgz"; - path = fetchurl { - name = "jquery_knob_chif___jquery_knob_chif_1.2.13.tgz"; - url = "https://registry.yarnpkg.com/jquery-knob-chif/-/jquery-knob-chif-1.2.13.tgz"; - sha512 = "dveq9MZCr68bRrsziuRusKS+/ciT1yOOHdENOSTcXVRM9MsEyCK/DjqR9nc7V3on41269PFdDE2Fuib8Cw4jAA=="; - }; - } - { - name = "jquery_mapael___jquery_mapael_2.2.0.tgz"; - path = fetchurl { - name = "jquery_mapael___jquery_mapael_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/jquery-mapael/-/jquery-mapael-2.2.0.tgz"; - sha512 = "B5cVcCkfs7Ezia1Zs8bEfVacYD/GvaASyqQeidApR/NJ1C4igcExk9VULVsgLcTPkxohcZrrz5uCaPXvuKeZWw=="; - }; - } - { - name = "jquery_mousewheel___jquery_mousewheel_3.1.13.tgz"; - path = fetchurl { - name = "jquery_mousewheel___jquery_mousewheel_3.1.13.tgz"; - url = "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz"; - sha512 = "GXhSjfOPyDemM005YCEHvzrEALhKDIswtxSHSR2e4K/suHVJKJxxRCGz3skPjNxjJjQa9AVSGGlYjv1M3VLIPg=="; - }; - } - { - name = "jquery_slimscroll___jquery_slimscroll_1.3.8.tgz"; - path = fetchurl { - name = "jquery_slimscroll___jquery_slimscroll_1.3.8.tgz"; - url = "https://registry.yarnpkg.com/jquery-slimscroll/-/jquery-slimscroll-1.3.8.tgz"; - sha512 = "3cNGNCq6i3b+rZQOx1tSBlSFewk4X35eUuQmoRVSA4MSytw3rGPvCw6cEB2oEHf+u15RVzgfh4hN+/3dDNzwiQ=="; - }; - } - { - name = "jquery_sparkline___jquery_sparkline_2.4.0.tgz"; - path = fetchurl { - name = "jquery_sparkline___jquery_sparkline_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/jquery-sparkline/-/jquery-sparkline-2.4.0.tgz"; - sha512 = "SzjpMkOwlnqZpH4Ni2UbdRU5GxDl/BljgN8Smlun7CXUDqRhjPf2eolJ37KKcaG0/ufsMKY+XDERfPTV1hIcjg=="; - }; - } - { - name = "jquery_ui_dist___jquery_ui_dist_1.13.2.tgz"; - path = fetchurl { - name = "jquery_ui_dist___jquery_ui_dist_1.13.2.tgz"; - url = "https://registry.yarnpkg.com/jquery-ui-dist/-/jquery-ui-dist-1.13.2.tgz"; - sha512 = "oVDRd1NLtTbBwpRKAYdIRgpWVDzeBhfy7Gu0RmY6JEaZtmBq6kDn1pm5SgDiAotrnDS+RoTRXO6xvcNTxA9tOA=="; - }; - } - { - name = "jquery_validation___jquery_validation_1.19.5.tgz"; - path = fetchurl { - name = "jquery_validation___jquery_validation_1.19.5.tgz"; - url = "https://registry.yarnpkg.com/jquery-validation/-/jquery-validation-1.19.5.tgz"; - sha512 = "X2SmnPq1mRiDecVYL8edWx+yTBZDyC8ohWXFhXdtqFHgU9Wd4KHkvcbCoIZ0JaSaumzS8s2gXSkP8F7ivg/8ZQ=="; - }; - } - { - name = "jquery.quicksearch___jquery.quicksearch_2.4.0.tgz"; - path = fetchurl { - name = "jquery.quicksearch___jquery.quicksearch_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/jquery.quicksearch/-/jquery.quicksearch-2.4.0.tgz"; - sha512 = "20FJSCW3kTawO6Jvy/6MtUCURvgUZFqRUOAGTxH/VaPlwLG4kba82sKaM3ghTi1DsmSZrM2BvrwLUwNWmwDXiw=="; - }; - } - { - name = "jquery___jquery_3.6.3.tgz"; - path = fetchurl { - name = "jquery___jquery_3.6.3.tgz"; - url = "https://registry.yarnpkg.com/jquery/-/jquery-3.6.3.tgz"; - sha512 = "bZ5Sy3YzKo9Fyc8wH2iIQK4JImJ6R0GWI9kL1/k7Z91ZBNgkRXE6U0JfHIizZbort8ZunhSI3jw9I6253ahKfg=="; - }; - } - { - name = "jqvmap_novulnerability___jqvmap_novulnerability_1.5.1.tgz"; - path = fetchurl { - name = "jqvmap_novulnerability___jqvmap_novulnerability_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/jqvmap-novulnerability/-/jqvmap-novulnerability-1.5.1.tgz"; - sha512 = "O6Jr7AGiut9iNJMelPdy8pH83tNXadOqmhJm5FZy9gtaZ5uuhZK3VNu+YLFuTpXeZI8YXUvlFUYbJJi5XHA+tw=="; - }; - } - { - name = "jsgrid___jsgrid_1.5.3.tgz"; - path = fetchurl { - name = "jsgrid___jsgrid_1.5.3.tgz"; - url = "https://registry.yarnpkg.com/jsgrid/-/jsgrid-1.5.3.tgz"; - sha512 = "/BJgQp7gZe8o/VgNelwXc21jHc9HN+l7WPOkBhC9b9jPXFtOrU9ftNLPVBmKYCNlIulAbGTW8SDJI0mpw7uWxQ=="; - }; - } - { - name = "jsonfile___jsonfile_6.1.0.tgz"; - path = fetchurl { - name = "jsonfile___jsonfile_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; - sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; - }; - } - { - name = "jszip___jszip_3.10.1.tgz"; - path = fetchurl { - name = "jszip___jszip_3.10.1.tgz"; - url = "https://registry.yarnpkg.com/jszip/-/jszip-3.10.1.tgz"; - sha512 = "xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g=="; - }; - } - { - name = "jtimeout___jtimeout_3.2.0.tgz"; - path = fetchurl { - name = "jtimeout___jtimeout_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/jtimeout/-/jtimeout-3.2.0.tgz"; - sha512 = "P/cEhmgr8P2Vd3V79uUk6pHAHpMSe+Px7B+mGEir4aZW3/J6C09uH97aAEXVpjqb9i9vHnUyIp7k0UoA+Hy0eg=="; - }; - } - { - name = "knockout___knockout_3.5.1.tgz"; - path = fetchurl { - name = "knockout___knockout_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/knockout/-/knockout-3.5.1.tgz"; - sha512 = "wRJ9I4az0QcsH7A4v4l0enUpkS++MBx0BnL/68KaLzJg7x1qmbjSlwEoCNol7KTYZ+pmtI7Eh2J0Nu6/2Z5J/Q=="; - }; - } - { - name = "levn___levn_0.3.0.tgz"; - path = fetchurl { - name = "levn___levn_0.3.0.tgz"; - url = "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz"; - sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; - }; - } - { - name = "lie___lie_3.3.0.tgz"; - path = fetchurl { - name = "lie___lie_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz"; - sha512 = "UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ=="; - }; - } - { - name = "magic_string___magic_string_0.25.1.tgz"; - path = fetchurl { - name = "magic_string___magic_string_0.25.1.tgz"; - url = "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.1.tgz"; - sha512 = "sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg=="; - }; - } - { - name = "merge_source_map___merge_source_map_1.0.4.tgz"; - path = fetchurl { - name = "merge_source_map___merge_source_map_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz"; - sha512 = "PGSmS0kfnTnMJCzJ16BLLCEe6oeYCamKFFdQKshi4BmM6FUwipjVOcBFGxqtQtirtAG4iZvHlqST9CpZKqlRjA=="; - }; - } - { - name = "minimist___minimist_1.2.8.tgz"; - path = fetchurl { - name = "minimist___minimist_1.2.8.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz"; - sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; - }; - } - { - name = "moment_timezone___moment_timezone_0.5.40.tgz"; - path = fetchurl { - name = "moment_timezone___moment_timezone_0.5.40.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.40.tgz"; - sha512 = "tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg=="; - }; - } - { - name = "moment___moment_2.29.4.tgz"; - path = fetchurl { - name = "moment___moment_2.29.4.tgz"; - url = "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz"; - sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; - }; - } - { - name = "multiselect___multiselect_0.9.12.tgz"; - path = fetchurl { - name = "multiselect___multiselect_0.9.12.tgz"; - url = "https://registry.yarnpkg.com/multiselect/-/multiselect-0.9.12.tgz"; - sha512 = "JCuFC288lp9m5xNlxsgX10dhZZv+5lIQQt4kM4H8uLysbiMJTYQBi0LuYguRunCvlXlGjFvH8O/YpL8x2lu9EA=="; - }; - } - { - name = "next_tick___next_tick_1.1.0.tgz"; - path = fetchurl { - name = "next_tick___next_tick_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz"; - sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="; - }; - } - { - name = "object_inspect___object_inspect_1.12.3.tgz"; - path = fetchurl { - name = "object_inspect___object_inspect_1.12.3.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz"; - sha512 = "geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g=="; - }; - } - { - name = "object_is___object_is_1.1.5.tgz"; - path = fetchurl { - name = "object_is___object_is_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz"; - sha512 = "3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw=="; - }; - } - { - name = "object_keys___object_keys_1.1.1.tgz"; - path = fetchurl { - name = "object_keys___object_keys_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - } - { - name = "optionator___optionator_0.8.3.tgz"; - path = fetchurl { - name = "optionator___optionator_0.8.3.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; - sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; - }; - } - { - name = "overlayscrollbars___overlayscrollbars_1.13.3.tgz"; - path = fetchurl { - name = "overlayscrollbars___overlayscrollbars_1.13.3.tgz"; - url = "https://registry.yarnpkg.com/overlayscrollbars/-/overlayscrollbars-1.13.3.tgz"; - sha512 = "1nB/B5kaakJuHXaLXLRK0bUIilWhUGT6q5g+l2s5vqYdLle/sd0kscBHkQC1kuuDg9p9WR4MTdySDOPbeL/86g=="; - }; - } - { - name = "pako___pako_0.2.9.tgz"; - path = fetchurl { - name = "pako___pako_0.2.9.tgz"; - url = "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz"; - sha512 = "NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA=="; - }; - } - { - name = "pako___pako_1.0.11.tgz"; - path = fetchurl { - name = "pako___pako_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz"; - sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; - }; - } - { - name = "path_parse___path_parse_1.0.7.tgz"; - path = fetchurl { - name = "path_parse___path_parse_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz"; - sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; - }; - } - { - name = "pdfmake___pdfmake_0.2.7.tgz"; - path = fetchurl { - name = "pdfmake___pdfmake_0.2.7.tgz"; - url = "https://registry.yarnpkg.com/pdfmake/-/pdfmake-0.2.7.tgz"; - sha512 = "ClLpgx30H5G3EDvRW1MrA1Xih6YxEaSgIVFrOyBMgAAt62V+hxsyWAi6JNP7u1Fc5JKYAbpb4RRVw8Rhvmz5cQ=="; - }; - } - { - name = "png_js___png_js_1.0.0.tgz"; - path = fetchurl { - name = "png_js___png_js_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/png-js/-/png-js-1.0.0.tgz"; - sha512 = "k+YsbhpA9e+EFfKjTCH3VW6aoKlyNYI6NYdTfDL4CIvFnvsuO84ttonmZE7rc+v23SLTH8XX+5w/Ak9v0xGY4g=="; - }; - } - { - name = "popper.js___popper.js_1.16.1.tgz"; - path = fetchurl { - name = "popper.js___popper.js_1.16.1.tgz"; - url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz"; - sha512 = "Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ=="; - }; - } - { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - path = fetchurl { - name = "prelude_ls___prelude_ls_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; - }; - } - { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - path = fetchurl { - name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; - sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; - }; - } - { - name = "quote_stream___quote_stream_1.0.2.tgz"; - path = fetchurl { - name = "quote_stream___quote_stream_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz"; - sha512 = "kKr2uQ2AokadPjvTyKJQad9xELbZwYzWlNfI3Uz2j/ib5u6H9lDP7fUUR//rMycd0gv4Z5P1qXMfXR8YpIxrjQ=="; - }; - } - { - name = "raphael___raphael_2.3.0.tgz"; - path = fetchurl { - name = "raphael___raphael_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/raphael/-/raphael-2.3.0.tgz"; - sha512 = "w2yIenZAQnp257XUWGni4bLMVxpUpcIl7qgxEgDIXtmSypYtlNxfXWpOBxs7LBTps5sDwhRnrToJrMUrivqNTQ=="; - }; - } - { - name = "readable_stream___readable_stream_2.3.7.tgz"; - path = fetchurl { - name = "readable_stream___readable_stream_2.3.7.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; - sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; - }; - } - { - name = "regexp.prototype.flags___regexp.prototype.flags_1.4.3.tgz"; - path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"; - sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; - }; - } - { - name = "resolve___resolve_1.1.7.tgz"; - path = fetchurl { - name = "resolve___resolve_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz"; - sha512 = "9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg=="; - }; - } - { - name = "resolve___resolve_1.22.1.tgz"; - path = fetchurl { - name = "resolve___resolve_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz"; - sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; - }; - } - { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; - path = fetchurl { - name = "safe_buffer___safe_buffer_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; - sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; - }; - } - { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - path = fetchurl { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - } - { - name = "sax___sax_1.2.4.tgz"; - path = fetchurl { - name = "sax___sax_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; - }; - } - { - name = "scope_analyzer___scope_analyzer_2.1.2.tgz"; - path = fetchurl { - name = "scope_analyzer___scope_analyzer_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/scope-analyzer/-/scope-analyzer-2.1.2.tgz"; - sha512 = "5cfCmsTYV/wPaRIItNxatw02ua/MThdIUNnUOCYp+3LSEJvnG804ANw2VLaavNILIfWXF1D1G2KNANkBBvInwQ=="; - }; - } - { - name = "select2___select2_4.0.13.tgz"; - path = fetchurl { - name = "select2___select2_4.0.13.tgz"; - url = "https://registry.yarnpkg.com/select2/-/select2-4.0.13.tgz"; - sha512 = "1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw=="; - }; - } - { - name = "setimmediate___setimmediate_1.0.5.tgz"; - path = fetchurl { - name = "setimmediate___setimmediate_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz"; - sha512 = "MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="; - }; - } - { - name = "shallow_copy___shallow_copy_0.0.1.tgz"; - path = fetchurl { - name = "shallow_copy___shallow_copy_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz"; - sha512 = "b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw=="; - }; - } - { - name = "source_map___source_map_0.5.7.tgz"; - path = fetchurl { - name = "source_map___source_map_0.5.7.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; - sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="; - }; - } - { - name = "source_map___source_map_0.1.43.tgz"; - path = fetchurl { - name = "source_map___source_map_0.1.43.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz"; - sha512 = "VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ=="; - }; - } - { - name = "source_map___source_map_0.6.1.tgz"; - path = fetchurl { - name = "source_map___source_map_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; - }; - } - { - name = "sourcemap_codec___sourcemap_codec_1.4.8.tgz"; - path = fetchurl { - name = "sourcemap_codec___sourcemap_codec_1.4.8.tgz"; - url = "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"; - sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; - }; - } - { - name = "sparklines___sparklines_1.3.0.tgz"; - path = fetchurl { - name = "sparklines___sparklines_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/sparklines/-/sparklines-1.3.0.tgz"; - sha512 = "CkFtpDE3hmOeu1IJyIQIOH0AQtHnPj1c61ALxJZQ9cPEFKDgWC1fcNAHuwPi1i1klTDYvlKKseoYHSwe7JmdLA=="; - }; - } - { - name = "static_eval___static_eval_2.1.0.tgz"; - path = fetchurl { - name = "static_eval___static_eval_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/static-eval/-/static-eval-2.1.0.tgz"; - sha512 = "agtxZ/kWSsCkI5E4QifRwsaPs0P0JmZV6dkLz6ILYfFYQGn+5plctanRN+IC8dJRiFkyXHrwEE3W9Wmx67uDbw=="; - }; - } - { - name = "static_module___static_module_3.0.4.tgz"; - path = fetchurl { - name = "static_module___static_module_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/static-module/-/static-module-3.0.4.tgz"; - sha512 = "gb0v0rrgpBkifXCa3yZXxqVmXDVE+ETXj6YlC/jt5VzOnGXR2C15+++eXuMDUYsePnbhf+lwW0pE1UXyOLtGCw=="; - }; - } - { - name = "string_decoder___string_decoder_1.1.1.tgz"; - path = fetchurl { - name = "string_decoder___string_decoder_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; - sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; - }; - } - { - name = "summernote___summernote_0.8.20.tgz"; - path = fetchurl { - name = "summernote___summernote_0.8.20.tgz"; - url = "https://registry.yarnpkg.com/summernote/-/summernote-0.8.20.tgz"; - sha512 = "W9RhjQjsn+b1s9xiJQgJbCiYGJaDAc9CdEqXo+D13WuStG8lCdtKaO5AiNiSSMJsQJN2EfGSwbBQt+SFE2B8Kw=="; - }; - } - { - name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; - path = fetchurl { - name = "supports_preserve_symlinks_flag___supports_preserve_symlinks_flag_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; - sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; - }; - } - { - name = "sweetalert2___sweetalert2_11.7.2.tgz"; - path = fetchurl { - name = "sweetalert2___sweetalert2_11.7.2.tgz"; - url = "https://registry.yarnpkg.com/sweetalert2/-/sweetalert2-11.7.2.tgz"; - sha512 = "atPjDa3fv/4xwZpiAt7FZUgAhR5VAASiLP2hu7HUeVDXx+v4/9nD1W0u8xal1e9f2/qGh0DwTxPXPV9XoZIBvg=="; - }; - } - { - name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.39.2.tgz"; - path = fetchurl { - name = "tempusdominus_bootstrap_4___tempusdominus_bootstrap_4_5.39.2.tgz"; - url = "https://registry.yarnpkg.com/tempusdominus-bootstrap-4/-/tempusdominus-bootstrap-4-5.39.2.tgz"; - sha512 = "8Au4miSAsMGdsElPg87EUmsN7aGJFaRA5Y8Ale7dDTfhhnQL1Za53LclIJkq+t/7NO5+Ufr1jY7tmEPvWGHaVg=="; - }; - } - { - name = "through2___through2_2.0.5.tgz"; - path = fetchurl { - name = "through2___through2_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz"; - sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; - }; - } - { - name = "through___through_2.3.8.tgz"; - path = fetchurl { - name = "through___through_2.3.8.tgz"; - url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; - }; - } - { - name = "tiny_inflate___tiny_inflate_1.0.3.tgz"; - path = fetchurl { - name = "tiny_inflate___tiny_inflate_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz"; - sha512 = "pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw=="; - }; - } - { - name = "toastr___toastr_2.1.4.tgz"; - path = fetchurl { - name = "toastr___toastr_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/toastr/-/toastr-2.1.4.tgz"; - sha512 = "LIy77F5n+sz4tefMmFOntcJ6HL0Fv3k1TDnNmFZ0bU/GcvIIfy6eG2v7zQmMiYgaalAiUv75ttFrPn5s0gyqlA=="; - }; - } - { - name = "type_check___type_check_0.3.2.tgz"; - path = fetchurl { - name = "type_check___type_check_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz"; - sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; - }; - } - { - name = "type___type_1.2.0.tgz"; - path = fetchurl { - name = "type___type_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz"; - sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; - }; - } - { - name = "type___type_2.7.2.tgz"; - path = fetchurl { - name = "type___type_2.7.2.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz"; - sha512 = "dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw=="; - }; - } - { - name = "typedarray___typedarray_0.0.6.tgz"; - path = fetchurl { - name = "typedarray___typedarray_0.0.6.tgz"; - url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; - }; - } - { - name = "unicode_properties___unicode_properties_1.4.1.tgz"; - path = fetchurl { - name = "unicode_properties___unicode_properties_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/unicode-properties/-/unicode-properties-1.4.1.tgz"; - sha512 = "CLjCCLQ6UuMxWnbIylkisbRj31qxHPAurvena/0iwSVbQ2G1VY5/HjV0IRabOEbDHlzZlRdCrD4NhB0JtU40Pg=="; - }; - } - { - name = "unicode_trie___unicode_trie_2.0.0.tgz"; - path = fetchurl { - name = "unicode_trie___unicode_trie_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/unicode-trie/-/unicode-trie-2.0.0.tgz"; - sha512 = "x7bc76x0bm4prf1VLg79uhAzKw8DVboClSN5VxJuQ+LKDOVEW9CdH+VY7SP+vX7xCYQqzzgQpFqz15zeLvAtZQ=="; - }; - } - { - name = "universalify___universalify_2.0.0.tgz"; - path = fetchurl { - name = "universalify___universalify_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; - }; - } - { - name = "uplot___uplot_1.6.24.tgz"; - path = fetchurl { - name = "uplot___uplot_1.6.24.tgz"; - url = "https://registry.yarnpkg.com/uplot/-/uplot-1.6.24.tgz"; - sha512 = "WpH2BsrFrqxkMu+4XBvc0eCDsRBhzoq9crttYeSI0bfxpzR5YoSVzZXOKFVWcVC7sp/aDXrdDPbDZGCtck2PVg=="; - }; - } - { - name = "util_deprecate___util_deprecate_1.0.2.tgz"; - path = fetchurl { - name = "util_deprecate___util_deprecate_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; - }; - } - { - name = "word_wrap___word_wrap_1.2.3.tgz"; - path = fetchurl { - name = "word_wrap___word_wrap_1.2.3.tgz"; - url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; - sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; - }; - } - { - name = "xmldoc___xmldoc_1.2.0.tgz"; - path = fetchurl { - name = "xmldoc___xmldoc_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/xmldoc/-/xmldoc-1.2.0.tgz"; - sha512 = "2eN8QhjBsMW2uVj7JHLHkMytpvGHLHxKXBy4J3fAT/HujsEtM6yU84iGjpESYGHg6XwK0Vu4l+KgqQ2dv2cCqg=="; - }; - } - { - name = "xtend___xtend_4.0.2.tgz"; - path = fetchurl { - name = "xtend___xtend_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"; - sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; - }; - } - ]; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix index 4c278dcdf8..1dcc539d71 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "3.3.2"; + version = "3.4.2"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "v${version}"; - hash = "sha256-crYxrjfo0fss9uOl7k2C2ZCpbQExxnAX4520k4iPhuo="; + hash = "sha256-i+RD0f3WxdW0PgMNynsIXnOfEdh3vS3NufJyXpw0EU0="; }; - vendorHash = "sha256-PgUj7MxGeDA7hYXzN/WWwZrUthkxyQL+MnSx9ZpzHms="; + vendorHash = "sha256-lrK4L7oTR5qP34Df0UJnTJATmKUmHVZeGrD9kD+sZFw="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix b/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix index bb9bb957f3..038d904f45 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/qv2ray/default.nix @@ -42,7 +42,6 @@ mkDerivation rec { }; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DQV2RAY_DISABLE_AUTO_UPDATE=on" "-DQV2RAY_USE_V5_CORE=on" "-DQV2RAY_TRANSLATION_PATH=${placeholder "out"}/share/qv2ray/lang" diff --git a/third_party/nixpkgs/pkgs/applications/networking/r53-ddns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/r53-ddns/default.nix index 321d1268ca..6761741ce9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/r53-ddns/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/r53-ddns/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-KJAPhSGaC3upWLfo2eeSD3Vit9Blmbol7s8y3f849N4="; }; - vendorSha256 = "sha256-KkyMd94cejWkgg/RJudy1lm/M3lsEJXFGqVTzGIX3qM="; + vendorHash = "sha256-KkyMd94cejWkgg/RJudy1lm/M3lsEJXFGqVTzGIX3qM="; meta = with lib; { license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix index f9668a9eea..66b8f8d59b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/anydesk/default.nix @@ -18,14 +18,14 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" ]; - hash = "sha256-lqfe0hROza/zgcNOSe7jJ1yqqsAIR+kav153g3BsmJw="; + hash = "sha256-seMzfTXOGa+TljgpmIsgFOis+79r0bWt+4vH3Nb+5FI="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix index cd5f21a15e..052369bfcc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -216,7 +216,7 @@ stdenv.mkDerivation rec { description = "Citrix Workspace"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; - maintainers = with maintainers; [ pmenke michaeladler ]; + maintainers = with maintainers; [ michaeladler ]; inherit homepage; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix index f586f4f3e9..b9b8ee29b1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix @@ -76,13 +76,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.10.0"; + version = "2.11.2"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-4sq3LblFRWCBREudtzg+o9wjstm58gPzBq7QAwlWvEg="; + sha256 = "sha256-buInsfjzpY4EF7bSojy42YNXssbNriSQGYBFE/DUJ7A="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix index 64ebd27001..9e3eeb711c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, fetchpatch, cmake, ninja, pkg-config, wrapGAppsHook +, desktopToDarwinBundle , glib, gtk3, gettext, libxkbfile, libX11, python3 , freerdp, libssh, libgcrypt, gnutls, vte , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 @@ -23,7 +24,16 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-oEgpav4oQ9Sld9PY4TsutS5xEnhQgOHnpQhDesRFTeQ="; }; - nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; + patches = [ + # https://gitlab.com/Remmina/Remmina/-/merge_requests/2525 + (fetchpatch { + url = "https://gitlab.com/Remmina/Remmina/-/commit/2ce153411597035d0f3db5177d703541e09eaa06.patch"; + hash = "sha256-RV/8Ze9aN4dW49Z+y3z0jFs4dyEWu7DK2FABtmse9Hc="; + }) + ]; + + nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ] + ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; buildInputs = [ gsettings-desktop-schemas diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/Cargo.lock b/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/Cargo.lock index 656b0fd9b0..1dc94cfdae 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/Cargo.lock @@ -18,30 +18,74 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "adler32" -version = "1.2.0" +name = "aes" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" +checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" +dependencies = [ + "cfg-if 1.0.0", + "cipher", + "cpufeatures", + "opaque-debug", +] + +[[package]] +name = "ahash" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] [[package]] -name = "alsa" -version = "0.6.0" +name = "allo-isolate" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" +checksum = "8ed55848be9f41d44c79df6045b680a74a78bc579e0813f7f196cd7928e22fb1" +dependencies = [ + "anyhow", + "atomic", + "chrono", + "uuid", +] + +[[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 = "alsa" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" dependencies = [ "alsa-sys", "bitflags", "libc", - "nix 0.23.2", + "nix 0.24.3", ] [[package]] @@ -56,15 +100,15 @@ dependencies = [ [[package]] name = "android_log-sys" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" +checksum = "27f0fc03f560e1aebde41c2398b691cb98b5ea5996a6184a7a67bbbb77448969" [[package]] name = "android_logger" -version = "0.11.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8619b80c242aa7bd638b5c7ddd952addeecb71f69c75e33f1d47b2804f8f883a" +checksum = "3fa490e751f3878eb9accb9f18988eca52c2337ce000a8bf31ef50d4c723ca9e" dependencies = [ "android_log-sys", "env_logger 0.10.0", @@ -91,16 +135,102 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.70" +name = "anstream" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" + +[[package]] +name = "anstyle-parse" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] +name = "anyhow" +version = "1.0.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" + +[[package]] +name = "apple-bindgen" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f109ee76f68b4767848cb5dc93bfcc7c425deca849c4c81fa11cdce525e3d2" +dependencies = [ + "apple-sdk", + "bindgen 0.63.0", + "derive_more", + "regex", + "serde 1.0.163", + "thiserror", + "toml 0.6.0", +] + +[[package]] +name = "apple-sdk" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a04f192a700686ee70008ff4e4eb76fe7d11814ab93b7ee9d48c36b9a9f0bd2a" +dependencies = [ + "plist", + "serde 1.0.163", + "serde_json 1.0.96", +] + +[[package]] +name = "apple-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12b3a1c3342678cd72676d0c1644fde496c1f65ea41f51465f54a89cad3bdf34" +dependencies = [ + "apple-bindgen", + "apple-sdk", + "objc", +] [[package]] name = "arboard" -version = "2.1.1" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc120354d1b5ec6d7aaf4876b602def75595937b5e15d356eb554ab5177e08bb" +checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854" dependencies = [ "clipboard-win", "core-graphics", @@ -109,73 +239,174 @@ dependencies = [ "objc", "objc-foundation", "objc_id", - "parking_lot 0.12.1", + "once_cell", + "parking_lot", "thiserror", "winapi 0.3.9", "x11rb", ] +[[package]] +name = "async-broadcast" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" +dependencies = [ + "event-listener", + "futures-core", +] + +[[package]] +name = "async-channel" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-executor" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "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 1.1.0", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg 1.1.0", + "cfg-if 1.0.0", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling", + "rustix", + "slab", + "socket2 0.4.9", + "waker-fn", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "async-process" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +dependencies = [ + "async-io", + "async-lock", + "autocfg 1.1.0", + "blocking", + "cfg-if 1.0.0", + "event-listener", + "futures-lite", + "rustix", + "signal-hook", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +dependencies = [ + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 2.0.15", +] + +[[package]] +name = "async-task" +version = "4.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" + [[package]] name = "async-trait" version = "0.1.68" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 2.0.15", ] [[package]] name = "atk" -version = "0.9.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812b4911e210bd51b24596244523c856ca749e6223c50a7fbbba3f89ee37c426" +checksum = "39991bc421ddf72f70159011b323ff49b0f783cc676a7287c59453da2e2531cf" dependencies = [ - "atk-sys 0.10.0", + "atk-sys", "bitflags", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "libc", -] - -[[package]] -name = "atk" -version = "0.15.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c3d816ce6f0e2909a96830d6911c2aff044370b1ef92d7f267b43bae5addedd" -dependencies = [ - "atk-sys 0.15.1", - "bitflags", - "glib 0.15.12", + "glib 0.16.7", "libc", ] [[package]] name = "atk-sys" -version = "0.10.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f530e4af131d94cc4fa15c5c9d0348f0ef28bac64ba660b6b2a1cf2605dedfce" +checksum = "11ad703eb64dc058024f0e57ccfa069e15a413b98dbd50a1a950e743b7f11148" dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", - "system-deps 1.3.2", + "system-deps 6.1.0", ] [[package]] -name = "atk-sys" -version = "0.15.1" +name = "atomic" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +checksum = "b88d82667eca772c4aa12f0f1348b3ae643424c8876448f3f7bd5787032e234c" dependencies = [ - "glib-sys 0.15.10", - "gobject-sys 0.15.10", - "libc", - "system-deps 6.0.4", + "autocfg 1.1.0", ] +[[package]] +name = "atomic-waker" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" + [[package]] name = "atty" version = "0.2.14" @@ -217,18 +448,18 @@ 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.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + [[package]] name = "bindgen" version = "0.59.2" @@ -244,12 +475,34 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", "regex", "rustc-hash", "shlex", - "which 4.4.0", + "which", +] + +[[package]] +name = "bindgen" +version = "0.63.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" +dependencies = [ + "bitflags", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "proc-macro2 1.0.63", + "quote 1.0.27", + "regex", + "rustc-hash", + "shlex", + "syn 1.0.109", + "which", ] [[package]] @@ -264,20 +517,61 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", "regex", "rustc-hash", "shlex", "syn 1.0.109", ] +[[package]] +name = "bindgen" +version = "0.65.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +dependencies = [ + "bitflags", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "prettyplease", + "proc-macro2 1.0.63", + "quote 1.0.27", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.15", + "which", +] + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[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" @@ -294,10 +588,52 @@ dependencies = [ ] [[package]] -name = "bumpalo" -version = "3.12.0" +name = "blocking" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +dependencies = [ + "async-channel", + "async-lock", + "async-task", + "atomic-waker", + "fastrand", + "futures-lite", + "log", +] + +[[package]] +name = "brotli" +version = "3.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", +] + +[[package]] +name = "brotli-decompressor" +version = "2.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + +[[package]] +name = "build-target" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b" + +[[package]] +name = "bumpalo" +version = "3.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" [[package]] name = "bytemuck" @@ -316,55 +652,104 @@ name = "bytes" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +dependencies = [ + "serde 1.0.163", +] [[package]] -name = "cairo-rs" -version = "0.9.1" +name = "bzip2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5c0f2e047e8ca53d0ff249c54ae047931d7a6ebe05d00af73e0ffeb6e34bdb8" +checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" dependencies = [ - "bitflags", - "cairo-sys-rs 0.10.0", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "bzip2-sys", "libc", - "thiserror", +] + +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", ] [[package]] name = "cairo-rs" -version = "0.15.12" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c76ee391b03d35510d9fa917357c7f1855bd9a6659c95a1b392e33f49b3369bc" +checksum = "f3125b15ec28b84c238f6f476c6034016a5f6cc0221cb514ca46c532139fc97d" dependencies = [ "bitflags", - "cairo-sys-rs 0.15.1", - "glib 0.15.12", + "cairo-sys-rs", + "glib 0.16.7", "libc", + "once_cell", "thiserror", ] [[package]] name = "cairo-sys-rs" -version = "0.10.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ed2639b9ad5f1d6efa76de95558e11339e7318426d84ac4890b86c03e828ca7" +checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" dependencies = [ - "glib-sys 0.10.1", + "glib-sys 0.16.3", "libc", - "system-deps 1.3.2", + "system-deps 6.1.0", ] [[package]] -name = "cairo-sys-rs" -version = "0.15.1" +name = "camino" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +checksum = "c530edf18f37068ac2d977409ed5cd50d53d73bc653c7647b48eb78976ac9ae2" dependencies = [ - "glib-sys 0.15.10", - "libc", - "system-deps 6.0.4", + "serde 1.0.163", +] + +[[package]] +name = "cargo-platform" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbdb825da8a5df079a43676dbe042702f1707b1109f713a01420fbb4cc71fa27" +dependencies = [ + "serde 1.0.163", +] + +[[package]] +name = "cargo_metadata" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" +dependencies = [ + "camino", + "cargo-platform", + "semver", + "serde 1.0.163", + "serde_json 1.0.96", +] + +[[package]] +name = "cbindgen" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6358dedf60f4d9b8db43ad187391afe959746101346fe51bb978126bec61dfb" +dependencies = [ + "clap 3.2.25", + "heck 0.4.1", + "indexmap", + "log", + "proc-macro2 1.0.63", + "quote 1.0.27", + "serde 1.0.163", + "serde_json 1.0.96", + "syn 1.0.109", + "tempfile", + "toml 0.5.11", ] [[package]] @@ -393,11 +778,12 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6" +checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9" dependencies = [ "smallvec", + "target-lexicon", ] [[package]] @@ -419,11 +805,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", + "js-sys", "num-integer", "num-traits 0.2.15", + "time 0.1.45", + "wasm-bindgen", "winapi 0.3.9", ] +[[package]] +name = "cidr-utils" +version = "0.5.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdfa36f04861d39453affe1cf084ce2d6554021a84eb6f31ebdeafb6fb92a01c" +dependencies = [ + "debug-helper", + "num-bigint", + "num-traits 0.2.15", + "once_cell", + "regex", +] + +[[package]] +name = "cipher" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" +dependencies = [ + "generic-array", +] + [[package]] name = "clang-sys" version = "1.6.1" @@ -432,7 +843,7 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.7.4", ] [[package]] @@ -452,19 +863,55 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.23" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags", - "clap_lex", + "clap_lex 0.2.4", "indexmap", "strsim 0.10.0", "termcolor", "textwrap 0.16.0", ] +[[package]] +name = "clap" +version = "4.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938" +dependencies = [ + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex 0.4.1", + "strsim 0.10.0", +] + +[[package]] +name = "clap_derive" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" +dependencies = [ + "heck 0.4.1", + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 2.0.15", +] + [[package]] name = "clap_lex" version = "0.2.4" @@ -474,6 +921,12 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "clap_lex" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" + [[package]] name = "clipboard" version = "0.1.0" @@ -481,25 +934,11 @@ dependencies = [ "cc", "hbb_common", "lazy_static", - "serde 1.0.159", + "serde 1.0.163", "serde_derive", "thiserror", ] -[[package]] -name = "clipboard-master" -version = "3.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "459887701008d8ee21f8de7f45f0f0707417c7eea3311973f6e67222bd686b7a" -dependencies = [ - "objc", - "objc-foundation", - "objc_id", - "winapi 0.3.9", - "windows-win", - "x11-clipboard", -] - [[package]] name = "clipboard-win" version = "4.5.0" @@ -576,6 +1015,23 @@ 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 = "colored" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" +dependencies = [ + "atty", + "lazy_static", + "winapi 0.3.9", +] + [[package]] name = "combine" version = "4.6.6" @@ -586,27 +1042,96 @@ dependencies = [ "memchr", ] +[[package]] +name = "concurrent-queue" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "confy" -version = "0.4.0" -source = "git+https://github.com/open-trade/confy#630cc28a396cb7d01eefdd9f3824486fe4d8554b" +version = "0.4.0-2" +source = "git+https://github.com/open-trade/confy#7855cd3c32b1a60b44e5076ee8f6b4131da10350" dependencies = [ "directories-next", - "serde 1.0.159", + "serde 1.0.163", "thiserror", "toml 0.5.11", ] +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen", +] + +[[package]] +name = "const_fn" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + +[[package]] +name = "const_format" +version = "0.2.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" +dependencies = [ + "proc-macro2 1.0.63", + "quote 1.0.27", + "unicode-xid 0.2.4", +] + +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "convert_case" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8" + [[package]] name = "core-foundation" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "core-foundation-sys", + "core-foundation-sys 0.8.4", "libc", ] +[[package]] +name = "core-foundation-sys" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" + [[package]] name = "core-foundation-sys" version = "0.8.4" @@ -640,11 +1165,12 @@ dependencies = [ [[package]] name = "coreaudio-rs" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" +checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff" dependencies = [ "bitflags", + "core-foundation-sys 0.6.2", "coreaudio-sys", ] @@ -659,34 +1185,34 @@ dependencies = [ [[package]] name = "cpal" -version = "0.13.5" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74117836a5124f3629e4b474eed03e479abaf98988b4bb317e29f08cfe0e4116" +checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" dependencies = [ "alsa", - "core-foundation-sys", + "core-foundation-sys 0.8.4", "coreaudio-rs", - "jni", + "dasp_sample", + "jni 0.19.0", "js-sys", - "lazy_static", "libc", - "mach", + "mach2", "ndk", - "ndk-glue", - "nix 0.23.2", + "ndk-context", "oboe", - "parking_lot 0.11.2", - "stdweb", - "thiserror", + "once_cell", + "parking_lot", + "wasm-bindgen", + "wasm-bindgen-futures", "web-sys", - "winapi 0.3.9", + "windows 0.46.0", ] [[package]] name = "cpufeatures" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] @@ -702,9 +1228,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -753,6 +1279,12 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-common" version = "0.1.6" @@ -794,10 +1326,10 @@ dependencies = [ "cc", "codespan-reporting", "once_cell", - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", "scratch", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -812,44 +1344,35 @@ version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 2.0.15", ] [[package]] -name = "darling" -version = "0.13.4" +name = "dark-light" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "a62007a65515b3cd88c733dd3464431f05d2ad066999a824259d8edc3cf6f645" dependencies = [ - "darling_core", - "darling_macro", + "dconf_rs", + "detect-desktop-environment", + "dirs 4.0.0", + "objc", + "rust-ini", + "web-sys", + "winreg 0.10.1", + "zbus", + "zvariant", ] [[package]] -name = "darling_core" -version = "0.13.4" +name = "dart-sys" +version = "4.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "8d8b5680b5c2cc52f50acb2457d9b3a3b58adcca785db13a0e3655626f601de6" dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.13.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" -dependencies = [ - "darling_core", - "quote", - "syn 1.0.109", + "cc", ] [[package]] @@ -983,15 +1506,84 @@ dependencies = [ ] [[package]] -name = "deflate" -version = "0.8.6" +name = "dbus-crossroads" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" +checksum = "3a4c83437187544ba5142427746835061b330446ca8902eabd70e4afb8f76de0" dependencies = [ - "adler32", - "byteorder", + "dbus", ] +[[package]] +name = "dconf_rs" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7046468a81e6a002061c01e6a7c83139daf91b11c30e66795b13217c2d885c8b" + +[[package]] +name = "debug-helper" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" + +[[package]] +name = "default-net" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4898b43aed56499fad6b294d15b3e76a51df68079bf492e5daae38ca084e003" +dependencies = [ + "dlopen2", + "libc", + "memalloc", + "netlink-packet-core", + "netlink-packet-route", + "netlink-sys", + "once_cell", + "system-configuration", + "windows 0.32.0", +] + +[[package]] +name = "delegate" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "082a24a9967533dc5d743c602157637116fc1b52806d694a5a45e6f32567fcdd" +dependencies = [ + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 1.0.109", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2 1.0.63", + "quote 1.0.27", + "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 0.4.0", + "proc-macro2 1.0.63", + "quote 1.0.27", + "rustc_version", + "syn 1.0.109", +] + +[[package]] +name = "detect-desktop-environment" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21d8ad60dd5b13a4ee6bd8fa2d5d88965c597c67bce32b5fc49c94f55cb50810" + [[package]] name = "digest" version = "0.10.6" @@ -1000,6 +1592,7 @@ checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ "block-buffer", "crypto-common", + "subtle", ] [[package]] @@ -1012,6 +1605,34 @@ dependencies = [ "dirs-sys-next", ] +[[package]] +name = "dirs" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" +dependencies = [ + "cfg-if 0.1.10", + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + [[package]] name = "dirs-next" version = "2.0.0" @@ -1022,6 +1643,29 @@ dependencies = [ "dirs-sys-next", ] +[[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", +] + +[[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 = "dirs-sys-next" version = "0.1.2" @@ -1039,6 +1683,58 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "dlopen" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71e80ad39f814a9abe68583cd50a2d45c8a67561c3361ab8da240587dda80937" +dependencies = [ + "dlopen_derive", + "lazy_static", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "dlopen2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b121caccfc363e4d9a4589528f3bef7c71b83c6ed01c8dc68cbeeb7fd29ec698" +dependencies = [ + "dlopen2_derive", + "libc", + "once_cell", + "winapi 0.3.9", +] + +[[package]] +name = "dlopen2_derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a09ac8bb8c16a282264c379dffba707b9c998afc7506009137f3c6136888078" +dependencies = [ + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 1.0.109", +] + +[[package]] +name = "dlopen_derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f236d9e1b1fbd81cea0f9cbdc8dcc7e8ebcd80e6659cd7cb2ad5f6c05946c581" +dependencies = [ + "libc", + "quote 0.6.13", + "syn 0.15.44", +] + +[[package]] +name = "dlv-list" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" + [[package]] name = "docopt" version = "1.1.1" @@ -1047,7 +1743,7 @@ checksum = "7f3f119846c823f9eafcf953a8f6ffb6ed69bf6240883261a7f13b634579a51f" dependencies = [ "lazy_static", "regex", - "serde 1.0.159", + "serde 1.0.163", "strsim 0.10.0", ] @@ -1057,6 +1753,18 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +[[package]] +name = "dylib_virtual_display" +version = "0.1.0" +dependencies = [ + "cc", + "hbb_common", + "lazy_static", + "serde 1.0.163", + "serde_derive", + "thiserror", +] + [[package]] name = "ed25519" version = "1.5.3" @@ -1072,21 +1780,65 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +[[package]] +name = "embed-resource" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80663502655af01a2902dff3f06869330782267924bf1788410b74edcd93770a" +dependencies = [ + "cc", + "rustc_version", + "toml 0.7.3", + "vswhom", + "winreg 0.11.0", +] + +[[package]] +name = "encoding_rs" +version = "0.8.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +dependencies = [ + "cfg-if 1.0.0", +] + [[package]] name = "enigo" version = "0.0.14" dependencies = [ "core-graphics", - "libc", + "hbb_common", "log", "objc", "pkg-config", - "serde 1.0.159", + "rdev", + "serde 1.0.163", "serde_derive", + "tfc", "unicode-segmentation", "winapi 0.3.9", ] +[[package]] +name = "enum-iterator" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7add3873b5dd076766ee79c8e406ad1a472c385476b9e38849f8eec24f1be689" +dependencies = [ + "enum-iterator-derive", +] + +[[package]] +name = "enum-iterator-derive" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eecf8589574ce9b895052fa12d69af7a233f99e6107f5cb8dd1044f2a17bfdcb" +dependencies = [ + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 2.0.15", +] + [[package]] name = "enum-map" version = "2.5.0" @@ -1102,11 +1854,44 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a4da76b3b6116d758c7ba93f7ec6a35d2e2cf24feda76c6e38a375f4d5c59f2" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", "syn 1.0.109", ] +[[package]] +name = "enum_dispatch" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11f36e95862220b211a6e2aa5eca09b4fa391b13cd52ceb8035a24bf65a79de2" +dependencies = [ + "once_cell", + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 1.0.109", +] + +[[package]] +name = "enumflags2" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +dependencies = [ + "enumflags2_derive", + "serde 1.0.163", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +dependencies = [ + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 2.0.15", +] + [[package]] name = "env_logger" version = "0.9.3" @@ -1126,22 +1911,21 @@ 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 = "err-derive" -version = "0.3.1" +name = "epoll" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" +checksum = "20df693c700404f7e19d4d6fae6b15215d2913c27955d2b9d6f2c0f537511cd0" dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", - "synstructure", + "bitflags", + "libc", ] [[package]] @@ -1176,12 +1960,35 @@ dependencies = [ ] [[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" +name = "evdev" +version = "0.11.5" +source = "git+https://github.com/fufesou/evdev#cec616e37790293d2cd2aa54a96601ed6b1b35a9" dependencies = [ - "backtrace", + "bitvec", + "libc", + "nix 0.23.2", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "exr" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdd2162b720141a91a054640662d3edce3d50a944a50ffca5313cd951abb35b4" +dependencies = [ + "bit_field", + "flume", + "half", + "lebe", + "miniz_oxide 0.6.2", + "rayon-core", + "smallvec", + "zune-inflate", ] [[package]] @@ -1193,6 +2000,26 @@ dependencies = [ "instant", ] +[[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 = [ + "chrono", + "colored", + "log", +] + [[package]] name = "field-offset" version = "0.3.5" @@ -1217,40 +2044,125 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide 0.6.2", + "miniz_oxide 0.7.1", ] [[package]] name = "flexi_logger" -version = "0.22.6" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c76a80dd14a27fc3d8bc696502132cb52b3f227256fd8601166c3a35e45f409" +checksum = "611de758a8869ffffa7524aafdb48658c64dae95cdce49654d68a8442e500d89" dependencies = [ - "ansi_term", - "atty", "chrono", "crossbeam-channel", "crossbeam-queue", "glob", + "is-terminal", "lazy_static", "log", + "nu-ansi-term", "regex", - "rustversion", "thiserror", - "time", ] +[[package]] +name = "flume" +version = "0.10.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +dependencies = [ + "futures-core", + "futures-sink", + "nanorand", + "pin-project", + "spin 0.9.8", +] + +[[package]] +name = "flutter_rust_bridge" +version = "1.75.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "907f6624c3c6a5a1421b1c1eb9c2881104607730d5f67ce7ae50051efa7a2cf3" +dependencies = [ + "allo-isolate", + "anyhow", + "build-target", + "bytemuck", + "cc", + "chrono", + "console_error_panic_hook", + "dart-sys", + "flutter_rust_bridge_macros", + "js-sys", + "lazy_static", + "libc", + "log", + "parking_lot", + "threadpool", + "uuid", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "flutter_rust_bridge_codegen" +version = "1.75.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49fdb2728cabeb86d1271ed4398ee1518b4a3d9f659756cf5021e5c5a91e3f25" +dependencies = [ + "anyhow", + "atty", + "cargo_metadata", + "cbindgen", + "chrono", + "clap 4.2.7", + "convert_case 0.5.0", + "delegate", + "enum-iterator", + "enum_dispatch", + "fern", + "itertools 0.10.5", + "lazy_static", + "log", + "pathdiff", + "quote 1.0.27", + "regex", + "serde 1.0.163", + "serde_yaml", + "strum_macros 0.24.3", + "syn 1.0.109", + "tempfile", + "thiserror", + "toml 0.5.11", + "topological-sort", +] + +[[package]] +name = "flutter_rust_bridge_macros" +version = "1.75.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de66560e226cb4a5da7ab042a0872c0be4e165288f5bcde809a08f3f5ca22962" + [[package]] name = "fnv" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "fon" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad46a0e6c9bc688823a742aa969b5c08fdc56c2a436ee00d5c6fbcb5982c55c4" +dependencies = [ + "libm", +] + [[package]] name = "foreign-types" version = "0.3.2" @@ -1266,6 +2178,28 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "form_urlencoded" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fruitbasket" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "898289b8e0528c84fb9b88f15ac9d5109bcaf23e0e49bb6f64deee0d86b6a351" +dependencies = [ + "dirs 2.0.2", + "objc", + "objc-foundation", + "objc_id", + "time 0.1.45", +] + [[package]] name = "fuchsia-cprng" version = "0.1.1" @@ -1273,20 +2207,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] -name = "fuchsia-zircon" -version = "0.3.3" +name = "funty" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" @@ -1336,15 +2260,30 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite", + "waker-fn", +] + [[package]] name = "futures-macro" version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 2.0.15", ] [[package]] @@ -1377,137 +2316,90 @@ dependencies = [ "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.13.2" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db00839b2a68a7a10af3fa28dfb3febaba3a20c3a9ac2425a33b7df1f84a6b7d" +checksum = "aa9cb33da481c6c040404a11f8212d193889e9b435db2c14fd86987f630d3ce1" dependencies = [ "bitflags", - "cairo-rs 0.9.1", - "cairo-sys-rs 0.10.0", - "gdk-pixbuf 0.9.0", - "gdk-sys 0.10.0", - "gio 0.9.1", - "gio-sys 0.10.1", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib 0.16.7", "libc", - "pango 0.9.1", -] - -[[package]] -name = "gdk" -version = "0.15.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6e05c1f572ab0e1f15be94217f0dc29088c248b14f792a5ff0af0d84bcda9e8" -dependencies = [ - "bitflags", - "cairo-rs 0.15.12", - "gdk-pixbuf 0.15.11", - "gdk-sys 0.15.1", - "gio 0.15.12", - "glib 0.15.12", - "libc", - "pango 0.15.10", + "pango", ] [[package]] name = "gdk-pixbuf" -version = "0.9.0" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6dae3cb99dd49b758b88f0132f8d401108e63ae8edd45f432d42cdff99998a" -dependencies = [ - "gdk-pixbuf-sys 0.10.0", - "gio 0.9.1", - "gio-sys 0.10.1", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "libc", -] - -[[package]] -name = "gdk-pixbuf" -version = "0.15.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad38dd9cc8b099cceecdf41375bb6d481b1b5a7cd5cd603e10a69a9383f8619a" +checksum = "c3578c60dee9d029ad86593ed88cb40f35c1b83360e12498d055022385dd9a05" dependencies = [ "bitflags", - "gdk-pixbuf-sys 0.15.10", - "gio 0.15.12", - "glib 0.15.12", + "gdk-pixbuf-sys", + "gio", + "glib 0.16.7", "libc", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.10.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bfe468a7f43e97b8d193a762b6c5cf67a7d36cacbc0b9291dbcae24bfea1e8f" +checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" dependencies = [ - "gio-sys 0.10.1", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "gio-sys", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", - "system-deps 1.3.2", -] - -[[package]] -name = "gdk-pixbuf-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" -dependencies = [ - "gio-sys 0.15.10", - "glib-sys 0.15.10", - "gobject-sys 0.15.10", - "libc", - "system-deps 6.0.4", + "system-deps 6.1.0", ] [[package]] name = "gdk-sys" -version = "0.10.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a9653cfc500fd268015b1ac055ddbc3df7a5c9ea3f4ccef147b3957bd140d69" +checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a" dependencies = [ - "cairo-sys-rs 0.10.0", - "gdk-pixbuf-sys 0.10.0", - "gio-sys 0.10.1", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", - "pango-sys 0.10.0", + "pango-sys", "pkg-config", - "system-deps 1.3.2", + "system-deps 6.1.0", ] [[package]] -name = "gdk-sys" -version = "0.15.1" +name = "gdkwayland-sys" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +checksum = "4511710212ed3020b61a8622a37aa6f0dd2a84516575da92e9b96928dcbe83ba" dependencies = [ - "cairo-sys-rs 0.15.1", - "gdk-pixbuf-sys 0.15.10", - "gio-sys 0.15.10", - "glib-sys 0.15.10", - "gobject-sys 0.15.10", + "gdk-sys", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", - "pango-sys 0.15.10", "pkg-config", - "system-deps 6.0.4", + "system-deps 6.1.0", +] + +[[package]] +name = "gdkx11-sys" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa2bf8b5b8c414bc5d05e48b271896d0fd3ddb57464a3108438082da61de6af" +dependencies = [ + "gdk-sys", + "glib-sys 0.16.3", + "libc", + "system-deps 6.1.0", + "x11 2.21.0", ] [[package]] @@ -1537,8 +2429,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", +] + +[[package]] +name = "gif" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +dependencies = [ + "color_quant", + "weezl", ] [[package]] @@ -1549,66 +2453,48 @@ checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "gio" -version = "0.9.1" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb60242bfff700772dae5d9e3a1f7aa2e4ebccf18b89662a16acb2822568561" +checksum = "2a1c84b4534a290a29160ef5c6eff2a9c95833111472e824fc5cb78b513dd092" dependencies = [ "bitflags", - "futures", "futures-channel", "futures-core", "futures-io", "futures-util", - "gio-sys 0.10.1", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "gio-sys", + "glib 0.16.7", "libc", "once_cell", + "pin-project-lite", + "smallvec", "thiserror", ] [[package]] -name = "gio" -version = "0.15.12" +name = "gio-sys" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68fdbc90312d462781a395f7a16d96a2b379bb6ef8cd6310a2df272771c4283b" +checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" +dependencies = [ + "glib-sys 0.16.3", + "gobject-sys 0.16.3", + "libc", + "system-deps 6.1.0", + "winapi 0.3.9", +] + +[[package]] +name = "git2" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" dependencies = [ "bitflags", - "futures-channel", - "futures-core", - "futures-io", - "gio-sys 0.15.10", - "glib 0.15.12", "libc", - "once_cell", - "thiserror", -] - -[[package]] -name = "gio-sys" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e24fb752f8f5d2cf6bbc2c606fd2bc989c81c5e2fe321ab974d54f8b6344eac" -dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "libc", - "system-deps 1.3.2", - "winapi 0.3.9", -] - -[[package]] -name = "gio-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" -dependencies = [ - "glib-sys 0.15.10", - "gobject-sys 0.15.10", - "libc", - "system-deps 6.0.4", - "winapi 0.3.9", + "libgit2-sys", + "log", + "url", ] [[package]] @@ -1632,18 +2518,20 @@ dependencies = [ [[package]] name = "glib" -version = "0.15.12" +version = "0.16.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edb0306fbad0ab5428b0ca674a23893db909a98582969c9b537be4ced78c505d" +checksum = "ddd4df61a866ed7259d6189b8bcb1464989a77f1d85d25d002279bbe9dd38b2f" dependencies = [ "bitflags", "futures-channel", "futures-core", "futures-executor", "futures-task", - "glib-macros 0.15.13", - "glib-sys 0.15.10", - "gobject-sys 0.15.10", + "futures-util", + "gio-sys", + "glib-macros 0.16.8", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", "once_cell", "smallvec", @@ -1658,26 +2546,26 @@ checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039" dependencies = [ "anyhow", "heck 0.3.3", - "itertools", + "itertools 0.9.0", "proc-macro-crate 0.1.5", "proc-macro-error", - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", "syn 1.0.109", ] [[package]] name = "glib-macros" -version = "0.15.13" +version = "0.16.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10c6ae9f6fa26f4fb2ac16b528d138d971ead56141de489f8111e259b9df3c4a" +checksum = "fb1a9325847aa46f1e96ffea37611b9d51fc4827e67f79e7de502a297560a67b" dependencies = [ "anyhow", "heck 0.4.1", "proc-macro-crate 1.3.1", "proc-macro-error", - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", "syn 1.0.109", ] @@ -1693,12 +2581,12 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.15.10" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" dependencies = [ "libc", - "system-deps 6.0.4", + "system-deps 6.1.0", ] [[package]] @@ -1720,13 +2608,13 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.15.10" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" dependencies = [ - "glib-sys 0.15.10", + "glib-sys 0.16.3", "libc", - "system-deps 6.0.4", + "system-deps 6.1.0", ] [[package]] @@ -1746,7 +2634,7 @@ dependencies = [ "gstreamer-sys", "libc", "muldiv", - "num-rational", + "num-rational 0.3.2", "once_cell", "paste", "pretty-hex", @@ -1864,143 +2752,137 @@ dependencies = [ [[package]] name = "gtk" -version = "0.9.2" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f022f2054072b3af07666341984562c8e626a79daa8be27b955d12d06a5ad6a" +checksum = "e4d3507d43908c866c805f74c9dd593c0ce7ba5c38e576e41846639cdcd4bee6" dependencies = [ - "atk 0.9.0", + "atk", "bitflags", - "cairo-rs 0.9.1", - "cairo-sys-rs 0.10.0", - "cc", - "gdk 0.13.2", - "gdk-pixbuf 0.9.0", - "gdk-pixbuf-sys 0.10.0", - "gdk-sys 0.10.0", - "gio 0.9.1", - "gio-sys 0.10.1", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", - "gtk-sys 0.10.0", - "libc", - "once_cell", - "pango 0.9.1", - "pango-sys 0.10.0", - "pkg-config", -] - -[[package]] -name = "gtk" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e3004a2d5d6d8b5057d2b57b3712c9529b62e82c77f25c1fecde1fd5c23bd0" -dependencies = [ - "atk 0.15.1", - "bitflags", - "cairo-rs 0.15.12", + "cairo-rs", "field-offset", "futures-channel", - "gdk 0.15.4", - "gdk-pixbuf 0.15.11", - "gio 0.15.12", - "glib 0.15.12", - "gtk-sys 0.15.3", + "gdk", + "gdk-pixbuf", + "gio", + "glib 0.16.7", + "gtk-sys", "gtk3-macros", "libc", "once_cell", - "pango 0.15.10", + "pango", "pkg-config", ] [[package]] name = "gtk-sys" -version = "0.10.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89acda6f084863307d948ba64a4b1ef674e8527dddab147ee4cdcc194c880457" +checksum = "89b5f8946685d5fe44497007786600c2f368ff6b1e61a16251c89f72a97520a3" dependencies = [ - "atk-sys 0.10.0", - "cairo-sys-rs 0.10.0", - "gdk-pixbuf-sys 0.10.0", - "gdk-sys 0.10.0", - "gio-sys 0.10.1", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", - "pango-sys 0.10.0", - "system-deps 1.3.2", -] - -[[package]] -name = "gtk-sys" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" -dependencies = [ - "atk-sys 0.15.1", - "cairo-sys-rs 0.15.1", - "gdk-pixbuf-sys 0.15.10", - "gdk-sys 0.15.1", - "gio-sys 0.15.10", - "glib-sys 0.15.10", - "gobject-sys 0.15.10", - "libc", - "pango-sys 0.15.10", - "system-deps 6.0.4", + "pango-sys", + "system-deps 6.1.0", ] [[package]] name = "gtk3-macros" -version = "0.15.6" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684c0456c086e8e7e9af73ec5b84e35938df394712054550e81558d21c44ab0d" +checksum = "096eb63c6fedf03bafe65e5924595785eaf1bcb7200dac0f2cbe9c9738f05ad8" dependencies = [ "anyhow", "proc-macro-crate 1.3.1", "proc-macro-error", - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", "syn 1.0.109", ] +[[package]] +name = "h2" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" +dependencies = [ + "bytes", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http", + "indexmap", + "slab", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "half" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +dependencies = [ + "crunchy", +] + [[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +dependencies = [ + "ahash", +] [[package]] name = "hbb_common" version = "0.1.0" dependencies = [ "anyhow", + "backtrace", "bytes", + "chrono", "confy", "directories-next", "dirs-next", - "env_logger 0.9.3", + "dlopen", + "env_logger 0.10.0", "filetime", + "flexi_logger", "futures", "futures-util", "lazy_static", + "libc", "log", "mac_address", + "machine-uid", + "osascript", "protobuf", - "protobuf-codegen-pure", + "protobuf-codegen", "quinn", "rand 0.8.5", "regex", - "serde 1.0.159", + "serde 1.0.163", "serde_derive", - "serde_json 1.0.95", + "serde_json 1.0.96", "socket2 0.3.19", "sodiumoxide", + "sysinfo", "tokio", "tokio-socks", - "tokio-util 0.6.10", - "toml 0.5.11", + "tokio-util", + "toml 0.7.3", + "uuid", "winapi 0.3.9", - "zstd", + "zstd 0.12.3+zstd.1.5.2", ] [[package]] @@ -2042,18 +2924,117 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest", +] + [[package]] name = "hound" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d13cdbd5dbb29f9c88095bbdc2590c9cba0d0a1269b983fef6b2cdd7e9f4db1" +[[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.6", +] + +[[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 = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + [[package]] name = "humantime" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +[[package]] +name = "hwcodec" +version = "0.1.1" +source = "git+https://github.com/21pages/hwcodec?branch=stable#82cdc15457e42feaf14e1b38622506b2d54baf76" +dependencies = [ + "bindgen 0.59.2", + "cc", + "log", + "serde 1.0.163", + "serde_derive", + "serde_json 1.0.96", +] + +[[package]] +name = "hyper" +version = "0.14.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" +dependencies = [ + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "httparse", + "httpdate", + "itoa 1.0.6", + "pin-project-lite", + "socket2 0.4.9", + "tokio", + "tower-service", + "tracing", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +dependencies = [ + "http", + "hyper", + "rustls 0.21.2", + "tokio", + "tokio-rustls", +] + [[package]] name = "iana-time-zone" version = "0.1.56" @@ -2061,11 +3042,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" dependencies = [ "android_system_properties", - "core-foundation-sys", + "core-foundation-sys 0.8.4", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows 0.48.0", ] [[package]] @@ -2079,27 +3060,42 @@ dependencies = [ ] [[package]] -name = "ident_case" -version = "1.0.1" +name = "idna" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] [[package]] name = "image" -version = "0.23.14" +version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" dependencies = [ "bytemuck", "byteorder", "color_quant", - "num-iter", - "num-rational", + "exr", + "gif", + "jpeg-decoder", + "num-rational 0.4.1", "num-traits 0.2.15", "png", + "qoi", "tiff", ] +[[package]] +name = "impersonate_system" +version = "0.1.0" +source = "git+https://github.com/21pages/impersonate-system#84b401893d5b6628c8b33b295328d13fbbe2674b" +dependencies = [ + "cc", +] + [[package]] name = "include_dir" version = "0.7.3" @@ -2115,8 +3111,8 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", ] [[package]] @@ -2129,6 +3125,26 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "inotify" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abf888f9575c290197b2c948dc9e9ff10bd1a39ad1ea8585f734585fa6b9d3f9" +dependencies = [ + "bitflags", + "inotify-sys", + "libc", +] + +[[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" @@ -2150,14 +3166,29 @@ dependencies = [ ] [[package]] -name = "iovec" -version = "0.1.4" +name = "ipnet" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" + +[[package]] +name = "is-terminal" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ - "libc", + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.48.0", ] +[[package]] +name = "is_debug" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89" + [[package]] name = "itertools" version = "0.9.0" @@ -2167,6 +3198,15 @@ dependencies = [ "either", ] +[[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 = "0.3.4" @@ -2193,6 +3233,36 @@ dependencies = [ "walkdir", ] +[[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" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if 1.0.0", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + [[package]] name = "jni-sys" version = "0.3.0" @@ -2210,19 +3280,37 @@ dependencies = [ [[package]] name = "jpeg-decoder" -version = "0.1.22" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" +checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +dependencies = [ + "rayon", +] [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "68c16e1bfd491478ab155fd8b4896b86f9ede344949b641e61501e07c2b8b4d5" dependencies = [ "wasm-bindgen", ] +[[package]] +name = "keepawake" +version = "0.4.3" +source = "git+https://github.com/rustdesk-org/keepawake-rs#ac395ef826b32a077bc5d2fe108cf71fde8fe2e6" +dependencies = [ + "anyhow", + "apple-sys", + "cfg-if 1.0.0", + "core-foundation", + "shadow-rs", + "windows 0.48.0", + "winres", + "zbus", +] + [[package]] name = "kernel32-sys" version = "0.2.2" @@ -2233,6 +3321,17 @@ dependencies = [ "winapi-build", ] +[[package]] +name = "keyboard-types" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7668b7cff6a51fe61cdde64cd27c8a220786f399501b57ebe36f7d8112fd68" +dependencies = [ + "bitflags", + "serde 1.0.163", + "unicode-segmentation", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -2246,65 +3345,62 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] -name = "libappindicator" -version = "0.6.1" -source = "git+https://github.com/liyue201/libappindicator-rs#3763cfd629dd90050af1feafa643cbfca0bf487e" -dependencies = [ - "glib 0.10.3", - "gtk 0.9.2", - "gtk-sys 0.10.0", - "libappindicator-sys 0.6.1", - "log", -] +name = "lebe" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libappindicator" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2d3cb96d092b4824cb306c9e544c856a4cb6210c1081945187f7f1924b47e8" +checksum = "89e1edfdc9b0853358306c6dfb4b77c79c779174256fe93d80c0b5ebca451a2f" dependencies = [ - "glib 0.15.12", - "gtk 0.15.5", - "gtk-sys 0.15.3", - "libappindicator-sys 0.7.3", + "glib 0.16.7", + "gtk", + "gtk-sys", + "libappindicator-sys", "log", ] [[package]] name = "libappindicator-sys" -version = "0.6.1" -source = "git+https://github.com/liyue201/libappindicator-rs#3763cfd629dd90050af1feafa643cbfca0bf487e" -dependencies = [ - "gtk-sys 0.10.0", - "pkg-config", -] - -[[package]] -name = "libappindicator-sys" -version = "0.7.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1b3b6681973cea8cc3bce7391e6d7d5502720b80a581c9a95c9cbaf592826aa" +checksum = "08fcb2bea89cee9613982501ec83eaa2d09256b24540ae463c52a28906163918" dependencies = [ - "gtk-sys 0.15.3", - "libloading", + "gtk-sys", + "libloading 0.7.4", "once_cell", ] [[package]] name = "libc" -version = "0.2.141" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libdbus-sys" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f8d7ae751e1cb825c840ae5e682f59b098cdfd213c350ac268b61449a5f58a0" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" dependencies = [ "pkg-config", ] +[[package]] +name = "libgit2-sys" +version = "0.14.2+1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +dependencies = [ + "cc", + "libc", + "libz-sys", + "pkg-config", +] + [[package]] name = "libloading" version = "0.7.4" @@ -2315,6 +3411,22 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "libloading" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + +[[package]] +name = "libm" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb" + [[package]] name = "libpulse-binding" version = "2.27.1" @@ -2384,6 +3496,46 @@ dependencies = [ "walkdir", ] +[[package]] +name = "libxdo" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00333b8756a3d28e78def82067a377de7fa61b24909000aeaa2b446a948d14db" +dependencies = [ + "libxdo-sys", +] + +[[package]] +name = "libxdo-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db23b9e7e2b7831bbd8aac0bbeeeb7b68cbebc162b227e7052e8e55829a09212" +dependencies = [ + "libc", + "x11 2.21.0", +] + +[[package]] +name = "libz-sys" +version = "1.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ee889ecc9568871456d42f603d6a0ce59ff328d291063a45cbdf0036baf6db" +dependencies = [ + "cc", + "libc", + "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 = "link-cplusplus" version = "1.0.8" @@ -2394,10 +3546,16 @@ dependencies = [ ] [[package]] -name = "linux-raw-sys" -version = "0.3.1" +name = "linked-hash-map" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f" [[package]] name = "lock_api" @@ -2429,30 +3587,32 @@ dependencies = [ ] [[package]] -name = "mach" -version = "0.3.2" +name = "mach2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" dependencies = [ "libc", ] [[package]] name = "machine-uid" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f1595709b0a7386bcd56ba34d250d626e5503917d05d32cdccddcd68603e212" +version = "0.3.0" +source = "git+https://github.com/21pages/machine-uid#381ff579c1dc3a6c54db9dfec47c44bcb0246542" dependencies = [ - "winreg 0.6.2", + "bindgen 0.59.2", + "cc", + "winreg 0.11.0", ] [[package]] name = "magnum-opus" version = "0.4.0" -source = "git+https://github.com/TheRadioGuy/magnum-opus#171e1d021004626f7444d1e39b98f50bc3cb2604" +source = "git+https://github.com/rustdesk/magnum-opus#5cd2bf989c148662fa3a2d9d539a71d71fd1d256" dependencies = [ - "libc", - "opusic-sys", + "bindgen 0.59.2", + "pkg-config", + "target_build_utils", ] [[package]] @@ -2464,6 +3624,18 @@ dependencies = [ "libc", ] +[[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] +name = "memalloc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df39d232f5c40b0891c10216992c2f250c054105cb1e56f0fc9032db6203ecc1" + [[package]] name = "memchr" version = "2.5.0" @@ -2479,6 +3651,15 @@ dependencies = [ "autocfg 1.1.0", ] +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg 1.1.0", +] + [[package]] name = "memoffset" version = "0.8.0" @@ -2488,31 +3669,18 @@ dependencies = [ "autocfg 1.1.0", ] +[[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.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg 1.1.0", -] - [[package]] name = "miniz_oxide" version = "0.6.2" @@ -2523,22 +3691,13 @@ dependencies = [ ] [[package]] -name = "mio" -version = "0.6.23" +name = "miniz_oxide" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow 0.2.2", - "net2", - "slab", - "winapi 0.2.8", + "adler", + "simd-adler32", ] [[package]] @@ -2549,50 +3708,45 @@ checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.45.0", ] [[package]] -name = "mio-named-pipes" -version = "0.1.7" +name = "miow" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" +checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" dependencies = [ - "log", - "mio 0.6.23", - "miow 0.3.7", - "winapi 0.3.9", + "windows-sys 0.42.0", ] [[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" +name = "mouce" +version = "0.2.1" +source = "git+https://github.com/fufesou/mouce.git#ed83800d532b95d70e39915314f6052aa433e9b9" dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", + "glob", ] [[package]] -name = "miow" -version = "0.3.7" +name = "muda" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" +checksum = "c3c820db003e601413e835a33b10cf51452b6415ef34ff1d862401826431c675" dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "miow" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7377f7792b3afb6a3cba68daa54ca23c032137010460d667fda53a8d66be00e" -dependencies = [ - "windows-sys 0.28.0", + "cocoa", + "crossbeam-channel", + "gdk", + "gdk-pixbuf", + "gtk", + "keyboard-types", + "libxdo", + "objc", + "once_cell", + "png", + "thiserror", + "windows-sys 0.48.0", ] [[package]] @@ -2602,15 +3756,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0419348c027fa7be448d2ae7ea0e4e04c2334c31dc4e74ab29f00a2a7ca69204" [[package]] -name = "ndk" -version = "0.6.0" +name = "nanorand" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" +checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +dependencies = [ + "getrandom", +] + +[[package]] +name = "ndk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ "bitflags", "jni-sys", "ndk-sys", "num_enum", + "raw-window-handle", "thiserror", ] @@ -2620,65 +3784,62 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-glue" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d0c4a7b83860226e6b4183edac21851f05d5a51756e97a1144b7f5a6b63e65f" -dependencies = [ - "lazy_static", - "libc", - "log", - "ndk", - "ndk-context", - "ndk-macro", - "ndk-sys", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling", - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "ndk-sys" -version = "0.3.0" +version = "0.4.1+23.1.7779620" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" dependencies = [ "jni-sys", ] [[package]] -name = "net2" -version = "0.2.38" +name = "netlink-packet-core" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631" +checksum = "7e5cf0b54effda4b91615c40ff0fd12d0d4c9a6e0f5116874f03941792ff535a" dependencies = [ - "cfg-if 0.1.10", + "anyhow", + "byteorder", "libc", - "winapi 0.3.9", + "netlink-packet-utils", ] [[package]] -name = "nix" -version = "0.22.3" +name = "netlink-packet-route" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" +checksum = "ea993e32c77d87f01236c38f572ecb6c311d592e56a06262a007fd2a6e31253c" dependencies = [ + "anyhow", "bitflags", - "cc", - "cfg-if 1.0.0", + "byteorder", "libc", - "memoffset 0.6.5", + "netlink-packet-core", + "netlink-packet-utils", +] + +[[package]] +name = "netlink-packet-utils" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ede8a08c71ad5a95cdd0e4e52facd37190977039a4704eb82a283f713747d34" +dependencies = [ + "anyhow", + "byteorder", + "paste", + "thiserror", +] + +[[package]] +name = "netlink-sys" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" +dependencies = [ + "bytes", + "libc", + "log", ] [[package]] @@ -2694,6 +3855,18 @@ dependencies = [ "memoffset 0.6.5", ] +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags", + "cfg-if 1.0.0", + "libc", + "memoffset 0.6.5", +] + [[package]] name = "nix" version = "0.26.2" @@ -2703,6 +3876,7 @@ dependencies = [ "bitflags", "cfg-if 1.0.0", "libc", + "memoffset 0.7.1", "static_assertions", ] @@ -2717,14 +3891,44 @@ dependencies = [ ] [[package]] -name = "ntapi" -version = "0.3.7" +name = "nom8" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" +dependencies = [ + "memchr", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi 0.3.9", +] + +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg 1.1.0", + "num-integer", + "num-traits 0.2.15", +] + [[package]] name = "num-complex" version = "0.4.3" @@ -2740,8 +3944,8 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", "syn 1.0.109", ] @@ -2756,10 +3960,10 @@ dependencies = [ ] [[package]] -name = "num-iter" -version = "0.1.43" +name = "num-rational" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ "autocfg 1.1.0", "num-integer", @@ -2768,9 +3972,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.3.2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" dependencies = [ "autocfg 1.1.0", "num-integer", @@ -2821,8 +4025,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", "syn 1.0.109", ] @@ -2842,6 +4046,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", + "objc_exception", ] [[package]] @@ -2855,6 +4060,15 @@ dependencies = [ "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" @@ -2875,11 +4089,11 @@ dependencies = [ [[package]] name = "oboe" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1" +checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" dependencies = [ - "jni", + "jni 0.20.0", "ndk", "ndk-context", "num-derive", @@ -2889,9 +4103,9 @@ dependencies = [ [[package]] name = "oboe-sys" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" +checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" dependencies = [ "cc", ] @@ -2902,6 +4116,12 @@ version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + [[package]] name = "openssl-probe" version = "0.1.5" @@ -2909,13 +4129,41 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] -name = "opusic-sys" -version = "0.3.6" +name = "option-ext" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eace752ce07a037241dba8f02c654799f051e431b27028056bcb480e83b54f5" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "ordered-multimap" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" dependencies = [ - "cmake", - "libc", + "dlv-list", + "hashbrown", +] + +[[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-version" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a8a1fed76ac765e39058ca106b6229a93c5a60292a1bd4b602ce2be11e1c020" +dependencies = [ + "anyhow", + "plist", + "uname", + "winapi 0.3.9", ] [[package]] @@ -2925,88 +4173,99 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" [[package]] -name = "padlock" -version = "0.2.0" +name = "osascript" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c10569378a1dacd9f30dbe7ae49e054d2c45dc2f8ee49899903e09c3924e8b6f" +checksum = "38731fa859ef679f1aec66ca9562165926b442f298467f76f5990f431efe87dc" +dependencies = [ + "serde 1.0.163", + "serde_derive", + "serde_json 1.0.96", +] [[package]] -name = "pango" -version = "0.9.1" +name = "overload" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9937068580bebd8ced19975938573803273ccbcbd598c58d4906efd4ac87c438" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "pam" +version = "0.7.0" +source = "git+https://github.com/fufesou/pam#10da2cbbabe32cbc9de22a66abe44738e7ec0ea0" dependencies = [ - "bitflags", - "glib 0.10.3", - "glib-sys 0.10.1", - "gobject-sys 0.10.0", "libc", - "once_cell", - "pango-sys 0.10.0", + "pam-macros", + "pam-sys", + "users 0.10.0", +] + +[[package]] +name = "pam-macros" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c94f3b9b97df3c6d4e51a14916639b24e02c7d15d1dba686ce9b1118277cb811" +dependencies = [ + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 1.0.109", +] + +[[package]] +name = "pam-sys" +version = "1.0.0-alpha4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9dfd42858f6a6bb1081079fd9dc259ca3e2aaece6cb689fd36b1058046c969" +dependencies = [ + "bindgen 0.59.2", + "libc", ] [[package]] name = "pango" -version = "0.15.10" +version = "0.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e4045548659aee5313bde6c582b0d83a627b7904dd20dc2d9ef0895d414e4f" +checksum = "cdff66b271861037b89d028656184059e03b0b6ccb36003820be19f7200b1e94" dependencies = [ "bitflags", - "glib 0.15.12", + "gio", + "glib 0.16.7", "libc", "once_cell", - "pango-sys 0.15.10", + "pango-sys", ] [[package]] name = "pango-sys" -version = "0.10.0" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d2650c8b62d116c020abd0cea26a4ed96526afda89b1c4ea567131fdefc890" +checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" dependencies = [ - "glib-sys 0.10.1", - "gobject-sys 0.10.0", + "glib-sys 0.16.3", + "gobject-sys 0.16.3", "libc", - "system-deps 1.3.2", -] - -[[package]] -name = "pango-sys" -version = "0.15.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" -dependencies = [ - "glib-sys 0.15.10", - "gobject-sys 0.15.10", - "libc", - "system-deps 6.0.4", + "system-deps 6.1.0", ] [[package]] name = "parity-tokio-ipc" -version = "0.7.3-1" -source = "git+https://github.com/open-trade/parity-tokio-ipc#20b2895910161605210657f3e751edd55321f698" +version = "0.7.3-2" +source = "git+https://github.com/open-trade/parity-tokio-ipc#a5b7861249107cbacc856cd43507cb95f40aef6e" dependencies = [ "futures", "libc", "log", - "mio-named-pipes", - "miow 0.4.0", + "miow", "rand 0.8.5", "tokio", "winapi 0.3.9", ] [[package]] -name = "parking_lot" -version = "0.11.2" +name = "parking" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] +checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" [[package]] name = "parking_lot" @@ -3015,21 +4274,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if 1.0.0", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi 0.3.9", + "parking_lot_core", ] [[package]] @@ -3045,18 +4290,53 @@ dependencies = [ "windows-sys 0.45.0", ] +[[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 = "paste" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +[[package]] +name = "pathdiff" +version = "0.2.1" +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", + "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 = "percent-encoding" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" + [[package]] name = "phf" version = "0.7.24" @@ -3110,8 +4390,8 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", "syn 1.0.109", ] @@ -3129,20 +4409,51 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.26" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" + +[[package]] +name = "plist" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bd9647b268a3d3e14ff09c23201133a62589c658db02bb7388c7246aafe0590" +dependencies = [ + "base64", + "indexmap", + "line-wrap", + "quick-xml", + "serde 1.0.163", + "time 0.3.21", +] [[package]] name = "png" -version = "0.16.8" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" +checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" dependencies = [ "bitflags", "crc32fast", - "deflate", - "miniz_oxide 0.3.7", + "fdeflate", + "flate2", + "miniz_oxide 0.7.1", +] + +[[package]] +name = "polling" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" +dependencies = [ + "autocfg 1.1.0", + "bitflags", + "cfg-if 1.0.0", + "concurrent-queue", + "libc", + "log", + "pin-project-lite", + "windows-sys 0.48.0", ] [[package]] @@ -3157,6 +4468,16 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" +[[package]] +name = "prettyplease" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ceca8aaf45b5c46ec7ed39fff75f57290368c1846d33d24a122ca81416ab058" +dependencies = [ + "proc-macro2 1.0.63", + "syn 2.0.15", +] + [[package]] name = "primal-check" version = "0.3.3" @@ -3182,7 +4503,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.8", ] [[package]] @@ -3192,8 +4513,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", "syn 1.0.109", "version_check", ] @@ -3204,74 +4525,88 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", "version_check", ] [[package]] name = "proc-macro2" -version = "1.0.56" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" +dependencies = [ + "unicode-xid 0.1.0", +] + +[[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 = "protobuf" -version = "3.0.0-alpha.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5ef59c35c7472ce5e1b6c5924b87585143d1fc2cf39eae0009bba6c4df62f1" +checksum = "b55bad9126f378a853655831eb7363b7b01b81d19f8cb1218861086ca4a1a61e" +dependencies = [ + "bytes", + "once_cell", + "protobuf-support", + "thiserror", +] [[package]] name = "protobuf-codegen" -version = "3.0.0-alpha.2" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89100ee819f69b77a4cab389fec9dd155a305af4c615e6413ec1ef9341f333ef" +checksum = "0dd418ac3c91caa4032d37cb80ff0d44e2ebe637b2fb243b6234bf89cdac4901" dependencies = [ "anyhow", + "once_cell", "protobuf", "protobuf-parse", - "thiserror", -] - -[[package]] -name = "protobuf-codegen-pure" -version = "3.0.0-alpha.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79453e74d08190551e821533ee42c447f9e21ca26f83520e120e6e8af27f6879" -dependencies = [ - "anyhow", - "protobuf", - "protobuf-codegen", - "protobuf-parse", - "thiserror", -] - -[[package]] -name = "protobuf-parse" -version = "3.0.0-alpha.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c265ffc69976efc3056955b881641add3186ad0be893ef10622482d80d1d2b68" -dependencies = [ - "anyhow", - "protobuf", - "protoc", + "regex", "tempfile", "thiserror", ] [[package]] -name = "protoc" -version = "3.0.0-alpha.2" +name = "protobuf-parse" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f1f8b318a54d18fbe542513331e058f4f8ce6502e542e057c50c7e5e803fdab" +checksum = "9d39b14605eaa1f6a340aec7f320b34064feb26c93aec35d6a9a2272a8ddfa49" dependencies = [ "anyhow", + "indexmap", "log", + "protobuf", + "protobuf-support", + "tempfile", "thiserror", - "which 4.4.0", + "which", +] + +[[package]] +name = "protobuf-support" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5d4d7b8601c814cfb36bcebb79f0e61e45e1e93640cf778837833bbed05c372" +dependencies = [ + "thiserror", +] + +[[package]] +name = "qoi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" +dependencies = [ + "bytemuck", ] [[package]] @@ -3289,26 +4624,25 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.22.0" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8533f14c8382aaad0d592c812ac3b826162128b65662331e1127b45c3d18536b" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" dependencies = [ "memchr", ] [[package]] name = "quinn" -version = "0.8.5" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b435e71d9bfa0d8889927231970c51fb89c58fa63bffcab117c9c7a41e5ef8f" +checksum = "445cbfe2382fa023c4f2f3c7e1c95c03dcc1df2bf23cebcb2b13e1402c4394d1" dependencies = [ "bytes", - "futures-channel", - "futures-util", - "fxhash", + "pin-project-lite", "quinn-proto", "quinn-udp", - "rustls", + "rustc-hash", + "rustls 0.20.8", "thiserror", "tokio", "tracing", @@ -3317,17 +4651,16 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.8.4" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fce546b9688f767a57530652488420d419a8b1f44a478b451c3d1ab6d992a55" +checksum = "67c10f662eee9c94ddd7135043e544f3c82fa839a1e7b865911331961b53186c" dependencies = [ "bytes", - "fxhash", "rand 0.8.5", "ring", - "rustls", + "rustc-hash", + "rustls 0.20.8", "rustls-native-certs", - "rustls-pemfile 0.2.1", "slab", "thiserror", "tinyvec", @@ -3337,27 +4670,41 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.1.4" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07946277141531aea269befd949ed16b2c85a780ba1043244eda0969e538e54" +checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" dependencies = [ - "futures-util", "libc", "quinn-proto", "socket2 0.4.9", - "tokio", "tracing", + "windows-sys 0.42.0", ] [[package]] name = "quote" -version = "1.0.26" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" dependencies = [ - "proc-macro2", + "proc-macro2 0.4.30", ] +[[package]] +name = "quote" +version = "1.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +dependencies = [ + "proc-macro2 1.0.63", +] + +[[package]] +name = "radium" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" + [[package]] name = "rand" version = "0.6.5" @@ -3494,6 +4841,12 @@ dependencies = [ "rand_core 0.3.1", ] +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + [[package]] name = "rayon" version = "1.7.0" @@ -3519,18 +4872,25 @@ dependencies = [ [[package]] name = "rdev" version = "0.5.0-2" -source = "git+https://github.com/open-trade/rdev#0ad53987fa6f0e37a7bc000358f71c3802de4e7c" +source = "git+https://github.com/fufesou/rdev#ee3057bd97c91529e8b9daf2ca133a5c49f0c0eb" dependencies = [ "cocoa", "core-foundation", - "core-foundation-sys", + "core-foundation-sys 0.8.4", "core-graphics", + "dispatch", "enum-map", + "epoll", + "inotify", "lazy_static", "libc", - "widestring 1.0.2", + "log", + "mio", + "strum 0.24.1", + "strum_macros 0.24.3", + "widestring", "winapi 0.3.9", - "x11", + "x11 2.21.0", ] [[package]] @@ -3582,9 +4942,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ "aho-corasick", "memchr", @@ -3593,9 +4953,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "repng" @@ -3607,6 +4967,44 @@ dependencies = [ "flate2", ] +[[package]] +name = "reqwest" +version = "0.11.18" +source = "git+https://github.com/rustdesk-org/reqwest#4cc834539d9c44f7b6bbc5d2f8805842dc5aa328" +dependencies = [ + "base64", + "bytes", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-rustls", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "rustls 0.21.2", + "rustls-pemfile", + "serde 1.0.163", + "serde_json 1.0.96", + "serde_urlencoded", + "tokio", + "tokio-rustls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots", + "winreg 0.50.0", +] + [[package]] name = "ring" version = "0.16.20" @@ -3616,12 +5014,21 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", + "spin 0.5.2", "untrusted", "web-sys", "winapi 0.3.9", ] +[[package]] +name = "ringbuf" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79abed428d1fd2a128201cec72c5f6938e2da607c6f3745f769fabea399d950a" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "rpassword" version = "2.1.0" @@ -3635,13 +5042,22 @@ dependencies = [ [[package]] name = "rpassword" -version = "6.0.1" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +dependencies = [ + "libc", + "rtoolbox", + "winapi 0.3.9", +] + +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" dependencies = [ "libc", - "serde 1.0.159", - "serde_json 1.0.95", "winapi 0.3.9", ] @@ -3659,12 +5075,22 @@ dependencies = [ [[package]] name = "runas" -version = "0.2.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a620b0994a180cdfa25c0439e6d58c0628272571501880d626ffff58e96a0799" +checksum = "ed87390fefd18965ff20baae5aeb9913bcf82d2b59dc04c0f6d8f17f7be56ff2" dependencies = [ "cc", - "which 3.1.1", + "which", +] + +[[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", ] [[package]] @@ -3677,9 +5103,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -3698,63 +5124,104 @@ dependencies = [ [[package]] name = "rustdesk" -version = "1.1.9" +version = "1.2.2" dependencies = [ "android_logger", "arboard", + "async-process", "async-trait", - "base64 0.13.1", + "base64", + "bytes", "cc", "cfg-if 1.0.0", - "clap 3.2.23", + "chrono", + "cidr-utils", + "clap 4.2.7", "clipboard", - "clipboard-master", "cocoa", "core-foundation", "core-graphics", "cpal", + "crossbeam-queue", "ctrlc", + "dark-light", "dasp", + "dbus", + "dbus-crossroads", + "default-net", "dispatch", "enigo", - "flexi_logger", + "errno", + "evdev", + "flutter_rust_bridge", + "flutter_rust_bridge_codegen", + "fon", + "fruitbasket", "hbb_common", + "hex", "hound", + "image", + "impersonate_system", "include_dir", + "jni 0.21.1", + "keepawake", "lazy_static", - "libc", + "libloading 0.8.0", "libpulse-binding", "libpulse-simple-binding", "mac_address", - "machine-uid", "magnum-opus", + "mouce", "num_cpus", "objc", + "objc_id", + "os-version", + "pam", "parity-tokio-ipc", "rdev", "repng", - "rpassword 6.0.1", + "reqwest", + "ringbuf", + "rpassword 7.2.0", "rubato", "runas", "rust-pulsectl", "samplerate", "sciter-rs", "scrap", - "serde 1.0.159", + "serde 1.0.163", "serde_derive", - "serde_json 1.0.95", + "serde_json 1.0.96", + "serde_repr", "sha2", + "shared_memory", + "shutdown_hooks", "sys-locale", - "sysinfo", - "systray", - "tray-item", + "system_shutdown", + "tao", + "tray-icon", + "url", + "users 0.11.0", "uuid", "virtual_display", "whoami", "winapi 0.3.9", "windows-service", - "winreg 0.10.1", + "winreg 0.11.0", "winres", + "wol-rs", + "zip", +] + +[[package]] +name = "rustdesk-portable-packer" +version = "0.1.0" +dependencies = [ + "brotli", + "dirs 5.0.1", + "embed-resource", + "md5", + "winapi 0.3.9", ] [[package]] @@ -3774,9 +5241,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.11" +version = "0.37.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" +checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" dependencies = [ "bitflags", "errno", @@ -3797,6 +5264,18 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls" +version = "0.21.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + [[package]] name = "rustls-native-certs" version = "0.6.2" @@ -3804,27 +5283,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" dependencies = [ "openssl-probe", - "rustls-pemfile 1.0.2", + "rustls-pemfile", "schannel", "security-framework", ] -[[package]] -name = "rustls-pemfile" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9" -dependencies = [ - "base64 0.13.1", -] - [[package]] name = "rustls-pemfile" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64 0.21.0", + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", ] [[package]] @@ -3839,6 +5319,12 @@ version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +[[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" @@ -3869,7 +5355,7 @@ dependencies = [ [[package]] name = "sciter-rs" version = "0.5.57" -source = "git+https://github.com/open-trade/rust-sciter?branch=dyn#82025b9ba77d5ae14543009444033036dbe25917" +source = "git+https://github.com/open-trade/rust-sciter?branch=dyn#fab913b7c2e779b05c249b0c5de5a08759b2c15d" dependencies = [ "lazy_static", "libc", @@ -3887,7 +5373,8 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" name = "scrap" version = "0.5.0" dependencies = [ - "bindgen 0.59.2", + "android_logger", + "bindgen 0.65.1", "block", "cfg-if 1.0.0", "dbus", @@ -3895,14 +5382,20 @@ dependencies = [ "gstreamer", "gstreamer-app", "gstreamer-video", - "libc", + "hbb_common", + "hwcodec", + "jni 0.21.1", + "lazy_static", + "log", + "ndk", "num_cpus", + "pkg-config", "quest", "repng", - "serde 1.0.159", + "serde 1.0.163", + "serde_json 1.0.96", "target_build_utils", "tracing", - "vcpkg", "webm", "winapi 0.3.9", ] @@ -3931,7 +5424,7 @@ checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" dependencies = [ "bitflags", "core-foundation", - "core-foundation-sys", + "core-foundation-sys 0.8.4", "libc", "security-framework-sys", ] @@ -3942,7 +5435,7 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" dependencies = [ - "core-foundation-sys", + "core-foundation-sys 0.8.4", "libc", ] @@ -3951,6 +5444,9 @@ name = "semver" version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +dependencies = [ + "serde 1.0.163", +] [[package]] name = "serde" @@ -3960,22 +5456,22 @@ checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 2.0.15", ] [[package]] @@ -3992,13 +5488,24 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa 1.0.6", "ryu", - "serde 1.0.159", + "serde 1.0.163", +] + +[[package]] +name = "serde_repr" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" +dependencies = [ + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 2.0.15", ] [[package]] @@ -4007,7 +5514,42 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" dependencies = [ - "serde 1.0.159", + "serde 1.0.163", +] + +[[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.6", + "ryu", + "serde 1.0.163", +] + +[[package]] +name = "serde_yaml" +version = "0.8.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" +dependencies = [ + "indexmap", + "ryu", + "serde 1.0.163", + "yaml-rust", +] + +[[package]] +name = "sha1" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest", ] [[package]] @@ -4021,12 +5563,54 @@ dependencies = [ "digest", ] +[[package]] +name = "shadow-rs" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "427f07ab5f873000cf55324882e12a88c0a7ea7025df4fc1e7e35e688877a583" +dependencies = [ + "const_format", + "git2", + "is_debug", + "time 0.3.21", + "tzdb", +] + +[[package]] +name = "shared_memory" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba8593196da75d9dc4f69349682bd4c2099f8cde114257d1ef7ef1b33d1aba54" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "nix 0.23.2", + "rand 0.8.5", + "win-sys", +] + [[package]] name = "shlex" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +[[package]] +name = "shutdown_hooks" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6057adedbec913419c92996f395ba69931acbd50b7d56955394cd3f7bedbfa45" + +[[package]] +name = "signal-hook" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9" +dependencies = [ + "libc", + "signal-hook-registry", +] + [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -4042,6 +5626,12 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +[[package]] +name = "simd-adler32" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" + [[package]] name = "siphasher" version = "0.2.3" @@ -4093,7 +5683,7 @@ dependencies = [ "ed25519", "libc", "libsodium-sys", - "serde 1.0.159", + "serde 1.0.163", ] [[package]] @@ -4102,18 +5692,21 @@ 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 = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stdweb" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" - [[package]] name = "str-buf" version = "1.0.6" @@ -4144,6 +5737,12 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" +[[package]] +name = "strum" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" + [[package]] name = "strum_macros" version = "0.18.0" @@ -4151,66 +5750,81 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" dependencies = [ "heck 0.3.3", - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", "syn 1.0.109", ] +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck 0.4.1", + "proc-macro2 1.0.63", + "quote 1.0.27", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "0.15.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5" +dependencies = [ + "proc-macro2 0.4.30", + "quote 0.6.13", + "unicode-xid 0.1.0", +] + [[package]] name = "syn" version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.13" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ - "proc-macro2", - "quote", + "proc-macro2 1.0.63", + "quote 1.0.27", "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.109", - "unicode-xid", -] - [[package]] name = "sys-locale" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8a11bd9c338fdba09f7881ab41551932ad42e405f61d01e8406baea71c07aee" +checksum = "ea0b9eefabb91675082b41eb94c3ecd91af7656caee3fb4961a07c0ec8c7ca6f" dependencies = [ - "js-sys", "libc", - "wasm-bindgen", - "web-sys", "windows-sys 0.45.0", ] [[package]] name = "sysinfo" -version = "0.23.13" +version = "0.29.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3977ec2e0520829be45c8a2df70db2bf364714d8a748316a10c3c35d4d2b01c9" +checksum = "c7cb97a5a85a136d84e75d5c3cf89655090602efb1be0d8d5337b7e386af2908" dependencies = [ "cfg-if 1.0.0", - "core-foundation-sys", + "core-foundation-sys 0.8.4", "libc", "ntapi", "once_cell", @@ -4218,6 +5832,27 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "system-configuration" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d75182f12f490e953596550b65ee31bda7c8e043d9386174b353bda50838c3fd" +dependencies = [ + "bitflags", + "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 0.8.4", + "libc", +] + [[package]] name = "system-deps" version = "1.3.2" @@ -4226,8 +5861,8 @@ checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b" dependencies = [ "heck 0.3.3", "pkg-config", - "strum", - "strum_macros", + "strum 0.18.0", + "strum_macros 0.18.0", "thiserror", "toml 0.5.11", "version-compare 0.0.10", @@ -4235,9 +5870,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.0.4" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f" +checksum = "e5fa6fb9ee296c0dc2df41a656ca7948546d061958115ddb0bcaae43ad0d17d2" dependencies = [ "cfg-expr", "heck 0.4.1", @@ -4247,18 +5882,84 @@ dependencies = [ ] [[package]] -name = "systray" -version = "0.4.1" -source = "git+https://github.com/liyue201/systray-rs#84cca4b4171661bc6c4d1ba5aaa2320ff8e085aa" +name = "system_shutdown" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7567f71160af5e9abfb4f5a21532cf2174cefe91ac5c336419295685a695cc66" dependencies = [ - "glib 0.10.3", - "gtk 0.9.2", - "libappindicator 0.6.1", + "windows 0.44.0", + "zbus", +] + +[[package]] +name = "tao" +version = "0.22.2" +source = "git+https://github.com/rustdesk-org/tao?branch=dev#1e5b97258cf42a30f80f85a6aa0b1a4aece1977e" +dependencies = [ + "bitflags", + "cairo-rs", + "cc", + "cocoa", + "core-foundation", + "core-graphics", + "crossbeam-channel", + "dispatch", + "gdk", + "gdk-pixbuf", + "gdk-sys", + "gdkwayland-sys", + "gdkx11-sys", + "gio", + "glib 0.16.7", + "glib-sys 0.16.3", + "gtk", + "image", + "instant", + "jni 0.21.1", + "lazy_static", "libc", "log", - "winapi 0.3.9", + "ndk", + "ndk-context", + "ndk-sys", + "objc", + "once_cell", + "parking_lot", + "png", + "raw-window-handle", + "scopeguard", + "tao-macros", + "unicode-segmentation", + "url", + "uuid", + "windows 0.48.0", + "windows-implement", + "x11-dl", + "zbus", ] +[[package]] +name = "tao-macros" +version = "0.1.2" +source = "git+https://github.com/rustdesk-org/tao?branch=dev#1e5b97258cf42a30f80f85a6aa0b1a4aece1977e" +dependencies = [ + "proc-macro2 1.0.63", + "quote 1.0.27", + "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 = "target-lexicon" +version = "0.12.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" + [[package]] name = "target_build_utils" version = "0.3.1" @@ -4316,6 +6017,18 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +[[package]] +name = "tfc" +version = "0.6.1" +source = "git+https://github.com/fufesou/The-Fat-Controller#9dd86151525fd010dc93f6bc9b6aedd1a75cc342" +dependencies = [ + "anyhow", + "core-graphics", + "unicode-segmentation", + "winapi 0.3.9", + "x11 2.19.0", +] + [[package]] name = "thiserror" version = "1.0.40" @@ -4331,39 +6044,70 @@ version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 2.0.15", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", ] [[package]] name = "tiff" -version = "0.6.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" +checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" dependencies = [ + "flate2", "jpeg-decoder", - "miniz_oxide 0.4.4", "weezl", ] [[package]] name = "time" -version = "0.3.9" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" +dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", + "winapi 0.3.9", +] + +[[package]] +name = "time" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc" dependencies = [ "itoa 1.0.6", "libc", "num_threads", + "serde 1.0.163", + "time-core", "time-macros", ] [[package]] -name = "time-macros" -version = "0.2.4" +name = "time-core" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792" +checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + +[[package]] +name = "time-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b" +dependencies = [ + "time-core", +] [[package]] name = "tinyvec" @@ -4382,38 +6126,48 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg 1.1.0", "bytes", "libc", - "mio 0.8.6", + "mio", "num_cpus", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.4.9", "tokio-macros", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.13", + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 2.0.15", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls 0.21.2", + "tokio", ] [[package]] name = "tokio-socks" -version = "0.5.1-1" -source = "git+https://github.com/open-trade/tokio-socks#7034e79263ce25c348be072808d7601d82cd892d" +version = "0.5.1-2" +source = "git+https://github.com/open-trade/tokio-socks#14a5c2564fa20a2765ea53d03c573ee2b7e20421" dependencies = [ "bytes", "either", @@ -4423,36 +6177,24 @@ dependencies = [ "pin-project", "thiserror", "tokio", - "tokio-util 0.7.7", + "tokio-util", ] [[package]] name = "tokio-util" -version = "0.6.10" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", - "log", + "futures-util", + "hashbrown", "pin-project-lite", "slab", "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", "tracing", ] @@ -4462,7 +6204,19 @@ version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ - "serde 1.0.159", + "serde 1.0.163", +] + +[[package]] +name = "toml" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217" +dependencies = [ + "serde 1.0.163", + "serde_spanned", + "toml_datetime 0.5.1", + "toml_edit 0.18.1", ] [[package]] @@ -4471,10 +6225,19 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" dependencies = [ - "serde 1.0.159", + "serde 1.0.163", "serde_spanned", - "toml_datetime", - "toml_edit", + "toml_datetime 0.6.1", + "toml_edit 0.19.8", +] + +[[package]] +name = "toml_datetime" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" +dependencies = [ + "serde 1.0.163", ] [[package]] @@ -4483,7 +6246,20 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" dependencies = [ - "serde 1.0.159", + "serde 1.0.163", +] + +[[package]] +name = "toml_edit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +dependencies = [ + "indexmap", + "nom8", + "serde 1.0.163", + "serde_spanned", + "toml_datetime 0.5.1", ] [[package]] @@ -4493,12 +6269,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ "indexmap", - "serde 1.0.159", + "serde 1.0.163", "serde_spanned", - "toml_datetime", + "toml_datetime 0.6.1", "winnow", ] +[[package]] +name = "topological-sort" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" + +[[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.37" @@ -4513,13 +6301,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 2.0.15", ] [[package]] @@ -4542,35 +6330,94 @@ dependencies = [ ] [[package]] -name = "tray-item" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0914b62e00e8f51241806cb9f9c4ea6b10c75d94cae02c89278de6f4b98c7d0f" +name = "tray-icon" +version = "0.5.1" +source = "git+https://github.com/rustdesk-org/tray-icon#ef98e7b98abed2e3da614277eced12a85bfb717c" dependencies = [ "cocoa", "core-graphics", - "gtk 0.15.5", - "libappindicator 0.7.1", - "libc", + "crossbeam-channel", + "dirs-next", + "libappindicator", + "muda", "objc", - "objc-foundation", - "objc_id", - "padlock", - "winapi 0.3.9", + "once_cell", + "png", + "thiserror", + "windows-sys 0.48.0", ] +[[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.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +[[package]] +name = "tz-rs" +version = "0.6.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33851b15c848fad2cf4b105c6bb66eb9512b6f6c44a4b13f57c53c73c707e2b4" +dependencies = [ + "const_fn", +] + +[[package]] +name = "tzdb" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec758958f2fb5069cd7fae385be95cc8eceb8cdfd270c7d14de6034f0108d99e" +dependencies = [ + "iana-time-zone", + "tz-rs", +] + +[[package]] +name = "uds_windows" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +dependencies = [ + "tempfile", + "winapi 0.3.9", +] + +[[package]] +name = "uname" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" +dependencies = [ + "libc", +] + +[[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.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" +[[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" @@ -4583,6 +6430,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +[[package]] +name = "unicode-xid" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" + [[package]] name = "unicode-xid" version = "0.2.4" @@ -4596,10 +6449,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] -name = "uuid" -version = "1.3.0" +name = "url" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde 1.0.163", +] + +[[package]] +name = "users" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa4227e95324a443c9fcb06e03d4d85e91aabe9a5a02aa818688b6918b6af486" +dependencies = [ + "libc", + "log", +] + +[[package]] +name = "users" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24cc0f6d6f267b73e5a2cadf007ba8f9bc39c6a6f9666f8cf25ea809a153b032" +dependencies = [ + "libc", + "log", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2" dependencies = [ "getrandom", ] @@ -4638,14 +6529,36 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" name = "virtual_display" version = "0.1.0" dependencies = [ - "cc", "hbb_common", "lazy_static", - "serde 1.0.159", - "serde_derive", - "thiserror", ] +[[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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" + [[package]] name = "walkdir" version = "2.3.3" @@ -4656,6 +6569,22 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "want" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +dependencies = [ + "log", + "try-lock", +] + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -4664,9 +6593,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5b6cb788c4e39112fbe1822277ef6fb3c55cd86b95cb3d3c4c1c9597e4ac74b4" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -4674,53 +6603,65 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "35e522ed4105a9d626d885b35d62501b30d9666283a5c8be12c14a8bdafe7822" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2", - "quote", - "syn 1.0.109", + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 2.0.15", "wasm-bindgen-shared", ] [[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" +name = "wasm-bindgen-futures" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "083abe15c5d88556b77bdf7aef403625be9e327ad37c62c4e4129af740168163" dependencies = [ - "quote", + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "358a79a0cb89d21db8120cbfb91392335913e4890665b1a7981d9e956903b434" +dependencies = [ + "quote 1.0.27", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "4783ce29f09b9d93134d41297aded3a712b7b979e9c6f28c32cb88c973a94869" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 2.0.15", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "a901d592cafaa4d711bc324edfaff879ac700b19c3dfd60058d2b445be2691eb" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "16b5f940c7edfdc6d12126d98c9ef4d1b3d470011c47c76a6581df47ad9ba721" dependencies = [ "js-sys", "wasm-bindgen", @@ -4754,22 +6695,21 @@ dependencies = [ "untrusted", ] +[[package]] +name = "webpki-roots" +version = "0.23.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +dependencies = [ + "rustls-webpki", +] + [[package]] name = "weezl" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" -[[package]] -name = "which" -version = "3.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" -dependencies = [ - "failure", - "libc", -] - [[package]] name = "which" version = "4.4.0" @@ -4791,18 +6731,21 @@ dependencies = [ "web-sys", ] -[[package]] -name = "widestring" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" - [[package]] name = "widestring" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +[[package]] +name = "win-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b7b128a98c1cfa201b09eb49ba285887deb3cbe7466a98850eb1adabb452be5" +dependencies = [ + "windows 0.34.0", +] + [[package]] name = "winapi" version = "0.2.8" @@ -4855,38 +6798,92 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec" +dependencies = [ + "windows_aarch64_msvc 0.32.0", + "windows_i686_gnu 0.32.0", + "windows_i686_msvc 0.32.0", + "windows_x86_64_gnu 0.32.0", + "windows_x86_64_msvc 0.32.0", +] + +[[package]] +name = "windows" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" +dependencies = [ + "windows_aarch64_msvc 0.34.0", + "windows_i686_gnu 0.34.0", + "windows_i686_msvc 0.34.0", + "windows_x86_64_gnu 0.34.0", + "windows_x86_64_msvc 0.34.0", +] + +[[package]] +name = "windows" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +dependencies = [ + "windows-targets 0.42.2", +] + [[package]] name = "windows" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ + "windows-implement", + "windows-interface", "windows-targets 0.48.0", ] [[package]] -name = "windows-service" -version = "0.4.0" +name = "windows-implement" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c643e10139d127d30d6d753398c8a6f0a43532e8370f6c9d29ebbff29b984ab" +checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" dependencies = [ - "bitflags", - "err-derive", - "widestring 0.4.3", - "winapi 0.3.9", + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 1.0.109", ] [[package]] -name = "windows-sys" -version = "0.28.0" +name = "windows-interface" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82ca39602d5cbfa692c4b67e3bcbb2751477355141c1ed434c94da4186836ff6" +checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" dependencies = [ - "windows_aarch64_msvc 0.28.0", - "windows_i686_gnu 0.28.0", - "windows_i686_msvc 0.28.0", - "windows_x86_64_gnu 0.28.0", - "windows_x86_64_msvc 0.28.0", + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 1.0.109", +] + +[[package]] +name = "windows-service" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd9db37ecb5b13762d95468a2fc6009d4b2c62801243223aabd44fca13ad13c8" +dependencies = [ + "bitflags", + "widestring", + "windows-sys 0.45.0", ] [[package]] @@ -4952,15 +6949,6 @@ dependencies = [ "windows_x86_64_msvc 0.48.0", ] -[[package]] -name = "windows-win" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d4243ec23afe4e9b4e668b3c0a0e973f1b8265f6a46223cfcbc16fd267480c0" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -4975,9 +6963,15 @@ checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.28.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52695a41e536859d5308cc613b4a022261a274390b25bd29dfff4bf08505f3c2" +checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" [[package]] name = "windows_aarch64_msvc" @@ -4993,9 +6987,15 @@ checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.28.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f54725ac23affef038fecb177de6c9bf065787c2f432f79e3c373da92f3e1d8a" +checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" + +[[package]] +name = "windows_i686_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" [[package]] name = "windows_i686_gnu" @@ -5011,9 +7011,15 @@ checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.28.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d5158a43cc43623c0729d1ad6647e62fa384a3d135fd15108d37c683461f64" +checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" + +[[package]] +name = "windows_i686_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" [[package]] name = "windows_i686_msvc" @@ -5029,9 +7035,15 @@ checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.28.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc31f409f565611535130cfe7ee8e6655d3fa99c1c61013981e491921b5ce954" +checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" [[package]] name = "windows_x86_64_gnu" @@ -5059,9 +7071,15 @@ checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.28.0" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2b8c7cbd3bfdddd9ab98769f9746a7fad1bca236554cd032b78d768bc0e89f" +checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" [[package]] name = "windows_x86_64_msvc" @@ -5077,22 +7095,13 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.1" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" dependencies = [ "memchr", ] -[[package]] -name = "winreg" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "winreg" version = "0.10.1" @@ -5102,6 +7111,26 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "winreg" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" +dependencies = [ + "cfg-if 1.0.0", + "winapi 0.3.9", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + [[package]] name = "winres" version = "0.1.12" @@ -5112,13 +7141,27 @@ dependencies = [ ] [[package]] -name = "ws2_32-sys" -version = "0.2.1" +name = "wol-rs" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" +checksum = "48dc5e486e34a31515518d370cdd8bf59ec696323fe8f92b858e43942e84a765" + +[[package]] +name = "wyz" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "tap", +] + +[[package]] +name = "x11" +version = "2.19.0" +source = "git+https://github.com/bjornsnoen/x11-rs#c2e9bfaa7b196938f8700245564d8ac5d447786a" +dependencies = [ + "libc", + "pkg-config", ] [[package]] @@ -5132,51 +7175,174 @@ dependencies = [ ] [[package]] -name = "x11-clipboard" -version = "0.5.3" +name = "x11-dl" +version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "473068b7b80ac86a18328824f1054e5e007898c47b5bbc281bd7abe32bc3653c" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" dependencies = [ - "xcb", + "libc", + "once_cell", + "pkg-config", ] [[package]] name = "x11rb" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a" +checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" dependencies = [ "gethostname", - "nix 0.22.3", + "nix 0.24.3", "winapi 0.3.9", "winapi-wsapoll", + "x11rb-protocol", ] [[package]] -name = "xcb" -version = "0.10.1" +name = "x11rb-protocol" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771e2b996df720cd1c6dd9ff90f62d91698fd3610cc078388d0564bdd6622a9c" +checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" dependencies = [ - "libc", - "log", - "quick-xml", + "nix 0.24.3", +] + +[[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix 0.26.2", + "winapi 0.3.9", +] + +[[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 = "zbus" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29242fa5ec5693629ae74d6eb1f69622a9511f600986d6d9779bccf36ac316e3" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock", + "async-recursion", + "async-task", + "async-trait", + "byteorder", + "derivative", + "enumflags2", + "event-listener", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.26.2", + "once_cell", + "ordered-stream", + "rand 0.8.5", + "serde 1.0.163", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "winapi 0.3.9", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "537793e26e9af85f774801dc52c6f6292352b2b517c5cf0449ffd3735732a53a" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.63", + "quote 1.0.27", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f34f314916bd89bdb9934154627fab152f4f28acdda03e7c4c68181b214fe7e3" +dependencies = [ + "serde 1.0.163", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zip" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e92305c174683d78035cbf1b70e18db6329cc0f1b9cae0a52ca90bf5bfe7125" +dependencies = [ + "aes", + "byteorder", + "bzip2", + "constant_time_eq", + "crc32fast", + "crossbeam-utils", + "flate2", + "hmac", + "pbkdf2", + "sha1", + "time 0.3.21", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] name = "zstd" -version = "0.9.2+zstd.1.5.1" +version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2390ea1bf6c038c39674f22d95f0564725fc06034a47129179810b2fc58caa54" +checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe", + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.12.3+zstd.1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +dependencies = [ + "zstd-safe 6.0.5+zstd.1.5.4", ] [[package]] name = "zstd-safe" -version = "4.1.3+zstd.1.5.1" +version = "5.0.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e99d81b99fb3c2c2c794e3fe56c305c63d5173a16a46b5850b07c935ffc7db79" +checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" +dependencies = [ + "libc", + "zstd-sys", +] + +[[package]] +name = "zstd-safe" +version = "6.0.5+zstd.1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" dependencies = [ "libc", "zstd-sys", @@ -5184,10 +7350,58 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.6.2+zstd.1.5.1" +version = "2.0.8+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2daf2f248d9ea44454bfcb2516534e8b8ad2fc91bf818a1885495fc42bc8ac9f" +checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" dependencies = [ "cc", "libc", + "pkg-config", +] + +[[package]] +name = "zune-inflate" +version = "0.2.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" +dependencies = [ + "simd-adler32", +] + +[[package]] +name = "zvariant" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46fe4914a985446d6fd287019b5fceccce38303d71407d9e6e711d44954a05d8" +dependencies = [ + "byteorder", + "enumflags2", + "libc", + "serde 1.0.163", + "static_assertions", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "3.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34c20260af4b28b3275d6676c7e2a6be0d4332e8e0aba4616d34007fd84e462a" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b22993dbc4d128a17a3b6c92f1c63872dd67198537ee728d8b5d7c40640a8b" +dependencies = [ + "proc-macro2 1.0.63", + "quote 1.0.27", + "syn 1.0.109", ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/cargo.patch b/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/cargo.patch deleted file mode 100644 index eb8495f14c..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/cargo.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index 1b715bd..960e8da 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -35,7 +35,7 @@ libc = "0.2" - parity-tokio-ipc = { git = "https://github.com/open-trade/parity-tokio-ipc" } - flexi_logger = { version = "0.22", features = ["async", "use_chrono_for_offset"] } - runas = "0.2" --magnum-opus = { git = "https://github.com/open-trade/magnum-opus" } -+magnum-opus = { git = "https://github.com/TheRadioGuy/magnum-opus" } - dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpolate"], optional = true } - rubato = { version = "0.12", optional = true } - samplerate = { version = "0.2", optional = true } diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/default.nix index 1f2972ee31..2a06e3f9da 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/default.nix @@ -1,106 +1,73 @@ { lib -, fetchFromGitHub -, makeDesktopItem -, copyDesktopItems -, makeWrapper , rustPlatform -, cmake -, yasm -, nasm +, fetchFromGitHub , pkg-config -, clang +, wrapGAppsHook +, atk +, bzip2 +, cairo +, dbus +, gdk-pixbuf +, glib +, gst_all_1 , gtk3 -, xdotool -, libxcb -, libXfixes -, alsa-lib -, pulseaudio +, libgit2 +, libpulseaudio +, libsodium , libXtst , libvpx , libyuv , libopus +, libaom +, libxkbcommon , libsciter -, wrapGAppsHook -, writeText +, xdotool +, pam +, pango +, zlib +, zstd +, stdenv +, darwin +, alsa-lib +, makeDesktopItem }: rustPlatform.buildRustPackage rec { pname = "rustdesk"; - version = "1.1.9"; + version = "1.2.2"; src = fetchFromGitHub { owner = "rustdesk"; repo = "rustdesk"; rev = version; - sha256 = "sha256-IlrfqwNyaSHE9Ct0mn7MUxEg7p1Ku34eOMYelEAYFW8="; + hash = "sha256-fgdhPBrC8HuuEKorzG9hY4K3KVwB8hENtE3RM5agGWk="; }; - patches = [ - # based on https://github.com/rustdesk/rustdesk/pull/1900 - ./fix-for-rust-1.65.diff - ]; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "confy-0.4.0" = "sha256-e91cvEixhpPzIthAxzTa3fDY6eCsHUy/eZQAqs7QTDo="; - "parity-tokio-ipc-0.7.3-1" = "sha256-eULJePtBu0iBI3It/bPH0h82Obsb1PJALgwYwrnCFYI="; - "rdev-0.5.0-2" = "sha256-7CEZ2wIM4QAPfY1tGKqXfHplTaxHnccVqFRPjY21Svo="; - "tokio-socks-0.5.1-1" = "sha256-45QQ6FrhGU9uEhbKXTKd/mY6MDumO6p46NmlakdyDQk="; - "libappindicator-0.6.1" = "sha256-JGnnZrcwbh8WJ6+/4bYhfD3HvgF2C7XaaGb6TaMRWdw="; - "magnum-opus-0.4.0" = "sha256-U5uuN4YolOYDnFNbtPpwYefcBDTUUyioui0UCcW8dyo="; + "confy-0.4.0-2" = "sha256-r5VeggXrIq5Cwxc2WSrxQDI5Gvbw979qIUQfMKHgBUI="; + "evdev-0.11.5" = "sha256-aoPmjGi/PftnH6ClEWXHvIj0X3oh15ZC1q7wPC1XPr0="; + "hwcodec-0.1.1" = "sha256-EQGJr5kH8O48y1oSrzFF3QGGpGFKP3v4gn2JquAkdlY="; + "impersonate_system-0.1.0" = "sha256-qbaTw9gxMKDjX5pKdUrKlmIxCxWwb99YuWPDvD2A3kY="; + "keepawake-0.4.3" = "sha256-sLQf9q88dB2bkTN01UlxRWSpoF1kFsqqpYC4Sw6cbEY="; + "machine-uid-0.3.0" = "sha256-rEOyNThg6p5oqE9URnxSkPtzyW8D4zKzLi9pAnzTElE="; + "magnum-opus-0.4.0" = "sha256-T4qaYOl8lCK1h9jWa9KqGvnVfDViT9Ob5R+YgnSw2tg="; + "mouce-0.2.1" = "sha256-3PtNEmVMXgqKV4r3KiKTkk4oyCt4BKynniJREE+RyFk="; + "pam-0.7.0" = "sha256-qe2GH6sfGEUnqLiQucYLB5rD/GyAaVtm9pAxWRb1H3Q="; + "parity-tokio-ipc-0.7.3-2" = "sha256-WXDKcDBaJuq4K9gjzOKMozePOFiVX0EqYAFamAz/Yvw="; + "rdev-0.5.0-2" = "sha256-Agxx/hoV45/NGsrUZLYdm1Y9088Z9urUcDnjVjY/odk="; + "reqwest-0.11.18" = "sha256-3k2wcVD+DzJEdP/+8BqP9qz3tgEWcbWZj5/CjrZz5LY="; "rust-pulsectl-0.2.12" = "sha256-8jXTspWvjONFcvw9/Z8C43g4BuGZ3rsG32tvLMQbtbM="; - "sciter-rs-0.5.57" = "sha256-ZZnZDhMjK0LjgmK0da1yvB0uoKueLhhhQtzmjoN+1R0="; - "systray-0.4.1" = "sha256-p1PMr/8oS6zHx4+Ng4zCqt0xZ57cq3wAu6/agyWq5Jw="; + "sciter-rs-0.5.57" = "sha256-NQPDlMQ0sGY8c9lBMlplT82sNjbgJy2m/+REnF3fz8M="; + "tao-0.22.2" = "sha256-vZx7WM6vK9UarbFQ/FMnTNEEDS+tglhWcPXt/h7YMFA="; + "tfc-0.6.1" = "sha256-ukxJl7Z+pUXCjvTsG5Q0RiXocPERWGsnAyh3SIWm0HU="; + "tokio-socks-0.5.1-2" = "sha256-x3aFJKo0XLaCGkZLtG9GYA+A/cGGedVZ8gOztWiYVUY="; + "tray-icon-0.5.1" = "sha256-1VyUg8V4omgdRIYyXhfn8kUvhV5ef6D2cr2Djz2uQyc="; + "x11-2.19.0" = "sha256-GDCeKzUtvaLeBDmPQdyr499EjEfT6y4diBMzZVEptzc="; }; }; - # Change magnus-opus version to upstream so that it does not use - # vcpkg for libopus since it does not work. - cargoPatches = [ - ./cargo.patch - ]; - - # Manually simulate a vcpkg installation so that it can link the libraries - # properly. - postUnpack = - let - vcpkg_target = "x64-linux"; - - updates_vcpkg_file = writeText "update_vcpkg_rustdesk" - '' - Package : libyuv - Architecture : ${vcpkg_target} - Version : 1.0 - Status : is installed - - Package : libvpx - Architecture : ${vcpkg_target} - Version : 1.0 - Status : is installed - ''; - in - '' - export VCPKG_ROOT="$TMP/vcpkg"; - - mkdir -p $VCPKG_ROOT/.vcpkg-root - mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib - mkdir -p $VCPKG_ROOT/installed/vcpkg/updates - ln -s ${updates_vcpkg_file} $VCPKG_ROOT/installed/vcpkg/status - mkdir -p $VCPKG_ROOT/installed/vcpkg/info - touch $VCPKG_ROOT/installed/vcpkg/info/libyuv_1.0_${vcpkg_target}.list - touch $VCPKG_ROOT/installed/vcpkg/info/libvpx_1.0_${vcpkg_target}.list - - ln -s ${libvpx.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ln -s ${libyuv.out}/lib/* $VCPKG_ROOT/installed/${vcpkg_target}/lib/ - ''; - - nativeBuildInputs = [ pkg-config cmake makeWrapper copyDesktopItems yasm nasm clang wrapGAppsHook rustPlatform.bindgenHook ]; - buildInputs = [ alsa-lib pulseaudio libXfixes libxcb xdotool gtk3 libvpx libopus libXtst libyuv ]; - - # Checks require an active X display. - doCheck = false; - desktopItems = [ (makeDesktopItem { name = "rustdesk"; @@ -113,17 +80,60 @@ rustPlatform.buildRustPackage rec { }) ]; - postPatch = '' - rm Cargo.lock - ln -s ${./Cargo.lock} Cargo.lock - ''; + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + wrapGAppsHook + ]; + + buildFeatures = lib.optionals stdenv.isLinux [ "linux-pkg-config" ]; + + # Checks require an active X server + doCheck = false; + + buildInputs = [ + atk + bzip2 + cairo + dbus + gdk-pixbuf + glib + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + gtk3 + libgit2 + libpulseaudio + libsodium + libXtst + libvpx + libyuv + libopus + libaom + libxkbcommon + xdotool + pam + pango + zlib + zstd + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreAudio + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreGraphics + darwin.apple_sdk.frameworks.Foundation + darwin.apple_sdk.frameworks.IOKit + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ] ++ lib.optionals stdenv.isLinux [ + alsa-lib + ]; # Add static ui resources and libsciter to same folder as binary so that it # can find them. postInstall = '' mkdir -p $out/{share/src,lib/rustdesk} - # so needs to be next to the executable + # .so needs to be next to the executable mv $out/bin/rustdesk $out/lib/rustdesk ln -s ${libsciter}/lib/libsciter-gtk.so $out/lib/rustdesk @@ -132,15 +142,19 @@ rustPlatform.buildRustPackage rec { cp -a $src/src/ui $out/share/src - install -Dm0644 $src/logo.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg + install -Dm0644 $src/res/logo.svg $out/share/icons/hicolor/scalable/apps/rustdesk.svg ''; + env = { + SODIUM_USE_PKG_CONFIG = true; + ZSTD_SYS_USE_PKG_CONFIG = true; + }; + meta = with lib; { - description = "Yet another remote desktop software"; + description = "Virtual / remote desktop infrastructure for everyone! Open source TeamViewer / Citrix alternative"; homepage = "https://rustdesk.com"; - license = licenses.gpl3Only; + license = licenses.agpl3Only; maintainers = with maintainers; [ ocfox leixb ]; - platforms = [ "x86_64-linux" ]; mainProgram = "rustdesk"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/fix-for-rust-1.65.diff b/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/fix-for-rust-1.65.diff deleted file mode 100644 index a70f51e0a7..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/rustdesk/fix-for-rust-1.65.diff +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/libs/hbb_common/src/config.rs b/libs/hbb_common/src/config.rs -index 74982de5..308bcf80 100644 ---- a/libs/hbb_common/src/config.rs -+++ b/libs/hbb_common/src/config.rs -@@ -656,7 +656,7 @@ const PEERS: &str = "peers"; - - impl PeerConfig { - pub fn load(id: &str) -> PeerConfig { -- let _ = CONFIG.read().unwrap(); // for lock -+ let _lock = CONFIG.read().unwrap(); - match confy::load_path(&Self::path(id)) { - Ok(config) => config, - Err(err) => { -@@ -667,7 +667,7 @@ impl PeerConfig { - } - - pub fn store(&self, id: &str) { -- let _ = CONFIG.read().unwrap(); // for lock -+ let _lock = CONFIG.read().unwrap(); - if let Err(err) = confy::store_path(Self::path(id), self) { - log::error!("Failed to store config: {}", err); - } -@@ -808,7 +808,7 @@ pub struct LanPeers { - - impl LanPeers { - pub fn load() -> LanPeers { -- let _ = CONFIG.read().unwrap(); // for lock -+ let _lock = CONFIG.read().unwrap(); - match confy::load_path(&Config::file_("_lan_peers")) { - Ok(peers) => peers, - Err(err) => { diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix index c5095d8fd4..77d72060c1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.6.2"; + version = "0.7.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yNWTTjlmMCMTed1SiRep3iUxchQya1GnTVoub1cpR14="; + sha256 = "sha256-hmlzv1WaT+KucR7RGPC3bKcIdTxPOvK2s17nDucdu7c="; }; strictDeps = true; 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 0fb74488f0..bf3b8b64f1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/xrdp/default.nix @@ -1,6 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: +{ lib, stdenv, fetchFromGitHub, applyPatches, pkg-config, which, perl, autoconf, automake, libtool, openssl, systemd, pam, fuse, libjpeg, libopus, nasm, xorg }: let + version = "0.9.23.1"; + patchedXrdpSrc = applyPatches { + patches = [ ./dynamic_config.patch ]; + name = "xrdp-patched-${version}"; + src = fetchFromGitHub { + owner = "neutrinolabs"; + repo = "xrdp"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-fJKSEHB5X5QydKgRPjIMJzNaAy1EVJifHETSGmlJttQ="; + }; + }; + xorgxrdp = stdenv.mkDerivation rec { pname = "xorgxrdp"; version = "0.9.19"; @@ -28,29 +41,20 @@ let preConfigure = "./bootstrap"; - configureFlags = [ "XRDP_CFLAGS=-I${xrdp.src}/common" ]; + configureFlags = [ "XRDP_CFLAGS=-I${patchedXrdpSrc}/common" ]; enableParallelBuilding = true; }; - xrdp = stdenv.mkDerivation rec { - version = "0.9.22.1"; + inherit version; pname = "xrdp"; - src = fetchFromGitHub { - owner = "neutrinolabs"; - repo = "xrdp"; - rev = "v${version}"; - fetchSubmodules = true; - hash = "sha256-8gAP4wOqSmar8JhKRt4qRRwh23coIn0Q8Tt9ClHQSt8="; - }; + src = patchedXrdpSrc; nativeBuildInputs = [ pkg-config autoconf automake which libtool nasm perl ]; buildInputs = [ openssl systemd pam fuse libjpeg libopus xorg.libX11 xorg.libXfixes xorg.libXrandr ]; - patches = [ ./dynamic_config.patch ]; - postPatch = '' substituteInPlace sesman/xauth.c --replace "xauth -q" "${xorg.xauth}/bin/xauth -q" ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix b/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix index 0ad0fd09f4..232b6460ec 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/rymdport/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "rymdport"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "Jacalz"; repo = "rymdport"; rev = "v${version}"; - hash = "sha256-nqB4KZdYSTiyIaslFN6ncwJnD8+7ZgHj/SXAa5YAt9k="; + hash = "sha256-aNLAj8rQSRp6fsEu052uc2gJE55A996YJY7tDApjHxA="; }; - vendorHash = "sha256-03qdjeU6u0mBcdWlMhs9ORaeBkPNMO4Auqy/rOFIaVM="; + vendorHash = "sha256-8TxuExcxiBTHVA9DTLfElKOq45a2EVLxqmByDyKJQ4c="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix b/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix index 1f340a7036..d31d56702a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/scaleft/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, rpmextract, patchelf, bash }: +{ lib, stdenv, fetchurl, rpmextract, patchelf, bash, testers, scaleft }: stdenv.mkDerivation rec { pname = "scaleft"; - version = "1.45.4"; + version = "1.67.4"; src = fetchurl { url = "http://pkg.scaleft.com/rpm/scaleft-client-tools-${version}-1.x86_64.rpm"; - sha256 = "1yskybjba9ljy1wazddgrm7a4cc72i1xbk7sxnjpcq4hdy3b50l0"; + sha256 = "kRCShTMKf5qKFth/8H8XHLj12YIVQ9G5f2MvVJRtyDs="; }; nativeBuildInputs = [ patchelf rpmextract ]; @@ -31,6 +31,12 @@ stdenv.mkDerivation rec { patchShebangs $out ''; + passthru.tests.version = testers.testVersion { + package = scaleft; + command = "sft -v"; + version = "sft version ${version}"; + }; + meta = with lib; { description = "ScaleFT provides Zero Trust software which you can use to secure your internal servers and services"; homepage = "https://www.scaleft.com"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/seahub/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seahub/default.nix index 677405c5a2..089eabf93d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seahub/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seahub/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , python3 , makeWrapper , nixosTests @@ -21,7 +22,7 @@ in python.pkgs.buildPythonApplication rec { pname = "seahub"; version = "9.0.10"; - format = "other"; + pyproject = false; src = fetchFromGitHub { owner = "haiwen"; @@ -30,6 +31,14 @@ python.pkgs.buildPythonApplication rec { sha256 = "sha256-7Exvm3EShb/1EqwA4wzWB9zCdv0P/ISmjKSoqtOMnqk="; }; + patches = [ + (fetchpatch { + # PIL update fix + url = "https://patch-diff.githubusercontent.com/raw/haiwen/seahub/pull/5570.patch"; + sha256 = "sha256-7V2aRlacJ7Qhdi9k4Bs+t/Emx+EAM/NNCI+K40bMwLA="; + }) + ]; + dontBuild = true; doCheck = false; # disabled because it requires a ccnet environment diff --git a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix index 7e0ea7e815..cfb35e5268 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - hash = "sha256-OvXbc3feCatyubbRZlaiXvGP59ApyAS0b0Z6SeJsZnE="; + hash = "sha256-+2YYTnQDU9AkCjWvUEsddgu8GVJk0VUCMkEeWhW/u0w="; }; modRoot = "./agent"; - vendorHash = "sha256-qQRi4GeepRpYPhE5ftUj01tMCqBh5txbizfkVXmrgOQ="; + vendorHash = "sha256-lZ7W7YpigcVaLO9HoS5V379nyKHemRh9Z2NjlZbJcPg="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; 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 f105450034..36084ae3ac 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/sngrep/default.nix @@ -3,6 +3,7 @@ , autoconf , automake , fetchFromGitHub +, fetchpatch , libpcap , ncurses , openssl @@ -20,6 +21,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-gFba2wOU4GwpOZTo5A2QpBgnC6OgDJEeyaPGHbA+7tA="; }; + patches = [ + (fetchpatch { + name = "CVE-2023-36192.patch"; + url = "https://github.com/irontec/sngrep/commit/ad1daf15c8387bfbb48097c25197bf330d2d98fc.patch"; + hash = "sha256-g8fxvxi3d7jmZEKTbxqw29hJbm/ShsKKxstsOUGxTug="; + }) + ]; + nativeBuildInputs = [ autoconf automake @@ -44,6 +53,8 @@ stdenv.mkDerivation rec { ./bootstrap.sh ''; + doCheck = true; + meta = with lib; { description = "A tool for displaying SIP calls message flows from terminal"; homepage = "https://github.com/irontec/sngrep"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index ce01fec02e..99839d9c99 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -49,7 +49,7 @@ assert withQt -> qt6 != null; let - version = "4.0.7"; + version = "4.0.8"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -61,7 +61,7 @@ stdenv.mkDerivation { repo = "wireshark"; owner = "wireshark"; rev = "v${version}"; - hash = "sha256-CjSf4CfzgiXvmraM3lYBVLSfdDBSuFNIgeatj0OjYSQ="; + hash = "sha256-bNg0yhNb1GRsTclNWWO+Bamm2wOnUjVKU+JftJu+LTo="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/soju/default.nix b/third_party/nixpkgs/pkgs/applications/networking/soju/default.nix index 5eb2621688..d4e6d7a393 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/soju/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/soju/default.nix @@ -18,13 +18,6 @@ buildGoModule rec { vendorHash = "sha256-iT/QMm6RM6kvw69Az+aLTtBuaCX7ELAiYlj5wXAtBd4="; - subPackages = [ - "cmd/soju" - "cmd/sojuctl" - "contrib/migrate-db" - "contrib/znc-import" - ]; - nativeBuildInputs = [ installShellFiles scdoc @@ -33,17 +26,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; postBuild = '' - make doc/soju.1 + make doc/soju.1 doc/sojuctl.1 ''; postInstall = '' - installManPage doc/soju.1 + installManPage doc/soju.1 doc/sojuctl.1 ''; preCheck = '' - # Test all targets. - unset subPackages - # Disable a test that requires an additional service. rm database/postgres_test.go ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/stc-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/stc-cli/default.nix index c2d7995371..bae71f82cb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/stc-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/stc-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-g1zn/CBpLv0oNhp32njeNhhli8aTCECgh92+zn5v+4U="; }; - vendorSha256 = "sha256-0OsxCGCJT5k5bHXNSIL6QiJXj72bzYCZiI03gvHQuR8="; + vendorHash = "sha256-0OsxCGCJT5k5bHXNSIL6QiJXj72bzYCZiI03gvHQuR8="; meta = with lib; { description = "Syncthing CLI Tool"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix index 0e0b362638..e3234af43d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/default.nix @@ -1,10 +1,9 @@ { lib , stdenv -, rust , rustPlatform , fetchFromGitHub , substituteAll -, fetchpatch +, just , pkg-config , wrapGAppsHook4 , cairo @@ -20,32 +19,18 @@ , rclone }: -let - # https://github.com/trevyn/librclone/pull/8 - librclone-mismatched-types-patch = fetchpatch { - name = "use-c_char-to-be-platform-independent.patch"; - url = "https://github.com/trevyn/librclone/commit/91fdf3fa5f5eea0dfd06981ba72e09034974fdad.patch"; - hash = "sha256-8YDyUNP/ISP5jCliT6UCxZ89fdRFud+6u6P29XdPy58="; - }; -in rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "celeste"; - version = "0.5.2"; + version = "0.7.0"; src = fetchFromGitHub { owner = "hwittenborn"; repo = "celeste"; rev = "v${version}"; - hash = "sha256-pFtyfKGPlwum/twGXi/e82BjINy6/MMvvmVfrwWHTQg="; + hash = "sha256-fqPAQCbuPnFyn3wioWDETmcXu53808nvnlEzcdUevI4="; }; - cargoHash = "sha256-wcgu4KApkn68Tpk3PQ9Tkxif++/8CmS4f8AOOpCA/X8="; - - patches = [ - (substituteAll { - src = ./target-dir.patch; - rustTarget = rust.toRustTarget stdenv.hostPlatform; - }) - ]; + cargoHash = "sha256-mVl7CsCX7HMlGC2EIKEfHnPNjmrexjsrpDK/Uq/GwpY="; postPatch = '' pushd $cargoDepsCopy/librclone-sys @@ -56,12 +41,11 @@ in rustPlatform.buildRustPackage rec { substituteInPlace .cargo-checksum.json \ --replace $oldHash $(sha256sum build.rs | cut -d " " -f 1) popd - pushd $cargoDepsCopy/librclone - oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1) - patch -p1 < ${librclone-mismatched-types-patch} - substituteInPlace .cargo-checksum.json \ - --replace $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1) - popd + + substituteInPlace justfile \ + --replace "{{ env_var('DESTDIR') }}/usr" "${placeholder "out"}" + # buildRustPackage takes care of installing the binary + sed -i "#/bin/celeste#d" justfile ''; # Cargo.lock is outdated @@ -69,17 +53,10 @@ in rustPlatform.buildRustPackage rec { cargo update --offline ''; - # We need to build celeste-tray first because celeste/src/launch.rs reads that file at build time. - # Upstream does the same: https://github.com/hwittenborn/celeste/blob/765dfa2/justfile#L1-L3 - cargoBuildFlags = [ "--bin" "celeste-tray" ]; - postConfigure = '' - cargoBuildHook - cargoBuildFlags= - ''; - RUSTC_BOOTSTRAP = 1; nativeBuildInputs = [ + just pkg-config rustPlatform.bindgenHook wrapGAppsHook4 @@ -104,6 +81,10 @@ in rustPlatform.buildRustPackage rec { ) ''; + postInstall = '' + just install + ''; + meta = { changelog = "https://github.com/hwittenborn/celeste/blob/${src.rev}/CHANGELOG.md"; description = "GUI file synchronization client that can sync with any cloud provider"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/target-dir.patch b/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/target-dir.patch deleted file mode 100644 index a8da72e77f..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/celeste/target-dir.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/celeste/src/launch.rs b/celeste/src/launch.rs -index 5227170..e3cf189 100644 ---- a/celeste/src/launch.rs -+++ b/celeste/src/launch.rs -@@ -172,10 +172,7 @@ impl TrayApp { - perms.set_mode(0o755); - file.set_permissions(perms).unwrap(); - -- #[cfg(debug_assertions)] -- let tray_file = include_bytes!("../../target/debug/celeste-tray"); -- #[cfg(not(debug_assertions))] -- let tray_file = include_bytes!("../../target/release/celeste-tray"); -+ let tray_file = include_bytes!(concat!("../../target/@rustTarget@/", env!("cargoBuildType"), "/celeste-tray")); - - file.write_all(tray_file).unwrap(); - drop(file); diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index f138523016..d82981f2f0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.63.1"; + version = "1.64.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-H//Y7BFBr3VXAoKZZgjSgU4aA+Af7tvFozhpoj14ba0="; + hash = "sha256-miXYBKUTmsqAvVLmxcVCpjgEO3HeKQpUZKSvzaxhqdU="; }; - vendorHash = "sha256-AXgyyI6ZbTepC/TGkHQvHiwpQOjzwG5ung71nKE5d1Y="; + vendorHash = "sha256-rpF44yd8ElOkXTT1lSW0l3ZwTqeNdGS1OxrvNY8atzA="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix index c88e86c529..f8b381b438 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,20 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.85.1"; + version = "1.89.2"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-WfV7n4AgZoD8rOd6UVBFRqOz9qs1frjSGLUhjxqTG08="; + hash = "sha256-tbzdfKA3ojwTvJ+t7jLLy3iKQ/x/0lXDcb2w1XcyEhs="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-EkB8GjWtOO3Yi0PFFE8G8swwzYmw6D6LDO24vnSrkLs="; + vendorHash = "sha256-AME5EM2j7PQ/DodK+3BiVepTRbwMqqItQbmCJ2lrGM8="; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Command-line tool for Storj"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix index 3612892548..10bc3ca686 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix @@ -6,7 +6,6 @@ , copyDesktopItems , makeDesktopItem , wrapGAppsHook -, glib , gsettings-desktop-schemas , zlib , enableX11 ? true @@ -26,10 +25,11 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ glib wrapGAppsHook ocamlPackages.ocaml ] - ++ lib.optional enableX11 copyDesktopItems; - buildInputs = [ gsettings-desktop-schemas ncurses zlib ] - ++ lib.optional stdenv.isDarwin Cocoa; + nativeBuildInputs = [ ocamlPackages.ocaml ] + ++ lib.optionals enableX11 [ copyDesktopItems wrapGAppsHook ]; + buildInputs = [ ncurses zlib ] + ++ lib.optionals enableX11 [ gsettings-desktop-schemas ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ]; preBuild = lib.optionalString enableX11 '' sed -i "s|\(OCAMLOPT=.*\)$|\1 -I $(echo "${ocamlPackages.lablgtk3}"/lib/ocaml/*/site-lib/lablgtk3)|" src/Makefile.OCaml diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix index 965c3d5e61..daa54ae05a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -13,16 +13,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.23.7"; + version = "1.25.0"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-LwjqMEfCdMvNoxn88H3+VyX31G5IlRohpfp++oNCfEc="; + hash = "sha256-HDzAqnWRfBlRHVf3V7+Y1IPH4QmZiRpxpEzOUgOYgUk="; }; - vendorHash = "sha256-nk80Y5RBoUCp+xYNYYnVWVBkCLCgvgKZFpV5CfS2p/s="; + vendorHash = "sha256-I/ul8ocHPlvtgbTR+/1FyqF0IbHZZSoAFe/0RFJtOYk="; nativeBuildInputs = lib.optionals stdenv.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when diff --git a/third_party/nixpkgs/pkgs/applications/networking/tcping-go/default.nix b/third_party/nixpkgs/pkgs/applications/networking/tcping-go/default.nix index b7f8ceb6d6..1502f8a16a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/tcping-go/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/tcping-go/default.nix @@ -11,7 +11,7 @@ buildGoModule { sha256 = "sha256-GSkNfaGMJbBqDg8DKhDtLAuUg1yF3FbBdxcf4oG50rI="; }; - vendorSha256 = "sha256-Q+aFgi7GCAn3AxDuGtRG4DdPhI7gQKEo7A9iu1YcTsQ="; + vendorHash = "sha256-Q+aFgi7GCAn3AxDuGtRG4DdPhI7gQKEo7A9iu1YcTsQ="; meta = with lib; { description = "Ping over TCP instead of ICMP, written in Go"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix b/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix index dd37e32b36..f2d8b8d685 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/termius/default.nix @@ -1,19 +1,20 @@ -{ atomEnv -, autoPatchelfHook +{ autoPatchelfHook , squashfsTools +, alsa-lib , fetchurl , makeDesktopItem , makeWrapper , stdenv , lib +, libsecret +, mesa , udev , wrapGAppsHook -, libxshmfence }: stdenv.mkDerivation rec { pname = "termius"; - version = "7.56.1"; + version = "8.1.2"; src = fetchurl { # find the latest version with @@ -22,8 +23,8 @@ stdenv.mkDerivation rec { # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r # and the sha512 with # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r - url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_144.snap"; - sha512 = "aad9ab72ad3dcbb897fa99139b83993770c243f49e8784c34ac38603f0d76578374723e756c4f51ea2d0a39f6b9c7738e7ce070a8ddfa11f8cf831260563f6d9"; + url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_167.snap"; + hash = "sha512-M/cyLfSnoCFJcdGXlA5/kH/MuyRpYcfBoyp6y6KSsTyh8Goq6niGZAQcCdIjNX8KVUvmcTWISsx8so4W5BrkCw=="; }; desktopItem = makeDesktopItem { @@ -41,9 +42,14 @@ stdenv.mkDerivation rec { dontPatchELF = true; dontWrapGApps = true; + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook ]; - buildInputs = atomEnv.packages ++ [ libxshmfence ]; + buildInputs = [ + alsa-lib + libsecret + mesa + ]; unpackPhase = '' runHook preUnpack diff --git a/third_party/nixpkgs/pkgs/applications/networking/twingate/default.nix b/third_party/nixpkgs/pkgs/applications/networking/twingate/default.nix index 09b3000c87..86349576d4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/twingate/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/twingate/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "twingate"; - version = "2023.227.93197"; + version = "2023.250.97595"; src = fetchurl { url = "https://binaries.twingate.com/client/linux/DEB/x86_64/${version}/twingate-amd64.deb"; - hash = "sha256-YV56U+RXpTOJvyufVKtTY1c460//ZJcifq2XroTQLXU="; + hash = "sha256-JTkyJLbcAEcmftPKejMnxwIY+ICkaFar2fahKeXk3fs="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix b/third_party/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix index 326f31c1d2..4e9bb7f820 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/upnp-router-control/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "upnp-router-control"; - version = "0.3.2"; + version = "0.3.3"; src = fetchzip { url = "https://launchpad.net/upnp-router-control/trunk/${version}/+download/upnp-router-control-${version}.tar.xz"; - hash = "sha256-724xcIYNufmSgrHwmIk3awEAVlta9huNa0o6Z0hdBwQ="; + hash = "sha256-d5NmA1tOQtYPjGXYfH0p9CCnWM+aVTX2KuV36QCDxd8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/utahfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/utahfs/default.nix deleted file mode 100644 index e867ff46e7..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/utahfs/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ buildGoPackage, lib, fetchFromGitHub }: - -buildGoPackage rec { - pname = "utahfs"; - version = "1.0"; - src = fetchFromGitHub { - owner = "cloudflare"; - repo = pname; - rev = "v${version}"; - sha256 = "1hpwch5fsqlxwpk5afawa1k5s0bx5c1cw0hvdllp7257lgly19fb"; - }; - - goPackagePath = "github.com/cloudflare/utahfs"; - - meta = with lib; { - homepage = "https://github.com/cloudflare/utahfs"; - description = - "Encrypted storage system that provides a user-friendly FUSE drive backed by cloud storage"; - license = licenses.bsd3; - maintainers = [ maintainers.snglth ]; - platforms = platforms.unix; - # does not build with go 1.17: https://github.com/cloudflare/utahfs/issues/46 - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/versus/default.nix b/third_party/nixpkgs/pkgs/applications/networking/versus/default.nix index 1e3dd21132..57b14ed54c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/versus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/versus/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "INFURA"; repo = pname; rev = "v${version}"; - sha256 = "0j5mj9gwwvgx7r1svlg14dpcqlj8mhwlf7sampkkih6bv92qfzcd"; + hash = "sha256-jX2HRdrLwDjnrUofRzmsSFLMbiPh0a1DPv1tzl+StUg="; }; - vendorSha256 = "1d12jcd8crxcgp5m8ga691wivim4cg8cbz4pzgxp0jhzg9jplpbv"; + vendorHash = "sha256-e116ZXofSnD7+5f8xdBjpMYdeUhGPVTLfaxnhhqTIrQ="; meta = with lib; { description = "Benchmark multiple API endpoints against each other"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/vnstat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/vnstat/default.nix index 56a609e3de..6eb7271d8f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/vnstat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/vnstat/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "vnstat"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "vergoh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XBApdQA6E2mx9WPIEiY9z2vxJS3qR0mjBnhbft4LNuQ="; + sha256 = "sha256-IO5B+jyY6izPpam3Qt4Hu8BOGwfO10ER/GFEbsQORK0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix index f30b10e99c..e8bf21b19e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/warp/default.nix @@ -15,6 +15,8 @@ , glib , gtk4 , libadwaita +, Security +, Foundation }: stdenv.mkDerivation rec { @@ -57,6 +59,9 @@ stdenv.mkDerivation rec { glib gtk4 libadwaita + ] ++ lib.optionals stdenv.isDarwin [ + Security + Foundation ]; meta = { @@ -64,6 +69,6 @@ stdenv.mkDerivation rec { homepage = "https://apps.gnome.org/app/app.drey.Warp"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ dotlambda foo-dogsquared ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/websocketd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/websocketd/default.nix index 636443c9b8..212850dcc7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/websocketd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/websocketd/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-cp4iBSQ6Cd0+NPZ2i79Mulg1z17u//OCm3yoArbZEHs="; }; - vendorSha256 = "sha256-i5IPJ3srUXL7WWjBW9w803VSoyjwA5JgPWKsAckPYxY="; + vendorHash = "sha256-i5IPJ3srUXL7WWjBW9w803VSoyjwA5JgPWKsAckPYxY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/wgcf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/wgcf/default.nix index 3a4e836aca..9b6db44f43 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/wgcf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/wgcf/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "wgcf"; - version = "2.2.18"; + version = "2.2.19"; src = fetchFromGitHub { owner = "ViRb3"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MTh92TlMQeIMmysQLcdsz45JHGJdOyR4oABjJUPobfE="; + hash = "sha256-wEBPaqqpiQdFohlzpVDVMwYq8+NjSQrh58yWl/W+n8M="; }; subPackages = "."; - vendorHash = "sha256-4VOjxGboYO00tJ17LNAYXiKQVUSUoveEYG/L+idYY6s="; + vendorHash = "sha256-i1CM0rG2DmgYMa+Na0In4fVJSGZlMTRajjLEZUvrmE8="; meta = with lib; { description = "Cross-platform, unofficial CLI for Cloudflare Warp"; diff --git a/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix b/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix index b95eb6cb51..0c98eaac4b 100644 --- a/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, qtsvg, qtwebengine, qttranslations, wrapQtAppsHook }: +{ lib, stdenv, fetchFromGitHub, cmake, qtsvg, qtwebengine, wrapQtAppsHook, qttools }: stdenv.mkDerivation rec { pname = "pageedit"; - version = "1.9.20"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Sigil-Ebook"; repo = pname; rev = version; - hash = "sha256-naoflFANeMwabbdrNL3+ndvEXYT4Yqf+Mo77HcCexHE="; + hash = "sha256-zwOSt1eyvuuqfQ1G2bCB4yj6GgixFRc2FLOgcCrdg3Q="; }; - nativeBuildInputs = [ cmake qttranslations wrapQtAppsHook ]; + nativeBuildInputs = [ cmake wrapQtAppsHook qttools ]; propagatedBuildInputs = [ qtsvg qtwebengine ]; cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix b/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix index 80bcb2ae91..e99c0fedf9 100644 --- a/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/appflowy/default.nix @@ -6,18 +6,17 @@ , copyDesktopItems , makeDesktopItem , gtk3 -, openssl_1_1 , xdg-user-dirs , keybinder3 }: stdenv.mkDerivation rec { pname = "appflowy"; - version = "0.2.6"; + version = "0.3.2"; src = fetchzip { url = "https://github.com/AppFlowy-IO/appflowy/releases/download/${version}/AppFlowy_x86_64-unknown-linux-gnu_ubuntu-20.04.tar.gz"; - sha256 = "sha256-e7nzJ81rMehpxwsbOlwnMh1jzCsGwc+kAo/6+AcCiLE="; + hash = "sha256-UmBXAfRIr9zOScqibKPHeKzr+UTx3gbGEm0tl7qn+oE="; stripRoot = false; }; @@ -29,7 +28,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - openssl_1_1 keybinder3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix index 41607522f7..91fea99ff1 100644 --- a/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix @@ -7,6 +7,7 @@ , wrapQtAppsHook , gst_all_1 , qtbase +, qtsvg , qtmultimedia , qttools , qtwayland @@ -27,13 +28,13 @@ stdenv.mkDerivation rec { pname = "beamerpresenter"; - version = "0.2.3-1"; + version = "0.2.4"; src = fetchFromGitHub { owner = "stiglers-eponym"; repo = "BeamerPresenter"; - rev = "dd41a00b3c6c8b881fa62945165c965634df66f0"; - sha256 = "11yj1zl8hdnqbynkbyzg8kwyx1jl8c87x8f8qyllpk0s6cg304d0"; + rev = "v${version}"; + hash = "sha256-UQbyzkFjrIDPcrE6yGuOWsXNjz8jWyJEWiQwHmf91/8="; }; nativeBuildInputs = [ @@ -51,6 +52,7 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-good zlib qtbase + qtsvg qtmultimedia qttools ] ++ lib.optionals stdenv.isLinux [ @@ -70,10 +72,10 @@ stdenv.mkDerivation rec { "-DUSE_POPPLER=${if usePoppler then "ON" else "OFF"}" "-DUSE_MUPDF=${if useMupdf then "ON" else "OFF"}" "-DUSE_QTPDF=OFF" - "-DUSE_MUPDF_THIRD=ON" + "-DLINK_MUPDF_THIRD=ON" "-DUSE_EXTERNAL_RENDERER=${if useExternalRenderer then "ON" else "OFF"}" - "-DUSE_MUJS=OFF" - "-DUSE_GUMBO=ON" + "-DLINK_MUJS=OFF" + "-DLINK_GUMBO=ON" "-DUSE_TRANSLATIONS=ON" "-DQT_VERSION_MAJOR=${lib.versions.major qtbase.version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix index 77e27feb95..b7e2105a94 100644 --- a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix @@ -2,12 +2,12 @@ python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.25.1"; + version = "1.26.1"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-RJbPqj6hXqf8D5G8zrg0BAYfxSRDfUgRNGwX+LZlPPY="; + hash = "sha256-pj4kaQDXahjhN7bu7xxT/ZuoCfPdGyo898482S5gnlE="; }; nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch b/third_party/nixpkgs/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch index e2b8153804..8b00b275e5 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch +++ b/third_party/nixpkgs/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch @@ -1,8 +1,6 @@ -diff --git a/libgnucash/app-utils/gnc-quotes.cpp b/libgnucash/app-utils/gnc-quotes.cpp -index 3003fca71f..2f2b1398e1 100644 ---- a/libgnucash/app-utils/gnc-quotes.cpp -+++ b/libgnucash/app-utils/gnc-quotes.cpp -@@ -122,7 +122,6 @@ private: +--- a/libgnucash/app-utils/gnc-quotes.cpp 2023-09-23 07:04:21.000000000 +0900 ++++ b/libgnucash/app-utils/gnc-quotes.cpp 2023-09-25 11:58:46.482696433 +0900 +@@ -125,7 +125,6 @@ class GncFQQuoteSource final : public GncQuoteSource { @@ -10,7 +8,7 @@ index 3003fca71f..2f2b1398e1 100644 std::string c_fq_wrapper; std::string m_version; StrVec m_sources; -@@ -145,13 +144,12 @@ static std::string parse_quotesource_error(const std::string& line); +@@ -148,13 +147,12 @@ static const std::string empty_string{}; GncFQQuoteSource::GncFQQuoteSource() : @@ -25,7 +23,7 @@ index 3003fca71f..2f2b1398e1 100644 auto [rv, sources, errors] = run_cmd(args, empty_string); if (rv) { -@@ -197,7 +195,7 @@ m_version{}, m_sources{}, m_api_key{} +@@ -200,7 +198,7 @@ QuoteResult GncFQQuoteSource::get_quotes(const std::string& json_str) const { @@ -34,7 +32,7 @@ index 3003fca71f..2f2b1398e1 100644 return run_cmd(args, json_str); } -@@ -215,13 +213,13 @@ GncFQQuoteSource::run_cmd (const StrVec& args, const std::string& json_string) c +@@ -218,7 +216,7 @@ auto input_buf = bp::buffer (json_string); bp::child process; if (m_api_key.empty()) @@ -43,6 +41,8 @@ index 3003fca71f..2f2b1398e1 100644 bp::std_out > out_buf, bp::std_err > err_buf, bp::std_in < input_buf, +@@ -227,7 +225,7 @@ + #endif svc); else - process = bp::child(c_cmd, args, diff --git a/third_party/nixpkgs/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch b/third_party/nixpkgs/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch deleted file mode 100644 index 14b68555f3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/libgnucash/app-utils/test/gtest-gnc-quotes.cpp b/libgnucash/app-utils/test/gtest-gnc-quotes.cpp -index 8a5221d19d..d14e96cb66 100644 ---- a/libgnucash/app-utils/test/gtest-gnc-quotes.cpp -+++ b/libgnucash/app-utils/test/gtest-gnc-quotes.cpp -@@ -153,25 +153,6 @@ TEST_F(GncQuotesTest, quotable_commodities) - EXPECT_EQ(4u, commodities.size()); - } - --#ifdef HAVE_F_Q --TEST_F(GncQuotesTest, online_wiggle) --{ -- GncQuotes quotes; -- quotes.fetch(m_book); -- auto pricedb{gnc_pricedb_get_db(m_book)}; -- auto failures{quotes.failures()}; -- ASSERT_EQ(1u, failures.size()); -- EXPECT_EQ(GncQuoteError::QUOTE_FAILED, std::get<2>(failures[0])); --// EXPECT_EQ(GncQuoteError::QUOTE_FAILED, std::get<2>(failures[1])); -- EXPECT_EQ(3u, gnc_pricedb_get_num_prices(pricedb)); --} --#else --TEST_F(GncQuotesTest, fq_failure) --{ -- EXPECT_THROW(GncQuotes quotes;, GncQuoteException); --} --#endif -- - TEST_F(GncQuotesTest, offline_wiggle) - { - StrVec quote_vec{ - diff --git a/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix index ae843bcf0f..eacda570cc 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , aqbanking , boost , cmake @@ -26,12 +27,13 @@ stdenv.mkDerivation rec { pname = "gnucash"; - version = "5.3"; + version = "5.4"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { - url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-FFjLCMWF6unXJL7G8oErzAO76D7SlKRqeJeqqwGm8Vo="; + # Upstream uploaded a -1 tarball on the same release, remove on next release + url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}-1.tar.bz2"; + hash = "sha256-d0EWXW1lLqe0oehJjPQ5pWuBpcyLZTKRpZBU8jYqv8w="; }; nativeBuildInputs = [ @@ -74,8 +76,12 @@ stdenv.mkDerivation rec { ./0003-remove-valgrind.patch # this patch makes gnucash exec the Finance::Quote wrapper directly ./0004-exec-fq-wrapper.patch - # this patch removes the online_wiggle GncQuotes test - ./0005-remove-gncquotes-online-wiggle.patch + # this patch fixes a test that fails due to a type error, remove on next release + (fetchpatch { + name = "0005-utest-gnc-pricedb-fix.patch"; + url = "https://github.com/Gnucash/gnucash/commit/0bd556c581ac462ca41b3cb533323fc3587051e1.patch"; + hash = "sha256-k0ANZuOkWrtU4q380oDu/hC9PeGmujF49XEFQ8eCLGM="; + }) ]; # this needs to be an environment variable and not a cmake flag to suppress @@ -95,7 +101,7 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=( # db drivers location --set GNC_DBD_DIR ${libdbiDrivers}/lib/dbd - # gnome settings schemas location on Nix + # gsettings schema location on Nix --set GSETTINGS_SCHEMA_DIR ${glib.makeSchemaPath "$out" "${pname}-${version}"} ) ''; @@ -108,6 +114,7 @@ stdenv.mkDerivation rec { # gnc-fq-* are cli utils written in Perl hence the extra wrapping postFixup = '' wrapProgram $out/bin/gnucash "''${gappsWrapperArgs[@]}" + wrapProgram $out/bin/gnucash-cli "''${gappsWrapperArgs[@]}" wrapProgram $out/bin/finance-quote-wrapper \ --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ JSONParse FinanceQuote ]}" @@ -139,6 +146,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ domenkozar AndersonTorres rski nevivurn ]; platforms = platforms.unix; + mainProgram = "gnucash"; }; } # TODO: investigate Darwin support diff --git a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix index 6fad7082ec..88091fa4b0 100644 --- a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = "http://homebank.free.fr/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix index d218d7351b..dffaf79406 100644 --- a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchurl , fetchFromGitHub , wrapGAppsHook , makeDesktopItem @@ -10,6 +11,7 @@ , jdk , gradle , perl +, python3 }: let @@ -19,20 +21,20 @@ let pin = "2.2.1-20230117.075740-16"; }; afterburner = { - snapshot = "testmoduleinfo-SNAPSHOT"; - pin = "0e337d8773"; + snapshot = "1.1.0-SNAPSHOT"; + pin = "1.1.0-20221226.155809-7"; }; }; in stdenv.mkDerivation rec { - version = "5.9"; + version = "5.10"; pname = "jabref"; src = fetchFromGitHub { owner = "JabRef"; repo = "jabref"; rev = "v${version}"; - hash = "sha256-uACmXas5L1NcxLwllkcbgCCt9bRicpQkiJkhkkVWDDY="; + hash = "sha256-Yj4mjXOZVM0dKcMfTjmnZs/kIs8AR0KJ9HKlyPM96j8="; }; desktopItems = [ @@ -49,37 +51,53 @@ stdenv.mkDerivation rec { }) ]; - deps = stdenv.mkDerivation { - pname = "${pname}-deps"; - inherit src version postPatch; + deps = + let + javafx-web = fetchurl { + url = "https://repo1.maven.org/maven2/org/openjfx/javafx-web/20/javafx-web-20.jar"; + hash = "sha256-qRtVN34KURlVM5Ie/x25IfKsKsUcux7V2m3LML74G/s="; + }; + in + stdenv.mkDerivation { + pname = "${pname}-deps"; + inherit src version postPatch; - nativeBuildInputs = [ gradle perl ]; - buildPhase = '' - export GRADLE_USER_HOME=$(mktemp -d) - gradle --no-daemon downloadDependencies -Dos.arch=amd64 - gradle --no-daemon downloadDependencies -Dos.arch=aarch64 - ''; - # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) - installPhase = '' - find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ - | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \ - | sh - mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \ - $out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot} - ''; - # Don't move info to share/ - forceShare = [ "dummy" ]; - outputHashMode = "recursive"; - outputHash = "sha256-s6GA8iT3UEVuELBgpBvzPJlVX+9DpfOQrEd3KIth8eA="; - }; + nativeBuildInputs = [ gradle perl ]; + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + gradle --no-daemon downloadDependencies -Dos.arch=amd64 + gradle --no-daemon downloadDependencies -Dos.arch=aarch64 + ''; + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \ + | sh + mv $out/org/jabref/afterburner.fx/${versionReplace.afterburner.pin} \ + $out/org/jabref/afterburner.fx/${versionReplace.afterburner.snapshot} + mv $out/com/tobiasdiez/easybind/${versionReplace.easybind.pin} \ + $out/com/tobiasdiez/easybind/${versionReplace.easybind.snapshot} + # This jar is required but not used or cached for unknown reason. + cp ${javafx-web} $out/org/openjfx/javafx-web/20/javafx-web-20.jar + ''; + # Don't move info to share/ + forceShare = [ "dummy" ]; + outputHashMode = "recursive"; + outputHash = "sha256-XswHEKjzErL+znau/F6mTORVJlFSgVuT0svK29v5dEU="; + }; postPatch = '' # Pin the version substituteInPlace build.gradle \ - --replace 'com.github.JabRef:afterburner.fx:${versionReplace.afterburner.snapshot}' \ - 'com.github.JabRef:afterburner.fx:${versionReplace.afterburner.pin}' \ + --replace 'org.jabref:afterburner.fx:${versionReplace.afterburner.snapshot}' \ + 'org.jabref:afterburner.fx:${versionReplace.afterburner.pin}' \ --replace 'com.tobiasdiez:easybind:${versionReplace.easybind.snapshot}' \ 'com.tobiasdiez:easybind:${versionReplace.easybind.pin}' + + # Disable update check + substituteInPlace src/main/java/org/jabref/preferences/JabRefPreferences.java \ + --replace 'VERSION_CHECK_ENABLED, Boolean.TRUE' \ + 'VERSION_CHECK_ENABLED, Boolean.FALSE' ''; preBuild = '' @@ -91,6 +109,18 @@ stdenv.mkDerivation rec { build.gradle \ buildSrc/build.gradle \ settings.gradle + + # The `plugin {}` block can't resolve plugins from the deps repo + sed -e '/plugins {/,/^}/d' buildSrc/build.gradle > buildSrc/build.gradle.tmp + cat > buildSrc/build.gradle <> buildSrc/build.gradle ''; nativeBuildInputs = [ @@ -101,7 +131,10 @@ stdenv.mkDerivation rec { unzip ]; - buildInputs = [ gtk3 ]; + buildInputs = [ + gtk3 + python3 + ]; buildPhase = '' runHook preBuild @@ -129,6 +162,7 @@ stdenv.mkDerivation rec { # script to support browser extensions install -Dm755 buildres/linux/jabrefHost.py $out/lib/jabrefHost.py + patchShebangs $out/lib/jabrefHost.py install -Dm644 buildres/linux/native-messaging-host/firefox/org.jabref.jabref.json $out/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json sed -i -e "s|/opt/jabref|$out|" $out/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json @@ -137,11 +171,8 @@ stdenv.mkDerivation rec { tar xf build/distributions/JabRef-${version}.tar -C $out --strip-components=1 - # remove openjfx libs for other platforms - rm $out/lib/javafx-*-win.jar ${lib.optionalString stdenv.isAarch64 "$out/lib/javafx-*-linux.jar"} - # workaround for https://github.com/NixOS/nixpkgs/issues/162064 - unzip $out/lib/javafx-web-*.jar libjfxwebkit.so -d $out/lib/ + unzip $out/lib/javafx-web-*-*.jar libjfxwebkit.so -d $out/lib/ DEFAULT_JVM_OPTS=$(sed -n -E "s/^DEFAULT_JVM_OPTS='(.*)'$/\1/p" $out/bin/JabRef | sed -e "s|\$APP_HOME|$out|g" -e 's/"//g') diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/README.md b/third_party/nixpkgs/pkgs/applications/office/libreoffice/README.md deleted file mode 100644 index a084572d21..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/README.md +++ /dev/null @@ -1,9 +0,0 @@ -LibreOffice -=========== - -To generate `src-$VARIANT/download.nix`, i.e. list of additional sources that -the libreoffice build process needs to download: - - nix-shell gen-shell.nix --argstr variant VARIANT --run generate - -Where VARIANT is either `still` or `fresh`. diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix index bec44b0b7f..44d07503b2 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchurl -, fetchpatch , lib , substituteAll , pam @@ -100,7 +99,7 @@ , langs ? [ "ar" "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "tr" "uk" "zh-CN" ] , withHelp ? true , kdeIntegration ? false -, mkDerivation ? null +, wrapQtAppsHook ? null , qtbase ? null , qtx11extras ? null , qtwayland ? null @@ -145,31 +144,33 @@ let }; importVariant = f: import (./. + "/src-${variant}/${f}"); - - primary-src = importVariant "primary.nix" { inherit fetchurl; }; - - inherit (primary-src) major minor version; - - langsSpaces = concatStringsSep " " langs; - - mkDrv = if kdeIntegration then mkDerivation else stdenv.mkDerivation; - + # Update these files with: + # nix-shell maintainers/scripts/update.nix --argstr package libreoffice-$VARIANT.unwrapped + version = importVariant "version.nix"; + srcsAttributes = { + main = importVariant "main.nix"; + help = importVariant "help.nix"; + translations = importVariant "translations.nix"; + deps = (importVariant "deps.nix") ++ [ + # TODO: Why is this needed? + (rec { + name = "unowinreg.dll"; + url = "https://dev-www.libreoffice.org/extern/${md5name}"; + sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; + md5 = "185d60944ea767075d27247c3162b3bc"; + md5name = "${md5}-${name}"; + }) + ]; + }; srcs = { - primary = primary-src; - third_party = - map (x: ((fetchurl { inherit (x) url sha256 name; }) // { inherit (x) md5name md5; })) - (importVariant "download.nix" ++ [ - (rec { - name = "unowinreg.dll"; - url = "https://dev-www.libreoffice.org/extern/${md5name}"; - sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; - md5 = "185d60944ea767075d27247c3162b3bc"; - md5name = "${md5}-${name}"; - }) - ]); - - translations = primary-src.translations; - help = primary-src.help; + third_party = map (x: + (fetchurl { + inherit (x) url sha256 name; + }) // { + inherit (x) md5name md5; + }) srcsAttributes.deps; + translations = fetchurl srcsAttributes.translations; + help = fetchurl srcsAttributes.help; }; # See `postPatch` for details @@ -185,13 +186,12 @@ let kwindowsystem ]); }; + tarballPath = "external/tarballs"; -in -(mkDrv rec { +in stdenv.mkDerivation (finalAttrs: { pname = "libreoffice"; inherit version; - - inherit (primary-src) src; + src = fetchurl srcsAttributes.main; env.NIX_CFLAGS_COMPILE = toString ([ "-I${librdf_rasqal}/include/rasqal" # librdf_redland refers to rasqal.h instead of rasqal/rasqal.h @@ -200,8 +200,6 @@ in "-O2" # https://bugs.gentoo.org/727188 ]); - tarballPath = "external/tarballs"; - postUnpack = '' mkdir -v $sourceRoot/${tarballPath} '' + (flip concatMapStrings srcs.third_party (f: '' @@ -215,18 +213,11 @@ in tar -xf ${srcs.translations} ''; - # Remove build config to reduce the amount of `-dev` outputs in the - # runtime closure. This was introduced in upstream commit - # cbfac11330882c7d0a817b6c37a08b2ace2b66f4, so the patch doesn't apply - # for 7.4. - patches = lib.optionals (lib.versionAtLeast version "7.5") [ + patches = [ + # Remove build config to reduce the amount of `-dev` outputs in the + # runtime closure. This behavior was introduced by upstream in commit + # cbfac11330882c7d0a817b6c37a08b2ace2b66f4 ./0001-Strip-away-BUILDCONFIG.patch - ] ++ [ - (fetchpatch { - name = "fix-curl-8.2.patch"; - url = "https://github.com/LibreOffice/core/commit/2a68dc02bd19a717d3c86873206fabed1098f228.diff"; - hash = "sha256-C+kts+oaLR3+GbnX/wrFguF7SzgerNataxP0SPxhyY8="; - }) ]; # libreoffice tries to reference the BUILDCONFIG (e.g. PKG_CONFIG_PATH) @@ -236,27 +227,9 @@ in disallowedRequisites = lib.optionals (!kdeIntegration) (lib.concatMap (x: lib.optional (x?dev) x.dev) - buildInputs); + finalAttrs.buildInputs); - ### QT/KDE - # - # configure.ac assumes that the first directory that contains headers and - # libraries during its checks contains *all* the relevant headers/libs which - # obviously doesn't work for us, so we have 2 options: - # - # 1. patch configure.ac in order to specify the direct paths to various Qt/KDE - # dependencies which is ugly and brittle, or - # - # 2. use symlinkJoin to pull in the relevant dependencies and just patch in - # that path which is *also* ugly, but far less likely to break - # - # The 2nd option is not very Nix'y, but I'll take robust over nice any day. - # Additionally, it's much easier to fix if LO breaks on the next upgrade (just - # add the missing dependencies to it). postPatch = '' - substituteInPlace shell/source/unix/exec/shellexec.cxx \ - --replace xdg-open ${if kdeIntegration then "kde-open5" else "xdg-open"} - # configure checks for header 'gpgme++/gpgmepp_version.h', # and if it is found (no matter where) uses a hardcoded path # in what presumably is an effort to make it possible to write @@ -267,6 +240,21 @@ in 'GPGMEPP_CFLAGS=-I/usr/include/gpgme++' \ 'GPGMEPP_CFLAGS=-I${gpgme.dev}/include/gpgme++' '' + optionalString kdeIntegration '' + substituteInPlace shell/source/unix/exec/shellexec.cxx \ + --replace xdg-open kde-open5 + # configure.ac assumes that the first directory that contains headers and + # libraries during its checks contains *all* the relevant headers/libs which + # obviously doesn't work for us, so we have 2 options: + # + # 1. patch configure.ac in order to specify the direct paths to various Qt/KDE + # dependencies which is ugly and brittle, or + # + # 2. use symlinkJoin to pull in the relevant dependencies and just patch in + # that path which is *also* ugly, but far less likely to break + # + # The 2nd option is not very Nix'y, but I'll take robust over nice any day. + # Additionally, it's much easier to fix if LO breaks on the next upgrade (just + # add the missing dependencies to it). substituteInPlace configure.ac \ --replace '$QT5INC ' '$QT5INC ${kdeDeps}/include ' \ --replace '$QT5LIB ' '$QT5LIB ${kdeDeps}/lib ' \ @@ -280,7 +268,7 @@ in preConfigure = '' configureFlagsArray=( "--with-parallelism=$NIX_BUILD_CORES" - "--with-lang=${langsSpaces}" + "--with-lang=${concatStringsSep " " langs}" ); chmod a+x ./bin/unpack-sources @@ -294,102 +282,110 @@ in NOCONFIGURE=1 ./autogen.sh ''; - postConfigure = + postConfigure = '' # fetch_Download_item tries to interpret the name as a variable name, let it do so... - '' - sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile - sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile - '' - # Test fixups - # May need to be revisited/pruned, left alone for now. - + '' - # unit test sd_tiledrendering seems to be fragile - # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html - echo > ./sd/CppunitTest_sd_tiledrendering.mk - sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk - # Pivot chart tests. Fragile. - sed -e '/CPPUNIT_TEST(testRoundtrip)/d' -i chart2/qa/extras/PivotChartTest.cxx - sed -e '/CPPUNIT_TEST(testPivotTableMedianODS)/d' -i sc/qa/unit/pivottable_filters_test.cxx - # one more fragile test? - sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx - # this I actually hate, this should be a data consistency test! - sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx - # rendering-dependent test - # tilde expansion in path processing checks the existence of $HOME - sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx - # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 - sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx' - # rendering-dependent: on my computer the test table actually doesn't fit… - # interesting fact: test disabled on macOS by upstream - sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx - # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh? - sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk - # one more fragile test? - sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx - # rendering-dependent tests - sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx - sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx - sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx - sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx - sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx - sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx - # not sure about this fragile test - sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx - # bunch of new Fresh failures. Sigh. - sed -e '/CPPUNIT_TEST(testDocumentLayout);/d' -i './sd/qa/unit/import-tests.cxx' - sed -e '/CPPUNIT_TEST(testErrorBarDataRangeODS);/d' -i './chart2/qa/extras/chart2export.cxx' - sed -e '/CPPUNIT_TEST(testLabelStringODS);/d' -i './chart2/qa/extras/chart2export.cxx' - sed -e '/CPPUNIT_TEST(testAxisNumberFormatODS);/d' -i './chart2/qa/extras/chart2export.cxx' - sed -e '/CPPUNIT_TEST(testBackgroundImage);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testFdo84043);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf97630);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf80020);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf62176);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testEmbeddedPdf);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testEmbeddedText);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf98477);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf50499);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf100926);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testPageWithTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTextRotation);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_On);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_Off);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testTdf44774);/d' -i './sd/qa/unit/misc-tests.cxx' - sed -e '/CPPUNIT_TEST(testTdf38225);/d' -i './sd/qa/unit/misc-tests.cxx' - sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' - sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests.cxx' - sed -e '/CPPUNIT_TEST(testFdo85554);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' - sed -e /CppunitTest_sw_layoutwriter/d -i sw/Module_sw.mk - sed -e /CppunitTest_sw_htmlimport/d -i sw/Module_sw.mk - sed -e /CppunitTest_sw_core_layout/d -i sw/Module_sw.mk - sed -e /CppunitTest_sw_uiwriter6/d -i sw/Module_sw.mk - sed -e /CppunitTest_sdext_pdfimport/d -i sdext/Module_sdext.mk - sed -e /CppunitTest_vcl_pdfexport/d -i vcl/Module_vcl.mk - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx" - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" - sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx" + sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile + sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile + '' /* Test fixups. May need to be revisited/pruned, left alone for now. */ + '' + # unit test sd_tiledrendering seems to be fragile + # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html + echo > ./sd/CppunitTest_sd_tiledrendering.mk + sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk + # Pivot chart tests. Fragile. + sed -e '/CPPUNIT_TEST(testRoundtrip)/d' -i chart2/qa/extras/PivotChartTest.cxx + sed -e '/CPPUNIT_TEST(testPivotTableMedianODS)/d' -i sc/qa/unit/pivottable_filters_test.cxx + # one more fragile test? + sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # this I actually hate, this should be a data consistency test! + sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # rendering-dependent test + # tilde expansion in path processing checks the existence of $HOME + sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx + # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 + sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx' + # rendering-dependent: on my computer the test table actually doesn't fit… + # interesting fact: test disabled on macOS by upstream + sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx + # Segfault on DB access — maybe temporarily acceptable for a new version of Fresh? + sed -e 's/CppunitTest_dbaccess_empty_stdlib_save//' -i ./dbaccess/Module_dbaccess.mk + # one more fragile test? + sed -e '/CPPUNIT_TEST(testTdf77014);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # rendering-dependent tests + sed -e '/CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape)/d' -i sc/qa/unit/filters-test.cxx + sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx + sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx + sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx + # not sure about this fragile test + sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx + # bunch of new Fresh failures. Sigh. + sed -e '/CPPUNIT_TEST(testDocumentLayout);/d' -i './sd/qa/unit/import-tests.cxx' + sed -e '/CPPUNIT_TEST(testErrorBarDataRangeODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testLabelStringODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testAxisNumberFormatODS);/d' -i './chart2/qa/extras/chart2export.cxx' + sed -e '/CPPUNIT_TEST(testBackgroundImage);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testFdo84043);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf97630);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf80020);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf62176);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedPdf);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedText);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf98477);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf50499);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf100926);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testPageWithTransparentBackground);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTextRotation);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf113818);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf119629);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf113822);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf105739);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testPageBitmapWithTransparency);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_On);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf115005_FallBack_Images_Off);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testTdf44774);/d' -i './sd/qa/unit/misc-tests.cxx' + sed -e '/CPPUNIT_TEST(testTdf38225);/d' -i './sd/qa/unit/misc-tests.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests-ooxml2.cxx' + sed -e '/CPPUNIT_TEST(testAuthorField);/d' -i './sd/qa/unit/export-tests.cxx' + sed -e '/CPPUNIT_TEST(testFdo85554);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testEmbeddedDataSource);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testTdf96479);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(testInconsistentBookmark);/d' -i './sw/qa/extras/uiwriter/uiwriter.cxx' + sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' + sed -e /CppunitTest_sw_layoutwriter/d -i sw/Module_sw.mk + sed -e /CppunitTest_sw_htmlimport/d -i sw/Module_sw.mk + sed -e /CppunitTest_sw_core_layout/d -i sw/Module_sw.mk + sed -e /CppunitTest_sw_uiwriter6/d -i sw/Module_sw.mk + sed -e /CppunitTest_sdext_pdfimport/d -i sdext/Module_sdext.mk + sed -e /CppunitTest_vcl_pdfexport/d -i vcl/Module_vcl.mk + sed -e /CppunitTest_sc_ucalc_formula/d -i sc/Module_sc.mk + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlexport9.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/ooxmlexport/ooxmlencryption.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/odfexport/odfexport.cxx" + sed -e "s/DECLARE_SW_ROUNDTRIP_TEST(\([_a-zA-Z0-9.]\+\)[, ].*, *\([_a-zA-Z0-9.]\+\))/class \\1: public \\2 { public: void verify() override; }; void \\1::verify() /" -i "sw/qa/extras/unowriter/unowriter.cxx" - # testReqIfTable fails since libxml2: 2.10.3 -> 2.10.4 - sed -e 's@.*"/html/body/div/table/tr/th".*@//&@' -i sw/qa/extras/htmlexport/htmlexport.cxx - '' - # This to avoid using /lib:/usr/lib at linking - + '' - sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk + sed -e '/CPPUNIT_ASSERT(!bRTL);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(0, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(4, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(11, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(18, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(3, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(9, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(17, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' + sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; - ''; + # testReqIfTable fails since libxml2: 2.10.3 -> 2.10.4 + sed -e 's@.*"/html/body/div/table/tr/th".*@//&@' -i sw/qa/extras/htmlexport/htmlexport.cxx + '' /* This to avoid using /lib:/usr/lib at linking */ + '' + sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk + + find -name "*.cmd" -exec sed -i s,/lib:/usr/lib,, {} \; + '' + optionalString stdenv.isAarch64 '' + sed -e '/CPPUNIT_TEST(testStatisticalFormulasFODS);/d' -i './sc/qa/unit/functions_statistical.cxx' + ''; makeFlags = [ "SHELL=${bash}/bin/bash" ]; @@ -406,13 +402,6 @@ in cp -r sysui/desktop/icons "$out/share" sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop - - # Install dolphin templates, like debian does - install -D extras/source/shellnew/soffice.* --target-directory="$out/share/templates/.source" - cp ${substituteAll {src = ./soffice-template.desktop; app="Writer"; ext="odt"; type="text"; }} $out/share/templates/soffice.odt.desktop - cp ${substituteAll {src = ./soffice-template.desktop; app="Calc"; ext="ods"; type="spreadsheet"; }} $out/share/templates/soffice.ods.desktop - cp ${substituteAll {src = ./soffice-template.desktop; app="Impress"; ext="odp"; type="presentation";}} $out/share/templates/soffice.odp.desktop - cp ${substituteAll {src = ./soffice-template.desktop; app="Draw"; ext="odg"; type="drawing"; }} $out/share/templates/soffice.odg.desktop ''; # Wrapping is done in ./wrapper.nix @@ -475,16 +464,26 @@ in "--without-system-libqxp" "--without-system-dragonbox" "--without-system-libfixmath" + # the "still" variant doesn't support Nixpkgs' mdds 2.1, only mdds 2.0 + ] ++ optionals (variant == "still") [ + "--without-system-mdds" + ] ++ optionals (variant == "fresh") [ "--with-system-mdds" + ] ++ [ # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" "--without-system-xmlsec" - "--without-system-cuckoo" "--without-system-zxing" ] ++ optionals kdeIntegration [ "--enable-kf5" "--enable-qt5" "--enable-gtk3-kde5" + ] ++ optionals (variant == "fresh") [ + "--without-system-dragonbox" + "--without-system-libfixmath" + # Technically needed only when kdeIntegration is enabled in the "fresh" + # variant. Won't hurt to put it here for every "fresh" variant. + "--without-system-frozen" ]; checkTarget = concatStringsSep " " [ @@ -501,9 +500,11 @@ in jdk17 libtool pkg-config + ] ++ optionals kdeIntegration [ + wrapQtAppsHook ]; - buildInputs = with xorg; [ + buildInputs = with xorg; finalAttrs.passthru.gst_packages ++ [ ArchiveZip CoinMP IOCompress @@ -572,6 +573,7 @@ in libxshmfence libxslt libzmf + libwebp mdds mythes ncurses @@ -592,14 +594,23 @@ in which zip zlib - ] - ++ passthru.gst_packages - ++ optionals kdeIntegration [ qtbase qtx11extras kcoreaddons kio ] - ++ optionals (lib.versionAtLeast (lib.versions.majorMinor version) "7.4") [ libwebp ]; + ] ++ optionals kdeIntegration [ + qtbase + qtx11extras + kcoreaddons + kio + ]; passthru = { inherit srcs; jdk = jre'; + updateScript = [ + ./update.sh + # Pass it this file name as argument + (builtins.unsafeGetAttrPos "pname" finalAttrs.finalPackage).file + # And the variant + variant + ]; inherit kdeIntegration; # For the wrapper.nix inherit gtk3; @@ -656,4 +667,4 @@ in maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; }; -}).overrideAttrs ((importVariant "override.nix") (args // { inherit kdeIntegration; })) +}) diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/download-list-builder.sh b/third_party/nixpkgs/pkgs/applications/office/libreoffice/download-list-builder.sh deleted file mode 100644 index 31cab28fd8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/download-list-builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -if [ -e .attrs.sh ]; then source .attrs.sh; fi -source $stdenv/setup - -tar --extract --file=$src libreoffice-$version/download.lst -O > $out diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/gen-shell.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/gen-shell.nix deleted file mode 100644 index 7429bb0cb3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/gen-shell.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pkgs ? (import {}), variant }: - -with pkgs; - -let - - primary-src = callPackage (./. + "/src-${variant}/primary.nix") {}; - -in - -stdenv.mkDerivation { - name = "generate-libreoffice-srcs-shell"; - - buildCommand = "exit 1"; - - downloadList = stdenv.mkDerivation { - name = "libreoffice-${primary-src.version}-download-list"; - inherit (primary-src) src version; - builder = ./download-list-builder.sh; - }; - - buildInputs = [ python3 ]; - - shellHook = '' - function generate { - python3 generate-libreoffice-srcs.py ${variant} > src-${variant}/download.nix - } - ''; -} diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/gpgme-1.18.patch b/third_party/nixpkgs/pkgs/applications/office/libreoffice/gpgme-1.18.patch deleted file mode 100644 index f554371e91..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/gpgme-1.18.patch +++ /dev/null @@ -1,10 +0,0 @@ -The way this check mixes C and C++ started to cause issues since gpgme 1.18.0 -But we can confidently skip the function check anyway. ---- a/configure.ac -+++ b/configure.ac -@@ -12302,4 +12302 @@ -- # progress_callback is the only func with plain C linkage -- # checking for it also filters out older, KDE-dependent libgpgmepp versions -- AC_CHECK_LIB(gpgmepp, progress_callback, [ GPGMEPP_LIBS=-lgpgmepp ], -- [AC_MSG_ERROR(gpgmepp not found or not functional)], []) -+ GPGMEPP_LIBS=-lgpgmepp diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/poppler-22-04-0.patch b/third_party/nixpkgs/pkgs/applications/office/libreoffice/poppler-22-04-0.patch deleted file mode 100644 index c907bf1680..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/poppler-22-04-0.patch +++ /dev/null @@ -1,100 +0,0 @@ -Patch from OpenSUSE -https://build.opensuse.org/package/view_file/LibreOffice:Factory/libreoffice/poppler-22-04-0.patch?expand=1&rev=45e176f964509ebe3560d0dbf1ec8be9 -Index: libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -=================================================================== ---- libreoffice-7.3.3.1.orig/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ libreoffice-7.3.3.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -474,12 +474,21 @@ int PDFOutDev::parseFont( long long nNew - { - // TODO(P3): Unfortunately, need to read stream twice, since - // we must write byte count to stdout before -+#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed -+ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef()); -+ if ( pBuf ) -+ { -+ aNewFont.isEmbedded = true; -+ nSize = pBuf->size(); -+ } -+#else - char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); - if( pBuf ) - { - aNewFont.isEmbedded = true; - gfree(pBuf); - } -+#endif - } - - m_aFontMap[ nNewId ] = aNewFont; -@@ -492,21 +501,35 @@ void PDFOutDev::writeFontFile( GfxFont* - return; - - int nSize = 0; -+#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed -+ auto pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef()); -+ if ( !pBuf ) -+ return; -+ nSize = pBuf->size(); -+#else - char* pBuf = gfxFont->readEmbFontFile( m_pDoc->getXRef(), &nSize ); - if( !pBuf ) - return; -+#endif - - // ---sync point--- see SYNC STREAMS above - fflush(stdout); - -+#if POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed -+ if( fwrite(pBuf->data(), sizeof(unsigned char), nSize, g_binary_out) != static_cast(nSize) ) -+ { -+#else - if( fwrite(pBuf, sizeof(char), nSize, g_binary_out) != static_cast(nSize) ) - { - gfree(pBuf); -+#endif - exit(1); // error - } - // ---sync point--- see SYNC STREAMS above - fflush(g_binary_out); -+#if !POPPLER_CHECK_VERSION(22, 04, 0) // readEmbFontFile signature changed - gfree(pBuf); -+#endif - } - - #if POPPLER_CHECK_VERSION(0, 83, 0) -@@ -759,7 +782,11 @@ void PDFOutDev::updateFont(GfxState *sta - { - assert(state); - -+#if POPPLER_CHECK_VERSION(22, 04, 0) -+ std::shared_ptr gfxFont = state->getFont(); -+#else - GfxFont *gfxFont = state->getFont(); -+#endif - if( !gfxFont ) - return; - -@@ -776,7 +803,11 @@ void PDFOutDev::updateFont(GfxState *sta - m_aFontMap.find( fontID ); - if( it == m_aFontMap.end() ) - { -+#if POPPLER_CHECK_VERSION(22, 04, 0) -+ nEmbedSize = parseFont( fontID, gfxFont.get(), state ); -+#else - nEmbedSize = parseFont( fontID, gfxFont, state ); -+#endif - it = m_aFontMap.find( fontID ); - } - -@@ -806,7 +837,11 @@ void PDFOutDev::updateFont(GfxState *sta - - if (nEmbedSize) - { -+#if POPPLER_CHECK_VERSION(22, 04, 0) -+ writeFontFile(gfxFont.get()); -+#else - writeFontFile(gfxFont); -+#endif - } - } - diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch b/third_party/nixpkgs/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch deleted file mode 100644 index d3ae91835a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/skip-failed-test-with-icu70.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/i18npool/qa/cppunit/test_breakiterator.cxx -+++ b/i18npool/qa/cppunit/test_breakiterator.cxx -@@ -35,7 +35,7 @@ public: - void testWeak(); - void testAsian(); - void testThai(); --#if (U_ICU_VERSION_MAJOR_NUM > 51) -+#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) - void testLao(); - #ifdef TODO - void testNorthernThai(); -@@ -52,7 +52,7 @@ public: - CPPUNIT_TEST(testWeak); - CPPUNIT_TEST(testAsian); - CPPUNIT_TEST(testThai); --#if (U_ICU_VERSION_MAJOR_NUM > 51) -+#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) - CPPUNIT_TEST(testLao); - #ifdef TODO - CPPUNIT_TEST(testKhmer); -@@ -843,7 +843,7 @@ void TestBreakIterator::testAsian() - } - } - --#if (U_ICU_VERSION_MAJOR_NUM > 51) -+#if (U_ICU_VERSION_MAJOR_NUM > 51 && U_ICU_VERSION_MAJOR_NUM < 70) - //A test to ensure that our Lao word boundary detection is useful - void TestBreakIterator::testLao() - { diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/soffice-template.desktop b/third_party/nixpkgs/pkgs/applications/office/libreoffice/soffice-template.desktop deleted file mode 100644 index 4adb91284a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/soffice-template.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=LibreOffice @app@... -Comment=Enter LibreOffice @app@ filename: -Type=Link -URL=.source/soffice.@ext@ -Icon=libreoffice-oasis-@type@ diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/download.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/deps.nix similarity index 71% rename from third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/download.nix rename to third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/deps.nix index c74bd2716e..cea715cd1c 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/download.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/deps.nix @@ -7,11 +7,11 @@ md5name = "e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed-libabw-0.1.3.tar.xz"; } { - name = "boost_1_79_0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/boost_1_79_0.tar.xz"; - sha256 = "2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc"; + name = "boost_1_82_0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/boost_1_82_0.tar.xz"; + sha256 = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de"; md5 = ""; - md5name = "2058aa88758a0e1aaac1759b3c4bad2526f899c6ecc6eeea79aa5e8fd3ea95dc-boost_1_79_0.tar.xz"; + md5name = "e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de-boost_1_82_0.tar.xz"; } { name = "box2d-2.4.1.tar.gz"; @@ -98,11 +98,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.0.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.0.1.tar.xz"; - sha256 = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0"; + name = "curl-8.2.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.2.1.tar.xz"; + sha256 = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894"; md5 = ""; - md5name = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0-curl-8.0.1.tar.xz"; + md5name = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894-curl-8.2.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -154,11 +154,11 @@ md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2"; } { - name = "fontconfig-2.13.94.tar.xz"; - url = "https://dev-www.libreoffice.org/src/fontconfig-2.13.94.tar.xz"; - sha256 = "a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c"; + name = "fontconfig-2.14.2.tar.xz"; + url = "https://dev-www.libreoffice.org/src/fontconfig-2.14.2.tar.xz"; + sha256 = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b"; md5 = ""; - md5name = "a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c-fontconfig-2.13.94.tar.xz"; + md5name = "dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b-fontconfig-2.14.2.tar.xz"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -209,34 +209,6 @@ md5 = "e7a384790b13c29113e22e596ade9687"; md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; } - { - name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz"; - url = "https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; - sha256 = "09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f"; - md5 = "907d6e99f241876695c19ff3db0b8923"; - md5name = "907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; - } - { - name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - url = "https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61"; - md5 = "edc4d741888bc0d38e32dbaa17149596"; - md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - } - { - name = "source-serif-pro-3.000R.tar.gz"; - url = "https://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; - sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; - md5 = ""; - md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; - } - { - name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; - url = "https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; - sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; - md5 = ""; - md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; - } { name = "noto-fonts-20171024.tar.gz"; url = "https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; @@ -266,18 +238,11 @@ md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; } { - name = "Amiri-0.117.zip"; - url = "https://dev-www.libreoffice.org/src/Amiri-0.117.zip"; - sha256 = "9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7"; + name = "Amiri-1.000.zip"; + url = "https://dev-www.libreoffice.org/src/Amiri-1.000.zip"; + sha256 = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30"; md5 = ""; - md5name = "9c4e768893e0023a0ad6f488d5c84bd5add6565d3dcadb838ba5b20e75fcc9a7-Amiri-0.117.zip"; - } - { - name = "ttf-kacst_2.01+mry.tar.gz"; - url = "https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; - sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56"; - md5 = ""; - md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz"; + md5name = "926fe1bd7dfde8e55178281f645258bfced6420c951c6f2fd532fd21691bca30-Amiri-1.000.zip"; } { name = "ReemKufi-1.2.zip"; @@ -301,11 +266,18 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.12.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.12.0.tar.xz"; - sha256 = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033"; + name = "freetype-2.13.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.13.0.tar.xz"; + sha256 = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c"; md5 = ""; - md5name = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033-freetype-2.12.0.tar.xz"; + md5name = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c-freetype-2.13.0.tar.xz"; + } + { + name = "frozen-1.1.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz"; + sha256 = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45"; + md5 = ""; + md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz"; } { name = "glm-0.9.9.8.zip"; @@ -329,11 +301,11 @@ md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz"; } { - name = "harfbuzz-7.1.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/harfbuzz-7.1.0.tar.xz"; - sha256 = "f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b"; + name = "harfbuzz-8.0.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/harfbuzz-8.0.0.tar.xz"; + sha256 = "1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79"; md5 = ""; - md5name = "f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b-harfbuzz-7.1.0.tar.xz"; + md5name = "1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79-harfbuzz-8.0.0.tar.xz"; } { name = "hsqldb_1_8_0.zip"; @@ -343,11 +315,11 @@ md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { - name = "hunspell-1.7.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz"; - sha256 = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951"; + name = "hunspell-1.7.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/hunspell-1.7.2.tar.gz"; + sha256 = "11ddfa39afe28c28539fe65fc4f1592d410c1e9b6dd7d8a91ca25d85e9ec65b8"; md5 = ""; - md5name = "57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951-hunspell-1.7.0.tar.gz"; + md5name = "11ddfa39afe28c28539fe65fc4f1592d410c1e9b6dd7d8a91ca25d85e9ec65b8-hunspell-1.7.2.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; @@ -357,18 +329,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-71_1-src.tgz"; - url = "https://dev-www.libreoffice.org/src/icu4c-71_1-src.tgz"; - sha256 = "67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf"; + name = "icu4c-73_2-src.tgz"; + url = "https://dev-www.libreoffice.org/src/icu4c-73_2-src.tgz"; + sha256 = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1"; md5 = ""; - md5name = "67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf-icu4c-71_1-src.tgz"; + md5name = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1-icu4c-73_2-src.tgz"; } { - name = "icu4c-71_1-data.zip"; - url = "https://dev-www.libreoffice.org/src/icu4c-71_1-data.zip"; - sha256 = "e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804"; + name = "icu4c-73_2-data.zip"; + url = "https://dev-www.libreoffice.org/src/icu4c-73_2-data.zip"; + sha256 = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701"; md5 = ""; - md5name = "e3882b4fece6e5e039f22c3189b7ba224180fd26fdbfa9db284617455b93e804-icu4c-71_1-data.zip"; + md5name = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701-icu4c-73_2-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -448,18 +420,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-2.1.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.2.tar.gz"; - sha256 = "09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5"; + name = "libjpeg-turbo-2.1.5.1.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-2.1.5.1.tar.gz"; + sha256 = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf"; md5 = ""; - md5name = "09b96cb8cbff9ea556a9c2d173485fd19488844d55276ed4f42240e1e2073ce5-libjpeg-turbo-2.1.2.tar.gz"; + md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2022-08-08.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2022-08-08.tar.bz2"; - sha256 = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00"; + name = "language-subtag-registry-2023-05-11.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-05-11.tar.bz2"; + sha256 = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da"; md5 = ""; - md5name = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00-language-subtag-registry-2022-08-08.tar.bz2"; + md5name = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da-language-subtag-registry-2023-05-11.tar.bz2"; } { name = "lcms2-2.12.tar.gz"; @@ -469,11 +441,11 @@ md5name = "18663985e864100455ac3e507625c438c3710354d85e5cbb7cd4043e11fe10f5-lcms2-2.12.tar.gz"; } { - name = "libassuan-2.5.5.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/libassuan-2.5.5.tar.bz2"; - sha256 = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4"; + name = "libassuan-2.5.6.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/libassuan-2.5.6.tar.bz2"; + sha256 = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426"; md5 = ""; - md5name = "8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4-libassuan-2.5.5.tar.bz2"; + md5name = "e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426-libassuan-2.5.6.tar.bz2"; } { name = "libatomic_ops-7.6.8.tar.gz"; @@ -525,39 +497,39 @@ md5name = "5dcb4db3b2340f81f601ce86d8d76b69e34d70f84f804192c901e4b7f84d5fb0-libnumbertext-1.0.11.tar.xz"; } { - name = "ltm-1.0.zip"; - url = "https://dev-www.libreoffice.org/src/ltm-1.0.zip"; - sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; + name = "ltm-1.2.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/ltm-1.2.0.tar.xz"; + sha256 = "b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1"; md5 = ""; - md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; + md5name = "b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1-ltm-1.2.0.tar.xz"; } { - name = "libwebp-1.2.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libwebp-1.2.4.tar.gz"; - sha256 = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df"; + name = "libwebp-1.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.3.2.tar.gz"; + sha256 = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4"; md5 = ""; - md5name = "7bf5a8a28cc69bcfa8cb214f2c3095703c6b73ac5fba4d5480c205331d9494df-libwebp-1.2.4.tar.gz"; + md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz"; } { - name = "xmlsec1-1.2.34.tar.gz"; - url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.34.tar.gz"; - sha256 = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262"; + name = "xmlsec1-1.2.37.tar.gz"; + url = "https://dev-www.libreoffice.org/src/xmlsec1-1.2.37.tar.gz"; + sha256 = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c"; md5 = ""; - md5name = "52ced4943f35bd7d0818a38298c1528ca4ac8a54440fd71134a07d2d1370a262-xmlsec1-1.2.34.tar.gz"; + md5name = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c-xmlsec1-1.2.37.tar.gz"; } { - name = "libxml2-2.10.4.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.10.4.tar.xz"; - sha256 = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45"; + name = "libxml2-2.11.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.11.4.tar.xz"; + sha256 = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7"; md5 = ""; - md5name = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45-libxml2-2.10.4.tar.xz"; + md5name = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7-libxml2-2.11.4.tar.xz"; } { - name = "libxslt-1.1.35.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxslt-1.1.35.tar.xz"; - sha256 = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79"; + name = "libxslt-1.1.38.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxslt-1.1.38.tar.xz"; + sha256 = "1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1"; md5 = ""; - md5name = "8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79-libxslt-1.1.35.tar.xz"; + md5name = "1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1-libxslt-1.1.38.tar.xz"; } { name = "lp_solve_5.5.tar.gz"; @@ -581,11 +553,11 @@ md5name = "431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b-mariadb-connector-c-3.1.8-src.tar.gz"; } { - name = "mdds-2.0.3.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/mdds-2.0.3.tar.bz2"; - sha256 = "9771fe42e133443c13ca187253763e17c8bc96a1a02aec9e1e8893367ffa9ce5"; + name = "mdds-2.1.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/mdds-2.1.1.tar.xz"; + sha256 = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56"; md5 = ""; - md5name = "9771fe42e133443c13ca187253763e17c8bc96a1a02aec9e1e8893367ffa9ce5-mdds-2.0.3.tar.bz2"; + md5name = "1483d90cefb8aa4563c4d0a85cb7b243aa95217d235d422e9ca6722fd5b97e56-mdds-2.1.1.tar.xz"; } { name = "mDNSResponder-878.200.35.tar.gz"; @@ -609,18 +581,18 @@ md5name = "e8750123a78d61b943cef78b7736c8a7f20bb0a649aa112402124fba794fc21c-libmwaw-0.3.21.tar.xz"; } { - name = "mythes-1.2.4.tar.gz"; - url = "https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; - sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"; - md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; - md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + name = "mythes-1.2.5.tar.xz"; + url = "https://dev-www.libreoffice.org/src/mythes-1.2.5.tar.xz"; + sha256 = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d"; + md5 = ""; + md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.88.1-with-nspr-4.35.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.88.1-with-nspr-4.35.tar.gz"; - sha256 = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a"; + name = "nss-3.90-with-nspr-4.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.90-with-nspr-4.35.tar.gz"; + sha256 = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739"; md5 = ""; - md5name = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a-nss-3.88.1-with-nspr-4.35.tar.gz"; + md5name = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739-nss-3.90-with-nspr-4.35.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -644,25 +616,25 @@ md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { - name = "openldap-2.4.59.tgz"; - url = "https://dev-www.libreoffice.org/src/openldap-2.4.59.tgz"; - sha256 = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34"; + name = "openldap-2.6.6.tgz"; + url = "https://dev-www.libreoffice.org/src/openldap-2.6.6.tgz"; + sha256 = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0"; md5 = ""; - md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; + md5name = "082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0-openldap-2.6.6.tgz"; } { - name = "openssl-1.1.1t.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-1.1.1t.tar.gz"; - sha256 = "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b"; + name = "openssl-3.0.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.10.tar.gz"; + sha256 = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323"; md5 = ""; - md5name = "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b-openssl-1.1.1t.tar.gz"; + md5name = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323-openssl-3.0.10.tar.gz"; } { - name = "liborcus-0.17.2.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/liborcus-0.17.2.tar.bz2"; - sha256 = "2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143"; + name = "liborcus-0.18.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/liborcus-0.18.1.tar.xz"; + sha256 = "6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb"; md5 = ""; - md5name = "2a86c405a5929f749b27637509596421d46805753364ab258b035fd01fbde143-liborcus-0.17.2.tar.bz2"; + md5name = "6006b9f1576315e313df715a7e72a17f3e0b17d7b6bd119cfa8a0b608ce971eb-liborcus-0.18.1.tar.xz"; } { name = "libpagemaker-0.0.4.tar.xz"; @@ -672,11 +644,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-5058.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-5058.tar.bz2"; - sha256 = "eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac"; + name = "pdfium-5778.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-5778.tar.bz2"; + sha256 = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06"; md5 = ""; - md5name = "eaf4ce9fad32b5d951c524139df23119b66c67720057defb97acab2dfb2582ac-pdfium-5058.tar.bz2"; + md5name = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06-pdfium-5778.tar.bz2"; } { name = "pixman-0.42.2.tar.gz"; @@ -686,46 +658,46 @@ md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz"; } { - name = "libpng-1.6.39.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libpng-1.6.39.tar.xz"; - sha256 = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937"; + name = "libpng-1.6.40.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libpng-1.6.40.tar.xz"; + sha256 = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1"; md5 = ""; - md5name = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937-libpng-1.6.39.tar.xz"; + md5name = "535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1-libpng-1.6.40.tar.xz"; } { - name = "tiff-4.5.0rc3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/tiff-4.5.0rc3.tar.xz"; - sha256 = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c"; + name = "tiff-4.5.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.5.1.tar.xz"; + sha256 = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a"; md5 = ""; - md5name = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c-tiff-4.5.0rc3.tar.xz"; + md5name = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a-tiff-4.5.1.tar.xz"; } { - name = "poppler-22.12.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/poppler-22.12.0.tar.xz"; - sha256 = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0"; + name = "poppler-23.06.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/poppler-23.06.0.tar.xz"; + sha256 = "d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65"; md5 = ""; - md5name = "d9aa9cacdfbd0f8e98fc2b3bb008e645597ed480685757c3e7bc74b4278d15c0-poppler-22.12.0.tar.xz"; + md5name = "d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65-poppler-23.06.0.tar.xz"; } { - name = "poppler-data-0.4.11.tar.gz"; - url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.11.tar.gz"; - sha256 = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c"; + name = "poppler-data-0.4.12.tar.gz"; + url = "https://dev-www.libreoffice.org/src/poppler-data-0.4.12.tar.gz"; + sha256 = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74"; md5 = ""; - md5name = "2cec05cd1bb03af98a8b06a1e22f6e6e1a65b1e2f3816cb3069bb0874825f08c-poppler-data-0.4.11.tar.gz"; + md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz"; } { - name = "postgresql-13.10.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/postgresql-13.10.tar.bz2"; - sha256 = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2"; + name = "postgresql-13.11.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/postgresql-13.11.tar.bz2"; + sha256 = "4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb"; md5 = ""; - md5name = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2-postgresql-13.10.tar.bz2"; + md5name = "4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb-postgresql-13.11.tar.bz2"; } { - name = "Python-3.8.16.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.16.tar.xz"; - sha256 = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562"; + name = "Python-3.8.18.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.18.tar.xz"; + sha256 = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f"; md5 = ""; - md5name = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562-Python-3.8.16.tar.xz"; + md5name = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f-Python-3.8.18.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; @@ -770,11 +742,11 @@ md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; } { - name = "skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; - url = "https://dev-www.libreoffice.org/src/skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; - sha256 = "c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9"; + name = "skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"; + url = "https://dev-www.libreoffice.org/src/skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"; + sha256 = "0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9"; md5 = ""; - md5name = "c094a6247e44104beaaa0d00c825beb6baf1a8e532dc22214747495317a65bd9-skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz"; + md5name = "0d08a99ed46cde43b5ad2672b5d8770c8eb85d0d26cb8f1f85fd9befe1e9ceb9-skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz"; } { name = "libstaroffice-0.0.7.tar.xz"; @@ -797,13 +769,6 @@ md5 = ""; md5name = "82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6-twaindsm_2.4.1.orig.tar.gz"; } - { - name = "ucpp-1.3.2.tar.gz"; - url = "https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; - sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776"; - md5 = "0168229624cfac409e766913506961a8"; - md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; - } { name = "libvisio-0.1.7.tar.xz"; url = "https://dev-www.libreoffice.org/src/libvisio-0.1.7.tar.xz"; @@ -819,11 +784,11 @@ md5name = "2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09-libwpd-0.10.3.tar.xz"; } { - name = "libwpg-0.3.3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz"; - sha256 = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c"; + name = "libwpg-0.3.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libwpg-0.3.4.tar.xz"; + sha256 = "b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3"; md5 = ""; - md5name = "99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c-libwpg-0.3.3.tar.xz"; + md5name = "b55fda9440d1e070630eb2487d8b8697cf412c214a27caee9df69cec7c004de3-libwpg-0.3.4.tar.xz"; } { name = "libwps-0.4.12.tar.xz"; @@ -854,10 +819,10 @@ md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } { - name = "zxing-cpp-1.2.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/zxing-cpp-1.2.0.tar.gz"; - sha256 = "653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a"; + name = "zxing-cpp-2.0.0.tar.gz"; + url = "https://dev-www.libreoffice.org/src/zxing-cpp-2.0.0.tar.gz"; + sha256 = "12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76"; md5 = ""; - md5name = "653d9e44195d86cf64a36af9ff3a1978ec5599df3882439fefa56e7064f55e8a-zxing-cpp-1.2.0.tar.gz"; + md5name = "12b76b7005c30d34265fc20356d340da179b0b4d43d2c1b35bcca86776069f76-zxing-cpp-2.0.0.tar.gz"; } ] diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/help.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/help.nix new file mode 100644 index 0000000000..af319ca97a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/help.nix @@ -0,0 +1,4 @@ +{ + sha256 = "0j6idhdywnbl0qaimf1ahxaqvp9s0y2hfrbcbmw32c30g812gp3b"; + url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-help-7.6.2.1.tar.xz"; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/main.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/main.nix new file mode 100644 index 0000000000..52f29a2068 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/main.nix @@ -0,0 +1,4 @@ +{ + sha256 = "18lw5gnjihjwzdsk6xql7ax5lasykxxvg5bp40q4rqics0xp7lp5"; + url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-7.6.2.1.tar.xz"; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix deleted file mode 100644 index 148c674f50..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/override.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, kdeIntegration, ... }: -attrs: -{ - postConfigure = attrs.postConfigure + '' - sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' - sed -e '/CPPUNIT_ASSERT(!bRTL);/d' -i './vcl/qa/cppunit/text.cxx' - - sed -e '/CPPUNIT_ASSERT_EQUAL(0, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(4, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(11, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(18, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - - sed -e '/CPPUNIT_ASSERT_EQUAL(3, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(9, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(17, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - ''; - configureFlags = attrs.configureFlags ++ [ - "--without-system-dragonbox" - "--without-system-libfixmath" - ]; -} diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix deleted file mode 100644 index e9dc428749..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl }: - -rec { - fetchSrc = {name, hash}: fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; - sha256 = hash; - }; - - major = "7"; - minor = "5"; - patch = "4"; - tweak = "1"; - - subdir = "${major}.${minor}.${patch}"; - - version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; - - src = fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - hash = "sha256-dWE7yXldkiEnsJOxfxyZ9p05eARqexgRRgNV158VVF4="; - }; - - # FIXME rename - translations = fetchSrc { - name = "translations"; - hash = "sha256-dv3L8DtdxZcwmeXnqtTtwIpOvwZg3aH3VvJBiiZzbh0="; - }; - - # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from - # it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory - - help = fetchSrc { - name = "help"; - hash = "sha256-2CrGEyK5AQEAo1Qz1ACmvMH7BaOubW5BNLWv3fDEdOY="; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/translations.nix new file mode 100644 index 0000000000..e48a731402 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/translations.nix @@ -0,0 +1,4 @@ +{ + sha256 = "02nnys853na9hwznxnf1h0pm5ymijvpyv9chg45v11vy2ak9y8sv"; + url = "https://download.documentfoundation.org/libreoffice/src/7.6.2/libreoffice-translations-7.6.2.1.tar.xz"; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/version.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/version.nix new file mode 100644 index 0000000000..121156b199 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/version.nix @@ -0,0 +1 @@ +"7.6.2.1" diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/deps.nix similarity index 92% rename from third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix rename to third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/deps.nix index 345c30299f..5a13758ff1 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/deps.nix @@ -98,11 +98,11 @@ md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz"; } { - name = "curl-8.0.1.tar.xz"; - url = "https://dev-www.libreoffice.org/src/curl-8.0.1.tar.xz"; - sha256 = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0"; + name = "curl-8.2.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/curl-8.2.1.tar.xz"; + sha256 = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894"; md5 = ""; - md5name = "0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0-curl-8.0.1.tar.xz"; + md5name = "dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894-curl-8.2.1.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -273,11 +273,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.12.0.tar.xz"; - url = "https://dev-www.libreoffice.org/src/freetype-2.12.0.tar.xz"; - sha256 = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033"; + name = "freetype-2.13.0.tar.xz"; + url = "https://dev-www.libreoffice.org/src/freetype-2.13.0.tar.xz"; + sha256 = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c"; md5 = ""; - md5name = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033-freetype-2.12.0.tar.xz"; + md5name = "5ee23abd047636c24b2d43c6625dcafc66661d1aca64dec9e0d05df29592624c-freetype-2.13.0.tar.xz"; } { name = "glm-0.9.9.8.zip"; @@ -427,11 +427,11 @@ md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz"; } { - name = "language-subtag-registry-2022-08-08.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2022-08-08.tar.bz2"; - sha256 = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00"; + name = "language-subtag-registry-2023-05-11.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2023-05-11.tar.bz2"; + sha256 = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da"; md5 = ""; - md5name = "e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00-language-subtag-registry-2022-08-08.tar.bz2"; + md5name = "9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da-language-subtag-registry-2023-05-11.tar.bz2"; } { name = "lcms2-2.12.tar.gz"; @@ -504,11 +504,11 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "libwebp-1.3.0.tar.gz"; - url = "https://dev-www.libreoffice.org/src/libwebp-1.3.0.tar.gz"; - sha256 = "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c"; + name = "libwebp-1.3.2.tar.gz"; + url = "https://dev-www.libreoffice.org/src/libwebp-1.3.2.tar.gz"; + sha256 = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4"; md5 = ""; - md5name = "64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c-libwebp-1.3.0.tar.gz"; + md5name = "2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4-libwebp-1.3.2.tar.gz"; } { name = "xmlsec1-1.2.37.tar.gz"; @@ -518,11 +518,11 @@ md5name = "5f8dfbcb6d1e56bddd0b5ec2e00a3d0ca5342a9f57c24dffde5c796b2be2871c-xmlsec1-1.2.37.tar.gz"; } { - name = "libxml2-2.10.4.tar.xz"; - url = "https://dev-www.libreoffice.org/src/libxml2-2.10.4.tar.xz"; - sha256 = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45"; + name = "libxml2-2.11.4.tar.xz"; + url = "https://dev-www.libreoffice.org/src/libxml2-2.11.4.tar.xz"; + sha256 = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7"; md5 = ""; - md5name = "ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45-libxml2-2.10.4.tar.xz"; + md5name = "737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7-libxml2-2.11.4.tar.xz"; } { name = "libxslt-1.1.35.tar.xz"; @@ -588,11 +588,11 @@ md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz"; } { - name = "nss-3.88.1-with-nspr-4.35.tar.gz"; - url = "https://dev-www.libreoffice.org/src/nss-3.88.1-with-nspr-4.35.tar.gz"; - sha256 = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a"; + name = "nss-3.90-with-nspr-4.35.tar.gz"; + url = "https://dev-www.libreoffice.org/src/nss-3.90-with-nspr-4.35.tar.gz"; + sha256 = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739"; md5 = ""; - md5name = "fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a-nss-3.88.1-with-nspr-4.35.tar.gz"; + md5name = "f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739-nss-3.90-with-nspr-4.35.tar.gz"; } { name = "libodfgen-0.1.8.tar.xz"; @@ -623,11 +623,11 @@ md5name = "99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34-openldap-2.4.59.tgz"; } { - name = "openssl-3.0.8.tar.gz"; - url = "https://dev-www.libreoffice.org/src/openssl-3.0.8.tar.gz"; - sha256 = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e"; + name = "openssl-3.0.10.tar.gz"; + url = "https://dev-www.libreoffice.org/src/openssl-3.0.10.tar.gz"; + sha256 = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323"; md5 = ""; - md5name = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e-openssl-3.0.8.tar.gz"; + md5name = "1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323-openssl-3.0.10.tar.gz"; } { name = "liborcus-0.17.2.tar.bz2"; @@ -644,11 +644,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-5408.tar.bz2"; - url = "https://dev-www.libreoffice.org/src/pdfium-5408.tar.bz2"; - sha256 = "7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35"; + name = "pdfium-5778.tar.bz2"; + url = "https://dev-www.libreoffice.org/src/pdfium-5778.tar.bz2"; + sha256 = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06"; md5 = ""; - md5name = "7db59b1e91f2bc0ab4c5e19d1a4f881e6a47dbb0d3b7e980a7358225b12a0f35-pdfium-5408.tar.bz2"; + md5name = "b1052ff24e9ffb11af017c444bb0f6ad508d64c9a0fb88cacb0e8210245dde06-pdfium-5778.tar.bz2"; } { name = "pixman-0.42.2.tar.gz"; @@ -665,11 +665,11 @@ md5name = "1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937-libpng-1.6.39.tar.xz"; } { - name = "tiff-4.5.0rc3.tar.xz"; - url = "https://dev-www.libreoffice.org/src/tiff-4.5.0rc3.tar.xz"; - sha256 = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c"; + name = "tiff-4.5.1.tar.xz"; + url = "https://dev-www.libreoffice.org/src/tiff-4.5.1.tar.xz"; + sha256 = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a"; md5 = ""; - md5name = "dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c-tiff-4.5.0rc3.tar.xz"; + md5name = "3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a-tiff-4.5.1.tar.xz"; } { name = "poppler-22.12.0.tar.xz"; @@ -693,11 +693,11 @@ md5name = "5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2-postgresql-13.10.tar.bz2"; } { - name = "Python-3.8.16.tar.xz"; - url = "https://dev-www.libreoffice.org/src/Python-3.8.16.tar.xz"; - sha256 = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562"; + name = "Python-3.8.18.tar.xz"; + url = "https://dev-www.libreoffice.org/src/Python-3.8.18.tar.xz"; + sha256 = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f"; md5 = ""; - md5name = "d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562-Python-3.8.16.tar.xz"; + md5name = "3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f-Python-3.8.18.tar.xz"; } { name = "libqxp-0.0.2.tar.xz"; diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/help.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/help.nix new file mode 100644 index 0000000000..c2a5e643ab --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/help.nix @@ -0,0 +1,4 @@ +{ + sha256 = "0lpgcwq03qxvhbl5b9ndaz0cwswd6jin1rfm6hv3kr8q4l52jgb3"; + url = "https://download.documentfoundation.org/libreoffice/src/7.5.7/libreoffice-help-7.5.7.1.tar.xz"; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/main.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/main.nix new file mode 100644 index 0000000000..3f2f4d54da --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/main.nix @@ -0,0 +1,4 @@ +{ + sha256 = "041bs79539w61yqmy971rfpf8qvfs4cl2m2fdjv7n1nqf6a2z4v5"; + url = "https://download.documentfoundation.org/libreoffice/src/7.5.7/libreoffice-7.5.7.1.tar.xz"; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix deleted file mode 100644 index 0a46cc3736..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/override.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, kdeIntegration, commonsLogging, ... }: -attrs: -{ - postConfigure = attrs.postConfigure + '' - sed -e '/CPPUNIT_TEST(Import_Export_Import);/d' -i './sw/qa/inc/swmodeltestbase.hxx' - sed -e '/CPPUNIT_ASSERT(!bRTL);/d' -i './vcl/qa/cppunit/text.cxx' - - sed -e '/CPPUNIT_ASSERT_EQUAL(0, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(4, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(11, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(18, nMinRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - - sed -e '/CPPUNIT_ASSERT_EQUAL(3, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(9, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(17, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - sed -e '/CPPUNIT_ASSERT_EQUAL(22, nEndRunPos);/d' -i './vcl/qa/cppunit/text.cxx' - ''; - configureFlags = attrs.configureFlags; - - patches = attrs.patches or []; -} diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/primary.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/primary.nix deleted file mode 100644 index e0cbdc5da9..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/primary.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ fetchurl }: - -rec { - fetchSrc = {name, hash}: fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; - inherit hash; - }; - - major = "7"; - minor = "4"; - patch = "7"; - tweak = "2"; - - subdir = "${major}.${minor}.${patch}"; - - version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; - - src = fetchurl { - url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - hash = "sha256-dD2R8qE4png4D6eo7LWyQB2ZSwZ7MwdQ8DrY9SOi+yA="; - }; - - # FIXME rename - translations = fetchSrc { - name = "translations"; - hash = "sha256-7wea0EClmvwcPvgQDGagkOF7eBVvYTZScCEEpirdXnE="; - }; - - # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from - # it and LibreOffice can use these by pointing DICPATH environment variable at the hunspell directory - - help = fetchSrc { - name = "help"; - hash = "sha256-vcQWE3mBZx2sBQ9KzTh6zM7277mK9twfvyESTzTiII8="; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/translations.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/translations.nix new file mode 100644 index 0000000000..b9d465f146 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/translations.nix @@ -0,0 +1,4 @@ +{ + sha256 = "1zxhnn8sslrlyb1cyg319slza2kn6mcc4h3li9ssnlfzkrzvxhc4"; + url = "https://download.documentfoundation.org/libreoffice/src/7.5.7/libreoffice-translations-7.5.7.1.tar.xz"; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/version.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/version.nix new file mode 100644 index 0000000000..8324371b4e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/version.nix @@ -0,0 +1 @@ +"7.5.7.1" diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/update.sh b/third_party/nixpkgs/pkgs/applications/office/libreoffice/update.sh new file mode 100755 index 0000000000..a04e668e81 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/update.sh @@ -0,0 +1,74 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p python3 pup curl jq nix + +set -euo pipefail +echoerr() { echo "$@" 1>&2; } + +fname="$1" +echoerr got fname $fname +shift + +variant="$1" +# See comment near version_major variable +if [[ $variant == fresh ]]; then + head_tail=head +elif [[ $variant == still ]]; then + head_tail=tail +else + echoerr got unknown variant $variant + exit 3 +fi +echoerr got variant $variant +shift + +# Not totally needed, but makes it easy to run the update in case tis folder is +# deleted. +mkdir -p "$(dirname $fname)/src-$variant" +cd "$(dirname $fname)/src-$variant" + +# The pup command prints both fresh and still versions one after another, and +# we use either head -1 or tail -1 to get the right version, per the if elif +# above. +version_major="$(curl --silent https://www.libreoffice.org/download/download-libreoffice/ |\ + pup '.dl_version_number text{}' | $head_tail -1)" +echoerr got from website ${variant}_version $version_major +baseurl=https://download.documentfoundation.org/libreoffice/src/$version_major +tarballs=($(curl --silent $baseurl/ |\ + pup 'table json{}' |\ + jq --raw-output '.. | .href? | strings' |\ + grep "$version_major.*.tar.xz$")) + +full_version="$(echo ${tarballs[0]} | sed -e 's/^libreoffice-//' -e 's/.tar.xz$//')" +echoerr full version is $full_version +echo \"$full_version\" > version.nix + +for t in help translations; do + echo "{" > $t.nix + echo " sha256 = "\"$(nix-prefetch-url $baseurl/libreoffice-$t-$full_version.tar.xz)'";' >> $t.nix + echo " url = "\"$baseurl/libreoffice-$t-$full_version.tar.xz'";' >> $t.nix + echo "}" >> $t.nix +done + +# Out of loop nix-prefetch-url, because there is no $t, and we want the output +# path as well, to get the download.lst file from there afterwards. +main_path_hash=($(nix-prefetch-url --print-path $baseurl/libreoffice-$full_version.tar.xz)) +echo "{" > main.nix +echo " sha256 = "\"${main_path_hash[0]}'";' >> main.nix +echo " url = "\"$baseurl/libreoffice-$full_version.tar.xz'";' >> main.nix +echo "}" >> main.nix +echoerr got filename ${main_path_hash[1]} + +# Environment variable required by ../generate-libreoffice-srcs.py +export downloadList=/tmp/nixpkgs-libreoffice-update-download-$full_version.lst +# Need to extract the file only if it doesn't exist, otherwise spare time be +# skipping this. +if [[ ! -f "$downloadList" ]]; then + tar --extract \ + --file=${main_path_hash[1]} \ + libreoffice-$full_version/download.lst \ + -O > $downloadList +else + echoerr relying on previously downloaded downloadList file +fi +cd .. +python3 ./generate-libreoffice-srcs.py > src-$variant/deps.nix diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix index 1f4059b2ad..b44fc71c3d 100644 --- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/wrapper.nix @@ -19,7 +19,9 @@ }: let - inherit (unwrapped.srcs.primary) major minor; + inherit (unwrapped) version; + major = lib.versions.major version; + minor = lib.versions.minor version; makeWrapperArgs = builtins.concatStringsSep " " ([ "--set" "GDK_PIXBUF_MODULE_FILE" "${librsvg}/${gdk-pixbuf.moduleDir}.cache" diff --git a/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix b/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix index adc6eb6ec1..ae522f53e6 100644 --- a/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchYarnDeps , fetchzip , makeWrapper , makeDesktopItem @@ -14,23 +15,26 @@ let in mkYarnPackage rec { pname = "micropad"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "MicroPad"; repo = "Micropad-Electron"; rev = "v${version}"; - sha256 = "sha256-XmnKhyb0JMWP0ZGzPvLPtpkgAemW/mdxunbFW9WV9lE="; + hash = "sha256-Rr3mOz2OlCq2tibxutR8zBANhswnkz70aP9BBS/pXp0="; }; micropad-core = fetchzip { url = "https://github.com/MicroPad/MicroPad-Core/releases/download/v${version}/micropad.tar.xz"; - sha256 = "0mzyd2p4mmnc19ffvd4sd75x7xwb1g5masdaqpn2n3h91687jmsf"; + hash = "sha256-7yFTD8bXsxT6kBKxBGGxwzYpa0rZYLYV6KRYtImQ58c="; }; packageJSON = ./package.json; - yarnLock = ./yarn.lock; - yarnNix = ./yarn.nix; + + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-PKCi1c8WY1BG/H1kUJ8xSCVoLF/9DEn5Kh29is2BTYY="; + }; nativeBuildInputs = [ copyDesktopItems makeWrapper ] ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/micropad/package.json b/third_party/nixpkgs/pkgs/applications/office/micropad/package.json index 912e451cba..b3492b71e6 100644 --- a/third_party/nixpkgs/pkgs/applications/office/micropad/package.json +++ b/third_party/nixpkgs/pkgs/applications/office/micropad/package.json @@ -1,6 +1,6 @@ { "name": "micropad", - "version": "4.2.1", + "version": "4.3.0", "description": "A powerful note-taking app that helps you organise + take notes without restrictions.", "main": "main.js", "scripts": { @@ -25,9 +25,10 @@ }, "homepage": "https://getmicropad.com", "devDependencies": { + "@types/mime": "^3.0.1", "@types/node": "^18.7.18", - "electron": "^23.1.3", - "electron-builder": "^23.6.0", + "electron": "^25.5.0", + "electron-builder": "^24.6.3", "typescript": "~4.9.5" }, "dependencies": { @@ -36,7 +37,8 @@ "electron-context-menu": "^3.1.2", "electron-window-state": "^5.0.3", "localforage": "^1.10.0", - "typo-js": "^1.2.1" + "mime": "^3.0.0", + "typo-js": "^1.2.3" }, "build": { "appId": "com.getmicropad.micropad", diff --git a/third_party/nixpkgs/pkgs/applications/office/micropad/update.sh b/third_party/nixpkgs/pkgs/applications/office/micropad/update.sh index e6e3bdd92c..e2265af4ee 100755 --- a/third_party/nixpkgs/pkgs/applications/office/micropad/update.sh +++ b/third_party/nixpkgs/pkgs/applications/office/micropad/update.sh @@ -1,17 +1,11 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts jq nix nodePackages.prettier yarn2nix +#!nix-shell -i bash -p curl common-updater-scripts jq nix nodePackages.prettier prefetch-yarn-deps set -eu -o pipefail latest_version=$(curl -s https://api.github.com/repos/MicroPad/Micropad-Electron/releases/latest | jq --raw-output '.tag_name[1:]') old_core_hash=$(nix-instantiate --eval --strict -A "micropad.micropad-core.drvAttrs.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g') - -{ - read new_core_hash - read store_path -} < <( - nix-prefetch-url --unpack --print-path "https://github.com/MicroPad/MicroPad-Core/releases/download/v$latest_version/micropad.tar.xz" -) +new_core_hash=$(nix hash to-sri --type sha256 $(nix-prefetch-url --unpack "https://github.com/MicroPad/MicroPad-Core/releases/download/v$latest_version/micropad.tar.xz")) nixFile=$(nix-instantiate --eval --strict -A "micropad.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') nixFolder=$(dirname "$nixFile") @@ -22,6 +16,9 @@ curl -o "$nixFolder/package.json" -s "https://raw.githubusercontent.com/MicroPad curl -o "$nixFolder/yarn.lock" -s "https://raw.githubusercontent.com/MicroPad/MicroPad-Electron/v$latest_version/yarn.lock" prettier --write "$nixFolder/package.json" -yarn2nix --lockfile "$nixFolder/yarn.lock" >"$nixFolder/yarn.nix" +old_yarn_hash=$(nix-instantiate --eval --strict -A "micropad.offlineCache.outputHash" | tr -d '"' | sed -re 's|[+]|\\&|g') +new_yarn_hash=$(nix hash to-sri --type sha256 $(prefetch-yarn-deps "$nixFolder/yarn.lock")) +sed -i "$nixFile" -re "s|\"$old_yarn_hash\"|\"$new_yarn_hash\"|" +rm "$nixFolder/yarn.lock" update-source-version micropad "$latest_version" diff --git a/third_party/nixpkgs/pkgs/applications/office/micropad/yarn.lock b/third_party/nixpkgs/pkgs/applications/office/micropad/yarn.lock deleted file mode 100644 index a6a8c100f4..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/micropad/yarn.lock +++ /dev/null @@ -1,1733 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"7zip-bin@~5.1.1": - version "5.1.1" - resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" - integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== - -"@develar/schema-utils@~2.6.5": - version "2.6.5" - resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6" - integrity sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig== - dependencies: - ajv "^6.12.0" - ajv-keywords "^3.4.1" - -"@electron/get@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e" - integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g== - dependencies: - 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" - optionalDependencies: - global-agent "^3.0.0" - -"@electron/universal@1.2.1": - version "1.2.1" - resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339" - integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ== - dependencies: - "@malept/cross-spawn-promise" "^1.1.0" - asar "^3.1.0" - debug "^4.3.1" - dir-compare "^2.4.0" - fs-extra "^9.0.1" - minimatch "^3.0.4" - plist "^3.0.4" - -"@malept/cross-spawn-promise@^1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" - integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== - dependencies: - cross-spawn "^7.0.1" - -"@malept/flatpak-bundler@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" - integrity sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q== - dependencies: - debug "^4.1.1" - fs-extra "^9.0.0" - lodash "^4.17.15" - tmp-promise "^3.0.2" - -"@sindresorhus/is@^4.0.0": - version "4.6.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" - integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== - -"@szmarczak/http-timer@^4.0.5": - version "4.0.6" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" - integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w== - dependencies: - defer-to-connect "^2.0.0" - -"@tootallnate/once@2": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" - integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== - -"@types/cacheable-request@^6.0.1": - version "6.0.3" - resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183" - integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw== - dependencies: - "@types/http-cache-semantics" "*" - "@types/keyv" "^3.1.4" - "@types/node" "*" - "@types/responselike" "^1.0.0" - -"@types/debug@^4.1.6": - version "4.1.7" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" - integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg== - dependencies: - "@types/ms" "*" - -"@types/fs-extra@^9.0.11": - version "9.0.13" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" - integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== - dependencies: - "@types/node" "*" - -"@types/glob@^7.1.1": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" - integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== - dependencies: - "@types/minimatch" "*" - "@types/node" "*" - -"@types/http-cache-semantics@*": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" - integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== - -"@types/keyv@^3.1.4": - version "3.1.4" - resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6" - integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg== - dependencies: - "@types/node" "*" - -"@types/minimatch@*": - version "5.1.2" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" - integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== - -"@types/ms@*": - version "0.7.31" - resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" - integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== - -"@types/node@*", "@types/node@^18.7.18": - version "18.15.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.15.0.tgz#286a65e3fdffd691e170541e6ecb0410b16a38be" - integrity sha512-z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w== - -"@types/node@^16.11.26": - version "16.18.14" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.14.tgz#5465ce598486a703caddbefe8603f8a2cffa3461" - integrity sha512-wvzClDGQXOCVNU4APPopC2KtMYukaF1MN/W3xAmslx22Z4/IF1/izDMekuyoUlwfnDHYCIZGaj7jMwnJKBTxKw== - -"@types/plist@^3.0.1": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz#61b3727bba0f5c462fe333542534a0c3e19ccb01" - integrity sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw== - dependencies: - "@types/node" "*" - xmlbuilder ">=11.0.1" - -"@types/responselike@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" - integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== - dependencies: - "@types/node" "*" - -"@types/verror@^1.10.3": - version "1.10.6" - resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz#3e600c62d210c5826460858f84bcbb65805460bb" - integrity sha512-NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ== - -"@types/yargs-parser@*": - version "21.0.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b" - integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA== - -"@types/yargs@^17.0.1": - version "17.0.22" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz#7dd37697691b5f17d020f3c63e7a45971ff71e9a" - integrity sha512-pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g== - dependencies: - "@types/yargs-parser" "*" - -"@types/yauzl@^2.9.1": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" - integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw== - dependencies: - "@types/node" "*" - -agent-base@6: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - -ajv-keywords@^3.4.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== - -ajv@^6.10.0, ajv@^6.12.0: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - 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" - -ansi-regex@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" - integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -app-builder-bin@4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" - integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== - -app-builder-lib@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8" - integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA== - dependencies: - "7zip-bin" "~5.1.1" - "@develar/schema-utils" "~2.6.5" - "@electron/universal" "1.2.1" - "@malept/flatpak-bundler" "^0.4.0" - async-exit-hook "^2.0.1" - bluebird-lst "^1.0.9" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - chromium-pickle-js "^0.2.0" - debug "^4.3.4" - ejs "^3.1.7" - electron-osx-sign "^0.6.0" - electron-publish "23.6.0" - form-data "^4.0.0" - fs-extra "^10.1.0" - hosted-git-info "^4.1.0" - is-ci "^3.0.0" - isbinaryfile "^4.0.10" - js-yaml "^4.1.0" - lazy-val "^1.0.5" - minimatch "^3.1.2" - read-config-file "6.2.0" - sanitize-filename "^1.6.3" - semver "^7.3.7" - tar "^6.1.11" - temp-file "^3.4.0" - -argparse@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" - integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== - -asar@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz#e6edb5edd6f627ebef04db62f771c61bea9c1221" - integrity sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg== - dependencies: - chromium-pickle-js "^0.2.0" - commander "^5.0.0" - glob "^7.1.6" - minimatch "^3.0.4" - optionalDependencies: - "@types/glob" "^7.1.1" - -assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== - -astral-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" - integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== - -async-exit-hook@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" - integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw== - -async@^3.2.3: - version "3.2.4" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" - integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== - -at-least-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" - integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -base64-js@^1.3.1, base64-js@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -bluebird-lst@^1.0.9: - version "1.0.9" - resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" - integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw== - dependencies: - bluebird "^3.5.5" - -bluebird@^3.5.0, bluebird@^3.5.5: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== - -boolean@^3.0.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" - integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== - dependencies: - balanced-match "^1.0.0" - -buffer-alloc-unsafe@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" - integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== - -buffer-alloc@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" - integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== - dependencies: - buffer-alloc-unsafe "^1.1.0" - buffer-fill "^1.0.0" - -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== - -buffer-equal@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" - integrity sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ== - -buffer-fill@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" - integrity sha512-T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ== - -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== - -buffer@^5.1.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - -builder-util-runtime@9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60" - integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw== - dependencies: - debug "^4.3.4" - sax "^1.2.4" - -builder-util@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9" - integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ== - dependencies: - "7zip-bin" "~5.1.1" - "@types/debug" "^4.1.6" - "@types/fs-extra" "^9.0.11" - app-builder-bin "4.0.0" - bluebird-lst "^1.0.9" - builder-util-runtime "9.1.1" - chalk "^4.1.1" - cross-spawn "^7.0.3" - debug "^4.3.4" - fs-extra "^10.0.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" - 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" - -cacheable-lookup@^5.0.3: - version "5.0.4" - resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" - integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== - -cacheable-request@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27" - integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew== - dependencies: - 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" - -chalk@^4.0.2, chalk@^4.1.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== - -chromium-pickle-js@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" - integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== - -ci-info@^3.2.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91" - integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw== - -cli-truncate@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" - integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== - dependencies: - slice-ansi "^3.0.0" - string-width "^4.2.0" - -cliui@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" - integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.1" - wrap-ansi "^7.0.0" - -clone-response@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3" - integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA== - dependencies: - mimic-response "^1.0.0" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -colors@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" - integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw== - -combined-stream@^1.0.8: - version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== - dependencies: - delayed-stream "~1.0.0" - -commander@2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - integrity sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A== - dependencies: - graceful-readlink ">= 1.0.0" - -commander@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" - integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== - -compare-version@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" - integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A== - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== - -core-util-is@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== - -crc@^3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" - integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== - dependencies: - buffer "^5.1.0" - -cross-spawn@^7.0.1, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -debug@^2.6.8: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -decompress-response@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" - integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== - dependencies: - mimic-response "^3.1.0" - -defer-to-connect@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" - integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== - -define-properties@^1.1.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" - integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== - dependencies: - has-property-descriptors "^1.0.0" - object-keys "^1.1.1" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== - -detect-node@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" - integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== - -dictionary-en-au@^2.1.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/dictionary-en-au/-/dictionary-en-au-2.4.0.tgz#6d7199c623bce7f9797f96aa89fbf79fd25d1f1f" - integrity sha512-SEETr3rqt26/Umc43gemwaH/ez4gPv7I4alifu/QLi8uxiCm6a7cn3wKb22HNB5l6j/R7/Sfkq9NTKk/QRVUHw== - -dictionary-en@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/dictionary-en/-/dictionary-en-3.2.0.tgz#5d5b5a156a5b1eb26ff96c80da3b919587f16b4b" - integrity sha512-oujbJhuplUTlDntmOoultEcNyk8ge7cFI6yXNn7eJvpbBJOhGNhWtK0XjOJsiwl4EfIeyvDKwGB95vJXv1d+lQ== - -dir-compare@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" - integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA== - dependencies: - buffer-equal "1.0.0" - colors "1.0.3" - commander "2.9.0" - minimatch "3.0.4" - -dmg-builder@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948" - integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA== - dependencies: - app-builder-lib "23.6.0" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - fs-extra "^10.0.0" - iconv-lite "^0.6.2" - js-yaml "^4.1.0" - optionalDependencies: - dmg-license "^1.0.11" - -dmg-license@^1.0.11: - version "1.0.11" - resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a" - integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q== - dependencies: - "@types/plist" "^3.0.1" - "@types/verror" "^1.10.3" - ajv "^6.10.0" - crc "^3.8.0" - iconv-corefoundation "^1.1.7" - plist "^3.0.4" - smart-buffer "^4.0.2" - verror "^1.10.0" - -dotenv-expand@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" - integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== - -dotenv@^9.0.2: - version "9.0.2" - resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" - integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== - -ejs@^3.1.7: - version "3.1.8" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" - integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== - dependencies: - jake "^10.8.5" - -electron-builder@^23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz#c79050cbdce90ed96c5feb67c34e9e0a21b5331b" - integrity sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw== - dependencies: - "@types/yargs" "^17.0.1" - app-builder-lib "23.6.0" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - chalk "^4.1.1" - dmg-builder "23.6.0" - fs-extra "^10.0.0" - is-ci "^3.0.0" - lazy-val "^1.0.5" - read-config-file "6.2.0" - simple-update-notifier "^1.0.7" - yargs "^17.5.1" - -electron-context-menu@^3.1.2: - version "3.6.1" - resolved "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.1.tgz#42f117e15309687b22283e6f8f7a0d95a19afe84" - integrity sha512-lcpO6tzzKUROeirhzBjdBWNqayEThmdW+2I2s6H6QMrwqTVyT3EK47jW3Nxm60KTxl5/bWfEoIruoUNn57/QkQ== - dependencies: - cli-truncate "^2.1.0" - electron-dl "^3.2.1" - electron-is-dev "^2.0.0" - -electron-dl@^3.2.1: - version "3.5.0" - resolved "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.5.0.tgz#7a80bf13f168f7e5204774eee89dbc7c86de957b" - integrity sha512-Oj+VSuScVx8hEKM2HEvTQswTX6G3MLh7UoAz/oZuvKyNDfudNi1zY6PK/UnFoK1nCl9DF6k+3PFwElKbtZlDig== - dependencies: - ext-name "^5.0.0" - pupa "^2.0.1" - unused-filename "^2.1.0" - -electron-is-dev@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-2.0.0.tgz#833487a069b8dad21425c67a19847d9064ab19bd" - integrity sha512-3X99K852Yoqu9AcW50qz3ibYBWY79/pBhlMCab8ToEWS48R0T9tyxRiQhwylE7zQdXrMnx2JKqUJyMPmt5FBqA== - -electron-osx-sign@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8" - integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg== - dependencies: - bluebird "^3.5.0" - compare-version "^0.1.2" - debug "^2.6.8" - isbinaryfile "^3.0.2" - minimist "^1.2.0" - plist "^3.0.1" - -electron-publish@23.6.0: - version "23.6.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9" - integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg== - dependencies: - "@types/fs-extra" "^9.0.11" - builder-util "23.6.0" - builder-util-runtime "9.1.1" - chalk "^4.1.1" - fs-extra "^10.0.0" - lazy-val "^1.0.5" - mime "^2.5.2" - -electron-window-state@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/electron-window-state/-/electron-window-state-5.0.3.tgz#4f36d09e3f953d87aff103bf010f460056050aa8" - integrity sha512-1mNTwCfkolXl3kMf50yW3vE2lZj0y92P/HYWFBrb+v2S/pCka5mdwN3cagKm458A7NjndSwijynXgcLWRodsVg== - dependencies: - jsonfile "^4.0.0" - mkdirp "^0.5.1" - -electron@^23.1.3: - version "23.1.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-23.1.3.tgz#42efdb98443a51db38bb0b627ec6788b1a64b92d" - integrity sha512-MNjuUS2K6/OxlJ0zTC77djo1R3xM038v1kUunvNFgDMZHYKpSOzOMNsPiwM2BGp+uZbkUb0nTnYafxXrM8H16w== - dependencies: - "@electron/get" "^2.0.0" - "@types/node" "^16.11.26" - extract-zip "^2.0.1" - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -end-of-stream@^1.1.0: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - -env-paths@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" - integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== - -es6-error@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" - integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-goat@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" - integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== - -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - -ext-list@^2.0.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37" - integrity sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA== - dependencies: - mime-db "^1.28.0" - -ext-name@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz#70781981d183ee15d13993c8822045c506c8f0a6" - integrity sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ== - dependencies: - ext-list "^2.0.0" - sort-keys-length "^1.0.0" - -extract-zip@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" - integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== - dependencies: - debug "^4.1.1" - get-stream "^5.1.0" - yauzl "^2.10.0" - optionalDependencies: - "@types/yauzl" "^2.9.1" - -extsprintf@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" - integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== - -fast-deep-equal@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== - dependencies: - pend "~1.2.0" - -filelist@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" - integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== - dependencies: - minimatch "^5.0.1" - -form-data@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" - integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.8" - mime-types "^2.1.12" - -fs-extra@^10.0.0, fs-extra@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" - integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^9.0.0, fs-extra@^9.0.1: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-minipass@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" - integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== - dependencies: - minipass "^3.0.0" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-intrinsic@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" - integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.3" - -get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== - dependencies: - pump "^3.0.0" - -glob@^7.1.3, glob@^7.1.6: - version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" - integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== - 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" - -global-agent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" - integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== - 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" - -globalthis@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" - integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== - dependencies: - define-properties "^1.1.3" - -got@^11.8.5: - version "11.8.6" - resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" - integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== - dependencies: - "@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@^4.1.6, graceful-fs@^4.2.0: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== - -"graceful-readlink@>= 1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w== - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-property-descriptors@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" - integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== - dependencies: - get-intrinsic "^1.1.1" - -has-symbols@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" - integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -hosted-git-info@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" - integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== - dependencies: - lru-cache "^6.0.0" - -http-cache-semantics@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" - integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== - -http-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" - integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== - dependencies: - "@tootallnate/once" "2" - agent-base "6" - debug "4" - -http2-wrapper@^1.0.0-beta.5.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" - integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== - dependencies: - quick-lru "^5.1.1" - resolve-alpn "^1.0.0" - -https-proxy-agent@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" - integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== - dependencies: - agent-base "6" - debug "4" - -iconv-corefoundation@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" - integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ== - dependencies: - cli-truncate "^2.1.0" - node-addon-api "^1.6.3" - -iconv-lite@^0.6.2: - version "0.6.3" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" - integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== - dependencies: - safer-buffer ">= 2.1.2 < 3.0.0" - -ieee754@^1.1.13: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -immediate@~3.0.5: - version "3.0.6" - resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" - integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ== - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -is-ci@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" - integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== - dependencies: - ci-info "^3.2.0" - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-plain-obj@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== - -isbinaryfile@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" - integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== - dependencies: - buffer-alloc "^1.2.0" - -isbinaryfile@^4.0.10: - version "4.0.10" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" - integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== - -isexe@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== - -jake@^10.8.5: - version "10.8.5" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" - integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== - dependencies: - async "^3.2.3" - chalk "^4.0.2" - filelist "^1.0.1" - minimatch "^3.0.4" - -js-yaml@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - -json-buffer@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" - integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-stringify-safe@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== - -json5@^2.2.0: - version "2.2.3" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" - integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== - optionalDependencies: - graceful-fs "^4.1.6" - -jsonfile@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" - integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== - dependencies: - universalify "^2.0.0" - optionalDependencies: - graceful-fs "^4.1.6" - -keyv@^4.0.0: - version "4.5.2" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56" - integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g== - dependencies: - json-buffer "3.0.1" - -lazy-val@^1.0.4, lazy-val@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" - integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== - -lie@3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e" - integrity sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw== - dependencies: - immediate "~3.0.5" - -localforage@^1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4" - integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg== - dependencies: - lie "3.1.1" - -lodash@^4.17.15: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -lowercase-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" - integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -matcher@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" - integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== - dependencies: - escape-string-regexp "^4.0.0" - -mime-db@1.52.0, mime-db@^1.28.0: - version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" - integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== - -mime-types@^2.1.12: - version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" - integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== - dependencies: - mime-db "1.52.0" - -mime@^2.5.2: - version "2.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" - integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== - -mimic-response@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" - integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== - -mimic-response@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" - integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== - -minimatch@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^5.0.1: - version "5.1.6" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" - integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== - dependencies: - brace-expansion "^2.0.1" - -minimist@^1.2.0, minimist@^1.2.6: - version "1.2.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" - integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== - -minipass@^3.0.0: - version "3.3.6" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" - integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== - dependencies: - yallist "^4.0.0" - -minipass@^4.0.0: - version "4.2.4" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.2.4.tgz#7d0d97434b6a19f59c5c3221698b48bbf3b2cd06" - integrity sha512-lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ== - -minizlib@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" - integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== - dependencies: - minipass "^3.0.0" - yallist "^4.0.0" - -mkdirp@^0.5.1: - version "0.5.6" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" - integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== - dependencies: - minimist "^1.2.6" - -mkdirp@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - -modify-filename@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/modify-filename/-/modify-filename-1.1.0.tgz#9a2dec83806fbb2d975f22beec859ca26b393aa1" - integrity sha512-EickqnKq3kVVaZisYuCxhtKbZjInCuwgwZWyAmRIp1NTMhri7r3380/uqwrUHfaDiPzLVTuoNy4whX66bxPVog== - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -node-addon-api@^1.6.3: - version "1.7.2" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" - integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== - -normalize-url@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" - integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== - -object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== - dependencies: - wrappy "1" - -p-cancelable@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" - integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg== - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== - -path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== - -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== - -plist@^3.0.1, plist@^3.0.4: - version "3.0.6" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3" - integrity sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA== - dependencies: - base64-js "^1.5.1" - xmlbuilder "^15.1.1" - -progress@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" - integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== - -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -punycode@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" - integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== - -pupa@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" - integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== - dependencies: - escape-goat "^2.0.0" - -quick-lru@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" - integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== - -read-config-file@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" - integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg== - dependencies: - dotenv "^9.0.2" - dotenv-expand "^5.1.0" - js-yaml "^4.1.0" - json5 "^2.2.0" - lazy-val "^1.0.4" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== - -resolve-alpn@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" - integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== - -responselike@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" - integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw== - dependencies: - lowercase-keys "^2.0.0" - -rimraf@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== - dependencies: - glob "^7.1.3" - -roarr@^2.15.3: - version "2.15.4" - resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" - integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== - dependencies: - 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" - -"safer-buffer@>= 2.1.2 < 3.0.0": - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -sanitize-filename@^1.6.3: - version "1.6.3" - resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" - integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== - dependencies: - truncate-utf8-bytes "^1.0.0" - -sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== - -semver@^6.2.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.3.2, semver@^7.3.7: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== - dependencies: - lru-cache "^6.0.0" - -semver@~7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" - integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== - -serialize-error@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" - integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== - dependencies: - type-fest "^0.13.1" - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -simple-update-notifier@^1.0.7: - version "1.1.0" - resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82" - integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg== - dependencies: - semver "~7.0.0" - -slice-ansi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" - integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -smart-buffer@^4.0.2: - version "4.2.0" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" - integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== - -sort-keys-length@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188" - integrity sha512-GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw== - dependencies: - sort-keys "^1.0.0" - -sort-keys@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad" - integrity sha512-vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg== - dependencies: - is-plain-obj "^1.0.0" - -source-map-support@^0.5.19: - version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map@^0.6.0: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -sprintf-js@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" - integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== - -stat-mode@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" - integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== - -string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -sumchecker@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" - integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg== - dependencies: - debug "^4.1.0" - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -tar@^6.1.11: - version "6.1.13" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" - integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^4.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - -temp-file@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" - integrity sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg== - dependencies: - async-exit-hook "^2.0.1" - fs-extra "^10.0.0" - -tmp-promise@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" - integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ== - dependencies: - tmp "^0.2.0" - -tmp@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== - dependencies: - rimraf "^3.0.0" - -truncate-utf8-bytes@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" - integrity sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ== - dependencies: - utf8-byte-length "^1.0.1" - -type-fest@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" - integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== - -typescript@~4.9.5: - version "4.9.5" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" - integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== - -typo-js@^1.2.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz#340484d81fe518e77c81a5a770162b14492f183b" - integrity sha512-C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw== - -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -universalify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" - integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== - -unused-filename@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/unused-filename/-/unused-filename-2.1.0.tgz#33719c4e8d9644f32d2dec1bc8525c6aaeb4ba51" - integrity sha512-BMiNwJbuWmqCpAM1FqxCTD7lXF97AvfQC8Kr/DIeA6VtvhJaMDupZ82+inbjl5yVP44PcxOuCSxye1QMS0wZyg== - dependencies: - modify-filename "^1.1.0" - path-exists "^4.0.0" - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -utf8-byte-length@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" - integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA== - -verror@^1.10.0: - version "1.10.1" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb" - integrity sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg== - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -which@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== - -xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: - version "15.1.1" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" - integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yargs-parser@^21.1.1: - version "21.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - -yargs@^17.5.1: - version "17.7.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" - integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw== - dependencies: - 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" - -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" diff --git a/third_party/nixpkgs/pkgs/applications/office/micropad/yarn.nix b/third_party/nixpkgs/pkgs/applications/office/micropad/yarn.nix deleted file mode 100644 index 6642790712..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/micropad/yarn.nix +++ /dev/null @@ -1,2013 +0,0 @@ -{ fetchurl, fetchgit, linkFarm, runCommand, gnutar }: rec { - offline_cache = linkFarm "offline" packages; - packages = [ - { - name = "7zip_bin___7zip_bin_5.1.1.tgz"; - path = fetchurl { - name = "7zip_bin___7zip_bin_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz"; - sha512 = "sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ=="; - }; - } - { - name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; - path = fetchurl { - name = "_develar_schema_utils___schema_utils_2.6.5.tgz"; - url = "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz"; - sha512 = "0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig=="; - }; - } - { - name = "_electron_get___get_2.0.2.tgz"; - path = fetchurl { - name = "_electron_get___get_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz"; - sha512 = "eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g=="; - }; - } - { - name = "_electron_universal___universal_1.2.1.tgz"; - path = fetchurl { - name = "_electron_universal___universal_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz"; - sha512 = "7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ=="; - }; - } - { - name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; - path = fetchurl { - name = "_malept_cross_spawn_promise___cross_spawn_promise_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz"; - sha512 = "RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ=="; - }; - } - { - name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; - path = fetchurl { - name = "_malept_flatpak_bundler___flatpak_bundler_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz"; - sha512 = "9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q=="; - }; - } - { - name = "_sindresorhus_is___is_4.6.0.tgz"; - path = fetchurl { - name = "_sindresorhus_is___is_4.6.0.tgz"; - url = "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz"; - sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; - }; - } - { - name = "_szmarczak_http_timer___http_timer_4.0.6.tgz"; - path = fetchurl { - name = "_szmarczak_http_timer___http_timer_4.0.6.tgz"; - url = "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz"; - sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; - }; - } - { - name = "_tootallnate_once___once_2.0.0.tgz"; - path = fetchurl { - name = "_tootallnate_once___once_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz"; - sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; - }; - } - { - name = "_types_cacheable_request___cacheable_request_6.0.3.tgz"; - path = fetchurl { - name = "_types_cacheable_request___cacheable_request_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz"; - sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw=="; - }; - } - { - name = "_types_debug___debug_4.1.7.tgz"; - path = fetchurl { - name = "_types_debug___debug_4.1.7.tgz"; - url = "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz"; - sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; - }; - } - { - name = "_types_fs_extra___fs_extra_9.0.13.tgz"; - path = fetchurl { - name = "_types_fs_extra___fs_extra_9.0.13.tgz"; - url = "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz"; - sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; - }; - } - { - name = "_types_glob___glob_7.2.0.tgz"; - path = fetchurl { - name = "_types_glob___glob_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz"; - sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; - }; - } - { - name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz"; - path = fetchurl { - name = "_types_http_cache_semantics___http_cache_semantics_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz"; - sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; - }; - } - { - name = "_types_keyv___keyv_3.1.4.tgz"; - path = fetchurl { - name = "_types_keyv___keyv_3.1.4.tgz"; - url = "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz"; - sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; - }; - } - { - name = "_types_minimatch___minimatch_5.1.2.tgz"; - path = fetchurl { - name = "_types_minimatch___minimatch_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz"; - sha512 = "K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="; - }; - } - { - name = "_types_ms___ms_0.7.31.tgz"; - path = fetchurl { - name = "_types_ms___ms_0.7.31.tgz"; - url = "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz"; - sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; - }; - } - { - name = "_types_node___node_18.15.0.tgz"; - path = fetchurl { - name = "_types_node___node_18.15.0.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-18.15.0.tgz"; - sha512 = "z6nr0TTEOBGkzLGmbypWOGnpSpSIBorEhC4L+4HeQ2iezKCi4f77kyslRwvHeNitymGQ+oFyIWGP96l/DPSV9w=="; - }; - } - { - name = "_types_node___node_16.18.14.tgz"; - path = fetchurl { - name = "_types_node___node_16.18.14.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-16.18.14.tgz"; - sha512 = "wvzClDGQXOCVNU4APPopC2KtMYukaF1MN/W3xAmslx22Z4/IF1/izDMekuyoUlwfnDHYCIZGaj7jMwnJKBTxKw=="; - }; - } - { - name = "_types_plist___plist_3.0.2.tgz"; - path = fetchurl { - name = "_types_plist___plist_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.2.tgz"; - sha512 = "ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw=="; - }; - } - { - name = "_types_responselike___responselike_1.0.0.tgz"; - path = fetchurl { - name = "_types_responselike___responselike_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz"; - sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; - }; - } - { - name = "_types_verror___verror_1.10.6.tgz"; - path = fetchurl { - name = "_types_verror___verror_1.10.6.tgz"; - url = "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.6.tgz"; - sha512 = "NNm+gdePAX1VGvPcGZCDKQZKYSiAWigKhKaz5KF94hG6f2s8de9Ow5+7AbXoeKxL8gavZfk4UquSAygOF2duEQ=="; - }; - } - { - name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; - path = fetchurl { - name = "_types_yargs_parser___yargs_parser_21.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"; - sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; - }; - } - { - name = "_types_yargs___yargs_17.0.22.tgz"; - path = fetchurl { - name = "_types_yargs___yargs_17.0.22.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.22.tgz"; - sha512 = "pet5WJ9U8yPVRhkwuEIp5ktAeAqRZOq4UdAyWLWzxbtpyXnzbtLdKiXAjJzi/KLmPGS9wk86lUFWZFN6sISo4g=="; - }; - } - { - name = "_types_yauzl___yauzl_2.10.0.tgz"; - path = fetchurl { - name = "_types_yauzl___yauzl_2.10.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz"; - sha512 = "Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw=="; - }; - } - { - name = "agent_base___agent_base_6.0.2.tgz"; - path = fetchurl { - name = "agent_base___agent_base_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz"; - sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; - }; - } - { - name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; - path = fetchurl { - name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; - sha512 = "5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ=="; - }; - } - { - name = "ajv___ajv_6.12.6.tgz"; - path = fetchurl { - name = "ajv___ajv_6.12.6.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; - sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; - }; - } - { - name = "ansi_regex___ansi_regex_5.0.1.tgz"; - path = fetchurl { - name = "ansi_regex___ansi_regex_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz"; - sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; - }; - } - { - name = "ansi_styles___ansi_styles_4.3.0.tgz"; - path = fetchurl { - name = "ansi_styles___ansi_styles_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; - sha512 = "zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="; - }; - } - { - name = "app_builder_bin___app_builder_bin_4.0.0.tgz"; - path = fetchurl { - name = "app_builder_bin___app_builder_bin_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz"; - sha512 = "xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA=="; - }; - } - { - name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; - path = fetchurl { - name = "app_builder_lib___app_builder_lib_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz"; - sha512 = "dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA=="; - }; - } - { - name = "argparse___argparse_2.0.1.tgz"; - path = fetchurl { - name = "argparse___argparse_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz"; - sha512 = "8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="; - }; - } - { - name = "asar___asar_3.2.0.tgz"; - path = fetchurl { - name = "asar___asar_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz"; - sha512 = "COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg=="; - }; - } - { - name = "assert_plus___assert_plus_1.0.0.tgz"; - path = fetchurl { - name = "assert_plus___assert_plus_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz"; - sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; - }; - } - { - name = "astral_regex___astral_regex_2.0.0.tgz"; - path = fetchurl { - name = "astral_regex___astral_regex_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; - sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; - }; - } - { - name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; - path = fetchurl { - name = "async_exit_hook___async_exit_hook_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz"; - sha512 = "NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw=="; - }; - } - { - name = "async___async_3.2.4.tgz"; - path = fetchurl { - name = "async___async_3.2.4.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz"; - sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; - }; - } - { - name = "asynckit___asynckit_0.4.0.tgz"; - path = fetchurl { - name = "asynckit___asynckit_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz"; - sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; - }; - } - { - name = "at_least_node___at_least_node_1.0.0.tgz"; - path = fetchurl { - name = "at_least_node___at_least_node_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz"; - sha512 = "+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="; - }; - } - { - name = "balanced_match___balanced_match_1.0.2.tgz"; - path = fetchurl { - name = "balanced_match___balanced_match_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz"; - sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; - }; - } - { - name = "base64_js___base64_js_1.5.1.tgz"; - path = fetchurl { - name = "base64_js___base64_js_1.5.1.tgz"; - url = "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz"; - sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; - }; - } - { - name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; - path = fetchurl { - name = "bluebird_lst___bluebird_lst_1.0.9.tgz"; - url = "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz"; - sha512 = "7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw=="; - }; - } - { - name = "bluebird___bluebird_3.7.2.tgz"; - path = fetchurl { - name = "bluebird___bluebird_3.7.2.tgz"; - url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; - sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; - }; - } - { - name = "boolean___boolean_3.2.0.tgz"; - path = fetchurl { - name = "boolean___boolean_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz"; - sha512 = "d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw=="; - }; - } - { - name = "brace_expansion___brace_expansion_1.1.11.tgz"; - path = fetchurl { - name = "brace_expansion___brace_expansion_1.1.11.tgz"; - url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz"; - sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; - }; - } - { - name = "brace_expansion___brace_expansion_2.0.1.tgz"; - path = fetchurl { - name = "brace_expansion___brace_expansion_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz"; - sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; - }; - } - { - name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; - path = fetchurl { - name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"; - sha512 = "TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="; - }; - } - { - name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; - path = fetchurl { - name = "buffer_alloc___buffer_alloc_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz"; - sha512 = "CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="; - }; - } - { - name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; - path = fetchurl { - name = "buffer_crc32___buffer_crc32_0.2.13.tgz"; - url = "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha512 = "VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="; - }; - } - { - name = "buffer_equal___buffer_equal_1.0.0.tgz"; - path = fetchurl { - name = "buffer_equal___buffer_equal_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz"; - sha512 = "tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ=="; - }; - } - { - name = "buffer_fill___buffer_fill_1.0.0.tgz"; - path = fetchurl { - name = "buffer_fill___buffer_fill_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz"; - sha512 = "T7zexNBwiiaCOGDg9xNX9PBmjrubblRkENuptryuI64URkXDFum9il/JGL8Lm8wYfAXpredVXXZz7eMHilimiQ=="; - }; - } - { - name = "buffer_from___buffer_from_1.1.2.tgz"; - path = fetchurl { - name = "buffer_from___buffer_from_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz"; - sha512 = "E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="; - }; - } - { - name = "buffer___buffer_5.7.1.tgz"; - path = fetchurl { - name = "buffer___buffer_5.7.1.tgz"; - url = "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"; - sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; - }; - } - { - name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; - path = fetchurl { - name = "builder_util_runtime___builder_util_runtime_9.1.1.tgz"; - url = "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz"; - sha512 = "azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw=="; - }; - } - { - name = "builder_util___builder_util_23.6.0.tgz"; - path = fetchurl { - name = "builder_util___builder_util_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz"; - sha512 = "QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ=="; - }; - } - { - name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz"; - path = fetchurl { - name = "cacheable_lookup___cacheable_lookup_5.0.4.tgz"; - url = "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz"; - sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="; - }; - } - { - name = "cacheable_request___cacheable_request_7.0.2.tgz"; - path = fetchurl { - name = "cacheable_request___cacheable_request_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz"; - sha512 = "pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew=="; - }; - } - { - name = "chalk___chalk_4.1.2.tgz"; - path = fetchurl { - name = "chalk___chalk_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz"; - sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; - }; - } - { - name = "chownr___chownr_2.0.0.tgz"; - path = fetchurl { - name = "chownr___chownr_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz"; - sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; - }; - } - { - name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; - path = fetchurl { - name = "chromium_pickle_js___chromium_pickle_js_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz"; - sha512 = "1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw=="; - }; - } - { - name = "ci_info___ci_info_3.8.0.tgz"; - path = fetchurl { - name = "ci_info___ci_info_3.8.0.tgz"; - url = "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz"; - sha512 = "eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw=="; - }; - } - { - name = "cli_truncate___cli_truncate_2.1.0.tgz"; - path = fetchurl { - name = "cli_truncate___cli_truncate_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz"; - sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; - }; - } - { - name = "cliui___cliui_8.0.1.tgz"; - path = fetchurl { - name = "cliui___cliui_8.0.1.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz"; - sha512 = "BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ=="; - }; - } - { - name = "clone_response___clone_response_1.0.3.tgz"; - path = fetchurl { - name = "clone_response___clone_response_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz"; - sha512 = "ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA=="; - }; - } - { - name = "color_convert___color_convert_2.0.1.tgz"; - path = fetchurl { - name = "color_convert___color_convert_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; - sha512 = "RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="; - }; - } - { - name = "color_name___color_name_1.1.4.tgz"; - path = fetchurl { - name = "color_name___color_name_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; - sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; - }; - } - { - name = "colors___colors_1.0.3.tgz"; - path = fetchurl { - name = "colors___colors_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz"; - sha512 = "pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw=="; - }; - } - { - name = "combined_stream___combined_stream_1.0.8.tgz"; - path = fetchurl { - name = "combined_stream___combined_stream_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz"; - sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; - }; - } - { - name = "commander___commander_2.9.0.tgz"; - path = fetchurl { - name = "commander___commander_2.9.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz"; - sha512 = "bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A=="; - }; - } - { - name = "commander___commander_5.1.0.tgz"; - path = fetchurl { - name = "commander___commander_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz"; - sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; - }; - } - { - name = "compare_version___compare_version_0.1.2.tgz"; - path = fetchurl { - name = "compare_version___compare_version_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz"; - sha512 = "pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A=="; - }; - } - { - name = "concat_map___concat_map_0.0.1.tgz"; - path = fetchurl { - name = "concat_map___concat_map_0.0.1.tgz"; - url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; - }; - } - { - name = "core_util_is___core_util_is_1.0.2.tgz"; - path = fetchurl { - name = "core_util_is___core_util_is_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; - sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; - }; - } - { - name = "crc___crc_3.8.0.tgz"; - path = fetchurl { - name = "crc___crc_3.8.0.tgz"; - url = "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz"; - sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; - }; - } - { - name = "cross_spawn___cross_spawn_7.0.3.tgz"; - path = fetchurl { - name = "cross_spawn___cross_spawn_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; - sha512 = "iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w=="; - }; - } - { - name = "debug___debug_4.3.4.tgz"; - path = fetchurl { - name = "debug___debug_4.3.4.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz"; - sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; - }; - } - { - name = "debug___debug_2.6.9.tgz"; - path = fetchurl { - name = "debug___debug_2.6.9.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"; - sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; - }; - } - { - name = "decompress_response___decompress_response_6.0.0.tgz"; - path = fetchurl { - name = "decompress_response___decompress_response_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz"; - sha512 = "aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ=="; - }; - } - { - name = "defer_to_connect___defer_to_connect_2.0.1.tgz"; - path = fetchurl { - name = "defer_to_connect___defer_to_connect_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz"; - sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; - }; - } - { - name = "define_properties___define_properties_1.2.0.tgz"; - path = fetchurl { - name = "define_properties___define_properties_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.0.tgz"; - sha512 = "xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA=="; - }; - } - { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; - path = fetchurl { - name = "delayed_stream___delayed_stream_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; - }; - } - { - name = "detect_node___detect_node_2.1.0.tgz"; - path = fetchurl { - name = "detect_node___detect_node_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz"; - sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="; - }; - } - { - name = "dictionary_en_au___dictionary_en_au_2.4.0.tgz"; - path = fetchurl { - name = "dictionary_en_au___dictionary_en_au_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/dictionary-en-au/-/dictionary-en-au-2.4.0.tgz"; - sha512 = "SEETr3rqt26/Umc43gemwaH/ez4gPv7I4alifu/QLi8uxiCm6a7cn3wKb22HNB5l6j/R7/Sfkq9NTKk/QRVUHw=="; - }; - } - { - name = "dictionary_en___dictionary_en_3.2.0.tgz"; - path = fetchurl { - name = "dictionary_en___dictionary_en_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/dictionary-en/-/dictionary-en-3.2.0.tgz"; - sha512 = "oujbJhuplUTlDntmOoultEcNyk8ge7cFI6yXNn7eJvpbBJOhGNhWtK0XjOJsiwl4EfIeyvDKwGB95vJXv1d+lQ=="; - }; - } - { - name = "dir_compare___dir_compare_2.4.0.tgz"; - path = fetchurl { - name = "dir_compare___dir_compare_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz"; - sha512 = "l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA=="; - }; - } - { - name = "dmg_builder___dmg_builder_23.6.0.tgz"; - path = fetchurl { - name = "dmg_builder___dmg_builder_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz"; - sha512 = "jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA=="; - }; - } - { - name = "dmg_license___dmg_license_1.0.11.tgz"; - path = fetchurl { - name = "dmg_license___dmg_license_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz"; - sha512 = "ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q=="; - }; - } - { - name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; - path = fetchurl { - name = "dotenv_expand___dotenv_expand_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz"; - sha512 = "YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA=="; - }; - } - { - name = "dotenv___dotenv_9.0.2.tgz"; - path = fetchurl { - name = "dotenv___dotenv_9.0.2.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz"; - sha512 = "I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg=="; - }; - } - { - name = "ejs___ejs_3.1.8.tgz"; - path = fetchurl { - name = "ejs___ejs_3.1.8.tgz"; - url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz"; - sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; - }; - } - { - name = "electron_builder___electron_builder_23.6.0.tgz"; - path = fetchurl { - name = "electron_builder___electron_builder_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz"; - sha512 = "y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw=="; - }; - } - { - name = "electron_context_menu___electron_context_menu_3.6.1.tgz"; - path = fetchurl { - name = "electron_context_menu___electron_context_menu_3.6.1.tgz"; - url = "https://registry.yarnpkg.com/electron-context-menu/-/electron-context-menu-3.6.1.tgz"; - sha512 = "lcpO6tzzKUROeirhzBjdBWNqayEThmdW+2I2s6H6QMrwqTVyT3EK47jW3Nxm60KTxl5/bWfEoIruoUNn57/QkQ=="; - }; - } - { - name = "electron_dl___electron_dl_3.5.0.tgz"; - path = fetchurl { - name = "electron_dl___electron_dl_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/electron-dl/-/electron-dl-3.5.0.tgz"; - sha512 = "Oj+VSuScVx8hEKM2HEvTQswTX6G3MLh7UoAz/oZuvKyNDfudNi1zY6PK/UnFoK1nCl9DF6k+3PFwElKbtZlDig=="; - }; - } - { - name = "electron_is_dev___electron_is_dev_2.0.0.tgz"; - path = fetchurl { - name = "electron_is_dev___electron_is_dev_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-2.0.0.tgz"; - sha512 = "3X99K852Yoqu9AcW50qz3ibYBWY79/pBhlMCab8ToEWS48R0T9tyxRiQhwylE7zQdXrMnx2JKqUJyMPmt5FBqA=="; - }; - } - { - name = "electron_osx_sign___electron_osx_sign_0.6.0.tgz"; - path = fetchurl { - name = "electron_osx_sign___electron_osx_sign_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz"; - sha512 = "+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg=="; - }; - } - { - name = "electron_publish___electron_publish_23.6.0.tgz"; - path = fetchurl { - name = "electron_publish___electron_publish_23.6.0.tgz"; - url = "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz"; - sha512 = "jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg=="; - }; - } - { - name = "electron_window_state___electron_window_state_5.0.3.tgz"; - path = fetchurl { - name = "electron_window_state___electron_window_state_5.0.3.tgz"; - url = "https://registry.yarnpkg.com/electron-window-state/-/electron-window-state-5.0.3.tgz"; - sha512 = "1mNTwCfkolXl3kMf50yW3vE2lZj0y92P/HYWFBrb+v2S/pCka5mdwN3cagKm458A7NjndSwijynXgcLWRodsVg=="; - }; - } - { - name = "electron___electron_23.1.3.tgz"; - path = fetchurl { - name = "electron___electron_23.1.3.tgz"; - url = "https://registry.yarnpkg.com/electron/-/electron-23.1.3.tgz"; - sha512 = "MNjuUS2K6/OxlJ0zTC77djo1R3xM038v1kUunvNFgDMZHYKpSOzOMNsPiwM2BGp+uZbkUb0nTnYafxXrM8H16w=="; - }; - } - { - name = "emoji_regex___emoji_regex_8.0.0.tgz"; - path = fetchurl { - name = "emoji_regex___emoji_regex_8.0.0.tgz"; - url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; - sha512 = "MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="; - }; - } - { - name = "end_of_stream___end_of_stream_1.4.4.tgz"; - path = fetchurl { - name = "end_of_stream___end_of_stream_1.4.4.tgz"; - url = "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz"; - sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; - }; - } - { - name = "env_paths___env_paths_2.2.1.tgz"; - path = fetchurl { - name = "env_paths___env_paths_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz"; - sha512 = "+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="; - }; - } - { - name = "es6_error___es6_error_4.1.1.tgz"; - path = fetchurl { - name = "es6_error___es6_error_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz"; - sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="; - }; - } - { - name = "escalade___escalade_3.1.1.tgz"; - path = fetchurl { - name = "escalade___escalade_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"; - sha512 = "k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="; - }; - } - { - name = "escape_goat___escape_goat_2.1.1.tgz"; - path = fetchurl { - name = "escape_goat___escape_goat_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz"; - sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q=="; - }; - } - { - name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; - path = fetchurl { - name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; - sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; - }; - } - { - name = "ext_list___ext_list_2.2.2.tgz"; - path = fetchurl { - name = "ext_list___ext_list_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz"; - sha512 = "u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA=="; - }; - } - { - name = "ext_name___ext_name_5.0.0.tgz"; - path = fetchurl { - name = "ext_name___ext_name_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz"; - sha512 = "yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ=="; - }; - } - { - name = "extract_zip___extract_zip_2.0.1.tgz"; - path = fetchurl { - name = "extract_zip___extract_zip_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz"; - sha512 = "GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg=="; - }; - } - { - name = "extsprintf___extsprintf_1.4.1.tgz"; - path = fetchurl { - name = "extsprintf___extsprintf_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz"; - sha512 = "Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA=="; - }; - } - { - name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; - path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; - sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; - }; - } - { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; - path = fetchurl { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; - sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; - }; - } - { - name = "fd_slicer___fd_slicer_1.1.0.tgz"; - path = fetchurl { - name = "fd_slicer___fd_slicer_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; - sha512 = "cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g=="; - }; - } - { - name = "filelist___filelist_1.0.4.tgz"; - path = fetchurl { - name = "filelist___filelist_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz"; - sha512 = "w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q=="; - }; - } - { - name = "form_data___form_data_4.0.0.tgz"; - path = fetchurl { - name = "form_data___form_data_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz"; - sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; - }; - } - { - name = "fs_extra___fs_extra_10.1.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz"; - sha512 = "oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ=="; - }; - } - { - name = "fs_extra___fs_extra_8.1.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_8.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz"; - sha512 = "yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g=="; - }; - } - { - name = "fs_extra___fs_extra_9.1.0.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz"; - sha512 = "hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ=="; - }; - } - { - name = "fs_minipass___fs_minipass_2.1.0.tgz"; - path = fetchurl { - name = "fs_minipass___fs_minipass_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; - sha512 = "V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg=="; - }; - } - { - name = "fs.realpath___fs.realpath_1.0.0.tgz"; - path = fetchurl { - name = "fs.realpath___fs.realpath_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; - }; - } - { - name = "function_bind___function_bind_1.1.1.tgz"; - path = fetchurl { - name = "function_bind___function_bind_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; - }; - } - { - name = "get_caller_file___get_caller_file_2.0.5.tgz"; - path = fetchurl { - name = "get_caller_file___get_caller_file_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz"; - sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; - }; - } - { - name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; - path = fetchurl { - name = "get_intrinsic___get_intrinsic_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz"; - sha512 = "L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q=="; - }; - } - { - name = "get_stream___get_stream_5.2.0.tgz"; - path = fetchurl { - name = "get_stream___get_stream_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz"; - sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; - }; - } - { - name = "glob___glob_7.2.3.tgz"; - path = fetchurl { - name = "glob___glob_7.2.3.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz"; - sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; - }; - } - { - name = "global_agent___global_agent_3.0.0.tgz"; - path = fetchurl { - name = "global_agent___global_agent_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz"; - sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q=="; - }; - } - { - name = "globalthis___globalthis_1.0.3.tgz"; - path = fetchurl { - name = "globalthis___globalthis_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz"; - sha512 = "sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA=="; - }; - } - { - name = "got___got_11.8.6.tgz"; - path = fetchurl { - name = "got___got_11.8.6.tgz"; - url = "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz"; - sha512 = "6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g=="; - }; - } - { - name = "graceful_fs___graceful_fs_4.2.10.tgz"; - path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.10.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz"; - sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; - }; - } - { - name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; - path = fetchurl { - name = "graceful_readlink___graceful_readlink_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha512 = "8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w=="; - }; - } - { - name = "has_flag___has_flag_4.0.0.tgz"; - path = fetchurl { - name = "has_flag___has_flag_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; - sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; - }; - } - { - name = "has_property_descriptors___has_property_descriptors_1.0.0.tgz"; - path = fetchurl { - name = "has_property_descriptors___has_property_descriptors_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; - sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; - }; - } - { - name = "has_symbols___has_symbols_1.0.3.tgz"; - path = fetchurl { - name = "has_symbols___has_symbols_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz"; - sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; - }; - } - { - name = "has___has_1.0.3.tgz"; - path = fetchurl { - name = "has___has_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz"; - sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; - }; - } - { - name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; - path = fetchurl { - name = "hosted_git_info___hosted_git_info_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; - sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; - }; - } - { - name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; - path = fetchurl { - name = "http_cache_semantics___http_cache_semantics_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"; - sha512 = "er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ=="; - }; - } - { - name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; - path = fetchurl { - name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; - sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; - }; - } - { - name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; - path = fetchurl { - name = "http2_wrapper___http2_wrapper_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz"; - sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg=="; - }; - } - { - name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; - path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; - sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; - }; - } - { - name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; - path = fetchurl { - name = "iconv_corefoundation___iconv_corefoundation_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz"; - sha512 = "T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ=="; - }; - } - { - name = "iconv_lite___iconv_lite_0.6.3.tgz"; - path = fetchurl { - name = "iconv_lite___iconv_lite_0.6.3.tgz"; - url = "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz"; - sha512 = "4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw=="; - }; - } - { - name = "ieee754___ieee754_1.2.1.tgz"; - path = fetchurl { - name = "ieee754___ieee754_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz"; - sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; - }; - } - { - name = "immediate___immediate_3.0.6.tgz"; - path = fetchurl { - name = "immediate___immediate_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz"; - sha512 = "XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="; - }; - } - { - name = "inflight___inflight_1.0.6.tgz"; - path = fetchurl { - name = "inflight___inflight_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; - }; - } - { - name = "inherits___inherits_2.0.4.tgz"; - path = fetchurl { - name = "inherits___inherits_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz"; - sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; - }; - } - { - name = "is_ci___is_ci_3.0.1.tgz"; - path = fetchurl { - name = "is_ci___is_ci_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz"; - sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ=="; - }; - } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; - sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; - }; - } - { - name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; - path = fetchurl { - name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha512 = "yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="; - }; - } - { - name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; - path = fetchurl { - name = "isbinaryfile___isbinaryfile_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz"; - sha512 = "8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw=="; - }; - } - { - name = "isbinaryfile___isbinaryfile_4.0.10.tgz"; - path = fetchurl { - name = "isbinaryfile___isbinaryfile_4.0.10.tgz"; - url = "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz"; - sha512 = "iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw=="; - }; - } - { - name = "isexe___isexe_2.0.0.tgz"; - path = fetchurl { - name = "isexe___isexe_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; - }; - } - { - name = "jake___jake_10.8.5.tgz"; - path = fetchurl { - name = "jake___jake_10.8.5.tgz"; - url = "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz"; - sha512 = "sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw=="; - }; - } - { - name = "js_yaml___js_yaml_4.1.0.tgz"; - path = fetchurl { - name = "js_yaml___js_yaml_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz"; - sha512 = "wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="; - }; - } - { - name = "json_buffer___json_buffer_3.0.1.tgz"; - path = fetchurl { - name = "json_buffer___json_buffer_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz"; - sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="; - }; - } - { - name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; - path = fetchurl { - name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; - sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; - }; - } - { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; - path = fetchurl { - name = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; - }; - } - { - name = "json5___json5_2.2.3.tgz"; - path = fetchurl { - name = "json5___json5_2.2.3.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz"; - sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg=="; - }; - } - { - name = "jsonfile___jsonfile_4.0.0.tgz"; - path = fetchurl { - name = "jsonfile___jsonfile_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz"; - sha512 = "m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg=="; - }; - } - { - name = "jsonfile___jsonfile_6.1.0.tgz"; - path = fetchurl { - name = "jsonfile___jsonfile_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz"; - sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; - }; - } - { - name = "keyv___keyv_4.5.2.tgz"; - path = fetchurl { - name = "keyv___keyv_4.5.2.tgz"; - url = "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz"; - sha512 = "5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g=="; - }; - } - { - name = "lazy_val___lazy_val_1.0.5.tgz"; - path = fetchurl { - name = "lazy_val___lazy_val_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz"; - sha512 = "0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q=="; - }; - } - { - name = "lie___lie_3.1.1.tgz"; - path = fetchurl { - name = "lie___lie_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz"; - sha512 = "RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw=="; - }; - } - { - name = "localforage___localforage_1.10.0.tgz"; - path = fetchurl { - name = "localforage___localforage_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz"; - sha512 = "14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg=="; - }; - } - { - name = "lodash___lodash_4.17.21.tgz"; - path = fetchurl { - name = "lodash___lodash_4.17.21.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"; - sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; - }; - } - { - name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; - path = fetchurl { - name = "lowercase_keys___lowercase_keys_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz"; - sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; - }; - } - { - name = "lru_cache___lru_cache_6.0.0.tgz"; - path = fetchurl { - name = "lru_cache___lru_cache_6.0.0.tgz"; - url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - } - { - name = "matcher___matcher_3.0.0.tgz"; - path = fetchurl { - name = "matcher___matcher_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz"; - sha512 = "OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng=="; - }; - } - { - name = "mime_db___mime_db_1.52.0.tgz"; - path = fetchurl { - name = "mime_db___mime_db_1.52.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz"; - sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; - }; - } - { - name = "mime_types___mime_types_2.1.35.tgz"; - path = fetchurl { - name = "mime_types___mime_types_2.1.35.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz"; - sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; - }; - } - { - name = "mime___mime_2.6.0.tgz"; - path = fetchurl { - name = "mime___mime_2.6.0.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz"; - sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; - }; - } - { - name = "mimic_response___mimic_response_1.0.1.tgz"; - path = fetchurl { - name = "mimic_response___mimic_response_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz"; - sha512 = "j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="; - }; - } - { - name = "mimic_response___mimic_response_3.1.0.tgz"; - path = fetchurl { - name = "mimic_response___mimic_response_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz"; - sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; - }; - } - { - name = "minimatch___minimatch_3.0.4.tgz"; - path = fetchurl { - name = "minimatch___minimatch_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; - }; - } - { - name = "minimatch___minimatch_3.1.2.tgz"; - path = fetchurl { - name = "minimatch___minimatch_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz"; - sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; - }; - } - { - name = "minimatch___minimatch_5.1.6.tgz"; - path = fetchurl { - name = "minimatch___minimatch_5.1.6.tgz"; - url = "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz"; - sha512 = "lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g=="; - }; - } - { - name = "minimist___minimist_1.2.8.tgz"; - path = fetchurl { - name = "minimist___minimist_1.2.8.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz"; - sha512 = "2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA=="; - }; - } - { - name = "minipass___minipass_3.3.6.tgz"; - path = fetchurl { - name = "minipass___minipass_3.3.6.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz"; - sha512 = "DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="; - }; - } - { - name = "minipass___minipass_4.2.4.tgz"; - path = fetchurl { - name = "minipass___minipass_4.2.4.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-4.2.4.tgz"; - sha512 = "lwycX3cBMTvcejsHITUgYj6Gy6A7Nh4Q6h9NP4sTHY1ccJlC7yKzDmiShEHsJ16Jf1nKGDEaiHxiltsJEvk0nQ=="; - }; - } - { - name = "minizlib___minizlib_2.1.2.tgz"; - path = fetchurl { - name = "minizlib___minizlib_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz"; - sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; - }; - } - { - name = "mkdirp___mkdirp_0.5.6.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_0.5.6.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz"; - sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; - }; - } - { - name = "mkdirp___mkdirp_1.0.4.tgz"; - path = fetchurl { - name = "mkdirp___mkdirp_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz"; - sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; - }; - } - { - name = "modify_filename___modify_filename_1.1.0.tgz"; - path = fetchurl { - name = "modify_filename___modify_filename_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/modify-filename/-/modify-filename-1.1.0.tgz"; - sha512 = "EickqnKq3kVVaZisYuCxhtKbZjInCuwgwZWyAmRIp1NTMhri7r3380/uqwrUHfaDiPzLVTuoNy4whX66bxPVog=="; - }; - } - { - name = "ms___ms_2.0.0.tgz"; - path = fetchurl { - name = "ms___ms_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; - }; - } - { - name = "ms___ms_2.1.2.tgz"; - path = fetchurl { - name = "ms___ms_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - } - { - name = "node_addon_api___node_addon_api_1.7.2.tgz"; - path = fetchurl { - name = "node_addon_api___node_addon_api_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz"; - sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg=="; - }; - } - { - name = "normalize_url___normalize_url_6.1.0.tgz"; - path = fetchurl { - name = "normalize_url___normalize_url_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz"; - sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; - }; - } - { - name = "object_keys___object_keys_1.1.1.tgz"; - path = fetchurl { - name = "object_keys___object_keys_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz"; - sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; - }; - } - { - name = "once___once_1.4.0.tgz"; - path = fetchurl { - name = "once___once_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; - }; - } - { - name = "p_cancelable___p_cancelable_2.1.1.tgz"; - path = fetchurl { - name = "p_cancelable___p_cancelable_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz"; - sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; - }; - } - { - name = "path_exists___path_exists_4.0.0.tgz"; - path = fetchurl { - name = "path_exists___path_exists_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; - sha512 = "ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="; - }; - } - { - name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; - path = fetchurl { - name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; - }; - } - { - name = "path_key___path_key_3.1.1.tgz"; - path = fetchurl { - name = "path_key___path_key_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; - sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; - }; - } - { - name = "pend___pend_1.2.0.tgz"; - path = fetchurl { - name = "pend___pend_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"; - sha512 = "F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="; - }; - } - { - name = "plist___plist_3.0.6.tgz"; - path = fetchurl { - name = "plist___plist_3.0.6.tgz"; - url = "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz"; - sha512 = "WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA=="; - }; - } - { - name = "progress___progress_2.0.3.tgz"; - path = fetchurl { - name = "progress___progress_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; - sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; - }; - } - { - name = "pump___pump_3.0.0.tgz"; - path = fetchurl { - name = "pump___pump_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"; - sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; - }; - } - { - name = "punycode___punycode_2.3.0.tgz"; - path = fetchurl { - name = "punycode___punycode_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz"; - sha512 = "rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA=="; - }; - } - { - name = "pupa___pupa_2.1.1.tgz"; - path = fetchurl { - name = "pupa___pupa_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz"; - sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; - }; - } - { - name = "quick_lru___quick_lru_5.1.1.tgz"; - path = fetchurl { - name = "quick_lru___quick_lru_5.1.1.tgz"; - url = "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz"; - sha512 = "WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="; - }; - } - { - name = "read_config_file___read_config_file_6.2.0.tgz"; - path = fetchurl { - name = "read_config_file___read_config_file_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz"; - sha512 = "gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg=="; - }; - } - { - name = "require_directory___require_directory_2.1.1.tgz"; - path = fetchurl { - name = "require_directory___require_directory_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; - sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; - }; - } - { - name = "resolve_alpn___resolve_alpn_1.2.1.tgz"; - path = fetchurl { - name = "resolve_alpn___resolve_alpn_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz"; - sha512 = "0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g=="; - }; - } - { - name = "responselike___responselike_2.0.1.tgz"; - path = fetchurl { - name = "responselike___responselike_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz"; - sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="; - }; - } - { - name = "rimraf___rimraf_3.0.2.tgz"; - path = fetchurl { - name = "rimraf___rimraf_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; - sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; - }; - } - { - name = "roarr___roarr_2.15.4.tgz"; - path = fetchurl { - name = "roarr___roarr_2.15.4.tgz"; - url = "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz"; - sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A=="; - }; - } - { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - path = fetchurl { - name = "safer_buffer___safer_buffer_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"; - sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; - }; - } - { - name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; - path = fetchurl { - name = "sanitize_filename___sanitize_filename_1.6.3.tgz"; - url = "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz"; - sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; - }; - } - { - name = "sax___sax_1.2.4.tgz"; - path = fetchurl { - name = "sax___sax_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; - }; - } - { - name = "semver_compare___semver_compare_1.0.0.tgz"; - path = fetchurl { - name = "semver_compare___semver_compare_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz"; - sha512 = "YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="; - }; - } - { - name = "semver___semver_6.3.0.tgz"; - path = fetchurl { - name = "semver___semver_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz"; - sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; - }; - } - { - name = "semver___semver_7.3.8.tgz"; - path = fetchurl { - name = "semver___semver_7.3.8.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz"; - sha512 = "NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A=="; - }; - } - { - name = "semver___semver_7.0.0.tgz"; - path = fetchurl { - name = "semver___semver_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; - sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; - }; - } - { - name = "serialize_error___serialize_error_7.0.1.tgz"; - path = fetchurl { - name = "serialize_error___serialize_error_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz"; - sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; - }; - } - { - name = "shebang_command___shebang_command_2.0.0.tgz"; - path = fetchurl { - name = "shebang_command___shebang_command_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; - sha512 = "kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA=="; - }; - } - { - name = "shebang_regex___shebang_regex_3.0.0.tgz"; - path = fetchurl { - name = "shebang_regex___shebang_regex_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; - sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; - }; - } - { - name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz"; - path = fetchurl { - name = "simple_update_notifier___simple_update_notifier_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz"; - sha512 = "VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg=="; - }; - } - { - name = "slice_ansi___slice_ansi_3.0.0.tgz"; - path = fetchurl { - name = "slice_ansi___slice_ansi_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz"; - sha512 = "pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="; - }; - } - { - name = "smart_buffer___smart_buffer_4.2.0.tgz"; - path = fetchurl { - name = "smart_buffer___smart_buffer_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz"; - sha512 = "94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg=="; - }; - } - { - name = "sort_keys_length___sort_keys_length_1.0.1.tgz"; - path = fetchurl { - name = "sort_keys_length___sort_keys_length_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz"; - sha512 = "GRbEOUqCxemTAk/b32F2xa8wDTs+Z1QHOkbhJDQTvv/6G3ZkbJ+frYWsTcc7cBB3Fu4wy4XlLCuNtJuMn7Gsvw=="; - }; - } - { - name = "sort_keys___sort_keys_1.1.2.tgz"; - path = fetchurl { - name = "sort_keys___sort_keys_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz"; - sha512 = "vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg=="; - }; - } - { - name = "source_map_support___source_map_support_0.5.21.tgz"; - path = fetchurl { - name = "source_map_support___source_map_support_0.5.21.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz"; - sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; - }; - } - { - name = "source_map___source_map_0.6.1.tgz"; - path = fetchurl { - name = "source_map___source_map_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz"; - sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; - }; - } - { - name = "sprintf_js___sprintf_js_1.1.2.tgz"; - path = fetchurl { - name = "sprintf_js___sprintf_js_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz"; - sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; - }; - } - { - name = "stat_mode___stat_mode_1.0.0.tgz"; - path = fetchurl { - name = "stat_mode___stat_mode_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz"; - sha512 = "jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg=="; - }; - } - { - name = "string_width___string_width_4.2.3.tgz"; - path = fetchurl { - name = "string_width___string_width_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz"; - sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; - }; - } - { - name = "strip_ansi___strip_ansi_6.0.1.tgz"; - path = fetchurl { - name = "strip_ansi___strip_ansi_6.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz"; - sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; - }; - } - { - name = "sumchecker___sumchecker_3.0.1.tgz"; - path = fetchurl { - name = "sumchecker___sumchecker_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz"; - sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg=="; - }; - } - { - name = "supports_color___supports_color_7.2.0.tgz"; - path = fetchurl { - name = "supports_color___supports_color_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; - sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; - }; - } - { - name = "tar___tar_6.1.13.tgz"; - path = fetchurl { - name = "tar___tar_6.1.13.tgz"; - url = "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz"; - sha512 = "jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw=="; - }; - } - { - name = "temp_file___temp_file_3.4.0.tgz"; - path = fetchurl { - name = "temp_file___temp_file_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz"; - sha512 = "C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg=="; - }; - } - { - name = "tmp_promise___tmp_promise_3.0.3.tgz"; - path = fetchurl { - name = "tmp_promise___tmp_promise_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz"; - sha512 = "RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ=="; - }; - } - { - name = "tmp___tmp_0.2.1.tgz"; - path = fetchurl { - name = "tmp___tmp_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz"; - sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; - }; - } - { - name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; - path = fetchurl { - name = "truncate_utf8_bytes___truncate_utf8_bytes_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz"; - sha512 = "95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ=="; - }; - } - { - name = "type_fest___type_fest_0.13.1.tgz"; - path = fetchurl { - name = "type_fest___type_fest_0.13.1.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz"; - sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; - }; - } - { - name = "typescript___typescript_4.9.5.tgz"; - path = fetchurl { - name = "typescript___typescript_4.9.5.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz"; - sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g=="; - }; - } - { - name = "typo_js___typo_js_1.2.2.tgz"; - path = fetchurl { - name = "typo_js___typo_js_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.2.tgz"; - sha512 = "C7pYBQK17EjSg8tVNY91KHdUt5Nf6FMJ+c3js076quPmBML57PmNMzAcIq/2kf/hSYtFABNDIYNYlJRl5BJhGw=="; - }; - } - { - name = "universalify___universalify_0.1.2.tgz"; - path = fetchurl { - name = "universalify___universalify_0.1.2.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz"; - sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; - }; - } - { - name = "universalify___universalify_2.0.0.tgz"; - path = fetchurl { - name = "universalify___universalify_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz"; - sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; - }; - } - { - name = "unused_filename___unused_filename_2.1.0.tgz"; - path = fetchurl { - name = "unused_filename___unused_filename_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/unused-filename/-/unused-filename-2.1.0.tgz"; - sha512 = "BMiNwJbuWmqCpAM1FqxCTD7lXF97AvfQC8Kr/DIeA6VtvhJaMDupZ82+inbjl5yVP44PcxOuCSxye1QMS0wZyg=="; - }; - } - { - name = "uri_js___uri_js_4.4.1.tgz"; - path = fetchurl { - name = "uri_js___uri_js_4.4.1.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; - sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; - }; - } - { - name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; - path = fetchurl { - name = "utf8_byte_length___utf8_byte_length_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz"; - sha512 = "4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA=="; - }; - } - { - name = "verror___verror_1.10.1.tgz"; - path = fetchurl { - name = "verror___verror_1.10.1.tgz"; - url = "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz"; - sha512 = "veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg=="; - }; - } - { - name = "which___which_2.0.2.tgz"; - path = fetchurl { - name = "which___which_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; - sha512 = "BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA=="; - }; - } - { - name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; - sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; - }; - } - { - name = "wrappy___wrappy_1.0.2.tgz"; - path = fetchurl { - name = "wrappy___wrappy_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; - }; - } - { - name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; - path = fetchurl { - name = "xmlbuilder___xmlbuilder_15.1.1.tgz"; - url = "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz"; - sha512 = "yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg=="; - }; - } - { - name = "y18n___y18n_5.0.8.tgz"; - path = fetchurl { - name = "y18n___y18n_5.0.8.tgz"; - url = "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz"; - sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="; - }; - } - { - name = "yallist___yallist_4.0.0.tgz"; - path = fetchurl { - name = "yallist___yallist_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; - sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; - }; - } - { - name = "yargs_parser___yargs_parser_21.1.1.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_21.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz"; - sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="; - }; - } - { - name = "yargs___yargs_17.7.1.tgz"; - path = fetchurl { - name = "yargs___yargs_17.7.1.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz"; - sha512 = "cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw=="; - }; - } - { - name = "yauzl___yauzl_2.10.0.tgz"; - path = fetchurl { - name = "yauzl___yauzl_2.10.0.tgz"; - url = "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz"; - sha512 = "p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g=="; - }; - } - ]; -} diff --git a/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix b/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix index 559474b741..f2bcd3b6a9 100644 --- a/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/morgen/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchurl, dpkg, autoPatchelfHook, makeWrapper, electron -, nodePackages, alsa-lib, gtk3, libxshmfence, mesa, nss }: +, asar, alsa-lib, gtk3, libxshmfence, mesa, nss }: stdenv.mkDerivation rec { pname = "morgen"; - version = "2.7.5"; + version = "3.0.1"; src = fetchurl { url = "https://download.todesktop.com/210203cqcj00tw1/morgen-${version}.deb"; - sha256 = "sha256-gsH+KJt0d1Xe1JhgXuqot/vrMw9eBzIpCGlGeaeVJ+k="; + sha256 = "sha256-lj+V5mntZzED2ZS62Uwlt/vTXwSuwzXeuEw8y/bA6og="; }; nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper - nodePackages.asar + asar ]; buildInputs = [ alsa-lib gtk3 libxshmfence mesa nss ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/notes/default.nix b/third_party/nixpkgs/pkgs/applications/office/notes/default.nix index 7ddc7d98dd..abd93813a7 100644 --- a/third_party/nixpkgs/pkgs/applications/office/notes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/notes/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "notes"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "nuttyartist"; repo = "notes"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZfAm77UHyjs2aYOYb+AhKViz6uteb7+KKSedonSiMkY="; + hash = "sha256-ShChF87ysRoisKshY86kJTa3ZAiQhBOImuL8OsEqgBo="; fetchSubmodules = true; }; @@ -34,11 +34,7 @@ stdenv.mkDerivation (finalAttrs: { Cocoa ]; - postInstall = lib.optionalString stdenv.isLinux '' - # temporary fix: https://github.com/nuttyartist/notes/issues/613 - substituteInPlace $out/share/applications/io.github.nuttyartist.notes.desktop \ - --replace 'Exec=notes' 'Exec=env QT_STYLE_OVERRIDE= notes' - '' + lib.optionalString stdenv.isDarwin '' + postInstall = lib.optionalString stdenv.isDarwin '' mkdir $out/Applications mv $out/bin/Notes.app $out/Applications ''; diff --git a/third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/default.nix b/third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/7_2.nix similarity index 94% rename from third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/default.nix rename to third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/7_2.nix index ba4a75ddfb..8abf0909e6 100644 --- a/third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/7_2.nix @@ -177,6 +177,10 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents"; + longDescription = '' + The latest versions of OnlyOffice are currently broken on wlroots environments (e.g. Hyprland, Sway). + If you are using a different environment, you can get the latest version using `onlyoffice-bin_latest`. + ''; homepage = "https://www.onlyoffice.com/"; downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases"; changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; diff --git a/third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/7_4.nix b/third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/7_4.nix new file mode 100644 index 0000000000..bf587a4c9b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/onlyoffice-bin/7_4.nix @@ -0,0 +1,215 @@ +{ stdenv +, lib +, fetchurl +, buildFHSEnv + # Alphabetic ordering below +, alsa-lib +, at-spi2-atk +, atk +, autoPatchelfHook +, cairo +, curl +, dbus +, dconf +, dpkg +, fontconfig +, gcc-unwrapped +, gdk-pixbuf +, glib +, glibc +, gsettings-desktop-schemas +, gst_all_1 +, gtk2 +, gtk3 +, libpulseaudio +, libudev0-shim +, libdrm +, makeWrapper +, mesa +, nspr +, nss +, pulseaudio +, qt5 +, wrapGAppsHook +, xkeyboard_config +, xorg +}: +let + + # Note on fonts: + # + # OnlyOffice does not distribute unfree fonts, but makes it easy to pick up + # any fonts you install. See: + # + # * https://helpcenter.onlyoffice.com/en/installation/docs-community-install-fonts-linux.aspx + # * https://www.onlyoffice.com/blog/2020/04/how-to-add-new-fonts-to-onlyoffice-desktop-editors/ + # + # As recommended there, you should download + # + # arial.ttf, calibri.ttf, cour.ttf, symbol.ttf, times.ttf, wingding.ttf + # + # into `~/.local/share/fonts/`, otherwise the default template fonts, and + # things like bullet points, will not look as expected. + + # TODO: Find out which of these fonts we'd be allowed to distribute along + # with this package, or how to make this easier for users otherwise. + + # Not using the `noto-fonts-cjk` package from nixpkgs, because it was + # reported that its `.ttc` file is not picked up by OnlyOffice, see: + # https://github.com/NixOS/nixpkgs/pull/116343#discussion_r593979816 + noto-fonts-cjk = fetchurl { + url = + let + version = "v20201206-cjk"; + in + "https://github.com/googlefonts/noto-cjk/raw/${version}/NotoSansCJKsc-Regular.otf"; + sha256 = "sha256-aJXSVNJ+p6wMAislXUn4JQilLhimNSedbc9nAuPVxo4="; + }; + + runtimeLibs = lib.makeLibraryPath [ + curl + glibc + gcc-unwrapped.lib + libudev0-shim + pulseaudio + ]; + + derivation = stdenv.mkDerivation rec { + pname = "onlyoffice-desktopeditors"; + version = "7.4.1"; + minor = null; + src = fetchurl { + url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; + sha256 = "sha256-vaBF3GJyLBldWdEruOeVpRvwGNwaRl7IKPguDLRoe8M="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + makeWrapper + wrapGAppsHook + ]; + + buildInputs = [ + alsa-lib + at-spi2-atk + atk + cairo + dbus + dconf + fontconfig + gdk-pixbuf + glib + gsettings-desktop-schemas + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + gtk2 + gtk3 + libpulseaudio + libdrm + nspr + nss + mesa # libgbm + qt5.qtbase + qt5.qtdeclarative + qt5.qtsvg + qt5.qtwayland + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst + ]; + + dontWrapQtApps = true; + + unpackPhase = '' + dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner + ''; + + preConfigure = '' + cp --no-preserve=mode,ownership ${noto-fonts-cjk} opt/onlyoffice/desktopeditors/fonts/ + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,lib,share} + + mv usr/bin/* $out/bin + mv usr/share/* $out/share/ + mv opt/onlyoffice/desktopeditors $out/share + + for f in $out/share/desktopeditors/asc-de-*.png; do + size=$(basename "$f" ".png" | cut -d"-" -f3) + res="''${size}x''${size}" + mkdir -pv "$out/share/icons/hicolor/$res/apps" + ln -s "$f" "$out/share/icons/hicolor/$res/apps/onlyoffice-desktopeditors.png" + done; + + substituteInPlace $out/bin/onlyoffice-desktopeditors \ + --replace "/opt/onlyoffice/" "$out/share/" + + ln -s $out/share/desktopeditors/DesktopEditors $out/bin/DesktopEditors + + runHook postInstall + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \ + --set QT_QPA_PLATFORM "xcb" + # the bundled version of qt does not support wayland + ) + ''; + + passthru.updateScript = ./update.sh; + }; + +in + +# In order to download plugins, OnlyOffice uses /usr/bin/curl so we have to wrap it. +# Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code. +buildFHSEnv { + name = derivation.name; + + targetPkgs = pkgs': [ + curl + derivation + ]; + + runScript = "/bin/onlyoffice-desktopeditors"; + + extraInstallCommands = '' + mv $out/bin/$name $out/bin/onlyoffice-desktopeditors + mkdir -p $out/share + ln -s ${derivation}/share/icons $out/share + cp -r ${derivation}/share/applications $out/share + substituteInPlace $out/share/applications/onlyoffice-desktopeditors.desktop \ + --replace "/usr/bin/onlyoffice-desktopeditors" "$out/bin/onlyoffice-desktopeditors" + ''; + + meta = with lib; { + description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents"; + longDescription = '' + This version is broken on wlroots environments (e.g. Hyprland, Sway). + If you are using one of these environments, please use `onlyoffice-bin` instead. + ''; + homepage = "https://www.onlyoffice.com/"; + downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases"; + changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ nh2 gtrunsec ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix index 407805a59d..7d9346c153 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix @@ -19,13 +19,13 @@ }: let - version = "1.17.0"; + version = "1.17.2"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-Zv+5DMviBGyc24R+qcAlvjko7wH+Gturvw5nzFJlIfk="; + hash = "sha256-/0Ml3NRTghqNykB1RZfqDW9TtENnSRM7wqG7Vn4Kl04="; }; # Use specific package versions required by paperless-ngx @@ -51,7 +51,7 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-J8oUDvcJ0fawTv9L1B9hw8l47UZvOCj16jUF+83W8W8="; + npmDepsHash = "sha256-6EvC9Ka8gl0eRgJtHooB3yQNVGYzuH/WRga4AtzQ0EY="; nativeBuildInputs = [ python3 @@ -248,6 +248,7 @@ python.pkgs.buildPythonApplication rec { pytest-django pytest-env pytest-httpx + pytest-rerunfailures pytest-xdist pytestCheckHook reportlab diff --git a/third_party/nixpkgs/pkgs/applications/office/planify/default.nix b/third_party/nixpkgs/pkgs/applications/office/planify/default.nix index 59f603a1ae..e4cca46bbd 100644 --- a/third_party/nixpkgs/pkgs/applications/office/planify/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/planify/default.nix @@ -23,13 +23,16 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.1"; + version = "4.1.1"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; - rev = version; - sha256 = "sha256-H8TPuqKRwbcB+2NTC5ZIK7y6uiYbTT4svtx21FbTzME="; + # The commit is named as "Release 4.1.1", published to Flathub, but not tags + # https://github.com/flathub/io.github.alainm23.planify/commit/2a353ccfcf3379add6778d569f49da37f40accfa + # https://github.com/alainm23/planify/issues/1002 + rev = "adf3629bcacfc9978f6dde5b87eff0278533ab3e"; + hash = "sha256-xqklvSYmqBQ+IQ3lRjMbV4W4vD/rLCln7rBVCbYiBGo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix index 0c52d8a0af..cf7b59f6fa 100644 --- a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.65.1"; + version = "0.65.4"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - hash = "sha256-VfYuqrz9YDHwY0atKXYkzHJW/lXlVWGgo5QjMTMeB+g="; + hash = "sha256-2+1lwaO2+kq/EjJoA4EvGCMLH6iErR9KtWINLoO17+w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix b/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix index 397193c4e0..42ff825d36 100644 --- a/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/pympress/default.nix @@ -13,11 +13,12 @@ python3Packages.buildPythonApplication rec { pname = "pympress"; - version = "1.7.2"; + version = "1.8.4"; src = fetchPypi { - inherit pname version; - sha256 = "LFUzrGHr8jmUqoIcKokC0gNDVmW1EUZlj9eI+GDycvI="; + inherit version; + pname = "pympress"; + hash = "sha256-3cnCHGoKUX0gTzIx1khM+br6x9+g9WXh28SLhm99eN4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix index e474a5de99..67f0bbc0ad 100644 --- a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -19,14 +19,14 @@ let pname = "qownnotes"; appname = "QOwnNotes"; - version = "23.8.0"; + version = "23.10.0"; in stdenv.mkDerivation { inherit pname appname version; src = fetchurl { url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; - hash = "sha256-ZvZOUcKtY+V0zhqsOYNi3W8yxRPUdYsp2kSHETRCTLs="; + hash = "sha256-wPZrKAWaWv88BeVu6e73b9/Ydo0ew4GLig46fyNSxtc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/roam-research/common.nix b/third_party/nixpkgs/pkgs/applications/office/roam-research/common.nix new file mode 100644 index 0000000000..8e63b111ad --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/roam-research/common.nix @@ -0,0 +1,22 @@ +{ fetchurl }: +let + pname = "roam-research"; + version = "0.0.18"; +in +{ + inherit pname version; + sources = { + x86_64-darwin = fetchurl { + url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}.dmg"; + hash = "sha256-jyFNH3qrgrsftExL/b2t8bY3W3fYVz+Gp11AuaIMxbg="; + }; + aarch64-darwin = fetchurl { + url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/Roam+Research-${version}-arm64.dmg"; + hash = "sha256-AnyvFCbyUi6tcgxYQAj+zPLl4/kVh9ZeupetRhzH0PU="; + }; + x86_64-linux = fetchurl { + url = "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${pname}_${version}_amd64.deb"; + hash = "sha256-veDWBFZbODsdaO1UdfuC4w6oGCkeVBe+fqKn5XVHKDQ="; + }; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/roam-research/darwin.nix b/third_party/nixpkgs/pkgs/applications/office/roam-research/darwin.nix new file mode 100644 index 0000000000..2c736c0c1a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/roam-research/darwin.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, undmg, fetchurl }: +let + common = import ./common.nix { inherit fetchurl; }; + inherit (stdenv.hostPlatform) system; +in +stdenv.mkDerivation rec { + inherit (common) pname version; + src = common.sources.${system} or (throw "Source for ${pname} is not available for ${system}"); + + appName = "Roam Research"; + + sourceRoot = "."; + + nativeBuildInputs = [ undmg ]; + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -R *.app "$out/Applications" + + mkdir -p $out/bin + ln -s "$out/Applications/${appName}.app/Contents/MacOS/${appName}" "$out/bin/${appName}" + runHook postInstall + ''; + + meta = with lib; { + description = "A note-taking tool for networked thought"; + homepage = "https://roamresearch.com/"; + maintainers = with lib.maintainers; [ dbalan ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = [ "x86_64-darwin" "aarch64-darwin" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/roam-research/default.nix b/third_party/nixpkgs/pkgs/applications/office/roam-research/default.nix index e1ca9bb47e..408f026bc5 100644 --- a/third_party/nixpkgs/pkgs/applications/office/roam-research/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/roam-research/default.nix @@ -1,81 +1,8 @@ -{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, dbus, dpkg, expat -, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor -, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libdrm -, libpulseaudio, libxcb, libxkbcommon, libxshmfence, mesa, nspr, nss, pango -, udev, }: - +{ stdenv, callPackage, ... }@args: let - libPath = lib.makeLibraryPath [ - alsa-lib - atk - cairo - cups - dbus - expat - gdk-pixbuf - glib - gtk3 - libX11 - libXcomposite - libXdamage - libXext - libXfixes - libXi - libXrandr - libdrm - libxcb - libxkbcommon - libxshmfence - mesa - nspr - nss - pango - stdenv.cc.cc - libXScrnSaver - libXcursor - libXrender - libXtst - libpulseaudio - udev - ]; -in stdenv.mkDerivation rec { - pname = "roam-research"; - version = "0.0.18"; - - src = fetchurl { - url = - "https://roam-electron-deploy.s3.us-east-2.amazonaws.com/${pname}_${version}_amd64.deb"; - sha256 = "sha256-veDWBFZbODsdaO1UdfuC4w6oGCkeVBe+fqKn5XVHKDQ="; - }; - - nativeBuildInputs = [ dpkg ]; - - unpackPhase = '' - mkdir pkg - dpkg-deb -x $src pkg - sourceRoot=pkg - ''; - - installPhase = '' - mkdir -p "$out/bin" - mv opt "$out/" - - ln -s "$out/opt/Roam Research/roam-research" "$out/bin/roam-research" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Roam Research:\$ORIGIN" "$out/opt/Roam Research/roam-research" - - mv usr/* "$out/" - - substituteInPlace $out/share/applications/roam-research.desktop \ - --replace "/opt/Roam Research/roam-research" "roam-research" - ''; - - dontPatchELF = true; - meta = with lib; { - description = "A note-taking tool for networked thought."; - homepage = "https://roamresearch.com/"; - maintainers = with lib.maintainers; [ dbalan ]; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - }; -} + extraArgs = removeAttrs args [ "callPackage" ]; +in +if stdenv.isDarwin then + callPackage ./darwin.nix (extraArgs // { }) +else + callPackage ./linux.nix (extraArgs // { }) diff --git a/third_party/nixpkgs/pkgs/applications/office/roam-research/linux.nix b/third_party/nixpkgs/pkgs/applications/office/roam-research/linux.nix new file mode 100644 index 0000000000..5873bcfdd1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/roam-research/linux.nix @@ -0,0 +1,73 @@ +{ stdenv, lib, fetchurl, alsa-lib, atk, cairo, cups, dbus, dpkg, expat +, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor +, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, libdrm +, libpulseaudio, libxcb, libxkbcommon, libxshmfence, mesa, nspr, nss, pango +, udev, }: + +let + common = import ./common.nix { inherit fetchurl; }; + inherit (stdenv.hostPlatform) system; + libPath = lib.makeLibraryPath [ + alsa-lib + atk + cairo + cups + dbus + expat + gdk-pixbuf + glib + gtk3 + libX11 + libXcomposite + libXdamage + libXext + libXfixes + libXi + libXrandr + libdrm + libxcb + libxkbcommon + libxshmfence + mesa + nspr + nss + pango + stdenv.cc.cc + libXScrnSaver + libXcursor + libXrender + libXtst + libpulseaudio + udev + ]; +in stdenv.mkDerivation rec { + inherit (common) pname version; + src = common.sources.${system} or (throw "Source for ${pname} is not available for ${system}"); + + nativeBuildInputs = [ dpkg ]; + + installPhase = '' + mkdir -p "$out/bin" + mv opt "$out/" + + ln -s "$out/opt/Roam Research/roam-research" "$out/bin/roam-research" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${libPath}:$out/opt/Roam Research:\$ORIGIN" "$out/opt/Roam Research/roam-research" + + mv usr/* "$out/" + + substituteInPlace $out/share/applications/roam-research.desktop \ + --replace "/opt/Roam Research/roam-research" "roam-research" + ''; + + # autoPatchelfHook/patchelf are not used because they cause the binary to coredump. + dontPatchELF = true; + + meta = with lib; { + description = "A note-taking tool for networked thought"; + homepage = "https://roamresearch.com/"; + maintainers = with lib.maintainers; [ dbalan ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/scribus/1_4.nix b/third_party/nixpkgs/pkgs/applications/office/scribus/1_4.nix deleted file mode 100644 index a6427d0f89..0000000000 --- a/third_party/nixpkgs/pkgs/applications/office/scribus/1_4.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, freetype, lcms, libtiff, libxml2 -, libart_lgpl, qt4, python2, cups, fontconfig, libjpeg -, zlib, libpng, xorg, cairo, podofo, hunspell, boost, cmake, imagemagick, ghostscript }: - -let - icon = fetchurl { - url = "https://gist.githubusercontent.com/ejpcmac/a74b762026c9bc4000be624c3d085517/raw/18edc497c5cb6fdeef1c8aede37a0ee68413f9d3/scribus-icon-centered.svg"; - sha256 = "0hq3i7c2l50445an9glhhg47kj26y16svfajc6naqn307ph9vzc3"; - }; - - pythonEnv = python2.withPackages(ps: [ps.tkinter ps.pillow]); -in stdenv.mkDerivation rec { - pname = "scribus"; - version = "1.4.8"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0bq433myw6h1siqlsakxv6ghb002rp3mfz5k12bg68s0k6skn992"; - }; - - nativeBuildInputs = [ pkg-config cmake ]; - buildInputs = with xorg; - [ freetype lcms libtiff libxml2 libart_lgpl qt4 - pythonEnv cups fontconfig - libjpeg zlib libpng podofo hunspell cairo - boost # for internal 2geom library - libXaw libXext libX11 libXtst libXi libXinerama - libpthreadstubs libXau libXdmcp - imagemagick # To build the icon - ]; - - postPatch = '' - substituteInPlace scribus/util_ghostscript.cpp \ - --replace 'QString gsName("gs");' \ - 'QString gsName("${ghostscript}/bin/gs");' - ''; - - postInstall = '' - for i in 16 24 48 64 96 128 256 512; do - mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps - convert -background none -resize ''${i}x''${i} ${icon} $out/share/icons/hicolor/''${i}x''${i}/apps/scribus.png - done - ''; - - meta = { - maintainers = [ lib.maintainers.marcweber ]; - platforms = lib.platforms.linux; - description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = "https://www.scribus.net"; - license = lib.licenses.gpl2; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix b/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix index c16c757836..1e5852b8cc 100644 --- a/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/super-productivity/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "super-productivity"; - version = "7.13.2"; + version = "7.14.3"; src = fetchurl { url = "https://github.com/johannesjo/super-productivity/releases/download/v${version}/superProductivity-${version}.AppImage"; - sha256 = "sha256-HwRJUrNaoAnNuIcDWgXOYA+PxLjOE6NXRJqINIbVxOw="; + sha256 = "sha256-wW72T1+RfejaI9LxSxa/g0lvIRmAeFa2ZaEa8K9mRcw="; name = "${pname}-${version}.AppImage"; }; diff --git a/third_party/nixpkgs/pkgs/applications/office/tagainijisho/default.nix b/third_party/nixpkgs/pkgs/applications/office/tagainijisho/default.nix index 7e171f7d70..55c84fd2a3 100644 --- a/third_party/nixpkgs/pkgs/applications/office/tagainijisho/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/tagainijisho/default.nix @@ -1,5 +1,6 @@ -{ lib, mkDerivation, fetchzip, qtbase, qttools, cmake, sqlite }: -mkDerivation rec { +{ stdenv, lib, fetchzip, qtbase, qttools, cmake, sqlite, wrapQtAppsHook }: + +stdenv.mkDerivation rec { pname = "tagainijisho"; version = "1.2.2"; @@ -8,8 +9,8 @@ mkDerivation rec { hash = "sha256-CTDMoYGbVE4W0SDerW//aAdUVsySWFQycSy0I3a9+94="; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ qtbase qttools sqlite ]; + nativeBuildInputs = [ qttools cmake wrapQtAppsHook ]; + buildInputs = [ qtbase sqlite ]; cmakeFlags = [ "-DEMBED_SQLITE=OFF" diff --git a/third_party/nixpkgs/pkgs/applications/office/ticktick/default.nix b/third_party/nixpkgs/pkgs/applications/office/ticktick/default.nix new file mode 100644 index 0000000000..c236ba4505 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/ticktick/default.nix @@ -0,0 +1,77 @@ +{ lib +, fetchurl +, stdenv +, wrapGAppsHook +, dpkg +, autoPatchelfHook +, glibc +, gcc-unwrapped +, nss +, libdrm +, mesa +, alsa-lib +, xdg-utils +, systemd +}: +stdenv.mkDerivation (finalAttrs: { + pname = "ticktick"; + version = "1.0.80"; + + src = fetchurl { + url = "https://d2atcrkye2ik4e.cloudfront.net/download/linux/linux_deb_x64/${finalAttrs.pname}-${finalAttrs.version}-amd64.deb"; + hash = "sha256-EK+8NFEim2gcFj9t6AGYdGVlyFj9Yq7NaOia3XKy3cc="; + }; + + nativeBuildInputs = [ + wrapGAppsHook + autoPatchelfHook + dpkg + ]; + + buildInputs = [ + nss + glibc + libdrm + gcc-unwrapped + mesa + alsa-lib + xdg-utils + ]; + + # Needed to make the process get past zygote_linux fork()'ing + runtimeDependencies = [ + systemd + ]; + + unpackPhase = '' + runHook preUnpack + + mkdir -p "$out/share" "$out/opt/${finalAttrs.pname}" "$out/bin" + dpkg-deb --fsys-tarfile "$src" | tar --extract --directory="$out" + + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + cp -av $out/opt/TickTick/* $out/opt/${finalAttrs.pname} + cp -av $out/usr/share/* $out/share + rm -rf $out/usr $out/opt/TickTick + ln -sf "$out/opt/${finalAttrs.pname}/${finalAttrs.pname}" "$out/bin/${finalAttrs.pname}" + + substituteInPlace "$out/share/applications/${finalAttrs.pname}.desktop" \ + --replace "Exec=/opt/TickTick/ticktick" "Exec=$out/bin/${finalAttrs.pname}" + + runHook postInstall + ''; + + meta = with lib; { + description = "A powerful to-do & task management app with seamless cloud synchronization across all your devices"; + homepage = "https://ticktick.com/home/"; + license = licenses.unfree; + maintainers = with maintainers; [ hbjydev ]; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/office/timetrap/default.nix b/third_party/nixpkgs/pkgs/applications/office/timetrap/default.nix index 579c9e115b..7ece5e9b4b 100644 --- a/third_party/nixpkgs/pkgs/applications/office/timetrap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/timetrap/default.nix @@ -1,11 +1,49 @@ -{ lib, bundlerApp, bundlerUpdateScript }: +{ stdenv +, lib +, pkgs +, bundlerEnv +, bundlerApp +, bundlerUpdateScript +, installShellFiles +}: -bundlerApp { - pname = "timetrap"; - gemdir = ./.; - exes = [ "t" "timetrap" ]; +let + ttBundlerApp = bundlerApp { + pname = "timetrap"; + gemdir = ./.; + exes = [ "t" "timetrap" ]; - passthru.updateScript = bundlerUpdateScript "timetrap"; + passthru.updateScript = bundlerUpdateScript "timetrap"; + }; + + ttGem = bundlerEnv { + pname = "timetrap"; + gemdir = ./.; + }; + +in + +stdenv.mkDerivation { + name = "timetrap"; + + dontUnpack = true; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + mkdir $out; + cd $out; + + mkdir bin; pushd bin; + ln -vs ${ttBundlerApp}/bin/t; + ln -vs ${ttBundlerApp}/bin/timetrap; + popd; + + for c in t timetrap; do + installShellCompletion --cmd $c --bash ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/bash/*; + installShellCompletion --cmd $c --zsh ${ttGem}/lib/ruby/gems/*/gems/timetrap*/completions/zsh/*; + done; + ''; meta = with lib; { description = "A simple command line time tracker written in ruby"; diff --git a/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix b/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix index 4bbcc13460..2d9148b482 100644 --- a/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/timeular/default.nix @@ -5,12 +5,12 @@ }: let - version = "5.9.0"; + version = "6.3.0"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - sha256 = "sha256-RbP//rrKgvChIbBVwC8ElMUe+XsGMgHxowSdw6tRWNI="; + sha256 = "sha256-axdkoqCLg0z1kLa/S0kS4d8yGFuKJRDPRte9c8PYniU="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix index 10334d6c41..813c29e1ef 100644 --- a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "todoman"; - version = "4.3.1"; + version = "4.3.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pimutils"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pa1zzu0ITJObzhSmohjgiGTCoautXrY+SQQ3hxEtQcE="; + hash = "sha256-dxyI9ypZZBouTUF72wzvi7j+CeoQ9JNSiXrVeV7ForY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -92,7 +92,7 @@ python3.pkgs.buildPythonApplication rec { ''; changelog = "https://github.com/pimutils/todoman/raw/v${version}/CHANGELOG.rst"; license = licenses.isc; - maintainers = with maintainers; [ leenaars ]; + maintainers = with maintainers; [ leenaars antonmosich ]; mainProgram = "todo"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix index 360491ce72..e41dfcd15f 100644 --- a/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-08-17"; + version = "unstable-2023-09-15"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "e88dd955bf1346b560da3c34234f9206463baf0b"; - sha256 = "DOvCJiZ76CzlJF6f0V8ABHi5uUJo4XCzJDUoikKkpMI="; + rev = "8e1ebe5a55f6a725ba6fe342b4b7604438d9d406"; + sha256 = "zz2erN/ap6vT56khqbpANu1eV/C9eQ6SBWEV4GNbmEY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix index 9e100459f7..dd3f41df52 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/desktop.nix @@ -1,6 +1,7 @@ { stdenv, lib, unzip, autoPatchelfHook -, fetchurl, atomEnv, makeWrapper -, makeDesktopItem, copyDesktopItems, wrapGAppsHook, libxshmfence +, fetchurl, makeWrapper +, alsa-lib, mesa, nss, nspr, systemd +, makeDesktopItem, copyDesktopItems, wrapGAppsHook , metaCommon }: @@ -20,11 +21,11 @@ let }; linux = stdenv.mkDerivation rec { - pname = "trilium-desktop"; - inherit version; + inherit pname version meta; src = fetchurl linuxSource; + # TODO: migrate off autoPatchelfHook and use nixpkgs' electron nativeBuildInputs = [ autoPatchelfHook makeWrapper @@ -32,7 +33,14 @@ let copyDesktopItems ]; - buildInputs = atomEnv.packages ++ [ libxshmfence ]; + buildInputs = [ + alsa-lib + mesa + nss + nspr + stdenv.cc.cc + systemd + ]; desktopItems = [ (makeDesktopItem { @@ -65,8 +73,9 @@ let ''; # LD_LIBRARY_PATH "shouldn't" be needed, remove when possible :) + # Error: libstdc++.so.6: cannot open shared object file: No such file or directory preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${atomEnv.libPath}) + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs}) ''; dontStrip = true; diff --git a/third_party/nixpkgs/pkgs/applications/office/vnote/default.nix b/third_party/nixpkgs/pkgs/applications/office/vnote/default.nix index ef77a07782..cd118c3c1d 100644 --- a/third_party/nixpkgs/pkgs/applications/office/vnote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/vnote/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "vnote"; - version = "3.16.0"; + version = "3.17.0"; src = fetchFromGitHub { owner = "vnotex"; repo = "vnote"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-tcu6y2DqdhFE2nbDkiANDk/Mzidcp8PLi8bWZaI6sH0="; + hash = "sha256-NUVu6tKXrrwAoT4BgxX05mmGSC9yx20lwvXzd4y19Zs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix index 35178fd4a9..9be6994d6a 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.26"; + version = "6.0.27"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - hash = "sha256-Btrzv9trUFjCrQ+OEc7MUOzq7x3XW7jtgUJMitmPK0A="; + hash = "sha256-+nCPLVVBkEu0g2Kxt/XYAt6sYxYm05nPcmPNS2OejRs="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/abracadabra/default.nix b/third_party/nixpkgs/pkgs/applications/radio/abracadabra/default.nix index 900d770ba4..4c71a6a38a 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/abracadabra/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/abracadabra/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "abracadabra"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "KejPi"; repo = "AbracaDABra"; rev = "v${version}"; - sha256 = "sha256-VFV2eHBvBdKrI4Zt+GCtAOSZt0++hYDWYR7AN42p85I="; + sha256 = "sha256-gpZ6ckV//fhDlpAqmMwL4XNXX7xFmGi58fkOC4oRcDM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix b/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix index 680278bf0e..b64771be55 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.4.5"; + version = "2.4.9"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - sha256 = "sha256-L68jk49lGw9LNSqIPlDp2WHoQhn8UBW6VDZwsCtjTQI="; + sha256 = "sha256-sygkddnSou1U2ZEwNhKvHCkFEl91pYSYOjbKPLqgGj4="; }; postPath = '' diff --git a/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix b/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix index d3c01aff76..e5af2fc020 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/direwolf/default.nix @@ -1,7 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, alsa-lib, espeak, gpsd -, hamlib, perl, python3, udev }: - -with lib; +{ lib +, stdenv +, fetchFromGitHub +, cmake +, alsa-lib +, gpsd +, gpsdSupport ? false +, hamlib +, hamlibSupport ? true +, perl +, python3 +, espeak +, udev +, extraScripts ? false +}: stdenv.mkDerivation rec { pname = "direwolf"; @@ -18,9 +29,14 @@ stdenv.mkDerivation rec { strictDeps = true; - buildInputs = [ - espeak gpsd hamlib perl python3 - ] ++ (optionals stdenv.isLinux [alsa-lib udev]); + buildInputs = lib.optionals stdenv.isLinux [ alsa-lib udev ] + ++ lib.optionals gpsdSupport [ gpsd ] + ++ lib.optionals hamlibSupport [ hamlib ] + ++ lib.optionals extraScripts [ python3 perl espeak ]; + + preConfigure = lib.optionals (!extraScripts) '' + echo "" > scripts/CMakeLists.txt + ''; postPatch = '' substituteInPlace conf/CMakeLists.txt \ @@ -31,21 +47,23 @@ stdenv.mkDerivation rec { substituteInPlace src/decode_aprs.c \ --replace /usr/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt \ --replace /opt/local/share/direwolf/tocalls.txt $out/share/direwolf/tocalls.txt - patchShebangs scripts/dwespeak.sh - substituteInPlace scripts/dwespeak.sh \ - --replace espeak ${espeak}/bin/espeak substituteInPlace cmake/cpack/direwolf.desktop.in \ --replace 'Terminal=false' 'Terminal=true' \ --replace 'Exec=@APPLICATION_DESKTOP_EXEC@' 'Exec=direwolf' substituteInPlace src/dwgpsd.c \ --replace 'GPSD_API_MAJOR_VERSION > 11' 'GPSD_API_MAJOR_VERSION > 14' + '' + + lib.optionalString extraScripts '' + patchShebangs scripts/dwespeak.sh + substituteInPlace scripts/dwespeak.sh \ + --replace espeak ${espeak}/bin/espeak ''; - meta = { + meta = with lib; { description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway"; homepage = "https://github.com/wb2osz/direwolf/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ lasandell ]; + maintainers = with maintainers; [ lasandell sarcasticadmin ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix b/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix index 79a2459f23..f088293502 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/fldigi/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "fldigi"; - version = "4.1.26"; + version = "4.2.00"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-RIrTWjQPnn0I8bzV3kMQEesNaAkIQnhikLMaYivrWRc="; + hash = "sha256-F09C6R3mEgYVhS7/MqEBFzfqGKbyrAem5/+QDlwI+9k="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/flmsg/default.nix b/third_party/nixpkgs/pkgs/applications/radio/flmsg/default.nix index e92c52a7e1..d4b97e3a29 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/flmsg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/flmsg/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "4.0.22"; + version = "4.0.23"; pname = "flmsg"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "sha256-ueOkhmxrd4OT5g8z78TWUZuxT5SbF9300UWe7UByfD0="; + sha256 = "sha256-3eR0wrzkNjlqm5xW5dtgihs33cVUmZeS0/rf+xnPeRY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix b/third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix index 8eb68db56a..c2aa051e70 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/flrig/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.02"; + version = "2.0.03"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "sha256-3I9ucz8XtGqY9I0tO9BRt1IQiOkpAkjMy3e7302gGMg="; + sha256 = "sha256-/5hOryoupl7MYWekx2hL3q+2GMXA6rohjvYy2XTkJBI="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix b/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix index a8a3d0f875..cd4e69529e 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/freedv/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "freedv"; - version = "1.8.12"; + version = "1.9.2"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; rev = "v${version}"; - hash = "sha256-5qq7EDCLAiCReFS1V8R2SkFI8CesmQclimcE3USGV/U="; + hash = "sha256-SBWwAmIsa9HfaZpH8TioMm9IaoZ+x4HNHaOBps0vA0A="; }; postPatch = lib.optionalString stdenv.isDarwin '' @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { "-DUSE_INTERNAL_CODEC2:BOOL=FALSE" "-DUSE_STATIC_DEPS:BOOL=FALSE" "-DUNITTEST=ON" - ] ++ lib.optionals pulseSupport [ "-DUSE_PULSEAUDIO:BOOL=TRUE" ]; + "-DUSE_PULSEAUDIO:BOOL=${if pulseSupport then "TRUE" else "FALSE"}" + ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-DAPPLE_OLD_XCODE" diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix index e10d3df374..3113915bce 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.8.nix @@ -40,11 +40,7 @@ # If one wishes to use a different src or name for a very custom build , overrideSrc ? {} , pname ? "gnuradio" -, versionAttr ? { - major = "3.8"; - minor = "5"; - patch = "0"; -} +, version ? "3.8.5.0" }: let @@ -204,6 +200,11 @@ let gr-zeromq = { runtime = [ cppzmq ]; cmakeEnableFlag = "GR_ZEROMQ"; + pythonRuntime = [ + # Will compile without this, but it is required by tests, and by some + # gr blocks. + python.pkgs.pyzmq + ]; }; }; shared = (import ./shared.nix { @@ -214,7 +215,7 @@ let removeReferencesTo featuresInfo features - versionAttr + version sourceSha256 overrideSrc fetchFromGitHub @@ -222,23 +223,28 @@ let qt = qt5; gtk = gtk3; }); - inherit (shared) hasFeature; # function + inherit (shared.passthru) hasFeature; # function in -stdenv.mkDerivation { - inherit pname; - inherit (shared) - version - src - nativeBuildInputs - buildInputs - disallowedReferences - stripDebugList - doCheck - dontWrapPythonPrograms - dontWrapQtApps - meta - ; +stdenv.mkDerivation (finalAttrs: (shared // { + inherit pname version; + # Will still evaluate correctly if not used here. It only helps nix-update + # find the right file in which version is defined. + inherit (shared) src; + # Remove failing tests + preConfigure = (shared.preConfigure or "") + '' + # https://github.com/gnuradio/gnuradio/issues/3801 + rm gr-blocks/python/blocks/qa_cpp_py_binding.py + rm gr-blocks/python/blocks/qa_cpp_py_binding_set.py + rm gr-blocks/python/blocks/qa_ctrlport_probes.py + # Tests that fail due to numpy deprecations upstream hasn't accomodated to yet. + rm gr-fec/python/fec/qa_polar_decoder_sc.py + rm gr-fec/python/fec/qa_polar_decoder_sc_list.py + rm gr-fec/python/fec/qa_polar_decoder_sc_systematic.py + rm gr-fec/python/fec/qa_polar_encoder.py + rm gr-fec/python/fec/qa_polar_encoder_systematic.py + rm gr-filter/python/filter/qa_freq_xlating_fft_filter.py + ''; patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.3_8.patch @@ -291,4 +297,4 @@ stdenv.mkDerivation { ${removeReferencesTo}/bin/remove-references-to -t ${python} $out/lib/cmake/gnuradio/GnuradioConfig.cmake '' ; -} +})) diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix index a393cd5528..4d10851b7e 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/3.9.nix @@ -42,11 +42,7 @@ # If one wishes to use a different src or name for a very custom build , overrideSrc ? {} , pname ? "gnuradio" -, versionAttr ? { - major = "3.9"; - minor = "8"; - patch = "0"; -} +, version ? "3.9.8.0" }: let @@ -231,6 +227,11 @@ let gr-zeromq = { runtime = [ cppzmq ]; cmakeEnableFlag = "GR_ZEROMQ"; + pythonRuntime = [ + # Will compile without this, but it is required by tests, and by some + # gr blocks. + python.pkgs.pyzmq + ]; }; gr-network = { cmakeEnableFlag = "GR_NETWORK"; @@ -250,7 +251,7 @@ let removeReferencesTo featuresInfo features - versionAttr + version sourceSha256 overrideSrc fetchFromGitHub @@ -258,24 +259,21 @@ let qt = qt5; gtk = gtk3; }); - inherit (shared) hasFeature; # function + inherit (shared.passthru) hasFeature; # function in -stdenv.mkDerivation { - inherit pname; - inherit (shared) - version - src - nativeBuildInputs - buildInputs - cmakeFlags - disallowedReferences - stripDebugList - doCheck - dontWrapPythonPrograms - dontWrapQtApps - meta - ; +stdenv.mkDerivation (finalAttrs: (shared // { + inherit pname version; + # Will still evaluate correctly if not used here. It only helps nix-update + # find the right file in which version is defined. + inherit (shared) src; + # Remove failing tests + preConfigure = (shared.preConfigure or "") + '' + # https://github.com/gnuradio/gnuradio/issues/3801 + rm gr-blocks/python/blocks/qa_cpp_py_binding.py + rm gr-blocks/python/blocks/qa_cpp_py_binding_set.py + rm gr-blocks/python/blocks/qa_ctrlport_probes.py + ''; patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.patch @@ -303,4 +301,4 @@ stdenv.mkDerivation { ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake '' ; -} +})) diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix index 49d3c4234c..d1f0a3fd6f 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , cmake # Remove gcc and python references , removeReferencesTo @@ -44,11 +45,7 @@ # If one wishes to use a different src or name for a very custom build , overrideSrc ? {} , pname ? "gnuradio" -, versionAttr ? { - major = "3.10"; - minor = "7"; - patch = "0"; -} +, version ? "3.10.7.0" }: let @@ -251,6 +248,11 @@ let gr-zeromq = { runtime = [ cppzmq ]; cmakeEnableFlag = "GR_ZEROMQ"; + pythonRuntime = [ + # Will compile without this, but it is required by tests, and by some + # gr blocks. + python.pkgs.pyzmq + ]; }; gr-network = { cmakeEnableFlag = "GR_NETWORK"; @@ -270,7 +272,7 @@ let removeReferencesTo featuresInfo features - versionAttr + version sourceSha256 overrideSrc fetchFromGitHub @@ -278,27 +280,23 @@ let qt = qt5; gtk = gtk3; }); - inherit (shared) hasFeature; # function + inherit (shared.passthru) hasFeature; # function in -stdenv.mkDerivation { - inherit pname; - inherit (shared) - version - src - nativeBuildInputs - buildInputs - cmakeFlags - disallowedReferences - stripDebugList - doCheck - dontWrapPythonPrograms - dontWrapQtApps - meta - ; +stdenv.mkDerivation (finalAttrs: (shared // { + inherit pname version; + # Will still evaluate correctly if not used here. It only helps nix-update + # find the right file in which version is defined. + inherit (shared) src; patches = [ # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 ./modtool-newmod-permissions.patch + # https://github.com/gnuradio/gnuradio/pull/6808 + (fetchpatch { + name = "gnuradio-fmt10.1.patch"; + url = "https://github.com/gnuradio/gnuradio/commit/9357c17721a27cc0aae3fe809af140c84e492f37.patch"; + hash = "sha256-w3b22PTqoORyYQ3RKRG+2htQWbITzQiOdSDyuejUtHQ="; + }) ]; passthru = shared.passthru // { # Deps that are potentially overridden and are used inside GR plugins - the same version must @@ -325,4 +323,4 @@ stdenv.mkDerivation { ${removeReferencesTo}/bin/remove-references-to -t ${python.pkgs.pybind11} $out/lib/cmake/gnuradio/gnuradio-runtimeTargets.cmake '' ; -} +})) diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix index bdbc22cb78..fbb4960dc8 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/shared.nix @@ -5,7 +5,7 @@ , removeReferencesTo , featuresInfo , features -, versionAttr +, version , sourceSha256 # If overridden. No need to set default values, as they are given defaults in # the main expressions @@ -13,10 +13,21 @@ , fetchFromGitHub }: -rec { - version = builtins.concatStringsSep "." ( - lib.attrVals [ "major" "minor" "patch" ] versionAttr +let + # Check if a feature is enabled, while defaulting to true if feat is not + # specified. + hasFeature = feat: ( + if builtins.hasAttr feat features then + features.${feat} + else + true ); + versionAttr = { + major = builtins.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); + minor = builtins.elemAt (lib.splitVersion version) 2; + patch = builtins.elemAt (lib.splitVersion version) 3; + }; +in { src = if overrideSrc != {} then overrideSrc else @@ -27,14 +38,6 @@ rec { sha256 = sourceSha256; } ; - # Check if a feature is enabled, while defaulting to true if feat is not - # specified. - hasFeature = feat: ( - if builtins.hasAttr feat features then - features.${feat} - else - true - ); nativeBuildInputs = lib.flatten (lib.mapAttrsToList ( feat: info: ( lib.optionals (hasFeature feat) ( @@ -109,9 +112,14 @@ rec { # Wrapping is done with an external wrapper dontWrapPythonPrograms = true; dontWrapQtApps = true; - # Tests should succeed, but it's hard to get LD_LIBRARY_PATH right in order - # for it to happen. - doCheck = false; + # On darwin, it requires playing with DYLD_FALLBACK_LIBRARY_PATH to make if + # find libgnuradio-runtim.3.*.dylib . + doCheck = !stdenv.isDarwin; + preCheck = '' + export HOME=$(mktemp -d) + export QT_QPA_PLATFORM=offscreen + export QT_PLUGIN_PATH="${qt.qtbase.bin}/${qt.qtbase.qtPluginPrefix}" + ''; meta = with lib; { description = "Software Defined Radio (SDR) software"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix index c38c89fc45..ac08d17397 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gnuradio/wrapper.nix @@ -28,6 +28,27 @@ , extraPackages ? [] # For Adding additional python packaages , extraPythonPackages ? [] +, soapysdr # For it's passthru.searchPath +# soapysdr plugins we add by default. Ideally, we should have a +# soapysdrPackages = soapysdr.pkgs attribute set, but until now this wasn't +# crucial. +, soapyairspy +, soapyaudio +, soapybladerf +, soapyhackrf +, soapyremote +, soapyrtlsdr +, soapyuhd +# For adding / changing soapysdr packages, like soapsdr-with-plugins does +, extraSoapySdrPackages ? [ + soapyairspy + soapyaudio + soapybladerf + soapyhackrf + soapyremote + soapyrtlsdr + soapyuhd +] # Allow to add whatever you want to the wrapper , extraMakeWrapperArgs ? [] }: @@ -87,6 +108,10 @@ let ++ lib.optionals (extraPackages != []) [ "--prefix" "GRC_BLOCKS_PATH" ":" "${lib.makeSearchPath "share/gnuradio/grc/blocks" extraPackages}" ] + ++ lib.optionals (extraSoapySdrPackages != []) [ + "--prefix" "SOAPY_SDR_PLUGIN_PATH" ":" "${lib.makeSearchPath + soapysdr.passthru.searchPath extraSoapySdrPackages}" + ] ++ lib.optionals (unwrapped.hasFeature "gr-qtgui") # 3.7 builds with qt4 (if lib.versionAtLeast unwrapped.versionAttr.major "3.8" then diff --git a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix index 1610d5e0f9..074f46a7fa 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/gqrx/default.nix @@ -27,13 +27,13 @@ assert !(pulseaudioSupport && portaudioSupport); gnuradioMinimal.pkgs.mkDerivation rec { pname = "gqrx"; - version = "2.16"; + version = "2.17"; src = fetchFromGitHub { owner = "gqrx-sdr"; repo = "gqrx"; rev = "v${version}"; - hash = "sha256-14MVimOxM7upq6vpEhvVRnrverBuFToE2ktNhG59LKE="; + hash = "sha256-QnwkiH8KqoHa2Q3knh0OAyGBySAArEtdpO+lTzqJ4j0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/radio/kappanhang/default.nix b/third_party/nixpkgs/pkgs/applications/radio/kappanhang/default.nix index 9146bfd781..41037c5092 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/kappanhang/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/kappanhang/default.nix @@ -8,14 +8,14 @@ buildGoModule rec { owner = "nonoo"; repo = pname; rev = "v${version}"; - sha256 = "1ycy8avq5s7zspfi0d9klqcwwkpmcaz742cigd7pmcnbbhspcicp"; + hash = "sha256-l0V2NVzLsnpPe5EJcr5i9U7OGaYzNRDd1f/ogrdCnvk="; }; + vendorHash = "sha256-CnZTUP2JBbhG8VUHbVX+vicfQJC9Y8endlwQHdmzMus="; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ pulseaudio ]; - vendorSha256 = "1srjngcis42wfskwfqxxj101y9xyzrans1smy53bh1c9zm856xha"; - meta = with lib; { homepage = "https://github.com/nonoo/kappanhang"; description = "Remote control for Icom radio transceivers"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix b/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix index bdfeec325a..ec26a7ddb9 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/multimon-ng/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, libpulseaudio, libX11 }: +{ lib, stdenv, fetchFromGitHub, cmake, libpulseaudio, libX11, makeWrapper, sox }: stdenv.mkDerivation rec { pname = "multimon-ng"; @@ -13,7 +13,11 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isLinux [ libpulseaudio libX11 ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/multimon-ng --prefix PATH : "${lib.makeBinPath [sox]}" + ''; meta = with lib; { description = "Multimon is a digital baseband audio protocol decoder"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/pat/default.nix b/third_party/nixpkgs/pkgs/applications/radio/pat/default.nix index 58eefd0dbc..991df60b24 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/pat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/pat/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, libax25 +, installShellFiles +}: buildGoModule rec { pname = "pat"; @@ -15,10 +21,25 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; + nativeBuildInputs = [ + installShellFiles + ]; + + buildInputs = lib.optional stdenv.isLinux [ libax25 ]; + + # Needed by wl2k-go go module for libax25 to include support for Linux' AX.25 stack by linking against libax25. + # ref: https://github.com/la5nta/wl2k-go/blob/abe3ae5bf6a2eec670a21672d461d1c3e1d4c2f3/transport/ax25/ax25.go#L11-L17 + tags = lib.optionals stdenv.isLinux [ "libax25" ]; + + postInstall = '' + installManPage man/pat-configure.1 man/pat.1 + ''; + meta = with lib; { description = "Pat is a cross platform Winlink client written in Go."; homepage = "https://getpat.io/"; license = licenses.mit; - maintainers = with maintainers; [ dotemup ]; + maintainers = with maintainers; [ dotemup sarcasticadmin ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/qradiolink/default.nix b/third_party/nixpkgs/pkgs/applications/radio/qradiolink/default.nix index 1bfb4c74f6..78ff080f40 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/qradiolink/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/qradiolink/default.nix @@ -23,13 +23,13 @@ gnuradio3_8.pkgs.mkDerivation rec { pname = "qradiolink"; - version = "0.8.9-1"; + version = "0.8.11-1"; src = fetchFromGitHub { owner = "qradiolink"; repo = "qradiolink"; rev = version; - sha256 = "sha256-yY9sdLFaG0fX/4obImxVAyJk13RklYjX99Ch9hgzTe8="; + sha256 = "sha256-62+eKaLt9DlTebbnLPVJFx68bfWb7BrdQHocyJTfK28="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/radio/quisk/default.nix b/third_party/nixpkgs/pkgs/applications/radio/quisk/default.nix index 86b4db693c..785f5cd8d9 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/quisk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/quisk/default.nix @@ -8,11 +8,11 @@ python3.pkgs.buildPythonApplication rec { pname = "quisk"; - version = "4.2.17"; + version = "4.2.22"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eF/3++wRG0JulVTT+GvtqleBPkzLSZeu+RfHDI1xfOY="; + sha256 = "sha256-F6xSE1EgWlHlrd4W79tmhTg/FS7QUPH3NWzWIljAAg4="; }; buildInputs = [ @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { ''; license = licenses.gpl2Plus; homepage = "https://james.ahlstrom.name/quisk/"; - maintainers = with maintainers; [ pulsation ]; + maintainers = with maintainers; [ pulsation kashw2 ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/rscw/default.nix b/third_party/nixpkgs/pkgs/applications/radio/rscw/default.nix index 3c42b3b813..7fe638df61 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/rscw/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/rscw/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { sha256 = "1hxwxmqc5jinr14ya1idigqigc8qhy1vimzcwy2vmwdjay2sqik2"; }; - setSourceRoot = "sourceRoot=`pwd`"; + sourceRoot = "."; nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk2 fftw ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix index 6fd4774df7..f55371fd68 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/sdrangel/default.nix @@ -41,22 +41,24 @@ , qtwebengine , rtl-sdr , serialdv +, sdrplay , sgp4 , soapysdr-with-plugins , uhd , wrapQtAppsHook , zlib +, withSDRplay ? false }: stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.15.2"; + version = "7.16.0"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-Yvf0LJu7YbXhW3i0fd5R2KVn2dkx484AZ0XaWhjozFE="; + hash = "sha256-k35TZ2H8GX3gSYyb27hTY6gHHnxPkFwp1v4OJXhvV7A="; }; nativeBuildInputs = [ @@ -108,7 +110,8 @@ stdenv.mkDerivation (finalAttrs: { soapysdr-with-plugins uhd zlib - ]; + ] + ++ lib.optionals withSDRplay [ sdrplay ]; cmakeFlags = [ "-DAPT_DIR=${aptdec}" diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix index e11e2af401..ee03d67d59 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix @@ -1,66 +1,81 @@ -{ stdenv, lib, lndir, makeWrapper -, fetchFromGitHub, cmake -, libusb-compat-0_1, pkg-config +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, cmake +, pkg-config +, makeWrapper +, libusb-compat-0_1 +, ncurses , usePython ? false , python ? null -, ncurses, swig2 -, extraPackages ? [] -, testers +, swig2 +, extraPackages ? [ ] , buildPackages +, testers }: -let - - version = "0.8.1"; - modulesVersion = with lib; versions.major version + "." + versions.minor version; - modulesPath = "lib/SoapySDR/modules" + modulesVersion; - extraPackagesSearchPath = lib.makeSearchPath modulesPath extraPackages; - -in stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation (finalAttrs: { pname = "soapysdr"; - inherit version; + version = "0.8.1"; src = fetchFromGitHub { owner = "pothosware"; repo = "SoapySDR"; - rev = "soapy-sdr-${version}"; + rev = "soapy-sdr-${finalAttrs.version}"; sha256 = "19f2x0pkxvf9figa0pl6xqlcz8fblvqb19mcnj632p0l8vk6qdv2"; }; patches = [ - # see https://github.com/pothosware/SoapySDR/issues/352 for upstream issue - ./fix-pkgconfig.patch + # Fix for https://github.com/pothosware/SoapySDR/issues/352 + (fetchpatch { + url = "https://github.com/pothosware/SoapySDR/commit/10c05b3e52caaa421147d6b4623eccd3fc3be3f4.patch"; + hash = "sha256-D7so6NSZiU6SXbzns04Q4RjSZW0FJ+MYobvvVpVMjws="; + }) ]; - nativeBuildInputs = [ cmake makeWrapper pkg-config ]; - buildInputs = [ libusb-compat-0_1 ncurses ] - ++ lib.optionals usePython [ python swig2 ]; + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; + buildInputs = [ + libusb-compat-0_1 + ncurses + ] ++ lib.optionals usePython [ + python + swig2 + ]; - propagatedBuildInputs = lib.optional usePython python.pkgs.numpy; + propagatedBuildInputs = lib.optionals usePython [ + python.pkgs.numpy + ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - ] ++ lib.optional usePython "-DUSE_PYTHON_CONFIG=ON"; + cmakeFlags = lib.optionals usePython [ + "-DUSE_PYTHON_CONFIG=ON" + ]; - # https://github.com/pothosware/SoapySDR/issues/352 - postPatch = '' - substituteInPlace lib/SoapySDR.in.pc \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; - - postFixup = lib.optionalString (lib.length extraPackages != 0) '' + postFixup = lib.optionalString (extraPackages != [ ]) ( # Join all plugins via symlinking - for i in ${toString extraPackages}; do - ${buildPackages.xorg.lndir}/bin/lndir -silent $i $out - done - # Needed for at least the remote plugin server - for file in $out/bin/*; do - wrapProgram "$file" --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.escapeShellArg extraPackagesSearchPath} - done - ''; + lib.pipe extraPackages [ + (map (pkg: '' + ${buildPackages.xorg.lndir}/bin/lndir -silent ${pkg} $out + '')) + lib.concatStrings + ] + '' + # Needed for at least the remote plugin server + for file in $out/bin/*; do + wrapProgram "$file" --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.escapeShellArg ( + lib.makeSearchPath finalAttrs.passthru.searchPath extraPackages + )} + done + '' + ); - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + searchPath = "lib/SoapySDR/modules${lib.versions.majorMinor finalAttrs.version}"; + }; meta = with lib; { homepage = "https://github.com/pothosware/SoapySDR"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/fix-pkgconfig.patch b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/fix-pkgconfig.patch deleted file mode 100644 index d4b15e3f99..0000000000 --- a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/fix-pkgconfig.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/lib/SoapySDR.in.pc b/lib/SoapySDR.in.pc -index a1ca698..fd2f4c0 100644 ---- a/lib/SoapySDR.in.pc -+++ b/lib/SoapySDR.in.pc -@@ -1,7 +1,5 @@ --prefix=@CMAKE_INSTALL_PREFIX@ --exec_prefix=${prefix} --libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - - Name: Soapy SDR - Description: Vendor and platform neutral SDR interface library. diff --git a/third_party/nixpkgs/pkgs/applications/radio/srsran/default.nix b/third_party/nixpkgs/pkgs/applications/radio/srsran/default.nix index 10ad55ca3b..c15bb14de4 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/srsran/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/srsran/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "srsran"; - version = "23.04"; + version = "23.04.1"; src = fetchFromGitHub { owner = "srsran"; repo = "srsran"; rev = "release_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-k2KUejn2eBFGknVQCHeYuZd4UUC2Jv0WEI9le9fYoFE="; + sha256 = "sha256-4Mwdar1WUIgT23VjI9CtA5FT5gCm0Su+xK5dld3qfho="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/uhd/3.5.nix b/third_party/nixpkgs/pkgs/applications/radio/uhd/3.5.nix deleted file mode 100644 index 5f34597ea2..0000000000 --- a/third_party/nixpkgs/pkgs/applications/radio/uhd/3.5.nix +++ /dev/null @@ -1,160 +0,0 @@ -{ lib -, stdenv -, fetchurl -, fetchFromGitHub -, cmake -, pkg-config -# See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations -, boost -, enableLibuhd_C_api ? true -# requires numpy -, enableLibuhd_Python_api ? false -, python3 -, enableExamples ? false -, enableUtils ? false -, enableLiberio ? false -, liberio -, libusb1 -, enableDpdk ? false -, dpdk -# Devices -, enableOctoClock ? true -, enableMpmd ? true -, enableB100 ? true -, enableB200 ? true -, enableUsrp1 ? true -, enableUsrp2 ? true -, enableX300 ? true -, enableN230 ? true -, enableN300 ? true -, enableN320 ? true -, enableE300 ? true -, enableE320 ? true -}: - -let - onOffBool = b: if b then "ON" else "OFF"; - inherit (lib) optionals; -in - -stdenv.mkDerivation rec { - pname = "uhd"; - # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz - # and xxx.yyy.zzz. Hrmpf... style keeps changing - version = "3.15.0.0"; - - src = fetchFromGitHub { - owner = "EttusResearch"; - repo = "uhd"; - rev = "v${version}"; - sha256 = "0jknln88a69fh244670nb7qrflbyv0vvdxfddb5g8ncpb6hcg8qf"; - }; - # Firmware images are downloaded (pre-built) from the respective release on Github - uhdImagesSrc = fetchurl { - url = "https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz"; - sha256 = "1fir1a13ac07mqhm4sr34cixiqj2difxq0870qv1wr7a7cbfw6vp"; - }; - - cmakeFlags = [ - "-DENABLE_LIBUHD=ON" - "-DENABLE_USB=ON" - "-DENABLE_TESTS=ON" # This installs tests as well so we delete them via postPhases - "-DENABLE_EXAMPLES=${onOffBool enableExamples}" - "-DENABLE_UTILS=${onOffBool enableUtils}" - "-DENABLE_LIBUHD_C_API=${onOffBool enableLibuhd_C_api}" - "-DENABLE_LIBUHD_PYTHON_API=${onOffBool enableLibuhd_Python_api}" - "-DENABLE_LIBERIO=${onOffBool enableLiberio}" - "-DENABLE_DPDK=${onOffBool enableDpdk}" - # Devices - "-DENABLE_OCTOCLOCK=${onOffBool enableOctoClock}" - "-DENABLE_MPMD=${onOffBool enableMpmd}" - "-DENABLE_B100=${onOffBool enableB100}" - "-DENABLE_B200=${onOffBool enableB200}" - "-DENABLE_USRP1=${onOffBool enableUsrp1}" - "-DENABLE_USRP2=${onOffBool enableUsrp2}" - "-DENABLE_X300=${onOffBool enableX300}" - "-DENABLE_N230=${onOffBool enableN230}" - "-DENABLE_N300=${onOffBool enableN300}" - "-DENABLE_N320=${onOffBool enableN320}" - "-DENABLE_E300=${onOffBool enableE300}" - "-DENABLE_E320=${onOffBool enableE320}" - ] - # TODO: Check if this still needed - # ABI differences GCC 7.1 - # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector::iterator {aka __gnu_cxx::__normal_iterator >}' changed in GCC 7.1 - ++ [ (lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ] - ; - - # Python + mako are always required for the build itself but not necessary for runtime. - pythonEnv = python3.withPackages (ps: with ps; [ mako ] - ++ optionals (enableLibuhd_Python_api) [ numpy setuptools ] - ++ optionals (enableUtils) [ requests six ] - ); - - nativeBuildInputs = [ - cmake - pkg-config - ] - # If both enableLibuhd_Python_api and enableUtils are off, we don't need - # pythonEnv in buildInputs as it's a 'build' dependency and not a runtime - # dependency - ++ optionals (!enableLibuhd_Python_api && !enableUtils) [ pythonEnv ] - ; - buildInputs = [ - boost - libusb1 - ] - # However, if enableLibuhd_Python_api *or* enableUtils is on, we need - # pythonEnv for runtime as well. The utilities' runtime dependencies are - # handled at the environment - ++ optionals (enableLibuhd_Python_api || enableUtils) [ pythonEnv ] - ++ optionals (enableLiberio) [ liberio ] - ++ optionals (enableDpdk) [ dpdk ] - ; - - doCheck = true; - - # Build only the host software - preConfigure = "cd host"; - # TODO: Check if this still needed, perhaps relevant: - # https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html#build_instructions_unix_arm - patches = if stdenv.isAarch32 then ./neon.patch else null; - - postPhases = [ "installFirmware" "removeInstalledTests" ] - ++ optionals (enableUtils) [ "moveUdevRules" ] - ; - - # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` - installFirmware = '' - mkdir -p "$out/share/uhd/images" - tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out/share/uhd/images" - ''; - - # -DENABLE_TESTS=ON installs the tests, we don't need them in the output - removeInstalledTests = '' - rm -r $out/lib/uhd/tests - ''; - - # Moves the udev rules to the standard location, needed only if utils are - # enabled - moveUdevRules = '' - mkdir -p $out/lib/udev/rules.d - mv $out/lib/uhd/utils/uhd-usrp.rules $out/lib/udev/rules.d/ - ''; - - meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; - description = "USRP Hardware Driver (for Software Defined Radio)"; - longDescription = '' - The USRP Hardware Driver (UHD) software is the hardware driver for all - USRP (Universal Software Radio Peripheral) devices. - - USRP devices are designed and sold by Ettus Research, LLC and its parent - company, National Instruments. - ''; - homepage = "https://uhd.ettus.com/"; - license = licenses.gpl3Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bjornfor fpletz tomberek ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix index 873c49dd9a..5dbed65484 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/uhd/default.nix @@ -8,13 +8,19 @@ , boost , ncurses , enableCApi ? true -# requires numpy +# Although we handle the Python API's dependencies in pythonEnvArg, this +# feature is currently disabled as upstream attempts to run `python setup.py +# install` by itself, and it fails because the Python's environment's prefix is +# not a writable directly. Adding support for this feature would require using +# python's pypa/build nad pypa/install hooks directly, and currently it is hard +# to do that because it all happens after a long buildPhase of the C API. , enablePythonApi ? false , python3 , buildPackages , enableExamples ? false -, enableUtils ? false +, enableUtils ? true , libusb1 +# Disable dpdk for now due to compilation issues. , enableDpdk ? false , dpdk # Devices @@ -41,7 +47,7 @@ let ); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uhd"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... style keeps changing @@ -52,14 +58,15 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-khVOHlvacZc4EMg4m55rxEqPvLY1xURpAfOW905/3jg="; }; # Firmware images are downloaded (pre-built) from the respective release on Github uhdImagesSrc = fetchurl { - url = "https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz"; + url = "https://github.com/EttusResearch/uhd/releases/download/v${finalAttrs.version}/uhd-images_${finalAttrs.version}.tar.xz"; sha256 = "V8ldW8bvYWbrDAvpWpHcMeLf9YvF8PIruDAyNK/bru4="; }; + # TODO: Add passthru.updateScript that will update both of the above hashes... cmakeFlags = [ "-DENABLE_LIBUHD=ON" @@ -105,7 +112,7 @@ stdenv.mkDerivation rec { # pythonEnv for runtime as well. The utilities' runtime dependencies are # handled at the environment ++ optionals (enableExamples) [ ncurses ncurses.dev ] - ++ optionals (enablePythonApi || enableUtils) [ pythonEnv ] + ++ optionals (enablePythonApi || enableUtils) [ finalAttrs.pythonEnv ] ++ optionals (enableDpdk) [ dpdk ] ; @@ -128,7 +135,7 @@ stdenv.mkDerivation rec { # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` installFirmware = '' mkdir -p "$out/share/uhd/images" - tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out/share/uhd/images" + tar --strip-components=1 -xvf "${finalAttrs.uhdImagesSrc}" -C "$out/share/uhd/images" ''; # -DENABLE_TESTS=ON installs the tests, we don't need them in the output @@ -143,6 +150,10 @@ stdenv.mkDerivation rec { mv $out/lib/uhd/utils/uhd-usrp.rules $out/lib/udev/rules.d/ ''; + disallowedReferences = optionals (!enablePythonApi && !enableUtils) [ + python3 + ]; + meta = with lib; { description = "USRP Hardware Driver (for Software Defined Radio)"; longDescription = '' @@ -157,4 +168,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor fpletz tomberek doronbehar ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix index 64e3f8713b..b5b92bd8fe 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "feb23a"; - version = "20230201_a"; + srcVersion = "aug23a"; + version = "20230801_a"; pname = "gildas"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz" ]; - sha256 = "sha256-A6jtcC8QMtJ7YcNaPiOjwNPDGPAjmRA3jZLEt5iBONE="; + sha256 = "sha256-jlyv2K1V+510C4uLek4oofm13d40nGJ46wqjW+tjfq4="; }; nativeBuildInputs = [ pkg-config groff perl getopt gfortran which ]; @@ -38,14 +38,15 @@ stdenv.mkDerivation rec { echo "gag_doc: $out/share/doc/" >> kernel/etc/gag.dico.lcl ''; + userExec = "astro class greg imager mapping sic"; + postInstall='' mkdir -p $out/bin cp -a ../gildas-exe-${srcVersion}/* $out mv $out/$GAG_EXEC_SYSTEM $out/libexec - cp admin/wrapper.sh $out/bin/gildas-wrapper.sh - chmod 755 $out/bin/gildas-wrapper.sh - for i in $out/libexec/bin/* ; do - ln -s $out/bin/gildas-wrapper.sh $out/bin/$(basename "$i") + for i in ${userExec} ; do + cp admin/wrapper.sh $out/bin/$i + chmod 755 $out/bin/$i done ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix index c4721c490c..ce29c5172a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.6.4"; + version = "3.6.6"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-9MJqJVgSZVBzlLv08Z6i8yO4YV1exsD5+yLJjqIGD20="; + sha256 = "sha256-Z4PatRvtIJBoeRDJJYkkBTOB/R+R7nGdDT38bfAShJQ="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix index db0411f133..255927d893 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/siril/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja +{ lib, stdenv, fetchFromGitLab, fetchpatch, pkg-config, meson, ninja, cmake , git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib , fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg , libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook @@ -6,17 +6,25 @@ stdenv.mkDerivation rec { pname = "siril"; - version = "1.0.6"; + version = "1.2.0"; src = fetchFromGitLab { owner = "free-astro"; - repo = pname; + repo = "siril"; rev = version; - sha256 = "sha256-KFCA3fUMVFHmh1BdKed5/dkq0EeYcmoWec97WX9ZHUc="; + hash = "sha256-lCoFQ7z6cZbyNPEm5s40DNdvTwFonHK3KCd8RniqQWs="; }; + patches = [ + (fetchpatch { + name = "siril-1.2-exiv2-0.28.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; + hash = "sha256-R1yslW6hzvJHKo0/IqBxkCuqcX6VrdRSz68gpAExxVE="; + }) + ]; + nativeBuildInputs = [ - meson ninja pkg-config git criterion wrapGAppsHook + meson ninja cmake pkg-config git criterion wrapGAppsHook ]; buildInputs = [ @@ -26,6 +34,7 @@ stdenv.mkDerivation rec { # Necessary because project uses default build dir for flatpaks/snaps dontUseMesonConfigure = true; + dontUseCmakeConfigure = true; configureScript = '' ${meson}/bin/meson --buildtype release nixbld . diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index 00b36de280..d656c39d0b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -11,24 +11,24 @@ , qtpositioning , qtmultimedia , qtserialport -, qttranslations , qtwayland , qtwebengine , calcmysky , qxlsx , indilib , libnova +, qttools }: stdenv.mkDerivation rec { pname = "stellarium"; - version = "23.2"; + version = "23.3"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - hash = "sha256-8Iheb/9wjf0u10ZQRkLMLNN2s7P++Fqcr26iatiKcTo="; + hash = "sha256-bYvGmYu9jMHk2IUICz2kCVh56Ymz8JHqurdWV+xEdJY="; }; patches = [ @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { perl wrapGAppsHook wrapQtAppsHook + qttools ]; buildInputs = [ @@ -60,7 +61,6 @@ stdenv.mkDerivation rec { qtpositioning qtmultimedia qtserialport - qttranslations qtwebengine calcmysky qxlsx @@ -92,6 +92,6 @@ stdenv.mkDerivation rec { homepage = "https://stellarium.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ kilianar ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/angsd/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/angsd/default.nix index 035cb2ca2b..71366dc0d3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/angsd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/angsd/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, htslib, zlib, bzip2, xz, curl, openssl }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, htslib +, zlib +, bzip2 +, xz +, curl +, openssl +}: stdenv.mkDerivation rec { pname = "angsd"; @@ -11,8 +21,20 @@ stdenv.mkDerivation rec { rev = version; }; + patches = [ + # Pull pending inclusion upstream patch for parallel buil fixes: + # https://github.com/ANGSD/angsd/pull/590 + (fetchpatch { + name = "parallel-make.patch"; + url = "https://github.com/ANGSD/angsd/commit/89fd1d898078016df390e07e25b8a3eeadcedf43.patch"; + hash = "sha256-KQgUfr3v8xc+opAm4qcSV2eaupztv4gzJJHyzJBCxqA="; + }) + ]; + buildInputs = [ htslib zlib bzip2 xz curl openssl ]; + enableParallelBuilding = true; + makeFlags = [ "HTSSRC=systemwide" "prefix=$(out)" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/ants/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/ants/default.nix index d71fbca4be..cb3ec8a4f7 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/ants/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/ants/default.nix @@ -1,32 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk, Cocoa }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, makeBinaryWrapper +, itk +, vtk +, Cocoa +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ANTs"; - version = "2.4.4"; + version = "2.5.0"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; - rev = "refs/tags/v${version}"; - hash = "sha256-GQndI8ayBvqujb2/qXT6RBAfr8hNPCI5IbwYkPlyNg0="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-rSibcsprhMC1qsuZN8ou32QPLf8n62BiDzpnTRWRx0Q="; }; - nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + nativeBuildInputs = [ + cmake + makeBinaryWrapper + ]; - cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; + buildInputs = [ + itk + vtk + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ]; + + cmakeFlags = [ + "-DANTS_SUPERBUILD=FALSE" + "-DUSE_VTK=TRUE" + ]; postInstall = '' for file in $out/bin/*; do - wrapProgram $file --set ANTSPATH "$out/bin" + wrapProgram $file --set PATH "$out/bin" done ''; - meta = with lib; { - homepage = "https://github.com/ANTsX/ANTs"; + meta = { + changelog = "https://github.com/ANTsX/ANTs/releases/tag/v${finalAttrs.version}"; description = "Advanced normalization toolkit for medical image registration and other processing"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.bsd3; + homepage = "https://github.com/ANTsX/ANTs"; + license = lib.licenses.asl20; + mainProgram = "antsRegistration"; + maintainers = with lib.maintainers; [ bcdarwin ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix index 383aa6d09a..407d38970b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/blast/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "blast"; - version = "2.14.0"; + version = "2.14.1"; src = fetchurl { url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-src.tar.gz"; - sha256 = "sha256-v0d/Gww7gvC3pwlL8AOpqD4347BxbB33mQYMT+qxdQA="; + sha256 = "sha256-cSwtvfD7E8wcLU9O9d0c5LBsO1fpbf6o8j5umfWxZQ4="; }; sourceRoot = "ncbi-blast-${version}+-src/c++"; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bwa-mem2/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bwa-mem2/default.nix new file mode 100644 index 0000000000..b34b6dc8c9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bwa-mem2/default.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, fetchFromGitHub +, zlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bwa-mem2"; + version = "unstable-2023-03-18"; + + src = fetchFromGitHub { + owner = "bwa-mem2"; + repo = "bwa-mem2"; + rev = "cf4306a47dac35e7e79a9e75398a35f33900cfd0"; + fetchSubmodules = true; + hash = "sha256-1AYSn7nBrDwbX7oSrdEoa1d3t6xzwKnA0S87Y/XeXJg="; + }; + + buildInputs = [ zlib ]; + + # see https://github.com/bwa-mem2/bwa-mem2/issues/93 + postPatch = lib.optionalString stdenv.isDarwin '' + sed -i 's/memset_s/memset8_s/g' ext/safestringlib/include/safe_mem_lib.h + sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset16_s.c + sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset32_s.c + sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/memset_s.c + sed -i 's/memset_s/memset8_s/g' ext/safestringlib/safeclib/wmemset_s.c + ''; + + buildFlags = [ + (if stdenv.hostPlatform.sse4_2Support then "arch=sse42" + else if stdenv.hostPlatform.avxSupport then "arch=avx" + else if stdenv.hostPlatform.avx2Support then "arch=avx2" + else if stdenv.hostPlatform.avx512Support then "arch=avx512" + else "arch=sse41") + ]; + enableParallelBuilding = true; + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp bwa-mem2* $out/bin/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Next version of the bwa-mem algorithm in bwa, a software package for mapping low-divergent sequences against a large reference genome"; + license = licenses.mit; + homepage = "https://github.com/bwa-mem2/bwa-mem2/"; + changelog = "https://github.com/bwa-mem2/bwa-mem2/blob/${finalAttrs.src.rev}/NEWS.md"; + platforms = platforms.x86_64; + maintainers = with maintainers; [ alxsimon ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix index 92eda1d1dd..1c39d209c3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "delly"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "dellytools"; repo = "delly"; rev = "v${finalAttrs.version}"; - hash = "sha256-/I//7MhsC/CcBeIJblzbjXp/yOSBm83KWJsrYpl6UJk="; + hash = "sha256-oBIY8s/ippf+Xw+3QzMwP0Esc/QpiT6yWeAnqpMix6s="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix index 1281643fe7..78f226350f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , cmake +, eigen , fetchFromGitHub , libcifpp , libmcfp @@ -8,24 +9,24 @@ }: let libcifpp' = libcifpp.overrideAttrs (oldAttrs: { - # dssp 4.3.1 requires specific version "5.1.0" of libcifpp - version = "5.1.0"; + # dssp 4.4.3 requires specific version "5.2.0" of libcifpp + version = "5.2.0"; src = fetchFromGitHub { inherit (oldAttrs.src) owner repo rev; - hash = "sha256-PUsi4T6huSqwaa6RnBP1Vj+0a1ePrvrHD0641Lkkc5s="; + hash = "sha256-Sj10j6HxUoUvQ66cd2B8CO7CVBRd7w9CTovxkwPDOvs="; }; }); in stdenv.mkDerivation (finalAttrs: { pname = "dssp"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { owner = "PDB-REDO"; repo = "dssp"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-Gic/rE/G24P5g4Uhf2lcvVa6i/4KGQzCpK4KlpjXcS0="; + hash = "sha256-zPmRR7sxVNErwabLqA5CNMO4K1qHdmC9FBPjcx91KuM="; }; nativeBuildInputs = [ @@ -33,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + eigen libcifpp' libmcfp zlib diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/hmmer/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/hmmer/default.nix index 2a4df9d21d..243e067dde 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/hmmer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/hmmer/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.3.2"; + version = "3.4"; pname = "hmmer"; src = fetchurl { url = "http://eddylab.org/software/hmmer/${pname}-${version}.tar.gz"; - sha256 = "0s9wf6n0qanbx8qs6igfl3vyjikwbrvh4d9d6mv54yp3xysykzlj"; + sha256 = "sha256-ynDZT9DPJxvXBjQjqrsRbULeUzEXNDqbJ6ZcF/8G+/M="; }; meta = with lib; { @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { HMMER can be downloaded and installed as a command line tool on your own hardware, and now it is also more widely accessible to the scientific community via new search servers at the European Bioinformatics Institute. ''; homepage = "http://hmmer.org/"; + changelog = "https://github.com/EddyRivasLab/hmmer/blob/hmmer-${version}/release-notes/RELEASE-${version}.md"; license = licenses.gpl3; maintainers = [ maintainers.iimog ]; # at least SSE is *required* diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix index c9af0483da..52d388ab02 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.16.1"; + version = "2.16.2"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; - sha256 = "sha256-/3ielakIRdm9/iGBKSk+fTyzYRnsMTdCdsKghnziVwA="; + sha256 = "sha256-/X9loW8rOevf/GA/Wk3bVsES9ZceF79Bkwby75SJgTQ="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/iqtree/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/iqtree/default.nix index abf9cfba45..37a8a58a92 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/iqtree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/iqtree/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "iqtree"; - version = "2.2.2.6"; + version = "2.2.2.7"; src = fetchFromGitHub { owner = "iqtree"; repo = "iqtree2"; rev = "v${version}"; - hash = "sha256-dce7JOPZaosRP99/xRfz88EwXR9nYXK6Z4t2i5Uje1w="; + hash = "sha256-XyjVo5TYMoB+ZOAGc4ivYqFGnEO1M7mhxXrG45TP44Y="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix index b36104bcf7..f2825eeb97 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/mosdepth/default.nix @@ -2,14 +2,14 @@ nimPackages.buildNimPackage rec { pname = "mosdepth"; - version = "0.3.4"; + version = "0.3.5"; nimBinOnly = true; src = fetchFromGitHub { owner = "brentp"; repo = "mosdepth"; rev = "v${version}"; - sha256 = "sha256-7uteYTCbAaXedPqk0WtHpqTfUWH/+rRW8aSlFixkEko="; + sha256 = "sha256-tG3J51PS6A0WBCZ+j/Nf7aaukFV+DZJsxpbTbvwu0zc="; }; buildInputs = [ docopt hts pcre ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix index 4cb130296a..64eafa0f69 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/mrtrix/default.nix @@ -1,17 +1,33 @@ -{ stdenv, lib, fetchFromGitHub, python, makeWrapper -, eigen, fftw, libtiff, libpng, zlib, ants, bc -, qt5, libGL, libGLU, libX11, libXext -, withGui ? true, less }: +{ stdenv +, lib +, fetchFromGitHub +, python +, makeWrapper +, eigen +, fftw +, libtiff +, libpng +, zlib +, ants +, bc +, qt5 +, libGL +, libGLU +, libX11 +, libXext +, less +, withGui ? true +}: stdenv.mkDerivation rec { pname = "mrtrix"; - version = "unstable-2021-11-25"; + version = "3.0.4"; src = fetchFromGitHub { - owner = "MRtrix3"; - repo = "mrtrix3"; - rev = "994498557037c9e4f7ba67f255820ef84ea899d9"; - sha256 = "sha256-8eFDS5z4ZxMzi9Khk90KAS4ndma/Syd6JDXM2Fpr0M8="; + owner = "MRtrix3"; + repo = "mrtrix3"; + rev = "refs/tags/${version}"; + hash = "sha256-87zBAoBLWQPccGS37XyQ8H0GhL01k8GQFgcLL6IwbcM="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/nest/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/nest/default.nix index 90fa698124..5f0ad540f6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/nest/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/nest/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "nest"; - version = "3.5"; + version = "3.6"; src = fetchFromGitHub { owner = "nest"; repo = "nest-simulator"; rev = "v${version}"; - hash = "sha256-PPUIXlU6noJRAa/twNSKVxPgIvbWl0OillEJRDzt+4s="; + hash = "sha256-sXtF4JmHYoLp0t3o4KF6R2E0qLnKrzSPMXOxVJAm+sU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix index 5b08fbfd67..6e5e4feb16 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/neuron/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "neuron"; - version = "8.2.2"; + version = "8.2.3"; # format is for pythonModule conversion format = "other"; @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/neuronsimulator/nrn/releases/download/${version}/full-src-package-${version}.tar.gz"; - sha256 = "sha256-orGeBxu3pu4AyAW5P1EGJv8G0dOUZcSOjpUaloqicZU="; + sha256 = "sha256-k8+71BRfh+a73sZho6v0QFRxVmrfx6jqrgaqammdtDI="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix index 38333cbc99..e1722a7086 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/sambamba/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "sambamba"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "biod"; repo = "sambamba"; rev = "v${version}"; - sha256 = "sha256-HwAzsbT71Q35Io6H7Hzs4RTatpRpdHqV0cwPYAlsf6c="; + sha256 = "sha256-3O9bHGpMuCgdR2Wm7Dv1VUjMT1QTn8K1hdwgjvwhFDw="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix index 6884e1955f..a529867aaa 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/sortmerna/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib rocksdb rapidjson ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DPORTABLE=off" "-DRAPIDJSON_HOME=${rapidjson}" "-DROCKSDB_HOME=${rocksdb}" diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/sratoolkit/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/sratoolkit/default.nix index 8a1bb5376e..a36157ed5d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/sratoolkit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/sratoolkit/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { stdenv.cc.cc.lib ]; - sourceRoot = "./sratoolkit.${version}-ubuntu64/bin"; + sourceRoot = "sratoolkit.${version}-ubuntu64/bin"; installPhase = '' find -L . -executable -type f -! -name "*remote-fuser*" -exec install -m755 -D {} $out/bin/{} \; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix index 04ef7c2e06..0a18c5f40f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.62"; + version = "2.65"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "sha256-7uhQVLC/AEPAPUdm3+vABoIwG4uhNy/EngjsrZjT0Ts="; + sha256 = "sha256-/9a9PWKVq5yJzEUfOF03zR1Hp3AZw9MF8xICoriV4uo="; }; buildInputs = [ zlib ]; @@ -15,5 +15,6 @@ stdenv.mkDerivation rec { homepage = "http://catchenlab.life.illinois.edu/stacks/"; maintainers = [ lib.maintainers.bzizou ]; license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/trimmomatic/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/trimmomatic/default.nix new file mode 100644 index 0000000000..ad1dc45c5c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/biology/trimmomatic/default.nix @@ -0,0 +1,66 @@ +{ lib +, stdenv +, ant +, fetchFromGitHub +, jdk11_headless +, jre +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "trimmomatic"; + version = "0.39"; + + src = fetchFromGitHub { + owner = "usadellab"; + repo = "Trimmomatic"; + rev = "v${version}"; + hash = "sha256-u+ubmacwPy/vsEi0YQCv0fTnVDesQvqeQDEwCbS8M6I="; + }; + + # Set source and target version to 11 + postPatch = '' + substituteInPlace ./build.xml \ + --replace 'source="1.5" target="1.5"' 'release="11"' + ''; + + nativeBuildInputs = [ jdk11_headless ant makeWrapper ]; + + buildPhase = '' + runHook preBuild + + ant + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share + cp dist/jar/trimmomatic-${version}.jar $out/share/ + cp -r adapters $out/share/ + makeWrapper ${jre}/bin/java $out/bin/trimmomatic \ + --add-flags "-cp $out/share/trimmomatic-${version}.jar org.usadellab.trimmomatic.Trimmomatic" + + runHook postInstall + ''; + + meta = { + description = "A flexible read trimming tool for Illumina NGS data"; + longDescription = '' + Trimmomatic performs a variety of useful trimming tasks for illumina + paired-end and single ended data: adapter trimming, quality trimming, + cropping to a specified length, length filtering, quality score + conversion. + ''; + homepage = "http://www.usadellab.org/cms/?page=trimmomatic"; + downloadPage = "https://github.com/usadellab/Trimmomatic/releases"; + license = lib.licenses.gpl3Only; + sourceProvenance = [ + lib.sourceTypes.fromSource + lib.sourceTypes.binaryBytecode # source bundles dependencies as jars + ]; + maintainers = [ lib.maintainers.kupac ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/truvari/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/truvari/default.nix index e626af5627..946f4be606 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/truvari/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/truvari/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , python3Packages , runtimeShell , bcftools @@ -16,37 +15,28 @@ let }; in python3Packages.buildPythonApplication rec { pname = "truvari"; - version = "4.0.0"; + version = "4.1.0"; + pyproject = true; src = fetchFromGitHub { owner = "ACEnglish"; repo = "truvari"; rev = "v${version}"; - hash = "sha256-UJNMKEV5m2jFqnWvkVAtymkcE2TjPIXp7JqRZpMSqsE="; + hash = "sha256-HFVAv1TTL/nMjr62tQKhMdwh25P/y4nBGzSbxoJxMmo="; }; - patches = [ - (fetchpatch { - name = "fix-anno-trf-on-darwin.patch"; - url = "https://github.com/ACEnglish/truvari/commit/f9f36305e8eaa88f951562210e3672a4d4f71265.patch"; - hash = "sha256-7O9jTQDCC2b8hUBm0qJQCYMzTC9NFtn/E0dTHSfJALU="; - }) - (fetchpatch { - name = "fix-anno-grm-on-darwin.patch"; - url = "https://github.com/ACEnglish/truvari/commit/31416552008a506204ed4e2add55474f10392357.patch"; - hash = "sha256-42u0ewZU38GCoSfff+XQFv9hEFeO3WlJufTHcl6vkN4="; - }) - ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "rich==" "rich>=" substituteInPlace truvari/utils.py \ --replace "/bin/bash" "${runtimeShell}" patchShebangs repo_utils/test_files ''; + nativeBuildInputs = [ + python3Packages.setuptools + ]; + propagatedBuildInputs = with python3Packages; [ + pywfa rich edlib pysam @@ -83,6 +73,7 @@ in python3Packages.buildPythonApplication rec { meta = with lib; { description = "Structural variant comparison tool for VCFs"; homepage = "https://github.com/ACEnglish/truvari"; + changelog = "https://github.com/ACEnglish/truvari/releases/tag/${src.rev}"; license = licenses.mit; maintainers = with maintainers; [ natsukium scalavision ]; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/veryfasttree/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/veryfasttree/default.nix index e29b2da0fc..63597a75d4 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/veryfasttree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/veryfasttree/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "veryfasttree"; - version = "4.0.2"; + version = "4.0.3"; src = fetchFromGitHub { owner = "citiususc"; repo = "veryfasttree"; rev = "v${finalAttrs.version}"; - hash = "sha256-JMBhSxfGO3qz7Yl4s5r6zWHFefXGzu0ktEJdRUh/Uqg="; + hash = "sha256-Sp331VJRaYv/BTwFj3HwUcUsWjYf6YEXWjYdOzDhBBA="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/avogadro/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/avogadro/default.nix deleted file mode 100644 index 547123b679..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/avogadro/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkg-config, libGLU, libGL, libX11, doxygen }: - -stdenv.mkDerivation rec { - pname = "avogadro"; - version = "1.1.1"; - - src = fetchurl { - url = "mirror://sourceforge/avogadro/avogadro-${version}.tar.bz2"; - sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; - }; - - buildInputs = [ qt4 eigen zlib openbabel libGL libGLU libX11 ]; - - nativeBuildInputs = [ cmake pkg-config doxygen ]; - - env.NIX_CFLAGS_COMPILE = "-include ${libGLU.dev}/include/GL/glu.h"; - - patches = [ - (fetchurl { - url = "https://data.gpo.zugaina.org/fusion809/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch"; - sha256 = "1p113v19z3zwr9gxj2k599f8p97a8rwm93pa4amqvd0snn31mw0k"; - }) - ]; - - meta = with lib; { - description = "Molecule editor and visualizer"; - maintainers = with maintainers; [ danielbarter ]; - platforms = platforms.mesaPlatforms; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/cp2k/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/cp2k/default.nix index 5defaafa3c..052d791c0b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/cp2k/default.nix @@ -1,15 +1,57 @@ -{ lib, stdenv, fetchFromGitHub, python3, gfortran, blas, lapack -, fftw, libint, libvori, libxc, mpi, gsl, scalapack, openssh, makeWrapper -, libxsmm, spglib, which, pkg-config, plumed, zlib +{ lib +, stdenv +, fetchFromGitHub +, mpiCheckPhaseHook +, python3 +, gfortran +, blas +, lapack +, fftw +, libint +, libvori +, libxc +, mpi +, gsl +, scalapack +, openssh +, makeWrapper +, libxsmm +, spglib +, which +, pkg-config +, plumed +, zlib +, hdf5-fortran +, sirius +, libvdwxc +, spla +, spfft , enableElpa ? false , elpa -} : +, gpuBackend ? "none" +, cudaPackages +# gpuVersion needs to be set for both CUDA as well as ROCM hardware. +# gpuArch is only required for the ROCM stack. +# Change to a value suitable for your target GPU. +# For AMD values see https://github.com/cp2k/cp2k/blob/master/INSTALL.md#2v-rocmhip-support-for-amd-gpu +# and for Nvidia see https://github.com/cp2k/cp2k/blob/master/INSTALL.md#2i-cuda-optional-improved-performance-on-gpu-systems +, gpuVersion ? "Mi100" +, gpuArch ? "gfx908" +, rocm-core +, hip +, hipblas +, hipfft +, rocblas +}: + +assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; let cp2kVersion = "psmp"; arch = "Linux-x86-64-gfortran"; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "cp2k"; version = "2023.2"; @@ -36,7 +78,16 @@ in stdenv.mkDerivation rec { lapack plumed zlib - ] ++ lib.optional enableElpa elpa; + hdf5-fortran + sirius + spla + spfft + libvdwxc + ] + ++ lib.optional enableElpa elpa + ++ lib.optional (gpuBackend == "cuda") cudaPackages.cudatoolkit + ++ lib.optional (gpuBackend == "rocm") [hip rocm-core hipblas hipfft rocblas] + ; propagatedBuildInputs = [ mpi ]; propagatedUserEnvPkgs = [ mpi ]; @@ -46,7 +97,7 @@ in stdenv.mkDerivation rec { "VERSION=${cp2kVersion}" ]; - doCheck = true; + doCheck = gpuBackend == "none"; enableParallelBuilding = true; @@ -64,44 +115,70 @@ in stdenv.mkDerivation rec { FC = mpif90 LD = mpif90 AR = ar -r + ${lib.strings.optionalString (gpuBackend == "cuda") '' + OFFLOAD_CC = nvcc + OFFLOAD_FLAGS = -O3 -g -w --std=c++11 + OFFLOAD_TARGET = cuda + GPUVER = ${gpuVersion} + CXX = mpicxx + CXXFLAGS = -std=c++11 -fopenmp + ''} + ${lib.strings.optionalString (gpuBackend == "rocm") '' + GPUVER = ${gpuVersion} + OFFLOAD_CC = hipcc + OFFLOAD_FLAGS = -fopenmp -m64 -pthread -fPIC -D__GRID_HIP -O2 --offload-arch=${gpuArch} --rocm-path=${rocm-core} + OFFLOAD_TARGET = hip + CXX = mpicxx + CXXFLAGS = -std=c++11 -fopenmp -D__HIP_PLATFORM_AMD__ + ''} DFLAGS = -D__FFTW3 -D__LIBXC -D__LIBINT -D__parallel -D__SCALAPACK \ -D__MPI_VERSION=3 -D__F2008 -D__LIBXSMM -D__SPGLIB \ -D__MAX_CONTR=4 -D__LIBVORI ${lib.optionalString enableElpa "-D__ELPA"} \ - -D__PLUMED2 - CFLAGS = -fopenmp + -D__PLUMED2 -D__HDF5 -D__GSL -D__SIRIUS -D__LIBVDWXC -D__SPFFT -D__SPLA \ + ${lib.strings.optionalString (gpuBackend == "cuda") "-D__OFFLOAD_CUDA -D__DBCSR_ACC"} \ + ${lib.strings.optionalString (gpuBackend == "rocm") "-D__OFFLOAD_HIP -D__DBCSR_ACC -D__NO_OFFLOAD_PW"} + CFLAGS = -fopenmp -I${lib.getDev hdf5-fortran}/include -I${lib.getDev gsl}/include FCFLAGS = \$(DFLAGS) -O2 -ffree-form -ffree-line-length-none \ -ftree-vectorize -funroll-loops -msse2 \ -std=f2008 \ -fopenmp -ftree-vectorize -funroll-loops \ - -I${libxc}/include -I${libxsmm}/include \ - -I${libint}/include ${lib.optionalString enableElpa "$(pkg-config --variable=fcflags elpa)"} + -I${lib.getDev libint}/include ${lib.optionalString enableElpa "$(pkg-config --variable=fcflags elpa)"} \ + -I${lib.getDev sirius}/include/sirius \ + -I${lib.getDev libxc}/include -I${lib.getDev libxsmm}/include LIBS = -lfftw3 -lfftw3_threads \ -lscalapack -lblas -llapack \ -lxcf03 -lxc -lxsmmf -lxsmm -lsymspg \ -lint2 -lstdc++ -lvori \ -lgomp -lpthread -lm \ -fopenmp ${lib.optionalString enableElpa "$(pkg-config --libs elpa)"} \ - -lz -ldl -lstdc++ ${lib.optionalString (mpi.pname == "openmpi") "$(mpicxx --showme:link)"} \ - -lplumed + -lz -ldl ${lib.optionalString (mpi.pname == "openmpi") "$(mpicxx --showme:link)"} \ + -lplumed -lhdf5_fortran -lhdf5_hl -lhdf5 -lgsl -lsirius -lspla -lspfft -lvdwxc \ + ${lib.strings.optionalString (gpuBackend == "cuda") "-lcudart -lnvrtc -lcuda -lcublas"} \ + ${lib.strings.optionalString (gpuBackend == "rocm") "-lamdhip64 -lhipfft -lhipblas -lrocblas"} LDFLAGS = \$(FCFLAGS) \$(LIBS) include ${plumed}/lib/plumed/src/lib/Plumed.inc EOF ''; + nativeCheckInputs = [ + mpiCheckPhaseHook + openssh + ]; + checkPhase = '' - export OMP_NUM_THREADS=1 + runHook preCheck - export HYDRA_IFACE=lo # Fix to make mpich run in a sandbox - export OMPI_MCA_rmaps_base_oversubscribe=1 export CP2K_DATA_DIR=data - mpirun -np 2 exe/${arch}/libcp2k_unittest.${cp2kVersion} + + runHook postCheck ''; installPhase = '' mkdir -p $out/bin $out/share/cp2k cp exe/${arch}/* $out/bin + rm $out/bin/*_unittest.* for i in cp2k cp2k_shell graph; do wrapProgram $out/bin/$i.${cp2kVersion} \ diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/element/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/element/default.nix index f0865b503d..c18fc9a563 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/element/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/element/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-06RDZnie0Lv7i95AwnBGl6PPucuj8pIT6DHW3e3mu1o="; }; - vendorSha256 = "sha256-A4g2rQTaYrA4/0rqldUv7iuibzNINEvx9StUnaN2/Yg="; + vendorHash = "sha256-A4g2rQTaYrA4/0rqldUv7iuibzNINEvx9StUnaN2/Yg="; meta = with lib; { description = "The periodic table on the command line"; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/ergoscf/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/ergoscf/default.nix index a2ea5b9015..5343f102b2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/ergoscf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/ergoscf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergoscf"; - version = "3.8"; + version = "3.8.2"; src = fetchurl { url = "http://www.ergoscf.org/source/tarfiles/ergo-${version}.tar.gz"; - sha256 = "1s50k2gfs3y6r5kddifn4p0wmj0yk85wm5vf9v3swm1c0h43riix"; + sha256 = "sha256-U0NVREEZ8HI0Q0ZcbwvZsYA76PWMh7bqgDG1uaUc01c="; }; buildInputs = [ blas lapack ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix index e4ffb94eeb..f80085278e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "16.1.33"; + version = "16.1.41"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - hash = "sha256-vOFGmLsCQNYRBMuDRVrdjWE6/MxY7IucB1OpV4cdZrs="; + hash = "sha256-91vPipS5FTqCl7BUSu47aApIfq2e8dD1SW/LEGQWWio="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/mopac/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/mopac/default.nix index d2b2b558bb..c0cdc4eff4 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/mopac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/mopac/default.nix @@ -12,13 +12,13 @@ assert blas.isILP64 == lapack.isILP64; stdenv.mkDerivation rec { pname = "mopac"; - version = "22.0.6"; + version = "22.1.0"; src = fetchFromGitHub { owner = "openmopac"; repo = pname; rev = "v${version}"; - hash = "sha256-j4AP3tki+Ep9Pv+pDg8TwCiJvpF2j5npW3Kpat+7gGg="; + hash = "sha256-4jQ0WCHK07CXWUPj5Z1zSXObKxnitMj+FJQbLDiS2Dc="; }; nativeBuildInputs = [ gfortran cmake ]; 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 82daf5f85e..d5c97aa17f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/nwchem/default.nix @@ -3,6 +3,7 @@ , pkgs , fetchFromGitHub , fetchurl +, mpiCheckPhaseHook , which , openssh , gcc @@ -168,7 +169,6 @@ stdenv.mkDerivation rec { cp -r $NWCHEM_TOP/src/data $out/share/nwchem/ cp -r $NWCHEM_TOP/src/basis/libraries $out/share/nwchem/data cp -r $NWCHEM_TOP/src/nwpw/libraryps $out/share/nwchem/data - cp -r $NWCHEM_TOP/QA $out/share/nwchem wrapProgram $out/bin/nwchem \ --set-default NWCHEM_BASIS_LIBRARY $out/share/nwchem/data/libraries/ @@ -190,16 +190,15 @@ stdenv.mkDerivation rec { doCheck = false; doInstallCheck = true; + nativeCheckInputs = [ mpiCheckPhaseHook ]; installCheckPhase = '' - export OMP_NUM_THREADS=1 - - # Fix to make mpich run in a sandbox - export HYDRA_IFACE=lo - export OMPI_MCA_rmaps_base_oversubscribe=1 + runHook preInstallCheck # run a simple water test - mpirun -np 2 $out/bin/nwchem $out/share/nwchem/QA/tests/h2o/h2o.nw > h2o.out + mpirun -np 2 $out/bin/nwchem $NWCHEM_TOP/QA/tests/h2o/h2o.nw > h2o.out grep "Total SCF energy" h2o.out | grep 76.010538 + + runHook postInstallCheck ''; passthru = { inherit mpi; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix index 695d5502b5..f8ebf5251f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation { "-DTOOLS=ON" "-DHDF5=ON" "-DFDE=ON" - "-DEXTERNAL_LIBXC=${libxc}" + "-DEXTERNAL_LIBXC=${lib.getDev libxc}" "-DDMRG=ON" "-DNEVPT2=ON" "-DCMAKE_SKIP_BUILD_RPATH=ON" diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/wxmacmolplt/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/wxmacmolplt/default.nix index 4e8dbb6f07..13bcf2d1dc 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/wxmacmolplt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/wxmacmolplt/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { xorg.libX11.dev ]; + configureFlags = [ "LDFLAGS=-lGL" ]; + enableParallelBuilding = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/dataexplorer/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/dataexplorer/default.nix index 596978fc92..128a5f62ee 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/dataexplorer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/dataexplorer/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "dataexplorer"; - version = "3.7.9"; + version = "3.8.0"; src = fetchurl { url = "mirror://savannah/dataexplorer/dataexplorer-${version}-src.tar.gz"; - sha256 = "sha256-CdIWAde7mytXP9U1PfI9d/rFK7Agy5biIq5tMTW9RD4="; + sha256 = "sha256-ZluT/jCjcOrlh2nqe0j56shmtGqfm11BCnsp6mWDXkQ="; }; nativeBuildInputs = [ ant makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix index 338823bbf3..2235cf0b4a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/default.nix @@ -1,83 +1,98 @@ { lib -, stdenv -, python3 -, fetchPypi , fetchFromBitbucket -, fetchpatch -, substituteAll -, geos +, buildPythonApplication +, pyqt5 +, matplotlib +, numpy +, cycler +, python-dateutil +, kiwisolver +, six +, setuptools +, dill +, rtree +, pyopengl +, vispy +, ortools +, svg-path +, simplejson +, shapely +, freetype-py +, fonttools +, rasterio +, lxml +, ezdxf +, qrcode +, reportlab +, svglib +, gdal +, pyserial +, python3 }: -let - python = python3.override { - packageOverrides = self: super: { - shapely = super.shapely.overridePythonAttrs (old: rec { - version = "1.8.4"; - src = fetchPypi { - pname = "Shapely"; - inherit version; - hash = "sha256-oZXlHKr6IYKR8suqP+9p/TNTyT7EtlsqRyLEz0DDGYw="; - }; - # Environment variable used in shapely/_buildcfg.py - GEOS_LIBRARY_PATH = "${geos}/lib/libgeos_c${stdenv.hostPlatform.extensions.sharedLibrary}"; - patches = [ - # Patch to search form GOES .so/.dylib files in a Nix-aware way - (substituteAll { - src = ./shapely-library-paths.patch; - libgeos_c = GEOS_LIBRARY_PATH; - libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; - }) - ]; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +buildPythonApplication rec { pname = "flatcam"; - version = "8.5"; + version = "unstable-2022-02-02"; src = fetchFromBitbucket { owner = "jpcgt"; repo = pname; - rev = "533afd6a1772857cb633c011b5e0a15b60b1e92e"; # 8.5 with Red Hat packaging. - sha256 = "199kiiml18k34z1zhk2hbhibphmnv0kb11kxiajq52alps0mjb3m"; + rev = "ebf5cb9e3094362c4b0774a54cf119559c02211d"; # beta branch as of 2022-02-02 + hash = "sha256-QKkBPEM+HVYmSZ83b4JRmOmCMp7C3EUqbJKPqUXMiKE="; }; - propagatedBuildInputs = with python.pkgs; [ + format = "other"; + + dontBuild = true; + + propagatedBuildInputs = [ + pyqt5 matplotlib numpy - packaging - pyqt4 - rtree - scipy - setuptools - shapely - simplejson + cycler + python-dateutil + kiwisolver six + setuptools + dill + rtree + pyopengl + vispy + ortools svg-path + simplejson + shapely + freetype-py + fonttools + rasterio + lxml + ezdxf + qrcode + reportlab + svglib + gdal + pyserial ]; - packaging_fix_pull_request_patch = fetchpatch { - name = "packaging_fix_pull_request.patch"; - url = "https://bitbucket.org/trepetti/flatcam/commits/5591ed889d1f48a5190fe237b562cb932cb5876c/raw"; - sha256 = "19rhjdrf1n1q29cgpcry6pl2kl90zq0d613hhkwdir9bhq5bkknp"; - }; + preInstall = '' + patchShebangs . - patches = [ - packaging_fix_pull_request_patch - ./release.patch - ]; + sed -i "s|/usr/local/bin|$out/bin|" Makefile - postPatch = '' - substituteInPlace setup.py --replace "'shapely>=1.3'" "'shapely>=1.3'," + mkdir -p $out/share/{flatcam,applications} + mkdir -p $out/bin ''; - # Only non-GUI tests can be run deterministically in the Nix build environment. - checkPhase = '' - python -m unittest tests.test_excellon - python -m unittest tests.test_gerber_buffer - python -m unittest tests.test_paint - python -m unittest tests.test_pathconnect + installFlags = [ + "USER_ID=0" + "LOCAL_PATH=/build/source/." + "INSTALL_PATH=${placeholder "out"}/share/flatcam" + "APPS_PATH=${placeholder "out"}/share/applications" + ]; + + postInstall = '' + sed -i "s|python3|${python3.withPackages (_: propagatedBuildInputs)}/bin/python3|" $out/bin/flatcam-beta + mv $out/bin/flatcam{-beta,} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/release.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/release.patch deleted file mode 100644 index 945228e35b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/flatcam/release.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/FlatCAMVersion.py b/FlatCAMVersion.py -index ba9e04a5..2c64d5a6 100644 ---- a/FlatCAMVersion.py -+++ b/FlatCAMVersion.py -@@ -16,7 +16,7 @@ version = { - "number": 8.5, - "date": (2016, 7, 1), # Year, Month, Day - "name": None, -- "release": False, -+ "release": True, - } - - diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix index 14cfac4c1e..652a96617c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/gerbv/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "gerbv"; - version = "2.9.8"; + version = "2.10.0"; src = fetchFromGitHub { owner = "gerbv"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-6r9C5qDOXsQoLsYMSCuIS01gI0ijH7WDoepcowo1yQw="; + hash = "sha256-sr48RGLYcMKuyH9p+5BhnR6QpKBvNOqqtRryw3+pbBk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index 5ee77fce96..51e1011b8a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,75 +1,77 @@ { lib , stdenv +, boost +, cmake , fetchFromGitHub , fetchpatch -, cmake +, graphviz +, igraph +, llvmPackages , ninja , pkg-config , python3Packages -, boost -, rapidjson , qtbase , qtsvg -, igraph +, quazip +, rapidjson , spdlog -, wrapQtAppsHook -, graphviz -, llvmPackages -, z3 -, fmt_8 , suitesparse +, wrapQtAppsHook +, z3 }: let - igraph' = igraph.overrideAttrs (old: rec { + # hal doesn't work with igraph 0.10.x yet https://github.com/emsec/hal/pull/487 + igraph' = igraph.overrideAttrs (final: prev: { version = "0.9.10"; src = fetchFromGitHub { owner = "igraph"; - repo = "igraph"; - rev = version; + repo = final.pname; + rev = final.version; hash = "sha256-prDadHsNhDRkNp1i0niKIYxE0g85Zs0ngvUy6uK8evk="; }; - postPatch = old.postPatch + lib.optionalString stdenv.isAarch64 '' + patches = (prev.patches or []) ++ [ + # needed by clang + (fetchpatch { + name = "libxml2-2.11-compat.patch"; + url = "https://github.com/igraph/igraph/commit/5ad464be5ae2f6ebb69c97cb0140c800cc8d97d6.patch"; + hash = "sha256-adU5SctH+H54UaAmr5BZInytD3wjUzLtQbCwngAWs4o="; + }) + ]; + postPatch = prev.postPatch + lib.optionalString stdenv.isAarch64 '' # https://github.com/igraph/igraph/issues/1694 substituteInPlace tests/CMakeLists.txt \ --replace "igraph_scg_grouping3" "" \ --replace "igraph_scg_semiprojectors2" "" ''; - buildInputs = old.buildInputs ++ [ suitesparse ]; - cmakeFlags = old.cmakeFlags ++ [ "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" ]; + # general options brought back from the old 0.9.x package + buildInputs = prev.buildInputs ++ [ suitesparse ]; + cmakeFlags = prev.cmakeFlags ++ [ "-DIGRAPH_USE_INTERNAL_CXSPARSE=OFF" ]; }); - # no stable hal release yet with recent spdlog/fmt support, remove - # once 4.0.0 is released - see https://github.com/emsec/hal/issues/452 - spdlog' = spdlog.override { - fmt_9 = fmt_8.overrideAttrs (_: rec { - version = "8.0.1"; - src = fetchFromGitHub { - owner = "fmtlib"; - repo = "fmt"; - rev = version; - sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw"; - }; - }); - }; + in stdenv.mkDerivation rec { - version = "3.3.0"; + version = "4.2.0"; pname = "hal-hardware-analyzer"; src = fetchFromGitHub { owner = "emsec"; repo = "hal"; rev = "v${version}"; - sha256 = "sha256-uNpELHhSAVRJL/4iypvnl3nX45SqB419r37lthd2WmQ="; + sha256 = "sha256-Yl86AClE3vWygqj1omCOXX8koJK2SjTkMZFReRThez0="; }; patches = [ (fetchpatch { - # Fix build with python 3.10 - # https://github.com/emsec/hal/pull/463 - name = "hal-fix-python-3.10.patch"; - url = "https://github.com/emsec/hal/commit/f695f55cb2209676ef76366185b7c419417fbbc9.patch"; - sha256 = "sha256-HsCdG3tPllUsLw6kQtGaaEGkEHqZPSC2v9k6ycO2I/8="; - includes = [ "plugins/gui/src/python/python_context.cpp" ]; + name = "cmake-add-no-vendored-options.patch"; + # https://github.com/emsec/hal/pull/529 + url = "https://github.com/emsec/hal/commit/37d5c1a0eacb25de57cc552c13e74f559a5aa6e8.patch"; + hash = "sha256-a30VjDt4roJOTntisixqnH17wwCgWc4VWeh1+RgqFuY="; + }) + (fetchpatch { + name = "hal-fix-fmt-10.1-compat.patch"; + # https://github.com/emsec/hal/pull/530 + url = "https://github.com/emsec/hal/commit/b639a56b303141afbf6731b70b7cc7452551f024.patch"; + hash = "sha256-a7AyDEKkqdbiHpa4OHTRuP9Yewb3Nxs/j6bwez5m0yU="; }) ]; @@ -77,14 +79,30 @@ in stdenv.mkDerivation rec { # copies them in full to the output, bloating the package postPatch = '' shopt -s extglob - rm -rf deps/!(sanitizers-cmake)/* + rm -rf deps/!(abc|sanitizers-cmake|subprocess)/* shopt -u extglob ''; - nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ qtbase qtsvg boost rapidjson igraph' spdlog' graphviz wrapQtAppsHook z3 ] - ++ (with python3Packages; [ python pybind11 ]) - ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; + nativeBuildInputs = [ + cmake + ninja + pkg-config + wrapQtAppsHook + ]; + buildInputs = [ + qtbase + qtsvg + boost + rapidjson + igraph' + spdlog + graphviz + z3 + quazip + ] + ++ (with python3Packages; [ python pybind11 ]) + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp + ; cmakeFlags = with lib.versions; [ "-DHAL_VERSION_RETURN=${version}" @@ -96,13 +114,25 @@ in stdenv.mkDerivation rec { "-DHAL_VERSION_DIRTY=false" "-DHAL_VERSION_BROKEN=false" "-DENABLE_INSTALL_LDCONFIG=off" + "-DUSE_VENDORED_PYBIND11=off" + "-DUSE_VENDORED_SPDLOG=off" + "-DUSE_VENDORED_QUAZIP=off" + "-DUSE_VENDORED_IGRAPH=off" "-DBUILD_ALL_PLUGINS=on" ]; # needed for macos build - this is why we use wrapQtAppsHook instead of # the qt mkDerivation - the latter forcibly overrides this. cmakeBuildType = "MinSizeRel"; + # some plugins depend on other plugins and need to be able to load them + postFixup = lib.optionalString stdenv.isLinux '' + find $out/lib/hal_plugins -name '*.so*' | while read -r f ; do + patchelf --set-rpath "$(patchelf --print-rpath "$f"):$out/lib/hal_plugins" "$f" + done + ''; + meta = with lib; { + broken = stdenv.isDarwin; description = "A comprehensive reverse engineering and manipulation framework for gate-level netlists"; homepage = "https://github.com/emsec/hal"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix index fa9b770370..3403e410cf 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix @@ -104,7 +104,6 @@ stdenv.mkDerivation rec { "-DKICAD_BUILD_QA_TESTS=OFF" ] ++ optionals (debug) [ - "-DCMAKE_BUILD_TYPE=Debug" "-DKICAD_STDLIB_DEBUG=ON" "-DKICAD_USE_VALGRIND=ON" ] @@ -115,6 +114,8 @@ stdenv.mkDerivation rec { "-DKICAD_SANITIZE_THREADS=ON" ]; + cmakeBuildType = if debug then "Debug" else "Release"; + nativeBuildInputs = [ cmake doxygen diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index 9b98a8231e..a49c813036 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -229,18 +229,9 @@ stdenv.mkDerivation rec { The Programs handle Schematic Capture, and PCB Layout with Gerber output. ''; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ evils kiwi ]; - # kicad is cross platform + maintainers = with lib.maintainers; [ evils ]; platforms = lib.platforms.all; broken = stdenv.isDarwin; - - hydraPlatforms = if (with3d) then [ ] else platforms; - # We can't download the 3d models on Hydra, - # they are a ~1 GiB download and they occupy ~5 GiB in store. - # as long as the base and libraries (minus 3d) are build, - # this wrapper does not need to get built - # the kicad-*small "packages" cause this to happen - mainProgram = "kicad"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix index 9591cbc31c..327f77d1c4 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/libraries.nix @@ -2,6 +2,9 @@ , cmake , gettext , libSrc +, stepreduce +, parallel +, zip }: let mkLib = name: @@ -11,14 +14,20 @@ let src = libSrc name; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] + ++ lib.optionals (name == "packages3d") [ + stepreduce + parallel + zip + ]; + + postInstall = lib.optional (name == "packages3d") '' + find $out -type f -name '*.step' | parallel 'stepreduce {} {} && zip -9 {.}.stpZ {} && rm {}' + ''; meta = rec { license = lib.licenses.cc-by-sa-40; platforms = lib.platforms.all; - # the 3d models are a ~1 GiB download and occupy ~5 GiB in store. - # this would exceed the hydra output limit - hydraPlatforms = if (name == "packages3d") then [ ] else platforms; }; }; in diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix index bd824ac288..dfd679d4d5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,21 +1,22 @@ { stdenv, lib, fetchFromGitHub -, qtbase, qttools, cmake, wrapQtAppsHook +, qtbase, qttools, qtquickcontrols2, opencascade-occt, libGLU, libSM, freeimage, cmake, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "librepcb"; - version = "0.1.7"; + version = "1.0.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-zqvvc3CHqdRWVUFt4BkH5Vq50/FKNvMNW2NvGyfWwFM="; + sha256 = "sha256-2o2Gue/RnDWxe8jk/Ehx9CM+B3ac5rEQn0H7yodUEZ8="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; + nativeBuildInputs = [ cmake qttools wrapQtAppsHook qtquickcontrols2 opencascade-occt libGLU ]; buildInputs = [ qtbase ]; + propagatedBuildInputs = [ libSM freeimage ]; meta = with lib; { description = "A free EDA software to develop printed circuit boards"; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix index 15157b11f2..94e0741f79 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "nvc"; - version = "1.10.1"; + version = "1.10.3"; src = fetchFromGitHub { owner = "nickg"; repo = "nvc"; rev = "r${version}"; - hash = "sha256-7Kw9irZltNE8VRnIvVX786/u0QQtmRhV8pzpba0h1JY="; + hash = "sha256-0KLya2B+gs7aoOvkQdHuJuQtCHLUeSYATToBfIDhm/c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix index 715a99cf48..a750001d05 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/openboardview/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DGLAD_REPRODUCIBLE=On" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/0001-Disable-failing-regression-tests.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/0001-Disable-failing-regression-tests.patch new file mode 100644 index 0000000000..e370bc860b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/0001-Disable-failing-regression-tests.patch @@ -0,0 +1,83 @@ +From dc32aabd50d53aece41d968649b972ee667875bb Mon Sep 17 00:00:00 2001 +From: Tobias Mayer +Date: Sun, 27 Aug 2023 15:08:50 +0200 +Subject: [PATCH] Disable failing regression tests + +--- + src/drt/test/regression_tests.tcl | 6 +++--- + src/odb/test/regression_tests.tcl | 4 ++-- + src/par/test/regression_tests.tcl | 2 +- + src/pdn/test/regression_tests.tcl | 2 +- + src/rcx/test/regression_tests.tcl | 6 +++--- + 5 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/src/drt/test/regression_tests.tcl b/src/drt/test/regression_tests.tcl +index 11705562d..15546244a 100644 +--- a/src/drt/test/regression_tests.tcl ++++ b/src/drt/test/regression_tests.tcl +@@ -9,6 +9,6 @@ record_tests { + top_level_term + top_level_term2 + } +-record_pass_fail_tests { +- gc_test +-} ++#record_pass_fail_tests { ++# gc_test ++#} +diff --git a/src/odb/test/regression_tests.tcl b/src/odb/test/regression_tests.tcl +index b8e4f917a..7c6a0223a 100644 +--- a/src/odb/test/regression_tests.tcl ++++ b/src/odb/test/regression_tests.tcl +@@ -34,9 +34,9 @@ record_tests { + } + + record_pass_fail_tests { +- cpp_tests ++ #cpp_tests + dump_netlists + dump_netlists_withfill +- parser_unit_test ++ #parser_unit_test + } + +diff --git a/src/par/test/regression_tests.tcl b/src/par/test/regression_tests.tcl +index 9ff31fb12..63d5d0dae 100644 +--- a/src/par/test/regression_tests.tcl ++++ b/src/par/test/regression_tests.tcl +@@ -1,4 +1,4 @@ + record_tests { + read_part +- partition_gcd ++ #partition_gcd + } +diff --git a/src/pdn/test/regression_tests.tcl b/src/pdn/test/regression_tests.tcl +index 86c334f24..b695c490c 100644 +--- a/src/pdn/test/regression_tests.tcl ++++ b/src/pdn/test/regression_tests.tcl +@@ -10,7 +10,7 @@ record_tests { + max_width + min_spacing + widthtable +- design_width ++ #design_width + offgrid + + core_grid +diff --git a/src/rcx/test/regression_tests.tcl b/src/rcx/test/regression_tests.tcl +index 7070cc45f..72f348d96 100644 +--- a/src/rcx/test/regression_tests.tcl ++++ b/src/rcx/test/regression_tests.tcl +@@ -6,6 +6,6 @@ record_tests { + 45_gcd + names + } +-record_pass_fail_tests { +- rcx_unit_test +-} ++#record_pass_fail_tests { ++# rcx_unit_test ++#} +-- +2.41.0 + diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/0001-Fix-string-formatting-in-tests.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/0001-Fix-string-formatting-in-tests.patch deleted file mode 100644 index 0332ade17d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/0001-Fix-string-formatting-in-tests.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nicolas Benes -Date: Sun, 2 Apr 2023 01:24:51 +0200 -Subject: [PATCH] Fix string formatting in tests - -Hide the decimal point and digits after the decimal point when they are -not needed. - -diff --git a/src/par/test/partition_gcd.ok b/src/par/test/partition_gcd.ok -index 6c40c14..b9a42f6 100644 ---- a/src/par/test/partition_gcd.ok -+++ b/src/par/test/partition_gcd.ok -@@ -9,7 +9,7 @@ - ======================================== - [INFO] Partitioning parameters**** - [PARAM] Number of partitions = 2 --[PARAM] UBfactor = 1.0 -+[PARAM] UBfactor = 1 - [PARAM] Vertex dimensions = 1 - [PARAM] Hyperedge dimensions = 1 - ======================================== -@@ -118,7 +118,7 @@ After Hyperedge Reduction : num_vertices = 137, num_hyperedges = 251 - [V-Refine] Level 2 :: 207, 301, 154.65254 - [V-Refine] Level 3 :: 312, 370, 154.65254 - [V-Refine] Level 4 :: 469, 451, 154.65254 --[INFO] V-cycle refinement 1 delta cost 0.0 -+[INFO] V-cycle refinement 1 delta cost 0 - ========================================= - [STATUS] Running FC multilevel coarsening - ========================================= -@@ -133,7 +133,7 @@ After Hyperedge Reduction : num_vertices = 137, num_hyperedges = 251 - [V-Refine] Level 2 :: 207, 301, 154.65254 - [V-Refine] Level 3 :: 312, 370, 154.65254 - [V-Refine] Level 4 :: 469, 451, 154.65254 --[INFO] V-cycle refinement 2 delta cost 0.0 -+[INFO] V-cycle refinement 2 delta cost 0 - [Cutcost of partition : 154.65254] - [Vertex balance of block_0 : 0.59249 ( 327.17993 ) - [Vertex balance of block_1 : 0.40751 ( 225.03609 ) -diff --git a/src/pdn/test/design_width.ok b/src/pdn/test/design_width.ok -index 381dca1..a102974 100644 ---- a/src/pdn/test/design_width.ok -+++ b/src/pdn/test/design_width.ok -@@ -9,5 +9,5 @@ - [INFO ODB-0130] Created 54 pins. - [INFO ODB-0131] Created 406 components and 1816 component-terminals. - [INFO ODB-0133] Created 361 nets and 1004 connections. --[ERROR PDN-0185] Insufficient width (14.04 um) to add straps on layer M8 in grid "Core" with total strap width 6.0 um and offset 10.0 um. -+[ERROR PDN-0185] Insufficient width (14.04 um) to add straps on layer M8 in grid "Core" with total strap width 6 um and offset 10 um. - PDN-0185 --- -2.38.4 - diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/default.nix index 36f168a02b..16659892a6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchFromGitHub +, fetchpatch , bison , cmake , doxygen @@ -34,14 +35,14 @@ mkDerivation rec { pname = "openroad"; - version = "unstable-2023-03-31"; + version = "unstable-2023-08-26"; src = fetchFromGitHub { owner = "The-OpenROAD-Project"; repo = "OpenROAD"; - rev = "cd03c5cf8a8eb78c0e07fe33a56b8e9d64672efe"; + rev = "6dba515c2aacd3fca58ef8135424884146efd95b"; fetchSubmodules = true; - hash = "sha256-BWUvFCuWKWQpifErpak03J+A7ni0jZWIrCMhMdKIbD0="; + hash = "sha256-LAj7X+Vq0+H3tIo5zgyUuIjQwTj+2DLL18/KMJ/kf4A="; }; nativeBuildInputs = [ @@ -79,7 +80,16 @@ mkDerivation rec { ]; patches = [ - ./0001-Fix-string-formatting-in-tests.patch + # https://github.com/The-OpenROAD-Project/OpenROAD/pull/3911 + (fetchpatch { + name = "openroad-fix-fmt-10.patch"; + url = "https://github.com/The-OpenROAD-Project/OpenROAD/commit/9396f07f28e0260cd64acfc51909f6566b70e682.patch"; + hash = "sha256-jy8K8pdhSswVz6V6otk8JAI7nndaFVMuKQ/4A3Kzwns="; + }) + # Upstream is not aware of these failures + ./0001-Disable-failing-regression-tests.patch + # This is an issue we experience in the sandbox, and upstream + # probably wouldn't mind merging this change, but no PR was opened. ./0002-Ignore-warning-on-stderr.patch ]; @@ -89,20 +99,17 @@ mkDerivation rec { # Enable output images from the placer. cmakeFlags = [ + # Tries to download gtest 1.13 as part of the build. We currently rely on + # the regression tests so we can get by without building unit tests. + "-DENABLE_TESTS=OFF" "-DUSE_SYSTEM_BOOST=ON" "-DUSE_CIMG_LIB=ON" "-DOPENROAD_VERSION=${src.rev}" - - # 2023-03-31: see discussion on fmt workaround in - # https://github.com/The-OpenROAD-Project/OpenROAD/pull/2696 - "-DCMAKE_CXX_FLAGS=-DFMT_DEPRECATED_OSTREAM" ]; # Resynthesis needs access to the Yosys binaries. qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ yosys ]}" ]; - checkInputs = [ gtest ]; - # Upstream uses vendored package versions for some dependencies, so regression testing is prudent # to see if there are any breaking changes in unstable that should be vendored as well. doCheck = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/qfsm/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/qfsm/default.nix deleted file mode 100644 index e22138997b..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/qfsm/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, stdenv, fetchurl, qt4, cmake, graphviz, pkg-config }: - -stdenv.mkDerivation rec { - pname = "qfsm"; - version = "0.54.0"; - - src = fetchurl { - url = "mirror://sourceforge/qfsm/qfsm-${version}-Source.tar.bz2"; - sha256 = "0rl7bc5cr29ng67yij4akciyid9z7npal812ys4c3m229vjvflrb"; - }; - - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ qt4 graphviz ]; - - patches = [ - ./drop-hardcoded-prefix.patch - ./gcc6-fixes.patch - ]; - - hardeningDisable = [ "format" ]; - - meta = { - description = "Graphical editor for finite state machines"; - homepage = "https://qfsm.sourceforge.net/"; - license = lib.licenses.gpl3Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch deleted file mode 100644 index 965d67ac55..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/qfsm/drop-hardcoded-prefix.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -ubrw qfsm-0.53.0-Source-orig/CMakeLists.txt qfsm-0.53.0-Source-new/CMakeLists.txt ---- qfsm-0.53.0-Source-orig/CMakeLists.txt 2012-11-11 20:13:01.935856229 +0100 -+++ qfsm-0.53.0-Source-new/CMakeLists.txt 2012-11-11 20:13:24.962930007 +0100 -@@ -406,10 +406,6 @@ - - - IF(UNIX AND NOT WIN32) -- SET(CMAKE_INSTALL_PREFIX "/usr") --ENDIF(UNIX AND NOT WIN32) -- --IF(UNIX AND NOT WIN32) - ADD_DEFINITIONS(-DQFSM_LANGUAGE_DIR="${CMAKE_INSTALL_PREFIX}/share/qfsm/") - ADD_DEFINITIONS(-DQFSM_HELP_DIR="${CMAKE_INSTALL_PREFIX}/share/doc/qfsm/") - ELSE(UNIX AND NOT WIN32) -@@ -472,5 +468,3 @@ - ) - - ENDIF(UNIX AND NOT WIN32) -- -- diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch deleted file mode 100644 index 5cedc64763..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- qfsm-0.54.0-Source-orig/src/FileIO.cpp 2015-01-02 19:01:46.000000000 +0100 -+++ qfsm-0.54.0-Source/src/FileIO.cpp 2017-09-11 19:53:30.579488402 +0200 -@@ -1617,7 +1617,7 @@ - QString ext; - - if (!imp) -- return FALSE; -+ return NULL; - - Project* p=NULL; - importdlg->setAcceptMode(QFileDialog::AcceptOpen); -@@ -1641,7 +1641,7 @@ - ifstream fin(act_importfile); - - if (!fin) -- return FALSE; -+ return NULL; - - emit setWaitCursor(); - diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/qucs-s/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/qucs-s/default.nix index 9da94aa609..0ce67ec4db 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/qucs-s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/qucs-s/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "qucs-s"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "ra3xdh"; repo = "qucs_s"; rev = version; - sha256 = "sha256-cQ9UNCTwRW61dOQYJX0mPNtCTk0qXKx8VQ6BIXl6Fa8="; + sha256 = "sha256-9/1sgxFqn9d9zlwrzjQosFO3m+2lC83qVcCtzfqY5XY="; }; nativeBuildInputs = [ flex bison wrapQtAppsHook cmake ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://ra3xdh.github.io/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ mazurel ]; + maintainers = with maintainers; [ mazurel kashw2 ]; platforms = with platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/qucs/cmakelists.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/qucs/cmakelists.patch deleted file mode 100644 index 27066f09c8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/qucs/cmakelists.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git i/qucs-core/CMakeLists.txt w/qucs-core/CMakeLists.txt -index 2dbbd41..d174b50 100644 ---- i/qucs-core/CMakeLists.txt -+++ w/qucs-core/CMakeLists.txt -@@ -158,26 +158,9 @@ ENDIF() - - # - # Need Bison --# --# This is a HACK to get arround a PATH issue with Qt Creator on OSX. --# It seams impossible to pass a custom PATH to Qt Creator on OSX, ie, cannot prepend `/usr/local/bin/` for intance. --# The FIND_PACKAGE fails. For now we provide a fallback with a custom FIND_PROGRAM. The variable BISON_DIR is also available. --IF(WIN32) -- FIND_PACKAGE(BISON 2.4 REQUIRED) -- IF(BISON_FOUND) -- #MESSAGE(STATUS "Found bison: ${BISON_EXECUTABLE} / Version: ${BISON_VERSION}" ) -- ENDIF() --ELSE() # Linux, OSX -- # use -DBISON_DIR=/path/ to provide the path to bison -- FIND_PROGRAM( BISON_EXECUTABLE bison -- PATHS /usr/local/bin/ /opt/local/bin/ /usr/bin ${BISON_DIR} -- DOC "bison path" -- NO_DEFAULT_PATH ) -- IF(BISON_EXECUTABLE ) -- MESSAGE(STATUS "Found bison: " ${BISON_EXECUTABLE}) -- ELSE() -- MESSAGE(FATAL_ERROR "Unable to find bison. Try to provide -DBISON_DIR=[path]") -- ENDIF() -+FIND_PACKAGE(BISON 2.4 REQUIRED) -+IF(BISON_FOUND) -+ #MESSAGE(STATUS "Found bison: ${BISON_EXECUTABLE} / Version: ${BISON_VERSION}" ) - ENDIF() - - # diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/qucs/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/qucs/default.nix deleted file mode 100644 index eeb10b3a5a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/qucs/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{lib, stdenv, fetchFromGitHub, flex, bison, qt4, libX11, cmake, gperf, adms }: - -stdenv.mkDerivation rec { - version = "0.0.19"; - pname = "qucs"; - - src = fetchFromGitHub { - owner = "Qucs"; - repo = "qucs"; - rev = "qucs-${version}"; - sha256 = "106h3kjyg7c0hkmzkin7h8fcl32n60835121b2qqih8ixi6r5id6"; - }; - - QTDIR=qt4; - - patches = [ - ./cmakelists.patch - ]; - - nativeBuildInputs = [ cmake flex bison ]; - buildInputs = [ qt4 libX11 gperf adms ]; - - meta = { - description = "Integrated circuit simulator"; - homepage = "https://qucs.sourceforge.net"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [viric]; - platforms = with lib.platforms; linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix index 4709065e45..aee1d25a04 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/xyce/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { srcs = [ xyce_src regression_src ]; - sourceRoot = "./${xyce_src.name}"; + sourceRoot = xyce_src.name; preConfigure = "./bootstrap"; diff --git a/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix b/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix index c00ab9c340..728cbe6229 100644 --- a/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }: stdenv.mkDerivation rec { pname = "gama"; - version = "2.24"; + version = "2.25"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-AIRqBSO71c26TeQwxjfAGIy8YQddF4tq+ZnWztroyRM="; + sha256 = "sha256-1j4fsPQEaftqmrdk6ZPWKSl7ywA/UPN8bdddGVlPxDQ="; }; buildInputs = [ expat ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/abc/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/abc/default.nix index 1062582d82..1d4a11bfb3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/abc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/abc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "abc-verifier"; - version = "unstable-2023-06-28"; + version = "unstable-2023-09-13"; src = fetchFromGitHub { owner = "yosyshq"; repo = "abc"; - rev = "bb64142b07794ee685494564471e67365a093710"; - hash = "sha256-Qkk61Lh84ervtehWskSB9GKh+JPB7mI1IuG32OSZMdg="; + rev = "daad9ede0137dc58487a0abc126253e671a85b14"; + hash = "sha256-5XeFYvdqT08xduFUDC5yK1jEOV1fYzyQD7N9ZmG3mpQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix index ce084c1f4a..eb7637f7f2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,47 +1,35 @@ -{ fetchFromGitHub, fetchpatch, lib, which, ocamlPackages }: +{ fetchurl, fetchpatch, lib, ocamlPackages }: let pname = "alt-ergo"; - version = "2.4.3"; + version = "2.5.1"; - configureScript = "ocaml unix.cma configure.ml"; - - src = fetchFromGitHub { - owner = "OCamlPro"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-2XARGr8rLiPMOM0rBBoRv5tZvKYtkLkJctGqLYkMe7Q="; + src = fetchurl { + url = "https://github.com/OCamlPro/alt-ergo/releases/download/v${version}/alt-ergo-${version}.tbz"; + hash = "sha256-nPjWmg5FepObhquioYxhVPq6UdOHtCo2Hs5V0yndYB0="; }; in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; - inherit version src configureScript; - configureFlags = [ pname ]; - nativeBuildInputs = [ which ]; - buildInputs = with ocamlPackages; [ dune-configurator ]; - propagatedBuildInputs = with ocamlPackages; [ dune-build-info num ocplib-simplex seq stdlib-shims zarith ]; - preBuild = '' - substituteInPlace src/lib/util/version.ml --replace 'version="dev"' 'version="${version}"' - ''; + inherit version src; + buildInputs = with ocamlPackages; [ ppx_blob ]; + propagatedBuildInputs = with ocamlPackages; [ camlzip dolmen_loop dune-build-info fmt ocplib-simplex seq stdlib-shims zarith ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; - inherit version src configureScript; - configureFlags = [ pname ]; - nativeBuildInputs = [ which ocamlPackages.menhir ]; - propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); + inherit version src; + nativeBuildInputs = [ ocamlPackages.menhir ]; + propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ psmt2-frontend ]); }; in ocamlPackages.buildDunePackage { - inherit pname version src configureScript; + inherit pname version src; - configureFlags = [ pname ]; - - nativeBuildInputs = [ which ocamlPackages.menhir ]; - buildInputs = [ alt-ergo-parsers ocamlPackages.cmdliner ]; + nativeBuildInputs = [ ocamlPackages.menhir ]; + buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ cmdliner dune-site ]); meta = { description = "High-performance theorem prover and SMT solver"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/beluga/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/beluga/default.nix index 3cb06c4e7b..693be7f338 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/beluga/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/beluga/default.nix @@ -2,13 +2,13 @@ ocamlPackages.buildDunePackage rec { pname = "beluga"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "Beluga-lang"; repo = "Beluga"; rev = "refs/tags/v${version}"; - hash = "sha256-0E7rmiLmQPfOAQ1qKiqxeLdqviVl+Thkl6KfOWkGZRc="; + hash = "sha256-l/C77czLtlLnpadVx4d9ve9jv/e11jsOgzrbXt+Zo5s="; }; duneVersion = "3"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix index 228027d187..6a878735bb 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cbmc/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cbmc"; - version = "5.89.0"; + version = "5.91.0"; src = fetchFromGitHub { owner = "diffblue"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-pgZdR1X0aOCfCKAGo2h9bAIO2XTTiWL8ERgandOQj/M="; + sha256 = "sha256-7DzhGEDS9T6WIjGoxOw9Gf/q+tYNFJDPbQUBV3tbn/I="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix index eaaa6a9a59..fe8180899c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/coq/default.nix @@ -55,6 +55,7 @@ let "8.16.1".sha256 = "sha256-n7830+zfZeyYHEOGdUo57bH6bb2/SZs8zv8xJhV+iAc="; "8.17.0".sha256 = "sha256-TGwm7S6+vkeZ8cidvp8pkiAd9tk008jvvPvYgfEOXhM="; "8.17.1".sha256 = "sha256-x+RwkbxMg9aR0L3WSCtpIz8jwA5cJA4tXAtHMZb20y4="; + "8.18.0".sha256 = "sha256-WhiBs4nzPHQ0R24xAdM49kmxSCPOxiOVMA1iiMYunz4="; }; releaseRev = v: "V${v}"; fetched = import ../../../../build-support/coq/meta-fetch/default.nix @@ -73,7 +74,7 @@ let ''; ocamlPackages = if customOCamlPackages != null then customOCamlPackages else with versions; switch coq-version [ - { case = range "8.16" "8.17"; out = ocamlPackages_4_14; } + { case = range "8.16" "8.18"; out = ocamlPackages_4_14; } { case = range "8.14" "8.15"; out = ocamlPackages_4_12; } { case = range "8.11" "8.13"; out = ocamlPackages_4_10; } { case = range "8.7" "8.10"; out = ocamlPackages_4_09; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix index 1d40257314..0645fd2952 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cryptominisat/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cryptominisat"; - version = "5.11.11"; + version = "5.11.14"; src = fetchFromGitHub { owner = "msoos"; repo = "cryptominisat"; rev = version; - hash = "sha256-TYuOgOOs1EsdNz7ctZMsArTlw3QzHjiPZVozuniiPcI="; + hash = "sha256-p/sVinjEh078PGtJ6JBRA8EmrJVcchBs9L3bRZvCHuo="; }; buildInputs = [ python3 boost ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix index e9f04d2044..1513c74779 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cvc4/default.nix @@ -35,9 +35,8 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs ./src/ ''; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Production" - ]; + + cmakeBuildType = "Production"; meta = with lib; { description = "A high-performance theorem prover and SMT solver"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cvc5/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cvc5/default.nix index 5357e1df54..7c483ec185 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cvc5/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cvc5/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cvc5"; - version = "1.0.6"; + version = "1.0.8"; src = fetchFromGitHub { owner = "cvc5"; repo = "cvc5"; rev = "cvc5-${version}"; - hash = "sha256-pZiXAO92cwnYtaVMDFBEmk+NzDf4eKdc0eY0RltofPA="; + hash = "sha256-2sJKHD7Wzznut4hKOyxgc4LR4H+4u3m8Gq02+v+m5lM="; }; nativeBuildInputs = [ pkg-config cmake flex ]; @@ -21,8 +21,9 @@ stdenv.mkDerivation rec { patchShebangs ./src/ ''; + cmakeBuildType = "Production"; + cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Production" "-DBUILD_SHARED_LIBS=1" "-DANTLR3_JAR=${antlr3_4}/lib/antlr/antlr-3.4-complete.jar" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/dafny/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/dafny/default.nix index 2b30d3aeeb..7da1958af3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/dafny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/dafny/default.nix @@ -8,28 +8,36 @@ buildDotnetModule rec { pname = "Dafny"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitHub { owner = "dafny-lang"; repo = "dafny"; rev = "v${version}"; - sha256 = "sha256-RSGaOgGf3m94t3SKnvSPqz0VHhWr6NmIMtGsmOynMaM="; + hash = "sha256-bnKaaqh1/921SRwnwqgYb31SJ8vguEBtzywPTz79S6I="; }; - postPatch = '' - cp ${writeScript "fake-gradlew-for-dafny" '' - mkdir -p build/libs/ - javac $(find -name "*.java" | grep "^./src/main") -d classes - jar cf build/libs/DafnyRuntime-${version}.jar -C classes dafny - ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew + postPatch = + # This version number seems to be hardcoded and didn't get updated with the + # version bump from 4.2.0 to 4.3.0. + let dafnyRuntimeJarVersion = "4.2.0"; + in '' + cp ${ + writeScript "fake-gradlew-for-dafny" '' + mkdir -p build/libs/ + javac $(find -name "*.java" | grep "^./src/main") -d classes + jar cf build/libs/DafnyRuntime-${dafnyRuntimeJarVersion}.jar -C classes dafny + ''} Source/DafnyRuntime/DafnyRuntimeJava/gradlew - # Needed to fix - # "error NETSDK1129: The 'Publish' target is not supported without specifying a target framework. The current project targets multiple frameworks, you must specify the framework for the published application." - substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \ - --replace TargetFrameworks TargetFramework \ - --replace "netstandard2.0;net452" net6.0 - ''; + # Needed to fix + # "error NETSDK1129: The 'Publish' target is not supported without + # specifying a target framework. The current project targets multiple + # frameworks, you must specify the framework for the published + # application." + substituteInPlace Source/DafnyRuntime/DafnyRuntime.csproj \ + --replace TargetFrameworks TargetFramework \ + --replace "netstandard2.0;net452" net6.0 + ''; buildInputs = [ jdk11 ]; nugetDeps = ./deps.nix; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/drat-trim/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/drat-trim/default.nix index c58a29dc28..78d810e19b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/drat-trim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/drat-trim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation { - pname = "drat-trim-unstable"; - version = "2020-06-05"; + pname = "drat-trim"; + version = "2023-05-22"; src = fetchFromGitHub { owner = "marijnheule"; repo = "drat-trim"; - rev = "9afad0f7156a1e9c6ce19dce5d72cf1cb9a3ef27"; - sha256 = "1zq585igfaknwqbvv2cji744016zxadbvr0ifr5l6yq13m0vvn3b"; + rev = "refs/tags/v05.22.2023"; + hash = "sha256-sV3A0f1TLSaTIdAtT6y8rU3ZS2UqEePJYSf3UySOlSA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/easycrypt/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/easycrypt/default.nix index abd2b0cb27..32243455ae 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/easycrypt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/easycrypt/default.nix @@ -1,25 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, ocamlPackages, why3 }: +{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3 }: stdenv.mkDerivation rec { pname = "easycrypt"; - version = "2022.04"; + version = "2023.09"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "r${version}"; - sha256 = "sha256:09rdwcj70lkamkhd895p284rfpz4bcnsf55mcimhiqncd2a21ml7"; + hash = "sha256-9xavU9jRisZekPqC87EyiLXtZCGu/9QeGzq6BJGt1+Y="; }; - patches = lib.lists.map fetchpatch [ - # Fix build with Why3 1.5 - { url = "https://github.com/EasyCrypt/easycrypt/commit/d226387432deb7f22738e1d5579346a2cbc9be7a.patch"; - hash = "sha256:1zvxij35fnr3h9b5wdl8ml17aqfx3a39rd4mgwmdvkapbg3pa4lm"; } - # Fix build with Why3 1.6 - { url = "https://github.com/EasyCrypt/easycrypt/commit/876f2ed50a0434afdf2fb20e7c50b8a3e26bb06e.patch"; - hash = "sha256-UycfLZWYHNsppb7qHSRaAF4Y0UnwoFueEG0wUcBUPYE="; } - ]; - nativeBuildInputs = with ocamlPackages; [ dune_3 findlib diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/egglog/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/egglog/default.nix index c74594df28..eedd90315d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/egglog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/egglog/default.nix @@ -5,13 +5,13 @@ rustPlatform.buildRustPackage { pname = "egglog"; - version = "unstable-2023-08-19"; + version = "unstable-2023-09-12"; src = fetchFromGitHub { owner = "egraphs-good"; repo = "egglog"; - rev = "a4768b1751b72292b0e79e6e442d54ab270748fb"; - hash = "sha256-WTdMhtdPvBtS6WAS3S4dui/8ospJ7nkeRhLce2zY8KE="; + rev = "4d67f262a6f27aa5cfb62a2cfc7df968959105df"; + hash = "sha256-1mc7dW2pgaK4D7ZmlSHohb+6lcr7M9SRLUV/Dod8Rv0="; }; cargoLock = { diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.nix index 187cbc9a92..4a5124b235 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/ekrhyper/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ ocaml perl ]; - setSourceRoot = "export sourceRoot=$(echo */ekrh/src/)"; + setSourceRoot = "export sourceRoot=$(echo */ekrh/src)"; preInstall = "export INSTALLDIR=$out"; postInstall = ''for i in "$out/casc"/*; do ln -s "$i" "$out/bin/ekrh-casc-$(basename $i)"; done ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix index d08a342a28..b0df275085 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/elan/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "2.0.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "sha256-gnE0uISKfUqUdmrHI6F7nLOFcsQALjRy584nMRrC68w="; + sha256 = "sha256-VrCEwAoWKhb1qfJUv3OreTzuKEVQADwZpEQIVEhjwHA="; }; - cargoHash = "sha256-rjxJ4bGep5OJUWME+EV5CqEsFY1SuoU07ANL0cbD+DU="; + cargoHash = "sha256-SMKFSu5C5mc3U266hEa6RB3GH5te3jIrUZAzj3YNa2E="; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -61,7 +61,9 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Small tool to manage your installations of the Lean theorem prover"; homepage = "https://github.com/leanprover/elan"; + changelog = "https://github.com/leanprover/elan/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gebner ]; + mainProgram = "elan"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/kissat/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/kissat/default.nix index 48d986cd5f..5f982508c8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/kissat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/kissat/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "kissat"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "arminbiere"; repo = "kissat"; rev = "rel-${version}"; - sha256 = "sha256-C1lvkyYgFNhV7jGVLlrpJ5zZ8SFHg8g+iW1lDczhpBM="; + sha256 = "sha256-AFUVkkD+toOfVEvIKfz3ncEdABLRxs9yQ8aJx6Q0ETM="; }; outputs = [ "out" "dev" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/klee/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/klee/default.nix index 401b2f48a6..68f68355f8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/klee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/klee/default.nix @@ -72,10 +72,11 @@ in stdenv.mkDerivation rec { (lit.override { python = kleePython; }) ]; + cmakeBuildType = if debug then "Debug" else if !debug && includeDebugInfo then "RelWithDebInfo" else "MinSizeRel"; + cmakeFlags = let onOff = val: if val then "ON" else "OFF"; in [ - "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else if !debug && includeDebugInfo then "RelWithDebInfo" else "MinSizeRel"}" "-DKLEE_RUNTIME_BUILD_TYPE=${if debugRuntime then "Debug" else "Release"}" "-DLLVMCC=${clang}/bin/clang" "-DLLVMCXX=${clang}/bin/clang++" diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix new file mode 100644 index 0000000000..12465ad908 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, cmake +, fetchFromGitHub +, git +, gmp +, perl +}: + +stdenv.mkDerivation rec { + pname = "lean4"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "leanprover"; + repo = "lean4"; + rev = "v${version}"; + hash = "sha256-6qbCafG0bL5KxQt2gL6hV4PFDsEMM0UXfldeOOqxsaE="; + }; + + postPatch = '' + substituteInPlace src/CMakeLists.txt \ + --replace 'set(GIT_SHA1 "")' 'set(GIT_SHA1 "${src.rev}")' + + # Remove tests that fails in sandbox. + # It expects `sourceRoot` to be a git repository. + rm -rf src/lake/examples/git/ + ''; + + preConfigure = '' + patchShebangs stage0/src/bin/ src/bin/ + ''; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + gmp + ]; + + nativeCheckInputs = [ + git + perl + ]; + + cmakeFlags = [ + "-DUSE_GITHASH=OFF" + ]; + + meta = with lib; { + description = "Automatic and interactive theorem prover"; + homepage = "https://leanprover.github.io/"; + changelog = "https://github.com/leanprover/lean4/blob/${src.rev}/RELEASES.md"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ marsam ]; + mainProgram = "lean"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/default.nix new file mode 100644 index 0000000000..8458d63f03 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, runCommandLocal +, netlistsvg +, yosys +}: + +buildNpmPackage rec { + pname = "netlistsvg"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "nturley"; + repo = "netlistsvg"; + rev = "refs/tags/v${version}"; + hash = "sha256-H37zhjfv7c/TV+pAk70eDiE6ZQ9JjZq1TFvac6OOKBk="; + }; + + postPatch = '' + cp ${./package-lock.json} ./package-lock.json + ''; + + npmDepsHash = "sha256-nKxskNW8YFDloA9Nxs/Rfjew8nX+l9xKB8/8313KoYo="; + + dontNpmBuild = true; + + doCheck = true; + + checkPhase = '' + runHook preCheck + + node --trace-warnings test/test-all.js + + runHook postCheck + ''; + + # An integration test: Synthesize a circuit from hdl and generate a diagram + passthru.tests.netlistsvg-yosys-integration-test = runCommandLocal "netlistsvg-yosys-integration-test" { + nativeBuildInputs = [ netlistsvg yosys ]; + } '' + yosys -p "prep -top helloworld -flatten; aigmap; write_json circuit.json" ${./test.v} + netlistsvg circuit.json -o circuit.svg + test -s circuit.svg + touch $out + ''; + + meta = { + description = "Draw SVG digital circuits schematics from yosys JSON netlists"; + homepage = "https://github.com/nturley/netlistsvg"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pbsds ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/package-lock.json b/third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/package-lock.json new file mode 100644 index 0000000000..cbf3309f6d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/package-lock.json @@ -0,0 +1,9761 @@ +{ + "name": "netlistsvg", + "version": "1.0.2", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "netlistsvg", + "version": "1.0.2", + "license": "MIT", + "dependencies": { + "@types/clone": "^0.1.30", + "@types/json5": "0.0.30", + "@types/lodash": "^4.14.116", + "ajv": "^6.10.0", + "ajv-errors": "^1.0.1", + "clone": "^2.1.0", + "elkjs": "^0.3.0", + "fs-extra": "^1.0.0", + "json5": "^0.5.1", + "lodash": "^4.17.11", + "onml": "^0.3.1", + "yargs": "^6.5.0" + }, + "bin": { + "netlistsvg": "bin/netlistsvg.js", + "netlistsvg-dumplayout": "bin/exportLayout.js" + }, + "devDependencies": { + "@types/jest": "^24.0.11", + "@types/node": "^11.13.0", + "brfs": "^2.0.2", + "browserify": "^16.2.3", + "browserify-shim": "^3.8.14", + "eslint": "^5.15.3", + "jest": "^24.5.0", + "superagent": "^3.8.2", + "ts-jest": "^24.0.0", + "tslint": "^5.14.0", + "typescript": "^3.3.4000" + } + }, + "node_modules/@ampproject/remapping": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", + "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", + "dev": true, + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.0", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@babel/code-frame": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.5.tgz", + "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==", + "dev": true, + "dependencies": { + "@babel/highlight": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/compat-data": { + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz", + "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/core": { + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.9.tgz", + "integrity": "sha512-G2EgeufBcYw27U4hhoIwFcgc1XU7TlXJ3mv04oOv1WCuo900U/anZSPzEqNjwdjgffkk2Gs0AN0dW1CKVLcG7w==", + "dev": true, + "dependencies": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.22.5", + "@babel/generator": "^7.22.9", + "@babel/helper-compilation-targets": "^7.22.9", + "@babel/helper-module-transforms": "^7.22.9", + "@babel/helpers": "^7.22.6", + "@babel/parser": "^7.22.7", + "@babel/template": "^7.22.5", + "@babel/traverse": "^7.22.8", + "@babel/types": "^7.22.5", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.2", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" + } + }, + "node_modules/@babel/core/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true + }, + "node_modules/@babel/core/node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@babel/core/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/generator": { + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.9.tgz", + "integrity": "sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.22.5", + "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", + "jsesc": "^2.5.1" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-compilation-targets": { + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.9.tgz", + "integrity": "sha512-7qYrNM6HjpnPHJbopxmb8hSPoZ0gsX8IvUS32JGVoy+pU9e5N0nLr1VjJoR6kA4d9dmGLxNYOjeB8sUDal2WMw==", + "dev": true, + "dependencies": { + "@babel/compat-data": "^7.22.9", + "@babel/helper-validator-option": "^7.22.5", + "browserslist": "^4.21.9", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-compilation-targets/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/@babel/helper-environment-visitor": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", + "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-function-name": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", + "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", + "dev": true, + "dependencies": { + "@babel/template": "^7.22.5", + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-hoist-variables": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", + "dev": true, + "dependencies": { + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-imports": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", + "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", + "dev": true, + "dependencies": { + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-module-transforms": { + "version": "7.22.9", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz", + "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==", + "dev": true, + "dependencies": { + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-simple-access": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/helper-validator-identifier": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/@babel/helper-plugin-utils": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", + "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-simple-access": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", + "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", + "dev": true, + "dependencies": { + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-split-export-declaration": { + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", + "dev": true, + "dependencies": { + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-string-parser": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", + "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", + "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helper-validator-option": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", + "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/helpers": { + "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.6.tgz", + "integrity": "sha512-YjDs6y/fVOYFV8hAf1rxd1QvR9wJe1pDBZ2AREKq/SDayfPzgk0PBnVuTCE5X1acEpMMNOVUqoe+OwiZGJ+OaA==", + "dev": true, + "dependencies": { + "@babel/template": "^7.22.5", + "@babel/traverse": "^7.22.6", + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/highlight": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.5.tgz", + "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==", + "dev": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.22.5", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/parser": { + "version": "7.22.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.7.tgz", + "integrity": "sha512-7NF8pOkHP5o2vpmGgNGcfAeCvOYhGLyA3Z4eBQkT1RJlWu47n63bCs93QfJ2hIAFCil7L5P2IWhs1oToVgrL0Q==", + "dev": true, + "bin": { + "parser": "bin/babel-parser.js" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "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, + "dependencies": { + "@babel/helper-plugin-utils": "^7.8.0" + }, + "peerDependencies": { + "@babel/core": "^7.0.0-0" + } + }, + "node_modules/@babel/template": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", + "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.5", + "@babel/parser": "^7.22.5", + "@babel/types": "^7.22.5" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/traverse": { + "version": "7.22.8", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.8.tgz", + "integrity": "sha512-y6LPR+wpM2I3qJrsheCTwhIinzkETbplIgPBbwvqPKc+uljeA5gP+3nP8irdYt1mjQaDnlIcG+dw8OjAco4GXw==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.22.5", + "@babel/generator": "^7.22.7", + "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-function-name": "^7.22.5", + "@babel/helper-hoist-variables": "^7.22.5", + "@babel/helper-split-export-declaration": "^7.22.6", + "@babel/parser": "^7.22.7", + "@babel/types": "^7.22.5", + "debug": "^4.1.0", + "globals": "^11.1.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@babel/types": { + "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.5.tgz", + "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==", + "dev": true, + "dependencies": { + "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.5", + "to-fast-properties": "^2.0.0" + }, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@cnakazawa/watch": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz", + "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==", + "dev": true, + "dependencies": { + "exec-sh": "^0.3.2", + "minimist": "^1.2.0" + }, + "bin": { + "watch": "cli.js" + }, + "engines": { + "node": ">=0.1.95" + } + }, + "node_modules/@jest/console": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-24.9.0.tgz", + "integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==", + "dev": true, + "dependencies": { + "@jest/source-map": "^24.9.0", + "chalk": "^2.0.1", + "slash": "^2.0.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@jest/core": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.9.0.tgz", + "integrity": "sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==", + "dev": true, + "dependencies": { + "@jest/console": "^24.7.1", + "@jest/reporters": "^24.9.0", + "@jest/test-result": "^24.9.0", + "@jest/transform": "^24.9.0", + "@jest/types": "^24.9.0", + "ansi-escapes": "^3.0.0", + "chalk": "^2.0.1", + "exit": "^0.1.2", + "graceful-fs": "^4.1.15", + "jest-changed-files": "^24.9.0", + "jest-config": "^24.9.0", + "jest-haste-map": "^24.9.0", + "jest-message-util": "^24.9.0", + "jest-regex-util": "^24.3.0", + "jest-resolve": "^24.9.0", + "jest-resolve-dependencies": "^24.9.0", + "jest-runner": "^24.9.0", + "jest-runtime": "^24.9.0", + "jest-snapshot": "^24.9.0", + "jest-util": "^24.9.0", + "jest-validate": "^24.9.0", + "jest-watcher": "^24.9.0", + "micromatch": "^3.1.10", + "p-each-series": "^1.0.0", + "realpath-native": "^1.1.0", + "rimraf": "^2.5.4", + "slash": "^2.0.0", + "strip-ansi": "^5.0.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@jest/core/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@jest/environment": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.9.0.tgz", + "integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==", + "dev": true, + "dependencies": { + "@jest/fake-timers": "^24.9.0", + "@jest/transform": "^24.9.0", + "@jest/types": "^24.9.0", + "jest-mock": "^24.9.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@jest/fake-timers": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-24.9.0.tgz", + "integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==", + "dev": true, + "dependencies": { + "@jest/types": "^24.9.0", + "jest-message-util": "^24.9.0", + "jest-mock": "^24.9.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@jest/reporters": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.9.0.tgz", + "integrity": "sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==", + "dev": true, + "dependencies": { + "@jest/environment": "^24.9.0", + "@jest/test-result": "^24.9.0", + "@jest/transform": "^24.9.0", + "@jest/types": "^24.9.0", + "chalk": "^2.0.1", + "exit": "^0.1.2", + "glob": "^7.1.2", + "istanbul-lib-coverage": "^2.0.2", + "istanbul-lib-instrument": "^3.0.1", + "istanbul-lib-report": "^2.0.4", + "istanbul-lib-source-maps": "^3.0.1", + "istanbul-reports": "^2.2.6", + "jest-haste-map": "^24.9.0", + "jest-resolve": "^24.9.0", + "jest-runtime": "^24.9.0", + "jest-util": "^24.9.0", + "jest-worker": "^24.6.0", + "node-notifier": "^5.4.2", + "slash": "^2.0.0", + "source-map": "^0.6.0", + "string-length": "^2.0.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@jest/reporters/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@jest/source-map": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.9.0.tgz", + "integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==", + "dev": true, + "dependencies": { + "callsites": "^3.0.0", + "graceful-fs": "^4.1.15", + "source-map": "^0.6.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@jest/source-map/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@jest/test-result": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-24.9.0.tgz", + "integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==", + "dev": true, + "dependencies": { + "@jest/console": "^24.9.0", + "@jest/types": "^24.9.0", + "@types/istanbul-lib-coverage": "^2.0.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@jest/test-sequencer": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-24.9.0.tgz", + "integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==", + "dev": true, + "dependencies": { + "@jest/test-result": "^24.9.0", + "jest-haste-map": "^24.9.0", + "jest-runner": "^24.9.0", + "jest-runtime": "^24.9.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@jest/transform": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-24.9.0.tgz", + "integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==", + "dev": true, + "dependencies": { + "@babel/core": "^7.1.0", + "@jest/types": "^24.9.0", + "babel-plugin-istanbul": "^5.1.0", + "chalk": "^2.0.1", + "convert-source-map": "^1.4.0", + "fast-json-stable-stringify": "^2.0.0", + "graceful-fs": "^4.1.15", + "jest-haste-map": "^24.9.0", + "jest-regex-util": "^24.9.0", + "jest-util": "^24.9.0", + "micromatch": "^3.1.10", + "pirates": "^4.0.1", + "realpath-native": "^1.1.0", + "slash": "^2.0.0", + "source-map": "^0.6.1", + "write-file-atomic": "2.4.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@jest/transform/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true + }, + "node_modules/@jest/transform/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@jest/types": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz", + "integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==", + "dev": true, + "dependencies": { + "@types/istanbul-lib-coverage": "^2.0.0", + "@types/istanbul-reports": "^1.1.1", + "@types/yargs": "^13.0.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/@jridgewell/gen-mapping": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", + "dev": true, + "dependencies": { + "@jridgewell/set-array": "^1.0.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.9" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/resolve-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", + "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/set-array": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", + "dev": true, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.15", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "dev": true + }, + "node_modules/@jridgewell/trace-mapping": { + "version": "0.3.18", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", + "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", + "dev": true, + "dependencies": { + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" + } + }, + "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": { + "version": "1.4.14", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", + "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", + "dev": true + }, + "node_modules/@types/babel__core": { + "version": "7.20.1", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.1.tgz", + "integrity": "sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.20.7", + "@babel/types": "^7.20.7", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "node_modules/@types/babel__generator": { + "version": "7.6.4", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz", + "integrity": "sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==", + "dev": true, + "dependencies": { + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__template": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz", + "integrity": "sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==", + "dev": true, + "dependencies": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "node_modules/@types/babel__traverse": { + "version": "7.20.1", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.1.tgz", + "integrity": "sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==", + "dev": true, + "dependencies": { + "@babel/types": "^7.20.7" + } + }, + "node_modules/@types/clone": { + "version": "0.1.30", + "resolved": "https://registry.npmjs.org/@types/clone/-/clone-0.1.30.tgz", + "integrity": "sha512-vcxBr+ybljeSiasmdke1cQ9ICxoEwaBgM1OQ/P5h4MPj/kRyLcDl5L8PrftlbyV1kBbJIs3M3x1A1+rcWd4mEA==" + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", + "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==", + "dev": true + }, + "node_modules/@types/istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", + "dev": true, + "dependencies": { + "@types/istanbul-lib-coverage": "*" + } + }, + "node_modules/@types/istanbul-reports": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz", + "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==", + "dev": true, + "dependencies": { + "@types/istanbul-lib-coverage": "*", + "@types/istanbul-lib-report": "*" + } + }, + "node_modules/@types/jest": { + "version": "24.9.1", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.9.1.tgz", + "integrity": "sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q==", + "dev": true, + "dependencies": { + "jest-diff": "^24.3.0" + } + }, + "node_modules/@types/json5": { + "version": "0.0.30", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.30.tgz", + "integrity": "sha512-sqm9g7mHlPY/43fcSNrCYfOeX9zkTTK+euO5E6+CVijSMm5tTjkVdwdqRkY3ljjIAf8679vps5jKUoJBCLsMDA==" + }, + "node_modules/@types/lodash": { + "version": "4.14.196", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.196.tgz", + "integrity": "sha512-22y3o88f4a94mKljsZcanlNWPzO0uBsBdzLAngf2tp533LzZcQzb6+eZPJ+vCTt+bqF2XnvT9gejTLsAcJAJyQ==" + }, + "node_modules/@types/node": { + "version": "11.15.54", + "resolved": "https://registry.npmjs.org/@types/node/-/node-11.15.54.tgz", + "integrity": "sha512-1RWYiq+5UfozGsU6MwJyFX6BtktcT10XRjvcAQmskCtMcW3tPske88lM/nHv7BQG1w9KBXI1zPGuu5PnNCX14g==", + "dev": true + }, + "node_modules/@types/stack-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz", + "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==", + "dev": true + }, + "node_modules/@types/yargs": { + "version": "13.0.12", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.12.tgz", + "integrity": "sha512-qCxJE1qgz2y0hA4pIxjBR+PelCH0U5CK1XJXFwCNqfmliatKp47UCXXE9Dyk1OXBDLvsCF57TqQEJaeLfDYEOQ==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@types/yargs-parser": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", + "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", + "dev": true + }, + "node_modules/abab": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", + "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", + "dev": true + }, + "node_modules/accessory": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/accessory/-/accessory-1.1.0.tgz", + "integrity": "sha512-DlgiZ+jTuCIZLURquQhOfclRvPu6gQKgOzr9wAiZtjWYjd1lMK8Hr6XXEDWuEAxpTWEccgn6YVREJ6C7fhvrww==", + "dev": true, + "dependencies": { + "ap": "~0.2.0", + "balanced-match": "~0.2.0", + "dot-parts": "~1.0.0" + } + }, + "node_modules/acorn": { + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz", + "integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-globals": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz", + "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==", + "dev": true, + "dependencies": { + "acorn": "^6.0.1", + "acorn-walk": "^6.0.1" + } + }, + "node_modules/acorn-globals/node_modules/acorn-walk": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz", + "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==", + "dev": true, + "engines": { + "node": ">=0.4.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, + "peerDependencies": { + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/acorn-node": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/acorn-node/-/acorn-node-1.8.2.tgz", + "integrity": "sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==", + "dev": true, + "dependencies": { + "acorn": "^7.0.0", + "acorn-walk": "^7.0.0", + "xtend": "^4.0.2" + } + }, + "node_modules/acorn-node/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, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "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/ajv-errors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", + "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", + "peerDependencies": { + "ajv": ">=5.0.0" + } + }, + "node_modules/amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.4.2" + } + }, + "node_modules/ansi-escapes": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/ansi-regex": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "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, + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "dependencies": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + } + }, + "node_modules/ap": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/ap/-/ap-0.2.0.tgz", + "integrity": "sha512-ImdvquIuBSVpWRWhB441UjvTcZqic1RL+lTQaUKGdGEp1aiTvt/phAvY8Vvs32qya5FJBI8U+tzNBYzFDQY/lQ==", + "dev": true + }, + "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, + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", + "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "is-array-buffer": "^3.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", + "integrity": "sha512-H3LU5RLiSsGXPhN+Nipar0iR0IofH+8r89G2y1tBKxQ/agagKyAjhkAFDRBfodP2caPrNKHpAWNIM/c9yeL7uA==", + "dev": true + }, + "node_modules/array-from": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", + "integrity": "sha512-GQTc6Uupx1FCavi5mPzBvVT7nEOeWMmUA9P95wpfpW1XwMSKs+KaymD5C2Up7KAUKg/mYwbsUYzdZWcoajlNZg==", + "dev": true + }, + "node_modules/array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/array.prototype.reduce": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz", + "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4", + "es-array-method-boxes-properly": "^1.0.0", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz", + "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "get-intrinsic": "^1.2.1", + "is-array-buffer": "^3.0.2", + "is-shared-array-buffer": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "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==", + "dev": true, + "dependencies": { + "safer-buffer": "~2.1.0" + } + }, + "node_modules/asn1.js": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", + "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==", + "dev": true, + "dependencies": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/asn1.js/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "node_modules/assert": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", + "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", + "dev": true, + "dependencies": { + "object-assign": "^4.1.1", + "util": "0.10.3" + } + }, + "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, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/assert/node_modules/inherits": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==", + "dev": true + }, + "node_modules/assert/node_modules/util": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==", + "dev": true, + "dependencies": { + "inherits": "2.0.1" + } + }, + "node_modules/assign-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/astral-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", + "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", + "dev": true + }, + "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/atob": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", + "dev": true, + "bin": { + "atob": "bin/atob.js" + }, + "engines": { + "node": ">= 4.5.0" + } + }, + "node_modules/available-typed-arrays": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", + "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/aws4": { + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", + "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==", + "dev": true + }, + "node_modules/babel-jest": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-24.9.0.tgz", + "integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==", + "dev": true, + "dependencies": { + "@jest/transform": "^24.9.0", + "@jest/types": "^24.9.0", + "@types/babel__core": "^7.1.0", + "babel-plugin-istanbul": "^5.1.0", + "babel-preset-jest": "^24.9.0", + "chalk": "^2.4.2", + "slash": "^2.0.0" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/babel-plugin-istanbul": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-5.2.0.tgz", + "integrity": "sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.0.0", + "find-up": "^3.0.0", + "istanbul-lib-instrument": "^3.3.0", + "test-exclude": "^5.2.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/babel-plugin-jest-hoist": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.9.0.tgz", + "integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==", + "dev": true, + "dependencies": { + "@types/babel__traverse": "^7.0.6" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/babel-preset-jest": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz", + "integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==", + "dev": true, + "dependencies": { + "@babel/plugin-syntax-object-rest-spread": "^7.0.0", + "babel-plugin-jest-hoist": "^24.9.0" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "@babel/core": "^7.0.0" + } + }, + "node_modules/balanced-match": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz", + "integrity": "sha512-euSOvfze1jPOf85KQOmZ2UcWDJ/dUJukTJdj4o9ZZLyjl7IjdIyE4fAQRSuGrxAjB9nvvvrl4N3bPtRq+W+SyQ==", + "dev": true + }, + "node_modules/base": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", + "dev": true, + "dependencies": { + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/base/node_modules/define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==", + "dev": true, + "dependencies": { + "is-descriptor": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "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==", + "dev": true, + "dependencies": { + "tweetnacl": "^0.14.3" + } + }, + "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==", + "dev": true, + "optional": true, + "dependencies": { + "file-uri-to-path": "1.0.0" + } + }, + "node_modules/bn.js": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz", + "integrity": "sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==", + "dev": true + }, + "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, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/brace-expansion/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==", + "dev": true + }, + "node_modules/braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "dependencies": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/braces/node_modules/extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", + "dev": true, + "dependencies": { + "is-extendable": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/braces/node_modules/is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/brfs": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/brfs/-/brfs-2.0.2.tgz", + "integrity": "sha512-IrFjVtwu4eTJZyu8w/V2gxU7iLTtcHih67sgEdzrhjLBMHp2uYefUBfdM4k2UvcuWMgV7PQDZHSLeNWnLFKWVQ==", + "dev": true, + "dependencies": { + "quote-stream": "^1.0.1", + "resolve": "^1.1.5", + "static-module": "^3.0.2", + "through2": "^2.0.0" + }, + "bin": { + "brfs": "bin/cmd.js" + } + }, + "node_modules/brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==", + "dev": true + }, + "node_modules/browser-pack": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz", + "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==", + "dev": true, + "dependencies": { + "combine-source-map": "~0.8.0", + "defined": "^1.0.0", + "JSONStream": "^1.0.3", + "safe-buffer": "^5.1.1", + "through2": "^2.0.0", + "umd": "^3.0.0" + }, + "bin": { + "browser-pack": "bin/cmd.js" + } + }, + "node_modules/browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", + "dev": true + }, + "node_modules/browser-resolve": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz", + "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==", + "dev": true, + "dependencies": { + "resolve": "^1.17.0" + } + }, + "node_modules/browserify": { + "version": "16.5.2", + "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.5.2.tgz", + "integrity": "sha512-TkOR1cQGdmXU9zW4YukWzWVSJwrxmNdADFbqbE3HFgQWe5wqZmOawqZ7J/8MPCwk/W8yY7Y0h+7mOtcZxLP23g==", + "dev": true, + "dependencies": { + "assert": "^1.4.0", + "browser-pack": "^6.0.1", + "browser-resolve": "^2.0.0", + "browserify-zlib": "~0.2.0", + "buffer": "~5.2.1", + "cached-path-relative": "^1.0.0", + "concat-stream": "^1.6.0", + "console-browserify": "^1.1.0", + "constants-browserify": "~1.0.0", + "crypto-browserify": "^3.0.0", + "defined": "^1.0.0", + "deps-sort": "^2.0.0", + "domain-browser": "^1.2.0", + "duplexer2": "~0.1.2", + "events": "^2.0.0", + "glob": "^7.1.0", + "has": "^1.0.0", + "htmlescape": "^1.1.0", + "https-browserify": "^1.0.0", + "inherits": "~2.0.1", + "insert-module-globals": "^7.0.0", + "JSONStream": "^1.0.3", + "labeled-stream-splicer": "^2.0.0", + "mkdirp-classic": "^0.5.2", + "module-deps": "^6.2.3", + "os-browserify": "~0.3.0", + "parents": "^1.0.1", + "path-browserify": "~0.0.0", + "process": "~0.11.0", + "punycode": "^1.3.2", + "querystring-es3": "~0.2.0", + "read-only-stream": "^2.0.0", + "readable-stream": "^2.0.2", + "resolve": "^1.1.4", + "shasum": "^1.0.0", + "shell-quote": "^1.6.1", + "stream-browserify": "^2.0.0", + "stream-http": "^3.0.0", + "string_decoder": "^1.1.1", + "subarg": "^1.0.0", + "syntax-error": "^1.1.1", + "through2": "^2.0.0", + "timers-browserify": "^1.0.1", + "tty-browserify": "0.0.1", + "url": "~0.11.0", + "util": "~0.10.1", + "vm-browserify": "^1.0.0", + "xtend": "^4.0.0" + }, + "bin": { + "browserify": "bin/cmd.js" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/browserify-aes": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", + "dev": true, + "dependencies": { + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/browserify-cipher": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", + "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", + "dev": true, + "dependencies": { + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" + } + }, + "node_modules/browserify-des": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", + "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", + "dev": true, + "dependencies": { + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "node_modules/browserify-rsa": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz", + "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==", + "dev": true, + "dependencies": { + "bn.js": "^5.0.0", + "randombytes": "^2.0.1" + } + }, + "node_modules/browserify-shim": { + "version": "3.8.16", + "resolved": "https://registry.npmjs.org/browserify-shim/-/browserify-shim-3.8.16.tgz", + "integrity": "sha512-+Ap0xOKUC5Hz8sdUROxCJHgzA5IeU7pgUquCdlbBxyxkexzU4kpU6u1TsIvnFJcdx1bxO902J08AEjbMqDbA3g==", + "dev": true, + "dependencies": { + "exposify": "~0.5.0", + "mothership": "~0.3.0", + "rename-function-calls": "~0.1.0", + "resolve": "~0.6.1", + "through": "~2.3.4" + }, + "peerDependencies": { + "browserify": ">= 2.3" + } + }, + "node_modules/browserify-shim/node_modules/resolve": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz", + "integrity": "sha512-UHBY3viPlJKf85YijDUcikKX6tmF4SokIDp518ZDVT92JNDcG5uKIthaT/owt3Sar0lwtOafsQuwrg22/v2Dwg==", + "dev": true + }, + "node_modules/browserify-sign": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", + "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "dev": true, + "dependencies": { + "bn.js": "^5.1.1", + "browserify-rsa": "^4.0.1", + "create-hash": "^1.2.0", + "create-hmac": "^1.1.7", + "elliptic": "^6.5.3", + "inherits": "^2.0.4", + "parse-asn1": "^5.1.5", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + } + }, + "node_modules/browserify-sign/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/browserify-zlib": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", + "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", + "dev": true, + "dependencies": { + "pako": "~1.0.5" + } + }, + "node_modules/browserslist": { + "version": "4.21.10", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", + "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "caniuse-lite": "^1.0.30001517", + "electron-to-chromium": "^1.4.477", + "node-releases": "^2.0.13", + "update-browserslist-db": "^1.0.11" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, + "node_modules/bs-logger": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz", + "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==", + "dev": true, + "dependencies": { + "fast-json-stable-stringify": "2.x" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/bser": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "dev": true, + "dependencies": { + "node-int64": "^0.4.0" + } + }, + "node_modules/buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz", + "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==", + "dev": true, + "dependencies": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" + } + }, + "node_modules/buffer-equal": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz", + "integrity": "sha512-RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "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==", + "dev": true + }, + "node_modules/buffer-xor": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==", + "dev": true + }, + "node_modules/builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/builtin-status-codes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", + "integrity": "sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==", + "dev": true + }, + "node_modules/cache-base": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "dev": true, + "dependencies": { + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/cached-path-relative": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/cached-path-relative/-/cached-path-relative-1.1.0.tgz", + "integrity": "sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==", + "dev": true + }, + "node_modules/call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "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, + "engines": { + "node": ">=6" + } + }, + "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": ">=6" + } + }, + "node_modules/caniuse-lite": { + "version": "1.0.30001519", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", + "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ] + }, + "node_modules/capture-exit": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz", + "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==", + "dev": true, + "dependencies": { + "rsvp": "^4.8.4" + }, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==", + "dev": true + }, + "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, + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "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/ci-info": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "dev": true + }, + "node_modules/cipher-base": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", + "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/class-utils": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "dev": true, + "dependencies": { + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/class-utils/node_modules/define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", + "dev": true, + "dependencies": { + "is-descriptor": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/class-utils/node_modules/is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==", + "dev": true, + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "dev": true, + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/class-utils/node_modules/is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==", + "dev": true, + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "dev": true, + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/class-utils/node_modules/is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "dependencies": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/class-utils/node_modules/kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==", + "dev": true, + "dependencies": { + "restore-cursor": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/cli-width": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz", + "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==", + "dev": true + }, + "node_modules/cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==", + "dependencies": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" + } + }, + "node_modules/cliui/node_modules/ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/cliui/node_modules/is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", + "dependencies": { + "number-is-nan": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/cliui/node_modules/string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", + "dependencies": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/cliui/node_modules/strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", + "dependencies": { + "ansi-regex": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", + "dev": true, + "engines": { + "iojs": ">= 1.0.0", + "node": ">= 0.12.0" + } + }, + "node_modules/code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/collection-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", + "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==", + "dev": true, + "dependencies": { + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "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, + "dependencies": { + "color-name": "1.1.3" + } + }, + "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 + }, + "node_modules/combine-source-map": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.8.0.tgz", + "integrity": "sha512-UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg==", + "dev": true, + "dependencies": { + "convert-source-map": "~1.1.0", + "inline-source-map": "~0.6.0", + "lodash.memoize": "~3.0.3", + "source-map": "~0.5.3" + } + }, + "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, + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + }, + "node_modules/component-emitter": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "dev": true + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "node_modules/concat-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "dev": true, + "engines": [ + "node >= 0.8" + ], + "dependencies": { + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + } + }, + "node_modules/console-browserify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", + "dev": true + }, + "node_modules/constants-browserify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", + "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==", + "dev": true + }, + "node_modules/convert-source-map": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz", + "integrity": "sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==", + "dev": true + }, + "node_modules/cookiejar": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz", + "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==", + "dev": true + }, + "node_modules/copy-descriptor": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", + "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "dev": true + }, + "node_modules/create-ecdh": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz", + "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==", + "dev": true, + "dependencies": { + "bn.js": "^4.1.0", + "elliptic": "^6.5.3" + } + }, + "node_modules/create-ecdh/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "node_modules/create-hash": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", + "dev": true, + "dependencies": { + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" + } + }, + "node_modules/create-hmac": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", + "dev": true, + "dependencies": { + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } + }, + "node_modules/cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "dependencies": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + }, + "engines": { + "node": ">=4.8" + } + }, + "node_modules/crypto-browserify": { + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", + "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", + "dev": true, + "dependencies": { + "browserify-cipher": "^1.0.0", + "browserify-sign": "^4.0.0", + "create-ecdh": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.0", + "diffie-hellman": "^5.0.0", + "inherits": "^2.0.1", + "pbkdf2": "^3.0.3", + "public-encrypt": "^4.0.0", + "randombytes": "^2.0.0", + "randomfill": "^1.0.3" + }, + "engines": { + "node": "*" + } + }, + "node_modules/cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", + "dev": true + }, + "node_modules/cssstyle": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz", + "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==", + "dev": true, + "dependencies": { + "cssom": "0.3.x" + } + }, + "node_modules/d": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz", + "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==", + "dev": true, + "dependencies": { + "es5-ext": "^0.10.50", + "type": "^1.0.1" + } + }, + "node_modules/dash-ast": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-2.0.1.tgz", + "integrity": "sha512-5TXltWJGc+RdnabUGzhRae1TRq6m4gr+3K2wQX0is5/F2yS6MJXJvLyI3ErAnsAXuJoGqvfVD5icRgim07DrxQ==", + "dev": true + }, + "node_modules/dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", + "dev": true, + "dependencies": { + "assert-plus": "^1.0.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/data-urls": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz", + "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==", + "dev": true, + "dependencies": { + "abab": "^2.0.0", + "whatwg-mimetype": "^2.2.0", + "whatwg-url": "^7.0.0" + } + }, + "node_modules/data-urls/node_modules/whatwg-url": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", + "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", + "dev": true, + "dependencies": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" + } + }, + "node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "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==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/decode-uri-component": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", + "dev": true, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/deep-is": { + "version": "0.1.4", + "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 + }, + "node_modules/define-properties": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", + "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", + "dev": true, + "dependencies": { + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "dev": true, + "dependencies": { + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/defined": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.1.tgz", + "integrity": "sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "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, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/deps-sort": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.1.tgz", + "integrity": "sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==", + "dev": true, + "dependencies": { + "JSONStream": "^1.0.3", + "shasum-object": "^1.0.0", + "subarg": "^1.0.0", + "through2": "^2.0.0" + }, + "bin": { + "deps-sort": "bin/cmd.js" + } + }, + "node_modules/des.js": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz", + "integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" + } + }, + "node_modules/detect-newline": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz", + "integrity": "sha512-CwffZFvlJffUg9zZA0uqrjQayUTC8ob94pnr5sFwaVv3IOmkfUHcWH+jXaQK3askE51Cqe8/9Ql/0uXNwqZ8Zg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/detective": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/detective/-/detective-5.2.1.tgz", + "integrity": "sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==", + "dev": true, + "dependencies": { + "acorn-node": "^1.8.2", + "defined": "^1.0.0", + "minimist": "^1.2.6" + }, + "bin": { + "detective": "bin/detective.js" + }, + "engines": { + "node": ">=0.8.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, + "engines": { + "node": ">=0.3.1" + } + }, + "node_modules/diff-sequences": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", + "integrity": "sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/diffie-hellman": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", + "dev": true, + "dependencies": { + "bn.js": "^4.1.0", + "miller-rabin": "^4.0.0", + "randombytes": "^2.0.0" + } + }, + "node_modules/diffie-hellman/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "node_modules/doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/domain-browser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", + "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", + "dev": true, + "engines": { + "node": ">=0.4", + "npm": ">=1.2" + } + }, + "node_modules/domexception": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz", + "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==", + "dev": true, + "dependencies": { + "webidl-conversions": "^4.0.2" + } + }, + "node_modules/dot-parts": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dot-parts/-/dot-parts-1.0.1.tgz", + "integrity": "sha512-DcAuaZ2hguFLkxrAwOlvYNFb4IE6xg1Ldzqpma4/UeiT0utd8/E17z1h9mH8s+9Hwh7SeLn83LpIykh/oBBxSw==", + "dev": true + }, + "node_modules/duplexer2": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", + "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==", + "dev": true, + "dependencies": { + "readable-stream": "^2.0.2" + } + }, + "node_modules/ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", + "dev": true, + "dependencies": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "node_modules/electron-to-chromium": { + "version": "1.4.485", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.485.tgz", + "integrity": "sha512-1ndQ5IBNEnFirPwvyud69GHL+31FkE09gH/CJ6m3KCbkx3i0EVOrjwz4UNxRmN9H8OVHbC6vMRZGN1yCvjSs9w==", + "dev": true + }, + "node_modules/elkjs": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/elkjs/-/elkjs-0.3.0.tgz", + "integrity": "sha512-bcO8RCIssdly316ou76QLsiuu1NCLbhhZwK/iuOdKTyQzKdCeX7sdIJOUdSsjlIDB203TN4NBpTiq4ugmLjR+Q==" + }, + "node_modules/elliptic": { + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", + "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==", + "dev": true, + "dependencies": { + "bn.js": "^4.11.9", + "brorand": "^1.1.0", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.1", + "inherits": "^2.0.4", + "minimalistic-assert": "^1.0.1", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "node_modules/elliptic/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "node_modules/emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", + "dev": true + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, + "dependencies": { + "once": "^1.4.0" + } + }, + "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==", + "dependencies": { + "is-arrayish": "^0.2.1" + } + }, + "node_modules/es-abstract": { + "version": "1.22.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz", + "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "arraybuffer.prototype.slice": "^1.0.1", + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "es-set-tostringtag": "^2.0.1", + "es-to-primitive": "^1.2.1", + "function.prototype.name": "^1.1.5", + "get-intrinsic": "^1.2.1", + "get-symbol-description": "^1.0.0", + "globalthis": "^1.0.3", + "gopd": "^1.0.1", + "has": "^1.0.3", + "has-property-descriptors": "^1.0.0", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "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.10", + "is-weakref": "^1.0.2", + "object-inspect": "^1.12.3", + "object-keys": "^1.1.1", + "object.assign": "^4.1.4", + "regexp.prototype.flags": "^1.5.0", + "safe-array-concat": "^1.0.0", + "safe-regex-test": "^1.0.0", + "string.prototype.trim": "^1.2.7", + "string.prototype.trimend": "^1.0.6", + "string.prototype.trimstart": "^1.0.6", + "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.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es-array-method-boxes-properly": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", + "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", + "dev": true + }, + "node_modules/es-set-tostringtag": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", + "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3", + "has": "^1.0.3", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "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, + "dependencies": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/es5-ext": { + "version": "0.10.62", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz", + "integrity": "sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "es6-iterator": "^2.0.3", + "es6-symbol": "^3.1.3", + "next-tick": "^1.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/es6-iterator": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", + "integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==", + "dev": true, + "dependencies": { + "d": "1", + "es5-ext": "^0.10.35", + "es6-symbol": "^3.1.1" + } + }, + "node_modules/es6-map": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", + "integrity": "sha512-mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A==", + "dev": true, + "dependencies": { + "d": "1", + "es5-ext": "~0.10.14", + "es6-iterator": "~2.0.1", + "es6-set": "~0.1.5", + "es6-symbol": "~3.1.1", + "event-emitter": "~0.3.5" + } + }, + "node_modules/es6-set": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz", + "integrity": "sha512-TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==", + "dev": true, + "dependencies": { + "d": "^1.0.1", + "es5-ext": "^0.10.62", + "es6-iterator": "~2.0.3", + "es6-symbol": "^3.1.3", + "event-emitter": "^0.3.5", + "type": "^2.7.2" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/es6-set/node_modules/type": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", + "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==", + "dev": true + }, + "node_modules/es6-symbol": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz", + "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==", + "dev": true, + "dependencies": { + "d": "^1.0.1", + "ext": "^1.1.2" + } + }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "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, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/escodegen": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "dev": true, + "dependencies": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=4.0" + }, + "optionalDependencies": { + "source-map": "~0.6.1" + } + }, + "node_modules/escodegen/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/eslint": { + "version": "5.16.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz", + "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "ajv": "^6.9.1", + "chalk": "^2.1.0", + "cross-spawn": "^6.0.5", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "eslint-scope": "^4.0.3", + "eslint-utils": "^1.3.1", + "eslint-visitor-keys": "^1.0.0", + "espree": "^5.0.1", + "esquery": "^1.0.1", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob": "^7.1.2", + "globals": "^11.7.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "inquirer": "^6.2.2", + "js-yaml": "^3.13.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.11", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.2", + "path-is-inside": "^1.0.2", + "progress": "^2.0.0", + "regexpp": "^2.0.1", + "semver": "^5.5.1", + "strip-ansi": "^4.0.0", + "strip-json-comments": "^2.0.1", + "table": "^5.2.3", + "text-table": "^0.2.0" + }, + "bin": { + "eslint": "bin/eslint.js" + }, + "engines": { + "node": "^6.14.0 || ^8.10.0 || >=9.10.0" + } + }, + "node_modules/eslint-scope": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", + "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", + "dev": true, + "dependencies": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/eslint-utils": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", + "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^1.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "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, + "engines": { + "node": ">=4" + } + }, + "node_modules/espree": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz", + "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==", + "dev": true, + "dependencies": { + "acorn": "^6.0.7", + "acorn-jsx": "^5.0.0", + "eslint-visitor-keys": "^1.0.0" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "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, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/esprima-fb": { + "version": "3001.1.0-dev-harmony-fb", + "resolved": "https://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz", + "integrity": "sha512-a3RFiCVBiy8KdO6q/C+8BQiP/sRk8XshBU3QHHDP8tNzjYwR3FKBOImu+PXfVhPoZL0JKtJLBAOWlDMCCFY8SQ==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/esquery": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", + "dev": true, + "dependencies": { + "estraverse": "^5.1.0" + }, + "engines": { + "node": ">=0.10" + } + }, + "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, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "dependencies": { + "estraverse": "^5.2.0" + }, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/esrecurse/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, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/estree-is-function": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/estree-is-function/-/estree-is-function-1.0.0.tgz", + "integrity": "sha512-nSCWn1jkSq2QAtkaVLJZY2ezwcFO161HVc174zL1KPW3RJ+O6C3eJb8Nx7OXzvhoEv+nLgSR1g71oWUHUDTrJA==", + "dev": true + }, + "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, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==", + "dev": true, + "dependencies": { + "d": "1", + "es5-ext": "~0.10.14" + } + }, + "node_modules/events": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/events/-/events-2.1.0.tgz", + "integrity": "sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg==", + "dev": true, + "engines": { + "node": ">=0.4.x" + } + }, + "node_modules/evp_bytestokey": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", + "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "dev": true, + "dependencies": { + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" + } + }, + "node_modules/exec-sh": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz", + "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==", + "dev": true + }, + "node_modules/execa": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "dev": true, + "dependencies": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==", + "dev": true, + "dependencies": { + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/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/expand-brackets/node_modules/define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", + "dev": true, + "dependencies": { + "is-descriptor": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/node_modules/extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", + "dev": true, + "dependencies": { + "is-extendable": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/node_modules/is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==", + "dev": true, + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "dev": true, + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/node_modules/is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==", + "dev": true, + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "dev": true, + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/node_modules/is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "dependencies": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/node_modules/is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/node_modules/kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/expand-brackets/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/expect": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz", + "integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==", + "dev": true, + "dependencies": { + "@jest/types": "^24.9.0", + "ansi-styles": "^3.2.0", + "jest-get-type": "^24.9.0", + "jest-matcher-utils": "^24.9.0", + "jest-message-util": "^24.9.0", + "jest-regex-util": "^24.9.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/exposify": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/exposify/-/exposify-0.5.0.tgz", + "integrity": "sha512-SXS1oEW6VXYinz7RbTPUj+RhO3ZXuj2cmUTWTaO8KcWMcxLZF3wzjqSuaOW0EZYBoKooUM8DIkvfWWOMXTMQFQ==", + "dev": true, + "dependencies": { + "globo": "~1.1.0", + "map-obj": "~1.0.1", + "replace-requires": "~1.0.3", + "through2": "~0.4.0", + "transformify": "~0.1.1" + } + }, + "node_modules/exposify/node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", + "dev": true + }, + "node_modules/exposify/node_modules/object-keys": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", + "integrity": "sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==", + "dev": true + }, + "node_modules/exposify/node_modules/readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==", + "dev": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "node_modules/exposify/node_modules/string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==", + "dev": true + }, + "node_modules/exposify/node_modules/through2": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz", + "integrity": "sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ==", + "dev": true, + "dependencies": { + "readable-stream": "~1.0.17", + "xtend": "~2.1.1" + } + }, + "node_modules/exposify/node_modules/xtend": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz", + "integrity": "sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==", + "dev": true, + "dependencies": { + "object-keys": "~0.4.0" + }, + "engines": { + "node": ">=0.4" + } + }, + "node_modules/ext": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz", + "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==", + "dev": true, + "dependencies": { + "type": "^2.7.2" + } + }, + "node_modules/ext/node_modules/type": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/type/-/type-2.7.2.tgz", + "integrity": "sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==", + "dev": true + }, + "node_modules/extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", + "dev": true + }, + "node_modules/extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==", + "dev": true, + "dependencies": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "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, + "dependencies": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, + "dependencies": { + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/extglob/node_modules/define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==", + "dev": true, + "dependencies": { + "is-descriptor": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/extglob/node_modules/extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", + "dev": true, + "dependencies": { + "is-extendable": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/extglob/node_modules/is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==", + "dev": true, + "engines": [ + "node >=0.6.0" + ] + }, + "node_modules/fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" + }, + "node_modules/fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + }, + "node_modules/fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, + "node_modules/fast-safe-stringify": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", + "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", + "dev": true + }, + "node_modules/fb-watchman": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", + "dev": true, + "dependencies": { + "bser": "2.1.1" + } + }, + "node_modules/figures": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/file-entry-cache": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", + "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", + "dev": true, + "dependencies": { + "flat-cache": "^2.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/file-uri-to-path": { + "version": "1.0.0", + "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==", + "dev": true, + "optional": true + }, + "node_modules/fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==", + "dev": true, + "dependencies": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fill-range/node_modules/extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", + "dev": true, + "dependencies": { + "is-extendable": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fill-range/node_modules/is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/find-parent-dir": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.1.tgz", + "integrity": "sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A==", + "dev": true + }, + "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, + "dependencies": { + "locate-path": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/flat-cache": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", + "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", + "dev": true, + "dependencies": { + "flatted": "^2.0.0", + "rimraf": "2.6.3", + "write": "1.0.3" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/flatted": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", + "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", + "dev": true + }, + "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, + "dependencies": { + "is-callable": "^1.1.3" + } + }, + "node_modules/for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, + "node_modules/formidable": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.6.tgz", + "integrity": "sha512-KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ==", + "deprecated": "Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau", + "dev": true, + "funding": { + "url": "https://ko-fi.com/tunnckoCore/commissions" + } + }, + "node_modules/fragment-cache": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==", + "dev": true, + "dependencies": { + "map-cache": "^0.2.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/fs-extra": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz", + "integrity": "sha512-VerQV6vEKuhDWD2HGOybV6v5I73syoc/cXAbKlgTC7M/oFVEtklWlp9QH2Ijw3IaWDOQcMkldSPa7zXy79Z/UQ==", + "dependencies": { + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "node_modules/fsevents": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz", + "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==", + "deprecated": "The v1 package contains DANGEROUS / INSECURE binaries. Upgrade to safe fsevents v2", + "dev": true, + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "dependencies": { + "bindings": "^1.5.0", + "nan": "^2.12.1" + }, + "engines": { + "node": ">= 4.0" + } + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "node_modules/function.prototype.name": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", + "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3", + "es-abstract": "^1.19.0", + "functions-have-names": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functional-red-black-tree": { + "version": "1.0.1", + "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 + }, + "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, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/get-assigned-identifiers": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/get-assigned-identifiers/-/get-assigned-identifiers-1.2.0.tgz", + "integrity": "sha512-mBBwmeGTrxEMO4pMaaf/uUEFHnYtwr8FTe8Y/mer4rcV/bye0qGm6pw1bGZFGStxC5O76c5ZAVBGnqHmOaJpdQ==", + "dev": true + }, + "node_modules/get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" + }, + "node_modules/get-intrinsic": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-stream": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "dev": true, + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-value": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", + "dev": true, + "dependencies": { + "assert-plus": "^1.0.0" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "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/globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/globalthis": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", + "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", + "dev": true, + "dependencies": { + "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/globo": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/globo/-/globo-1.1.0.tgz", + "integrity": "sha512-9kacJpRuOo2IPxzYdogGZKnREZXMLs7P2/gaeHxynuL7kmxdB9o4EVtpd69f81CeUFWmZSxj1heZFEXQDTkaLQ==", + "dev": true, + "dependencies": { + "accessory": "~1.1.0", + "is-defined": "~1.0.0", + "ternary": "~1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/gopd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" + }, + "node_modules/growly": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", + "integrity": "sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==", + "dev": true + }, + "node_modules/har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/har-validator": { + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", + "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", + "deprecated": "this library is no longer supported", + "dev": true, + "dependencies": { + "ajv": "^6.12.3", + "har-schema": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "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, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "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, + "engines": { + "node": ">=4" + } + }, + "node_modules/has-property-descriptors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", + "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.1.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-require": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/has-require/-/has-require-1.2.2.tgz", + "integrity": "sha512-JHMVoV2TG3LEFw/8UjxXJzCRGdOHJzzAXft7BafERh2rdPYZcS5N6Twv7Q8yLy9mciKsVBkXmpWSuLp5GUXNng==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^1.0.3" + } + }, + "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==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", + "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "dev": true, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", + "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==", + "dev": true, + "dependencies": { + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/has-values": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", + "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==", + "dev": true, + "dependencies": { + "is-number": "^3.0.0", + "kind-of": "^4.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/has-values/node_modules/kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==", + "dev": true, + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/hash-base": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz", + "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "safe-buffer": "^5.2.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/hash-base/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/hash.js": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz", + "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.1" + } + }, + "node_modules/hmac-drbg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==", + "dev": true, + "dependencies": { + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" + } + }, + "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==" + }, + "node_modules/html-encoding-sniffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz", + "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==", + "dev": true, + "dependencies": { + "whatwg-encoding": "^1.0.1" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true + }, + "node_modules/htmlescape": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz", + "integrity": "sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg==", + "dev": true, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==", + "dev": true, + "dependencies": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + }, + "engines": { + "node": ">=0.8", + "npm": ">=1.3.7" + } + }, + "node_modules/https-browserify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", + "integrity": "sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==", + "dev": true + }, + "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": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "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, + "engines": { + "node": ">= 4" + } + }, + "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, + "dependencies": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/import-local": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz", + "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==", + "dev": true, + "dependencies": { + "pkg-dir": "^3.0.0", + "resolve-cwd": "^2.0.0" + }, + "bin": { + "import-local-fixture": "fixtures/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true, + "engines": { + "node": ">=0.8.19" + } + }, + "node_modules/inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "node_modules/inline-source-map": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.2.tgz", + "integrity": "sha512-0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA==", + "dev": true, + "dependencies": { + "source-map": "~0.5.3" + } + }, + "node_modules/inquirer": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz", + "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==", + "dev": true, + "dependencies": { + "ansi-escapes": "^3.2.0", + "chalk": "^2.4.2", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^3.0.3", + "figures": "^2.0.0", + "lodash": "^4.17.12", + "mute-stream": "0.0.7", + "run-async": "^2.2.0", + "rxjs": "^6.4.0", + "string-width": "^2.1.0", + "strip-ansi": "^5.1.0", + "through": "^2.3.6" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/inquirer/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/insert-module-globals": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.2.1.tgz", + "integrity": "sha512-ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg==", + "dev": true, + "dependencies": { + "acorn-node": "^1.5.2", + "combine-source-map": "^0.8.0", + "concat-stream": "^1.6.1", + "is-buffer": "^1.1.0", + "JSONStream": "^1.0.3", + "path-is-absolute": "^1.0.1", + "process": "~0.11.0", + "through2": "^2.0.0", + "undeclared-identifiers": "^1.1.2", + "xtend": "^4.0.0" + }, + "bin": { + "insert-module-globals": "bin/cmd.js" + } + }, + "node_modules/internal-slot": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", + "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.0", + "has": "^1.0.3", + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/invariant": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "dev": true, + "dependencies": { + "loose-envify": "^1.0.0" + } + }, + "node_modules/invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "dependencies": { + "kind-of": "^6.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", + "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.0", + "is-typed-array": "^1.1.10" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" + }, + "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, + "dependencies": { + "has-bigints": "^1.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "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, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "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, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-ci": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", + "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", + "dev": true, + "dependencies": { + "ci-info": "^2.0.0" + }, + "bin": { + "is-ci": "bin.js" + } + }, + "node_modules/is-core-module": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", + "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", + "dependencies": { + "has": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "dependencies": { + "kind-of": "^6.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "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, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-defined": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-defined/-/is-defined-1.0.0.tgz", + "integrity": "sha512-/drGiPCBGsJDhtnLkdcNl8QtEo9ddV10m0Y7wzkopIQM4u91wXhe84pZSH6RLukO2uJDtQoaAr1XoP0ilwsYzg==", + "dev": true + }, + "node_modules/is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "dependencies": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "dev": true, + "dependencies": { + "is-plain-object": "^2.0.4" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "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==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/is-generator-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", + "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/is-negative-zero": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==", + "dev": true, + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "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, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-number/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "dev": true, + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "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==", + "dev": true, + "dependencies": { + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "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, + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", + "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "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, + "dependencies": { + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "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, + "dependencies": { + "has-symbols": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", + "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", + "dev": true, + "dependencies": { + "which-typed-array": "^1.1.11" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", + "dev": true + }, + "node_modules/is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==" + }, + "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, + "dependencies": { + "call-bind": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-wsl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", + "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "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 + }, + "node_modules/isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "node_modules/isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==", + "dev": true + }, + "node_modules/istanbul-lib-coverage": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", + "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/istanbul-lib-instrument": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz", + "integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==", + "dev": true, + "dependencies": { + "@babel/generator": "^7.4.0", + "@babel/parser": "^7.4.3", + "@babel/template": "^7.4.0", + "@babel/traverse": "^7.4.3", + "@babel/types": "^7.4.0", + "istanbul-lib-coverage": "^2.0.5", + "semver": "^6.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/istanbul-lib-instrument/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/istanbul-lib-report": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz", + "integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==", + "dev": true, + "dependencies": { + "istanbul-lib-coverage": "^2.0.5", + "make-dir": "^2.1.0", + "supports-color": "^6.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/istanbul-lib-report/node_modules/supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/istanbul-lib-source-maps": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz", + "integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==", + "dev": true, + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^2.0.5", + "make-dir": "^2.1.0", + "rimraf": "^2.6.3", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/istanbul-lib-source-maps/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/istanbul-reports": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz", + "integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==", + "dev": true, + "dependencies": { + "html-escaper": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jest": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-24.9.0.tgz", + "integrity": "sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==", + "dev": true, + "dependencies": { + "import-local": "^2.0.0", + "jest-cli": "^24.9.0" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-changed-files": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-24.9.0.tgz", + "integrity": "sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==", + "dev": true, + "dependencies": { + "@jest/types": "^24.9.0", + "execa": "^1.0.0", + "throat": "^4.0.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-cli": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.9.0.tgz", + "integrity": "sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==", + "dev": true, + "dependencies": { + "@jest/core": "^24.9.0", + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", + "chalk": "^2.0.1", + "exit": "^0.1.2", + "import-local": "^2.0.0", + "is-ci": "^2.0.0", + "jest-config": "^24.9.0", + "jest-util": "^24.9.0", + "jest-validate": "^24.9.0", + "prompts": "^2.0.1", + "realpath-native": "^1.1.0", + "yargs": "^13.3.0" + }, + "bin": { + "jest": "bin/jest.js" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-cli/node_modules/cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "dependencies": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "node_modules/jest-cli/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, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/jest-cli/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jest-cli/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jest-cli/node_modules/which-module": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", + "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", + "dev": true + }, + "node_modules/jest-cli/node_modules/wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jest-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 + }, + "node_modules/jest-cli/node_modules/yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "dependencies": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + }, + "node_modules/jest-cli/node_modules/yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dev": true, + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, + "node_modules/jest-config": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-24.9.0.tgz", + "integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==", + "dev": true, + "dependencies": { + "@babel/core": "^7.1.0", + "@jest/test-sequencer": "^24.9.0", + "@jest/types": "^24.9.0", + "babel-jest": "^24.9.0", + "chalk": "^2.0.1", + "glob": "^7.1.1", + "jest-environment-jsdom": "^24.9.0", + "jest-environment-node": "^24.9.0", + "jest-get-type": "^24.9.0", + "jest-jasmine2": "^24.9.0", + "jest-regex-util": "^24.3.0", + "jest-resolve": "^24.9.0", + "jest-util": "^24.9.0", + "jest-validate": "^24.9.0", + "micromatch": "^3.1.10", + "pretty-format": "^24.9.0", + "realpath-native": "^1.1.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-diff": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-24.9.0.tgz", + "integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==", + "dev": true, + "dependencies": { + "chalk": "^2.0.1", + "diff-sequences": "^24.9.0", + "jest-get-type": "^24.9.0", + "pretty-format": "^24.9.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-docblock": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-24.9.0.tgz", + "integrity": "sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==", + "dev": true, + "dependencies": { + "detect-newline": "^2.1.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-each": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-24.9.0.tgz", + "integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==", + "dev": true, + "dependencies": { + "@jest/types": "^24.9.0", + "chalk": "^2.0.1", + "jest-get-type": "^24.9.0", + "jest-util": "^24.9.0", + "pretty-format": "^24.9.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-environment-jsdom": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-24.9.0.tgz", + "integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==", + "dev": true, + "dependencies": { + "@jest/environment": "^24.9.0", + "@jest/fake-timers": "^24.9.0", + "@jest/types": "^24.9.0", + "jest-mock": "^24.9.0", + "jest-util": "^24.9.0", + "jsdom": "^11.5.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-environment-node": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-24.9.0.tgz", + "integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==", + "dev": true, + "dependencies": { + "@jest/environment": "^24.9.0", + "@jest/fake-timers": "^24.9.0", + "@jest/types": "^24.9.0", + "jest-mock": "^24.9.0", + "jest-util": "^24.9.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-get-type": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz", + "integrity": "sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-haste-map": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-24.9.0.tgz", + "integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==", + "dev": true, + "dependencies": { + "@jest/types": "^24.9.0", + "anymatch": "^2.0.0", + "fb-watchman": "^2.0.0", + "graceful-fs": "^4.1.15", + "invariant": "^2.2.4", + "jest-serializer": "^24.9.0", + "jest-util": "^24.9.0", + "jest-worker": "^24.9.0", + "micromatch": "^3.1.10", + "sane": "^4.0.3", + "walker": "^1.0.7" + }, + "engines": { + "node": ">= 6" + }, + "optionalDependencies": { + "fsevents": "^1.2.7" + } + }, + "node_modules/jest-jasmine2": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-24.9.0.tgz", + "integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==", + "dev": true, + "dependencies": { + "@babel/traverse": "^7.1.0", + "@jest/environment": "^24.9.0", + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", + "chalk": "^2.0.1", + "co": "^4.6.0", + "expect": "^24.9.0", + "is-generator-fn": "^2.0.0", + "jest-each": "^24.9.0", + "jest-matcher-utils": "^24.9.0", + "jest-message-util": "^24.9.0", + "jest-runtime": "^24.9.0", + "jest-snapshot": "^24.9.0", + "jest-util": "^24.9.0", + "pretty-format": "^24.9.0", + "throat": "^4.0.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-leak-detector": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-24.9.0.tgz", + "integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==", + "dev": true, + "dependencies": { + "jest-get-type": "^24.9.0", + "pretty-format": "^24.9.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-matcher-utils": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-24.9.0.tgz", + "integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==", + "dev": true, + "dependencies": { + "chalk": "^2.0.1", + "jest-diff": "^24.9.0", + "jest-get-type": "^24.9.0", + "pretty-format": "^24.9.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-message-util": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-24.9.0.tgz", + "integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", + "@types/stack-utils": "^1.0.1", + "chalk": "^2.0.1", + "micromatch": "^3.1.10", + "slash": "^2.0.0", + "stack-utils": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-mock": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-24.9.0.tgz", + "integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==", + "dev": true, + "dependencies": { + "@jest/types": "^24.9.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-pnp-resolver": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz", + "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==", + "dev": true, + "engines": { + "node": ">=6" + }, + "peerDependencies": { + "jest-resolve": "*" + }, + "peerDependenciesMeta": { + "jest-resolve": { + "optional": true + } + } + }, + "node_modules/jest-regex-util": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-24.9.0.tgz", + "integrity": "sha512-05Cmb6CuxaA+Ys6fjr3PhvV3bGQmO+2p2La4hFbU+W5uOc479f7FdLXUWXw4pYMAhhSZIuKHwSXSu6CsSBAXQA==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-resolve": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-24.9.0.tgz", + "integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==", + "dev": true, + "dependencies": { + "@jest/types": "^24.9.0", + "browser-resolve": "^1.11.3", + "chalk": "^2.0.1", + "jest-pnp-resolver": "^1.2.1", + "realpath-native": "^1.1.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-resolve-dependencies": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-24.9.0.tgz", + "integrity": "sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==", + "dev": true, + "dependencies": { + "@jest/types": "^24.9.0", + "jest-regex-util": "^24.3.0", + "jest-snapshot": "^24.9.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-resolve/node_modules/browser-resolve": { + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz", + "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==", + "dev": true, + "dependencies": { + "resolve": "1.1.7" + } + }, + "node_modules/jest-resolve/node_modules/resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg==", + "dev": true + }, + "node_modules/jest-runner": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-24.9.0.tgz", + "integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==", + "dev": true, + "dependencies": { + "@jest/console": "^24.7.1", + "@jest/environment": "^24.9.0", + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", + "chalk": "^2.4.2", + "exit": "^0.1.2", + "graceful-fs": "^4.1.15", + "jest-config": "^24.9.0", + "jest-docblock": "^24.3.0", + "jest-haste-map": "^24.9.0", + "jest-jasmine2": "^24.9.0", + "jest-leak-detector": "^24.9.0", + "jest-message-util": "^24.9.0", + "jest-resolve": "^24.9.0", + "jest-runtime": "^24.9.0", + "jest-util": "^24.9.0", + "jest-worker": "^24.6.0", + "source-map-support": "^0.5.6", + "throat": "^4.0.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-runtime": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-24.9.0.tgz", + "integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==", + "dev": true, + "dependencies": { + "@jest/console": "^24.7.1", + "@jest/environment": "^24.9.0", + "@jest/source-map": "^24.3.0", + "@jest/transform": "^24.9.0", + "@jest/types": "^24.9.0", + "@types/yargs": "^13.0.0", + "chalk": "^2.0.1", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.1.15", + "jest-config": "^24.9.0", + "jest-haste-map": "^24.9.0", + "jest-message-util": "^24.9.0", + "jest-mock": "^24.9.0", + "jest-regex-util": "^24.3.0", + "jest-resolve": "^24.9.0", + "jest-snapshot": "^24.9.0", + "jest-util": "^24.9.0", + "jest-validate": "^24.9.0", + "realpath-native": "^1.1.0", + "slash": "^2.0.0", + "strip-bom": "^3.0.0", + "yargs": "^13.3.0" + }, + "bin": { + "jest-runtime": "bin/jest-runtime.js" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-runtime/node_modules/cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "dev": true, + "dependencies": { + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" + } + }, + "node_modules/jest-runtime/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, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/jest-runtime/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jest-runtime/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jest-runtime/node_modules/which-module": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", + "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", + "dev": true + }, + "node_modules/jest-runtime/node_modules/wrap-ansi": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jest-runtime/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 + }, + "node_modules/jest-runtime/node_modules/yargs": { + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", + "dev": true, + "dependencies": { + "cliui": "^5.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.1.2" + } + }, + "node_modules/jest-runtime/node_modules/yargs-parser": { + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", + "dev": true, + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + }, + "node_modules/jest-serializer": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-24.9.0.tgz", + "integrity": "sha512-DxYipDr8OvfrKH3Kel6NdED3OXxjvxXZ1uIY2I9OFbGg+vUkkg7AGvi65qbhbWNPvDckXmzMPbK3u3HaDO49bQ==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-snapshot": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-24.9.0.tgz", + "integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==", + "dev": true, + "dependencies": { + "@babel/types": "^7.0.0", + "@jest/types": "^24.9.0", + "chalk": "^2.0.1", + "expect": "^24.9.0", + "jest-diff": "^24.9.0", + "jest-get-type": "^24.9.0", + "jest-matcher-utils": "^24.9.0", + "jest-message-util": "^24.9.0", + "jest-resolve": "^24.9.0", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "pretty-format": "^24.9.0", + "semver": "^6.2.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-snapshot/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/jest-util": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-24.9.0.tgz", + "integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==", + "dev": true, + "dependencies": { + "@jest/console": "^24.9.0", + "@jest/fake-timers": "^24.9.0", + "@jest/source-map": "^24.9.0", + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", + "callsites": "^3.0.0", + "chalk": "^2.0.1", + "graceful-fs": "^4.1.15", + "is-ci": "^2.0.0", + "mkdirp": "^0.5.1", + "slash": "^2.0.0", + "source-map": "^0.6.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-util/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/jest-validate": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz", + "integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==", + "dev": true, + "dependencies": { + "@jest/types": "^24.9.0", + "camelcase": "^5.3.1", + "chalk": "^2.0.1", + "jest-get-type": "^24.9.0", + "leven": "^3.1.0", + "pretty-format": "^24.9.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-watcher": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-24.9.0.tgz", + "integrity": "sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==", + "dev": true, + "dependencies": { + "@jest/test-result": "^24.9.0", + "@jest/types": "^24.9.0", + "@types/yargs": "^13.0.0", + "ansi-escapes": "^3.0.0", + "chalk": "^2.0.1", + "jest-util": "^24.9.0", + "string-length": "^2.0.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-worker": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz", + "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==", + "dev": true, + "dependencies": { + "merge-stream": "^2.0.0", + "supports-color": "^6.1.0" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/jest-worker/node_modules/supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "dev": true, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + }, + "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, + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==", + "dev": true + }, + "node_modules/jsdom": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz", + "integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==", + "dev": true, + "dependencies": { + "abab": "^2.0.0", + "acorn": "^5.5.3", + "acorn-globals": "^4.1.0", + "array-equal": "^1.0.0", + "cssom": ">= 0.3.2 < 0.4.0", + "cssstyle": "^1.0.0", + "data-urls": "^1.0.0", + "domexception": "^1.0.1", + "escodegen": "^1.9.1", + "html-encoding-sniffer": "^1.0.2", + "left-pad": "^1.3.0", + "nwsapi": "^2.0.7", + "parse5": "4.0.0", + "pn": "^1.1.0", + "request": "^2.87.0", + "request-promise-native": "^1.0.5", + "sax": "^1.2.4", + "symbol-tree": "^3.2.2", + "tough-cookie": "^2.3.4", + "w3c-hr-time": "^1.0.1", + "webidl-conversions": "^4.0.2", + "whatwg-encoding": "^1.0.3", + "whatwg-mimetype": "^2.1.0", + "whatwg-url": "^6.4.1", + "ws": "^5.2.0", + "xml-name-validator": "^3.0.0" + } + }, + "node_modules/jsdom/node_modules/acorn": { + "version": "5.7.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz", + "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true, + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true + }, + "node_modules/json-schema": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", + "dev": true + }, + "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/json-stable-stringify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz", + "integrity": "sha512-nKtD/Qxm7tWdZqJoldEC7fF0S41v0mWbeaXG3637stOWfyGxTgWTYE2wtfKmjzpvxv2MA2xzxsXOIiwUpkX6Qw==", + "dev": true, + "dependencies": { + "jsonify": "~0.0.0" + } + }, + "node_modules/json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "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 + }, + "node_modules/json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", + "dev": true + }, + "node_modules/json5": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "integrity": "sha512-4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw==", + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/jsonfile": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "integrity": "sha512-PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==", + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/jsonify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz", + "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/jsonparse": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", + "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", + "dev": true, + "engines": [ + "node >= 0.2.0" + ] + }, + "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, + "dependencies": { + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" + }, + "bin": { + "JSONStream": "bin.js" + }, + "engines": { + "node": "*" + } + }, + "node_modules/jsprim": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", + "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", + "dev": true, + "dependencies": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.4.0", + "verror": "1.10.0" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/klaw": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", + "integrity": "sha512-TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==", + "optionalDependencies": { + "graceful-fs": "^4.1.9" + } + }, + "node_modules/kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/labeled-stream-splicer": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz", + "integrity": "sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "stream-splicer": "^2.0.0" + } + }, + "node_modules/lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==", + "dependencies": { + "invert-kv": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/left-pad": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz", + "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==", + "deprecated": "use String.prototype.padStart()", + "dev": true + }, + "node_modules/leven": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "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, + "dependencies": { + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "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, + "engines": { + "node": ">=4" + } + }, + "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, + "dependencies": { + "p-locate": "^3.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + }, + "node_modules/lodash.memoize": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz", + "integrity": "sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A==", + "dev": true + }, + "node_modules/lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==", + "dev": true + }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, + "node_modules/lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "dependencies": { + "yallist": "^3.0.2" + } + }, + "node_modules/magic-string": { + "version": "0.25.1", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.1.tgz", + "integrity": "sha512-sCuTz6pYom8Rlt4ISPFn6wuFodbKMIHUMv4Qko9P17dpxb7s52KJTmRuZZqHdGmLCK9AOcDare039nRIcfdkEg==", + "dev": true, + "dependencies": { + "sourcemap-codec": "^1.4.1" + } + }, + "node_modules/make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "dev": true, + "dependencies": { + "pify": "^4.0.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/make-error": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", + "dev": true + }, + "node_modules/makeerror": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz", + "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==", + "dev": true, + "dependencies": { + "tmpl": "1.0.5" + } + }, + "node_modules/map-cache": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "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, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/map-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", + "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==", + "dev": true, + "dependencies": { + "object-visit": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/md5.js": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz", + "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==", + "dev": true, + "dependencies": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "node_modules/merge-source-map": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.0.4.tgz", + "integrity": "sha512-PGSmS0kfnTnMJCzJ16BLLCEe6oeYCamKFFdQKshi4BmM6FUwipjVOcBFGxqtQtirtAG4iZvHlqST9CpZKqlRjA==", + "dev": true, + "dependencies": { + "source-map": "^0.5.6" + } + }, + "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==", + "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, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "dev": true, + "dependencies": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/miller-rabin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", + "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", + "dev": true, + "dependencies": { + "bn.js": "^4.0.0", + "brorand": "^1.0.1" + }, + "bin": { + "miller-rabin": "bin/miller-rabin" + } + }, + "node_modules/miller-rabin/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "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, + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "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==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "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==", + "dev": true, + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", + "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/minimalistic-assert": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", + "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", + "dev": true + }, + "node_modules/minimalistic-crypto-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==", + "dev": true + }, + "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/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/mixin-deep": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", + "dev": true, + "dependencies": { + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/mkdirp-classic": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz", + "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==", + "dev": true + }, + "node_modules/module-deps": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz", + "integrity": "sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==", + "dev": true, + "dependencies": { + "browser-resolve": "^2.0.0", + "cached-path-relative": "^1.0.2", + "concat-stream": "~1.6.0", + "defined": "^1.0.0", + "detective": "^5.2.0", + "duplexer2": "^0.1.2", + "inherits": "^2.0.1", + "JSONStream": "^1.0.3", + "parents": "^1.0.0", + "readable-stream": "^2.0.2", + "resolve": "^1.4.0", + "stream-combiner2": "^1.1.1", + "subarg": "^1.0.0", + "through2": "^2.0.0", + "xtend": "^4.0.0" + }, + "bin": { + "module-deps": "bin/cmd.js" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/mothership": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/mothership/-/mothership-0.3.0.tgz", + "integrity": "sha512-/ORGXVhkG5Qal0ZD3BnxG/JtMcCJKOn7FkbbTA8N9HwJyXGsBYq9EXH7WbsRCpGUwmwrpQqN6ENLUL+ebmNTCQ==", + "dev": true, + "dependencies": { + "find-parent-dir": "~0.3.0" + } + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "node_modules/mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha512-r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ==", + "dev": true + }, + "node_modules/nan": { + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", + "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", + "dev": true, + "optional": true + }, + "node_modules/nanomatch": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", + "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", + "dev": true, + "dependencies": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "node_modules/next-tick": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", + "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", + "dev": true + }, + "node_modules/nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", + "dev": true + }, + "node_modules/node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "dev": true + }, + "node_modules/node-notifier": { + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.5.tgz", + "integrity": "sha512-tVbHs7DyTLtzOiN78izLA85zRqB9NvEXkAf014Vx3jtSvn/xBl6bR8ZYifj+dFcFrKI21huSQgJZ6ZtL3B4HfQ==", + "dev": true, + "dependencies": { + "growly": "^1.3.0", + "is-wsl": "^1.1.0", + "semver": "^5.5.0", + "shellwords": "^0.1.1", + "which": "^1.3.0" + } + }, + "node_modules/node-releases": { + "version": "2.0.13", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", + "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", + "dev": true + }, + "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==", + "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/normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==", + "dev": true, + "dependencies": { + "remove-trailing-separator": "^1.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==", + "dev": true, + "dependencies": { + "path-key": "^2.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/nwsapi": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", + "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==", + "dev": true + }, + "node_modules/oauth-sign": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", + "dev": true, + "engines": { + "node": "*" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-copy": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", + "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==", + "dev": true, + "dependencies": { + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-copy/node_modules/define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", + "dev": true, + "dependencies": { + "is-descriptor": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-copy/node_modules/is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==", + "dev": true, + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-copy/node_modules/is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==", + "dev": true, + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-copy/node_modules/is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "dependencies": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-copy/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "dev": true, + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-inspect": { + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object-visit": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", + "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==", + "dev": true, + "dependencies": { + "isobject": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object.assign": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", + "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "has-symbols": "^1.0.3", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.getownpropertydescriptors": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz", + "integrity": "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==", + "dev": true, + "dependencies": { + "array.prototype.reduce": "^1.0.5", + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.21.2", + "safe-array-concat": "^1.0.0" + }, + "engines": { + "node": ">= 0.8" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.pick": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", + "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", + "dev": true, + "dependencies": { + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==", + "dev": true, + "dependencies": { + "mimic-fn": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/onml": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/onml/-/onml-0.3.1.tgz", + "integrity": "sha512-+OhJ42QBJnjCUPtt7NabMtC+e9F+/NqDHsj9DT/uZj3nw91Dwbj11/VIIZl1/l8bLmM8wPAF3NN8KHnogA4iOA==", + "dependencies": { + "sax": "^1.1.4" + } + }, + "node_modules/optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "dependencies": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/os-browserify": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", + "integrity": "sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==", + "dev": true + }, + "node_modules/os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==", + "dependencies": { + "lcid": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "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, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/p-each-series": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-1.0.0.tgz", + "integrity": "sha512-J/e9xiZZQNrt+958FFzJ+auItsBGq+UrQ7nE89AUP7UOTtjHnkISANXLdayhVzh538UnLMCSlf13lFfRIAKQOA==", + "dev": true, + "dependencies": { + "p-reduce": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "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": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "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, + "dependencies": { + "p-limit": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/p-reduce": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-reduce/-/p-reduce-1.0.0.tgz", + "integrity": "sha512-3Tx1T3oM1xO/Y8Gj0sWyE78EIJZ+t+aEmXUdvQgvGmSMri7aPTHoovbXEreWKkL5j21Er60XAWLTzKbAKYOujQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "dev": true + }, + "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, + "dependencies": { + "callsites": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/parents": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz", + "integrity": "sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg==", + "dev": true, + "dependencies": { + "path-platform": "~0.11.15" + } + }, + "node_modules/parse-asn1": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz", + "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==", + "dev": true, + "dependencies": { + "asn1.js": "^5.2.0", + "browserify-aes": "^1.0.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3", + "safe-buffer": "^5.1.1" + } + }, + "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, + "dependencies": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/parse5": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", + "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", + "dev": true + }, + "node_modules/pascalcase": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", + "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/patch-text": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/patch-text/-/patch-text-1.0.2.tgz", + "integrity": "sha512-r1P+pfiTgWrsMOk/aW64RGv0oLjdyP0LeaLv2dF+iUfaVLqicXRi2dkjGYDgQ/kHVYm4z4GEHnx36Q6uqiFNlA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-browserify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz", + "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==", + "dev": true + }, + "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, + "engines": { + "node": ">=4" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==", + "dev": true + }, + "node_modules/path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + }, + "node_modules/path-platform": { + "version": "0.11.15", + "resolved": "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz", + "integrity": "sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "dev": true, + "dependencies": { + "pify": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/path-type/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, + "engines": { + "node": ">=4" + } + }, + "node_modules/pbkdf2": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz", + "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==", + "dev": true, + "dependencies": { + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + }, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==", + "dev": true + }, + "node_modules/picocolors": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true + }, + "node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==", + "dependencies": { + "pinkie": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/pirates": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", + "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/pkg-dir": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz", + "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==", + "dev": true, + "dependencies": { + "find-up": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/pn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz", + "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==", + "dev": true + }, + "node_modules/posix-character-classes": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", + "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/pretty-format": { + "version": "24.9.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz", + "integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==", + "dev": true, + "dependencies": { + "@jest/types": "^24.9.0", + "ansi-regex": "^4.0.0", + "ansi-styles": "^3.2.0", + "react-is": "^16.8.4" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "dev": true, + "engines": { + "node": ">= 0.6.0" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "dev": true + }, + "node_modules/progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/prompts": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", + "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==", + "dev": true, + "dependencies": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/psl": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", + "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", + "dev": true + }, + "node_modules/public-encrypt": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz", + "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==", + "dev": true, + "dependencies": { + "bn.js": "^4.1.0", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "parse-asn1": "^5.0.0", + "randombytes": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "node_modules/public-encrypt/node_modules/bn.js": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz", + "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==", + "dev": true + }, + "node_modules/pump": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", + "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", + "dev": true, + "dependencies": { + "end-of-stream": "^1.1.0", + "once": "^1.3.1" + } + }, + "node_modules/punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", + "dev": true + }, + "node_modules/qs": { + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", + "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", + "dev": true, + "engines": { + "node": ">=0.6" + } + }, + "node_modules/querystring-es3": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", + "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==", + "dev": true, + "engines": { + "node": ">=0.4.x" + } + }, + "node_modules/quote-stream": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/quote-stream/-/quote-stream-1.0.2.tgz", + "integrity": "sha512-kKr2uQ2AokadPjvTyKJQad9xELbZwYzWlNfI3Uz2j/ib5u6H9lDP7fUUR//rMycd0gv4Z5P1qXMfXR8YpIxrjQ==", + "dev": true, + "dependencies": { + "buffer-equal": "0.0.1", + "minimist": "^1.1.3", + "through2": "^2.0.0" + }, + "bin": { + "quote-stream": "bin/cmd.js" + } + }, + "node_modules/randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.1.0" + } + }, + "node_modules/randomfill": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", + "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", + "dev": true, + "dependencies": { + "randombytes": "^2.0.5", + "safe-buffer": "^5.1.0" + } + }, + "node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + }, + "node_modules/read-only-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz", + "integrity": "sha512-3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w==", + "dev": true, + "dependencies": { + "readable-stream": "^2.0.2" + } + }, + "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, + "dependencies": { + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/read-pkg-up": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz", + "integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==", + "dev": true, + "dependencies": { + "find-up": "^3.0.0", + "read-pkg": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "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, + "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_modules/readable-stream/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/readable-stream/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, + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/realpath-native": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz", + "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==", + "dev": true, + "dependencies": { + "util.promisify": "^1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/regex-not": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "dev": true, + "dependencies": { + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", + "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "functions-have-names": "^1.2.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexpp": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", + "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", + "dev": true, + "engines": { + "node": ">=6.5.0" + } + }, + "node_modules/remove-trailing-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==", + "dev": true + }, + "node_modules/rename-function-calls": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/rename-function-calls/-/rename-function-calls-0.1.1.tgz", + "integrity": "sha512-F+z4csKBo6gw4y5vhIbOhG+UcZVWNh42fW35dagdFP74YrY4ET932NTZZEimMdJz8Efha73caz/OFGxt1vReOA==", + "dev": true, + "dependencies": { + "detective": "~3.1.0" + } + }, + "node_modules/rename-function-calls/node_modules/detective": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detective/-/detective-3.1.0.tgz", + "integrity": "sha512-BIvQHuiVSRMufK1OnlpeAzVqF2yXD75ZzYIx8XV4VQiJ48chF/MMYAdsz/NkulhZznwb4fAX8vyi5CUc24I2BA==", + "dev": true, + "dependencies": { + "escodegen": "~1.1.0", + "esprima-fb": "3001.1.0-dev-harmony-fb" + } + }, + "node_modules/rename-function-calls/node_modules/escodegen": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.1.0.tgz", + "integrity": "sha512-md+WjA8K+DJELEYe0n4XAOE0XbUYfw2rzb8T+nhZ19OnQxlh+0jMLS6d+z2oqWugIh3uYKu1+KJh6QKeoogLzg==", + "dev": true, + "dependencies": { + "esprima": "~1.0.4", + "estraverse": "~1.5.0", + "esutils": "~1.0.0" + }, + "bin": { + "escodegen": "bin/escodegen.js", + "esgenerate": "bin/esgenerate.js" + }, + "engines": { + "node": ">=0.4.0" + }, + "optionalDependencies": { + "source-map": "~0.1.30" + } + }, + "node_modules/rename-function-calls/node_modules/esprima": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz", + "integrity": "sha512-rp5dMKN8zEs9dfi9g0X1ClLmV//WRyk/R15mppFNICIFRG5P92VP7Z04p8pk++gABo9W2tY+kHyu6P1mEHgmTA==", + "dev": true, + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/rename-function-calls/node_modules/estraverse": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz", + "integrity": "sha512-FpCjJDfmo3vsc/1zKSeqR5k42tcIhxFIlvq+h9j0fO2q/h2uLKyweq7rYJ+0CoVvrGQOxIS5wyBrW/+vF58BUQ==", + "dev": true, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/rename-function-calls/node_modules/esutils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz", + "integrity": "sha512-x/iYH53X3quDwfHRz4y8rn4XcEwwCJeWsul9pF1zldMbGtgOtMNBEOuYWwB1EQlK2LRa1fev3YAgym/RElp5Cg==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/rename-function-calls/node_modules/source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==", + "dev": true, + "optional": true, + "dependencies": { + "amdefine": ">=0.0.4" + }, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/repeat-element": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz", + "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==", + "dev": true, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/replace-requires": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/replace-requires/-/replace-requires-1.0.4.tgz", + "integrity": "sha512-9PpQ4IWrhJ+waLnakqT26sOIFW8SPTWZ/aEmz35Pq1V1k1A352nYDTkbhznTGUmYS2MsC0ULJ+2vChstBTxKRw==", + "dev": true, + "dependencies": { + "detective": "^4.5.0", + "has-require": "~1.2.1", + "patch-text": "~1.0.2", + "xtend": "~4.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/replace-requires/node_modules/acorn": { + "version": "5.7.4", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz", + "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==", + "dev": true, + "bin": { + "acorn": "bin/acorn" + }, + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/replace-requires/node_modules/detective": { + "version": "4.7.1", + "resolved": "https://registry.npmjs.org/detective/-/detective-4.7.1.tgz", + "integrity": "sha512-H6PmeeUcZloWtdt4DAkFyzFL94arpHr3NOwwmVILFiy+9Qd4JTxxXrzfyGk/lmct2qVGBwTSwSXagqu2BxmWig==", + "dev": true, + "dependencies": { + "acorn": "^5.2.1", + "defined": "^1.0.0" + } + }, + "node_modules/request": { + "version": "2.88.2", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", + "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", + "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", + "dev": true, + "dependencies": { + "aws-sign2": "~0.7.0", + "aws4": "^1.8.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", + "forever-agent": "~0.6.1", + "form-data": "~2.3.2", + "har-validator": "~5.1.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", + "performance-now": "^2.1.0", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.5.0", + "tunnel-agent": "^0.6.0", + "uuid": "^3.3.2" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/request-promise-core": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", + "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", + "dev": true, + "dependencies": { + "lodash": "^4.17.19" + }, + "engines": { + "node": ">=0.10.0" + }, + "peerDependencies": { + "request": "^2.34" + } + }, + "node_modules/request-promise-native": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", + "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", + "deprecated": "request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142", + "dev": true, + "dependencies": { + "request-promise-core": "1.1.4", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + }, + "engines": { + "node": ">=0.12.0" + }, + "peerDependencies": { + "request": "^2.34" + } + }, + "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==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-main-filename": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true + }, + "node_modules/resolve": { + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", + "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/resolve-cwd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", + "integrity": "sha512-ccu8zQTrzVr954472aUVPLEcB3YpKSYR3cg/3lo1okzobPBM+1INXBbBZlDbnI/hbEocnf8j0QVo43hQKrbchg==", + "dev": true, + "dependencies": { + "resolve-from": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/resolve-cwd/node_modules/resolve-from": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", + "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/resolve-url": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==", + "deprecated": "https://github.com/lydell/resolve-url#deprecated", + "dev": true + }, + "node_modules/restore-cursor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==", + "dev": true, + "dependencies": { + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "dev": true, + "engines": { + "node": ">=0.12" + } + }, + "node_modules/rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/ripemd160": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", + "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", + "dev": true, + "dependencies": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1" + } + }, + "node_modules/rsvp": { + "version": "4.8.5", + "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", + "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==", + "dev": true, + "engines": { + "node": "6.* || >= 7.*" + } + }, + "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, + "engines": { + "node": ">=0.12.0" + } + }, + "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, + "dependencies": { + "tslib": "^1.9.0" + }, + "engines": { + "npm": ">=2.0.0" + } + }, + "node_modules/safe-array-concat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz", + "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.0", + "has-symbols": "^1.0.3", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-array-concat/node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/safe-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==", + "dev": true, + "dependencies": { + "ret": "~0.1.10" + } + }, + "node_modules/safe-regex-test": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", + "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "is-regex": "^1.1.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, + "node_modules/sane": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz", + "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==", + "deprecated": "some dependency vulnerabilities fixed, support for node < 10 dropped, and newer ECMAScript syntax/features added", + "dev": true, + "dependencies": { + "@cnakazawa/watch": "^1.0.3", + "anymatch": "^2.0.0", + "capture-exit": "^2.0.0", + "exec-sh": "^0.3.2", + "execa": "^1.0.0", + "fb-watchman": "^2.0.0", + "micromatch": "^3.1.4", + "minimist": "^1.1.1", + "walker": "~1.0.5" + }, + "bin": { + "sane": "src/cli.js" + }, + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + }, + "node_modules/scope-analyzer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/scope-analyzer/-/scope-analyzer-2.1.2.tgz", + "integrity": "sha512-5cfCmsTYV/wPaRIItNxatw02ua/MThdIUNnUOCYp+3LSEJvnG804ANw2VLaavNILIfWXF1D1G2KNANkBBvInwQ==", + "dev": true, + "dependencies": { + "array-from": "^2.1.1", + "dash-ast": "^2.0.1", + "es6-map": "^0.1.5", + "es6-set": "^0.1.5", + "es6-symbol": "^3.1.1", + "estree-is-function": "^1.0.0", + "get-assigned-identifiers": "^1.1.0" + } + }, + "node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==" + }, + "node_modules/set-value": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", + "dev": true, + "dependencies": { + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/set-value/node_modules/extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", + "dev": true, + "dependencies": { + "is-extendable": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/set-value/node_modules/is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/sha.js": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + }, + "bin": { + "sha.js": "bin.js" + } + }, + "node_modules/shallow-copy": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz", + "integrity": "sha512-b6i4ZpVuUxB9h5gfCxPiusKYkqTMOjEbBs4wMaFbkfia4yFv92UKZ6Df8WXcKbn08JNL/abvg3FnMAOfakDvUw==", + "dev": true + }, + "node_modules/shasum": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz", + "integrity": "sha512-UTzHm/+AzKfO9RgPgRpDIuMSNie1ubXRaljjlhFMNGYoG7z+rm9AHLPMf70R7887xboDH9Q+5YQbWKObFHEAtw==", + "dev": true, + "dependencies": { + "json-stable-stringify": "~0.0.0", + "sha.js": "~2.4.4" + } + }, + "node_modules/shasum-object": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shasum-object/-/shasum-object-1.0.0.tgz", + "integrity": "sha512-Iqo5rp/3xVi6M4YheapzZhhGPVs0yZwHj7wvwQ1B9z8H6zk+FEnI7y3Teq7qwnekfEhu8WmG2z0z4iWZaxLWVg==", + "dev": true, + "dependencies": { + "fast-safe-stringify": "^2.0.7" + } + }, + "node_modules/shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==", + "dev": true, + "dependencies": { + "shebang-regex": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/shell-quote": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/shellwords": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", + "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==", + "dev": true + }, + "node_modules/side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "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==", + "dev": true + }, + "node_modules/simple-concat": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", + "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", + "dev": true + }, + "node_modules/slash": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", + "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/slice-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", + "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", + "dev": true, + "dependencies": { + "ansi-styles": "^3.2.0", + "astral-regex": "^1.0.0", + "is-fullwidth-code-point": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/snapdragon": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", + "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", + "dev": true, + "dependencies": { + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon-node": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", + "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", + "dev": true, + "dependencies": { + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon-node/node_modules/define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==", + "dev": true, + "dependencies": { + "is-descriptor": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon-util": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "dev": true, + "dependencies": { + "kind-of": "^3.2.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon-util/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "dev": true, + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/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/snapdragon/node_modules/define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", + "dev": true, + "dependencies": { + "is-descriptor": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", + "dev": true, + "dependencies": { + "is-extendable": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==", + "dev": true, + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/is-accessor-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "dev": true, + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==", + "dev": true, + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/is-data-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "dev": true, + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "dependencies": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/node_modules/kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/snapdragon/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/source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-resolve": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", + "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", + "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated", + "dev": true, + "dependencies": { + "atob": "^2.1.2", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" + } + }, + "node_modules/source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "dependencies": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "node_modules/source-map-support/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/source-map-url": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz", + "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==", + "deprecated": "See https://github.com/lydell/source-map-url#deprecated", + "dev": true + }, + "node_modules/sourcemap-codec": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", + "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", + "deprecated": "Please use @jridgewell/sourcemap-codec instead", + "dev": true + }, + "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==", + "dependencies": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-exceptions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" + }, + "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==", + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.13", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz", + "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==" + }, + "node_modules/split-string": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "dev": true, + "dependencies": { + "extend-shallow": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "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 + }, + "node_modules/sshpk": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz", + "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==", + "dev": true, + "dependencies": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + }, + "bin": { + "sshpk-conv": "bin/sshpk-conv", + "sshpk-sign": "bin/sshpk-sign", + "sshpk-verify": "bin/sshpk-verify" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stack-utils": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz", + "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==", + "dev": true, + "dependencies": { + "escape-string-regexp": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/stack-utils/node_modules/escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/static-eval": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.1.0.tgz", + "integrity": "sha512-agtxZ/kWSsCkI5E4QifRwsaPs0P0JmZV6dkLz6ILYfFYQGn+5plctanRN+IC8dJRiFkyXHrwEE3W9Wmx67uDbw==", + "dev": true, + "dependencies": { + "escodegen": "^1.11.1" + } + }, + "node_modules/static-extend": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", + "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==", + "dev": true, + "dependencies": { + "define-property": "^0.2.5", + "object-copy": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-extend/node_modules/define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", + "dev": true, + "dependencies": { + "is-descriptor": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-extend/node_modules/is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==", + "dev": true, + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-extend/node_modules/is-accessor-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "dev": true, + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-extend/node_modules/is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==", + "dev": true, + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-extend/node_modules/is-data-descriptor/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "dev": true, + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-extend/node_modules/is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "dev": true, + "dependencies": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-extend/node_modules/kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/static-module": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/static-module/-/static-module-3.0.4.tgz", + "integrity": "sha512-gb0v0rrgpBkifXCa3yZXxqVmXDVE+ETXj6YlC/jt5VzOnGXR2C15+++eXuMDUYsePnbhf+lwW0pE1UXyOLtGCw==", + "dev": true, + "dependencies": { + "acorn-node": "^1.3.0", + "concat-stream": "~1.6.0", + "convert-source-map": "^1.5.1", + "duplexer2": "~0.1.4", + "escodegen": "^1.11.1", + "has": "^1.0.1", + "magic-string": "0.25.1", + "merge-source-map": "1.0.4", + "object-inspect": "^1.6.0", + "readable-stream": "~2.3.3", + "scope-analyzer": "^2.0.1", + "shallow-copy": "~0.0.1", + "static-eval": "^2.0.5", + "through2": "~2.0.3" + } + }, + "node_modules/static-module/node_modules/convert-source-map": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", + "dev": true + }, + "node_modules/stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/stream-browserify": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", + "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", + "dev": true, + "dependencies": { + "inherits": "~2.0.1", + "readable-stream": "^2.0.2" + } + }, + "node_modules/stream-combiner2": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz", + "integrity": "sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==", + "dev": true, + "dependencies": { + "duplexer2": "~0.1.0", + "readable-stream": "^2.0.2" + } + }, + "node_modules/stream-http": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.2.0.tgz", + "integrity": "sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==", + "dev": true, + "dependencies": { + "builtin-status-codes": "^3.0.0", + "inherits": "^2.0.4", + "readable-stream": "^3.6.0", + "xtend": "^4.0.2" + } + }, + "node_modules/stream-http/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/stream-splicer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.1.tgz", + "integrity": "sha512-Xizh4/NPuYSyAXyT7g8IvdJ9HJpxIGL9PjyhtywCZvvP0OPIdqyrr4dMikeuvY8xahpdKEBlBTySe583totajg==", + "dev": true, + "dependencies": { + "inherits": "^2.0.1", + "readable-stream": "^2.0.2" + } + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "dev": true, + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-length": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-2.0.0.tgz", + "integrity": "sha512-Qka42GGrS8Mm3SZ+7cH8UXiIWI867/b/Z/feQSpQx/rbfB8UGknGEZVaUQMOUVj+soY6NpWAxily63HI1OckVQ==", + "dev": true, + "dependencies": { + "astral-regex": "^1.0.0", + "strip-ansi": "^4.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "dependencies": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", + "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", + "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", + "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.4", + "es-abstract": "^1.20.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "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==", + "dev": true, + "dependencies": { + "ansi-regex": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-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==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "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, + "engines": { + "node": ">=4" + } + }, + "node_modules/strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/subarg": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz", + "integrity": "sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==", + "dev": true, + "dependencies": { + "minimist": "^1.1.0" + } + }, + "node_modules/superagent": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz", + "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==", + "deprecated": "Please upgrade to v7.0.2+ of superagent. We have fixed numerous issues with streams, form-data, attach(), filesystem errors not bubbling up (ENOENT on attach()), and all tests are now passing. See the releases tab for more information at .", + "dev": true, + "dependencies": { + "component-emitter": "^1.2.0", + "cookiejar": "^2.1.0", + "debug": "^3.1.0", + "extend": "^3.0.0", + "form-data": "^2.3.1", + "formidable": "^1.2.0", + "methods": "^1.1.1", + "mime": "^1.4.1", + "qs": "^6.5.1", + "readable-stream": "^2.3.5" + }, + "engines": { + "node": ">= 4.0" + } + }, + "node_modules/superagent/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "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, + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "dev": true + }, + "node_modules/syntax-error": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz", + "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==", + "dev": true, + "dependencies": { + "acorn-node": "^1.2.0" + } + }, + "node_modules/table": { + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", + "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", + "dev": true, + "dependencies": { + "ajv": "^6.10.2", + "lodash": "^4.17.14", + "slice-ansi": "^2.1.0", + "string-width": "^3.0.0" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/table/node_modules/string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "dependencies": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/table/node_modules/strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "dependencies": { + "ansi-regex": "^4.1.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/ternary": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ternary/-/ternary-1.0.0.tgz", + "integrity": "sha512-/e+OUAGiEqytNLXnDfFkuel0N0y9IGkmvuGIPkirI+zv0dx/jPvUZ2l8qV6KYk8lmmLrAqk4iLJtRduUA6AUKw==", + "dev": true + }, + "node_modules/test-exclude": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz", + "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==", + "dev": true, + "dependencies": { + "glob": "^7.1.3", + "minimatch": "^3.0.4", + "read-pkg-up": "^4.0.0", + "require-main-filename": "^2.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, + "node_modules/throat": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz", + "integrity": "sha512-wCVxLDcFxw7ujDxaeJC6nfl2XfHJNYs8yUYJnvMgtPEFlttP9tHSfRUv2vBe6C4hkVFPWoP1P6ZccbYjmSEkKA==", + "dev": true + }, + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "dev": true + }, + "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, + "dependencies": { + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" + } + }, + "node_modules/timers-browserify": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz", + "integrity": "sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==", + "dev": true, + "dependencies": { + "process": "~0.11.0" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, + "dependencies": { + "os-tmpdir": "~1.0.2" + }, + "engines": { + "node": ">=0.6.0" + } + }, + "node_modules/tmpl": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", + "dev": true + }, + "node_modules/to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/to-object-path": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", + "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==", + "dev": true, + "dependencies": { + "kind-of": "^3.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-object-path/node_modules/kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "dev": true, + "dependencies": { + "is-buffer": "^1.1.5" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-regex": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "dev": true, + "dependencies": { + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", + "dev": true, + "dependencies": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "dev": true, + "dependencies": { + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/tough-cookie/node_modules/punycode": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/tr46": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", + "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==", + "dev": true, + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/tr46/node_modules/punycode": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/transformify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/transformify/-/transformify-0.1.2.tgz", + "integrity": "sha512-BUZAqCslm5pVXExA8PfXcvp7exsUNqRcNzx+KXj3Bv0oMROqnAt4bvs9U8Z2wVPa40NvLWJ/oswN0kreNFxBUg==", + "dev": true, + "dependencies": { + "readable-stream": "~1.1.9" + } + }, + "node_modules/transformify/node_modules/isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==", + "dev": true + }, + "node_modules/transformify/node_modules/readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==", + "dev": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "node_modules/transformify/node_modules/string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==", + "dev": true + }, + "node_modules/ts-jest": { + "version": "24.3.0", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-24.3.0.tgz", + "integrity": "sha512-Hb94C/+QRIgjVZlJyiWwouYUF+siNJHJHknyspaOcZ+OQAIdFG/UrdQVXw/0B8Z3No34xkUXZJpOTy9alOWdVQ==", + "dev": true, + "dependencies": { + "bs-logger": "0.x", + "buffer-from": "1.x", + "fast-json-stable-stringify": "2.x", + "json5": "2.x", + "lodash.memoize": "4.x", + "make-error": "1.x", + "mkdirp": "0.x", + "resolve": "1.x", + "semver": "^5.5", + "yargs-parser": "10.x" + }, + "bin": { + "ts-jest": "cli.js" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "jest": ">=24 <25" + } + }, + "node_modules/ts-jest/node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true, + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/ts-jest/node_modules/lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", + "dev": true + }, + "node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "node_modules/tslint": { + "version": "5.20.1", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz", + "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==", + "dev": true, + "dependencies": { + "@babel/code-frame": "^7.0.0", + "builtin-modules": "^1.1.1", + "chalk": "^2.3.0", + "commander": "^2.12.1", + "diff": "^4.0.1", + "glob": "^7.1.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "mkdirp": "^0.5.1", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.8.0", + "tsutils": "^2.29.0" + }, + "bin": { + "tslint": "bin/tslint" + }, + "engines": { + "node": ">=4.8.0" + }, + "peerDependencies": { + "typescript": ">=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev || >= 3.1.0-dev || >= 3.2.0-dev" + } + }, + "node_modules/tsutils": { + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", + "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", + "dev": true, + "dependencies": { + "tslib": "^1.8.1" + }, + "peerDependencies": { + "typescript": ">=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev" + } + }, + "node_modules/tty-browserify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz", + "integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==", + "dev": true + }, + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.0.1" + }, + "engines": { + "node": "*" + } + }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", + "dev": true + }, + "node_modules/type": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", + "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==", + "dev": true + }, + "node_modules/type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==", + "dev": true, + "dependencies": { + "prelude-ls": "~1.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/typed-array-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", + "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.2.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", + "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "is-typed-array": "^1.1.10" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", + "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", + "dev": true, + "dependencies": { + "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" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", + "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "is-typed-array": "^1.1.9" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==", + "dev": true + }, + "node_modules/typescript": { + "version": "3.9.10", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", + "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", + "dev": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, + "node_modules/umd": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/umd/-/umd-3.0.3.tgz", + "integrity": "sha512-4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==", + "dev": true, + "bin": { + "umd": "bin/cli.js" + } + }, + "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, + "dependencies": { + "call-bind": "^1.0.2", + "has-bigints": "^1.0.2", + "has-symbols": "^1.0.3", + "which-boxed-primitive": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/undeclared-identifiers": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/undeclared-identifiers/-/undeclared-identifiers-1.1.3.tgz", + "integrity": "sha512-pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==", + "dev": true, + "dependencies": { + "acorn-node": "^1.3.0", + "dash-ast": "^1.0.0", + "get-assigned-identifiers": "^1.2.0", + "simple-concat": "^1.0.0", + "xtend": "^4.0.1" + }, + "bin": { + "undeclared-identifiers": "bin.js" + } + }, + "node_modules/undeclared-identifiers/node_modules/dash-ast": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/dash-ast/-/dash-ast-1.0.0.tgz", + "integrity": "sha512-Vy4dx7gquTeMcQR/hDkYLGUnwVil6vk4FOOct+djUnHOUWt+zJPJAaRIXaAFkPXtJjvlY7o3rfRu0/3hpnwoUA==", + "dev": true + }, + "node_modules/union-value": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", + "dev": true, + "dependencies": { + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^2.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/union-value/node_modules/is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/unset-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", + "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==", + "dev": true, + "dependencies": { + "has-value": "^0.3.1", + "isobject": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/unset-value/node_modules/has-value": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", + "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==", + "dev": true, + "dependencies": { + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/unset-value/node_modules/has-value/node_modules/isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==", + "dev": true, + "dependencies": { + "isarray": "1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/unset-value/node_modules/has-values": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", + "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", + "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "dependencies": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/uri-js/node_modules/punycode": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "engines": { + "node": ">=6" + } + }, + "node_modules/urix": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", + "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==", + "deprecated": "Please see https://github.com/lydell/urix#deprecated", + "dev": true + }, + "node_modules/url": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.1.tgz", + "integrity": "sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==", + "dev": true, + "dependencies": { + "punycode": "^1.4.1", + "qs": "^6.11.0" + } + }, + "node_modules/url/node_modules/qs": { + "version": "6.11.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz", + "integrity": "sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==", + "dev": true, + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/use": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/util": { + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", + "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", + "dev": true, + "dependencies": { + "inherits": "2.0.3" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true + }, + "node_modules/util.promisify": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.2.tgz", + "integrity": "sha512-PBdZ03m1kBnQ5cjjO0ZvJMJS+QsbyIcFwi4hY4U76OQsCO9JrOYjbCFgIF76ccFg9xnJo7ZHPkqyj1GqmdS7MA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "for-each": "^0.3.3", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3", + "object.getownpropertydescriptors": "^2.1.6", + "safe-array-concat": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/util/node_modules/inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", + "dev": true + }, + "node_modules/uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "dev": true, + "bin": { + "uuid": "bin/uuid" + } + }, + "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==", + "dependencies": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, + "node_modules/verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, + "node_modules/verror/node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", + "dev": true + }, + "node_modules/vm-browserify": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", + "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", + "dev": true + }, + "node_modules/w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.", + "dev": true, + "dependencies": { + "browser-process-hrtime": "^1.0.0" + } + }, + "node_modules/walker": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz", + "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==", + "dev": true, + "dependencies": { + "makeerror": "1.0.12" + } + }, + "node_modules/webidl-conversions": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", + "dev": true + }, + "node_modules/whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "dev": true, + "dependencies": { + "iconv-lite": "0.4.24" + } + }, + "node_modules/whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==", + "dev": true + }, + "node_modules/whatwg-url": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz", + "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==", + "dev": true, + "dependencies": { + "lodash.sortby": "^4.7.0", + "tr46": "^1.0.1", + "webidl-conversions": "^4.0.2" + } + }, + "node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, + "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": { + "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": "1.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==" + }, + "node_modules/which-typed-array": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", + "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", + "dev": true, + "dependencies": { + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "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/wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==", + "dependencies": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrap-ansi/node_modules/ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", + "dependencies": { + "number-is-nan": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrap-ansi/node_modules/string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", + "dependencies": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/wrap-ansi/node_modules/strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", + "dependencies": { + "ansi-regex": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "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==", + "dev": true + }, + "node_modules/write": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", + "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", + "dev": true, + "dependencies": { + "mkdirp": "^0.5.1" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/write-file-atomic": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.4.1.tgz", + "integrity": "sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "signal-exit": "^3.0.2" + } + }, + "node_modules/ws": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.3.tgz", + "integrity": "sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==", + "dev": true, + "dependencies": { + "async-limiter": "~1.0.0" + } + }, + "node_modules/xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==", + "dev": true + }, + "node_modules/xtend": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", + "dev": true, + "engines": { + "node": ">=0.4" + } + }, + "node_modules/y18n": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz", + "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==" + }, + "node_modules/yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true + }, + "node_modules/yargs": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", + "integrity": "sha512-6/QWTdisjnu5UHUzQGst+UOEuEVwIzFVGBjq3jMTFNs5WJQsH/X6nMURSaScIdF5txylr1Ao9bvbWiKi2yXbwA==", + "dependencies": { + "camelcase": "^3.0.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.2", + "which-module": "^1.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^4.2.0" + } + }, + "node_modules/yargs-parser": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz", + "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==", + "dev": true, + "dependencies": { + "camelcase": "^4.1.0" + } + }, + "node_modules/yargs-parser/node_modules/camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha512-FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/yargs/node_modules/ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yargs/node_modules/camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yargs/node_modules/find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==", + "dependencies": { + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yargs/node_modules/is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==", + "dependencies": { + "number-is-nan": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yargs/node_modules/load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==", + "dependencies": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yargs/node_modules/parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==", + "dependencies": { + "error-ex": "^1.2.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yargs/node_modules/path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==", + "dependencies": { + "pinkie-promise": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yargs/node_modules/path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==", + "dependencies": { + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yargs/node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yargs/node_modules/read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==", + "dependencies": { + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yargs/node_modules/read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==", + "dependencies": { + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yargs/node_modules/require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==" + }, + "node_modules/yargs/node_modules/string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==", + "dependencies": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yargs/node_modules/strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==", + "dependencies": { + "ansi-regex": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yargs/node_modules/strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==", + "dependencies": { + "is-utf8": "^0.2.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yargs/node_modules/yargs-parser": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", + "integrity": "sha512-+QQWqC2xeL0N5/TE+TY6OGEqyNRM+g2/r712PDNYgiCdXYCApXf1vzfmDSLBxfGRwV+moTq/V8FnMI24JCm2Yg==", + "dependencies": { + "camelcase": "^3.0.0" + } + } + } +} diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/test.v b/third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/test.v new file mode 100644 index 0000000000..940543ae0e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/logic/netlistsvg/test.v @@ -0,0 +1,7 @@ +module helloworld ( + input wire[7:0] a, + input wire[7:0] b, + output wire[7:0] c, +); + assign c = a + b; +endmodule diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/surelog/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/surelog/default.nix index 3b88ff3403..d8c762de60 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/surelog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/surelog/default.nix @@ -10,19 +10,19 @@ , gtest , uhdm , antlr4 -, flatbuffers , capnproto }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "surelog"; - version = "1.57"; + version = "1.73"; src = fetchFromGitHub { owner = "chipsalliance"; - repo = pname; - rev = "v${version}"; - hash = "sha256-Gty0OSNG5Nonyw7v2KiKP51LhiugMY7uqI6aJ6as0SQ="; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-z47Eqs3fP53pbEb3s66CqMiO4UpEwox+fKakxtRBakQ="; + fetchSubmodules = false; # we use all dependencies from nix }; nativeBuildInputs = [ @@ -40,14 +40,13 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid gperftools - flatbuffers uhdm capnproto antlr4.runtime.cpp ]; cmakeFlags = [ - "-DSURELOG_USE_HOST_FLATBUFFERS=On" + "-DSURELOG_USE_HOST_CAPNP=On" "-DSURELOG_USE_HOST_UHDM=On" "-DSURELOG_USE_HOST_GTEST=On" "-DSURELOG_USE_HOST_ANTLR=On" @@ -66,7 +65,8 @@ stdenv.mkDerivation rec { description = "SystemVerilog 2017 Pre-processor, Parser, Elaborator, UHDM Compiler"; homepage = "https://github.com/chipsalliance/Surelog"; license = lib.licenses.asl20; + mainProgram = "surelog"; maintainers = with lib.maintainers; [ matthuszagh ]; platforms = lib.platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix index d5d6512c73..09ef2d7d46 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -4,12 +4,12 @@ }: let - version = "1.6.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "tamarin-prover"; repo = "tamarin-prover"; rev = version; - sha256 = "sha256:0cz1v7k4d0im749ag632nc34n91b51b0pq4z05rzw1p59a5lza92"; + sha256 = "sha256-ujnaUdbjqajmkphOS4Fs4QBCRGX4JZkQ2p1X2jripww="; }; # tamarin has its own dependencies, but they're kept inside the repo, @@ -51,6 +51,7 @@ let doHaddock = false; # broken libraryHaskellDepends = (with haskellPackages; [ aeson aeson-pretty parallel uniplate + regex-pcre-builtin regex-posix split ]) ++ [ tamarin-prover-utils tamarin-prover-term ]; }); @@ -62,31 +63,37 @@ let ]) ++ [ tamarin-prover-theory ]; }); + tamarin-prover-accountability = mkDerivation (common "tamarin-prover-accountability" (src + "/lib/accountability") // { + postPatch = "cp --remove-destination ${src}/LICENSE ."; + doHaddock = false; # broken + libraryHaskellDepends = (with haskellPackages; [ + raw-strings-qq + ]) ++ [ + tamarin-prover-utils + tamarin-prover-term + tamarin-prover-theory + ]; + }); + + tamarin-prover-export = mkDerivation (common "tamarin-prover-export" (src + "/lib/export") // { + postPatch = "cp --remove-destination ${src}/LICENSE ."; + doHaddock = false; # broken + libraryHaskellDepends = (with haskellPackages; [ + HStringTemplate + ]) ++ [ + tamarin-prover-utils + tamarin-prover-term + tamarin-prover-theory + tamarin-prover-sapic + ]; + }); + in mkDerivation (common "tamarin-prover" src // { isLibrary = false; isExecutable = true; - patches = [ - # Backport unreleased patch allowing maude 3.2.1 - (fetchpatch { - name = "tamarin-prover-allow-maude-3.2.1.patch"; - url = "https://github.com/tamarin-prover/tamarin-prover/commit/bfcf56909479e154a203f0eeefa767f4d91b600d.patch"; - sha256 = "1zjqzyxwnfp7z3h3li8jrxn9732dx6lyq9q3w2dsphmxbzrs64dg"; - }) - # Backport unreleased patch allowing maude 3.2.2 - (fetchpatch { - name = "tamarin-prover-allow-maude-3.2.2.patch"; - url = "https://github.com/tamarin-prover/tamarin-prover/commit/df1aa9fc4fcc72b6cf0bed0f71844efe3d8ad238.patch"; - sha256 = "1bkwvyyz5d660jjh08z8wq9c3l40s0rxd2nsbn20xnl2nynyvqpy"; - }) - # Backport proposed patch allowing maude 3.3 and 3.3.1 - (fetchpatch { - name = "tamarin-prover-allow-maude-3.3.patch"; - url = "https://github.com/tamarin-prover/tamarin-prover/pull/544/commits/d0313b1a1bac7c92130773f7ccdd890f8aec286d.patch"; - sha256 = "1jhlz8vp9a3aahyhj24yjcv4l1389y9kg878yfnq0rkkgvk0m681"; - }) - ]; + patches = [ ]; # strip out unneeded deps manually doHaddock = false; @@ -118,6 +125,8 @@ mkDerivation (common "tamarin-prover" src // { resourcet shakespeare threads wai warp yesod-core yesod-static ]) ++ [ tamarin-prover-utils tamarin-prover-sapic + tamarin-prover-accountability + tamarin-prover-export tamarin-prover-term tamarin-prover-theory ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix index 2a667a8ac9..c611ccdf5b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/uhdm/default.nix @@ -7,15 +7,16 @@ , gtest }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "UHDM"; - version = "1.57"; + version = "1.74"; src = fetchFromGitHub { owner = "chipsalliance"; - repo = pname; - rev = "v${version}"; - hash = "sha256-z3vURlKXCW5W2naVwJjBXcn94u80JsBxlUOIy9ylsJw="; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-DiwLo/3RcXY+wG2+7aDx4p6UuQm/eNX/kG35TJzIbe0="; + fetchSubmodules = false; # we use all dependencies from nix }; nativeBuildInputs = [ @@ -43,4 +44,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ matthuszagh ]; platforms = lib.platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix index da8d8ac9ea..24d3fb84d6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "sha256-iqHdyyZX3AcBAjPTpZAiJi0IHhEDWBtKp0e2LAdWGsQ="; + sha256 = "sha256-/mh8IN3rGUZIYvyrqnhl0mgnizPZzDduXjQHIDouI38="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/geogebra/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/geogebra/default.nix index e9e309f421..f4c6e72427 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/geogebra/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/geogebra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: +{ lib, stdenv, fetchurl, xorg, jre, makeDesktopItem, makeWrapper, unzip, language ? "en_US" }: let pname = "geogebra"; version = "5-0-785-0"; @@ -55,7 +55,11 @@ let installPhase = '' install -D geogebra/* -t "$out/libexec/geogebra/" + # The bundled jogl (required for 3D graphics) links to libXxf86vm + # OpenGL versions newer than 3.0 cause "javax.media.opengl.GLException: Not a GL2 implementation" makeWrapper "$out/libexec/geogebra/geogebra" "$out/bin/geogebra" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ xorg.libXxf86vm ]}" \ + --set MESA_GL_VERSION_OVERRIDE 3.0 \ --set JAVACMD "${jre}/bin/java" \ --set GG_PATH "$out/libexec/geogebra" \ --add-flags "--language=${language}" diff --git a/third_party/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix b/third_party/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix index 4cfcb6debb..38b668804a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/geogebra/geogebra6.nix @@ -30,7 +30,7 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" - "https://web.archive.org/web/20230627211859/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" + "https://web.archive.org/web/20230824011801/https://download.geogebra.org/installers/6.0/GeoGebra-Linux64-Portable-${version}.zip" ]; hash = "sha256-sNCq1Xcx/Y5r+SIRiqQYcG9dVsfIC2Ef5KJf+tgfxC8="; }; @@ -65,9 +65,9 @@ let src = fetchurl { urls = [ "https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" - "https://web.archive.org/web/20230627214413/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" + "https://web.archive.org/web/20230824012900/https://download.geogebra.org/installers/6.0/GeoGebra-Classic-6-MacOS-Portable-${version}.zip" ]; - hash = "sha256-HtIhhq8E1Q5B6xZ7q6Ok95Rt53VWLoGf8PbY+UEOSKg="; + hash = "sha256-CrSoKAjXiejfJHyv8wIpcRr2d8u/50HnatiDm1CdnGQ="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix index c7ae890c07..752b05fe4f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "pari_2_11.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/pari_2_11.patch?id=21ba7540d385a9864b44850d6987893dfa16bfc0"; + url = "https://raw.githubusercontent.com/sagemath/sage/21ba7540d385a9864b44850d6987893dfa16bfc0/build/pkgs/giac/patches/pari_2_11.patch"; sha256 = "sha256-vEo/5MNzMdYRPWgLFPsDcMT1W80Qzj4EPBjx/B8j68k="; }) @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # means some outputs differ in the make check. Patch around this: (fetchpatch { name = "nofltk-check.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26"; + url = "https://raw.githubusercontent.com/sagemath/sage/7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26/build/pkgs/giac/patches/nofltk-check.patch"; sha256 = "sha256-nAl5q3ufLjK3X9s0qMlGNowdRRf3EaC24eVtJABzdXY="; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix index 057b242e60..d9d12cbf38 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/ginac/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ginac"; - version = "1.8.6"; + version = "1.8.7"; src = fetchurl { url = "https://www.ginac.de/ginac-${version}.tar.bz2"; - sha256 = "sha256-ALMgsRFsrlt7QzZNv/t5EkcdFx9ITYJ2RgXXFYWNl1s="; + sha256 = "sha256-cf9PLYoA5vB86P7mm3bcweu7cnvmdgtYfB+7XM97Yeo="; }; propagatedBuildInputs = [ cln ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gretl/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gretl/default.nix index 64e2b9f913..f7ccbf8905 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/gretl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/gretl/default.nix @@ -1,13 +1,29 @@ -{ lib, stdenv, fetchurl, curl, fftw, gmp, gnuplot, gtk3, gtksourceview3, json-glib -, lapack, libxml2, mpfr, openblas, pkg-config, readline }: +{ lib +, stdenv +, fetchurl +, curl +, fftw +, gmp +, gnuplot +, gtk3 +, gtksourceview3 +, json-glib +, lapack +, libxml2 +, mpfr +, openblas +, readline +, Accelerate +, pkg-config +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gretl"; - version = "2023a"; + version = "2023b"; src = fetchurl { - url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; - sha256 = "sha256-T1UwQhw/Tr/juYqVJBkst2LRBCIXPLvVd0N+QCJcVtM="; + url = "mirror://sourceforge/gretl/gretl-${finalAttrs.version}.tar.xz"; + hash = "sha256-Hf025JjFxde43TN/1m9PeA1uHqxKTZMI8+1qf3XJLGs="; }; buildInputs = [ @@ -23,9 +39,13 @@ stdenv.mkDerivation rec { mpfr openblas readline + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Accelerate ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + ]; enableParallelBuilding = true; # Missing install depends: @@ -33,15 +53,15 @@ stdenv.mkDerivation rec { # make[1]: *** [Makefile:73: install_datafiles] Error 1 enableParallelInstalling = false; - meta = with lib; { + meta = { description = "A software package for econometric analysis"; + homepage = "https://gretl.sourceforge.net"; + license = lib.licenses.gpl3; longDescription = '' gretl is a cross-platform software package for econometric analysis, written in the C programming language. ''; - homepage = "https://gretl.sourceforge.net"; - license = licenses.gpl3; - maintainers = with maintainers; [ dmrauh ]; - platforms = with platforms; all; + maintainers = with lib.maintainers; [ dmrauh ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix index 9d1b5c09b8..e7ac178cd5 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix @@ -18,12 +18,12 @@ let searchPath = lib.makeBinPath (lib.filter (x: x != null) [ lisp-compiler rlwrap tk gnuplot ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "maxima"; version = "5.46.0"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + url = "mirror://sourceforge/${finalAttrs.pname}/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; sha256 = "sha256-c5Dwa0jaZckDPosvYpuXi5AFZFSlQCLbfecOIiWqiwc="; }; @@ -52,31 +52,31 @@ stdenv.mkDerivation rec { done # Move emacs modules and documentation into the right place. mkdir -p $out/share/emacs $out/share/doc - ln -s ../maxima/${version}/emacs $out/share/emacs/site-lisp - ln -s ../maxima/${version}/doc $out/share/doc/maxima + ln -s ../maxima/${finalAttrs.version}/emacs $out/share/emacs/site-lisp + ln -s ../maxima/${finalAttrs.version}/doc $out/share/doc/maxima '' + (lib.optionalString (lisp-compiler.pname == "ecl") '' - cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${version}/binary-ecl/" + cp src/binary-ecl/maxima.fas* "$out/lib/maxima/${finalAttrs.version}/binary-ecl/" '') ; patches = [ # fix path to info dir (see https://trac.sagemath.org/ticket/11348) (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/infodir.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/maxima/patches/infodir.patch"; sha256 = "09v64n60f7i6frzryrj0zd056lvdpms3ajky4f9p6kankhbiv21x"; }) # fix https://sourceforge.net/p/maxima/bugs/2596/ (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/matrixexp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/maxima/patches/matrixexp.patch"; sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg"; }) # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca # see https://trac.sagemath.org/ticket/13364#comment:93 (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; + url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch"; sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; }) ]; @@ -115,4 +115,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/math/mpsolve/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/mpsolve/default.nix new file mode 100644 index 0000000000..e9b8a3185a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/math/mpsolve/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchurl +, gmp +, pkg-config +, qtbase +, wrapQtAppsHook +, gtk3 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mpsolve"; + version = "3.2.1"; + + src = fetchurl { + url = "https://numpi.dm.unipi.it/_media/software/mpsolve/mpsolve-${finalAttrs.version}.tar.gz"; + hash = "sha256-PRFCiumrLgIPJMq/vNnk2bIuxXLPcK8NRP6Nrh1R544="; + }; + + nativeBuildInputs = [ + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + gmp + gtk3 + qtbase + ]; + + meta = { + homepage = "https://numpi.dm.unipi.it/scientific-computing-libraries/mpsolve/"; + description = "Multiprecision Polynomial Solver"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ kilianar ]; + mainProgram = "mpsolve"; + platforms = lib.platforms.linux; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix index 970f5517c2..ade614c89b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -1,20 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, intltool, autoreconfHook, pkg-config, libqalculate, gtk3, curl, wrapGAppsHook, desktopToDarwinBundle }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qalculate-gtk"; - version = "4.7.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; - rev = "v${version}"; - sha256 = "sha256-Fbi+vZEyXhUZQjWUX01IXd6G1cthfiuztdbisNQ/VZU="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-bG0hui5GjHWHny/8Rq5sZGz3s5rYnYlpc+K8I/LwDto="; }; hardeningDisable = [ "format" ]; - nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook ]; - buildInputs = [ libqalculate gtk3 ]; + nativeBuildInputs = [ intltool pkg-config autoreconfHook wrapGAppsHook ] + ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ]; + buildInputs = [ libqalculate gtk3 curl ]; enableParallelBuilding = true; meta = with lib; { @@ -24,4 +25,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix index abe65e4136..adc43b5f9d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-qt/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, intltool, pkg-config, qmake, wrapQtAppsHook, libqalculate, qtbase, qttools, qtsvg, qtwayland }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qalculate-qt"; - version = "4.7.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-qt"; - rev = "v${version}"; - hash = "sha256-fMchJgxuOO2e7cOHLako26c9gsWvQY2MTRVD3JWGSAU="; + rev = "v${finalAttrs.version}"; + hash = "sha256-hH+orU+5PmPcrhkLKCdsDhVCrD8Mvxp2RPTGSlsUP7Y="; }; nativeBuildInputs = [ qmake intltool pkg-config qttools wrapQtAppsHook ]; @@ -33,4 +33,4 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix index 44c68ebcdc..42e6b7d00a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ratpoints/patches/sturm_and_rp_private.patch?id=1615f58890e8f9881c4228c78a6b39b9aab1303a"; + url = "https://raw.githubusercontent.com/sagemath/sage/1615f58890e8f9881c4228c78a6b39b9aab1303a/build/pkgs/ratpoints/patches/sturm_and_rp_private.patch"; sha256 = "0q3wajncyfr3gahd8gwk9x7g56zw54lpywrl63lqk7drkf60mrcl"; }) ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/README.md b/third_party/nixpkgs/pkgs/applications/science/math/sage/README.md index c4de5da45d..35e8d0deef 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/README.md +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/README.md @@ -2,7 +2,7 @@ Sage is a pretty complex package that depends on many other complex packages and patches some of those. As a result, the sage nix package is also quite complex. -Don't feel discouraged to fix, simplify or improve things though. The individual files have comments explaining their purpose. The most importent ones are `default.nix` linking everything together, `sage-src.nix` adding patches and `sagelib.nix` building the actual sage package. +Don't feel discouraged to fix, simplify or improve things though. The individual files have comments explaining their purpose. The most important ones are `default.nix` linking everything together, `sage-src.nix` adding patches and `sagelib.nix` building the actual sage package. ## The sage build is broken diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index dee6e8eb0d..9fe07603fe 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix @@ -103,6 +103,13 @@ stdenv.mkDerivation rec { url = "https://github.com/sagemath/sage/commit/1a1b49f814cdf4c4c8d0ac8930610f3fef6af5b0.diff"; sha256 = "sha256-GqMgoi0tsP7zcCcPumhdsbvhPB6fgw1ufx6gHlc6iSc="; }) + + # https://github.com/sagemath/sage/pull/36006, positively reviewed + (fetchpatch { + name = "gmp-6.3-upgrade.patch"; + url = "https://github.com/sagemath/sage/commit/d88bc3815c0901bfdeaa3e4a31107c084199f614.diff"; + sha256 = "sha256-dXaEwk2wXxmx02sCw4Vu9mF0ZrydhFD4LRwNAiQsPgM="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix index 2cd6336675..227e4bbdbf 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage.nix @@ -47,10 +47,11 @@ stdenv.mkDerivation rec { passthru = { tests = sage-tests; quicktest = sage-tests.override { longTests = false; timeLimit = 600; }; # as many tests as possible in ~10m - doc = sagedoc; lib = sage-with-env.env.lib; with-env = sage-with-env; kernelspec = jupyter-kernel-definition; + } // lib.optionalAttrs withDoc { + doc = sagedoc; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/math/wolfram-engine/l10ns.nix b/third_party/nixpkgs/pkgs/applications/science/math/wolfram-engine/l10ns.nix index 5a29633016..ae1886bae1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/wolfram-engine/l10ns.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/wolfram-engine/l10ns.nix @@ -7,6 +7,13 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ + { + version = "13.3.0"; + lang = "en"; + language = "English"; + sha256 = "96106ac8ed6d0e221a68d846117615c14025320f927e5e0ed95b1965eda68e31"; + installer = "WolframEngine_13.3.0_LINUX.sh"; + } { version = "13.2.0"; lang = "en"; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix index ee2f62317c..c475dbd5ef 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/wxmaxima/default.nix @@ -10,14 +10,14 @@ , glib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs:{ pname = "wxmaxima"; version = "23.02.1"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; - rev = "Version-${version}"; + rev = "Version-${finalAttrs.version}"; sha256 = "sha256-Lrj/oJNmKlCkNbnCGY2TewCospwajKdWgmKkreHzEIU="; }; @@ -51,4 +51,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix b/third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix deleted file mode 100644 index b08acc77c6..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/medicine/aliza/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib, stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU, libGL }: - -with lib; -stdenv.mkDerivation { - pname = "aliza"; - version = "1.98.57"; - src = fetchurl { - # See https://www.aliza-dicom-viewer.com/download - urls = [ - "https://drive.google.com/uc?export=download&id=1-AXa3tjy_onecW2k7ftjAQl0KGTb0B1Y" - "https://web.archive.org/web/20210327224315/https://doc-0s-0s-docs.googleusercontent.com/docs/securesc/ha0ro937gcuc7l7deffksulhg5h7mbp1/1lgjid9ti29rdf5ebmd7o58iqhs3gfpo/1616884950000/16072287944266838401/*/1-AXa3tjy_onecW2k7ftjAQl0KGTb0B1Y?e=download" - ]; - sha256 = "01qk2gadmc24pmfdnmpiz7vgfiqkvhznyq9rsr153frscg76gc9b"; - name = "aliza.rpm"; - }; - - nativeBuildInputs = [ makeWrapper rpmextract ]; - - unpackCmd = "rpmextract $curSrc"; - - postPatch = '' - sed -i 's/^Exec.*$/Exec=aliza %F/' share/applications/aliza.desktop - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -r bin share $out - - runHook postInstall - ''; - - postInstall = let - libs = lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU libGL ]; - in '' - ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/aliza - - ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/aliza-vtkvol - - wrapProgram $out/bin/aliza \ - --prefix LD_LIBRARY_PATH : ${libs} - - wrapProgram $out/bin/aliza-vtkvol \ - --prefix LD_LIBRARY_PATH : ${libs} - ''; - - meta = { - description = "Medical imaging software with 2D, 3D and 4D capabilities"; - homepage = "https://www.aliza-dicom-viewer.com"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ mounium ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/medicine/xmedcon/default.nix b/third_party/nixpkgs/pkgs/applications/science/medicine/xmedcon/default.nix index 5a0f3877cd..b09183f71b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/medicine/xmedcon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/medicine/xmedcon/default.nix @@ -6,6 +6,7 @@ , pkg-config , libpng , zlib +, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -24,11 +25,11 @@ stdenv.mkDerivation rec { zlib ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook ]; meta = with lib; { description = "An open source toolkit for medical image conversion "; - homepage = "https://xmedcon.sourceforge.io/Main/HomePage"; + homepage = "https://xmedcon.sourceforge.net/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ arianvp flokli ]; platforms = platforms.darwin ++ platforms.linux; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix index f806be834b..4721e94646 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { pname = "boinc"; - version = "7.22.2"; + version = "7.24.1"; src = fetchFromGitHub { name = "${pname}-${version}-src"; owner = "BOINC"; repo = "boinc"; rev = "client_release/${lib.versions.majorMinor version}/${version}"; - hash = "sha256-9GgvyYiDfppRuDFfxn50e+YZeSX0SLKSfo31lWx2FBs="; + hash = "sha256-CAzAKxNHG8ew9v2B1jK7MxfWGwTfdmDncDe7QT+twd8="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix index 52cfc7210c..bd5b698988 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/cytoscape/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cytoscape"; - version = "3.10.0"; + version = "3.10.1"; src = fetchurl { url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz"; - sha256 = "sha256-xfEVNOXptMpcrisr+a62JruXki1V0YjA/j4US7X8mXA="; + sha256 = "sha256-fqxAsnpMYCYj0hW2oxu/NH4PqesRlWPs5eDSeSjy1aU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/golly/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/golly/default.nix index 7d91c76579..52b05cbb7e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/golly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/golly/default.nix @@ -1,10 +1,10 @@ {lib, stdenv, fetchurl, wxGTK, perl, python3, zlib, libGLU, libGL, libX11, SDL2}: stdenv.mkDerivation rec { pname = "golly"; - version = "4.1"; + version = "4.2"; src = fetchurl { - sha256 = "1j30dpzy6wh8fv1j2750hzc6wb0nhk83knl9fapccxgxw9n5lrbc"; + hash = "sha256-VpEoqSPaZMP/AGIYZAbk5R/f8Crqvx8pKYN1O9Bl6V0="; url="mirror://sourceforge/project/golly/golly/golly-${version}/golly-${version}-src.tar.gz"; }; @@ -13,13 +13,10 @@ stdenv.mkDerivation rec { ]; setSourceRoot = '' - sourceRoot=$(echo */gui-wx/) + sourceRoot=$(echo */gui-wx) ''; postPatch = '' - sed -e '/gollydir =/agollydir += "/../share/golly/";' -i wxgolly.cpp - grep share/golly wxgolly.cpp - sed -e 's@PYTHON_SHLIB@${python3}/lib/libpython3.so@' -i wxprefs.cpp sed -e 's@PERL_SHLIB@'"$(find "${perl}/lib/" -name libperl.so)"'@' -i wxprefs.cpp ! grep _SHLIB *.cpp @@ -31,6 +28,7 @@ stdenv.mkDerivation rec { makeFlags=[ "-f" "makefile-gtk" "ENABLE_SOUND=1" "ENABLE_PERL=1" + "GOLLYDIR=${placeholder "out"}/share/golly" ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix index fde756181c..35f46f7a45 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/openmvs/default.nix @@ -26,14 +26,14 @@ let }); in stdenv.mkDerivation rec { - version = "2.1.0"; + version = "2.2.0"; pname = "openmvs"; src = fetchFromGitHub { owner = "cdcseacave"; repo = "openmvs"; rev = "v${version}"; - sha256 = "sha256-eqNprBgR0hZnbLKLZLJqjemKxHhDtGblmaSxYlmegsc="; + sha256 = "sha256-j/tGkR73skZiU+bP4j6aZ5CxkbIcHtqKcaUTgNvj0C8="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix index 1f8a2d3b8d..6dc630181b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix @@ -2,7 +2,6 @@ , lib , callPackage , fetchurl -, fetchpatch , makeWrapper , cmake , coreutils @@ -14,6 +13,7 @@ , gnugrep , gnused , gsl +, gtest , lapack , libX11 , libXpm @@ -23,7 +23,7 @@ , libGL , libxcrypt , libxml2 -, llvm_9 +, llvm_13 , lsof , lz4 , xz @@ -55,23 +55,9 @@ , noSplash ? false }: -let - - _llvm_9 = llvm_9.overrideAttrs (prev: { - patches = (prev.patches or [ ]) ++ [ - (fetchpatch { - url = "https://github.com/root-project/root/commit/a9c961cf4613ff1f0ea50f188e4a4b0eb749b17d.diff"; - stripLen = 3; - hash = "sha256-LH2RipJICEDWOr7JzX5s0QiUhEwXNMFEJihYKy9qWpo="; - }) - ]; - }); - -in - stdenv.mkDerivation rec { pname = "root"; - version = "6.26.10"; + version = "6.28.06"; passthru = { tests = import ./tests { inherit callPackage; }; @@ -79,7 +65,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - hash = "sha256-jla+w5cQQBeqVPnrVU3noaE0R0/gs7sPQ6cPxPq9Yl8="; + hash = "sha256-rztnO5rKOTpcmuG/huqyZyqvGEG2WMXG56MKuTxYZTM="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -97,10 +83,11 @@ stdenv.mkDerivation rec { lapack libxcrypt libxml2 - _llvm_9 + llvm_13 lz4 xz gsl + gtest openblas openssl xxHash @@ -122,27 +109,16 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch - ] ++ lib.optionals (python.pkgs.pythonAtLeast "3.11") [ - # Fix build against Python 3.11 - (fetchpatch { - url = "https://github.com/root-project/root/commit/484deb056dacf768aba4954073b41105c431bffc.patch"; - hash = "sha256-4qur2e3SxMIPgOg4IjlvuULR2BObuP7xdvs+LmNT2/s="; - }) ]; - # Fix build against vanilla LLVM 9 - postPatch = '' - sed \ - -e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/i#define private protected' \ - -e '/#include "llvm.*RTDyldObjectLinkingLayer.h"/a#undef private' \ - -i interpreter/cling/lib/Interpreter/IncrementalJIT.h - ''; - preConfigure = '' rm -rf builtins/* substituteInPlace cmake/modules/SearchInstalledSoftware.cmake \ --replace 'set(lcgpackages ' '#set(lcgpackages ' + substituteInPlace interpreter/llvm/src/tools/clang/tools/driver/CMakeLists.txt \ + --replace 'add_clang_symlink(''${link} clang)' "" + # Don't require textutil on macOS : > cmake/modules/RootCPack.cmake @@ -167,6 +143,8 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-Dbuiltin_llvm=OFF" + "-Dbuiltin_freetype=OFF" + "-Dbuiltin_gtest=OFF" "-Dbuiltin_nlohmannjson=OFF" "-Dbuiltin_openui5=OFF" "-Dalien=OFF" @@ -240,23 +218,20 @@ stdenv.mkDerivation rec { # but it also need to support Bash-less POSIX shell like dash, # as they are mentioned in `thisroot.sh`. - # `thisroot.sh` would include commands `lsof` and `procps` since ROOT 6.28. - # See https://github.com/root-project/root/pull/10332 - patchRcPathPosix "$out/bin/thisroot.sh" "${lib.makeBinPath [ coreutils # dirname tail gnugrep # grep gnused # sed - lsof # lsof # for ROOT (>=6.28) + lsof # lsof man # manpath - procps # ps # for ROOT (>=6.28) + procps # ps which # which ]}" patchRcPathCsh "$out/bin/thisroot.csh" "${lib.makeBinPath [ coreutils gnugrep gnused - lsof # lsof # for ROOT (>=6.28) + lsof # lsof man which ]}" diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/vite/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/vite/default.nix index 7d284d5eeb..c748b6d1bd 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/vite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/vite/default.nix @@ -1,33 +1,19 @@ -{ fetchsvn, lib, stdenv, cmake, qt4, libGLU, libGL }: +{ stdenv, fetchFromGitLab, lib, cmake, qtbase, qttools, qtcharts, libGLU, libGL, glm, glew, wrapQtAppsHook }: -# ViTE 1.1 has several bugs, so use the SVN version. -let - rev = "1543"; - externals = fetchsvn { - url = "svn://scm.gforge.inria.fr/svn/vite/externals"; - sha256 = "1a422n3dp72v4visq5b1i21cf8sj12903sgg5v2hah3sgk02dnyz"; - inherit rev; - }; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "vite"; - version = "1.2pre${rev}"; + version = "unstable-2022-05-17"; - src = fetchsvn { - url = "svn://scm.gforge.inria.fr/svn/vite/trunk"; - sha256 = "02479dv96h29d0w0svp42mjjrxhmv8lkkqp30w7mlx5gr2g0v7lf"; - inherit rev; + src = fetchFromGitLab { + domain = "gitlab.inria.fr"; + owner = "solverstack"; + repo = pname; + rev = "6d497cc519fac623e595bd174e392939c4de845c"; + hash = "sha256-Yf2jYALZplIXzVtd/sg6gzEYrZ+oU0zLG1ETd/hiTi0="; }; - preConfigure = '' - rm -rv externals - ln -sv "${externals}" externals - ''; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ qt4 libGLU libGL ]; - - NIX_LDFLAGS = "-lGLU"; + nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; + buildInputs = [ qtbase qtcharts libGLU libGL glm glew ]; meta = { description = "Visual Trace Explorer (ViTE), a tool to visualize execution traces"; diff --git a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 580dbb6796..7924d044c2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -43,16 +43,17 @@ , extraBuildInputs ? [] }: -stdenv.mkDerivation rec { - # LAMMPS has weird versioning converted to ISO 8601 format - version = "2Aug2023"; +stdenv.mkDerivation (finalAttrs: { + # LAMMPS has weird versioning convention. Updates should go smoothly with: + # nix-update --commit lammps --version-regex 'stable_(.*)' + version = "2Aug2023_update1"; pname = "lammps"; src = fetchFromGitHub { owner = "lammps"; repo = "lammps"; - rev = "stable_${version}"; - hash = "sha256-6T4YAa4iN3pJpODGPW+faR16xxyYYdkHLavtiPUbZ4o="; + rev = "stable_${finalAttrs.version}"; + hash = "sha256-Zmn87a726qdidBfyvJlYleYv9jqyFAakxjGrg3lipc0="; }; preConfigure = '' cd cmake @@ -117,4 +118,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.costrouc maintainers.doronbehar ]; mainProgram = "lmp"; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/viennarna/default.nix b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/viennarna/default.nix index 3d20eeabe2..f292cbb378 100644 --- a/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/viennarna/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/molecular-dynamics/viennarna/default.nix @@ -8,11 +8,11 @@ }: stdenv.mkDerivation rec { - pname = "ViennaRNA"; + pname = "viennarna"; version = "2.5.1"; src = fetchurl { - url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_5_x/${pname}-${version}.tar.gz"; + url = "https://www.tbi.univie.ac.at/RNA/download/sourcecode/2_5_x/ViennaRNA-${version}.tar.gz"; sha256 = "sha256-BUAEN88VWV4QsaJd9snEiFbzVhMPnR44D6iGa20n9Fc="; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix b/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix index 41a0e00ae7..e63203a93f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/physics/elmerfem/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade, libsForQt5, tbb, vtkWithQt5 }: +{ lib, stdenv, fetchFromGitHub, cmake, git, gfortran, mpi, blas, liblapack, pkg-config, libGL, libGLU, opencascade-occt, libsForQt5, tbb, vtkWithQt5 }: stdenv.mkDerivation rec { pname = "elmerfem"; - version = "unstable-2023-02-03"; + version = "unstable-2023-09-18"; src = fetchFromGitHub { owner = "elmercsc"; repo = pname; - rev = "39c8784b6e4543a6bf560b5d597e0eec1eb06343"; - hash = "sha256-yyxgFvlS+I4PouDL6eD4ZrXuONTDejCSYKq2AwQ0Iug="; + rev = "0fcced06f91c93f44557efd6a5f10b2da5c7066c"; + hash = "sha256-UuARDYW7D3a4dB6I86s2Ed5ecQxc+Y/es3YIeF2VyTc="; }; hardeningDisable = [ "format" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { libsForQt5.qwt libGL libGLU - opencascade + opencascade-occt tbb vtkWithQt5 ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix index 43b04ba1ee..b3337b7f55 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.62"; + version = "1.8.66"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XypOQNETmxg9DYcuCGkXH9/LwCq+pR23KbNfP0mfs3I="; + hash = "sha256-tIwXiDHEmFHF5Jdv25hPkzEqAdig+i5h4fW6SGIrZDM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mujoco/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/mujoco/default.nix index 4af3d6899f..c4f84e1583 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/mujoco/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/mujoco/default.nix @@ -9,18 +9,18 @@ }: let - # See https://github.com/deepmind/mujoco/blob/573d331b69845c5d651b70f5d1b0f3a0d2a3a233/cmake/MujocoDependencies.cmake#L21-L59 + # See https://github.com/deepmind/mujoco/blob/c9246e1f5006379d599e0bcddf159a8616d31441/cmake/MujocoDependencies.cmake#L17-L55 abseil-cpp = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = "8c0b94e793a66495e0b1f34a5eb26bd7dc672db0"; - hash = "sha256-Od1FZOOWEXVQsnZBwGjDIExi6LdYtomyL0STR44SsG8="; + rev = "c2435f8342c2d0ed8101cb43adfd605fdc52dca2"; + hash = "sha256-PLoI7ix+reUqkZ947kWzls8lujYqWXk9A9a55UcfahI="; }; benchmark = fetchFromGitHub { owner = "google"; repo = "benchmark"; - rev = "d845b7b3a27d54ad96280a29d61fa8988d4fddcf"; - hash = "sha256-XTnTM1k6xMGXUws/fKdJUbpCPcc4U0IelL6BPEEnpEQ="; + rev = "2dd015dfef425c866d9a43f2c67d8b52d709acb6"; + hash = "sha256-pUW9YVaujs/y00/SiPqDgK4wvVsaM7QUp/65k0t7Yr0="; }; ccd = fetchFromGitHub { owner = "danfis"; @@ -31,14 +31,14 @@ let eigen3 = fetchFromGitLab { owner = "libeigen"; repo = "eigen"; - rev = "3bb6a48d8c171cf20b5f8e48bfb4e424fbd4f79e"; - hash = "sha256-k71DoEsx8JpC9AlQ0cCRI0fWMIWFBFL/Yscx+2iBtNM="; + rev = "211c5dfc6741a5570ad007983c113ef4d144f9f3"; + hash = "sha256-oT/h8QkL0vwaflh46Zsnu9Db1b65AP6p//nAga8M5jI="; }; googletest = fetchFromGitHub { owner = "google"; repo = "googletest"; - rev = "58d77fa8070e8cec2dc1ed015d66b454c8d78850"; - hash = "sha256-W+OxRTVtemt2esw4P7IyGWXOonUN5ZuscjvzqkYvZbM="; + rev = "b796f7d44681514f58a683a3a71ff17c94edb0c1"; + hash = "sha256-LVLEn+e7c8013pwiLzJiiIObyrlbBHYaioO/SWbItPQ="; }; lodepng = fetchFromGitHub { owner = "lvandeve"; @@ -49,8 +49,8 @@ let qhull = fetchFromGitHub { owner = "qhull"; repo = "qhull"; - rev = "3df027b91202cf179f3fba3c46eebe65bbac3790"; - hash = "sha256-aHO5n9Y35C7/zb3surfMyjyMjo109DoZnkozhiAKpYQ="; + rev = "0c8fc90d2037588024d9964515c1e684f6007ecc"; + hash = "sha256-Ptzxad3ewmKJbbcmrBT+os4b4SR976zlCG9F0nq0x94="; }; tinyobjloader = fetchFromGitHub { owner = "tinyobjloader"; @@ -61,12 +61,12 @@ let tinyxml2 = fetchFromGitHub { owner = "leethomason"; repo = "tinyxml2"; - rev = "1dee28e51f9175a31955b9791c74c430fe13dc82"; - hash = "sha256-AQQOctXi7sWIH/VOeSUClX6hlm1raEQUOp+VoPjLM14="; + rev = "9a89766acc42ddfa9e7133c7d81a5bda108a0ade"; + hash = "sha256-YGAe4+Ttv/xeou+9FoJjmQCKgzupTYdDhd+gzvtz/88="; }; - # See https://github.com/deepmind/mujoco/blob/573d331b69845c5d651b70f5d1b0f3a0d2a3a233/simulate/cmake/SimulateDependencies.cmake#L32-L35 - glfw = fetchFromGitHub { + # See https://github.com/deepmind/mujoco/blob/c9246e1f5006379d599e0bcddf159a8616d31441/simulate/cmake/SimulateDependencies.cmake#L32-L35 + glfw3 = fetchFromGitHub { owner = "glfw"; repo = "glfw"; rev = "7482de6071d21db77a7236155da44c172a7f6c9e"; @@ -75,13 +75,13 @@ let in stdenv.mkDerivation rec { pname = "mujoco"; - version = "2.3.0"; + version = "2.3.7"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; rev = version; - hash = "sha256-FxMaXl7yfUAyY6LE1sxaw226dBtp1DOCWNnROp0WX2I="; + hash = "sha256-LgpA+iPGqciHuWBSD6/7yvZ7p+vo48ZYKjjrDZSnAwE="; }; patches = [ ./dependencies.patch ]; @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { ln -s ${benchmark} build/_deps/benchmark-src ln -s ${ccd} build/_deps/ccd-src ln -s ${eigen3} build/_deps/eigen3-src - ln -s ${glfw} build/_deps/glfw-src + ln -s ${glfw3} build/_deps/glfw3-src ln -s ${googletest} build/_deps/googletest-src ln -s ${lodepng} build/_deps/lodepng-src ln -s ${qhull} build/_deps/qhull-src diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mujoco/dependencies.patch b/third_party/nixpkgs/pkgs/applications/science/robotics/mujoco/dependencies.patch index 5ddbaaab53..f7dcc06a9e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/mujoco/dependencies.patch +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/mujoco/dependencies.patch @@ -1,8 +1,8 @@ diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake -index 99e4a7a..cf9a901 100644 +index 3e322ea..980aace 100644 --- a/cmake/MujocoDependencies.cmake +++ b/cmake/MujocoDependencies.cmake -@@ -82,8 +82,6 @@ set(BUILD_SHARED_LIBS +@@ -87,8 +87,6 @@ set(BUILD_SHARED_LIBS if(NOT TARGET lodepng) FetchContent_Declare( lodepng @@ -11,7 +11,7 @@ index 99e4a7a..cf9a901 100644 ) FetchContent_GetProperties(lodepng) -@@ -111,10 +109,6 @@ findorfetch( +@@ -127,10 +125,6 @@ findorfetch( qhull LIBRARY_NAME qhull @@ -21,8 +21,8 @@ index 99e4a7a..cf9a901 100644 - ${MUJOCO_DEP_VERSION_qhull} TARGETS qhull - # TODO(fraromano) Remove when https://github.com/qhull/qhull/pull/112 is merged. -@@ -146,10 +140,6 @@ findorfetch( + EXCLUDE_FROM_ALL +@@ -151,10 +145,6 @@ findorfetch( tinyxml2 LIBRARY_NAME tinyxml2 @@ -33,7 +33,7 @@ index 99e4a7a..cf9a901 100644 TARGETS tinyxml2 EXCLUDE_FROM_ALL -@@ -164,10 +154,6 @@ findorfetch( +@@ -169,10 +159,6 @@ findorfetch( tinyobjloader LIBRARY_NAME tinyobjloader @@ -44,7 +44,7 @@ index 99e4a7a..cf9a901 100644 TARGETS tinyobjloader EXCLUDE_FROM_ALL -@@ -182,10 +168,6 @@ findorfetch( +@@ -187,10 +173,6 @@ findorfetch( ccd LIBRARY_NAME ccd @@ -55,7 +55,7 @@ index 99e4a7a..cf9a901 100644 TARGETS ccd EXCLUDE_FROM_ALL -@@ -222,10 +204,6 @@ if(MUJOCO_BUILD_TESTS) +@@ -227,10 +209,6 @@ if(MUJOCO_BUILD_TESTS) absl LIBRARY_NAME abseil-cpp @@ -66,7 +66,7 @@ index 99e4a7a..cf9a901 100644 TARGETS absl::core_headers EXCLUDE_FROM_ALL -@@ -249,10 +227,6 @@ if(MUJOCO_BUILD_TESTS) +@@ -254,10 +232,6 @@ if(MUJOCO_BUILD_TESTS) GTest LIBRARY_NAME googletest @@ -77,7 +77,7 @@ index 99e4a7a..cf9a901 100644 TARGETS gtest gmock -@@ -283,10 +257,6 @@ if(MUJOCO_BUILD_TESTS) +@@ -288,10 +262,6 @@ if(MUJOCO_BUILD_TESTS) benchmark LIBRARY_NAME benchmark @@ -88,7 +88,7 @@ index 99e4a7a..cf9a901 100644 TARGETS benchmark::benchmark benchmark::benchmark_main -@@ -303,8 +273,6 @@ if(MUJOCO_TEST_PYTHON_UTIL) +@@ -308,8 +278,6 @@ if(MUJOCO_TEST_PYTHON_UTIL) FetchContent_Declare( Eigen3 @@ -98,17 +98,17 @@ index 99e4a7a..cf9a901 100644 FetchContent_GetProperties(Eigen3) diff --git a/simulate/cmake/SimulateDependencies.cmake b/simulate/cmake/SimulateDependencies.cmake -index 6616d6f..5d5a889 100644 +index fa539c2..5985d5a 100644 --- a/simulate/cmake/SimulateDependencies.cmake +++ b/simulate/cmake/SimulateDependencies.cmake @@ -81,10 +81,6 @@ findorfetch( - glfw + glfw3 LIBRARY_NAME - glfw + glfw3 - GIT_REPO - https://github.com/glfw/glfw.git - GIT_TAG -- ${MUJOCO_DEP_VERSION_glfw} +- ${MUJOCO_DEP_VERSION_glfw3} TARGETS glfw EXCLUDE_FROM_ALL diff --git a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix index 933b07a5d8..fdc8b6317a 100644 --- a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix +++ b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix @@ -3,8 +3,10 @@ , lib , mkDerivation , antiword +, aspell , bison , catdoc +, catdvi , chmlib , djvulibre , file @@ -26,6 +28,7 @@ , poppler_utils , python3Packages , qtbase +, qttools , unrtf , untex , unzip @@ -43,6 +46,7 @@ let filters = { awk = gawk; antiword = antiword; catppt = catdoc; + catdvi = catdvi; djvused = djvulibre; djvutxt = djvulibre; egrep = gnugrep; @@ -66,11 +70,11 @@ in mkDerivation rec { pname = "recoll"; - version = "1.33.4"; + version = "1.35.0"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-ffD49sGYWYEWAFPRtpyDU/CYFvkrEDL21Ddq3QsXCvc="; + hash = "sha256-5msEeHCdrpPS0VMCVohYNllaFJJdXRn8laY6BNBt+UE="; }; configureFlags = [ @@ -100,18 +104,19 @@ mkDerivation rec { ./fix-datadir.patch ]; - nativeBuildInputs = lib.optionals withGui [ - qtbase - ] ++ [ + nativeBuildInputs = [ + makeWrapper pkg-config + which + ] ++ lib.optionals withGui [ + qtbase + qttools ] ++ lib.optionals withPython [ python3Packages.setuptools - ] ++ [ - makeWrapper - which ]; buildInputs = [ + aspell bison chmlib ] ++ lib.optionals withPython [ diff --git a/third_party/nixpkgs/pkgs/applications/system/asusctl/Cargo.lock b/third_party/nixpkgs/pkgs/applications/system/asusctl/Cargo.lock index 6377a21c70..573daf8894 100644 --- a/third_party/nixpkgs/pkgs/applications/system/asusctl/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/system/asusctl/Cargo.lock @@ -89,9 +89,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -115,18 +115,18 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" +checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" dependencies = [ "memchr", ] [[package]] name = "android-activity" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40bc1575e653f158cbdc6ebcd917b9564e66321c5325c232c3591269c257be69" +checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" dependencies = [ "android-properties", "bitflags 1.3.2", @@ -163,9 +163,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arboard" @@ -199,7 +199,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "asusctl" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "asusd", "cargo-husky", @@ -218,7 +218,7 @@ dependencies = [ [[package]] name = "asusd" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "async-trait", "cargo-husky", @@ -242,7 +242,7 @@ dependencies = [ [[package]] name = "asusd-user" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "cargo-husky", "config-traits", @@ -323,15 +323,15 @@ dependencies = [ "polling", "rustix 0.37.23", "slab", - "socket2", + "socket2 0.4.9", "waker-fn", ] [[package]] name = "async-lock" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ "event-listener", ] @@ -374,7 +374,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -385,13 +385,13 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -426,9 +426,9 @@ checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" [[package]] name = "atomic_refcell" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79d6dc922a2792b006573f60b2648076355daeae5ce9cb59507e5908c9625d31" +checksum = "112ef6b3f6cb3cb6fc5b6b494ef7a848492cff1ab0ef4de10b0f7d572861c905" [[package]] name = "atspi" @@ -471,9 +471,9 @@ checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" [[package]] name = "backtrace" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -486,9 +486,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" [[package]] name = "bindgen" @@ -518,9 +518,12 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +dependencies = [ + "serde", +] [[package]] name = "block" @@ -594,7 +597,7 @@ checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -656,11 +659,12 @@ checksum = "7b02b629252fe8ef6460461409564e2c21d0c8e77e0944f3d189ff06c4e932ad" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -680,9 +684,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "215c0072ecc28f92eeb0eea38ba63ddfcb65c2828c46311d646f1a3ff5f9841c" +checksum = "b40ccee03b5175c18cde8f37e7d2a33bcef6f8ec8f7cc0d81090d1bb380949c9" dependencies = [ "smallvec", "target-lexicon", @@ -767,7 +771,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d" dependencies = [ "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -781,7 +785,7 @@ dependencies = [ [[package]] name = "config-traits" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "cargo-husky", "log", @@ -869,6 +873,12 @@ dependencies = [ "typenum", ] +[[package]] +name = "deranged" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" + [[package]] name = "derivative" version = "2.2.0" @@ -1079,7 +1089,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -1119,9 +1129,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", @@ -1190,9 +1200,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" dependencies = [ "crc32fast", "miniz_oxide 0.7.1", @@ -1286,7 +1296,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -1420,9 +1430,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.3" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "gio" @@ -1544,9 +1554,9 @@ dependencies = [ [[package]] name = "glutin" -version = "0.30.9" +version = "0.30.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b0385782048be65f0a9dd046c469d6a758a53fe1aa63a8111dea394d2ffa2f" +checksum = "8fc93b03242719b8ad39fb26ed2b01737144ce7bd4bfc7adadcef806596760fe" dependencies = [ "bitflags 1.3.2", "cfg_aliases", @@ -1579,9 +1589,9 @@ dependencies = [ [[package]] name = "glutin_egl_sys" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b3bcbddc51573b977fc6dca5d93867e4f29682cdbaf5d13e48f4fa4346d4d87" +checksum = "af784eb26c5a68ec85391268e074f0aa618c096eadb5d6330b0911cf34fe57c5" dependencies = [ "gl_generator", "windows-sys 0.45.0", @@ -1776,9 +1786,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff335215fb898bf09c45833b657233d8c0b699a616d7dd64d0513080da270ab6" +checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc" dependencies = [ "bitflags 1.3.2", "futures-core", @@ -1826,7 +1836,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.4", + "rustix 0.38.9", "windows-sys 0.48.0", ] @@ -1983,9 +1993,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "lock_api" @@ -1999,15 +2009,15 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "logind-zbus" -version = "3.1.1" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b36b364be05220b24411a1c1a1ee4df0ba77b09c9880e70e5f4c16ebdec157" +checksum = "c07a2542f6e91ea92780158654852190edb2ba0b232d9d00d649d0c691cb7eb3" dependencies = [ "serde", "zbus", @@ -2015,9 +2025,9 @@ dependencies = [ [[package]] name = "mac-notification-sys" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abc434554ad0e640d772f7f262aa28e61d485212533d3673abe5f3d1729bd42a" +checksum = "9402858e87f85f88bf518bd2e68450640df1c99b1ddb3ea28c4d5d823bb54cdd" dependencies = [ "cc", "dirs-next", @@ -2274,7 +2284,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -2340,9 +2350,9 @@ dependencies = [ [[package]] name = "object" -version = "0.31.1" +version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1" +checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" dependencies = [ "memchr", ] @@ -2355,9 +2365,9 @@ checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "orbclient" -version = "0.3.45" +version = "0.3.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221d488cd70617f1bd599ed8ceb659df2147d9393717954d82a0f5e8032a6ab1" +checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" dependencies = [ "redox_syscall 0.3.5", ] @@ -2433,7 +2443,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -2456,9 +2466,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2480,9 +2490,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "png" -version = "0.17.9" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" dependencies = [ "bitflags 1.3.2", "crc32fast", @@ -2577,9 +2587,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -2651,9 +2661,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.1" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" +checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" dependencies = [ "aho-corasick", "memchr", @@ -2663,9 +2673,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.3" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" +checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" dependencies = [ "aho-corasick", "memchr", @@ -2680,7 +2690,7 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "rog-control-center" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "asusd", "cargo-husky", @@ -2713,7 +2723,7 @@ dependencies = [ [[package]] name = "rog_anime" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "cargo-husky", "gif", @@ -2730,7 +2740,7 @@ dependencies = [ [[package]] name = "rog_aura" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "cargo-husky", "log", @@ -2744,7 +2754,7 @@ dependencies = [ [[package]] name = "rog_dbus" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "cargo-husky", "rog_anime", @@ -2756,7 +2766,7 @@ dependencies = [ [[package]] name = "rog_platform" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "cargo-husky", "concat-idents", @@ -2769,26 +2779,26 @@ dependencies = [ "serde_derive", "sysfs-class", "typeshare", - "udev 0.7.0", + "udev", "zbus", ] [[package]] name = "rog_profiles" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "cargo-husky", "log", "serde", "serde_derive", "typeshare", - "udev 0.7.0", + "udev", "zbus", ] [[package]] name = "rog_simulators" -version = "4.7.0-RC3" +version = "4.7.1" dependencies = [ "glam", "log", @@ -2799,20 +2809,21 @@ dependencies = [ [[package]] name = "ron" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ "base64", - "bitflags 1.3.2", + "bitflags 2.4.0", "serde", + "serde_derive", ] [[package]] name = "rusb" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44a8c36914f9b1a3be712c1dfa48c9b397131f9a75707e570a391735f785c5d1" +checksum = "45fff149b6033f25e825cbb7b2c625a11ee8e6dac09264d49beb125e39aa97bf" dependencies = [ "libc", "libusb1-sys", @@ -2855,14 +2866,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.4" +version = "0.38.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" +checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" dependencies = [ - "bitflags 2.3.3", + "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.3", + "linux-raw-sys 0.4.5", "windows-sys 0.48.0", ] @@ -2937,29 +2948,29 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.174" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b88756493a5bd5e5395d53baa70b194b05764ab85b59e43e4b8f4e1192fa9b1" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.174" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5c3a298c7f978e53536f95a63bdc4c4a64550582f31a0359a9afda6aede62e" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] name = "serde_json" -version = "1.0.103" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -2968,13 +2979,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e168eaaf71e8f9bd6037feb05190485708e019f4fd87d161b3c0a0d37daf85e5" +checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3024,15 +3035,15 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[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", ] @@ -3108,6 +3119,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +dependencies = [ + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -3128,8 +3149,8 @@ checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" [[package]] name = "supergfxctl" -version = "5.1.1" -source = "git+https://gitlab.com/asus-linux/supergfxctl.git#fcba63b1a29284fc76da65e60751a33b81380259" +version = "5.1.2" +source = "git+https://gitlab.com/asus-linux/supergfxctl.git#c2a1bb3461c7abbcdabecdc463d668555120f953" dependencies = [ "log", "logind-zbus", @@ -3137,7 +3158,7 @@ dependencies = [ "serde_derive", "serde_json", "tokio", - "udev 0.6.3", + "udev", "zbus", ] @@ -3154,9 +3175,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" dependencies = [ "proc-macro2", "quote", @@ -3187,9 +3208,9 @@ dependencies = [ [[package]] name = "systemd-zbus" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abba675e441b13248eaf74f1acfacf64adc7b5c030f2f3ff66cc7e02b9a0c417" +checksum = "ffbb1b6ea6d96b14a7e94532711efc4106337fe8b1d6bdf8ba5318012a9fa7e3" dependencies = [ "serde", "zbus", @@ -3197,9 +3218,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.10" +version = "0.12.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" +checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" [[package]] name = "tauri-winrt-notification" @@ -3213,14 +3234,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.7.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand 2.0.0", "redox_syscall 0.3.5", - "rustix 0.38.4", + "rustix 0.38.9", "windows-sys 0.48.0", ] @@ -3235,30 +3256,31 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" +checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.44" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" +checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] name = "time" -version = "0.3.23" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" dependencies = [ + "deranged", "serde", "time-core", ] @@ -3320,17 +3342,16 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" dependencies = [ - "autocfg", "backtrace", "libc", "mio", "num_cpus", "pin-project-lite", - "socket2", + "socket2 0.5.3", "tokio-macros", "windows-sys 0.48.0", ] @@ -3343,7 +3364,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3386,7 +3407,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.5.0", + "winnow", ] [[package]] @@ -3409,7 +3430,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.29", ] [[package]] @@ -3455,17 +3476,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "udev" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c960764f7e816eed851a96c364745d37f9fe71a2e7dba79fbd40104530b5dd0" -dependencies = [ - "libc", - "libudev-sys", - "pkg-config", -] - [[package]] name = "udev" version = "0.7.0" @@ -3758,9 +3768,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd222aa310eb7532e3fd427a5d7db7e44bc0b0cf1c1e21139c345325511a85b6" +checksum = "b2c79b77f525a2d670cb40619d7d9c673d09e0666f72c591ebd7861f84a87e57" dependencies = [ "core-foundation", "home", @@ -3849,7 +3859,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -3889,7 +3899,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -3909,17 +3919,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" 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.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]] @@ -3930,9 +3940,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -3948,9 +3958,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -3966,9 +3976,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -3984,9 +3994,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -4002,9 +4012,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -4014,9 +4024,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -4032,9 +4042,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winit" @@ -4073,18 +4083,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.4.1" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fac9742fd1ad1bd9643b991319f72dd031016d44b77039a26977eb667141e7" +checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" dependencies = [ "memchr", ] @@ -4149,9 +4150,9 @@ checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1" [[package]] name = "zbus" -version = "3.13.1" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c3d77c9966c28321f1907f0b6c5a5561189d1f7311eea6d94180c6be9daab29" +checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" dependencies = [ "async-broadcast", "async-executor", @@ -4162,6 +4163,7 @@ dependencies = [ "async-recursion", "async-task", "async-trait", + "blocking", "byteorder", "derivative", "enumflags2", @@ -4189,16 +4191,15 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.13.1" +version = "3.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e341d12edaff644e539ccbbf7f161601294c9a84ed3d7e015da33155b435af" +checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", "regex", "syn 1.0.109", - "winnow 0.4.1", "zvariant_utils", ] diff --git a/third_party/nixpkgs/pkgs/applications/system/asusctl/default.nix b/third_party/nixpkgs/pkgs/applications/system/asusctl/default.nix index 95b0f847fe..8b5eb17cbc 100644 --- a/third_party/nixpkgs/pkgs/applications/system/asusctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/asusctl/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; rev = version; - hash = "sha256-SZijR9PotN0O72laj+FBSCVMXLXadmLRhCSD4XqobD0="; + hash = "sha256-T/KAhKoxZRdbJspL+Fkos6YqVhiUxCtxbCSm+8CX1to="; }; cargoHash = ""; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { outputHashes = { "ecolor-0.21.0" = "sha256-m7eHX6flwO21umtx3dnIuVUnNsEs3ZCyOk5Vvp/lVfI="; "notify-rust-4.6.0" = "sha256-jhCgisA9f6AI9e9JQUYRtEt47gQnDv5WsdRKFoKvHJs="; - "supergfxctl-5.1.1" = "sha256-H00QHNILEjOtavXdj4Jd+rdLprJpVSlSVV3qkTeknzQ="; + "supergfxctl-5.1.2" = "sha256-1XCIltd7o+Bc+UXmeuPAXdPKU86UP0p+Qh0gTZyrbH8="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix index 014304592b..7e66aacf25 100644 --- a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "glances"; - version = "3.4.0.2"; + version = "3.4.0.3"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "refs/tags/v${version}"; - sha256 = "sha256-mAhdablRr97DXNmwRk8cA9Q0rS9PsEocVvNc686Gco0="; + hash = "sha256-TakQqyHKuiFdBL73JQzflNUMYmBINyY0flqitqoIpmg="; }; # On Darwin this package segfaults due to mismatch of pure and impure diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix index be1ccdc354..3427852669 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -49,16 +49,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-X3Z+f5r8surBW9FSsmWKZ/fr82ThXBUkS8fr/sTYR50="; + hash = "sha256-SUEI7DTgs6NYT4oiqaMBNCQ8gP1XoZjPFIKhob7tfsk="; }; - cargoHash = "sha256-JOmDmJl/y4WNsBnCixJykl4PgYgb5cSyo6MCdYmQAzQ="; + cargoHash = "sha256-iLhctiCDNpcTxoMrWwUWHBRc6X5rxSH9Jl2EDuktWmw="; nativeBuildInputs = [ cmake @@ -132,6 +132,7 @@ rustPlatform.buildRustPackage rec { description = "A cross-platform, GPU-accelerated terminal emulator"; homepage = "https://github.com/alacritty/alacritty"; license = licenses.asl20; + mainProgram = "alacritty"; maintainers = with maintainers; [ Br1ght0ne mic92 ]; platforms = platforms.unix; changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md"; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix index c54c92c201..e734a1e91e 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Beautiful GTK 4 terminal"; + mainProgram = "blackbox"; homepage = "https://gitlab.gnome.org/raggesilver/blackbox"; changelog = "https://gitlab.gnome.org/raggesilver/blackbox/-/raw/v${version}/CHANGELOG.md"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix index c1eba0e3fe..9c44946f38 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/contour/default.nix @@ -47,6 +47,8 @@ mkDerivation rec { sha256 = "sha256-TpxVC0GFZD3jGISnDWHKEetgVVpznm5k/Vc2dwVfSG4="; }; + outputs = [ "out" "terminfo" ]; + nativeBuildInputs = [ cmake pkg-config @@ -86,6 +88,12 @@ mkDerivation rec { sed -i '/fixup_bundle/d' src/contour/CMakeLists.txt ''; + postInstall = '' + mkdir -p $out/nix-support $terminfo/share + mv $out/share/terminfo $terminfo/share/ + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + passthru.tests.test = nixosTests.terminal-emulators.contour; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/eterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/eterm/default.nix deleted file mode 100644 index a0bccbfcb1..0000000000 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/eterm/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, autoreconfHook -, imlib2 -, libX11 -, libXaw -, libXext -, libast -, pkg-config -, nixosTests -}: - -stdenv.mkDerivation rec { - pname = "eterm"; - version = "0.9.6+date=2020-03-03"; - - src = fetchFromGitHub { - owner = "mej"; - repo = pname; - rev = "e8fb85b56da21113aaf0f5f7987ae647c4413b6c"; - sha256 = "sha256-pfXYrd6BamBTcnarvXj+C6D1WyGtj87GrW+Dl6AeiDE="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - buildInputs = [ - imlib2 - libX11 - libXaw - libXext - libast - ]; - - passthru.tests.test = nixosTests.terminal-emulators.eterm; - - meta = with lib; { - homepage = "https://github.com/mej/Eterm"; # http://www.eterm.org is gone - description = "Terminal emulator"; - license = licenses.bsd2; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - knownVulnerabilities = [ - ''Usage of ANSI escape sequences causes unexpected newline-termination, - leading to unexpected command execution. More info at: - - https://www.cve.org/CVERecord?id=CVE-2021-33477 - - https://www.openwall.com/lists/oss-security/2021/05/17/1'' - ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix index 23f059ed9a..98934dc2ec 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix @@ -102,6 +102,8 @@ stdenv.mkDerivation { hash = "sha256-jn/S0xjxZPnkGYpTRIpL3dKxGe7+Z+EmOGHiE0UkQqg="; }; + separateDebugInfo = true; + depsBuildBuild = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix index 4b62044ba2..4431784db2 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.4.20"; + version = "3.4.21"; src = fetchzip { url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip"; - hash = "sha256-RXBv3RXd2Kq8k7rbOE3HPEf6vI64VZCo1IX03gDy7l0="; + hash = "sha256-hx2d08U4AeRCLtSV3QBcnRu1QS0RblLx/LUH6HHdQvw="; }; dontFixup = true; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix index 9b4a1be708..f120b5290e 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, python3Packages, libunistring , harfbuzz, fontconfig, pkg-config, ncurses, imagemagick , libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor -, libxkbcommon, libXi, libXext, wayland-protocols, wayland +, libxkbcommon, libXi, libXext, wayland-protocols, wayland, xxHash , lcms2 , librsync , openssl @@ -29,20 +29,20 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.29.2"; + version = "0.30.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-ureJHG6Jh4bsXqQZnGwY5Hlq7sXxYX3iTajb8ZkpZw8="; + hash = "sha256-zjXwiRo6Jw3K0iDf05f04MCtg1qKABah7x07CwvW0/0="; }; goModules = (buildGoModule { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-jk2EcYVuhV/UQfHAIfpnn8ZIZnwjA/o8YRXmpoC85Vc="; + vendorHash = "sha256-KDqzcJbI2f91wlrjVWgUmut4nhXA/rO9q5q3FaDWnfc="; }).goModules; buildInputs = [ @@ -51,6 +51,7 @@ buildPythonApplication rec { lcms2 librsync openssl.dev + xxHash ] ++ lib.optionals stdenv.isDarwin [ Cocoa Kernel @@ -102,9 +103,6 @@ buildPythonApplication rec { hardeningDisable = [ # causes redefinition of _FORTIFY_SOURCE "fortify3" - ] ++ lib.optionals stdenv.cc.isClang [ - # Causes build failure due to warning - "strictoverflow" ]; CGO_ENABLED = 0; @@ -158,7 +156,8 @@ buildPythonApplication rec { preCheck = lib.optionalString stdenv.isDarwin '' substituteInPlace kitty_tests/file_transmission.py \ --replace test_file_get dont_test_file_get \ - --replace test_path_mapping_receive dont_test_path_mapping_receive + --replace test_path_mapping_receive dont_test_path_mapping_receive \ + --replace test_transfer_send dont_test_transfer_send substituteInPlace kitty_tests/shell_integration.py \ --replace test_fish_integration dont_test_fish_integration substituteInPlace kitty_tests/shell_integration.py \ @@ -239,6 +238,7 @@ buildPythonApplication rec { license = licenses.gpl3Only; changelog = "https://sw.kovidgoyal.net/kitty/changelog/"; platforms = platforms.darwin ++ platforms.linux; - maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens ]; + mainProgram = "kitty"; + maintainers = with maintainers; [ tex rvolosatovs Luflosi adamcstephens kashw2 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix index 07563345bd..6ca522e409 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "kitty-themes"; - version = "unstable-2023-06-01"; + version = "unstable-2023-09-15"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty-themes"; - rev = "f765eb1715d79c6cb3ad3d571342d612f21b810e"; - hash = "sha256-Y3N8cyqEsY/kB2xMIlPYnbuYUs8grzepPx/11maG4bo="; + rev = "c9c12d20f83b9536febb21e4b53e176c0ccccb51"; + hash = "sha256-dhzYTHaaTrbE5k+xEC01Y9jGb+ZmEyvWMb4a2WWKGCw="; }; dontConfigure = true; @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/kovidgoyal/kitty-themes"; description = "Themes for the kitty terminal emulator"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ AndersonTorres nelsonjeppesen ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/microcom/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/microcom/default.nix index 8377505ec1..890a70ac30 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/microcom/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/microcom/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "microcom"; - version = "2019.01.0"; + version = "2023.09.0"; src = fetchFromGitHub { owner = "pengutronix"; repo = pname; rev = "v${version}"; - sha256 = "056v28hvagnzns6p8i3bq8609k82d3w1ab2lab5dr4cdfwhs4pqj"; + hash = "sha256-CT/myxOK4U3DzliGsa45WMIFcYLjcoxx6w5S1NL5c7Y="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix index dce5ad9d06..3614046f68 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -96,14 +96,14 @@ let in lib.withFeatureAs (commaSepList != "") featureName commaSepList ; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "mlterm"; version = "3.9.3"; src = fetchFromGitHub { owner = "arakiken"; - repo = pname; - rev = version; + repo = "mlterm"; + rev = finalAttrs.version; sha256 = "sha256-gfs5cdwUUwSBWwJJSaxrQGWJvLkI27RMlk5QvDALEDg="; }; @@ -217,4 +217,4 @@ in stdenv.mkDerivation rec { platforms = platforms.all; mainProgram = desktopBinary; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix index 3029adbd81..afd3205343 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix @@ -43,16 +43,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.16"; + version = "0.0.19"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-jyfobmwDCsvhpKcAD0ivxfRENaTVjjauRBMDNPgvjVY="; + hash = "sha256-N7eHIyp2imkMUVwiOCameOROoaDJ7g+zNKdIB2aGZy0="; }; - cargoHash = "sha256-efMw07KH8Nic76MWTyf16Gg/8PyM9gZKSNs5cuIKBJQ="; + cargoHash = "sha256-XD+/DaaJEJ9jHZITTUma/wfsbduPUTc/SralPOx46Yo="; nativeBuildInputs = [ autoPatchelfHook @@ -78,6 +78,10 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' + install -D -m 644 misc/rio.desktop -t $out/share/applications + install -D -m 644 rio/src/screen/window/resources/images/logo.png \ + $out/share/icons/hicolor/scalable/apps/rio.png + install -dm 755 "$terminfo/share/terminfo/r/" tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo mkdir -p $out/nix-support @@ -99,5 +103,6 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ otavio oluceps ]; platforms = lib.platforms.unix; changelog = "https://github.com/raphamorim/rio/blob/v${version}/CHANGELOG.md"; + mainProgram = "rio"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/roxterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/roxterm/default.nix index 72b40c8cd2..031dfc27f2 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "roxterm"; - version = "3.12.1"; + version = "3.14.1"; src = fetchFromGitHub { owner = "realh"; repo = "roxterm"; rev = version; - sha256 = "sha256-jVcf/nrEq8dM8rw40ZhXGJjt3DQLroCePtIAdAsVIfs="; + sha256 = "sha256-IHJ30qXNVv9tUdePskHl1hd5kPivBb2kH1oOstBr/9s="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix index 7824fa2a81..ac2a5f09fb 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Change the urxvt font size on the fly"; homepage = "https://github.com/majutsushi/urxvt-font-size"; license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix index 9ecaffb185..f30507483f 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { description = "Perl extensions for the rxvt-unicode terminal emulator"; homepage = "https://github.com/effigies/urxvt-perl"; license = licenses.gpl3; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix index da48550877..9856d1428f 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/st/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-82NZeZc06ueFvss3QGPwvoM88i+ItPFpzSUbmTJOCOc="; }; + outputs = [ "out" "terminfo" ]; + inherit patches; configFile = lib.optionalString (conf != null) @@ -51,7 +53,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ extraLibs; preInstall = '' - export TERMINFO=$out/share/terminfo + export TERMINFO=$terminfo/share/terminfo + mkdir -p $TERMINFO $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages ''; installFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/tym/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/tym/default.nix index 91a0b528c8..d999bb5db2 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/tym/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/tym/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tym"; - version = "3.4.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "endaaman"; repo = "${pname}"; rev = version; - sha256 = "sha256-5pXNOuMT2/G+m6XoTrwNTCGNfISLLy0wQpVPhQJzs4s="; + sha256 = "sha256-aXV3TNjHxg/9Lb2o+ci5/cCAPbkWhxqOka3wv21ajSA="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Lua-configurable terminal emulator"; homepage = "https://github.com/endaaman/tym"; license = licenses.mit; - maintainers = [ maintainers.wesleyjrz ]; + maintainers = with maintainers; [ wesleyjrz kashw2 ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/yaft/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/yaft/default.nix index 5471ee45e0..c38d90bd40 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/yaft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/yaft/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { version = "0.2.9"; pname = "yaft"; + outputs = [ "out" "terminfo" ]; + src = fetchFromGitHub { owner = "uobikiemukot"; repo = "yaft"; @@ -15,6 +17,12 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "MANPREFIX=$(out)/share/man" ]; + postInstall = '' + mkdir -p $out/nix-support $terminfo/share + mv $out/share/terminfo $terminfo/share/ + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; + meta = { homepage = "https://github.com/uobikiemukot/yaft"; description = "Yet another framebuffer terminal"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/bit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/bit/default.nix index c352441782..23d676e54e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/bit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/bit/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-18R0JGbG5QBDghF4SyhXaKe9UY5UzF7Ap0Y061Z1SZ8="; }; - vendorSha256 = "sha256-3Y/B14xX5jaoL44rq9+Nn4niGViLPPXBa8WcJgTvYTA="; + vendorHash = "sha256-3Y/B14xX5jaoL44rq9+Nn4niGViLPPXBa8WcJgTvYTA="; propagatedBuildInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/blackbox/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/blackbox/default.nix index 2b4b09fd25..bee8da850b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/blackbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/blackbox/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "blackbox"; - version = "2.0.0"; + version = "1.20220610"; src = fetchFromGitHub { owner = "stackexchange"; repo = pname; rev = "v${version}"; - sha256 = "1plwdmzds6dq2rlp84dgiashrfg0kg4yijhnxaapz2q4d1vvx8lq"; + hash = "sha256-g0oNV7Nj7ZMmsVQFVTDwbKtF4a/Fb3WDB+NRx9IGSWA="; }; buildInputs = [ gnupg ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { --replace "PREFIX?=/usr/local" "PREFIX=$out" substituteInPlace tools/confidence_test.sh \ - --replace 'PATH="''${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:/usr/pkg/bin:/usr/pkg/gnu/bin:''${blackbox_home}"' \ + --replace 'PATH="''${blackbox_home}:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin:/opt/local/bin:/usr/pkg/bin:/usr/pkg/gnu/bin:/usr/local/MacGPG2/bin:/opt/homebrew/bin:''${blackbox_home}"' \ "PATH=/build/source/bin/:$PATH" ''; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix index 7cdcc5bf81..178f6281c1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix @@ -3,19 +3,24 @@ , fetchFromGitHub , git , python3 +, stdenv +, installShellFiles +, nix-update-script , testers }: python3.pkgs.buildPythonApplication rec { pname = "commitizen"; - version = "3.5.2"; + version = "3.10.0"; format = "pyproject"; + disabled = python3.pythonOlder "3.8"; + src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-4m3NCnGUX9lHCk6czwzxXLqf8GLi2u2A/crBZYTyplA="; + hash = "sha256-faHZBH/JrCDRQqZT9v6hsj4C9/PbLQxIr+6hNFzsEcg="; }; pythonRelaxDeps = [ @@ -25,6 +30,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core pythonRelaxDepsHook + installShellFiles ]; propagatedBuildInputs = with python3.pkgs; [ @@ -77,7 +83,20 @@ python3.pkgs.buildPythonApplication rec { "test_commitizen_debug_excepthook" ]; + postInstall = + let + argcomplete = lib.getExe' python3.pkgs.argcomplete "register-python-argcomplete"; + in + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) + '' + installShellCompletion --cmd cz \ + --bash <(${argcomplete} --shell bash $out/bin/cz) \ + --zsh <(${argcomplete} --shell zsh $out/bin/cz) \ + --fish <(${argcomplete} --shell fish $out/bin/cz) + ''; + passthru = { + updateScript = nix-update-script { }; tests.version = testers.testVersion { package = commitizen; command = "cz version"; @@ -89,6 +108,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/commitizen-tools/commitizen"; changelog = "https://github.com/commitizen-tools/commitizen/blob/v${version}/CHANGELOG.md"; license = licenses.mit; + mainProgram = "cz"; maintainers = with maintainers; [ lovesegfault anthonyroussel ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/conform/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/conform/default.nix index c60a855ced..4800a14b31 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/conform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/conform/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "sha256-lIXkflWQcUcmRDX9iSszFLKpI8nSgkCCB2+GQn07+DM="; }; - vendorSha256 = "sha256-Oigt7tAK4jhBQtfG1wdLHqi11NWu6uJn5fmuqTmR76E="; + vendorHash = "sha256-Oigt7tAK4jhBQtfG1wdLHqi11NWu6uJn5fmuqTmR76E="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix index e853d4134d..d6727d327c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "cvs-fast-export"; - version = "1.60"; + version = "1.61"; src = fetchurl { url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-${version}.tar.gz"; - sha256 = "sha256-QLMBYX2n27rcaa9Uisrr2VItgtTPv5ZWbOc5tK1VF8w="; + sha256 = "sha256-4iH8VKxVliVZKwZ40rGMb3fH1nxTBdMT5IcBzdp1mjw="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/degit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/degit/default.nix new file mode 100644 index 0000000000..af586da349 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/degit/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "degit"; + version = "2.8.4"; + + src = fetchFromGitHub { + owner = "Rich-Harris"; + repo = "degit"; + rev = "v${version}"; + hash = "sha256-Vw/gtmKywi5faSCs7Wek80nmnqcPHXlQarD5qMwlsQE="; + }; + + npmDepsHash = "sha256-42cM31C2c1Gr7HWOowMUTEUEyL0mGnyl5fyQECcz1Sw="; + + meta = { + changelog = "https://github.com/Rich-Harris/degit/blob/${src.rev}/CHANGELOG.md"; + description = "Make copies of git repositories"; + homepage = "https://github.com/Rich-Harris/degit"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kidonng ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/delta/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/delta/default.nix index 79c511ec2c..7038ed13dc 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/delta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/delta/default.nix @@ -54,5 +54,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/dandavison/delta/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ marsam zowoq SuperSandro2000 figsoda ]; + mainProgram = "delta"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix index 663f7d3f7b..b10e9d432c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/forgejo/default.nix @@ -39,17 +39,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.20.2-0"; + version = "1.20.5-0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-8mFI5Zt2J6EQZqu/qcirFp8WMz+IlrkvHeA+oUb0X5U="; + hash = "sha256-tuwMvSWaMUc/GghmrbGLtyjixwOwiapWEOMD9QmMLic="; }; - vendorHash = "sha256-ZoFs2T3NNixrbTDdp7fqTgjJ+G8DpkxHW8K6BM8tZ9w="; + vendorHash = "sha256-dgtZjsLBwblhdge3BvdbK/mN/TeZKps9K5dJbqomtjo="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gex/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gex/default.nix index 31ea25cabb..bb190a272b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gex/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "gex"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "Piturnah"; repo = pname; rev = "v${version}"; - hash = "sha256-iCK3fiVchbfQh5JPHzBN/b24dkoXKW5dJdCsyoG0Kvw="; + hash = "sha256-ADVF+Kb0DDiR3dS43uzhefFFEg1O8IC22i5fmziEp6I="; }; nativeBuildInputs = [ pkg-config ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { libgit2_1_6 ]; - cargoHash = "sha256-5w8VzYoevWesMGQJe4rDbugCFQrE1LDNb69CaJ2bQ0w="; + cargoHash = "sha256-XBBZ56jvBtYI5J/sSc4ckk/KXzCHNgM9A4jGolGKh2E="; meta = with lib; { description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gg/default.nix index b94fea8da8..ea701c6f07 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gg/default.nix @@ -20,7 +20,7 @@ in buildGoModule { owner = "gg-scm"; repo = "gg"; rev = "v${version}"; - sha256 = "e628aeddb94d2470de860df09ef65499f8c5493fb336bf3df8502842ee02487f"; + hash = "sha256-5iiu3blNJHDehg3wnvZUmfjFST+zNr89+FAoQu4CSH8="; }; postPatch = '' substituteInPlace cmd/gg/editor_unix.go \ @@ -33,7 +33,7 @@ in buildGoModule { "-X" "main.buildCommit=${commit}" ]; - vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405"; + vendorHash = "sha256-IU3Ac9rXsyPqRJrPJMW1eNVzQy7qoVBs9XYaLX9c5AU="; nativeBuildInputs = [ pandoc installShellFiles makeWrapper ]; nativeCheckInputs = [ bash coreutils git ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix index 84de388ca6..22edc08e65 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.33.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-BvGZS0n9S3a/QCbzpP2539wj7hN54G5VlJnQVtqdSTk="; + hash = "sha256-ya+Iuhe+vXNqt6mfpZ3h8jq++82AGMj+Zd4ozGFjuqY="; }; - vendorHash = "sha256-7Izhqma/zukH9M7EvV9I4axefVaTDoNVXQmLx+GjAt0="; + vendorHash = "sha256-tJDn3pyX5iTIa61OQXbErdBprqxu1N2LXqyJtpDQnBE="; nativeBuildInputs = [ installShellFiles ]; @@ -47,6 +47,7 @@ buildGoModule rec { homepage = "https://cli.github.com/"; changelog = "https://github.com/cli/cli/releases/tag/v${version}"; license = licenses.mit; + mainProgram = "gh"; maintainers = with maintainers; [ zowoq ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix index dbe3841b29..ac534ff573 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.9.7"; + version = "1.9.9"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-uIhYk79ZXcJ/ttexgjtxskI2nEwlq+E4jgIZzwz8hmI="; + sha256 = "sha256-yq95+MHMbzVg8i/55EZBVCVkE3uwD964fAaXWP5aWYw="; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix index fd433bbfc5..0b460b14a9 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/ghr/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { sha256 = "sha256-aD1HEdoAPFFpJL++fLZIk+pIs+qDNYbTGDMlcRjV6M4="; }; - vendorSha256 = "sha256-pqwJPo3ZhsXU1RF4BKPOWQS71+9EitSSTE1+sKlc9+s="; + vendorHash = "sha256-pqwJPo3ZhsXU1RF4BKPOWQS71+9EitSSTE1+sKlc9+s="; # Tests require a Github API token, and networking doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-appraise/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-appraise/default.nix index 8b5844fb76..652c0be521 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-appraise/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-appraise/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-TteTI8yGP2sckoJ5xuBB5S8xzm1upXmZPlcDLvXZrpc="; }; - vendorSha256 = "sha256-Lzq4qpDAUjKFA2T685eW9NCfzEhDsn5UR1A1cIaZadE="; + vendorHash = "sha256-Lzq4qpDAUjKFA2T685eW9NCfzEhDsn5UR1A1cIaZadE="; ldflags = [ "-s" "-w" ]; 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 a1d94748e7..6bcfb0a6cd 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 @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - sha256 = "sha256-9kyC9Uwmc2WNHgfKpnS3v8vNF2o+168ULWqE+2eX1cE="; + hash = "sha256-ev56NzrEF7xm3WmR2a0pHPs69Lvmb4He7+kIBYiJjKY="; }; - cargoHash = "sha256-k+Jx5PcA8TaFQQDYqZ6dTy8bwNtYeALF75ucoFjVGUc="; + cargoHash = "sha256-Ppw5TN/6zMNxFAx90Q9hQ7RdGxV+TT8UlOm68ldK8oc="; nativeBuildInputs = [ pkg-config ]; @@ -52,6 +52,7 @@ rustPlatform.buildRustPackage rec { description = "A suite of tools to help you visualize, navigate, manipulate, and repair your commit history"; homepage = "https://github.com/arxanas/git-branchless"; license = licenses.gpl2Only; + mainProgram = "git-branchless"; maintainers = with maintainers; [ msfjarvis nh2 hmenke ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-bug-migration/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-bug-migration/default.nix index 36ddc93d83..386f405eb2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-bug-migration/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-bug-migration/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { hash = "sha256-IOBgrU3C0ZHD2wx9LRVgKEJzDlUj6z2UXlHGU3tdTdQ="; }; - vendorSha256 = "sha256-Hid9OK91LNjLmDHam0ZlrVQopVOsqbZ+BH2rfQi5lS0="; + vendorHash = "sha256-Hid9OK91LNjLmDHam0ZlrVQopVOsqbZ+BH2rfQi5lS0="; nativeCheckInputs = [ git ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-bug/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-bug/default.nix index 45c0557c30..5a2e9e5eec 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-bug/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-bug/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "12byf6nsamwz0ssigan1z299s01cyh8bhgj86bibl90agd4zs9n8"; }; - vendorSha256 = "sha256-32kNDoBE50Jx1Ef9YwhDk7nd3CaTSnHPlu7PgWPUGfE="; + vendorHash = "sha256-32kNDoBE50Jx1Ef9YwhDk7nd3CaTSnHPlu7PgWPUGfE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix index f4722b894a..5e82daa496 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-cliff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-EmpWJWvYxyg6m08Q77kRehtcVSQOm16ZdcmZWncLch4="; + hash = "sha256-DzlCy8Y3OW3FiXO45wuUh3t87Za2jWQ4rnztZGRySYA="; }; - cargoHash = "sha256-ECTvfS09CglAavj8LJbfpxnaWQtsp4DZb7GMJHIeEAA="; + cargoHash = "sha256-+XyZqxjiOAIyc+FmnexIdV1RMzc+iqmo8nPahzUo43E="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix index 26c34e5830..9606b9e15d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-codereview/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-codereview"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "golang"; repo = "review"; rev = "v${version}"; - hash = "sha256-Dy7gHT6WmZ1TjA5s+VmOUkaRvrA9v7mWQSLPscgBHgY="; + hash = "sha256-oHW73Y31z+0jOJdSJJa550mJYV8IP2fN+oNwT+3sySM="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix index f7b5d082e1..ae99781f83 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/default.nix @@ -20,13 +20,13 @@ assert withLibsecretSupport -> withGuiSupport; buildDotnetModule rec { pname = "git-credential-manager"; - version = "2.2.2"; + version = "2.3.2"; src = fetchFromGitHub { owner = "git-ecosystem"; repo = "git-credential-manager"; rev = "v${version}"; - hash = "sha256-XXtir/sSjJ1rpv3UQHM3Kano/fMBch/sm8ZtYwGyFyQ="; + hash = "sha256-vfv6dCmTuDsh6MaD2HAKlxZtQGVE0B5HJZPnoAUwUnM="; }; projectFile = "src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/update.sh b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/update.sh index a24eed3f27..e87352a365 100755 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/update.sh +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-manager/update.sh @@ -16,8 +16,8 @@ fi echo "updating $currentVersion -> $latestVersion" sed -i -e "s/version = \"${currentVersion}\"/version = \"${latestVersion}\"/" default.nix -hash="$(nix-prefetch ./.)" -sed -i -Ee "s/hash = \"sha256-[A-Za-z0-9=]{44}\"/hash = \"${hash}\"/" default.nix +hash="$(nix-prefetch -f "$(pwd)/../../../.." git-credential-manager)" +sed -i -Ee "s/hash = \"sha256-[A-Za-z0-9/+=]{44}\"/hash = \"${hash}\"/" default.nix $(nix-build ../../../.. -A git-credential-manager.fetch-deps --no-out-link) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix index 96277c4047..b7f6aa7bff 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-credential-oauth/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "hickford"; repo = pname; rev = "v${version}"; - hash = "sha256-dsJ2h0hnqAwqNZv2Wod6XvPR5za8YNYAhtv4pMICfO8="; + hash = "sha256-0sgoBvNVQZI8mOfKI5XWVQ6+615gKi1pO/4DPI6/fKA="; }; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-hound/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-hound/default.nix index d2be44bc1a..7a135b69a2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-hound/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-hound/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "sha256-HD5OK8HjnLDbyC/TmVI2HfBRIUCyyHTbA3JvKoeXV5E="; }; - vendorSha256 = null; #vendorSha256 = ""; + vendorHash = null; meta = with lib; { description = "Reconnaissance tool for GitHub code search"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix index 4c96bc13b4..e2d185b97f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-mit/default.nix @@ -10,7 +10,7 @@ }: let - version = "5.12.146"; + version = "5.12.156"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -20,10 +20,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; rev = "v${version}"; - hash = "sha256-VN1TbK9wi5Nt2K3yKx2lYSP30zSpwNETQ4OyHj8zxBg="; + hash = "sha256-AY+1zJsH4KgMiOfGDuNGxn5XmmYrWARapqiEZhckako="; }; - cargoHash = "sha256-YtUuRLjmehG+5kUiCo4LK0PkKAckr28UahlrAjm9MYw="; + cargoHash = "sha256-Rz0bgSlvekay5c/TYCu8FJUN3xnXjVFMa0wcUB72nw8="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-privacy/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-privacy/default.nix index 0a87793639..0fe486dbc2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-privacy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-privacy/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "git-privacy"; - version = "2.1.0"; + version = "2.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "EMPRI-DEVOPS"; repo = pname; rev = "v${version}"; - sha256 = "0hfy43fip1l81672xfwqrz1jryzkjy7h9f2lyikxgibibil0p444"; + hash = "sha256-b2RkRL8/mZwqc3xCs+oltzualhQtp/7F9POlLlT3UUU="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index d8eed798e1..a5f6820342 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.35"; + version = "2.37"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-ZJFXQH4bF3O4oMUwBQnoZC2FyL2/DH6AHk4CcHA0fLc="; + hash = "sha256-6OAubRkNXIm1HaiDq4jzBPUhgbwQowSZXSqAzAe7Rv0="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix index ed7239b80c..277786d724 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-sizer/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-On7QBTzKfnuuzwMQ8m1odxGqfIKL+EDg5V05Kxuhmqw="; }; - vendorSha256 = "sha256-oRlsD99XiI/0ZWibjyRcycmGab+vMbXrV5hIdIyUDYg="; + vendorHash = "sha256-oRlsD99XiI/0ZWibjyRcycmGab+vMbXrV5hIdIyUDYg="; ldflags = [ "-s" "-w" "-X main.BuildVersion=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix index 4e9c3b7a5c..c10a271024 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-subtrac/default.nix @@ -8,10 +8,10 @@ buildGoModule rec { owner = "apenwarr"; repo = pname; rev = "v${version}"; - sha256 = "0p1n29k2a2rpznwxlwzkmx38ic6g041k9vx7msvick7cydn417fx"; + hash = "sha256-3Z1AbPPsTBa3rqfvNAMBz7CIRq/zc9q5/TcLJWYSNlw="; }; - vendorSha256 = "0m64grnmhjvfsw7a56474s894sgd24rvcp5kamhzzyc4q556hqny"; + vendorHash = "sha256-3mJoSsGE+f9hVbNctjMR7WmSkCaHmKIO125LWG1+xFQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-up/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-up/default.nix index e4bd7e3ad8..7c0e6d53db 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-up/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-up/default.nix @@ -6,26 +6,33 @@ pythonPackages.buildPythonApplication rec { pname = "git-up"; - version = "1.6.1"; + version = "2.2.0"; + format = "pyproject"; src = fetchPypi { - inherit pname version; - sha256 = "0gs791yb0cndg9879vayvcj329jwhzpk6wrf9ri12l5hg8g490za"; + pname = "git_up"; + inherit version; + hash = "sha256-GTX2IWLQ48yWfPnmtEa9HJ5umQLttqgTlgZQlaWgeE4="; }; + nativeBuildInputs = with pythonPackages; [ + poetry-core + ]; + # git should be on path for tool to work correctly propagatedBuildInputs = [ git ] ++ (with pythonPackages; [ - click colorama - docopt gitpython - six termcolor ]); - nativeCheckInputs = [ git pythonPackages.nose ]; # git needs to be on path + nativeCheckInputs = [ + git + pythonPackages.pytestCheckHook + ]; + # 1. git fails to run as it cannot detect the email address, so we set it # 2. $HOME is by default not a valid dir, so we have to set that too # https://github.com/NixOS/nixpkgs/issues/12591 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-when-merged/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-when-merged/default.nix index d020f351fe..00c9bfa0ae 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-when-merged/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-when-merged/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "git-when-merged"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "mhagger"; repo = pname; rev = "v${version}"; - sha256 = "0sw98gmsnd4iki9fx455jga9m80bxvvfgys8i1r2fc7d5whc2qa6"; + sha256 = "sha256-Yp/GNzD+7EPlk/kzZnT1eiSNsSxpYEiZezRbUU3HfLc="; }; buildInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix index e225d5b55c..e56e57201e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix @@ -6,29 +6,33 @@ , Security , pkg-config , openssl +, nix-update-script , testers , git-workspace }: rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ppb42u31/iJd743vKX+5RdI7aITsWg9Jg0Aheguep5s="; + sha256 = "sha256-dtOYMZGBnFwas/k3yHSNnKlVwwLUOx7QseshJWY1X4o="; }; - cargoSha256 = "sha256-O0wyNdgY1meEBJh/tEHxwzjNQdzxbKn5Ji+gdd146vQ="; + cargoSha256 = "sha256-4zqbNhR8A0yPD/qIJgP6049bUunAKRyGmlNmC3yPc5Q="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; - passthru.tests.version = testers.testVersion { package = git-workspace; }; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = git-workspace; }; + }; meta = with lib; { description = "Sync personal and work git repositories from multiple providers"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix index 59afb979ac..1b92778e65 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git/default.nix @@ -29,7 +29,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.41.0"; + version = "2.42.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-50i6/UJM/oCyEsvG8bvMw6R9SGL7HreYiHd1BHhWgEA="; + hash = "sha256-MnghDp/SmUuEhN1+Pd2eqLlA71IXDNtgbaqU2IfJOw0="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -396,7 +396,7 @@ stdenv.mkDerivation (finalAttrs: { ''; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ primeos wmertens globin ]; + maintainers = with lib.maintainers; [ primeos wmertens globin kashw2 ]; mainProgram = "git"; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitbatch/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitbatch/default.nix index 0eb20db146..cb19964f73 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitbatch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitbatch/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-ovmdbyPRSebwmW6AW55jBgBKaNdY6w5/wrpUF2cMKw8="; }; - vendorSha256 = "sha256-wwpaJO5cXMsvqFXj+qGiIm4zg/SL4YCm2mNnG/qdilw="; + vendorHash = "sha256-wwpaJO5cXMsvqFXj+qGiIm4zg/SL4YCm2mNnG/qdilw="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 7da2ca8ffd..f21e586033 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -20,12 +20,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.20.3"; + version = "1.20.5"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-cn61Z5nYMmzSoHcDoXwuhm+IMn6+iIYPi7KxzO/b5Nw="; + hash = "sha256-cH/AHsFXOdvfSfj9AZUd3l/RlYE06o1ByZu0vvGQuXw="; }; vendorHash = null; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch index 7de1779f4a..a87e7ac161 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/Remove-unsupported-database-names.patch @@ -1,15 +1,15 @@ -From 310245bad66048624e199000a1c7eb9d68ce2b5c Mon Sep 17 00:00:00 2001 +From 054e2e2092e3f20267a5d2046978df6d33c72712 Mon Sep 17 00:00:00 2001 From: Yaya Date: Tue, 23 May 2023 13:49:18 +0000 Subject: [PATCH] Remove unsupported database names The only supported ones are main, ci, main_clusterwide. --- - config/database.yml.postgresql | 35 ---------------------------------- - 1 file changed, 35 deletions(-) + config/database.yml.postgresql | 37 ---------------------------------- + 1 file changed, 37 deletions(-) diff --git a/config/database.yml.postgresql b/config/database.yml.postgresql -index b210b9c412bc..900612080416 100644 +index da9f458ff..2d6d44e37 100644 --- a/config/database.yml.postgresql +++ b/config/database.yml.postgresql @@ -26,13 +26,6 @@ production: @@ -54,8 +54,8 @@ index b210b9c412bc..900612080416 100644 # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". -@@ -117,17 +96,3 @@ test: &test - prepared_statements: false +@@ -119,19 +98,3 @@ test: &test + reaping_frequency: nil variables: statement_timeout: 15s - geo: @@ -65,6 +65,7 @@ index b210b9c412bc..900612080416 100644 - username: postgres - password: - host: localhost +- reaping_frequency: nil - embedding: - adapter: postgresql - encoding: unicode @@ -72,6 +73,7 @@ index b210b9c412bc..900612080416 100644 - username: postgres - password: - host: localhost +- reaping_frequency: nil -- -2.38.4 +2.40.1 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json index ea2d40f923..3566e85a27 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.1.3", - "repo_hash": "sha256-PI0nmwfk8uu74NJkavbbJR9/jDN9SS0Z9Axe4UmT2kk=", - "yarn_hash": "0wykn0vq16n8mz4jfh7dfyp9javzhqlfwmc5i1zm07gld91nirlm", + "version": "16.4.1", + "repo_hash": "sha256-gIoHv+Zt0WgxxL1GLz1iaK1g3uJNMbp+Umo6FbWEggY=", + "yarn_hash": "0106yyiy00cag36mgckiwfdvhz23fsnskigpd533kjrl32qr9d6l", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.1.3-ee", + "rev": "v16.4.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.1.3", - "GITLAB_PAGES_VERSION": "16.1.3", - "GITLAB_SHELL_VERSION": "14.23.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.5", - "GITLAB_WORKHORSE_VERSION": "16.1.3" + "GITALY_SERVER_VERSION": "16.4.1", + "GITLAB_PAGES_VERSION": "16.4.1", + "GITLAB_SHELL_VERSION": "14.28.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.9", + "GITLAB_WORKHORSE_VERSION": "16.4.1" } } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix index 69d8bd5df3..5590588243 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix @@ -33,15 +33,6 @@ let buildInputs = [ file ]; buildFlags = [ "--enable-system-libraries" ]; }; - # the included yarn rake task attaches the yarn:install task - # to assets:precompile, which is both unnecessary (since we - # run `yarn install` ourselves) and undoes the shebang patches - # in node_modules - railties = x.railties // { - dontBuild = false; - patches = [ ./railties-remove-yarn-install-enhancement.patch ]; - patchFlags = [ "-p2" ]; - }; }; groups = [ "default" "unicorn" "ed25519" "metrics" "development" "puma" "test" "kerberos" @@ -50,7 +41,7 @@ let # `console` executable. ignoreCollisions = true; - extraConfigPaths = [ "${src}/vendor" ]; + extraConfigPaths = [ "${src}/vendor" "${src}/gems" ]; }; assets = stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 2d35d06dc8..f89f920c4c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -3,17 +3,10 @@ , fetchFromGitHub , buildGoModule , pkg-config - -# libgit2 + dependencies -, libgit2 -, http-parser -, openssl -, pcre -, zlib }: let - version = "16.1.3"; + version = "16.4.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -24,17 +17,16 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-g9K1dFcrUkWJInPrwg9fz/TEK35GrjqFpUS2bnemwLQ="; + hash = "sha256-t3d72l/Na0qv+jezT/YhAUbG9DSSe9pyixQjTALTxvk="; }; - vendorSha256 = "sha256-6oOFQGPwiMRQrESXsQsGzvWz9bCb0VTYIyyG/C2b3nA="; + vendorHash = "sha256-Nlq1l1f389DC854rFznEu2Viv0T7Y1cD1Ht0o2N304o="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; - tags = [ "static,system_libgit2" ]; + tags = [ "static" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgit2 openssl zlib pcre http-parser ]; doCheck = false; }; @@ -42,7 +34,7 @@ let auxBins = buildGoModule ({ pname = "gitaly-aux"; - subPackages = [ "cmd/gitaly-hooks" "cmd/gitaly-ssh" "cmd/gitaly-git2go" "cmd/gitaly-lfs-smudge" ]; + subPackages = [ "cmd/gitaly-hooks" "cmd/gitaly-ssh" "cmd/gitaly-lfs-smudge" "cmd/gitaly-gpg" ]; } // commonOpts); in buildGoModule ({ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index 62521099a7..0cac9f890e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "3.79.0"; + version = "3.84.0"; rev = "v${version}-gitlab"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - sha256 = "sha256-JOXJ8HSTf7yW78SlYzbdn7IAbSwv/UE/W3oSJRyGrAQ="; + sha256 = "sha256-VdLovX3/y0fME74YlpPxjNPAwFpr1urAHJYO24VJ4AE="; }; - vendorHash = "sha256-4cxfyG1uhqgIheAVDQbIDb4MRSqAUtLgxGYt5MuNfKw="; + vendorHash = "sha256-ZFQixOgcB8GqgZPIbjMJEYOlg9cD+wAMZF7mwWaNSXI="; patches = [ ./Disable-inmemory-storage-driver-test.patch diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix index a52a9a7538..11e272e1bc 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -2,16 +2,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "4.3.5"; + version = "4.3.9"; + # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - sha256 = "sha256-2idvN92H4Cc1W71gADrsuUl3+f2weAvL2MOP19NO/3I="; + sha256 = "sha256-/jo44MlLWZCSUWFW2rJSqugNYZCXEs5pfj0f6fZs4zg="; }; - vendorHash = "sha256-7LqzuBVYqpPI2thIJu4kQgCZGMlBlKI8L+j7AdUYrgQ="; + vendorHash = "sha256-TQ6E5eckZNVL6zzaS9m0izWnQitqfpc4MAEoQOVasnA="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 7fcc652056..7810639eca 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.1.3"; + version = "16.4.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-FSdew0HMbgEAzVoDhINDIQQs8Q63AHu8mu/dKo+wP9k="; + hash = "sha256-aUpuzgFbxMJwKjTn+QAudOeMBSLtLTjaTmwe25f6qxg="; }; - vendorHash = "sha256-SN4r9hcTTQUr3miv2Cm7iBryyh7yG1xx9lCvq3vQwc0="; + vendorHash = "sha256-ko0ycT8HlqVfXf7tck0xcs6rDJMpHxjSoI59gTLgqDQ="; subPackages = [ "." ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index b3b4fc3105..01b1193263 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.23.0"; + version = "14.28.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-nQJq9aPC5YtTbyiwtzKwDG95PnBr6XdNpSIJkfgvnzU="; + sha256 = "sha256-w/Td4J4t/xrkR5LmFTcAD5U9ZR3HDGqLNxpjkDC0pi4="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-JEWgOuWvtuaipF8fFTsFbB+sYfaHEYUl9Z8Q1XAuJuE="; + vendorHash = "sha256-EIJSBUUsWvA93OAyBNey2WA2sV+7YSWbsC1RnWf6nrI="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 9b19ec2aec..690af3a806 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.1.3"; + version = "16.4.1"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorSha256 = "sha256-lKl/V2fti0eqrEoeJNNwvJbZO7z7v+5HlES+dyxxcP4="; + vendorHash = "sha256-C6FVTOY3CdO2y6mKuvgEWDZnWevRTxeOefRF2EbXDv8="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/railties-remove-yarn-install-enhancement.patch b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/railties-remove-yarn-install-enhancement.patch deleted file mode 100644 index 25cbf775e6..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/railties-remove-yarn-install-enhancement.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/railties/lib/rails/tasks/yarn.rake b/railties/lib/rails/tasks/yarn.rake -index 0226da721a..365cdeb0f9 100644 ---- a/railties/lib/rails/tasks/yarn.rake -+++ b/railties/lib/rails/tasks/yarn.rake -@@ -27,8 +27,3 @@ namespace :yarn do - exit 1 - end - end -- --# Run Yarn prior to Sprockets assets precompilation, so dependencies are available for use. --if Rake::Task.task_defined?("assets:precompile") && File.exist?(Rails.root.join("bin", "yarn")) -- Rake::Task["assets:precompile"].enhance [ "yarn:install" ] --end diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index ef5a22d201..d9ee8a8ae7 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -13,26 +13,39 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir # NOTE: When incrementing the major or minor version here, also increment activerecord_version # in vendor/gems/attr_encrypted/attr_encrypted.gemspec until we resolve # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 -gem 'rails', '~> 6.1.7.2' +# +# See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails +gem 'rails', '~> 7.0.6' + +gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' + +gem 'vite_rails' gem 'bootsnap', '~> 1.16.0', require: false gem 'openssl', '~> 3.0' gem 'ipaddr', '~> 1.2.5' +gem 'gitlab-safe_request_store', path: 'gems/gitlab-safe_request_store' + +# GitLab Monorepo Gems +group :monorepo do + gem 'gitlab-utils', path: 'gems/gitlab-utils' +end + # Responders respond_to and respond_with gem 'responders', '~> 3.0' gem 'sprockets', '~> 3.7.0' -gem 'view_component', '~> 3.2.0' +gem 'view_component', '~> 3.5.0' # Supported DBs -gem 'pg', '~> 1.5.3' +gem 'pg', '~> 1.5.4' gem 'neighbor', '~> 0.2.3' -gem 'rugged', '~> 1.5' +gem 'rugged', '~> 1.6' gem 'grape-path-helpers', '~> 1.7.1' gem 'faraday', '~> 1.0' @@ -47,7 +60,7 @@ gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'vendor/gems/devise-pbkdf2-en gem 'bcrypt', '~> 3.1', '>= 3.1.14' gem 'doorkeeper', '~> 5.6', '>= 5.6.6' gem 'doorkeeper-openid_connect', '~> 1.8', '>= 1.8.7' -gem 'rexml', '~> 3.2.5' +gem 'rexml', '~> 3.2.6' gem 'ruby-saml', '~> 1.15.0' gem 'omniauth', '~> 2.1.0' gem 'omniauth-auth0', '~> 3.1' @@ -61,7 +74,7 @@ gem 'omniauth-gitlab', '~> 4.0.0', path: 'vendor/gems/omniauth-gitlab' # See ven gem 'omniauth-google-oauth2', '~> 1.1' gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 2.1.0' -gem 'omniauth-shibboleth-redux', '~> 2.0' +gem 'omniauth-shibboleth-redux', '~> 2.0', require: 'omniauth-shibboleth' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.4.0', path: 'vendor/gems/omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md gem 'omniauth_openid_connect', '~> 0.6.1' @@ -80,7 +93,7 @@ gem 'timfel-krb5-auth', '~> 0.8', group: :kerberos # Spam and anti-bot protection gem 'recaptcha', '~> 5.12', require: 'recaptcha/rails' gem 'akismet', '~> 3.0' -gem 'invisible_captcha', '~> 2.0.0' +gem 'invisible_captcha', '~> 2.1.0' # Two-factor authentication gem 'devise-two-factor', '~> 4.0.2' @@ -88,7 +101,7 @@ gem 'rqrcode-rails3', '~> 0.1.7' gem 'attr_encrypted', '~> 3.2.4', path: 'vendor/gems/attr_encrypted' # GitLab Pages -gem 'validates_hostname', '~> 1.0.11' +gem 'validates_hostname', '~> 1.0.13' gem 'rubyzip', '~> 2.3.2', require: 'zip' # GitLab Pages letsencrypt support gem 'acme-client', '~> 2.0' @@ -100,28 +113,31 @@ gem 'browser', '~> 5.3.1' gem 'ohai', '~> 17.9' # GPG -gem 'gpgme', '~> 2.0.22' +gem 'gpgme', '~> 2.0.23' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' -gem 'net-ldap', '~> 0.18.0' +gem 'net-ldap', '~> 0.17.1' # API -gem 'grape', '~> 1.7.0' +gem 'grape', '~> 1.7.1' gem 'grape-entity', '~> 0.10.0' -gem 'rack-cors', '~> 1.1.1', require: 'rack/cors' +gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' gem 'grape-swagger', '~> 1.6.1', group: [:development, :test] gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test] # GraphQL API -gem 'graphql', '~> 1.13.12' -gem 'graphiql-rails', '~> 1.8' +gem 'graphql', '~> 1.13.19' +gem 'graphiql-rails', '~> 1.8.0' gem 'apollo_upload_server', '~> 2.1.0' gem 'graphql-docs', '~> 2.1.0', group: [:development, :test] gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import) +# Generate Fake data +gem 'ffaker', '~> 2.10' + gem 'hashie', '~> 5.0.0' # Pagination @@ -148,7 +164,7 @@ gem 'fog-local', '~> 0.8' # We may want to update this dependency if this is ever addressed upstream, e.g. via # https://github.com/aliyun/aliyun-oss-ruby-sdk/pull/93 gem 'fog-aliyun', '~> 0.4' -gem 'gitlab-fog-azure-rm', '~> 1.7.0', require: 'fog/azurerm' +gem 'gitlab-fog-azure-rm', '~> 1.8.0', require: 'fog/azurerm' # for Google storage gem 'google-cloud-storage', '~> 1.44.0' @@ -163,9 +179,6 @@ gem 'google-apis-serviceusage_v1', '~> 0.28.0' gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0' gem 'google-apis-androidpublisher_v3', '~> 0.34.0' -# for aws storage -gem 'unf', '~> 0.1.4' - # Seed data gem 'seed-fu', '~> 2.3.7' @@ -173,17 +186,17 @@ gem 'seed-fu', '~> 2.3.7' gem 'elasticsearch-model', '~> 7.2' gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '7.13.3' -gem 'aws-sdk-core', '~> 3.175.0' +gem 'aws-sdk-core', '~> 3.181.1' gem 'aws-sdk-cloudformation', '~> 1' -gem 'aws-sdk-s3', '~> 1.126.0' +gem 'aws-sdk-s3', '~> 1.134.0' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # Markdown and HTML processing gem 'html-pipeline', '~> 2.14.3' -gem 'deckar01-task_list', '2.3.2' +gem 'deckar01-task_list', '2.3.3' gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' -gem 'commonmarker', '~> 0.23.9' +gem 'commonmarker', '~> 0.23.10' gem 'kramdown', '~> 2.3.1' gem 'RedCloth', '~> 4.3.2' gem 'rdoc', '~> 6.3.2' @@ -194,9 +207,9 @@ gem 'asciidoctor', '~> 2.0.18' gem 'asciidoctor-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-plantuml', '~> 0.0.16' gem 'asciidoctor-kroki', '~> 0.8.0', require: false -gem 'rouge', '~> 4.1.2' +gem 'rouge', '~> 4.1.3' gem 'truncato', '~> 0.7.12' -gem 'nokogiri', '~> 1.15', '>= 1.15.2' +gem 'nokogiri', '~> 1.15', '>= 1.15.4' # Calendar rendering gem 'icalendar' @@ -206,12 +219,12 @@ gem 'diffy', '~> 3.4' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.2.7' +gem 'rack', '~> 2.2.8' # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' group :puma do - gem 'puma', '~> 6.3', require: false + gem 'puma', '~> 6.3', '>= 6.3.1', require: false gem 'sd_notify', '~> 0.1.0', require: false end @@ -231,7 +244,7 @@ gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', requir gem 'fugit', '~> 1.8.1' # HTTP requests -gem 'httparty', '~> 0.20.0' +gem 'httparty', '~> 0.21.0' # Colored output to console gem 'rainbow', '~> 3.0' @@ -240,12 +253,13 @@ gem 'rainbow', '~> 3.0' gem 'ruby-progressbar', '~> 1.10' # Linear-time regex library for untrusted regular expressions -gem 're2', '~> 1.6.0' +gem 're2', '2.0.0' # Misc gem 'semver_dialects', '~> 1.2.1' gem 'version_sorter', '~> 2.3' +gem 'csv_builder', path: 'gems/csv_builder' # Export Ruby Regex to Javascript gem 'js_regex', '~> 3.8' @@ -287,16 +301,14 @@ gem 'ruby-openai', '~> 3.7' gem 'circuitbox', '2.0.0' # Sanitize user input -gem 'sanitize', '~> 6.0' +gem 'sanitize', '~> 6.0.2' gem 'babosa', '~> 2.0' # Sanitizes SVG input gem 'loofah', '~> 2.21.3' -# Working with license -# Detects the open source license the repository includes -# This version needs to be in sync with gitlab-org/gitaly -gem 'licensee', '~> 9.15' +# Used to provide license templates +gem 'licensee', '~> 9.16' # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.7' @@ -305,20 +317,21 @@ gem 'charlock_holmes', '~> 0.7.7' gem 'ruby-magic', '~> 0.6' # Faster blank -gem 'fast_blank' +gem 'fast_blank', '~> 1.0.1' # Parse time & duration gem 'gitlab-chronic', '~> 0.10.5' -gem 'gitlab_chronic_duration', '~> 0.10.6.2' +gem 'gitlab_chronic_duration', '~> 0.11' -gem 'rack-proxy', '~> 0.7.6' +gem 'rack-proxy', '~> 0.7.7' gem 'sassc-rails', '~> 2.1.0' gem 'autoprefixer-rails', '10.2.5.1' gem 'terser', '1.0.2' +gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' gem 'addressable', '~> 2.8' -gem 'tanuki_emoji', '~> 0.6' +gem 'tanuki_emoji', '~> 0.7' gem 'gon', '~> 6.4.0' gem 'request_store', '~> 1.5.1' gem 'base32', '~> 0.3.0' @@ -326,7 +339,7 @@ gem 'base32', '~> 0.3.0' gem 'gitlab-license', '~> 2.3' # Protect against bruteforcing -gem 'rack-attack', '~> 6.6.1' +gem 'rack-attack', '~> 6.7.0' # Sentry integration gem 'sentry-raven', '~> 3.1' @@ -336,17 +349,18 @@ gem 'sentry-sidekiq', '~> 5.8.0' # PostgreSQL query parsing # -gem 'pg_query', '~> 4.2.1' +gem 'pg_query', '~> 4.2.3' + +gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation' gem 'premailer-rails', '~> 1.10.3' -gem 'gitlab-labkit', '~> 0.33.0' +gem 'gitlab-labkit', '~> 0.34.0' gem 'thrift', '>= 0.16.0' # I18n -gem 'ruby_parser', '~> 3.20', require: false gem 'rails-i18n', '~> 7.0' -gem 'gettext_i18n_rails', '~> 1.8.0' +gem 'gettext_i18n_rails', '~> 1.11.0' gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.3', require: false, group: :development @@ -363,12 +377,12 @@ gem 'snowplow-tracker', '~> 0.8.0' # Metrics gem 'webrick', '~> 1.8.1', require: false -gem 'prometheus-client-mmap', '~> 0.25', require: 'prometheus/client' +gem 'prometheus-client-mmap', '~> 0.28', require: 'prometheus/client' gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 1.4.2', require: false + gem 'lefthook', '~> 1.4.7', require: false gem 'rubocop' gem 'solargraph', '~> 0.47.2', require: false @@ -389,24 +403,21 @@ group :development, :test do gem 'parser', '~> 3.2', '>= 3.2.2.3' gem 'pry-byebug' gem 'pry-rails', '~> 0.3.9' - gem 'pry-shell', '~> 0.6.1' + gem 'pry-shell', '~> 0.6.4' gem 'awesome_print', require: false gem 'database_cleaner', '~> 1.7.0' gem 'factory_bot_rails', '~> 6.2.0' - gem 'rspec-rails', '~> 6.0.1' + gem 'rspec-rails', '~> 6.0.3' # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0' - # Generate Fake data - gem 'ffaker', '~> 2.10' - gem 'spring', '~> 4.1.0' gem 'spring-commands-rspec', '~> 1.0.4' - gem 'gitlab-styles', '~> 10.0.0', require: false + gem 'gitlab-styles', '~> 10.1.0', require: false gem 'haml_lint', '~> 0.40.0', require: false gem 'bundler-audit', '~> 0.7.0.1', require: false @@ -432,13 +443,13 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.10.0', require: false + gem 'gitlab-dangerfiles', '~> 4.0.0', require: false end group :development, :test, :coverage do gem 'simplecov', '~> 0.21', require: false gem 'simplecov-lcov', '~> 0.8.0', require: false - gem 'simplecov-cobertura', '~> 1.3.1', require: false + gem 'simplecov-cobertura', '~> 2.1.0', require: false gem 'undercover', '~> 0.4.4', require: false end @@ -447,6 +458,12 @@ group :development, :test, :omnibus do gem 'license_finder', '~> 7.0', require: false end +# Gems required in various pipelines +group :development, :test, :monorepo do + gem 'gitlab-rspec', path: 'gems/gitlab-rspec' + gem 'rspec_flaky', path: 'gems/rspec_flaky' +end + group :test do gem 'fuubar', '~> 2.2.0' gem 'rspec-retry', '~> 0.6.2' @@ -454,19 +471,18 @@ group :test do gem 'rspec-benchmark', '~> 0.6.0' gem 'rspec-parameterized', '~> 1.0', require: false - gem 'capybara', '~> 3.39', '>= 3.39.1' + gem 'capybara', '~> 3.39', '>= 3.39.2' gem 'capybara-screenshot', '~> 1.0.26' - # 4.9.1 drops Ruby 2.7 support. We can upgrade further after we drop Ruby 2.7 support. - gem 'selenium-webdriver', '= 4.9.0' + gem 'selenium-webdriver', '= 4.12.0' gem 'graphlyte', '~> 1.0.0' gem 'shoulda-matchers', '~> 5.1.0', require: false gem 'email_spec', '~> 2.2.0' - gem 'webmock', '~> 3.18.1' + gem 'webmock', '~> 3.19.1' gem 'rails-controller-testing' gem 'concurrent-ruby', '~> 1.1' - gem 'test-prof', '~> 1.2.1' + gem 'test-prof', '~> 1.2.2' gem 'rspec_junit_formatter' gem 'guard-rspec' gem 'axe-core-rspec' @@ -474,10 +490,10 @@ group :test do # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false - gem 'gitlab_quality-test_tooling', '~> 0.8.1', require: false + gem 'gitlab_quality-test_tooling', '~> 1.0.0', require: false end -gem 'octokit', '~> 4.15' +gem 'octokit', '~> 6.0' gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' @@ -509,23 +525,23 @@ gem 'ssh_data', '~> 1.3' gem 'spamcheck', '~> 1.3.0' # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 16.1.0-rc2' +gem 'gitaly', '~> 16.3.0-rc1' # KAS GRPC protocol definitions -gem 'kas-grpc', '~> 0.1.0' +gem 'kas-grpc', '~> 0.2.0' -gem 'grpc', '~> 1.42.0' +gem 'grpc', '~> 1.55.0' -gem 'google-protobuf', '~> 3.23', '>= 3.23.3' +gem 'google-protobuf', '~> 3.24', '>= 3.24.3' gem 'toml-rb', '~> 2.2.0' # Feature toggles -gem 'flipper', '~> 0.25.0' -gem 'flipper-active_record', '~> 0.25.0' -gem 'flipper-active_support_cache_store', '~> 0.25.0' +gem 'flipper', '~> 0.26.2' +gem 'flipper-active_record', '~> 0.26.2' +gem 'flipper-active_support_cache_store', '~> 0.26.2' gem 'unleash', '~> 3.2.2' -gem 'gitlab-experiment', '~> 0.7.1' +gem 'gitlab-experiment', '~> 0.8.0' # Structured logging gem 'lograge', '~> 0.5' @@ -555,12 +571,13 @@ gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: f gem 'microsoft_graph_mailer', '~> 0.1.0', path: 'vendor/gems/microsoft_graph_mailer' # File encryption -gem 'lockbox', '~> 1.1.1' +gem 'lockbox', '~> 1.3.0' # Email validation gem 'valid_email', '~> 0.1' # JSON +gem 'jsonb_accessor', '~> 1.3.10' gem 'json', '~> 2.6.3' gem 'json_schemer', '~> 0.2.18' gem 'oj', '~> 3.13.21' @@ -575,13 +592,13 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'ipynbdiff', path: 'vendor/gems/ipynbdiff' +gem 'ipynbdiff', path: 'gems/ipynbdiff', require: 'ipynb_diff' gem 'ed25519', '~> 1.3.0' # Error Tracking OpenAPI client # See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature -gem 'error_tracking_open_api', path: 'vendor/gems/error_tracking_open_api' +gem 'error_tracking_open_api', path: 'gems/error_tracking_open_api' # Vulnerability advisories gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' @@ -590,7 +607,7 @@ gem 'cvss-suite', '~> 3.0.1', require: 'cvss_suite' gem 'arr-pm', '~> 0.0.12' # Remote Development -gem 'devfile', '~> 0.0.19.pre.alpha1' +gem 'devfile', '~> 0.0.22.pre.alpha1' # Apple plist parsing gem 'CFPropertyList', '~> 3.0.0' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 3aaf6a4593..2a8f80bf39 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1,3 +1,72 @@ +PATH + remote: gems/activerecord-gitlab + specs: + activerecord-gitlab (0.2.0) + activerecord (>= 7) + +PATH + remote: gems/click_house-client + specs: + click_house-client (0.1.0) + activesupport (< 8) + addressable (~> 2.8) + json (~> 2.6.3) + +PATH + remote: gems/csv_builder + specs: + csv_builder (0.1.0) + +PATH + remote: gems/error_tracking_open_api + specs: + error_tracking_open_api (1.0.0) + typhoeus (~> 1.0, >= 1.0.1) + +PATH + remote: gems/gitlab-rspec + specs: + gitlab-rspec (0.1.0) + activesupport (>= 6.1, < 7.1) + rspec (~> 3.0) + +PATH + remote: gems/gitlab-safe_request_store + specs: + gitlab-safe_request_store (0.1.0) + request_store + +PATH + remote: gems/gitlab-schema-validation + specs: + gitlab-schema-validation (0.1.0) + diffy + pg_query + +PATH + remote: gems/gitlab-utils + specs: + gitlab-utils (0.1.0) + actionview (>= 6.1.7.2) + activesupport (>= 6.1.7.2) + addressable (~> 2.8) + nokogiri (~> 1.15.2) + rake (~> 13.0) + +PATH + remote: gems/ipynbdiff + specs: + ipynbdiff (0.4.7) + diffy (~> 3.4) + oj (~> 3.13.16) + +PATH + remote: gems/rspec_flaky + specs: + rspec_flaky (0.1.0) + activesupport (>= 6.1, < 7.1) + rspec (~> 3.0) + PATH remote: vendor/gems/attr_encrypted specs: @@ -26,25 +95,12 @@ PATH devise (~> 4.0) devise-two-factor (~> 4.0) -PATH - remote: vendor/gems/error_tracking_open_api - specs: - error_tracking_open_api (1.0.0) - typhoeus (~> 1.0, >= 1.0.1) - -PATH - remote: vendor/gems/ipynbdiff - specs: - ipynbdiff (0.4.7) - diffy (~> 3.4) - oj (~> 3.13.16) - PATH remote: vendor/gems/mail-smtp_pool specs: mail-smtp_pool (0.1.0) connection_pool (~> 2.0) - mail (~> 2.7) + mail (~> 2.8) PATH remote: vendor/gems/microsoft_graph_mailer @@ -99,69 +155,75 @@ GEM acme-client (2.0.11) faraday (>= 1.0, < 3.0.0) faraday-retry (~> 1.0) - actioncable (6.1.7.2) - actionpack (= 6.1.7.2) - activesupport (= 6.1.7.2) + actioncable (7.0.6) + actionpack (= 7.0.6) + activesupport (= 7.0.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.2) - actionpack (= 6.1.7.2) - activejob (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + actionmailbox (7.0.6) + actionpack (= 7.0.6) + activejob (= 7.0.6) + activerecord (= 7.0.6) + activestorage (= 7.0.6) + activesupport (= 7.0.6) mail (>= 2.7.1) - actionmailer (6.1.7.2) - actionpack (= 6.1.7.2) - actionview (= 6.1.7.2) - activejob (= 6.1.7.2) - activesupport (= 6.1.7.2) + net-imap + net-pop + net-smtp + actionmailer (7.0.6) + actionpack (= 7.0.6) + actionview (= 7.0.6) + activejob (= 7.0.6) + activesupport (= 7.0.6) mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp rails-dom-testing (~> 2.0) - actionpack (6.1.7.2) - actionview (= 6.1.7.2) - activesupport (= 6.1.7.2) - rack (~> 2.0, >= 2.0.9) + actionpack (7.0.6) + actionview (= 7.0.6) + activesupport (= 7.0.6) + rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.2) - actionpack (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + actiontext (7.0.6) + actionpack (= 7.0.6) + activerecord (= 7.0.6) + activestorage (= 7.0.6) + activesupport (= 7.0.6) + globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (6.1.7.2) - activesupport (= 6.1.7.2) + actionview (7.0.6) + activesupport (= 7.0.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7.2) - activesupport (= 6.1.7.2) + activejob (7.0.6) + activesupport (= 7.0.6) globalid (>= 0.3.6) - activemodel (6.1.7.2) - activesupport (= 6.1.7.2) - activerecord (6.1.7.2) - activemodel (= 6.1.7.2) - activesupport (= 6.1.7.2) + activemodel (7.0.6) + activesupport (= 7.0.6) + activerecord (7.0.6) + activemodel (= 7.0.6) + activesupport (= 7.0.6) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (6.1.7.2) - actionpack (= 6.1.7.2) - activejob (= 6.1.7.2) - activerecord (= 6.1.7.2) - activesupport (= 6.1.7.2) + activestorage (7.0.6) + actionpack (= 7.0.6) + activejob (= 7.0.6) + activerecord (= 7.0.6) + activesupport (= 7.0.6) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.2) + activesupport (7.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - zeitwerk (~> 2.3) - acts-as-taggable-on (9.0.0) + acts-as-taggable-on (9.0.1) activerecord (>= 6.0, < 7.1) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) @@ -203,7 +265,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.175.0) + aws-sdk-core (3.181.1) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) @@ -211,11 +273,11 @@ GEM aws-sdk-kms (1.64.0) aws-sdk-core (~> 3, >= 3.165.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.126.0) - aws-sdk-core (~> 3, >= 3.174.0) + aws-sdk-s3 (1.134.0) + aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.1) + aws-sigv4 (~> 1.6) + aws-sigv4 (1.6.0) aws-eventstream (~> 1, >= 1.0.2) axe-core-api (4.6.0) dumb_delegator @@ -240,7 +302,7 @@ GEM backport (1.2.0) base32 (0.3.2) batch-loader (2.0.1) - bcrypt (3.1.16) + bcrypt (3.1.18) benchmark (0.2.0) benchmark-ips (2.11.0) benchmark-malloc (0.2.0) @@ -266,7 +328,7 @@ GEM bundler (>= 1.2.0, < 3) thor (>= 0.18, < 2) byebug (11.1.3) - capybara (3.39.1) + capybara (3.39.2) addressable matrix mini_mime (>= 0.1.3) @@ -307,7 +369,7 @@ GEM coercible (1.0.0) descendants_tracker (~> 0.0.1) colored2 (3.1.2) - commonmarker (0.23.9) + commonmarker (0.23.10) concurrent-ruby (1.2.2) connection_pool (2.3.0) cork (0.3.0) @@ -327,18 +389,18 @@ GEM css_parser (1.14.0) addressable cvss-suite (3.0.1) - danger (8.6.1) + danger (9.3.1) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) cork (~> 0.1) - faraday (>= 0.9.0, < 2.0) + faraday (>= 0.9.0, < 3.0) faraday-http-cache (~> 2.0) - git (~> 1.7) + git (~> 1.13) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) no_proxy_fix - octokit (~> 4.7) + octokit (~> 6.0) terminal-table (>= 1, < 4) danger-gitlab (8.0.0) danger @@ -347,7 +409,7 @@ GEM date (3.3.3) dead_end (3.1.1) debug_inspector (1.1.0) - deckar01-task_list (2.3.2) + deckar01-task_list (2.3.3) html-pipeline declarative (0.0.20) declarative_policy (1.1.0) @@ -367,7 +429,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devfile (0.0.19.pre.alpha1) + devfile (0.0.22.pre.alpha1) device_detector (1.0.0) devise (4.8.1) bcrypt (~> 3.0) @@ -397,6 +459,7 @@ GEM doorkeeper (>= 5.5, < 5.7) jwt (>= 2.5) dotenv (2.7.6) + dry-cli (1.0.0) dry-core (1.0.0) concurrent-ruby (~> 1.0) zeitwerk (~> 2.6) @@ -440,7 +503,7 @@ GEM escape_utils (1.2.1) et-orbi (1.2.7) tzinfo - ethon (0.15.0) + ethon (0.16.0) ffi (>= 1.15.0) excon (0.99.0) execjs (2.8.1) @@ -466,9 +529,6 @@ GEM faraday-rack (~> 1.0) faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) - faraday-cookie_jar (0.0.7) - faraday (>= 0.8.0) - http-cookie (~> 1.0.0) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) @@ -490,24 +550,25 @@ GEM faraday_middleware-multi_json (0.0.6) faraday_middleware multi_json - fast_blank (1.0.0) + fast_blank (1.0.1) fast_gettext (2.3.0) ffaker (2.10.0) ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - ffi-yajl (2.3.4) - libyajl2 (~> 1.2) + ffi-yajl (2.6.0) + libyajl2 (>= 1.2) filelock (1.1.1) find_a_port (1.0.1) - flipper (0.25.0) - flipper-active_record (0.25.0) + flipper (0.26.2) + concurrent-ruby (< 2) + flipper-active_record (0.26.2) activerecord (>= 4.2, < 8) - flipper (~> 0.25.0) - flipper-active_support_cache_store (0.25.0) + flipper (~> 0.26.2) + flipper-active_support_cache_store (0.26.2) activesupport (>= 4.2, < 8) - flipper (~> 0.25.0) + flipper (~> 0.26.2) fog-aliyun (0.4.0) addressable (~> 2.8.0) aliyun-sdk (~> 0.8.0) @@ -566,43 +627,43 @@ GEM gettext (3.3.6) locale (>= 2.0.5) text (>= 1.3.0) - gettext_i18n_rails (1.8.0) + gettext_i18n_rails (1.11.0) fast_gettext (>= 0.9.0) gettext_i18n_rails_js (1.3.0) gettext (>= 3.0.2) gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - git (1.11.0) + git (1.18.0) + addressable (~> 2.8) rchardet (~> 1.8) - gitaly (16.1.0.pre.rc2) + gitaly (16.3.0.pre.rc1) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.10.0) - danger (>= 8.4.5) + gitlab-dangerfiles (4.0.0) + danger (>= 9.3.0) danger-gitlab (>= 8.0.0) rake - gitlab-experiment (0.7.1) + gitlab-experiment (0.8.0) activesupport (>= 3.0) request_store (>= 1.0) - gitlab-fog-azure-rm (1.7.0) + gitlab-fog-azure-rm (1.8.0) azure-storage-blob (~> 2.0) azure-storage-common (~> 2.0) fog-core (= 2.1.0) fog-json (~> 1.2.0) mime-types - ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.33.0) + gitlab-labkit (0.34.0) actionpack (>= 5.0.0, < 8.0.0) activesupport (>= 5.0.0, < 8.0.0) grpc (>= 1.37) jaeger-client (~> 1.1.0) opentracing (~> 0.4) - pg_query (~> 4.2.1) + pg_query (~> 4.2.3) redis (> 3.0.0, < 6.0.0) gitlab-license (2.3.0) gitlab-mail_room (0.0.23) @@ -611,20 +672,20 @@ GEM oauth2 (>= 1.4.4, < 3) gitlab-markup (1.9.0) gitlab-net-dns (0.9.2) - gitlab-styles (10.0.0) - rubocop (~> 1.43.0) + gitlab-styles (10.1.0) + rubocop (~> 1.50.2) rubocop-graphql (~> 0.18) rubocop-performance (~> 1.15) rubocop-rails (~> 2.17) - rubocop-rspec (~> 2.18) - gitlab_chronic_duration (0.10.6.2) + rubocop-rspec (~> 2.22) + gitlab_chronic_duration (0.11.0) numerizer (~> 0.2) gitlab_omniauth-ldap (2.2.0) net-ldap (~> 0.16) omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (0.8.1) + gitlab_quality-test_tooling (1.0.0) activesupport (>= 6.1, < 7.1) gitlab (~> 4.19) http (~> 5.0) @@ -694,7 +755,7 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - google-protobuf (3.23.3) + google-protobuf (3.24.3) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) @@ -708,14 +769,14 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - gpgme (2.0.22) + gpgme (2.0.23) mini_portile2 (~> 2.7) - grape (1.7.0) + grape (1.7.1) activesupport builder dry-types (>= 1.1) mustermann-grape (~> 1.0.0) - rack (>= 1.3.0) + rack (>= 1.3.0, < 3) rack-accept grape-entity (0.10.0) activesupport (>= 3.0.0) @@ -741,7 +802,7 @@ GEM faraday_middleware graphql-client graphlyte (1.0.0) - graphql (1.13.12) + graphql (1.13.19) graphql-client (0.17.0) activesupport (>= 3.0) graphql (~> 1.10) @@ -753,8 +814,8 @@ GEM graphql (~> 1.12) html-pipeline (~> 2.9) sass (~> 3.4) - grpc (1.42.0) - google-protobuf (~> 3.18) + grpc (1.55.0) + google-protobuf (~> 3.23) googleapis-common-protos-types (~> 1.0) gssapi (1.3.1) ffi (>= 1.0.1) @@ -809,11 +870,11 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) - httparty (0.20.0) - mime-types (~> 3.0) + httparty (0.21.0) + mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) i18n_data (0.13.1) icalendar (2.8.0) @@ -822,8 +883,8 @@ GEM ice_nine (0.11.2) imagen (0.1.8) parser (>= 2.5, != 2.5.1.1) - invisible_captcha (2.0.0) - rails (>= 5.0) + invisible_captcha (2.1.0) + rails (>= 5.2) ipaddr (1.2.5) ipaddress (0.8.3) jaeger-client (1.1.0) @@ -851,6 +912,10 @@ GEM hana (~> 1.3) regexp_parser (~> 2.0) uri_template (~> 0.7) + jsonb_accessor (1.3.10) + activerecord (>= 5.0) + activesupport (>= 5.0) + pg (>= 0.18.1) jsonpath (1.1.2) multi_json jwt (2.5.0) @@ -866,7 +931,7 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) - kas-grpc (0.1.0) + kas-grpc (0.2.0) grpc (~> 1.0) knapsack (1.21.1) rake @@ -881,7 +946,7 @@ GEM rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (1.4.2) + lefthook (1.4.7) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -897,10 +962,10 @@ GEM tomlrb (>= 1.3, < 2.1) with_env (= 1.1.0) xml-simple (~> 1.1.9) - licensee (9.15.2) + licensee (9.16.0) dotenv (~> 2.0) - octokit (~> 4.20) - reverse_markdown (~> 1.0) + octokit (>= 4.20, < 7.0) + reverse_markdown (>= 1, < 3) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) listen (3.7.1) @@ -910,7 +975,7 @@ GEM ffi-compiler (~> 1.0) rake (~> 13.0) locale (2.1.3) - lockbox (1.1.1) + lockbox (1.3.0) lograge (0.11.2) actionpack (>= 4) activesupport (>= 4) @@ -952,7 +1017,7 @@ GEM mini_histogram (0.3.1) mini_magick (4.10.1) mini_mime (1.1.2) - mini_portile2 (2.8.2) + mini_portile2 (2.8.4) minitest (5.11.3) mixlib-cli (2.1.8) mixlib-config (3.0.9) @@ -960,15 +1025,6 @@ GEM mixlib-log (3.0.9) mixlib-shellout (3.2.5) chef-utils - ms_rest (0.7.6) - concurrent-ruby (~> 1.0) - faraday (>= 0.9, < 2.0.0) - timeliness (~> 0.3.10) - ms_rest_azure (0.12.0) - concurrent-ruby (~> 1.0) - faraday (>= 0.9, < 2.0.0) - faraday-cookie_jar (~> 0.0.6) - ms_rest (~> 0.7.6) msgpack (1.5.4) multi_json (1.14.1) multi_xml (0.6.0) @@ -990,7 +1046,7 @@ GEM net-imap (0.3.4) date net-protocol - net-ldap (0.18.0) + net-ldap (0.17.1) net-ntp (2.1.3) net-pop (0.1.2) net-protocol @@ -1004,7 +1060,7 @@ GEM netrc (0.11.0) nio4r (2.5.8) no_proxy_fix (0.1.2) - nokogiri (1.15.2) + nokogiri (1.15.4) mini_portile2 (~> 2.8.2) racc (~> 1.4) notiffany (0.1.3) @@ -1019,7 +1075,7 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) - octokit (4.25.1) + octokit (6.1.1) faraday (>= 1, < 3) sawyer (~> 0.9) ohai (17.9.0) @@ -1136,8 +1192,8 @@ GEM tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.5.3) - pg_query (4.2.1) + pg (1.5.4) + pg_query (4.2.3) google-protobuf (>= 3.22.3) plist (3.6.0) png_quantizator (0.2.1) @@ -1154,7 +1210,7 @@ GEM coderay parser unparser - prometheus-client-mmap (0.25.0) + prometheus-client-mmap (0.28.0) rb_sys (~> 0.9) pry (0.14.2) coderay (~> 1.1) @@ -1164,22 +1220,22 @@ GEM pry (>= 0.13, < 0.15) pry-rails (0.3.9) pry (>= 0.10.4) - pry-shell (0.6.1) + pry-shell (0.6.4) pry (>= 0.13.0) tty-markdown tty-prompt public_suffix (5.0.0) - puma (6.3.0) + puma (6.3.1) nio4r (~> 2.0) pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) racc (1.6.2) - rack (2.2.7) + rack (2.2.8) rack-accept (0.4.5) rack (>= 0.4) - rack-attack (6.6.1) - rack (>= 1.0, < 3) - rack-cors (1.1.1) + rack-attack (6.7.0) + rack (>= 1.0, < 4) + rack-cors (2.0.1) rack (>= 2.0.0) rack-oauth2 (1.21.3) activesupport @@ -1189,26 +1245,25 @@ GEM rack (>= 2.1.0) rack-protection (2.2.2) rack - rack-proxy (0.7.6) + rack-proxy (0.7.7) rack - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.3) - rails (6.1.7.2) - actioncable (= 6.1.7.2) - actionmailbox (= 6.1.7.2) - actionmailer (= 6.1.7.2) - actionpack (= 6.1.7.2) - actiontext (= 6.1.7.2) - actionview (= 6.1.7.2) - activejob (= 6.1.7.2) - activemodel (= 6.1.7.2) - activerecord (= 6.1.7.2) - activestorage (= 6.1.7.2) - activesupport (= 6.1.7.2) + rails (7.0.6) + actioncable (= 7.0.6) + actionmailbox (= 7.0.6) + actionmailer (= 7.0.6) + actionpack (= 7.0.6) + actiontext (= 7.0.6) + actionview (= 7.0.6) + activejob (= 7.0.6) + activemodel (= 7.0.6) + activerecord (= 7.0.6) + activestorage (= 7.0.6) + activesupport (= 7.0.6) bundler (>= 1.15.0) - railties (= 6.1.7.2) - sprockets-rails (>= 2.0.0) + railties (= 7.0.6) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -1221,12 +1276,13 @@ GEM rails-i18n (7.0.3) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (6.1.7.2) - actionpack (= 6.1.7.2) - activesupport (= 6.1.7.2) + railties (7.0.6) + actionpack (= 7.0.6) + activesupport (= 7.0.6) method_source rake (>= 12.2) thor (~> 1.0) + zeitwerk (~> 2.5) rainbow (3.1.1) rake (13.0.6) rb-fsevent (0.11.2) @@ -1240,7 +1296,8 @@ GEM rbtree (0.4.6) rchardet (1.8.0) rdoc (6.3.2) - re2 (1.6.0) + re2 (2.0.0) + mini_portile2 (~> 2.8.4) recaptcha (5.12.3) json recursive-open-struct (1.1.3) @@ -1265,7 +1322,7 @@ GEM uber (< 0.2.0) request_store (1.5.1) rack (>= 1.4) - responders (3.0.0) + responders (3.0.1) actionpack (>= 5.0) railties (>= 5.0) rest-client (2.1.0) @@ -1276,10 +1333,10 @@ GEM retriable (3.1.2) reverse_markdown (1.4.0) nokogiri - rexml (3.2.5) + rexml (3.2.6) rinku (2.0.0) rotp (6.2.0) - rouge (4.1.2) + rouge (4.1.3) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -1293,12 +1350,12 @@ GEM benchmark-perf (~> 0.6) benchmark-trend (~> 0.4) rspec (>= 3.0) - rspec-core (3.12.0) + rspec-core (3.12.2) rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.3) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) rspec-parameterized (1.0.0) @@ -1312,14 +1369,14 @@ GEM rspec-parameterized-table_syntax (1.0.0) binding_of_caller rspec-parameterized-core (< 2) - rspec-rails (6.0.1) + rspec-rails (6.0.3) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.11) - rspec-expectations (~> 3.11) - rspec-mocks (~> 3.11) - rspec-support (~> 3.11) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) rspec-retry (0.6.2) rspec-core (> 3.3) rspec-support (3.12.0) @@ -1330,32 +1387,35 @@ GEM pg rails sqlite3 - rubocop (1.43.0) + rubocop (1.50.2) json (~> 2.3) parallel (~> 1.10) parser (>= 3.2.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.24.1, < 2.0) + rubocop-ast (>= 1.28.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.24.1) - parser (>= 3.1.1.0) - rubocop-capybara (2.17.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + rubocop-capybara (2.18.0) rubocop (~> 1.41) + rubocop-factory_bot (2.23.1) + rubocop (~> 1.33) rubocop-graphql (0.19.0) rubocop (>= 0.87, < 2) - rubocop-performance (1.16.0) + rubocop-performance (1.18.0) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) - rubocop-rails (2.17.4) + rubocop-rails (2.20.2) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) - rubocop-rspec (2.18.1) + rubocop-rspec (2.22.0) rubocop (~> 1.33) rubocop-capybara (~> 2.17) + rubocop-factory_bot (~> 2.22) ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) @@ -1369,16 +1429,14 @@ GEM rexml ruby-statistics (3.0.0) ruby2_keywords (0.0.5) - ruby_parser (3.20.0) - sexp_processor (~> 4.16) rubyntlm (0.6.3) rubypants (0.2.0) rubyzip (2.3.2) - rugged (1.5.1) + rugged (1.6.3) safe_yaml (1.0.4) safety_net_attestation (0.4.0) jwt (~> 2.0) - sanitize (6.0.0) + sanitize (6.0.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) sass (3.5.5) @@ -1401,7 +1459,7 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (4.9.0) + selenium-webdriver (4.12.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -1419,8 +1477,7 @@ GEM sentry-sidekiq (5.8.0) sentry-ruby (~> 5.8.0) sidekiq (>= 3.0) - set (1.0.1) - sexp_processor (4.16.1) + set (1.0.2) shellany (0.0.1) shoulda-matchers (5.1.0) activesupport (>= 5.2.0) @@ -1438,12 +1495,13 @@ GEM jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_po_parser (1.1.6) - simplecov (0.21.2) + simplecov (0.22.0) docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) - simplecov-cobertura (1.3.1) - simplecov (~> 0.8) + simplecov-cobertura (2.1.0) + rexml + simplecov (~> 0.19) simplecov-html (0.12.3) simplecov-lcov (0.8.0) simplecov_json_formatter (0.1.4) @@ -1510,7 +1568,7 @@ GEM ffi (~> 1.1) sysexits (1.2.0) table_print (1.5.7) - tanuki_emoji (0.6.0) + tanuki_emoji (0.7.0) telesign (2.2.4) net-http-persistent (>= 3.0.0, < 5.0) telesignenterprise (2.2.2) @@ -1522,7 +1580,7 @@ GEM unicode-display_width (>= 1.1.1, < 3) terser (1.0.2) execjs (>= 0.3.0, < 3) - test-prof (1.2.1) + test-prof (1.2.2) test_file_finder (0.1.4) faraday (~> 1.0) text (1.3.1) @@ -1530,7 +1588,6 @@ GEM thread_safe (0.3.6) thrift (0.16.0) tilt (2.0.11) - timeliness (0.3.10) timeout (0.3.2) timfel-krb5-auth (0.8.3) tins (1.31.1) @@ -1577,10 +1634,10 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - undercover (0.4.5) + undercover (0.4.6) imagen (>= 0.1.8) rainbow (>= 2.1, < 4.0) - rugged (>= 0.27, < 1.6) + rugged (>= 0.27, < 1.7) unf (0.1.4) unf_ext unf_ext (0.0.8.2) @@ -1603,12 +1660,12 @@ GEM validate_url (1.0.15) activemodel (>= 3.0.0) public_suffix - validates_hostname (1.0.11) + validates_hostname (1.0.13) activerecord (>= 3.0) activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (3.2.0) + view_component (3.5.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1616,6 +1673,13 @@ GEM axiom-types (~> 0.1) coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) + vite_rails (3.0.15) + railties (>= 5.1, < 8) + vite_ruby (~> 3.0, >= 3.2.2) + vite_ruby (3.3.4) + dry-cli (>= 0.7, < 2) + rack-proxy (~> 0.6, >= 0.6.1) + zeitwerk (~> 2.2) vmstat (2.3.0) warden (1.2.9) rack (>= 2.0.9) @@ -1632,7 +1696,7 @@ GEM webfinger (1.2.0) activesupport httpclient (>= 2.4) - webmock (3.18.1) + webmock (3.19.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -1654,7 +1718,7 @@ GEM nokogiri (~> 1.8) yajl-ruby (1.4.3) yard (0.9.26) - zeitwerk (2.6.6) + zeitwerk (2.6.7) PLATFORMS ruby @@ -1664,6 +1728,7 @@ DEPENDENCIES RedCloth (~> 4.3.2) acme-client (~> 2.0) activerecord-explain-analyze (~> 0.1) + activerecord-gitlab! acts-as-taggable-on (~> 9.0) addressable (~> 2.8) akismet (~> 3.0) @@ -1680,8 +1745,8 @@ DEPENDENCIES autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.175.0) - aws-sdk-s3 (~> 1.126.0) + aws-sdk-core (~> 3.181.1) + aws-sdk-s3 (~> 1.134.0) axe-core-rspec babosa (~> 2.0) base32 (~> 0.3.0) @@ -1695,25 +1760,27 @@ DEPENDENCIES bullet (~> 7.0.2) bundler-audit (~> 0.7.0.1) bundler-checksum (~> 0.1.0)! - capybara (~> 3.39, >= 3.39.1) + capybara (~> 3.39, >= 3.39.2) capybara-screenshot (~> 1.0.26) carrierwave (~> 1.3) charlock_holmes (~> 0.7.7) circuitbox (= 2.0.0) + click_house-client! cloud_profiler_agent (~> 0.0.0)! - commonmarker (~> 0.23.9) + commonmarker (~> 0.23.10) concurrent-ruby (~> 1.1) connection_pool (~> 2.0) countries (~> 4.0.0) creole (~> 0.5.0) crystalball (~> 0.7.0) + csv_builder! cvss-suite (~> 3.0.1) database_cleaner (~> 1.7.0) - deckar01-task_list (= 2.3.2) + deckar01-task_list (= 2.3.3) declarative_policy (~> 1.1.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks - devfile (~> 0.0.19.pre.alpha1) + devfile (~> 0.0.22.pre.alpha1) device_detector devise (~> 4.8.1) devise-pbkdf2-encryptable (~> 0.0.0)! @@ -1734,11 +1801,11 @@ DEPENDENCIES factory_bot_rails (~> 6.2.0) faraday (~> 1.0) faraday_middleware-aws-sigv4 (~> 0.3.0) - fast_blank + fast_blank (~> 1.0.1) ffaker (~> 2.10) - flipper (~> 0.25.0) - flipper-active_record (~> 0.25.0) - flipper-active_support_cache_store (~> 0.25.0) + flipper (~> 0.26.2) + flipper-active_record (~> 0.26.2) + flipper-active_support_cache_store (~> 0.26.2) fog-aliyun (~> 0.4) fog-aws (~> 3.18) fog-core (= 2.1.0) @@ -1747,23 +1814,27 @@ DEPENDENCIES fugit (~> 1.8.1) fuubar (~> 2.2.0) gettext (~> 3.3) - gettext_i18n_rails (~> 1.8.0) + gettext_i18n_rails (~> 1.11.0) gettext_i18n_rails_js (~> 1.3) - gitaly (~> 16.1.0.pre.rc2) + gitaly (~> 16.3.0.pre.rc1) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.10.0) - gitlab-experiment (~> 0.7.1) - gitlab-fog-azure-rm (~> 1.7.0) - gitlab-labkit (~> 0.33.0) + gitlab-dangerfiles (~> 4.0.0) + gitlab-experiment (~> 0.8.0) + gitlab-fog-azure-rm (~> 1.8.0) + gitlab-labkit (~> 0.34.0) gitlab-license (~> 2.3) gitlab-mail_room (~> 0.0.23) gitlab-markup (~> 1.9.0) gitlab-net-dns (~> 0.9.2) + gitlab-rspec! + gitlab-safe_request_store! + gitlab-schema-validation! gitlab-sidekiq-fetcher! - gitlab-styles (~> 10.0.0) - gitlab_chronic_duration (~> 0.10.6.2) + gitlab-styles (~> 10.1.0) + gitlab-utils! + gitlab_chronic_duration (~> 0.11) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 0.8.1) + gitlab_quality-test_tooling (~> 1.0.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -1776,20 +1847,20 @@ DEPENDENCIES google-apis-serviceusage_v1 (~> 0.28.0) google-apis-sqladmin_v1beta4 (~> 0.41.0) google-cloud-storage (~> 1.44.0) - google-protobuf (~> 3.23, >= 3.23.3) - gpgme (~> 2.0.22) - grape (~> 1.7.0) + google-protobuf (~> 3.24, >= 3.24.3) + gpgme (~> 2.0.23) + grape (~> 1.7.1) grape-entity (~> 0.10.0) grape-path-helpers (~> 1.7.1) grape-swagger (~> 1.6.1) grape-swagger-entity (~> 0.5.1) grape_logging (~> 1.8) - graphiql-rails (~> 1.8) + graphiql-rails (~> 1.8.0) graphlient (~> 0.5.0) graphlyte (~> 1.0.0) - graphql (~> 1.13.12) + graphql (~> 1.13.19) graphql-docs (~> 2.1.0) - grpc (~> 1.42.0) + grpc (~> 1.55.0) gssapi (~> 1.3.1) guard-rspec haml_lint (~> 0.40.0) @@ -1799,9 +1870,9 @@ DEPENDENCIES health_check (~> 3.0) html-pipeline (~> 2.14.3) html2text - httparty (~> 0.20.0) + httparty (~> 0.21.0) icalendar - invisible_captcha (~> 2.0.0) + invisible_captcha (~> 2.1.0) ipaddr (~> 1.2.5) ipaddress (~> 0.8.3) ipynbdiff! @@ -1809,18 +1880,19 @@ DEPENDENCIES js_regex (~> 3.8) json (~> 2.6.3) json_schemer (~> 0.2.18) + jsonb_accessor (~> 1.3.10) jwt (~> 2.5) kaminari (~> 1.2.2) - kas-grpc (~> 0.1.0) + kas-grpc (~> 0.2.0) knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.11.0) - lefthook (~> 1.4.2) + lefthook (~> 1.4.7) letter_opener_web (~> 2.0.0) license_finder (~> 7.0) - licensee (~> 9.15) + licensee (~> 9.16) listen (~> 3.7) - lockbox (~> 1.1.1) + lockbox (~> 1.3.0) lograge (~> 0.5) loofah (~> 2.21.3) lookbook (~> 2.0, >= 2.0.1) @@ -1835,12 +1907,12 @@ DEPENDENCIES multi_json (~> 1.14.1) neighbor (~> 0.2.3) net-http (= 0.1.1) - net-ldap (~> 0.18.0) + net-ldap (~> 0.17.1) net-ntp net-protocol (~> 0.1.3) - nokogiri (~> 1.15, >= 1.15.2) + nokogiri (~> 1.15, >= 1.15.4) oauth2 (~> 2.0) - octokit (~> 4.15) + octokit (~> 6.0) ohai (~> 17.9) oj (~> 3.13.21) oj-introspect (~> 0.7) @@ -1870,28 +1942,28 @@ DEPENDENCIES parser (~> 3.2, >= 3.2.2.3) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.5.3) - pg_query (~> 4.2.1) + pg (~> 1.5.4) + pg_query (~> 4.2.3) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.25) + prometheus-client-mmap (~> 0.28) pry-byebug pry-rails (~> 0.3.9) - pry-shell (~> 0.6.1) - puma (~> 6.3) - rack (~> 2.2.7) - rack-attack (~> 6.6.1) - rack-cors (~> 1.1.1) + pry-shell (~> 0.6.4) + puma (~> 6.3, >= 6.3.1) + rack (~> 2.2.8) + rack-attack (~> 6.7.0) + rack-cors (~> 2.0.1) rack-oauth2 (~> 1.21.3) - rack-proxy (~> 0.7.6) + rack-proxy (~> 0.7.7) rack-timeout (~> 0.6.3) - rails (~> 6.1.7.2) + rails (~> 7.0.6) rails-controller-testing rails-i18n (~> 7.0) rainbow (~> 3.0) rbtrace (~> 0.4) rdoc (~> 6.3.2) - re2 (~> 1.6.0) + re2 (= 2.0.0) recaptcha (~> 5.12) redis (~> 4.8.0) redis-actionpack (~> 5.3.0) @@ -1899,13 +1971,14 @@ DEPENDENCIES request_store (~> 1.5.1) responders (~> 3.0) retriable (~> 3.1.2) - rexml (~> 3.2.5) - rouge (~> 4.1.2) + rexml (~> 3.2.6) + rouge (~> 4.1.3) rqrcode-rails3 (~> 0.1.7) rspec-benchmark (~> 0.6.0) rspec-parameterized (~> 1.0) - rspec-rails (~> 6.0.1) + rspec-rails (~> 6.0.3) rspec-retry (~> 0.6.2) + rspec_flaky! rspec_junit_formatter rspec_profiling (~> 0.0.6) rubocop @@ -1914,14 +1987,13 @@ DEPENDENCIES ruby-openai (~> 3.7) ruby-progressbar (~> 1.10) ruby-saml (~> 1.15.0) - ruby_parser (~> 3.20) rubyzip (~> 2.3.2) - rugged (~> 1.5) - sanitize (~> 6.0) + rugged (~> 1.6) + sanitize (~> 6.0.2) sassc-rails (~> 2.1.0) sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) - selenium-webdriver (= 4.9.0) + selenium-webdriver (= 4.12.0) semver_dialects (~> 1.2.1) sentry-rails (~> 5.8.0) sentry-raven (~> 3.1) @@ -1933,7 +2005,7 @@ DEPENDENCIES sigdump (~> 0.2.4) simple_po_parser (~> 1.1.6) simplecov (~> 0.21) - simplecov-cobertura (~> 1.3.1) + simplecov-cobertura (~> 2.1.0) simplecov-lcov (~> 0.8.0) slack-messenger (~> 2.3.4) snowplow-tracker (~> 0.8.0) @@ -1947,10 +2019,10 @@ DEPENDENCIES stackprof (~> 0.2.25) state_machines-activerecord (~> 0.8.0) sys-filesystem (~> 1.4.3) - tanuki_emoji (~> 0.6) + tanuki_emoji (~> 0.7) telesignenterprise (~> 2.2) terser (= 1.0.2) - test-prof (~> 1.2.1) + test-prof (~> 1.2.2) test_file_finder (~> 0.1.3) thrift (>= 0.16.0) timfel-krb5-auth (~> 0.8) @@ -1958,19 +2030,19 @@ DEPENDENCIES truncato (~> 0.7.12) typhoeus (~> 1.4.0) undercover (~> 0.4.4) - unf (~> 0.1.4) unleash (~> 3.2.2) valid_email (~> 0.1) - validates_hostname (~> 1.0.11) + validates_hostname (~> 1.0.13) version_sorter (~> 2.3) - view_component (~> 3.2.0) + view_component (~> 3.5.0) + vite_rails vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 3.0) - webmock (~> 3.18.1) + webmock (~> 3.19.1) webrick (~> 1.8.1) wikicloth (= 0.8.1) yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.4.14 + 2.4.19 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 9c71ff591a..6dcac890ea 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -13,36 +13,36 @@ src: }; actioncable = { dependencies = ["actionpack" "activesupport" "nio4r" "websocket-driver"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1y9lj7ra9xf4q4mryydmd498grsndqmz1zwasb4ai9gv62igvw3s"; - type = "gem"; - }; - version = "6.1.7.2"; - }; - actionmailbox = { - dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bzacsr93sxv90nljv3ajw54nmyz1v9k2v2wx1pxsi0jasqg5fvn"; + sha256 = "1d72cqx1h9c0yl1vc8xakvji00krg118ih6lwqlg5nbw50gbx25c"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; + }; + actionmailbox = { + dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; + groups = ["default" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12xkyfdpr7ljnd31yhc2kzl0rqrlwxzpg4qcn4yb2h364hwc6fh8"; + type = "gem"; + }; + version = "7.0.6"; }; actionmailer = { - dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; + dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rjddp1a5l4amsbibhnf7g2rb69qvq0nc0a2dvr6r57bpkf82hj4"; + sha256 = "01x11ijfg56585vj7a7az0235idnxcnyjp1nb1jvkm08jjll5d1k"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -50,32 +50,32 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza"; + sha256 = "0d66w1d9rhvafd0dilqyr1ymsvr060l8hi0xvwij7cyvzzxrlrbc"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; actiontext = { - dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; + dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jx8wi961i34v7x0j3h4wjw3qbyx9bkzb598vg42kidzk2f90dyj"; + sha256 = "0bpyfh8g0mzgkb8bxvf245mwnx1awbr1y6dxcdckyhsjjgrfynfl"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za"; + sha256 = "1icfh9pgjpd29apzn07cnqa9nlpvjv7i4vrygack5gp7hp54l8m7"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -83,10 +83,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ililjwy4x52a6x5fidh1iyllf6vx49nz93fd2hxypc5bpryx9mz"; + sha256 = "1gawwb6550ra1xgbrki03aq4q5wafa3xfrpdr3cva4ghy3qqn53q"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; activemodel = { dependencies = ["activesupport"]; @@ -94,10 +94,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nn17y72fhsynwn11bqg75bazqp6r1g8mpwwyv64harwvh3fh5qj"; + sha256 = "072iv0d3vpbp0xijg4jj99sjil1rykmqfj9addxj76bm5mbzwcaj"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -105,10 +105,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k69m3b0lb4jx20jx8vsvdqm1ki1r6riq9haabyddkcpvmgz1wh7"; + sha256 = "1l0rn43bhyzlfa4wwcfz016vb4lkzvl0jf5zibkjy4sppxxixzrq"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -121,27 +121,37 @@ src: }; version = "0.1.0"; }; + activerecord-gitlab = { + dependencies = ["activerecord"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/gems/activerecord-gitlab"; + type = "path"; + }; + version = "0.2.0"; + }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c3cvc01azfkccg5hsl96wafsxb5hf1nva3cn8rif2mlwx17p8n3"; + sha256 = "036mv935r5mmh7fljz10lyr43c5y5bn8b6h7gdkv8spfgwzihw4j"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; activesupport = { - dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; - groups = ["default" "development" "test"]; + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2"; + sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -149,10 +159,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11hv6pdsr0kd9bmd84sab21sbm209ck1cwqs5jqbf9g1xbh9nh2s"; + sha256 = "1nhyvfdiv6mz8z3icwhk01482hq0s6dvf1qysvh27cyi3c4y1n53"; type = "gem"; }; - version = "9.0.0"; + version = "9.0.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -401,10 +411,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbbzcszpdjy2yzxfvl5fzgn0jgznkwxvqpb46nxv69gqhv3dpsg"; + sha256 = "1qnwh40d45pqm77dayvh1zdlb5xjbbj7hv29s8nhxj7c3qkl4bpb"; type = "gem"; }; - version = "3.175.0"; + version = "3.181.1"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -423,10 +433,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17ya49rwjzimqhzsj6vlc4xfvj2sixy04kr4b6ddg3r6y0jrsixi"; + sha256 = "1fbz259as60xnf563z9byp8blq5fsc81h92h3wicai4bmz45w4r5"; type = "gem"; }; - version = "1.126.0"; + version = "1.134.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -434,10 +444,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4bifmll4hrf4gihr5hdvn59wjpz4qpyg5jj95kp17fykzqg36n"; + sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.0"; }; axe-core-api = { dependencies = ["dumb_delegator" "virtus"]; @@ -539,10 +549,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02r1c3isfchs5fxivbq99gc3aq4vfyn8snhcy707dal1p8qz12qb"; + sha256 = "048z3fvcknqx7ikkhrcrykxlqmf9bzc7l0y5h1cnvrc9n2qf0k8m"; type = "gem"; }; - version = "3.1.16"; + version = "3.1.18"; }; benchmark = { groups = ["default" "development"]; @@ -720,10 +730,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qhg45jxxy5h90frmajrrh5sirmj29sbfhbf7q0qhjymc0w1p0r5"; + sha256 = "114qm5f5vhwaaw9rj1h2lcamh46zl13v1m18jiw68zl961gwmw6n"; type = "gem"; }; - version = "3.39.1"; + version = "3.39.2"; }; capybara-screenshot = { dependencies = ["capybara" "launchy"]; @@ -861,6 +871,16 @@ src: }; version = "0.9.2"; }; + click_house-client = { + dependencies = ["activesupport" "addressable" "json"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/gems/click_house-client"; + type = "path"; + }; + version = "0.1.0"; + }; cloud_profiler_agent = { dependencies = ["google-cloud-profiler-v2" "google-protobuf" "googleauth" "stackprof"]; groups = ["default"]; @@ -911,10 +931,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "074162raa8pc92q6833hgqdlfr3z5jgid9avdz5k25cnls2rqwrf"; + sha256 = "1lb5slzbqrca49h0gaifg82xky5r7i9xgm4560pin1xl5fp15lzx"; type = "gem"; }; - version = "0.23.9"; + version = "0.23.10"; }; concurrent-ruby = { groups = ["default" "development" "test"]; @@ -1022,6 +1042,15 @@ src: }; version = "1.14.0"; }; + csv_builder = { + groups = ["default"]; + platforms = []; + source = { + path = "${src}/gems/csv_builder"; + type = "path"; + }; + version = "0.1.0"; + }; cvss-suite = { groups = ["default"]; platforms = []; @@ -1038,10 +1067,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n6zbkkinlv2hp4ig5c170d1ckbbdf8rgxmykfm3m3gn865vapnr"; + sha256 = "1x8xwn2l7avc6h08vgrkxyb6ga7slip5x8lynswmzd0y32ngnw4h"; type = "gem"; }; - version = "8.6.1"; + version = "9.3.1"; }; danger-gitlab = { dependencies = ["danger" "gitlab"]; @@ -1100,10 +1129,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01c8vv0xwbhlyhiagj93b1hlm2n0rmj4sw62nbc0jhyj90jhj6as"; + sha256 = "0n67q9rb4gsfs8k2fsd08xcfx13z7mcyyyrb9hi0sv0yz3rvm2li"; type = "gem"; }; - version = "2.3.2"; + version = "2.3.3"; }; declarative = { groups = ["default"]; @@ -1163,10 +1192,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n4yxjijplg0klcnjdhk7kxmvlb0szchk1ad8flg5hb2j59c8a6r"; + sha256 = "0hglq61xxs8hgj2aq6g94w9ry90jq9aivb3c6fycxz1srdq26lsl"; type = "gem"; }; - version = "0.0.19.pre.alpha1"; + version = "0.0.22.pre.alpha1"; }; device_detector = { groups = ["default"]; @@ -1315,6 +1344,16 @@ src: }; version = "2.7.6"; }; + dry-cli = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1w39jms4bsggxvl23cxanhccv1ngb6nqxsqhi784v5bjz1lx3si8"; + type = "gem"; + }; + version = "1.0.0"; + }; dry-core = { dependencies = ["concurrent-ruby" "zeitwerk"]; groups = ["default" "development" "test"]; @@ -1499,7 +1538,7 @@ src: groups = ["default"]; platforms = []; source = { - path = "${src}/vendor/gems/error_tracking_open_api"; + path = "${src}/gems/error_tracking_open_api"; type = "path"; }; version = "1.0.0"; @@ -1541,10 +1580,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288"; + sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v"; type = "gem"; }; - version = "0.15.0"; + version = "0.16.0"; }; excon = { groups = ["default"]; @@ -1631,17 +1670,6 @@ src: }; version = "1.10.0"; }; - faraday-cookie_jar = { - dependencies = ["faraday" "http-cookie"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk"; - type = "gem"; - }; - version = "0.0.7"; - }; faraday-em_http = { groups = ["danger" "default" "development" "test"]; platforms = []; @@ -1792,10 +1820,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16s1ilyvwzmkcgmklbrn0c2pch5n02vf921njx0bld4crgdr6z56"; + sha256 = "1shpmamyzyhyxmv95r96ja5rylzaw60r19647d0fdm7y2h2c77r6"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; fast_gettext = { groups = ["default"]; @@ -1844,10 +1872,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pfmn0gprc3c15baxa9rx64pqllk64m60f5vg4gp0icpafkp0jx5"; + sha256 = "0dj3y95260rvlclkkcxak6c1dsrzbyr4wik7jv3y949r4w9adfk9"; type = "gem"; }; - version = "2.3.4"; + version = "2.6.0"; }; filelock = { groups = ["default" "development" "test"]; @@ -1870,14 +1898,15 @@ src: version = "1.0.1"; }; flipper = { + dependencies = ["concurrent-ruby"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pbsd7p9aij9ffw621wl841hj319vv677n69jk4qndxqa9kpgcnc"; + sha256 = "127ryr9107719rfk9k638fxk2p38cnbz23h9ghxxbckiv4474mvd"; type = "gem"; }; - version = "0.25.0"; + version = "0.26.2"; }; flipper-active_record = { dependencies = ["activerecord" "flipper"]; @@ -1885,10 +1914,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zxn7qp16xwk289xa3f8sqy4dg8difcsjc8rx44nmk72cnack9c5"; + sha256 = "1g10lck7p3776r2dshz185rd1hjzv47z95bhgpk7bxz2ikpsxpk1"; type = "gem"; }; - version = "0.25.0"; + version = "0.26.2"; }; flipper-active_support_cache_store = { dependencies = ["activesupport" "flipper"]; @@ -1896,10 +1925,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06skgdfb43g6i40b5rx61yqgq16wwd8knvswnrva1l889fcvz0kj"; + sha256 = "1c6j2frspzafqmha5wlkpv05n5vfzrglbprpgj1dxiz5s4x8ily2"; type = "gem"; }; - version = "0.25.0"; + version = "0.26.2"; }; fog-aliyun = { dependencies = ["addressable" "aliyun-sdk" "fog-core" "fog-json" "ipaddress" "xml-simple"]; @@ -2069,10 +2098,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vs918a03mqvx9aczaqdg9d2q9s3c6swqavzn82qgq5i822czrcm"; + sha256 = "1gibn9j4k9ck54v7rxbqwa587fc2l92clv9r71zhyl3c4m57x771"; type = "gem"; }; - version = "1.8.0"; + version = "1.11.0"; }; gettext_i18n_rails_js = { dependencies = ["gettext" "gettext_i18n_rails" "po_to_json" "rails"]; @@ -2086,15 +2115,15 @@ src: version = "1.3.0"; }; git = { - dependencies = ["rchardet"]; + dependencies = ["addressable" "rchardet"]; groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wd0rvz6cybqm9svcx427hgpcz804am64s0sxxrh72i9m16vm5by"; + sha256 = "0rf4603ffvdlvnzx1nmh2x5j8lic3p24115sm7bx6p2nwii09f69"; type = "gem"; }; - version = "1.11.0"; + version = "1.18.0"; }; gitaly = { dependencies = ["grpc"]; @@ -2102,10 +2131,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bz3i05lr1nzm35xg11blaq78v96sg49aw1yh4hj7wfk3cbdn1q0"; + sha256 = "0hsccw9njvvsic0qn5x1aia0yz66sy4bsw1pixc5jf2g990wrnam"; type = "gem"; }; - version = "16.1.0.pre.rc2"; + version = "16.3.0.pre.rc1"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2135,10 +2164,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ha0n6wkw8xm42v4wx9815ivpwjydp88jv9laq19qljj3w2zwk6z"; + sha256 = "04j81xsasbfzc9xs0sgizc76qj26ka629yrcd9l6m3iqj0byiaz3"; type = "gem"; }; - version = "3.10.0"; + version = "4.0.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2146,21 +2175,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "093q9b2nv010n10axlhz68gxdi0xs176hd9wm758nhl3marxsv8n"; + sha256 = "1yfk2w86nzw8mksahs70ai0d860kdj25lpvlka4xv77i18zggqml"; type = "gem"; }; - version = "0.7.1"; + version = "0.8.0"; }; gitlab-fog-azure-rm = { - dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types" "ms_rest_azure"]; + dependencies = ["azure-storage-blob" "azure-storage-common" "fog-core" "fog-json" "mime-types"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hix4q2ibrq0r97bn492vzxj4fgijc209kbak8jlrbal7ja6g74n"; + sha256 = "0a3c3slg1iqlhyci9mnbasgw1qcsnznczyqjkn28hfr79cblpwp4"; type = "gem"; }; - version = "1.7.0"; + version = "1.8.0"; }; gitlab-labkit = { dependencies = ["actionpack" "activesupport" "grpc" "jaeger-client" "opentracing" "pg_query" "redis"]; @@ -2168,10 +2197,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nz0g5s65wkicsn9ianqxi7ys2w666n226gfblzllcfy1z9siyyi"; + sha256 = "1k9yd8b1xbq3l6l1n4pb0mh2wklz0ninr7h2l5xx031r05150p6a"; type = "gem"; }; - version = "0.33.0"; + version = "0.34.0"; }; gitlab-license = { groups = ["default"]; @@ -2214,6 +2243,36 @@ src: }; version = "0.9.2"; }; + gitlab-rspec = { + dependencies = ["activesupport" "rspec"]; + groups = ["development" "monorepo" "test"]; + platforms = []; + source = { + path = "${src}/gems/gitlab-rspec"; + type = "path"; + }; + version = "0.1.0"; + }; + gitlab-safe_request_store = { + dependencies = ["request_store"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/gems/gitlab-safe_request_store"; + type = "path"; + }; + version = "0.1.0"; + }; + gitlab-schema-validation = { + dependencies = ["diffy" "pg_query"]; + groups = ["default"]; + platforms = []; + source = { + path = "${src}/gems/gitlab-schema-validation"; + type = "path"; + }; + version = "0.1.0"; + }; gitlab-sidekiq-fetcher = { dependencies = ["json" "sidekiq"]; groups = ["default"]; @@ -2230,10 +2289,20 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1w0kd66l92ckv5z3gqfifhkny8ipxx4cckpdyign0lgknpvj06wa"; + sha256 = "0jn8zp5a35yi6jw7kyyq8fgpzcwmr5bfpl7j9ki2y13x77sla9zl"; type = "gem"; }; - version = "10.0.0"; + version = "10.1.0"; + }; + gitlab-utils = { + dependencies = ["actionview" "activesupport" "addressable" "nokogiri" "rake"]; + groups = ["monorepo"]; + platforms = []; + source = { + path = "${src}/gems/gitlab-utils"; + type = "path"; + }; + version = "0.1.0"; }; gitlab_chronic_duration = { dependencies = ["numerizer"]; @@ -2241,10 +2310,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yq5a4vs96xz5yxqkfwcvzw0riww7mf87j1s2s7rb6yagpz4rnkd"; + sha256 = "19jba5gxlb25mvd85rn3hfzyzsqw4cq7ml13mzq1y0x94hbj1zf2"; type = "gem"; }; - version = "0.10.6.2"; + version = "0.11.0"; }; gitlab_omniauth-ldap = { dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"]; @@ -2263,10 +2332,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02xwchhhfv8jkypap5pn1wjkdx92jxk4wsp71i2s0ymnqw98y401"; + sha256 = "1nriqgy9rlnachzrq63xakskdgjg9b3bdgh2fb2b63kai8bbwc5h"; type = "gem"; }; - version = "0.8.1"; + version = "1.0.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2514,10 +2583,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aczvz5jdslr1bfx08xrycp6ggdpaifdlh5hrdyd774mvcl0mg2d"; + sha256 = "0pcl4x4cw3snl5xzs99lm82m9xkfs8vm1a8dfrc34pwb77mwrwv3"; type = "gem"; }; - version = "3.23.3"; + version = "3.24.3"; }; googleapis-common-protos = { dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"]; @@ -2558,10 +2627,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qn87vxdsaq1szcvq39rnz38cgqllncdxmiyghnbzl7x5aah8sbw"; + sha256 = "010wr6nnifi952bx4v5c49q25yx1g8lhib5wiv2sg7bip3yvlyy8"; type = "gem"; }; - version = "2.0.22"; + version = "2.0.23"; }; grape = { dependencies = ["activesupport" "builder" "dry-types" "mustermann-grape" "rack" "rack-accept"]; @@ -2569,10 +2638,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lbgysx2d64hsck11jajc4gwikj5nd82809bz0jibrnp4yb1lcw8"; + sha256 = "1dnbb3gxwbmvhzvzb22prwaim9wmvilm0nm91ndw2ggf324rsrvb"; type = "gem"; }; - version = "1.7.0"; + version = "1.7.1"; }; grape-entity = { dependencies = ["activesupport" "multi_json"]; @@ -2666,10 +2735,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hvsv6ig6d8syr4vasa8vcc090kbawwflk5m1j6kl681y9n6d0hx"; + sha256 = "0njsbxx82vqi8hdn4nad62abmh0x0w3mis3mq79q3xr11srisn23"; type = "gem"; }; - version = "1.13.12"; + version = "1.13.19"; }; graphql-client = { dependencies = ["activesupport" "graphql"]; @@ -2699,10 +2768,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jjq2ing7px4zvdrg9xcq5a9qsciq6g3v14n95a3d9n6cyg69lmk"; + sha256 = "1bk1l7mi98givcd4rj0h9izj97nwgff4lp7xi89mp3z9wpw354sj"; type = "gem"; }; - version = "1.42.0"; + version = "1.55.0"; }; gssapi = { dependencies = ["ffi"]; @@ -2927,15 +2996,15 @@ src: version = "2.3.0"; }; httparty = { - dependencies = ["mime-types" "multi_xml"]; + dependencies = ["mini_mime" "multi_xml"]; groups = ["danger" "default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rs8c5wga6f1acyaj90d2hlv307gh2flfpb8y48wdk2si812l3a9"; + sha256 = "050jzsa6fbfvy2rldhk7mf1sigildaqvbplfz2zs6c0zlzwppvq0"; type = "gem"; }; - version = "0.20.0"; + version = "0.21.0"; }; httpclient = { groups = ["default"]; @@ -2949,14 +3018,14 @@ src: }; i18n = { dependencies = ["concurrent-ruby"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx"; type = "gem"; }; - version = "1.12.0"; + version = "1.14.1"; }; i18n_data = { groups = ["default"]; @@ -3016,10 +3085,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hn06njrwbxhxs2myr04fq3spqn38b8wm3irvkll91qv3p5yv0d3"; + sha256 = "07ibhphcvf9lfaar9g78cazbdrp03dzfks53bcaiss8vxgrm5d02"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; ipaddr = { groups = ["default"]; @@ -3046,7 +3115,7 @@ src: groups = ["default"]; platforms = []; source = { - path = "${src}/vendor/gems/ipynbdiff"; + path = "${src}/gems/ipynbdiff"; type = "path"; }; version = "0.4.7"; @@ -3136,6 +3205,17 @@ src: }; version = "0.2.18"; }; + jsonb_accessor = { + dependencies = ["activerecord" "activesupport" "pg"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q2q9i2kf4p6vw8fbzvsd037wl837gpsiiikjazf6fdfayi803v7"; + type = "gem"; + }; + version = "1.3.10"; + }; jsonpath = { dependencies = ["multi_json"]; groups = ["default"]; @@ -3206,10 +3286,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nhdllr7zi19b73q0flbc0lhqb5mn0jrw4bqdang7wfxgfdwf6dj"; + sha256 = "07lsr5gfnl56v8znf780vpa79wx3p5rqsdgc6j88364ixj3zg8xr"; type = "gem"; }; - version = "0.1.0"; + version = "0.2.0"; }; knapsack = { dependencies = ["rake"]; @@ -3271,10 +3351,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hqffqr2krk6gcjapriwwmdrjz56dczshxafnwrkipyxi51vwgvh"; + sha256 = "112m3ypr3z3n23l0axy057wkbzwhf52p20pya2nylwd8jmck1gi2"; type = "gem"; }; - version = "1.4.2"; + version = "1.4.7"; }; letter_opener = { dependencies = ["launchy"]; @@ -3325,10 +3405,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v9x94h19b20wc551vs9a0yvk44w2y3g9ng07fflk26s8jsmjsab"; + sha256 = "0i4hs0vbgp0w3pdddr37zhydm16af122rmr0w39v3nqrj1ir65kv"; type = "gem"; }; - version = "9.15.2"; + version = "9.16.0"; }; listen = { dependencies = ["rb-fsevent" "rb-inotify"]; @@ -3367,10 +3447,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h1a3h3rfv3094pn5zn7d3c066dmhx9i380mhqa1qyagqla6pw8a"; + sha256 = "1sm365iplg1iscizckjm6zy57zs0350czi9afqfnvig0wh35i3na"; type = "gem"; }; - version = "1.1.1"; + version = "1.3.0"; }; lograge = { dependencies = ["actionpack" "activesupport" "railties" "request_store"]; @@ -3573,14 +3653,14 @@ src: version = "1.1.2"; }; mini_portile2 = { - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.4"; }; minitest = { groups = ["development" "test"]; @@ -3634,28 +3714,6 @@ src: }; version = "3.2.5"; }; - ms_rest = { - dependencies = ["concurrent-ruby" "faraday" "timeliness"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1jiha1bda5knpjqjymwik6i41n69gb0phcrgvmgc5icl4mcisai7"; - type = "gem"; - }; - version = "0.7.6"; - }; - ms_rest_azure = { - dependencies = ["concurrent-ruby" "faraday" "faraday-cookie_jar" "ms_rest"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "06i37b84r2q206kfm5vsi9s1qiiy09091vhvc5pzb7320h0hc1ih"; - type = "gem"; - }; - version = "0.12.0"; - }; msgpack = { groups = ["default"]; platforms = []; @@ -3797,10 +3855,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xqcffn3c1564c4fizp10dzw2v5g2pabdzrcn25hq05bqhsckbar"; + sha256 = "1ycw0qsw3hap8svakl0i30jkj0ffd4lpyrn17a1j0w8mz5ainmsj"; type = "gem"; }; - version = "0.18.0"; + version = "0.17.1"; }; net-ntp = { groups = ["default"]; @@ -3898,14 +3956,14 @@ src: }; nokogiri = { dependencies = ["mini_portile2" "racc"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mr2ibfk874ncv0qbdkynay738w2mfinlkhnbd5lyk5yiw5q1p10"; + sha256 = "0k9w2z0953mnjrsji74cshqqp08q7m1r6zhadw1w0g34xzjh3a74"; type = "gem"; }; - version = "1.15.2"; + version = "1.15.4"; }; notiffany = { dependencies = ["nenv" "shellany"]; @@ -3955,10 +4013,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15lvy06h276jryxg19258b2yqaykf0567sp0n16yipywhbp94860"; + sha256 = "1gxh0x910qvah2sm9fbxn8jjy3pgwskyd3gm703zf182hafll3lj"; type = "gem"; }; - version = "4.25.1"; + version = "6.1.1"; }; ohai = { dependencies = ["chef-config" "chef-utils" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "train-core" "wmi-lite"]; @@ -4392,10 +4450,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zcvxmfa8hxkhpp59fhxyxy1arp70f11zi1jh9c7bsdfspifb7kb"; + sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.4"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -4403,10 +4461,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cs8c0f903phs3yjjbrhlyaipvmvm95xids06a761hf0s6lj0j5h"; + sha256 = "15ynrzqsmmbmxib8ri8n9k6z3l6rwd91j7y1mghm33nfgdf9bj8w"; type = "gem"; }; - version = "4.2.1"; + version = "4.2.3"; }; plist = { groups = ["default"]; @@ -4478,10 +4536,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14m09ysq0l6kih9pdy1mmdabdyjk09hvx4rzqh6phgb34s1w4pfp"; + sha256 = "0yyd1mvzbv64jc700d2vvdcr4cmb2gwf68368g0bwp1ybn64xqgk"; type = "gem"; }; - version = "0.25.0"; + version = "0.28.0"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -4522,10 +4580,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "031nacdzds5821p384qzhliim1h6d60nc63ml572gpz4zwynp6m9"; + sha256 = "027jd53zjbimqb3n1329q4njs94bagmfnrfylxqv04lrsa14h0md"; type = "gem"; }; - version = "0.6.1"; + version = "0.6.4"; }; public_suffix = { groups = ["danger" "default" "development" "test"]; @@ -4543,10 +4601,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v7fmv0n4bhdcwh60dgza44iqai5pg34f5pzm4vh4i5fwx7mpqxh"; + sha256 = "1x4dwx2shx0p7lsms97r85r7ji7zv57bjy3i1kmcpxc8bxvrr67c"; type = "gem"; }; - version = "6.3.0"; + version = "6.3.1"; }; pyu-ruby-sasl = { groups = ["default"]; @@ -4583,10 +4641,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; + sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; type = "gem"; }; - version = "2.2.7"; + version = "2.2.8"; }; rack-accept = { dependencies = ["rack"]; @@ -4605,10 +4663,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "049s3y3dpl6dn478g912y6f9nzclnnkl30psrbc2w5kaihj5szhq"; + sha256 = "0z6pj5vjgl6swq7a33gssf795k958mss8gpmdb4v4cydcs7px91w"; type = "gem"; }; - version = "6.6.1"; + version = "6.7.0"; }; rack-cors = { dependencies = ["rack"]; @@ -4616,10 +4674,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jvs0mq8jrsz86jva91mgql16daprpa3qaipzzfvngnnqr5680j7"; + sha256 = "02lvkg1nb4z3zc2nry545dap7a64bb9h2k8waxfz0jkabkgnpimw"; type = "gem"; }; - version = "1.1.1"; + version = "2.0.1"; }; rack-oauth2 = { dependencies = ["activesupport" "attr_required" "httpclient" "json-jwt" "rack"]; @@ -4649,10 +4707,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a62439xwn5v6hsl9s11hdk4wj58czhcbg7lminv23mnkc0ca147"; + sha256 = "12jw7401j543fj8cc83lmw72d8k6bxvkp9rvbifi88hh01blnsj4"; type = "gem"; }; - version = "0.7.6"; + version = "0.7.7"; }; rack-test = { dependencies = ["rack"]; @@ -4660,10 +4718,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rjl709krgf499dhjdapg580l2qaj9d91pwzk8ck8fpnazlx1bdd"; + sha256 = "1ysx29gk9k14a14zsp5a8czys140wacvp91fja8xcja0j1hzqq8c"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; rack-timeout = { groups = ["default"]; @@ -4676,15 +4734,15 @@ src: version = "0.6.3"; }; rails = { - dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + dependencies = ["actioncable" "actionmailbox" "actionmailer" "actionpack" "actiontext" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties"]; groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b7ggchi3d7pwzmj8jn9fhbazr5fr4dy304f0hz7kqbg23s9c1ym"; + sha256 = "08glp6jhq5yh8i5jjxzqa3aqx819l6ci6m68bx1asmimla0x9ysx"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4731,15 +4789,15 @@ src: version = "7.0.3"; }; railties = { - dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor" "zeitwerk"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mm3nf3y715ln6v8k6g4351ggkr1bcwc5637vr979yw8vsmdi42k"; + sha256 = "0dcabk5bl5flmspnb9d2qcvclcaw0nd5yr9w6m5pzsmylg3y63pv"; type = "gem"; }; - version = "6.1.7.2"; + version = "7.0.6"; }; rainbow = { groups = ["coverage" "default" "development" "test"]; @@ -4834,14 +4892,15 @@ src: version = "6.3.2"; }; re2 = { + dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1habsrf67d3m5p12wc2bydsa7bj87r7w1266x8in59znf5wz4drf"; + sha256 = "09c9f692ixym8sqk26f175jw53a00h2s4xad6z141axpi2mmy1q9"; type = "gem"; }; - version = "1.6.0"; + version = "2.0.0"; }; recaptcha = { dependencies = ["json"]; @@ -4986,10 +5045,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p7pqcfq33q1z4xlp4qm94w4h3fzc1yvr3cny16d00i8b20v4rx2"; + sha256 = "14kjykc6rpdh24sshg9savqdajya2dislc1jmbzg91w9967f4gv1"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.1"; }; rest-client = { dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; @@ -5024,14 +5083,14 @@ src: version = "1.4.0"; }; rexml = { - groups = ["danger" "default" "development" "test"]; + groups = ["coverage" "danger" "default" "development" "omnibus" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; rinku = { groups = ["default"]; @@ -5058,10 +5117,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pym2zjwl6dwdfvbn7rbvmds32r70jx9qddhvvi6pqy6987ack1v"; + sha256 = "19drl3x8fw65v3mpy7fk3cf3dfrywz5alv98n2rm4pp04vdn71lw"; type = "gem"; }; - version = "4.1.2"; + version = "4.1.3"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -5109,37 +5168,37 @@ src: }; rspec-core = { dependencies = ["rspec-support"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ibb81slc35q5yp276sixp3yrvj9q92wlmi1glbnwlk6g49z8rn4"; - type = "gem"; - }; - version = "3.12.0"; - }; - rspec-expectations = { - dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; + sha256 = "0l95bnjxdabrn79hwdhn2q1n7mn26pj7y1w5660v5qi81x458nqm"; type = "gem"; }; version = "3.12.2"; }; - rspec-mocks = { + rspec-expectations = { dependencies = ["diff-lcs" "rspec-support"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sq2cc9pm5gq411y7iwfvzbmgv3g91lyf7y7cqn1lr3yf1v122nc"; + sha256 = "05j44jfqlv7j2rpxb5vqzf9hfv7w8ba46wwgxwcwd8p0wzi1hg89"; type = "gem"; }; version = "3.12.3"; }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default" "development" "monorepo" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy"; + type = "gem"; + }; + version = "3.12.6"; + }; rspec-parameterized = { dependencies = ["rspec-parameterized-core" "rspec-parameterized-table_syntax"]; groups = ["test"]; @@ -5179,10 +5238,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d3fnabkaw8n0na2dpnlg2xygggj51djzpj9x6y5rkiqbfyqwv01"; + sha256 = "086qdyz7c4s5dslm6j06mq7j4jmj958whc3yinhabnqqmz7i463d"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.3"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -5205,6 +5264,16 @@ src: }; version = "3.12.0"; }; + rspec_flaky = { + dependencies = ["activesupport" "rspec"]; + groups = ["development" "monorepo" "test"]; + platforms = []; + source = { + path = "${src}/gems/rspec_flaky"; + type = "path"; + }; + version = "0.1.0"; + }; rspec_junit_formatter = { dependencies = ["rspec-core"]; groups = ["test"]; @@ -5233,10 +5302,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1imdfx3mx2p1k7bhc5qm35zvqw12hyz52yy2k9xj3dwrdpzjg0fh"; + sha256 = "0l46lw5gfj3mcm982wpmx7br4rs466gyislv0hfwcsk8dxhv1zkw"; type = "gem"; }; - version = "1.43.0"; + version = "1.50.2"; }; rubocop-ast = { dependencies = ["parser"]; @@ -5244,10 +5313,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdzabz95hv3z5sfbkfqa8bdybsfl13gv7rjb32v3ss8klq99lbd"; + sha256 = "188bs225kkhrb17dsf3likdahs2p1i1sqn0pr3pvlx50g6r2mnni"; type = "gem"; }; - version = "1.24.1"; + version = "1.29.0"; }; rubocop-capybara = { dependencies = ["rubocop"]; @@ -5255,10 +5324,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h4qcjkz0365qlhi7y1ni94qj14k397cad566zygm20p15ypbp5v"; + sha256 = "01fn05a87g009ch1sh00abdmgjab87i995msap26vxq1a5smdck6"; type = "gem"; }; - version = "2.17.0"; + version = "2.18.0"; + }; + rubocop-factory_bot = { + dependencies = ["rubocop"]; + groups = ["default" "development" "test"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kqchl8f67k2g56sq2h1sm2wb6br5gi47s877hlz94g5086f77n1"; + type = "gem"; + }; + version = "2.23.1"; }; rubocop-graphql = { dependencies = ["rubocop"]; @@ -5277,10 +5357,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n7g0vg06ldjaq4f8c11c7yqy99zng1qdrkkk4kfziippy24yxnc"; + sha256 = "0bp02784v0qm8qcswi169s0ar6216rwk516v3idzpbxznpqp97ac"; type = "gem"; }; - version = "1.16.0"; + version = "1.18.0"; }; rubocop-rails = { dependencies = ["activesupport" "rack" "rubocop"]; @@ -5288,21 +5368,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1nxyifly45y7dfiaf0ql8aq7xykrg0sh1l7dxmn3sb9p2jd18140"; + sha256 = "05r46ds0dm44fb4p67hbz721zck8mdwblzssz2y25yh075hvs36j"; type = "gem"; }; - version = "2.17.4"; + version = "2.20.2"; }; rubocop-rspec = { - dependencies = ["rubocop" "rubocop-capybara"]; + dependencies = ["rubocop" "rubocop-capybara" "rubocop-factory_bot"]; groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vmmin3ymgq7bhv2hl4pd0zpwawy709p816axc4vi67w61b4bij1"; + sha256 = "00rsflhijcr0q838fgbdmk7knm5kcjpimn6x0k9qmiw15hi96x1d"; type = "gem"; }; - version = "2.18.1"; + version = "2.22.0"; }; ruby-fogbugz = { dependencies = ["crack" "multipart-post"]; @@ -5378,17 +5458,6 @@ src: }; version = "0.0.5"; }; - ruby_parser = { - dependencies = ["sexp_processor"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1qybplg87pv6kxwyh4nkfn7pa4cisiajbfvh22dzkkbzxyxwil0p"; - type = "gem"; - }; - version = "3.20.0"; - }; rubyntlm = { groups = ["default"]; platforms = []; @@ -5424,10 +5493,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wnfgxx59nq2wpvi8ll7bqw9x99x5hps6i38xdjrwbb5a3896d58"; + sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in"; type = "gem"; }; - version = "1.5.1"; + version = "1.6.3"; }; safe_yaml = { groups = ["default" "test"]; @@ -5456,10 +5525,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zq8pxmsd1abw18zz6mazsm2jfpwmbgdxbpawb7bmwvkb2c5yyc1"; + sha256 = "1kymrjdpbmn4yaml3aaqyj1dzj8gqmm9h030dc2rj5mvja7fpi28"; type = "gem"; }; - version = "6.0.0"; + version = "6.0.2"; }; sass = { dependencies = ["sass-listen"]; @@ -5543,10 +5612,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kxnv3ywssagv2q453hasrrrvsv68d5f3ccm33pyacdji88w8pqg"; + sha256 = "0jwll13m7bqph4lgl75m7vwd175k657znwa7qn9qkf5dcxdjkcjs"; type = "gem"; }; - version = "4.9.0"; + version = "4.12.0"; }; semver_dialects = { dependencies = ["pastel" "thor" "tty-command"]; @@ -5608,20 +5677,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p8raic4vlif3r4crjm3x32hmkpikjd456c126hrv3kkyj6zwsfi"; + sha256 = "00ick64s6066idlylbxhpjmxf56h1l22c8xp0mg4j8963zga9zq2"; type = "gem"; }; - version = "1.0.1"; - }; - sexp_processor = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1p0r92dyffx6wkgazv3wi4m2yfm39kvvr9cjp2f57az5pgsdpajw"; - type = "gem"; - }; - version = "4.16.1"; + version = "1.0.2"; }; shellany = { groups = ["default" "test"]; @@ -5703,21 +5762,21 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hrv046jll6ad1s964gsmcq4hvkr3zzr6jc7z1mns22mvfpbc3cr"; + sha256 = "198kcbrjxhhzca19yrdcd6jjj9sb51aaic3b0sc3pwjghg3j49py"; type = "gem"; }; - version = "0.21.2"; + version = "0.22.0"; }; simplecov-cobertura = { - dependencies = ["simplecov"]; - groups = ["development" "test"]; + dependencies = ["rexml" "simplecov"]; + groups = ["coverage" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07ikl2y382g6ibzfflsamh13qlsr2769bx09kxdcs894cl882wwv"; + sha256 = "00izmp202y48qvmvwrh5x56cc5ivbjhgkkkjklvqmqzj9pik4r9c"; type = "gem"; }; - version = "1.3.1"; + version = "2.1.0"; }; simplecov-html = { groups = ["coverage" "default" "development" "test"]; @@ -6027,10 +6086,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0an1311bpyhd9kzak1qpd4jks336i47gbvx3zdrnn1rdxppimsac"; + sha256 = "11z9m8jcys8q8h8prqdr1frppm0mjdh8if7c1rm2qyq8v19g83fi"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; telesign = { dependencies = ["net-http-persistent"]; @@ -6102,10 +6161,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09phq7jxfgamv03kjcgibw0f6w3g3mlb9yapji3bxh7cbjvwk2pa"; + sha256 = "08j5456rdpgxvv8bs44x81jrxzpxb79wxfxdq4fqwxyircxzi2jj"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; test_file_finder = { dependencies = ["faraday"]; @@ -6168,16 +6227,6 @@ src: }; version = "2.0.11"; }; - timeliness = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gvp9b7yn4pykn794cibylc9ys1lw7fzv7djx1433icxw4y26my3"; - type = "gem"; - }; - version = "0.3.10"; - }; timeout = { groups = ["default"]; platforms = []; @@ -6385,10 +6434,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fgkhqg7npixc95h060ykbjz0a07ldl3dp9y7wd2qgi5irq5vfr7"; + sha256 = "1bp644b1mxwhbkjlm8bmwv8sxkkwkpc7chqxff9a8yxy0n99ambj"; type = "gem"; }; - version = "0.4.5"; + version = "0.4.6"; }; unf = { dependencies = ["unf_ext"]; @@ -6522,10 +6571,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hxqza44pvk6x6vb91cvllhw71hqziby06dk1s94rh9f6khbl1nm"; + sha256 = "06fspma67flsvwl3gfyrv2572l15pjsmqsncz5yp4kqbriw03i7a"; type = "gem"; }; - version = "1.0.11"; + version = "1.0.13"; }; version_gem = { groups = ["default"]; @@ -6553,10 +6602,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08jc9k4qqazbf5frhdril5084adm90rs1lqbnqq3yfdm2dgaiyhx"; + sha256 = "1bz86m3bbnhy8j1gmpm76jcgqfyjafqwyxjdd1bk2f5jmgswvqy3"; type = "gem"; }; - version = "3.2.0"; + version = "3.5.0"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker"]; @@ -6569,6 +6618,28 @@ src: }; version = "2.0.0"; }; + vite_rails = { + dependencies = ["railties" "vite_ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q7qbi3npw47xza8spvd8ni0x0ahjb6lkd12y9a4pqppxn555v5q"; + type = "gem"; + }; + version = "3.0.15"; + }; + vite_ruby = { + dependencies = ["dry-cli" "rack-proxy" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "036qi8w4qzglhqrrrrkc0m7ivfzmagsdyj61r0h27p56hn1l6ph2"; + type = "gem"; + }; + version = "3.3.4"; + }; vmstat = { groups = ["default"]; platforms = []; @@ -6628,10 +6699,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1myj44wvbbqvv18ragv3ihl0h61acgnfwrnj3lccdgp49bgmbjal"; + sha256 = "0vfispr7wd2p1fs9ckn1qnby1yyp4i1dl7qz8n482iw977iyxrza"; type = "gem"; }; - version = "3.18.1"; + version = "3.19.1"; }; webrick = { groups = ["default" "development" "test"]; @@ -6762,9 +6833,9 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; + sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1"; type = "gem"; }; - version = "2.6.6"; + version = "2.6.7"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py index 3df024b2c0..195fce350c 100755 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py @@ -187,7 +187,7 @@ def update_rubyenv(): ) # Fetch vendored dependencies temporarily in order to build the gemset.nix - subprocess.check_output(["mkdir", "-p", "vendor/gems"], cwd=rubyenv_dir) + subprocess.check_output(["mkdir", "-p", "vendor/gems", "gems"], cwd=rubyenv_dir) subprocess.check_output( [ "sh", @@ -196,6 +196,14 @@ def update_rubyenv(): ], cwd=f"{rubyenv_dir}/vendor/gems", ) + subprocess.check_output( + [ + "sh", + "-c", + f"curl -L https://gitlab.com/gitlab-org/gitlab/-/archive/v{version}-ee/gitlab-v{version}-ee.tar.bz2?path=gems | tar -xj --strip-components=3", + ], + cwd=f"{rubyenv_dir}/gems", + ) # Undo our gemset.nix patches so that bundix runs through subprocess.check_output( @@ -213,11 +221,13 @@ def update_rubyenv(): "1i\\src:", "-e", 's:path = \\(vendor/[^;]*\\);:path = "${src}/\\1";:g', + "-e", + 's:path = \\(gems/[^;]*\\);:path = "${src}/\\1";:g', "gemset.nix", ], cwd=rubyenv_dir, ) - subprocess.check_output(["rm", "-rf", "vendor"], cwd=rubyenv_dir) + subprocess.check_output(["rm", "-rf", "vendor", "gems"], cwd=rubyenv_dir) @cli.command("update-gitaly") diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitls/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitls/default.nix index 4cda10b380..28fbba659f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitls/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitls/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { hash = "sha256-kLkH/nNidd1QNPKvo7fxZwMhTgd4AVB8Ofw0Wo0z6c0="; }; - vendorSha256 = null; + vendorHash = null; passthru.tests.version = testers.testVersion { package = gitls; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitmux/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitmux/default.nix index a0b4db2010..be565f4fda 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitmux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitmux/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitmux"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "arl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0WfxtOidHiRxSXGzG8So965f/sBS0DY7fEDsocvfPiY="; + sha256 = "sha256-BvjBEhu6696DkT4GEg2gYTovZEnRosnBD3kzym536e0="; }; - vendorHash = "sha256-talZSkf8lQXwXKdkQliHFv2K+42BFtcg13oB5Szkff0="; + vendorHash = "sha256-PHY020MIuLlC1LqNGyBJRNd7J+SzoHbNMPAil7CKP/M="; # GitHub source does contain a regression test for the module # but it requires networking as it git clones a repo from github diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitnr/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitnr/default.nix new file mode 100644 index 0000000000..a6d5a5bd61 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitnr/default.nix @@ -0,0 +1,49 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libxkbcommon +, openssl +, stdenv +, darwin +, wayland +}: + +rustPlatform.buildRustPackage rec { + pname = "gitnr"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "reemus-dev"; + repo = "gitnr"; + rev = "v${version}"; + hash = "sha256-Hsro0y/avI20cFQveQF17NiR3JCNlBKqXbaIce7uxBM="; + }; + + cargoHash = "sha256-Ahzm23AStSwDSgks9j/J15/zo+EH/NgbfCBc3xBcTwQ="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + ] ++ lib.optionals stdenv.isLinux [ + libxkbcommon + wayland + ]; + + # requires internet access + doCheck = false; + + meta = with lib; { + description = "Create `.gitignore` files using one or more templates from TopTal, GitHub or your own collection"; + homepage = "https://github.com/reemus-dev/gitnr"; + changelog = "https://github.com/reemus-dev/gitnr/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "gitnr"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix index 3863962fc5..64efc4731a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.28.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - hash = "sha256-7iJx7kE606jeaokROmOSoh0egCQUgYwvg8BAA3y1BGs="; + hash = "sha256-VJZwNLFePUNIRHEyiEr1tiLaB2tuL6Ah81LNuM/1H14="; }; - cargoHash = "sha256-zChqIA/KuS1aBs/g1tlymGvvJeljKMMCODijPhQYy40="; + cargoHash = "sha256-vEp0wLxmmmv33oRO7eOxOoOsV87/7DQ8db5RUfqUb88="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitty/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitty/default.nix index da24cb2988..0bc267d964 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitty/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-g0D6nJiHY7cz72DSmdQZsj9Vgv/VOp0exTcLsaypGiU="; }; - vendorSha256 = "sha256-qrLECQkjXH0aTHmysq64jnXj9jgbunpVtBAIXJOEYIY="; + vendorHash = "sha256-qrLECQkjXH0aTHmysq64jnXj9jgbunpVtBAIXJOEYIY="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitui/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitui/default.nix index 2686463da2..257d7fd4aa 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitui/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.23.0"; + version = "0.24.3"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - hash = "sha256-Mz4/Q1EmTg3vXIYbIdr5MtemGrBSkvBBwcfz+McEaJ8="; + hash = "sha256-mT5toF4mKRP0dlwlfKHjmFFQJ/cWSb2vwg1uZbhZRhI="; }; - cargoHash = "sha256-hsu3WQfqMnD5frJP6wDcexG7HafXmzs5ZIGePGOBRVs="; + cargoHash = "sha256-8j0NtJB2ErrpljPHSMRD/4IGZuqA8wLuzPnuQqxaXRg="; nativeBuildInputs = [ pkg-config ]; @@ -37,11 +37,19 @@ rustPlatform.buildRustPackage rec { # environment: delete them. postPatch = "rm .cargo/config"; + + # Getting app_config_path fails with a permission denied + checkFlags = [ + "--skip=keys::key_config::tests::test_symbolic_links" + ]; + + meta = with lib; { description = "Blazing fast terminal-ui for Git written in Rust"; homepage = "https://github.com/extrawurst/gitui"; - changelog = "https://github.com/extrawurst/gitui/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/extrawurst/gitui/blob/v${version}/CHANGELOG.md"; + mainProgram = "gitui"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne yanganto ]; + maintainers = with maintainers; [ Br1ght0ne yanganto mfrw ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix index 797b508e13..d0e6a1018a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.31.0"; + version = "1.32.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-K7yGRuIfYEqs4ziystxLMK+dYUZoyGlBJAmx2qmY08Q="; + hash = "sha256-7XFekLlWcifqGJL6IIONpixdMAyGBJJmqo+l6RKCfC8="; }; - vendorHash = "sha256-WfzN70HHLatBuV+GW2VC+5laR3rBfDOqPydyxMSmL3s="; + vendorHash = "sha256-HiU6Kx/du8QLNKUDsSMm349msxSxyNRppxadtIpglBg="; ldflags = [ "-s" @@ -29,6 +29,8 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + make manpage + installManPage share/man/man1/* installShellCompletion --cmd glab \ --bash <($out/bin/glab completion -s bash) \ --fish <($out/bin/glab completion -s fish) \ @@ -39,6 +41,7 @@ buildGoModule rec { description = "GitLab CLI tool bringing GitLab to your command line"; license = licenses.mit; homepage = "https://gitlab.com/gitlab-org/cli"; + changelog = "https://gitlab.com/gitlab-org/cli/-/releases/v${version}"; maintainers = with maintainers; [ freezeboy ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix index 824d0e0560..2a7d70cdc1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "sha256-UfxE+NaqDr3XUXpvlV989Iwjq/lsAwpMTDAPkcOmma8="; }; - vendorSha256 = "sha256-ISJOEJ1DWO4nnMpDuZ36Nq528LhgekDh3XUF8adlj2w="; + vendorHash = "sha256-ISJOEJ1DWO4nnMpDuZ36Nq528LhgekDh3XUF8adlj2w="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix index e3bf938303..f00ee82d1c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "got"; - version = "0.91"; + version = "0.93"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - hash = "sha256-ebFetQhgEBjy3aq3TfK9veeevbmSAEv9kaUohsnsrlU="; + hash = "sha256-wlcnJr7f3Bd9SEgrKiPlr7pTSjaRj47qwktI2jepINE="; }; nativeBuildInputs = [ pkg-config bison ] @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libbsd libevent libuuid libmd zlib ncurses ] ++ lib.optionals stdenv.isDarwin [ libossp_uuid ]; + configureFlags = [ "--enable-gotd" ]; + preConfigure = lib.optionalString stdenv.isDarwin '' # The configure script assumes dependencies on Darwin are install via # Homebrew or MacPorts and hardcodes assumptions about the paths of @@ -52,6 +54,7 @@ stdenv.mkDerivation rec { on the same repository. ''; homepage = "https://gameoftrees.org"; + changelog = "https://gameoftrees.org/releases/CHANGES"; license = licenses.isc; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ abbe afh ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gql/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gql/default.nix index b5682ad4ba..0c20b51fbc 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gql/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gql/default.nix @@ -2,29 +2,29 @@ , rustPlatform , fetchFromGitHub , pkg-config -, libgit2_1_6 +, libgit2 , zlib }: rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.4.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-d6uncWHq9bLDODFle7xij9YjhpiQPL7mmyFmVxmy8hY="; + hash = "sha256-qNLVbhVXITbMRI2x/0q5enJgjL3EAcXBwqWeH6MPfZs="; }; - cargoHash = "sha256-jR79xchMpib76oVnpy+UIbcwhDXvDPyl+jWmVPfXVog="; + cargoHash = "sha256-UrzJGEASGaDqKUrPiNcjldevCqCPaNXJXNYecbHodOc="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ - libgit2_1_6 + libgit2 zlib ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gst/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gst/default.nix index f0f347d14c..bf7abf12d7 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gst/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gst/default.nix @@ -13,10 +13,10 @@ buildGoModule rec { owner = "uetchy"; repo = "gst"; rev = "v${version}"; - sha256 = "07cixz5wlzzb4cwcrncg2mz502wlhd3awql5js1glw9f6qfwc5in"; + hash = "sha256-NhbGHTYucfqCloVirkaDlAtQfhWP2cw4I+t/ysvvkR0="; }; - vendorSha256 = "0k5xl55vzpl64gwsgaff92jismpx6y7l2ia0kx7gamd1vklf0qwh"; + vendorHash = "sha256-kGPg6NyhVfVOn0BFQY83/VYdpUjOqaf5I4bev0uhvUw="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix index 568460d7ce..ed8e486681 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "jujutsu"; - version = "0.8.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - sha256 = "sha256-kbJWkCnb77VRKemA8WejaChaQYCxNiVMbqW5PCrDoE8="; + hash = "sha256-LJW4Px3K5cz6RJ4sUbwUXsp2+rzEW5wowi+DALHajYA="; }; - cargoHash = "sha256-qbCOVcKpNGWGonRAwPsr3o3yd+7qUTy3IVmC3Ifn4xE="; + cargoHash = "sha256-fs1cWhBFp2u3HiEx/mMnbwvgwKo97KmftA/sr4dGsiM="; buildNoDefaultFeatures = true; buildFeatures = [ @@ -38,16 +38,6 @@ rustPlatform.buildRustPackage rec { "packaging" ]; - patches = [ - # this patch (hopefully!) fixes a very, very rare test failure that can - # occasionally be cajoled out of Nix and GitHub CI builds. go ahead and - # apply it to be safe. - (fetchpatch { - url = "https://github.com/martinvonz/jj/commit/8e7e32710d29010423f3992bb920aaf2a0fa04ec.patch"; - hash = "sha256-ySieobB1P/DpWOurcCb4BXoHk9IqrjzMfzdc3O5cTXk="; - }) - ]; - cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors useNextest = true; # nextest is the upstream integration framework ZSTD_SYS_USE_PKG_CONFIG = "1"; # disable vendored zlib diff --git a/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix index d882edc5a3..6bbe405f65 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { subPackages = [ "." ]; - vendorSha256 = "sha256-ChysquNuUffcM3qaWUdqu3Av33gnKkdlotEoFKoedA0="; + vendorHash = "sha256-ChysquNuUffcM3qaWUdqu3Av33gnKkdlotEoFKoedA0="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix index b5cb93e71e..1fb7c16557 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/lefthook/default.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.4.8"; + version = "1.5.1"; in buildGoModule rec { inherit pname version; @@ -15,7 +15,7 @@ buildGoModule rec { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-lK2JGENCqfNXXzZBHirEoOB5+ktea38ypb2VD7GWxhg="; + hash = "sha256-v6COZt4ylhpPfPNQLSN0XDpjVk8E2ZUDIP4TU+Uzk5A="; }; vendorHash = "sha256-/VLS7+nPERjIU7V2CzqXH69Z3/y+GKZbAFn+KcRKRuA="; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix index f347ed884e..01dc3efcd6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.5.1"; + version = "6.5.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-M/fejYs2B/orQIzeS4cl4RfrCtQZJqeH6qtAnKik/C8="; + sha256 = "sha256-r8OdcGeXZZPIMyuOl6Eq/Tk7VQN8X7nDyrGkLHVg9go="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-tPv0UeZOsHDGKzXWeA/fFio7d3EN+KGioDu/1WH1drc="; + sha256 = "sha256-dcyHmLkRadNK30Vv0XsCEaZGTIcF/L29lLe58ggB3Lg="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; @@ -90,6 +90,7 @@ let description = "A fast, lightweight SCM system for very large distributed projects"; homepage = "https://www.mercurial-scm.org"; downloadPage = "https://www.mercurial-scm.org/release/"; + changelog = "https://wiki.mercurial-scm.org/Release${versions.majorMinor version}"; license = licenses.gpl2Plus; maintainers = with maintainers; [ eelco lukegb pacien techknowlogick ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix index 4d3cea9c00..1ea92e333d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/pijul/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchCrate , rustPlatform +, installShellFiles , pkg-config , libsodium , openssl @@ -22,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-mRi0NUETTdYE/oM+Jo7gW/zNby8dPAKl6XhzP0Qzsf0="; doCheck = false; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl libsodium xxHash ] ++ (lib.optionals gitImportSupport [ libgit2 ]) ++ (lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ @@ -31,6 +32,13 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional gitImportSupport "git"; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd pijul \ + --bash <($out/bin/pijul completion bash) \ + --fish <($out/bin/pijul completion fish) \ + --zsh <($out/bin/pijul completion zsh) + ''; + meta = with lib; { description = "A distributed version control system"; homepage = "https://pijul.org"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix index 2c7836f131..ea34252f68 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/reposurgeon/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "sha256-FuL5pvIM468hEm6rUBKGW6+WlYv4DPHNnpwpRGzMwlY="; }; - vendorSha256 = "sha256-QpgRCnsOOZujE405dCe+PYg/zNkqnrfZFfbBFo7adjY="; + vendorHash = "sha256-QpgRCnsOOZujE405dCe+PYg/zNkqnrfZFfbBFo7adjY="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/scmpuff/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/scmpuff/default.nix index 65ca1b476d..38927d7575 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/scmpuff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/scmpuff/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-+L0W+M8sZdUSCWj9Ftft1gkRRfWMHdxon2xNnotx8Xs="; }; - vendorSha256 = "sha256-7WHVSEz3y1nxWfbxkzkfHhINLC8+snmWknHyUUpNy7c="; + vendorHash = "sha256-7WHVSEz3y1nxWfbxkzkfHhINLC8+snmWknHyUUpNy7c="; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix index 5d7478b944..eae70b3724 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/git.nix @@ -22,35 +22,35 @@ let inherit src version; pname = "gitsrht-api"; modRoot = "api"; - vendorSha256 = "sha256-cCs9FUBusaAou9w4TDOg8GKxhRcsPbSNcQpxvFH/+so="; + vendorHash = "sha256-cCs9FUBusaAou9w4TDOg8GKxhRcsPbSNcQpxvFH/+so="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); gitDispatch = buildGoModule { inherit src version; pname = "gitsrht-dispatch"; modRoot = "gitsrht-dispatch"; - vendorSha256 = "sha256-qWXPHo86s6iuRBhRMtmD5jxnAWKdrWHtA/iSUkdw89M="; + vendorHash = "sha256-qWXPHo86s6iuRBhRMtmD5jxnAWKdrWHtA/iSUkdw89M="; }; gitKeys = buildGoModule { inherit src version; pname = "gitsrht-keys"; modRoot = "gitsrht-keys"; - vendorSha256 = "sha256-9pojS69HCKVHUceyOpGtv9ewcxFD4WsOVsEzkmWJkF4="; + vendorHash = "sha256-9pojS69HCKVHUceyOpGtv9ewcxFD4WsOVsEzkmWJkF4="; }; gitShell = buildGoModule { inherit src version; pname = "gitsrht-shell"; modRoot = "gitsrht-shell"; - vendorSha256 = "sha256-WqfvSPuVsOHA//86u33atMfeA11+DJhjLmWy8Ivq0NI="; + vendorHash = "sha256-WqfvSPuVsOHA//86u33atMfeA11+DJhjLmWy8Ivq0NI="; }; gitUpdateHook = buildGoModule { inherit src version; pname = "gitsrht-update-hook"; modRoot = "gitsrht-update-hook"; - vendorSha256 = "sha256-Bc3yPabS2S+qiroHFKrtkII/CfzBDYQ6xWxKHAME+Tc="; + vendorHash = "sha256-Bc3yPabS2S+qiroHFKrtkII/CfzBDYQ6xWxKHAME+Tc="; }; in diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix index eb8fa96624..7f25ec99aa 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/hg.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { inherit src version; pname = "hgsrht-api"; modRoot = "api"; - vendorSha256 = "sha256-uIP3W7UJkP68HJUF33kz5xfg/KBiaSwMozFYmQJQkys="; + vendorHash = "sha256-uIP3W7UJkP68HJUF33kz5xfg/KBiaSwMozFYmQJQkys="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); hgsrht-keys = buildGoModule { inherit src version; pname = "hgsrht-keys"; modRoot = "hgsrht-keys"; - vendorSha256 = "sha256-7ti8xCjSrxsslF7/1X/GY4FDl+69hPL4UwCDfjxmJLU="; + vendorHash = "sha256-7ti8xCjSrxsslF7/1X/GY4FDl+69hPL4UwCDfjxmJLU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix index e4b366b01e..b875a46fca 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/lists.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { inherit src version; pname = "listssrht-api"; modRoot = "api"; - vendorSha256 = "sha256-xnmMkRSokbhWD+kz0XQ9AinYdm6/50FRBISURPvlzD0="; + vendorHash = "sha256-xnmMkRSokbhWD+kz0XQ9AinYdm6/50FRBISURPvlzD0="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/pages.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/pages.nix index edb9379c6d..abcef1648f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/pages.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/pages.nix @@ -20,7 +20,7 @@ buildGoModule (rec { --replace "all: server" "" ''; - vendorSha256 = "sha256-VOqY/nStqGyfWOXnJSZX8UYyp2kzcibQM2NRNysHYEc="; + vendorHash = "sha256-VOqY/nStqGyfWOXnJSZX8UYyp2kzcibQM2NRNysHYEc="; postInstall = '' mkdir -p $out/share/sql/ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix index 95ef43775e..cee340e0d2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/todo.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { inherit src version; pname = "todosrht-api"; modRoot = "api"; - vendorSha256 = "sha256-LB1H4jwnvoEyaaYJ09NI/M6IkgZwRet/fkso6b9EPV0="; + vendorHash = "sha256-LB1H4jwnvoEyaaYJ09NI/M6IkgZwRet/fkso6b9EPV0="; } // import ./fix-gqlgen-trimpath.nix { inherit unzip; }); propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh index 239d767ed9..54727e0317 100755 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/update.sh @@ -38,7 +38,7 @@ update_version() { (cd "$root" && update-source-version "sourcehut.python.pkgs.$1" "$version") - # Update vendorSha256 of Go modules + # Update vendorHash of Go modules retry=true while "$retry"; do retry=false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/stgit/0001-fix-use-canonical-Message-ID-spelling.patch b/third_party/nixpkgs/pkgs/applications/version-management/stgit/0001-fix-use-canonical-Message-ID-spelling.patch deleted file mode 100644 index 71cab8fc28..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/stgit/0001-fix-use-canonical-Message-ID-spelling.patch +++ /dev/null @@ -1,249 +0,0 @@ -From c500ebe5a51da4eecba0c88d9a335e7a659e7ecb Mon Sep 17 00:00:00 2001 -From: Peter Grayson -Date: Sun, 18 Jun 2023 15:00:19 -0400 -Subject: fix: use canonical Message-ID spelling - -This change aligns with a change in git 2.41.0 to consistently spell -"Message-ID" instead of "Message-Id". - -The test suite is updated to accommodate both spellings, since such headers -are case insensitive. ---- - Documentation/stg.txt | 2 +- - completion/stgit.zsh | 2 +- - src/cmd/email/format.rs | 2 +- - src/cmd/email/send.rs | 2 +- - src/cmd/import.rs | 6 +++--- - t/t1800-import.sh | 2 +- - t/t1801-import-email.sh | 32 ++++++++++++++++---------------- - 7 files changed, 24 insertions(+), 24 deletions(-) - -diff --git a/Documentation/stg.txt b/Documentation/stg.txt -index fb4c08fb..20b75ce2 100644 ---- a/Documentation/stg.txt -+++ b/Documentation/stg.txt -@@ -302,7 +302,7 @@ N.B. Set 'commit.gpgsign' to determine whether patch commits themselves are GPG - See linkgit:git-config[1] for more information about 'commit.gpgsign'. - - stgit.import.message-id:: -- When set to 'true', create 'Message-Id:' trailer in the patch description of patches -+ When set to 'true', create 'Message-ID:' trailer in the patch description of patches - imported from email using linkstg:import[]. - - stgit.keepoptimized:: -diff --git a/completion/stgit.zsh b/completion/stgit.zsh -index 797d9044..de818242 100644 ---- a/completion/stgit.zsh -+++ b/completion/stgit.zsh -@@ -717,7 +717,7 @@ _stg-import() { - '--replace[replace unapplied patches in series]' - '--reject[leave rejected hunks in .rej files]' - '--keep-cr[do not remove CR from email lines ending with CRLF]' -- '--message-id[create Message-Id trailer from email header]' -+ '--message-id[create Message-ID trailer from email header]' - '(-d --showdiff)'{-d,--showdiff}'[show patch content in editor buffer]' - ':file:_files' - + '(source)' -diff --git a/src/cmd/email/format.rs b/src/cmd/email/format.rs -index f385b48a..b30af9c0 100644 ---- a/src/cmd/email/format.rs -+++ b/src/cmd/email/format.rs -@@ -323,7 +323,7 @@ fn message_options() -> Vec { - .long_help( - "Controls addition of `In-Reply-To` and `References` headers to make \ - the second and subsequent mails appear as replies to the first. Also \ -- controls generation of the `Message-Id` header to reference.\n\ -+ controls generation of the `Message-ID` header to reference.\n\ - \n\ - The optional